godot/.import/crows.wav-6906b12da3fb6458972258513c6c5832.md5

@@ -1,3 +0,0 @@
-source_md5="e612a9a2d137976670bd39e3a6178b5b"
-dest_md5="623bbafdfd693b3b2117bbdfbddd3730"
-

godot/.import/heaven_plane.glb-e5f1321e15ede3782c8d8ec7a9cd014d.md5

@@ -1,3 +0,0 @@
-source_md5="a21eef194eb4f5f0f40d50e48f480ec6"
-dest_md5="fd32293bef1d68d5d61cb5a3fefcf47d"
-

godot/.import/whispers.wav-e3cf0cc7b9a445030518a39562f395c5.md5

@@ -1,3 +0,0 @@
-source_md5="ac591b3159f12d613f3eea5606d60973"
-dest_md5="91b0f31fb83105f2d1c664c222e15953"
-

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.2, 0.23, 0.31, 1 )
+bg_color = Color( 0.03, 0.21, 0.26, 1 )
 border_width_left = 1
 border_width_top = 1
 border_width_right = 1

godot/assets/audio/crows.wav.import

@@ -1,23 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamSample"
-path="res://.import/crows.wav-6906b12da3fb6458972258513c6c5832.sample"
-
-[deps]
-
-source_file="res://assets/audio/crows.wav"
-dest_files=[ "res://.import/crows.wav-6906b12da3fb6458972258513c6c5832.sample" ]
-
-[params]
-
-force/8_bit=false
-force/mono=false
-force/max_rate=false
-force/max_rate_hz=44100
-edit/trim=false
-edit/normalize=false
-edit/loop_mode=2
-edit/loop_begin=0
-edit/loop_end=-1
-compress/mode=0

godot/assets/audio/whispers.wav.import

@@ -1,23 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamSample"
-path="res://.import/whispers.wav-e3cf0cc7b9a445030518a39562f395c5.sample"
-
-[deps]
-
-source_file="res://assets/audio/whispers.wav"
-dest_files=[ "res://.import/whispers.wav-e3cf0cc7b9a445030518a39562f395c5.sample" ]
-
-[params]
-
-force/8_bit=false
-force/mono=false
-force/max_rate=false
-force/max_rate_hz=44100
-edit/trim=false
-edit/normalize=false
-edit/loop_mode=3
-edit/loop_begin=0
-edit/loop_end=-1
-compress/mode=0

godot/assets/meat_bore/ObeliskRingSound.gd

@@ -22,6 +22,6 @@ func _on_Area_body_entered(body):
 	$AudioStreamPlayer.stop()
 
 func _on_Area_body_exited(body):
-	if body.get_parent() != Util.player or Util.player.camera_position().y < -100:
+	if body.get_parent() != Util.player:
 		return
 	$AudioStreamPlayer.play()

