diff --git a/characters/enemies/Bingus/run-stats.tres b/characters/enemies/Bingus/run-stats.tres index 1864c13..718917d 100644 --- a/characters/enemies/Bingus/run-stats.tres +++ b/characters/enemies/Bingus/run-stats.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="RunStats" load_steps=5 format=3 uid="uid://cdynh4jxcd7nf"] -[ext_resource type="Script" uid="uid://ckrifgfjoj43a" path="res://state_machine/misc/RunStats.gd" id="1_cje7e"] +[ext_resource type="Script" path="res://state_machine/misc/RunStats.gd" id="1_cje7e"] [sub_resource type="Curve" id="Curve_q4yvk"] min_value = -100.0 diff --git a/characters/player/AnimStateTemplate.tres b/characters/player/AnimStateTemplate.tres index a7abc03..ff40d0c 100644 --- a/characters/player/AnimStateTemplate.tres +++ b/characters/player/AnimStateTemplate.tres @@ -127,4 +127,4 @@ states/run_turn_l/position = Vector2(413, 100) states/run_turn_r/node = SubResource("AnimationNodeAnimation_vbdq7") states/run_turn_r/position = Vector2(645, 100) transitions = ["run_l", "run_turn_r", SubResource("AnimationNodeStateMachineTransition_ontot"), "run_turn_r", "run_r", SubResource("AnimationNodeStateMachineTransition_gwrg1"), "run_r", "run_turn_l", SubResource("AnimationNodeStateMachineTransition_wrqe1"), "run_turn_l", "run_l", SubResource("AnimationNodeStateMachineTransition_nj0d1"), "Start", "idle_l", SubResource("AnimationNodeStateMachineTransition_hso43"), "Start", "idle_r", SubResource("AnimationNodeStateMachineTransition_p65jq"), "idle_l", "run_turn_r", SubResource("AnimationNodeStateMachineTransition_wn3to"), "idle_r", "run_turn_l", SubResource("AnimationNodeStateMachineTransition_jw2dj"), "Start", "run_l", SubResource("AnimationNodeStateMachineTransition_736xv"), "Start", "run_r", SubResource("AnimationNodeStateMachineTransition_c6rbw"), "idle_l", "run_start_l", SubResource("AnimationNodeStateMachineTransition_bdtsj"), "run_start_l", "run_l", SubResource("AnimationNodeStateMachineTransition_h3n2f"), "idle_r", "run_start_r", SubResource("AnimationNodeStateMachineTransition_y2dcf"), "run_start_r", "run_r", SubResource("AnimationNodeStateMachineTransition_macrx"), "run_r", "run_stop_r", SubResource("AnimationNodeStateMachineTransition_hhcfj"), "run_stop_r", "idle_r", SubResource("AnimationNodeStateMachineTransition_lowxd"), "run_l", "run_stop_l", SubResource("AnimationNodeStateMachineTransition_tuv16"), "run_stop_l", "idle_l", SubResource("AnimationNodeStateMachineTransition_vsox1")] -graph_offset = Vector2(-405.586, -185) +graph_offset = Vector2(-399.586, -97) diff --git a/characters/player/Player.tscn b/characters/player/Player.tscn index aa2e1ae..e6b5a81 100644 --- a/characters/player/Player.tscn +++ b/characters/player/Player.tscn @@ -2,17 +2,17 @@ [ext_resource type="Script" path="res://characters/player/Player.gd" id="1_l3wc5"] [ext_resource type="Texture2D" uid="uid://mu78xlrkgmpq" path="res://debug/debug_asset_debug/updated player size v1.png" id="2_1bl0t"] -[ext_resource type="Script" uid="uid://2xux1ohyteb2" path="res://state_machine/StateMachine.gd" id="2_ae3rk"] -[ext_resource type="Script" uid="uid://dyinmqkd8n1e7" path="res://state_machine/Run.gd" id="3_r7kf7"] -[ext_resource type="Script" uid="uid://ckrifgfjoj43a" path="res://state_machine/misc/RunStats.gd" id="4_towo1"] +[ext_resource type="Script" path="res://state_machine/StateMachine.gd" id="2_ae3rk"] +[ext_resource type="Script" path="res://state_machine/Run.gd" id="3_r7kf7"] +[ext_resource type="Script" path="res://state_machine/misc/RunStats.gd" id="4_towo1"] [ext_resource type="Resource" uid="uid://bwu3tfatay4xu" path="res://characters/player/normal_jump.tres" id="5_42qg3"] -[ext_resource type="Script" uid="uid://dr5x24g332mp4" path="res://state_machine/Air.gd" id="6_vkhjv"] +[ext_resource type="Script" path="res://state_machine/Air.gd" id="6_vkhjv"] [ext_resource type="Curve" uid="uid://mxv5toxidjer" path="res://characters/player/falling_curve.tres" id="7_5npc2"] [ext_resource type="Script" path="res://state_machine/Dash.gd" id="8_cenpi"] -[ext_resource type="Script" uid="uid://c04nwbkwmtvtl" path="res://state_machine/Wallslide.gd" id="8_g5obm"] +[ext_resource type="Script" path="res://state_machine/Wallslide.gd" id="8_g5obm"] [ext_resource type="Texture2D" uid="uid://cuemjxyxstwwq" path="res://characters/player/assets/dash/dash_d.png" id="8_wmkje"] [ext_resource type="Shape2D" uid="uid://c1iuvxx2i661g" path="res://characters/player/shape.tres" id="9_lka70"] -[ext_resource type="Script" uid="uid://b230k0tqwex5k" path="res://state_machine/misc/HurtBox.gd" id="10_mejgj"] +[ext_resource type="Script" path="res://state_machine/misc/HurtBox.gd" id="10_mejgj"] [ext_resource type="Texture2D" uid="uid://clqevh5c7mngx" path="res://characters/player/assets/dash/dash_u.png" id="11_gkjao"] [ext_resource type="Script" path="res://state_machine/Death.gd" id="12_33ksn"] [ext_resource type="Texture2D" uid="uid://c25ofwwebxe3m" path="res://characters/player/assets/atk/atk d.png" id="12_hw4yd"] @@ -794,6 +794,7 @@ tracks/1/keys = { [sub_resource type="Animation" id="Animation_jfs81"] resource_name = "jump_air_start_l" +length = 0.05 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -813,7 +814,7 @@ tracks/1/path = NodePath("PlayerCharacterSprite:progress") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0, 1), +"times": PackedFloat32Array(0, 0.05), "transitions": PackedFloat32Array(1, 1), "update": 0, "values": [0.0, 1.0] @@ -848,6 +849,7 @@ tracks/1/keys = { [sub_resource type="Animation" id="Animation_k8ps4"] resource_name = "jump_floor_start_l" +length = 0.0667 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -867,7 +869,7 @@ tracks/1/path = NodePath("PlayerCharacterSprite:progress") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0, 1), +"times": PackedFloat32Array(0, 0.0667), "transitions": PackedFloat32Array(1, 1), "update": 0, "values": [0.0, 1.0] @@ -875,6 +877,7 @@ tracks/1/keys = { [sub_resource type="Animation" id="Animation_4jvvr"] resource_name = "jump_floor_start_r" +length = 0.0667 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -894,7 +897,7 @@ tracks/1/path = NodePath("PlayerCharacterSprite:progress") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0, 1), +"times": PackedFloat32Array(0, 0.0667), "transitions": PackedFloat32Array(1, 1), "update": 0, "values": [0.0, 1.0] @@ -1326,15 +1329,18 @@ states/fall_r/position = Vector2(467, 100) transitions = ["Start", "fall_l", SubResource("AnimationNodeStateMachineTransition_wlevo"), "fall_l", "fall_r", SubResource("AnimationNodeStateMachineTransition_skws1"), "fall_r", "fall_l", SubResource("AnimationNodeStateMachineTransition_he6a0")] graph_offset = Vector2(-131, -66) +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_c8qc6"] +animation = &"jump_floor_start_l" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_0kks2"] +animation = &"jump_floor_start_r" + [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_kc6bp"] animation = &"jump_l" [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_cu6il"] animation = &"jump_r" -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_w0dyg"] -advance_mode = 2 - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7wg7b"] advance_mode = 2 advance_expression = "looking_right" @@ -1343,14 +1349,35 @@ advance_expression = "looking_right" advance_mode = 2 advance_expression = "!looking_right" +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_6o41i"] +advance_mode = 2 +advance_expression = "!looking_right" + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_m67h0"] +switch_mode = 2 +advance_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_xgjro"] +advance_mode = 2 +advance_expression = "looking_right" + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_pfc6d"] +switch_mode = 2 +advance_mode = 2 + [sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_6ud3m"] -states/End/position = Vector2(685, 100) +states/End/position = Vector2(1089, 100) +states/Start/position = Vector2(48, 100) +states/jump_floor_start_l/node = SubResource("AnimationNodeAnimation_c8qc6") +states/jump_floor_start_l/position = Vector2(312.664, 44) +states/jump_floor_start_r/node = SubResource("AnimationNodeAnimation_0kks2") +states/jump_floor_start_r/position = Vector2(312.664, 153.324) states/jump_l/node = SubResource("AnimationNodeAnimation_kc6bp") -states/jump_l/position = Vector2(356, 100) +states/jump_l/position = Vector2(537, 44) states/jump_r/node = SubResource("AnimationNodeAnimation_cu6il") -states/jump_r/position = Vector2(507, 100) -transitions = ["Start", "jump_l", SubResource("AnimationNodeStateMachineTransition_w0dyg"), "jump_l", "jump_r", SubResource("AnimationNodeStateMachineTransition_7wg7b"), "jump_r", "jump_l", SubResource("AnimationNodeStateMachineTransition_s4pbh")] -graph_offset = Vector2(-93.3359, 36.3242) +states/jump_r/position = Vector2(537, 153.324) +transitions = ["jump_l", "jump_r", SubResource("AnimationNodeStateMachineTransition_7wg7b"), "jump_r", "jump_l", SubResource("AnimationNodeStateMachineTransition_s4pbh"), "Start", "jump_floor_start_l", SubResource("AnimationNodeStateMachineTransition_6o41i"), "jump_floor_start_l", "jump_l", SubResource("AnimationNodeStateMachineTransition_m67h0"), "Start", "jump_floor_start_r", SubResource("AnimationNodeStateMachineTransition_xgjro"), "jump_floor_start_r", "jump_r", SubResource("AnimationNodeStateMachineTransition_pfc6d")] +graph_offset = Vector2(-226.336, -62.6758) [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_17li2"] animation = &"RESET" @@ -1405,31 +1432,6 @@ states/dash_r/position = Vector2(640, 114) transitions = ["Start", "dash_l", SubResource("AnimationNodeStateMachineTransition_w0522"), "dash_l", "dash_r", SubResource("AnimationNodeStateMachineTransition_hb22c"), "dash_r", "dash_l", SubResource("AnimationNodeStateMachineTransition_rnv5s")] graph_offset = Vector2(-154, -81) -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_jq61u"] -animation = &"jump_floor_start_l" - -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_id4ia"] -animation = &"jump_floor_start_r" - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_vqmx2"] -advance_mode = 2 - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_2m6mm"] -advance_mode = 2 -advance_expression = "looking_right" - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ahewn"] -advance_mode = 2 -advance_expression = "!looking_right" - -[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_s8po6"] -states/jump_floor_start_l/node = SubResource("AnimationNodeAnimation_jq61u") -states/jump_floor_start_l/position = Vector2(422, 100) -states/jump_floor_start_r/node = SubResource("AnimationNodeAnimation_id4ia") -states/jump_floor_start_r/position = Vector2(654, 100) -transitions = ["Start", "jump_floor_start_l", SubResource("AnimationNodeStateMachineTransition_vqmx2"), "jump_floor_start_l", "jump_floor_start_r", SubResource("AnimationNodeStateMachineTransition_2m6mm"), "jump_floor_start_r", "jump_floor_start_l", SubResource("AnimationNodeStateMachineTransition_ahewn")] -graph_offset = Vector2(-152, -104) - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_0alk5"] advance_mode = 2 @@ -1443,7 +1445,7 @@ advance_expression = "!falling || on_wall" [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_jltsu"] advance_mode = 2 -advance_expression = "(on_floor && !just_dashed && standing_still) || (on_floor && !just_dashed && !standing_still)" +advance_expression = "on_floor && !just_dashed && (standing_still || !standing_still)" [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_o5kw1"] advance_mode = 2 @@ -1451,8 +1453,11 @@ advance_expression = "!on_floor || just_dashed" [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_6ngu7"] advance_mode = 2 -advance_expression = "just_jumped -" +advance_expression = "just_jumped && !just_doublejumped" + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_sasso"] +advance_mode = 2 +advance_expression = "falling || on_wall || on_floor || just_dashed" [sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_kn6jm"] states/End/position = Vector2(590, 18.989) @@ -1461,18 +1466,16 @@ states/Falling/position = Vector2(120.317, -90.011) states/Idle+Run/node = ExtResource("29_lxe8h") states/Idle+Run/position = Vector2(120.317, 140.989) states/Jump/node = SubResource("AnimationNodeStateMachine_6ud3m") -states/Jump/position = Vector2(336.868, -35.011) +states/Jump/position = Vector2(268.868, 18.989) states/RESET/node = SubResource("AnimationNodeAnimation_17li2") states/RESET/position = Vector2(120.317, 18.989) -states/Start/position = Vector2(-126, 18.989) +states/Start/position = Vector2(-129, 18.989) states/Wallslide/node = SubResource("AnimationNodeStateMachine_an8ao") states/Wallslide/position = Vector2(295.868, -212.011) states/dash/node = SubResource("AnimationNodeStateMachine_cn3w8") states/dash/position = Vector2(295.868, -147.012) -"states/jump start floor/node" = SubResource("AnimationNodeStateMachine_s8po6") -"states/jump start floor/position" = Vector2(436.868, 69.989) -transitions = ["Start", "RESET", SubResource("AnimationNodeStateMachineTransition_0alk5"), "RESET", "Falling", SubResource("AnimationNodeStateMachineTransition_blac4"), "Falling", "RESET", SubResource("AnimationNodeStateMachineTransition_6bj8y"), "RESET", "Idle+Run", SubResource("AnimationNodeStateMachineTransition_jltsu"), "Idle+Run", "RESET", SubResource("AnimationNodeStateMachineTransition_o5kw1"), "RESET", "Jump", SubResource("AnimationNodeStateMachineTransition_6ngu7")] -graph_offset = Vector2(-227.427, -108.891) +transitions = ["Start", "RESET", SubResource("AnimationNodeStateMachineTransition_0alk5"), "RESET", "Falling", SubResource("AnimationNodeStateMachineTransition_blac4"), "Falling", "RESET", SubResource("AnimationNodeStateMachineTransition_6bj8y"), "RESET", "Idle+Run", SubResource("AnimationNodeStateMachineTransition_jltsu"), "Idle+Run", "RESET", SubResource("AnimationNodeStateMachineTransition_o5kw1"), "RESET", "Jump", SubResource("AnimationNodeStateMachineTransition_6ngu7"), "Jump", "RESET", SubResource("AnimationNodeStateMachineTransition_sasso")] +graph_offset = Vector2(-545.427, -156.891) [sub_resource type="Curve" id="Curve_w1mwi"] max_value = 300.0 diff --git a/characters/player/normal_jump.tres b/characters/player/normal_jump.tres index 008115b..14697b7 100644 --- a/characters/player/normal_jump.tres +++ b/characters/player/normal_jump.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="JumpStats" load_steps=4 format=3 uid="uid://bwu3tfatay4xu"] [ext_resource type="Curve" uid="uid://mxv5toxidjer" path="res://characters/player/falling_curve.tres" id="1_46nf6"] -[ext_resource type="Script" uid="uid://c3joat1uqwo78" path="res://state_machine/misc/JumpStats.gd" id="1_p0xow"] +[ext_resource type="Script" path="res://state_machine/misc/JumpStats.gd" id="1_p0xow"] [sub_resource type="Curve" id="Curve_4h0vl"] min_value = -400.0 diff --git a/test_levels/test_1.tscn b/test_levels/test_1.tscn index 89b5b72..02ae0cc 100644 --- a/test_levels/test_1.tscn +++ b/test_levels/test_1.tscn @@ -2,12 +2,12 @@ [ext_resource type="Script" path="res://characters/player/ExtendedCamera.gd" id="1_22nty"] [ext_resource type="Texture2D" uid="uid://bgw5itdndav4s" path="res://icon.svg" id="1_a777e"] -[ext_resource type="Script" uid="uid://dboeuh5ymmvso" path="res://global/SceneTransition.gd" id="1_heet6"] -[ext_resource type="Script" uid="uid://cbhe4svme1axe" path="res://global/FocusZone.gd" id="1_kki15"] +[ext_resource type="Script" path="res://global/SceneTransition.gd" id="1_heet6"] +[ext_resource type="Script" path="res://global/FocusZone.gd" id="1_kki15"] [ext_resource type="Texture2D" uid="uid://ddlrqr4ss8vls" path="res://debug/debug_asset_debug/down.png" id="1_oukny"] -[ext_resource type="Shader" uid="uid://b6er4bnj6bwyd" path="res://assets/shaders/blurX.gdshader" id="1_x15t4"] -[ext_resource type="Shader" uid="uid://io718ahx46m8" path="res://assets/shaders/blurY.gdshader" id="2_kpx7o"] -[ext_resource type="Script" uid="uid://dgxn3a7clr5vt" path="res://test_levels/ExpressiveStone.gd" id="2_rd8co"] +[ext_resource type="Shader" path="res://assets/shaders/blurX.gdshader" id="1_x15t4"] +[ext_resource type="Shader" path="res://assets/shaders/blurY.gdshader" id="2_kpx7o"] +[ext_resource type="Script" path="res://test_levels/ExpressiveStone.gd" id="2_rd8co"] [ext_resource type="Texture2D" uid="uid://3hyrbswjn4e" path="res://expressive_stone.png" id="2_vgtwj"] [ext_resource type="PackedScene" uid="uid://sxcxj2sua5ho" path="res://characters/enemies/Bingus/Bingus.tscn" id="5_0m374"] [ext_resource type="TileSet" uid="uid://nvduvcllkfyc" path="res://test_levels/test_1_tileset.tres" id="5_3r2p0"] @@ -15,7 +15,7 @@ [ext_resource type="Texture2D" uid="uid://bvfk2imjwpga7" path="res://debug/debug_asset_debug/x-grid.png" id="8_ulsik"] [ext_resource type="Texture2D" uid="uid://5qnqarh456gc" path="res://debug/debug_asset_debug/y-grid.png" id="9_72m0c"] [ext_resource type="Texture2D" uid="uid://rbbqk1tv4e5x" path="res://debug/debug_asset_debug/fogTest.png" id="10_qlm2x"] -[ext_resource type="Script" uid="uid://deg5jn14kcdvc" path="res://global/RelativeParallax2D.gd" id="11_6rg2v"] +[ext_resource type="Script" path="res://global/RelativeParallax2D.gd" id="11_6rg2v"] [ext_resource type="Texture2D" uid="uid://bhcl4y1hdhm6" path="res://debug/debug_asset_debug/credits meow 4.png" id="11_8s8sg"] [ext_resource type="Texture2D" uid="uid://6vvjkjlc0y6d" path="res://debug/debug_asset_debug/test fluid anim/fluid_test_sprite_sheet_1440.png" id="19_oioxv"] [ext_resource type="Texture2D" uid="uid://bc1qao5dv1cqq" path="res://debug/debug_asset_debug/test fluid anim/fluid_test_sprite_sheet.png" id="268_whvcx"]