godot/.import/meat_tentacle.glb-3cffec7d9765aa6fe6a9196c031435c6.md5

@@ -1,3 +0,0 @@
-source_md5="56e6d7f3cda678040104c8b638cb94fc"
-dest_md5="7ee89808bc86f5358467fc11364fb549"
-

godot/.import/meat_tentacle.glb-f1bb9072d822c7a9aa209d5f58ccbb4f.md5

@@ -1,3 +0,0 @@
-source_md5="56e6d7f3cda678040104c8b638cb94fc"
-dest_md5="7ee89808bc86f5358467fc11364fb549"
-

godot/assets/meat_creek/side_tunnel_1.tscn

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-[gd_scene load_steps=22 format=2]
-=======
 [gd_scene load_steps=23 format=2]
->>>>>>> 728f37803be883280645c24c9f0a6e2637a27012
 
 [ext_resource path="res://assets/meat_creek/side_tunnel_1.glb" type="PackedScene" id=1]
 [ext_resource path="res://player/player.tscn" type="PackedScene" id=2]
@@ -22,12 +18,8 @@
 [ext_resource path="res://assets/audio/walkie_talkie/buzz_static.ogg" type="AudioStream" id=16]
 [ext_resource path="res://assets/audio/walkie_talkie/low_whale_one.ogg" type="AudioStream" id=17]
 [ext_resource path="res://assets/meat_creek/WhaleSounds.gd" type="Script" id=18]
-<<<<<<< HEAD
-[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=19]
-=======
 [ext_resource path="res://assets/models/black_box/black_box.tscn" type="PackedScene" id=19]
 [ext_resource path="res://assets/models/obelisk/obelisk.tscn" type="PackedScene" id=20]
->>>>>>> 728f37803be883280645c24c9f0a6e2637a27012
 
 [sub_resource type="PanoramaSky" id=2]
 panorama = ExtResource( 4 )
@@ -64,9 +56,6 @@ glow_bloom = 1.0
 
 [node name="StaticBody" parent="Canvas001" index="0" instance=ExtResource( 8 )]
 
-[node name="AnimationPlayer" parent="." index="1"]
-autoplay = "Canvas001"
-
 [node name="Player" parent="." index="2" instance=ExtResource( 2 )]
 transform = Transform( 0.0716538, 0, 0.99743, 0, 1, 0, -0.99743, 0, 0.0716538, -70.375, 15.7962, -106.953 )
 
