Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux

godot/.import/slurp.wav-f54a8f51ebb246021aa2e2ae1a304e33.md5

@@ -0,0 +1,3 @@
+source_md5="6d48718700735ab9207615e187729d97"
+dest_md5="8e3dd4d6f1b77a395392bdf3d5da2a0f"
+

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

godot/assets/audio/slurp.wav.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/slurp.wav-f54a8f51ebb246021aa2e2ae1a304e33.sample"
+
+[deps]
+
+source_file="res://assets/audio/slurp.wav"
+dest_files=[ "res://.import/slurp.wav-f54a8f51ebb246021aa2e2ae1a304e33.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/npcs/inherited/clark.tscn

@@ -1,9 +1,17 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://assets/meat_bore/npcs/male.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/npcs/clark.png" type="Texture" id=2]
 [ext_resource path="res://assets/meat_bore/npcs/inherited/clark.gd" type="Script" id=3]
 
+[sub_resource type="AnimationNodeStateMachine" id=1]
+
+[sub_resource type="AnimationNodeStateMachinePlayback" id=2]
+
 [node name="clark" instance=ExtResource( 1 )]
 script = ExtResource( 3 )
 body_texture = ExtResource( 2 )
+
+[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
+tree_root = SubResource( 1 )
+parameters/playback = SubResource( 2 )

godot/assets/models/meat_elevator_tracker.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://assets/models/meat_elevator_tracker.glb" type="PackedScene" id=1]
 [ext_resource path="res://effects/ElevatorTracker.gd" type="Script" id=2]
+[ext_resource path="res://assets/audio/slurp.wav" type="AudioStream" id=3]
 
 [sub_resource type="Animation" id=1]
 resource_name = "tracker_journey"
@@ -31,3 +32,7 @@ anims/tracker_journey = SubResource( 1 )
 [node name="CollisionShape" type="CollisionShape" parent="MeatElevatorTracker/ElevatorGrip" index="0"]
 transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 )
 shape = SubResource( 2 )
+
+[node name="Slurp" type="AudioStreamPlayer" parent="." index="2"]
+stream = ExtResource( 3 )
+volume_db = 15.0

godot/effects/ElevatorTracker.gd

@@ -19,6 +19,7 @@ func toggle():
 	at_top = not at_top
 
 func descend():
+	$"../Slurp".play()
 	yield(get_tree().create_timer(0.1), "timeout")
 	$AnimationPlayer.play(track_animation_name)
 	get_node(vertex_animation_path).play(vertex_animation_name)

godot/effects/player/Flashlight.gd

@@ -25,4 +25,4 @@ func toggle():
 
 func _process(delta):
 	if visible:
-		Dialogic.set_variable("flashlight_seconds", Dialogic.get_variable("flashlight_seconds")+delta)
+		Dialogic.set_variable("flashlight_seconds", float(Dialogic.get_variable("flashlight_seconds"))+delta)