From 2c7a8e64f2ee702eee8704a20fdeb1d7e70e1114 Mon Sep 17 00:00:00 2001
From: Dustin <relay01@gmail.com>
Date: Wed, 30 Apr 2025 23:39:33 -0700
Subject: [PATCH] Tired state added to test movement.

---
 lib/classes/movement_state_receiver.gd  |  7 +++++++
 lib/classes/state_machine.gd            |  7 +++++++
 src/actors/players/playerE/PlayerE.gd   | 19 ++++++++++++++++++-
 src/actors/players/playerE/PlayerE.tscn |  2 +-
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/lib/classes/movement_state_receiver.gd b/lib/classes/movement_state_receiver.gd
index 8c76ba2..9c86db8 100644
--- a/lib/classes/movement_state_receiver.gd
+++ b/lib/classes/movement_state_receiver.gd
@@ -136,6 +136,13 @@ func _on_state_change(old_state_name:String, new_state :State):
 		push_warning("Received non animated Actor state.")
 	#current_state = new_state
 
+func _on_modifiers_updated(_modifier_type :int, _modifier_action :int, _merged_modifier :StateModifier):
+	## Get reference (subscribe) to the merged modifier for movement
+	if _merged_modifier is StateModifierMovement:
+		modifier = _merged_modifier
+
+
+
 ## Side effects for these variables
 # velocity - doesn't change but uses it to set base calculations
 # accepts the state to determine movement, the deltatime, and an optional direction 
diff --git a/lib/classes/state_machine.gd b/lib/classes/state_machine.gd
index 9c52839..e0fd723 100644
--- a/lib/classes/state_machine.gd
+++ b/lib/classes/state_machine.gd
@@ -68,6 +68,13 @@ func merge_modifiers():
 			if m.is_active:
 				#merged_animation_state_modifiers.merge(m)
 				this_mod_type.merge(m)
+		if m is StateModifierMovement:
+			if merged_modifiers.has("StateModifierMovement") == false:
+				merged_modifiers["StateModifierMovement"] = StateModifierMovement.new()
+			#print(m.name)
+			var this_mod_type :StateModifierMovement = merged_modifiers["StateModifierMovement"]
+			if m.is_active:
+				this_mod_type.merge(m)
 
 # Change to the new state by first calling any exit logic on the current state.
 func change_state(new_state: State) -> void:
diff --git a/src/actors/players/playerE/PlayerE.gd b/src/actors/players/playerE/PlayerE.gd
index c492ea7..031b04e 100644
--- a/src/actors/players/playerE/PlayerE.gd
+++ b/src/actors/players/playerE/PlayerE.gd
@@ -34,6 +34,15 @@ const state_to_item_map :Dictionary = {
 var player_info_index :int
 var player_data :PlayerData
 
+## Temp Modifier to test movement modifier (getting tired)
+var tired_debuff_modifier = StateModifierMovement.new()
+#	attack_sword = StateModifierAnimatedActor.new()
+#	attack_sword.setup('sword_drawn',StateModifier.TYPE.ANIMATION_SUFFIX,2.0)
+#	add_child(attack_sword.timeout)
+#	#attack_sword.animation_name = 'PoopenStein'
+#	attack_sword.animation_suffix = 'attack-sword'
+#	add_state_modifier.call_func(attack_sword)
+
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
@@ -59,6 +68,10 @@ func _ready():
 	player_inventory.select_primary(punch_item)
 	
 	movement_component.state_stamina_cost = state_stamina_cost
+	
+	tired_debuff_modifier.setup('so_tired', StateModifier.TYPE.NONE)
+	tired_debuff_modifier.horizontal_speed = -40
+	movement_state_machine.push_state_modifier(tired_debuff_modifier)
 
 #var stamina_recovery :float = 0.0
 
@@ -86,7 +99,11 @@ func _process(delta):
 		hitbox_component.damage_amount = state_damage_amount[movement_state_machine.current_state.name]
 	else:
 		hitbox_component.damage_amount = 10
-
+	
+	if stamina_component.stamina < 20 and tired_debuff_modifier.is_active == false:
+		tired_debuff_modifier.activate()
+	if stamina_component.stamina > 20 and tired_debuff_modifier.is_active == true:
+		tired_debuff_modifier.deactivate()
 
 
 func hit_Receiver(damage):
diff --git a/src/actors/players/playerE/PlayerE.tscn b/src/actors/players/playerE/PlayerE.tscn
index 0a732e5..1adc02e 100644
--- a/src/actors/players/playerE/PlayerE.tscn
+++ b/src/actors/players/playerE/PlayerE.tscn
@@ -148,7 +148,7 @@ max_health = 100
 [node name="Stamina_Component" parent="." index="9" instance=ExtResource( 29 )]
 unique_name_in_owner = true
 max_stamina = 50
-recovery_rate = 12
+recovery_rate = 2
 
 [node name="Hurtbox_Component" parent="." index="10" instance=ExtResource( 16 )]
 collision_layer = 16