minimata/MovementTests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more-rework #1

Merged
minimata merged 16 commits from more-rework into main 2025-09-13 16:57:42 +00:00
Conversation 0 Commits 16 Files Changed 27 +1349 -911
27 changed files with 1349 additions and 911 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 925b7004c0 - Show all commits

14
player_controller/PlayerController.tscn
View File

@ -431,6 +431,12 @@ to = NodePath("../Dashing/ToWeaponDash")
event = &"weapon_dash" event = &"weapon_dash"
delay_in_seconds = "0.0" 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"] [node name="Mantling" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("27_34snm") script = ExtResource("27_34snm")
@ -511,12 +517,6 @@ script = ExtResource("27_34snm")
[node name="ToWeaponDash" type="Node" parent="StateChart/Root/Movement/Dashing"] [node name="ToWeaponDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
script = ExtResource("27_34snm") 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"] [node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("27_34snm") script = ExtResource("27_34snm")
@ -627,7 +627,7 @@ delay_in_seconds = "0.0"
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall"] [node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall"]
script = ExtResource("28_n7qhm") script = ExtResource("28_n7qhm")
to = NodePath("../../Jump/DoubleJump") to = NodePath("../../Jump/SimpleJump")
event = &"jump" event = &"jump"
delay_in_seconds = "0.0" delay_in_seconds = "0.0"

3
player_controller/Scripts/PlayerController.cs
View File

@ -195,6 +195,7 @@ public partial class PlayerController : CharacterBody3D
private StateChartState _onWallHugging; private StateChartState _onWallHugging;
private StateChartState _onWallHanging; private StateChartState _onWallHanging;
private StateChartState _falling; private StateChartState _falling;
private StateChartState _to_weapon_dash;
private Transition _onJumpFromWall; private Transition _onJumpFromWall;
private Transition _onMegajumpFromWall; private Transition _onMegajumpFromWall;
@ -282,6 +283,7 @@ public partial class PlayerController : CharacterBody3D
_megaJump = StateChartState.Of(GetNode("StateChart/Root/Movement/Jump/MegaJump")); _megaJump = StateChartState.Of(GetNode("StateChart/Root/Movement/Jump/MegaJump"));
_doubleJumpEnabled = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne/DoubleJumpEnabled")); _doubleJumpEnabled = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne/DoubleJumpEnabled"));
_falling = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne/Falling")); _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")); _onWall = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall"));
_onJumpFromWall = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/OnJump")); _onJumpFromWall = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/OnJump"));
_onMegajumpFromWall = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/OnMegajump")); _onMegajumpFromWall = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/OnMegajump"));
@ -428,7 +430,6 @@ public partial class PlayerController : CharacterBody3D
} }
public void HandleWallHanging(float delta) public void HandleWallHanging(float delta)
{ {
GD.Print("Hanging");
WallHang(delta); WallHang(delta);
} }