diff --git a/blends/levels/meat_creek_cage.png b/blends/levels/meat_creek_cage.png new file mode 100644 index 0000000..2e5a2a6 --- /dev/null +++ b/blends/levels/meat_creek_cage.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c99916ad060c0518d9a9ce34a71d7278e23ac20a549cc504cb120a1d9eac147 +size 3259584 diff --git a/blends/levels/side_tunnel_1.blend b/blends/levels/side_tunnel_1.blend index c2f21a3..b04fa1d 100644 --- a/blends/levels/side_tunnel_1.blend +++ b/blends/levels/side_tunnel_1.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1eae03a3be0ff4bd8f25abc42c4302877c338ba2bc6efa3921adbdc1618cd83 -size 17017165 +oid sha256:dc6a9a2c17161c85e8072237af7786d73edcf5a65a08bb668393fa25fda8e642 +size 17023541 diff --git a/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.md5 b/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.md5 index def55fd..e0d5359 100644 --- a/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.md5 +++ b/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.md5 @@ -1,3 +1,3 @@ -source_md5="6929a25c3e27c26b9da92ac96646dd8d" -dest_md5="4e1398144e148a69735c5296354ea7f8" +source_md5="a4b045d4090a0a01a253a33da0505cb1" +dest_md5="aa0e8b90fb5b116e0726f81803c8a616" diff --git a/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.scn b/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.scn index eb484ff..42b1cdc 100644 Binary files a/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.scn and b/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.scn differ diff --git a/godot/assets/meat_creek/Material_001.material b/godot/assets/meat_creek/Material_001.material deleted file mode 100644 index 24dcd61..0000000 --- a/godot/assets/meat_creek/Material_001.material +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f15d33da0e1fa8edda14ac80edcfa85e9eb254f2ff36afda98d8185728c1859 -size 741 diff --git a/godot/assets/meat_creek/MeatCreekCage.material b/godot/assets/meat_creek/MeatCreekCage.material new file mode 100644 index 0000000..5fe400d --- /dev/null +++ b/godot/assets/meat_creek/MeatCreekCage.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:930e0d7d01c6ea31714377b8a28dc2d1fb60f9ce2580458835af3a957aca68f4 +size 4933231 diff --git a/godot/assets/meat_creek/creek_cage.glb b/godot/assets/meat_creek/creek_cage.glb index c82ef1f..382ab22 100644 --- a/godot/assets/meat_creek/creek_cage.glb +++ b/godot/assets/meat_creek/creek_cage.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f326c273ac162f62ff6d9f0efa5744f0cf8ad95f6024ab61c5a578edf5bf50d -size 19092 +oid sha256:9306185c0af7ed4c31d9d5a82ab150dde53d0bff3f7e951c67f54db137cff5a4 +size 3293832 diff --git a/godot/assets/meat_creek/side_tunnel_1.tscn b/godot/assets/meat_creek/side_tunnel_1.tscn index ce8500b..59093c9 100644 --- a/godot/assets/meat_creek/side_tunnel_1.tscn +++ b/godot/assets/meat_creek/side_tunnel_1.tscn @@ -23,8 +23,8 @@ ambient_light_sky_contribution = 0.0 fog_enabled = true fog_color = Color( 0.0117647, 0.0156863, 0.0156863, 1 ) fog_sun_color = Color( 0.639216, 0.541176, 0.345098, 1 ) -fog_depth_begin = 15.0 -fog_depth_end = 22.0 +fog_depth_begin = 0.0 +fog_depth_end = 73.5 fog_depth_curve = 0.933033 fog_transmit_enabled = true fog_transmit_curve = 1.03526 diff --git a/godot/assets/models/Material_004.material b/godot/assets/models/Material_004.material index cdb96b1..409ef70 100644 --- a/godot/assets/models/Material_004.material +++ b/godot/assets/models/Material_004.material @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96fb73f4885cd530a59afc9b201d7e2301a9169b4054886bfab0feef36fd58db -size 1657 +oid sha256:2c001ea211a2f5a8b4ff0381e72a0cdd0a5290735a7dc784302aa9acc356ee1a +size 737 diff --git a/godot/assets/models/walkie_talkie/walkie_talkie.gd b/godot/assets/models/walkie_talkie/walkie_talkie.gd index 6ad5294..5e382ba 100644 --- a/godot/assets/models/walkie_talkie/walkie_talkie.gd +++ b/godot/assets/models/walkie_talkie/walkie_talkie.gd @@ -12,6 +12,7 @@ onready var player = util.player func _ready(): is_screen_on = false turn_screen_off() + fsm.start("WalkieTalkieStart") func turn_screen_off(): var mat = $Animations/walkie_talkie/Body.get_active_material(1) diff --git a/godot/assets/models/walkie_talkie/walkie_talkie.tscn b/godot/assets/models/walkie_talkie/walkie_talkie.tscn index 9435ff5..e524f25 100644 --- a/godot/assets/models/walkie_talkie/walkie_talkie.tscn +++ b/godot/assets/models/walkie_talkie/walkie_talkie.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=34 format=2] +[gd_scene load_steps=37 format=2] [ext_resource path="res://assets/models/walkie_talkie/LCDScreen.material" type="Material" id=1] [ext_resource path="res://assets/models/walkie_talkie/WalkieTalkieSpeaker.material" type="Material" id=2] @@ -46,6 +46,17 @@ tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.0416667, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.125, 1, 0, 0.0313745, 0, 0, 0, 0, 1, 1, 1, 1, 0.166667, 1, 0, 0.0424367, 0, 0, 0, 0, 1, 1, 1, 1, 0.208333, 1, 0, 0.0498168, 0, 0, 0, 0, 1, 1, 1, 1, 0.25, 1, 0, 0.0529201, 0, 0, 0, 0, 1, 1, 1, 1, 0.291667, 1, 0, 0.0509806, 0, 0, 0, 0, 1, 1, 1, 1, 0.333333, 1, 0, 0.0429844, 0, 0, 0, 0, 1, 1, 1, 1, 0.375, 1, 0, 0.0275464, 0, 0, 0, 0, 1, 1, 1, 1, 0.416667, 1, 0, 0.00269568, 0, 0, 0, 0, 1, 1, 1, 1, 0.458333, 1, 0, -0.0345194, 0, 0, 0, 0, 1, 1, 1, 1, 0.5, 1, 0, -0.0888285, 0, 0, 0, 0, 1, 1, 1, 1, 0.541667, 1, 0, -0.168521, 0, 0, 0, 0, 1, 1, 1, 1, 0.583333, 1, 0, -0.289866, 0, 0, 0, 0, 1, 1, 1, 1, 0.625, 1, 0, -0.486, 0, 0, 0, 0, 1, 1, 1, 1, 0.666667, 1, 0, -0.754503, 0, 0, 0, 0, 1, 1, 1, 1, 0.708333, 1, 0, -0.921423, 0, 0, 0, 0, 1, 1, 1, 1, 0.75, 1, 0, -0.984901, 0, 0, 0, 0, 1, 1, 1, 1, 0.791667, 1, 0, -1, 0, 0, 0, 0, 1, 1, 1, 1 ) +[sub_resource type="Animation" id=36] +resource_name = "WalkieTalkieStart" +length = 0.791667 +tracks/0/type = "transform" +tracks/0/path = NodePath("Animations") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = PoolRealArray( 0, 1, 0, -1, 0, 0, 0, 0, 1, 1, 1, 1 ) + [sub_resource type="Animation" id=4] resource_name = "WalkieTalkieWalking" length = 1.08333 @@ -67,6 +78,9 @@ animation = "WalkieTalkieIdle" [sub_resource type="AnimationNodeAnimation" id=26] animation = "WalkieTalkieLeave" +[sub_resource type="AnimationNodeAnimation" id=37] +animation = "WalkieTalkieStart" + [sub_resource type="AnimationNodeAnimation" id=27] animation = "WalkieTalkieWalking" @@ -92,6 +106,8 @@ xfade_time = 0.1 [sub_resource type="AnimationNodeStateMachineTransition" id=35] xfade_time = 0.1 +[sub_resource type="AnimationNodeStateMachineTransition" id=38] + [sub_resource type="AnimationNodeStateMachine" id=18] states/WalkieTalkieEnter/node = SubResource( 24 ) states/WalkieTalkieEnter/position = Vector2( 184, 280 ) @@ -99,9 +115,12 @@ states/WalkieTalkieIdle/node = SubResource( 25 ) states/WalkieTalkieIdle/position = Vector2( 380, 113 ) states/WalkieTalkieLeave/node = SubResource( 26 ) states/WalkieTalkieLeave/position = Vector2( 123, -28 ) +states/WalkieTalkieStart/node = SubResource( 37 ) +states/WalkieTalkieStart/position = Vector2( -74, 136.064 ) states/WalkieTalkieWalking/node = SubResource( 27 ) states/WalkieTalkieWalking/position = Vector2( 681, 113 ) -transitions = [ "WalkieTalkieEnter", "WalkieTalkieIdle", SubResource( 28 ), "WalkieTalkieIdle", "WalkieTalkieWalking", SubResource( 29 ), "WalkieTalkieWalking", "WalkieTalkieIdle", SubResource( 30 ), "WalkieTalkieIdle", "WalkieTalkieLeave", SubResource( 32 ), "WalkieTalkieWalking", "WalkieTalkieLeave", SubResource( 33 ), "WalkieTalkieLeave", "WalkieTalkieEnter", SubResource( 34 ), "WalkieTalkieEnter", "WalkieTalkieLeave", SubResource( 35 ) ] +transitions = [ "WalkieTalkieEnter", "WalkieTalkieIdle", SubResource( 28 ), "WalkieTalkieIdle", "WalkieTalkieWalking", SubResource( 29 ), "WalkieTalkieWalking", "WalkieTalkieIdle", SubResource( 30 ), "WalkieTalkieIdle", "WalkieTalkieLeave", SubResource( 32 ), "WalkieTalkieWalking", "WalkieTalkieLeave", SubResource( 33 ), "WalkieTalkieLeave", "WalkieTalkieEnter", SubResource( 34 ), "WalkieTalkieEnter", "WalkieTalkieLeave", SubResource( 35 ), "WalkieTalkieStart", "WalkieTalkieEnter", SubResource( 38 ) ] +start_node = "WalkieTalkieStart" graph_offset = Vector2( -167, -100.936 ) [sub_resource type="AnimationNodeStateMachinePlayback" id=19] @@ -205,13 +224,14 @@ surfaces/0 = { script = ExtResource( 5 ) [node name="Animations" type="Spatial" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -7.3322e-05, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="Animations"] root_node = NodePath("../..") anims/WalkieTalkieEnter = SubResource( 1 ) anims/WalkieTalkieIdle = SubResource( 2 ) anims/WalkieTalkieLeave = SubResource( 3 ) +anims/WalkieTalkieStart = SubResource( 36 ) anims/WalkieTalkieWalking = SubResource( 4 ) [node name="AnimationTree" type="AnimationTree" parent="Animations"]