Dustin/Attempt2
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Dustin:eb7e8d1a58ccbf437dc48020941c58af8ff182bd
Branches Tags
Dustin:main
Dustin:feature-movements3
Dustin:feature
Dustin:feature-movementsr2
Dustin:feature-multiplayer1
Dustin:feature-camera1
..
compare: Dustin:5196b3eb6e4fa086fb791f7cb677f0aeb17e728f
Branches Tags
Dustin:main
Dustin:feature-movements3
Dustin:feature
Dustin:feature-movementsr2
Dustin:feature-multiplayer1
Dustin:feature-camera1

No commits in common. "eb7e8d1a58ccbf437dc48020941c58af8ff182bd" and "5196b3eb6e4fa086fb791f7cb677f0aeb17e728f" have entirely different histories.
eb7e8d1a58 ... 5196b3eb6e

5 changed files with 8 additions and 23 deletions
Show Stats Expand all files Collapse all files

8
src/actors/players/playerE/PlayerE-Movement_StateReceiver.gd
View File

@ -18,8 +18,6 @@ func _ready():
if debug_velocity_controller: if debug_velocity_controller:
velocity_controller.debug = true velocity_controller.debug = true
assert(parent is Actor, "Movement state receiver assumes parent is an Actor type.")
#var state_ref :State #var state_ref :State
#var state_name :String #var state_name :String
#state_name = 'jump' #state_name = 'jump'
@ -376,12 +374,6 @@ func _state_process_physics_jump():
desired_movement_vector.y = UP desired_movement_vector.y = UP
#move_actor_as_desired() #move_actor_as_desired()
## We're no longer holding the jump button
if Input.is_action_just_released("jump_" + str(player_number)):
## Halve the velocity but only do it once?
## Just released will do it once but checking for still pressed wasn't working, not sure why.
velocity_controller.velocity = velocity_controller.velocity/2
apply_movement_to_parent( apply_movement_to_parent(
velocity_controller.calculate_velocity( velocity_controller.calculate_velocity(
physics_delta , physics_delta ,

7
src/actors/players/playerE/PlayerE.gd
View File

@ -198,13 +198,6 @@ func use_secondary_item() -> String:
func _on_Movement_StateMachine_state_changed(old_state_name, new_state): func _on_Movement_StateMachine_state_changed(old_state_name, new_state):
## Reduce stamina if this state has a cost ## Reduce stamina if this state has a cost
if state_stamina_cost.has(new_state.name): if state_stamina_cost.has(new_state.name):
## Skip stamina removal when coming from certain states
match old_state_name:
'climb':
pass
'ledge_grab':
pass
_:
stamina_component.reduce_stamina(state_stamina_cost[new_state.name]) stamina_component.reduce_stamina(state_stamina_cost[new_state.name])

2
src/actors/players/playerE/PlayerE.tscn
View File

@ -124,7 +124,7 @@ __meta__ = {
[node name="Movement_StateReceiver" parent="." index="2"] [node name="Movement_StateReceiver" parent="." index="2"]
script = ExtResource( 6 ) script = ExtResource( 6 )
debug_velocity_controller = false debug_velocity_controller = true
[node name="Modifier_Receiver" parent="." index="3" instance=ExtResource( 35 )] [node name="Modifier_Receiver" parent="." index="3" instance=ExtResource( 35 )]
callable_state_machine = NodePath("../Movement_StateMachine") callable_state_machine = NodePath("../Movement_StateMachine")

4
src/levels/TC_04.tscn
View File

@ -39,7 +39,7 @@ position = Vector2( 332, 61 )
[node name="LevelTransition" parent="." index="6" instance=ExtResource( 4 )] [node name="LevelTransition" parent="." index="6" instance=ExtResource( 4 )]
position = Vector2( -11, 64 ) position = Vector2( -11, 64 )
_transition_type = "door_left" _transition_type = "door_left"
_destination_level = "res://src/levels/TC_03.tscn" _destination_level = "res://src/levels/TC_02.tscn"
_destination_position_name = "EnterRight" _destination_position_name = "EnterRight"
[node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition" index="0"] [node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition" index="0"]
@ -51,7 +51,7 @@ __meta__ = {
[node name="LevelTransition2" parent="." index="7" instance=ExtResource( 4 )] [node name="LevelTransition2" parent="." index="7" instance=ExtResource( 4 )]
position = Vector2( 333, 64 ) position = Vector2( 333, 64 )
_destination_level = "res://src/levels/TC_05.tscn" _destination_level = "res://src/levels/CloneBox.tscn"
_destination_position_name = "EnterLeft" _destination_position_name = "EnterLeft"
[node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition2" index="0"] [node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition2" index="0"]

6
src/levels/TC_05.tscn
View File

@ -30,7 +30,7 @@ tile_data = PoolIntArray( 196616, 0, 0, 196620, 0, 0, 262152, 0, 65536, 262156,
[node name="TileMap Collision" parent="." index="2"] [node name="TileMap Collision" parent="." index="2"]
tile_set = ExtResource( 2 ) tile_set = ExtResource( 2 )
tile_data = PoolIntArray( -262145, 4, 0, -327661, 4, 0, -196609, 4, 0, -262125, 4, 0, -131073, 4, 0, -196589, 4, 0, -65537, 4, 0, -131053, 4, 65536, -1, 4, 0, -65517, 4, 65536, 65535, 4, 0, 19, 4, 65536, 131069, 4, 0, 131070, 4, 0, 131071, 4, 0, 65555, 4, 0, 65556, 4, 65536, 65557, 4, 65536, 65558, 4, 65536, 196605, 4, 0, 131094, 4, 65536, 262141, 4, 0, 196630, 4, 65536, 327677, 4, 0, 262145, 2, 1, 262162, 2, 1, 262166, 4, 65536, 393213, 4, 0, 393214, 4, 0, 393215, 4, 0, 327680, 4, 65536, 327681, 2, 65537, 327698, 2, 65537, 327699, 4, 65536, 327700, 4, 65536, 327701, 4, 65536, 327702, 4, 65536, 393216, 4, 0, 393235, 4, 0, 458752, 4, 65536, 458771, 4, 65536, 589823, 0, 1, 524288, 4, 131072, 524289, 0, 3, 524290, 0, 1, 524291, 0, 2, 524292, 0, 3, 524293, 0, 1, 524294, 0, 2, 524295, 0, 3, 524296, 0, 1, 524297, 0, 2, 524298, 0, 3, 524299, 0, 1, 524300, 0, 2, 524301, 0, 3, 524302, 0, 1, 524303, 0, 2, 524304, 0, 3, 524305, 0, 1, 524306, 0, 2, 524307, 4, 0, 524308, 0, 1, 524309, 0, 2, 524310, 0, 3, 655359, 0, 65537, 589824, 0, 65538, 589825, 0, 65539, 589826, 0, 65537, 589827, 0, 65538, 589828, 0, 65539, 589829, 0, 65537, 589830, 0, 65538, 589831, 0, 65539, 589832, 0, 65537, 589833, 0, 65538, 589834, 0, 65539, 589835, 0, 65537, 589836, 0, 65538, 589837, 0, 65539, 589838, 0, 65537, 589839, 0, 65538, 589840, 0, 65539, 589841, 0, 65537, 589842, 0, 65538, 589843, 0, 65539, 589844, 0, 65537, 589845, 0, 65538, 589846, 0, 65539, 720895, 0, 131073, 655360, 0, 131074, 655361, 0, 131075, 655362, 0, 131073, 655363, 0, 131074, 655364, 0, 131075, 655365, 0, 131073, 655366, 0, 131074, 655367, 0, 131075, 655368, 0, 131073, 655369, 0, 131074, 655370, 0, 131075, 655371, 0, 131073, 655372, 0, 131074, 655373, 0, 131075, 655374, 0, 131073, 655375, 0, 131074, 655376, 0, 131075, 655377, 0, 131073, 655378, 0, 131074, 655379, 0, 131075, 655380, 0, 131073, 655381, 0, 131074, 655382, 0, 131075, 786431, 0, 196609, 720896, 0, 196610, 720897, 0, 196611, 720898, 0, 196609, 720899, 0, 196610, 720900, 0, 196611, 720901, 0, 196609, 720902, 0, 196610, 720903, 0, 196611, 720904, 0, 196609, 720905, 0, 196610, 720906, 0, 196611, 720907, 0, 196609, 720908, 0, 196610, 720909, 0, 196611, 720910, 0, 196609, 720911, 0, 196610, 720912, 0, 196611, 720913, 0, 196609, 720914, 0, 196610, 720915, 0, 196611, 720916, 0, 196609, 720917, 0, 196610, 720918, 0, 196611, 851967, 0, 262145, 786432, 0, 262146, 786433, 0, 262147, 786434, 0, 262145, 786435, 0, 262146, 786436, 0, 262147, 786437, 0, 262145, 786438, 0, 262146, 786439, 0, 262147, 786440, 0, 262145, 786441, 0, 262146, 786442, 0, 262147, 786443, 0, 262145, 786444, 0, 262146, 786445, 0, 262147, 786446, 0, 262145, 786447, 0, 262146, 786448, 0, 262147, 786449, 0, 262145, 786450, 0, 262146, 786451, 0, 262147, 786452, 0, 262145, 786453, 0, 262146, 786454, 0, 262147 ) tile_data = PoolIntArray( -262145, 4, 0, -327661, 4, 0, -196609, 4, 0, -262125, 4, 0, -131073, 4, 0, -196589, 4, 0, -65537, 4, 0, -131053, 4, 65536, -1, 4, 0, -65517, 4, 65536, 65535, 4, 0, 19, 4, 65536, 131069, 4, 0, 131070, 4, 0, 131071, 4, 0, 65555, 4, 0, 65556, 4, 65536, 65557, 4, 65536, 65558, 4, 65536, 196605, 4, 0, 131094, 4, 65536, 262141, 4, 0, 196630, 4, 65536, 327677, 4, 0, 262145, 2, 1, 262146, 2, 2, 262161, 2, 0, 262162, 2, 1, 262166, 4, 65536, 393213, 4, 0, 393214, 4, 0, 393215, 4, 0, 327680, 4, 65536, 327681, 2, 65537, 327682, 2, 65538, 327697, 2, 65536, 327698, 2, 65537, 327699, 4, 65536, 327700, 4, 65536, 327701, 4, 65536, 327702, 4, 65536, 393216, 4, 0, 393235, 4, 0, 458752, 4, 65536, 458771, 4, 65536, 589823, 0, 1, 524288, 4, 131072, 524289, 0, 3, 524290, 0, 1, 524291, 0, 2, 524292, 0, 3, 524293, 0, 1, 524294, 0, 2, 524295, 0, 3, 524296, 0, 1, 524297, 0, 2, 524298, 0, 3, 524299, 0, 1, 524300, 0, 2, 524301, 0, 3, 524302, 0, 1, 524303, 0, 2, 524304, 0, 3, 524305, 0, 1, 524306, 0, 2, 524307, 4, 0, 524308, 0, 1, 524309, 0, 2, 524310, 0, 3, 655359, 0, 65537, 589824, 0, 65538, 589825, 0, 65539, 589826, 0, 65537, 589827, 0, 65538, 589828, 0, 65539, 589829, 0, 65537, 589830, 0, 65538, 589831, 0, 65539, 589832, 0, 65537, 589833, 0, 65538, 589834, 0, 65539, 589835, 0, 65537, 589836, 0, 65538, 589837, 0, 65539, 589838, 0, 65537, 589839, 0, 65538, 589840, 0, 65539, 589841, 0, 65537, 589842, 0, 65538, 589843, 0, 65539, 589844, 0, 65537, 589845, 0, 65538, 589846, 0, 65539, 720895, 0, 131073, 655360, 0, 131074, 655361, 0, 131075, 655362, 0, 131073, 655363, 0, 131074, 655364, 0, 131075, 655365, 0, 131073, 655366, 0, 131074, 655367, 0, 131075, 655368, 0, 131073, 655369, 0, 131074, 655370, 0, 131075, 655371, 0, 131073, 655372, 0, 131074, 655373, 0, 131075, 655374, 0, 131073, 655375, 0, 131074, 655376, 0, 131075, 655377, 0, 131073, 655378, 0, 131074, 655379, 0, 131075, 655380, 0, 131073, 655381, 0, 131074, 655382, 0, 131075, 786431, 0, 196609, 720896, 0, 196610, 720897, 0, 196611, 720898, 0, 196609, 720899, 0, 196610, 720900, 0, 196611, 720901, 0, 196609, 720902, 0, 196610, 720903, 0, 196611, 720904, 0, 196609, 720905, 0, 196610, 720906, 0, 196611, 720907, 0, 196609, 720908, 0, 196610, 720909, 0, 196611, 720910, 0, 196609, 720911, 0, 196610, 720912, 0, 196611, 720913, 0, 196609, 720914, 0, 196610, 720915, 0, 196611, 720916, 0, 196609, 720917, 0, 196610, 720918, 0, 196611, 851967, 0, 262145, 786432, 0, 262146, 786433, 0, 262147, 786434, 0, 262145, 786435, 0, 262146, 786436, 0, 262147, 786437, 0, 262145, 786438, 0, 262146, 786439, 0, 262147, 786440, 0, 262145, 786441, 0, 262146, 786442, 0, 262147, 786443, 0, 262145, 786444, 0, 262146, 786445, 0, 262147, 786446, 0, 262145, 786447, 0, 262146, 786448, 0, 262147, 786449, 0, 262145, 786450, 0, 262146, 786451, 0, 262147, 786452, 0, 262145, 786453, 0, 262146, 786454, 0, 262147 )
[node name="TileMap Foreground" parent="." index="3"] [node name="TileMap Foreground" parent="." index="3"]
tile_set = ExtResource( 2 ) tile_set = ExtResource( 2 )
@ -50,7 +50,7 @@ position = Vector2( 332, 61 )
[node name="LevelTransition" parent="." index="7" instance=ExtResource( 4 )] [node name="LevelTransition" parent="." index="7" instance=ExtResource( 4 )]
position = Vector2( -11, 64 ) position = Vector2( -11, 64 )
_transition_type = "door_left" _transition_type = "door_left"
_destination_level = "res://src/levels/TC_04.tscn" _destination_level = "res://src/levels/CloneBox.tscn"
_destination_position_name = "EnterRight" _destination_position_name = "EnterRight"
[node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition" index="0"] [node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition" index="0"]
@ -62,7 +62,7 @@ __meta__ = {
[node name="LevelTransition2" parent="." index="8" instance=ExtResource( 4 )] [node name="LevelTransition2" parent="." index="8" instance=ExtResource( 4 )]
position = Vector2( 333, 64 ) position = Vector2( 333, 64 )
_destination_level = "res://src/levels/CloneBox.tscn" _destination_level = "res://src/levels/TC_02.tscn"
_destination_position_name = "EnterLeft" _destination_position_name = "EnterLeft"
[node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition2" index="0"] [node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition2" index="0"]