@@ -138,34 +127,23 @@ transform = Transform( 0.65383, 0, 0.756641, 0, 1, 0, -0.756641, 0, 0.65383, 21.
 [node name="creek_platform20" parent="platforms" index="19" instance=ExtResource( 6 )]
 transform = Transform( 0.65383, 0, 0.756641, 0, 1, 0, -0.756641, 0, 0.65383, 18.0342, 0.216419, 2.72338 )
 
-[node name="decorations" type="Spatial" parent="." index="6"]
+[node name="shader" parent="." index="6" instance=ExtResource( 7 )]
 
-[node name="meat_tentacle" parent="decorations" index="0" instance=ExtResource( 19 )]
+[node name="creek_cage" parent="." index="7" instance=ExtResource( 9 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -62.359, 0.919437, -94.0659 )
 
-[node name="meat_tentacle2" parent="decorations" index="1" instance=ExtResource( 19 )]
+[node name="elevator" parent="." index="8" instance=ExtResource( 10 )]
-transform = Transform( 0.709009, -0.431706, -0.557617, 0.357585, 0.711878, -0.0964662, 0.700344, -0.209177, 1.05243, -63.2874, 0.919437, -93.3404 )
-
-[node name="meat_tentacle3" parent="decorations" index="2" instance=ExtResource( 19 )]
-transform = Transform( -0.0265356, -0.362184, -1.17042, 0, 1.26435, -0.335417, 1.29597, -0.00741591, -0.023965, -62.359, 0.919437, -93.1787 )
-
-[node name="shader" parent="." index="7" instance=ExtResource( 7 )]
-
-[node name="creek_cage" parent="." index="8" instance=ExtResource( 9 )]
-
-[node name="elevator" parent="." index="9" instance=ExtResource( 10 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0735546, -123.027, -41.1766 )
 
-[node name="SignalGenerator" parent="." index="10" instance=ExtResource( 12 )]
+[node name="SignalGenerator" parent="." index="9" instance=ExtResource( 12 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.489914, -122.635, -41.5684 )
 stream = ExtResource( 16 )
 max_db = 6.0
 max_distance = 200.0
 
-[node name="upper_shelf" parent="." index="11" instance=ExtResource( 13 )]
+[node name="upper_shelf" parent="." index="10" instance=ExtResource( 13 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.09789, 0 )
 
-[node name="AmbientSounds" type="Node" parent="." index="12"]
+[node name="AmbientSounds" type="Node" parent="." index="11"]
 
 [node name="WaterSound" type="AudioStreamPlayer" parent="AmbientSounds" index="0"]
 stream = ExtResource( 14 )

godot/assets/models/AnimationPlayer.gd

@@ -1,4 +0,0 @@
-extends AnimationPlayer
-
-func _ready() -> void:
-	self.play("ArmatureAction-loop")

godot/assets/models/meat_tentacle.tscn

@@ -1,73 +0,0 @@
-[gd_scene load_steps=7 format=2]
-
-[ext_resource path="res://assets/models/meat_tentacle.glb" type="PackedScene" id=1]
-[ext_resource path="res://assets/models/MeatElevatorEntrance.material" type="Material" id=2]
-[ext_resource path="res://assets/models/AnimationPlayer.gd" type="Script" id=3]
-
-[sub_resource type="Animation" id=3]
-resource_name = "ArmatureAction-loop"
-length = 3.0
-loop = true
-tracks/0/type = "transform"
-tracks/0/path = NodePath("Armature/Skeleton:Bone.003")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/keys = PoolRealArray( 0, 1, 0, 0, 0, 1.49012e-08, -7.45058e-09, 1.49012e-08, 1, 1, 1, 1, 0.0666667, 1, -1.49012e-08, 0, -1.19209e-07, -9.81436e-05, 0.00528583, 0.00109728, 0.999986, 1, 1, 1, 0.133333, 1, 0, -2.98023e-08, -1.19209e-07, -0.000298338, 0.0190093, 0.00408249, 0.999811, 1, 1, 1, 0.2, 1, 0, 0, -1.19209e-07, -0.000560187, 0.0410554, 0.00902754, 0.999116, 1, 1, 1, 0.333333, 1, -1.49012e-08, -8.9407e-08, -2.38419e-07, -0.00130108, 0.106409, 0.0237738, 0.994037, 1, 1, 1, 0.533333, 1, 0, 0, -1.19209e-07, -0.00391482, 0.245193, 0.0524962, 0.968044, 1, 1, 1, 0.733333, 1, 0, 0, -1.19209e-07, -0.0107686, 0.402299, 0.0753061, 0.912342, 1, 1, 1, 0.866667, 1, 1.49012e-08, 2.98023e-08, 0, -0.0194033, 0.498568, 0.0782339, 0.863095, 1, 1, 1, 0.933333, 1, 1.49012e-08, 0, -1.19209e-07, -0.0254841, 0.540771, 0.0737985, 0.837539, 1, 1, 1, 1, 1, 8.9407e-08, 5.96046e-08, -5.96046e-08, -0.0329392, 0.578466, 0.0647944, 0.812461, 1, 1, 1, 1.06667, 1, -5.96046e-08, 2.98023e-08, 0, -0.0424528, 0.610784, 0.0492959, 0.78912, 1, 1, 1, 1.13333, 1, 2.98023e-08, 2.98023e-08, 0, -0.0543802, 0.638331, 0.026573, 0.767379, 1, 1, 1, 1.2, 1, 5.96046e-08, 5.96046e-08, 0, -0.0702923, 0.661238, -0.00725605, 0.746841, 1, 1, 1, 1.26667, 1, -1.3411e-07, -1.49012e-07, -2.98023e-07, -0.0938105, 0.68069, -0.0603645, 0.724028, 1, 1, 1, 1.33333, 1, 5.96046e-08, 5.96046e-08, 0, -0.118392, 0.689965, -0.114303, 0.704887, 1, 1, 1, 1.4, 1, -5.96046e-08, -1.49012e-07, -2.98023e-07, -0.138172, 0.685095, -0.151973, 0.698898, 1, 1, 1, 1.46667, 1, -7.45058e-08, -5.96046e-08, -2.38419e-07, -0.155162, 0.670454, -0.177997, 0.703373, 1, 1, 1, 1.53333, 1, -2.98023e-08, -5.96046e-08, -2.38419e-07, -0.170153, 0.646526, -0.193024, 0.718188, 1, 1, 1, 1.6, 1, -1.49012e-08, 2.98023e-08, 0, -0.183981, 0.613799, -0.198244, 0.741688, 1, 1, 1, 1.66667, 1, -5.96046e-08, -8.9407e-08, -2.38419e-07, -0.197156, 0.572872, -0.194973, 0.771319, 1, 1, 1, 1.73333, 1, 1.49012e-08, 0, -1.19209e-07, -0.194495, 0.529585, -0.189913, 0.80352, 1, 1, 1, 1.8, 1, -5.96046e-08, -8.9407e-08, -2.38419e-07, -0.170829, 0.487046, -0.187371, 0.835761, 1, 1, 1, 1.86667, 1, 1.49012e-08, 2.98023e-08, 0, -0.146854, 0.435961, -0.177506, 0.869979, 1, 1, 1, 1.93333, 1, 1.49012e-08, -2.98023e-08, -1.19209e-07, -0.123589, 0.377734, -0.160942, 0.903405, 1, 1, 1, 2, 1, -1.49012e-08, 0, -1.19209e-07, -0.101992, 0.314683, -0.13901, 0.933407, 1, 1, 1, 2.2, 1, -1.04308e-07, -8.9407e-08, -2.38419e-07, -0.0497251, 0.130466, -0.0601972, 0.988374, 1, 1, 1, 2.26667, 1, -2.98023e-08, 5.96046e-08, 0, -0.0279883, 0.0827915, -0.0399243, 0.995373, 1, 1, 1, 2.33333, 1, 2.98023e-08, -5.96046e-08, -2.38419e-07, -0.0135948, 0.0436046, -0.0217319, 0.99872, 1, 1, 1, 2.4, 1, 2.98023e-08, 2.98023e-08, -1.19209e-07, -0.00579967, 0.0168051, -0.00834528, 0.999807, 1, 1, 1, 2.46667, 1, 1.49012e-08, -2.98023e-08, -2.38419e-07, 0.00014308, 0.00239369, -0.00146202, 0.999996, 1, 1, 1, 2.62463, 1, -1.49012e-08, 0, -1.19209e-07, -9.81436e-05, 0.00528583, 0.00109728, 0.999986, 1, 1, 1, 2.76525, 1, 0, -2.98023e-08, -1.19209e-07, -0.000298338, 0.0190093, 0.00408249, 0.999811, 1, 1, 1, 2.857, 1, 0, 0, 0, 1.49012e-08, -7.45058e-09, 1.49012e-08, 1, 1, 1, 1 )
-tracks/1/type = "transform"
-tracks/1/path = NodePath("Armature/Skeleton:Bone.001")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/keys = PoolRealArray( 0, 1, 0, 0, 0, -3.64292e-17, -9.31323e-10, -1.69966e-08, 1, 1, 1, 1, 2.80585, 1, 0, 0, 0, -3.64292e-17, -9.31323e-10, -1.69966e-08, 1, 1, 1, 1 )
-tracks/2/type = "transform"
-tracks/2/path = NodePath("Armature/Skeleton:Bone.002")
-tracks/2/interp = 1
-tracks/2/loop_wrap = true
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/keys = PoolRealArray( 0, 1, 0, 0, 0, -5.37764e-17, -3.72529e-09, 9.31323e-10, 1, 1, 1, 1, 0.0666667, 1, 1.49012e-08, 0, -7.45058e-09, 0.034518, 0.0288649, -0.0456917, 0.997942, 1, 1, 1, 0.133333, 1, 0, 1.19209e-07, -1.49012e-08, -0.0119611, -0.00337004, 0.014985, 0.999811, 1, 1, 1, 0.2, 1, 1.49012e-08, 0, -1.49012e-08, 0.0111817, 0.0281823, -0.0172091, 0.999392, 1, 1, 1, 0.266667, 1, 1.49012e-08, 0, 0, -0.00274599, 0.0230294, 0.00039682, 0.999731, 1, 1, 1, 0.333333, 1, 2.98023e-08, 0, 0, -0.00407479, 0.0339603, 0.000616117, 0.999415, 1, 1, 1, 0.4, 1, 1.49012e-08, 0, -7.45058e-09, -0.000481518, 0.0549093, -0.00643461, 0.998471, 1, 1, 1, 0.466667, 1, 1.49012e-08, 0, 0, -0.00626964, 0.0590904, 7.37238e-05, 0.998233, 1, 1, 1, 0.533333, 1, 1.49012e-08, 0, -7.45058e-09, -0.00398962, 0.0811058, -0.00551539, 0.996682, 1, 1, 1, 0.6, 1, 2.98023e-08, 0, -7.45058e-09, -0.00593255, 0.0930324, -0.00467614, 0.995634, 1, 1, 1, 0.666667, 1, 1.49012e-08, 0, 7.45058e-09, -0.00743926, 0.106189, -0.00452492, 0.994308, 1, 1, 1, 0.733333, 1, 1.49012e-08, 0, 1.49012e-08, -0.00753836, 0.124375, -0.00672948, 0.992184, 1, 1, 1, 0.8, 1, 1.49012e-08, 0, 0, -0.00919476, 0.136773, -0.00629925, 0.99054, 1, 1, 1, 1.4, 1, 1.49012e-08, 0, -7.45058e-09, -0.0145295, 0.268314, -0.0111941, 0.963157, 1, 1, 1, 1.46667, 1, 1.49012e-08, 0, -7.45058e-09, -0.0126718, 0.282429, -0.00991482, 0.959153, 1, 1, 1, 1.6, 1, 1.49012e-08, 0, 7.45058e-09, -0.00666716, 0.31059, -0.00572489, 0.950503, 1, 1, 1, 1.73333, 1, 0, 0, -7.45058e-09, 0.00159422, 0.33803, 7.51321e-05, 0.941134, 1, 1, 1, 1.93333, 1, 0, 0, -7.45058e-09, 0.016267, 0.375913, 0.0104105, 0.926454, 1, 1, 1, 2.26667, 1, 2.98023e-08, 0, -7.45058e-09, 0.0385629, 0.421693, 0.0261524, 0.905541, 1, 1, 1, 2.33333, 1, 2.98023e-08, 0, -7.45058e-09, 0.0415287, 0.427061, 0.0282486, 0.902827, 1, 1, 1, 2.4, 1, 0, 1.19209e-07, -1.49012e-08, 0.0435767, 0.430654, 0.0296966, 0.900975, 1, 1, 1, 2.46667, 1, 1.49012e-08, 0, -7.45058e-09, 0.0447002, 0.432582, 0.030491, 0.899969, 1, 1, 1, 2.62463, 1, 1.49012e-08, 0, -7.45058e-09, 0.034518, 0.0288649, -0.0456917, 0.997942, 1, 1, 1, 2.7068, 1, 0, 1.19209e-07, -1.49012e-08, -0.0119611, -0.00337004, 0.014985, 0.999811, 1, 1, 1, 2.76201, 1, 0, 0, 0, -5.37764e-17, -3.72529e-09, 9.31323e-10, 1, 1, 1, 1 )
-tracks/3/type = "transform"
-tracks/3/path = NodePath("Armature/Skeleton:Bone")
-tracks/3/interp = 1
-tracks/3/loop_wrap = true
-tracks/3/imported = false
-tracks/3/enabled = true
-tracks/3/keys = PoolRealArray( 0, 1, 0, 0, 0, 3.72529e-09, 8.69477e-10, 6.05223e-09, 1, 1, 1, 1, 0.0666667, 1, 0, 0, 0, -8.0897e-06, -0.004964, 0.000386736, 0.999988, 1.00009, 1.0036, 1.00005, 0.133333, 1, 0, 0, 0, -3.1428e-05, -0.0181388, 0.00139624, 0.999835, 1.00031, 1.01292, 1.00018, 0.2, 1, 0, 0, 0, -7.55956e-05, -0.0398094, 0.00302564, 0.999203, 1.00067, 1.02774, 1.00038, 0.266667, 1, 0, 0, 0, -0.000147619, -0.0695552, 0.00521784, 0.997564, 1.00115, 1.04728, 1.00064, 0.4, 1, 0, 0, 0, -0.000408033, -0.150731, 0.0110136, 0.988513, 1.00239, 1.09729, 1.00132, 0.933333, 1, 0, 0, 0, -0.00288478, -0.597347, 0.0375666, 0.801097, 1.0085, 1.3373, 1.00458, 1.13333, 1, 0, 0, 0, -0.00339285, -0.713632, 0.041012, 0.699311, 1.00982, 1.39168, 1.00539, 1.2, 1, 0, 0, 0, -0.00344206, -0.741037, 0.0410001, 0.670202, 1.01, 1.39963, 1.00552, 1.26667, 1, 0, 0, 1.49012e-08, -0.00344024, -0.762818, 0.0404157, 0.645339, 1.01002, 1.40119, 1.00555, 1.33333, 1, 0, 0, 1.49012e-08, -0.0034006, -0.776268, 0.0394662, 0.629157, 1.00989, 1.39661, 1.00549, 1.4, 1, 0, 0, 1.49012e-08, -0.00333795, -0.76935, 0.0386126, 0.637651, 1.00962, 1.38553, 1.00532, 1.46667, 1, 0, 0, 1.49012e-08, -0.00323047, -0.717309, 0.0385966, 0.695678, 1.00926, 1.36957, 1.00507, 1.53333, 1, 0, 0, 1.49012e-08, -0.00285652, -0.593505, 0.0389235, 0.803883, 1.0088, 1.34904, 1.00475, 1.6, 1, 0, 0, 1.49012e-08, -0.0022509, -0.466284, 0.0374456, 0.883839, 1.00819, 1.32475, 1.0044, 1.66667, 1, 0, 0, 1.49012e-08, -0.00166397, -0.364282, 0.034603, 0.930644, 1.00749, 1.29762, 1.00403, 1.73333, 1, 0, 0, 1.49012e-08, -0.00119353, -0.287803, 0.031065, 0.957185, 1.00671, 1.26799, 1.00363, 1.8, 1, 0, 0, 1.49012e-08, -0.000822237, -0.226729, 0.0272488, 0.973576, 1.0059, 1.23692, 1.00322, 1.86667, 1, 0, 0, 1.49012e-08, -0.000540999, -0.178416, 0.0233529, 0.983678, 1.00508, 1.20499, 1.00279, 2, 1, 0, 0, 1.49012e-08, -0.000173434, -0.107658, 0.0158124, 0.994062, 1.00348, 1.14152, 1.00193, 2.13333, 1, 0, 0, 1.49012e-08, 2.09499e-05, -0.0608783, 0.00919002, 0.998103, 1.00204, 1.08359, 1.00114, 2.2, 1, 0, 0, 1.49012e-08, 7.81153e-05, -0.0436305, 0.00638608, 0.999027, 1.00142, 1.05848, 1.0008, 2.26667, 1, 0, 0, 1.49012e-08, 0.000117272, -0.0296669, 0.00401864, 0.999552, 1.0009, 1.03701, 1.0005, 2.33333, 1, 0, 0, 1.49012e-08, 0.000143924, -0.0183102, 0.00211101, 0.99983, 1.00047, 1.01954, 1.00027, 2.4, 1, 0, 0, 1.49012e-08, 0.000161029, -0.00955819, 0.000815809, 0.999954, 1.00018, 1.00758, 1.0001, 2.46667, 1, 0, 0, 1.49012e-08, 0.000172443, -0.0027429, 0.000112485, 0.999996, 1.00003, 1.00105, 1.00001, 2.65578, 1, 0, 0, 0, -8.0897e-06, -0.004964, 0.000386736, 0.999988, 1.00009, 1.0036, 1.00005, 2.73602, 1, 0, 0, 0, -3.1428e-05, -0.0181388, 0.00139624, 0.999835, 1.00031, 1.01292, 1.00018, 2.857, 1, 0, 0, 0, 3.72529e-09, 8.69477e-10, 6.05223e-09, 1, 1, 1, 1 )
-tracks/4/type = "transform"
-tracks/4/path = NodePath("Armature/Skeleton:Bone.017")
-tracks/4/interp = 1
-tracks/4/loop_wrap = true
-tracks/4/imported = false
-tracks/4/enabled = true
-tracks/4/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 )
-
-[sub_resource type="Animation" id=2]
-length = 0.001
-
-[sub_resource type="CapsuleShape" id=1]
-radius = 0.997672
-height = 0.947179
-
-[node name="meat_tentacle" instance=ExtResource( 1 )]
-
-[node name="Cone" parent="Armature/Skeleton" index="0"]
-material_override = ExtResource( 2 )
-material/0 = ExtResource( 2 )
-
-[node name="AnimationPlayer" parent="." index="1"]
-autoplay = "ArmatureAction-loop"
-playback_speed = 0.5
-method_call_mode = 1
-anims/ArmatureAction-loop = SubResource( 3 )
-anims/RESET = SubResource( 2 )
-script = ExtResource( 3 )
-
-[node name="StaticBody" type="StaticBody" parent="." index="2"]
-transform = Transform( 1.29603, 0.396787, 0.0456263, -0.180669, 2.84635, 0.327301, 0, -0.581511, 1.63319, -0.459882, 0, -0.0209413 )
-
-[node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"]
-transform = Transform( 0.222041, 0.00571365, -0.0496885, -0.0321011, 0.0306116, -0.539539, -0.0114299, 0.284227, -0.0947877, 0.181285, 0.638165, 0.185954 )
-shape = SubResource( 1 )