From 00cafbf8101da78c3a662cf4bb73b06e068b4797 Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Tue, 3 Jan 2023 22:44:38 -0700 Subject: [PATCH 1/2] curve bridge --- blends/large_meat_tunnel.blend | 4 ++-- ...e.glb-e3c55adc4c25e74b8b5e53cb73d57231.md5 | 4 ++-- ...e.glb-e3c55adc4c25e74b8b5e53cb73d57231.scn | Bin 1665 -> 2377 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blends/large_meat_tunnel.blend b/blends/large_meat_tunnel.blend index 3e8d6df..827beab 100644 --- a/blends/large_meat_tunnel.blend +++ b/blends/large_meat_tunnel.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d073626bc6b98e6752f785cab694ec7cd797e90fb1aa7087256360dbd01911bc -size 58898197 +oid sha256:fc266dd1e579cceeb1d1a535588435773290c33928f97e3091a2dda22d95227c +size 59920909 diff --git a/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.md5 b/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.md5 index 478aa0f..a146b62 100644 --- a/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.md5 +++ b/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.md5 @@ -1,3 +1,3 @@ -source_md5="b55252b193b820230f43f7e9c800ec75" -dest_md5="d35a34792cc21a09cd2504f4154b6cb2" +source_md5="c532c3a2f96107461a44deb84d39efb9" +dest_md5="c3617d1811bc857d73165e335ad3abcf" diff --git a/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.scn b/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.scn index 786bc402a377a3ade2b8747df44e499e2af7ada4..0f44f84a9202e38f58108a8dac3f98237769eee3 100644 GIT binary patch literal 2377 zcmbtWO-~y~7#=7Xrx5c|x0JYq5C=-b#~Lmur4kf`P!8k+E>R<8wO&u~D)t)fu2Ea5 zw<=W+`3b&6O4W07s5rGYgplO3k(^W>7PIr9YFTxmHz* z4}eshopMmMc1_>;R+?qU4a6YeVnwQh96F{h(GgEvr}*ydh&RFNgofdhd}E0CUJRm3z7@bGiPuzX(zzEPD{U>0khG&b?I z>N%wyIaiI@JHh@wriukZ^P)P1;7 zEGYOAV5%YuW3ni0maM=MV>teWoBH{eKY!~SzwrB^^?0?pe}DGY+;NT=XQuMQYO}d% z+?vyTZS1S%nZmD2lp{vj{bqi+AF`*hsmu%GESA5~2ieHRva*qTI{C_I*@!UOc&zxK zb4B^L@oe^0Ti>#>n|qsGYTJ#l!@*RcWjDg|>wRr~j5j=JFy42`IKsw(G1z|&8_m8j z&hj0v56r)d<6y4BM&rRGa`i92jYV;Uc4PB4;$ZG$pMm|IMI7QZ z_GEfS=Q++xXdk=js+V<0X z$W`pKdM~y;)s0-mK1bM-?HRlwmVk?xd(sQ!*QQ;oqZqPMFJO|$!l>(mgmnyim-rCXuuEjH4~lt_#X5zZ4WUD%P>9kfv;**B zNPL9yJR&|3IY{Qk6)}O*ISD<6m<5k+AQ!QBqHOhG?Z%!K!;nlv&oFfNLwgo2p&zmX zkePt|0O$s^3_-gAA3uecbE1HKL|g~Q2<%-4JrAohu#^|$h+-7$HS7ZZj9~4+J_di& zSg&C313H0KU}vKErBl>S;`hKvW3k=!oT?Kzds4;G6;W8iAJ#n7egzMIH?9OIq*@Lu zIDeCztOuRrKdx|QDm`mtVuSM^$%+hWu5MD7fpCy|wyUYjOER!cwfYVlDRazmwo$XA z&{yVzLe!qZWKZ?+1_W+cbLf79Gzqc2YX$6oWCmMVy)-tdo30;Nt}PXX>h>%&N;mNF zmUQ=`FUd~EHszuxCtfJYEjK{&aV-LuEyO?3pwk>Y>aX@12TB_Gs4X7UN`rRIbrS|j wjt!Ee4aR88Lj+ycfy5;K=a3~Qu<#GVbfVZ#voKxw4f;;aRd+ylw(uwFU)si`pa1{> delta 664 zcmZXRzfQtX6vof3NI?oM;J@w0#Hon_vnE9*w=RwAO(VpZ7)%HnU2L4#@d?;FnD_wN zZoUAsJcfyb-|cO&!f?(>em&p$&bj?;JXc=_O#3dpT(OJbixFuDQ&a}xZ$Uga- zHi@W;xF3whg9mYWdp8`@22nu!pz>=S;g3fCqqrXS(bD(FK5@Wv1fw##8R@7c+M^2c uHfobB+C{FS)-a}ytf3akpawFb?offYkWEx+WFV9UwwUTVJA5nYXWB0(1(*r| From 9db476acf37c802664a6fe1da454d063888e3b62 Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Tue, 3 Jan 2023 23:20:07 -0700 Subject: [PATCH 2/2] too much --- .../styles/ResourceMenuPanelBackground.tres | 2 +- godot/assets/meat_bore/MeatBridge.material | 4 +- godot/assets/meat_bore/meat_module/Area.gd | 6 +++ .../meat_bore/meat_module/level_jackie.tscn | 39 ++++++++++++++++++- godot/assets/models/heart/Heart_2.tscn | 4 +- godot/dialogic/folder_structure.json | 3 +- .../timelines/timeline-1672812380.json | 19 +++++++++ godot/effects/grainy_shader.gd | 8 ++++ godot/effects/grainy_shader.tscn | 6 ++- godot/tests/bore_hole/DeathArea.gd | 6 +++ godot/util.gd | 2 +- 11 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 godot/assets/meat_bore/meat_module/Area.gd create mode 100644 godot/dialogic/timelines/timeline-1672812380.json create mode 100644 godot/tests/bore_hole/DeathArea.gd diff --git a/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres b/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres index acd96c5..41c5bcc 100644 --- a/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres +++ b/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres @@ -5,7 +5,7 @@ content_margin_left = 10.0 content_margin_right = 10.0 content_margin_top = 10.0 content_margin_bottom = 10.0 -bg_color = Color( 0.03, 0.21, 0.26, 1 ) +bg_color = Color( 0.2, 0.23, 0.31, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 diff --git a/godot/assets/meat_bore/MeatBridge.material b/godot/assets/meat_bore/MeatBridge.material index ddd7c71..cfe0479 100644 --- a/godot/assets/meat_bore/MeatBridge.material +++ b/godot/assets/meat_bore/MeatBridge.material @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39a23c32909a51097cf80c59b38e2f608d981c771d1491508a31c3950eacca98 -size 4196286 +oid sha256:8c9f09cf357ac8355c42b5e666b4eebac78c3fe7eb91181c3b85af285e79d0a7 +size 1300246 diff --git a/godot/assets/meat_bore/meat_module/Area.gd b/godot/assets/meat_bore/meat_module/Area.gd new file mode 100644 index 0000000..09b5951 --- /dev/null +++ b/godot/assets/meat_bore/meat_module/Area.gd @@ -0,0 +1,6 @@ +extends Area + + +func _on_Area_body_entered(body): + if body.get_parent() == Util.player: + Util.shader.mega_madness() diff --git a/godot/assets/meat_bore/meat_module/level_jackie.tscn b/godot/assets/meat_bore/meat_module/level_jackie.tscn index 4fdaa34..4849ffa 100644 --- a/godot/assets/meat_bore/meat_module/level_jackie.tscn +++ b/godot/assets/meat_bore/meat_module/level_jackie.tscn @@ -1,10 +1,19 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_5.png" type="Texture" id=2] [ext_resource path="res://assets/meat_bore/npcs/inherited/jackie.tscn" type="PackedScene" id=3] [ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=4] [ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=5] +[ext_resource path="res://tests/bore_hole/DeathArea.gd" type="Script" id=6] +[ext_resource path="res://assets/meat_bore/bridge.tscn" type="PackedScene" id=7] +[ext_resource path="res://assets/models/heart/Heart_2.tscn" type="PackedScene" id=8] +[ext_resource path="res://assets/models/black_box/black_box.tscn" type="PackedScene" id=9] +[ext_resource path="res://assets/meat_bore/meat_module/Area.gd" type="Script" id=10] + +[sub_resource type="BoxShape" id=1] + +[sub_resource type="BoxShape" id=2] [node name="level_jackie" type="Spatial"] @@ -23,3 +32,31 @@ transform = Transform( 0.957214, 0.289383, 0, -0.289383, 0.957214, 0, 0, 0, 1, - [node name="SinkBlock" parent="." instance=ExtResource( 5 )] transform = Transform( 30, 0, 0, 0, 1, 0, 0, 0, 30, -0.004, -469.575, 0.012 ) + +[node name="bridge" parent="." instance=ExtResource( 7 )] +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, -525.933, -4.029 ) + +[node name="Heart_2" parent="." instance=ExtResource( 8 )] +transform = Transform( 4.51801e-05, -600, 4.63546e-06, -30.6993, 2.31773e-06, 599.214, -599.214, -4.53581e-05, -30.6993, 12.6254, -834.663, -7.77628 ) + +[node name="Area" type="Area" parent="Heart_2"] +script = ExtResource( 6 ) + +[node name="CollisionShape" type="CollisionShape" parent="Heart_2/Area"] +transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 0.085, 0, 0, 0 ) +shape = SubResource( 1 ) + +[node name="black_box" parent="." instance=ExtResource( 9 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 18.1989, -523.791, -3.90097 ) +id = 6 + +[node name="Area" type="Area" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -473.241, 0 ) +script = ExtResource( 10 ) + +[node name="CollisionShape" type="CollisionShape" parent="Area"] +transform = Transform( 500, 0, 0, 0, 13, 0, 0, 0, 500, 0, -3.39966, 0 ) +shape = SubResource( 2 ) + +[connection signal="body_entered" from="Heart_2/Area" to="Heart_2/Area" method="_on_Area_body_entered"] +[connection signal="body_entered" from="Area" to="Area" method="_on_Area_body_entered"] diff --git a/godot/assets/models/heart/Heart_2.tscn b/godot/assets/models/heart/Heart_2.tscn index bec415d..aeb666e 100644 --- a/godot/assets/models/heart/Heart_2.tscn +++ b/godot/assets/models/heart/Heart_2.tscn @@ -30,8 +30,8 @@ start_node = "HeartBeat" [node name="Heart_2" instance=ExtResource( 1 )] [node name="Heart" parent="." index="0"] -blend_shapes/bulge1 = 0.56232 -blend_shapes/bulge2 = 0.43768 +blend_shapes/bulge1 = 0.251092 +blend_shapes/bulge2 = 0.748908 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="AnimationPlayer" index="0"] stream = ExtResource( 2 ) diff --git a/godot/dialogic/folder_structure.json b/godot/dialogic/folder_structure.json index 6a58ddd..d599d52 100644 --- a/godot/dialogic/folder_structure.json +++ b/godot/dialogic/folder_structure.json @@ -80,7 +80,8 @@ "timeline-1672623960.json", "timeline-1672719153.json", "timeline-1672725696.json", - "timeline-1672727997.json" + "timeline-1672727997.json", + "timeline-1672812380.json" ], "folders": { diff --git a/godot/dialogic/timelines/timeline-1672812380.json b/godot/dialogic/timelines/timeline-1672812380.json new file mode 100644 index 0000000..3174cd5 --- /dev/null +++ b/godot/dialogic/timelines/timeline-1672812380.json @@ -0,0 +1,19 @@ +{ + "events": [ + { + "event_id": "dialogic_024", + "set_theme": "theme-1671745159.cfg" + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "[data corrupted]" + } + ], + "metadata": { + "dialogic-version": "1.4.5", + "file": "timeline-1672812380.json", + "name": "blackbox_6" + } +} diff --git a/godot/effects/grainy_shader.gd b/godot/effects/grainy_shader.gd index 5b0a28e..6ca057b 100644 --- a/godot/effects/grainy_shader.gd +++ b/godot/effects/grainy_shader.gd @@ -1,5 +1,13 @@ extends Spatial +func _ready(): + Util.shader = self + +func mega_madness(): + $CanvasLayer/ColorRect.visible = false + $CanvasLayer/ColorRect2.visible = true + $AudioStreamPlayer.play() + func madness(): $CanvasLayer/ColorRect.visible = false $CanvasLayer/ColorRect2.visible = true diff --git a/godot/effects/grainy_shader.tscn b/godot/effects/grainy_shader.tscn index da5c975..efc7865 100644 --- a/godot/effects/grainy_shader.tscn +++ b/godot/effects/grainy_shader.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://effects/dithering/screen_space_shader.tres" type="Shader" id=1] [ext_resource path="res://effects/grainy_shader.tres" type="Material" id=2] [ext_resource path="res://effects/grainy_shader.gd" type="Script" id=3] [ext_resource path="res://assets/audio/sicky_drone_2.ogg" type="AudioStream" id=4] +[ext_resource path="res://assets/audio/sicky_drone.ogg" type="AudioStream" id=5] [sub_resource type="ShaderMaterial" id=3] shader = ExtResource( 1 ) @@ -38,3 +39,6 @@ anchor_bottom = 1.0 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="CanvasLayer/ColorRect2"] stream = ExtResource( 4 ) volume_db = 15.0 + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) diff --git a/godot/tests/bore_hole/DeathArea.gd b/godot/tests/bore_hole/DeathArea.gd new file mode 100644 index 0000000..5557176 --- /dev/null +++ b/godot/tests/bore_hole/DeathArea.gd @@ -0,0 +1,6 @@ +extends Area + + +func _on_Area_body_entered(body): + if body.get_parent() == Util.player: + var _err = get_tree().change_scene("res://screens/gameover_screen.tscn") diff --git a/godot/util.gd b/godot/util.gd index 8debf0c..af4f02e 100644 --- a/godot/util.gd +++ b/godot/util.gd @@ -4,10 +4,10 @@ extends Node onready var player = null onready var meat_sink_parameters = null signal meat_sink_parameters +var shader = null func never_called(): emit_signal("meat_sink_parameters") - func vec3_componentwise_clamp(vec: Vector3, lower: float, upper: float) -> Vector3: return Vector3( clamp(vec.x, lower, upper),