godot/assets/meat_bore/level.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=2]
+[gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://assets/meat_bore/meat_tunnel_top.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/meat_module/level_wally.tscn" type="PackedScene" id=2]
@@ -14,7 +14,6 @@
 [ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=12]
 [ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=13]
 [ext_resource path="res://assets/meat_bore/obelisk_ring.tscn" type="PackedScene" id=14]
-[ext_resource path="res://assets/meat_bore/npcs/inherited/guy.tscn" type="PackedScene" id=15]
 
 [sub_resource type="Environment" id=3]
 background_mode = 2
@@ -135,6 +134,3 @@ transform = Transform( -95.0824, 0, 30.9731, 0, 100, 0, -30.9731, 0, -95.0824, 0
 
 [node name="obelisk_ring" parent="." instance=ExtResource( 14 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.746, 0 )
-
-[node name="guy" parent="." instance=ExtResource( 15 )]
-transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, -0.524274, 0.652003, 82.3411 )

godot/assets/meat_bore/meat_heaven.gd

@@ -1,5 +0,0 @@
-extends Spatial
-
-func _ready():
-	var dialog = Dialogic.start("controls")
-	add_child(dialog)

godot/assets/meat_bore/meat_module/AmbientAudioRegion.gd

@@ -1,15 +0,0 @@
-extends Area
-
-func _on_AmbientAudioRegion_body_entered(body):
-	if body.get_parent() != Util.player:
-		return
-	$AmbientAudio.play()
-	$AnimationPlayer.play("fade")
-		
-
-func _on_AmbientAudioRegion_body_exited(body):
-	if body.get_parent() != Util.player:
-		return
-	$AnimationPlayer.play_backwards("fade")
-	yield($AnimationPlayer, "animation_finished")
-	$AmbientAudio.stop()

godot/assets/meat_bore/meat_module/level_lee.tscn

@@ -45,10 +45,16 @@ transform = Transform( -0.0820203, -1.37205, 0.747237, 1.03682, 0.378031, 1.1123
 transform = Transform( 0.095217, -5.53714, 0, 3.81474, 0.875616, 0, 0, 0, 5.43642, 21.2893, -59.4721, 0 )
 
 [node name="lee" parent="." instance=ExtResource( 7 )]
-transform = Transform( 0.899565, 0, -0.436786, 0, 1, 0, 0.436786, 0, 0.899565, 28.0628, -62.1293, -3.01394 )
+transform = Transform( 0.899565, 0, -0.436786, 0, 1, 0, 0.436786, 0, 0.899565, 28.0628, -61.9719, -3.01394 )
+
+[node name="dialogue_platform" parent="lee" instance=ExtResource( 9 )]
+transform = Transform( 0.932718, 0.233958, -0.274408, -0.358633, 0.522342, -0.773655, -0.0376677, 0.820013, 0.571103, -0.58202, 0, 0.0505943 )
 
 [node name="dialogue_platform2" parent="lee" instance=ExtResource( 9 )]
-transform = Transform( 1.01026, 0, -1.49012e-07, 0, 2.03947, 0, 0, 0, 1.03886, -0.573584, -0.402378, 0.0679827 )
+transform = Transform( 0.993062, -0.0918569, -0.0734214, 0.164162, 2.03195, -0.321783, 0.0866099, 0.148994, 0.985038, -0.582026, -0.267639, 0.0505934 )
+
+[node name="dialogue_platform3" parent="lee" instance=ExtResource( 9 )]
+transform = Transform( 2.31384, -0.249626, -0.395868, 0.079543, 0.984562, -0.155916, -0.0525585, 0.317759, 1.97973, 1.10797, -1.2313, 3.53116 )
 
 [node name="OmniLight" type="OmniLight" parent="lee"]
 transform = Transform( 1, 0, -4.17233e-07, 0, 1, 0, 4.17233e-07, 0, 1, -0.247002, 0.73962, 0.499458 )

godot/assets/meat_bore/meat_module/meat_module.gd

@@ -1,9 +1,7 @@
 extends Spatial
 
 export var texture: StreamTexture
-export var audio: AudioStream
 
 func _ready():
 	var mat = $MeatModule.get_active_material(0)
 	mat.albedo_texture = texture
-	$AmbientAudioRegion/AmbientAudio.stream = audio

godot/assets/meat_bore/npcs/inherited/guy.tscn

@@ -1,9 +1,8 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://assets/meat_bore/npcs/male.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/npcs/guy.png" type="Texture" id=2]
 [ext_resource path="res://assets/meat_bore/npcs/inherited/guy.gd" type="Script" id=3]
-[ext_resource path="res://assets/models/heart/Heart_2.tscn" type="PackedScene" id=4]
 
 [sub_resource type="AnimationNodeAnimation" id=1]
 animation = "guy_idle"
@@ -26,6 +25,3 @@ tree_root = SubResource( 2 )
 anim_player = NodePath("../AnimationPlayer")
 active = true
 parameters/playback = SubResource( 3 )
-
-[node name="Heart_2" parent="." index="4" instance=ExtResource( 4 )]
-transform = Transform( 1, 0, 0, 0, 0.988268, 0.152727, 0, -0.152727, 0.988268, 0, 0.588648, -0.0990121 )

godot/assets/meat_bore/npcs/npc.gd

@@ -65,8 +65,6 @@ func close_dialog():
 		call_deferred("remove_child", dialog.get_ref())
 
 func player_entered():
-	if has_node("npc_common/SignalGenerator"):
-		$npc_common.remove_child($npc_common/SignalGenerator)
 	create_dialog(initial_dialogic_timeline)
 	
 func player_exited():

godot/assets/meat_bore/npcs/npc_common.tscn

@@ -1,7 +1,4 @@
-[gd_scene load_steps=5 format=2]
-
-[ext_resource path="res://assets/models/walkie_talkie/signal_generator.tscn" type="PackedScene" id=1]
-[ext_resource path="res://assets/audio/whispers.wav" type="AudioStream" id=2]
+[gd_scene load_steps=3 format=2]
 
 [sub_resource type="SphereShape" id=1]
 
@@ -20,6 +17,3 @@ shape = SubResource( 1 )
 [node name="CollisionShape" type="CollisionShape" parent="StaticBody"]
 transform = Transform( 1, 0, 0, 0, 9.98379, 0, 0, 0, 1, 0, 0, 0 )
 shape = SubResource( 2 )
-
-[node name="SignalGenerator" parent="." instance=ExtResource( 1 )]
-stream = ExtResource( 2 )

godot/assets/meat_bore/obelisk_ring.tscn

@@ -36,12 +36,11 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.13092, -0.209801, 0.025795
 script = ExtResource( 4 )
 
 [node name="CollisionShape" type="CollisionShape" parent="Area" index="0"]
-transform = Transform( 138.113, 0, 0, 0, 90000, 0, 0, 0, 138.113, -0.217957, -0.071228, -0.212582 )
+transform = Transform( 138.113, 0, 0, 0, 138.113, 0, 0, 0, 138.113, -0.217957, -0.071228, -0.212582 )
 shape = SubResource( 3 )
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Area" index="1"]
 stream = ExtResource( 3 )
-volume_db = -20.0
 
 [connection signal="body_entered" from="Area" to="Area" method="_on_Area_body_entered"]
 [connection signal="body_exited" from="Area" to="Area" method="_on_Area_body_exited"]

godot/dialogic/timelines/timeline-1667764079.json

@@ -8,7 +8,7 @@
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "[speed=0]Use WASD/Mouse or Joysticks to move and look around\n\nPress and hold Space or R1 to jump and glide and hold Shift or L1 to run\n\nPress F or Y to toggle your flashlight and C or X to toggle your walkie talkie\n\nUse the Arrow Keys or D-pad to select between dialog options and press Enter or A to select\n\nPress Escape to access the pause menu"
+			"text": "[speed=0]Use WASD/Mouse or Joysticks to move and look around\n\nPress and hold Space or R1 to jump and glide and hold Shift or L1 to run\n\nPress F or Y to toggle your flashlight and C or X to toggle your walkie talkie\n\nUse the Arrow Keys or D-pad to select between dialog options and press Enter or A to select"
 		}
 	],
 	"metadata": {

godot/effects/MeatSinkParameters.gd

@@ -7,7 +7,3 @@ func _ready():
 	Util.meat_sink_parameters = self
 	Util.emit_signal("meat_sink_parameters")
 
-
-
-func _on_MeatSinkParameters_tree_exited():
-	Util.meat_sink_parameters = null

godot/effects/MeatSinkParameters.tscn

@@ -4,5 +4,3 @@
 
 [node name="MeatSinkParameters" type="Spatial"]
 script = ExtResource( 1 )
-
-[connection signal="tree_exited" from="." to="." method="_on_MeatSinkParameters_tree_exited"]

godot/player/player.gd

@@ -8,9 +8,6 @@ export var can_float: bool = false
 func _ready():
 	Util.player = self
 
-func _on_Player_tree_exiting():
-	Util.player = null
-
 func is_on_foot():
 	return active_physics_node == $OnFootPhysics
 
@@ -45,5 +42,3 @@ func _process(_delta):
 
 
 
-
-

godot/player/player.tscn

@@ -55,7 +55,7 @@ tracks/0/keys = {
 "values": [ 70.0, 70.0, 130.0 ]
 }
 
-[sub_resource type="CapsuleShape" id=15]
+[sub_resource type="CylinderShape" id=4]
 
 [sub_resource type="Animation" id=14]
 resource_name = "float_anim"
@@ -223,8 +223,8 @@ script = ExtResource( 2 )
 float_factor = 3.0
 
 [node name="CollisionShape" type="CollisionShape" parent="OnFootPhysics"]
-transform = Transform( 0.4, 0, 0, 0, -1.92767e-08, -0.334, 0, 0.441, -1.45996e-08, 0, 0, 0 )
-shape = SubResource( 15 )
+transform = Transform( 0.4, 0, 0, 0, 0.440932, 0, 0, 0, 0.4, 0, 0, 0 )
+shape = SubResource( 4 )
 
 [node name="Floor" type="RayCast" parent="OnFootPhysics"]
 script = ExtResource( 10 )
@@ -309,7 +309,6 @@ color = Color( 1, 1, 1, 0 )
 [node name="ObjectiveTracker" type="Node" parent="."]
 script = ExtResource( 21 )
 
-[connection signal="tree_exiting" from="." to="." method="_on_Player_tree_exiting"]
 [connection signal="area_entered" from="ElevatorPhysics/Area" to="ElevatorPhysics" method="_on_Area_area_entered"]
 [connection signal="area_exited" from="ElevatorPhysics/Area" to="ElevatorPhysics" method="_on_Area_area_exited"]
 [connection signal="timeout" from="MovementInput/VerticalTimer" to="MovementInput" method="_on_VerticalTimer_timeout"]

godot/screens/EndMenu.gd

@@ -19,4 +19,4 @@ func _on_QuitButton_pressed():
 	get_tree().quit()
 
 func _on_MenuButton_pressed():
-	var _err = get_tree().change_scene("res://screens/TitleScreen_Planet.tscn")
+	get_tree().change_scene("res://screens/TitleScreen_Planet.tscn")

godot/screens/TitleMenu.gd

@@ -16,7 +16,8 @@ func _on_Credits_pressed():
 	add_child(dialog)
 
 func _on_Controls_pressed():
-	get_tree().change_scene("res://assets/meat_bore/meat_heaven.tscn")
+	var dialog = Dialogic.start("controls")
+	add_child(dialog)
 
 func _on_QuitButton_pressed():
 	get_tree().quit()

godot/tests/ground_squish/meat_plane_material.tres

@@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=5 format=2]
 
-[ext_resource path="res://effects/sink_block_tiled_texture.png" type="Texture" id=1]
+[ext_resource path="res://tests/ground_squish/stringy_meat.jpg" type="Texture" id=1]
 
 [sub_resource type="Shader" id=4]
 code = "// NOTE: Shader automatically converted from Godot Engine 3.5.1.stable.mono's SpatialMaterial.
@@ -44,7 +44,7 @@ void fragment() {
 "
 
 [sub_resource type="Curve" id=5]
-_data = [ Vector2( 0, 0 ), 0.0, -0.454261, 0, 0, Vector2( 0.292308, 0.525 ), 2.53247, 2.53247, 0, 0, Vector2( 0.645517, 0.186364 ), -0.454844, 0.0, 0, 0, Vector2( 0.838621, 0.822727 ), 0.0, 0.0, 0, 0, Vector2( 0.925517, 0.122727 ), 0.0, 0.0, 0, 0, Vector2( 1, 0.859091 ), 0.0, 0.0, 0, 0 ]
+_data = [ Vector2( 0, 0 ), 0.0, -0.454261, 0, 0, Vector2( 0.292308, 0.525 ), 2.53247, 2.53247, 0, 0, Vector2( 1, 1 ), -0.454844, 0.0, 0, 0 ]
 
 [sub_resource type="CurveTexture" id=6]
 curve = SubResource( 5 )
@@ -57,12 +57,12 @@ shader_param/specular = 0.5
 shader_param/metallic = 0.0
 shader_param/roughness = 1.0
 shader_param/point_size = 1.0
-shader_param/uv1_scale = Vector3( 10, 10, 1 )
+shader_param/uv1_scale = Vector3( 1, 1, 1 )
 shader_param/uv1_offset = Vector3( 0, 0, 0 )
 shader_param/uv2_scale = Vector3( 1, 1, 1 )
 shader_param/uv2_offset = Vector3( 0, 0, 0 )
 shader_param/player_pos = null
-shader_param/sink_factor = 3.6
-shader_param/end_distance = 5.4
+shader_param/sink_factor = 1.8
+shader_param/end_distance = 5.2
 shader_param/texture_albedo = ExtResource( 1 )
 shader_param/curve = SubResource( 6 )