From 925b7004c0d901671a7a98a5089bcbd8a53cb2cc Mon Sep 17 00:00:00 2001 From: Minimata Date: Sat, 13 Sep 2025 18:57:11 +0200 Subject: [PATCH] complete move patterns --- player_controller/PlayerController.tscn | 14 +++++++------- player_controller/Scripts/PlayerController.cs | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/player_controller/PlayerController.tscn b/player_controller/PlayerController.tscn index 62df327..eef81cc 100644 --- a/player_controller/PlayerController.tscn +++ b/player_controller/PlayerController.tscn @@ -431,6 +431,12 @@ to = NodePath("../Dashing/ToWeaponDash") event = &"weapon_dash" delay_in_seconds = "0.0" +[node name="ToPlantedWeapon" type="Node" parent="StateChart/Root/Movement"] +script = ExtResource("28_n7qhm") +to = NodePath("../OnWall/Hanging") +event = &"to_planted" +delay_in_seconds = "0.0" + [node name="Mantling" type="Node" parent="StateChart/Root/Movement"] script = ExtResource("27_34snm") @@ -511,12 +517,6 @@ script = ExtResource("27_34snm") [node name="ToWeaponDash" type="Node" parent="StateChart/Root/Movement/Dashing"] script = ExtResource("27_34snm") -[node name="ToPlantedWeapon" type="Node" parent="StateChart/Root/Movement/Dashing/ToWeaponDash"] -script = ExtResource("28_n7qhm") -to = NodePath("../../../OnWall/Hanging") -event = &"to_planted" -delay_in_seconds = "0.0" - [node name="Grounded" type="Node" parent="StateChart/Root/Movement"] script = ExtResource("27_34snm") @@ -627,7 +627,7 @@ delay_in_seconds = "0.0" [node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall"] script = ExtResource("28_n7qhm") -to = NodePath("../../Jump/DoubleJump") +to = NodePath("../../Jump/SimpleJump") event = &"jump" delay_in_seconds = "0.0" diff --git a/player_controller/Scripts/PlayerController.cs b/player_controller/Scripts/PlayerController.cs index 356674c..54eec46 100644 --- a/player_controller/Scripts/PlayerController.cs +++ b/player_controller/Scripts/PlayerController.cs @@ -195,6 +195,7 @@ public partial class PlayerController : CharacterBody3D private StateChartState _onWallHugging; private StateChartState _onWallHanging; private StateChartState _falling; + private StateChartState _to_weapon_dash; private Transition _onJumpFromWall; private Transition _onMegajumpFromWall; @@ -282,6 +283,7 @@ public partial class PlayerController : CharacterBody3D _megaJump = StateChartState.Of(GetNode("StateChart/Root/Movement/Jump/MegaJump")); _doubleJumpEnabled = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne/DoubleJumpEnabled")); _falling = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne/Falling")); + _to_weapon_dash = StateChartState.Of(GetNode("StateChart/Root/Movement/Dashing/ToWeaponDash")); _onWall = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall")); _onJumpFromWall = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/OnJump")); _onMegajumpFromWall = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/OnMegajump")); @@ -428,7 +430,6 @@ public partial class PlayerController : CharacterBody3D } public void HandleWallHanging(float delta) { - GD.Print("Hanging"); WallHang(delta); }