Modifiers applying for movement! but now I need bodges in the object mover again.

lib/classes/movement_parameters.gd

@@ -1,32 +1,45 @@
-class_name MovementParameters
+class_name MovementParameters
-extends Reference
+extends Reference
-
+
-## Vector based ones for x and y
+## Vector based ones for x and y
-export var base_move_speed :Vector2
+export var base_move_speed :Vector2
-export var base_move_acceleration :Vector2
+export var base_move_acceleration :Vector2
-export var move_speed_modifier :Vector2
+export var move_speed_modifier :Vector2
-export var move_speed_modifier_acceleration :Vector2
+export var move_speed_modifier_acceleration :Vector2
-
+
-var gravity: int = ProjectSettings.get_setting("physics/2d/default_gravity")
+var gravity: int = ProjectSettings.get_setting("physics/2d/default_gravity")
-var jerk: float = 0.0
+var jerk: float = 0.0
-# export var base_h_move_speed :float
+# export var base_h_move_speed :float
-# export var base_h_move_acceleration :float
+# export var base_h_move_acceleration :float
-# export var h_move_speed_modifier :float
+# export var h_move_speed_modifier :float
-# export var h_move_modifier_move_acceleration :float
+# export var h_move_modifier_move_acceleration :float
-
+
-# export var base_v_move_speed :float
+# export var base_v_move_speed :float
-# export var base_v_move_acceleration :float
+# export var base_v_move_acceleration :float
-# export var v_move_speed_modifier :float
+# export var v_move_speed_modifier :float
-# export var v_move_modifier_move_acceleration :float
+# export var v_move_modifier_move_acceleration :float
-
+
-func modify(_movement_parameters :MovementParameters):
+func modify(_movement_parameters :MovementParameters):
-    pass
+	pass
-
+
-# var movement_params :Dictionary = {
+func apply_state_modifier(_modifier :StateModifierMovement):
-#     "_base_h_move_speed" : _state.horizontal_speed,
+	match _modifier.modifier_type:
-#     "_base_h_move_acceleration" : _state.horizontal_acceleration,
+		StateModifierMovement.SUB_TYPE.PASS_ZERO:
-#     "_base_h_move_speed_modifier" : _state.horizontal_speed_offset,
+			continue
-#     "_base_h_move_modifier_move_acceleration" : _state.horizontal_speed_offset_acceleration,
+		_:
-#     "_jerk_factor" : _state.jerk_factor,
+			#print( StateModifierMovement.SUB_TYPE.PASS_ZERO, "<-->", _modifier.modifier_type )
-#     "_gravity" : _state.gravity
+			base_move_speed.x += _modifier.horizontal_speed
-# }
+			base_move_acceleration.x += _modifier.horizontal_acceleration
+			move_speed_modifier.x += _modifier.horizontal_speed_offset
+			move_speed_modifier_acceleration.x += _modifier.horizontal_speed_offset_acceleration
+
+	
+	
+# var movement_params :Dictionary = {
+#     "_base_h_move_speed" : _state.horizontal_speed,
+#     "_base_h_move_acceleration" : _state.horizontal_acceleration,
+#     "_base_h_move_speed_modifier" : _state.horizontal_speed_offset,
+#     "_base_h_move_modifier_move_acceleration" : _state.horizontal_speed_offset_acceleration,
+#     "_jerk_factor" : _state.jerk_factor,
+#     "_gravity" : _state.gravity
+# }

lib/classes/movement_state_receiver.gd

@@ -168,6 +168,8 @@ func new_move_actor_as_desired(_delta :float,
 	# 	"_gravity" : _state.gravity
 	# }
 	var movement_parameters :MovementParameters = _state.get_movement_parameters()
+	if modifier:
+		movement_parameters.apply_state_modifier(modifier)
 
 	var calc_velocity = Vector2.ZERO
 	if _velocity_override.x != 0.0:
@@ -229,10 +231,14 @@ func new_move_actor_as_desired(_delta :float,
 		##
 #		calc_inertia.x = clamp( calc_inertia.x + (calc_acceleration.x * _delta),
 #							h_speed.x , h_speed.y)
+		## Start speed really shouldn't be less than zero (modifiers can do this)
+		if h_speed.x < h_speed.y:
+			h_speed.x = clamp(h_speed.x,0.0,h_speed.y)
 		## If there is currently no inertia apply the base h_speed
 		if calc_inertia.x == 0.0:
 			calc_inertia.x = h_speed.x
 		elif calc_inertia.x != 0.0:
+			##WIP: attempts to apply start speed only once
 			if h_speed.x < h_speed.y:
 				if calc_inertia.x < h_speed.x and sign(move_direction.x) == calc_inertial_dir.x:
 					calc_inertia.x = h_speed.x
@@ -245,6 +251,9 @@ func new_move_actor_as_desired(_delta :float,
 		## Apply friction
 		calc_inertia.x = move_toward(calc_inertia.x, 0, abs(calc_friction.x * _delta))
 		
+		if modifier and modifier.is_active:
+			var foo = 2+2 # breakpoint check
+		
 		## Working but trying something new:
 #		if h_speed.y > h_speed.x:
 #			calc_inertia.x = move_toward(calc_inertia.x, h_speed.y, (calc_acceleration.x * _delta))
@@ -256,6 +265,9 @@ func new_move_actor_as_desired(_delta :float,
 
 			
 	elif calc_inertia.x != 0.0: ## We still have inertia but no difference in movement
+		if h_speed.x < h_speed.y:
+			h_speed.x = clamp(h_speed.x,0.0,h_speed.y)
+
 		if calc_acceleration.x != 0.0: # We are applying acceleration
 			## Move back towards the base speed
 			calc_inertia.x = move_toward(calc_inertia.x, h_speed.x, abs(calc_acceleration.x * _delta))
@@ -275,6 +287,10 @@ func new_move_actor_as_desired(_delta :float,
 				#calc_inertia.x = move_toward(calc_inertia.x, h_speed.x, ( calc_friction.x * _delta))
 				## Apply friction
 				calc_inertia.x = move_toward(calc_inertia.x, 0, abs(calc_friction.x * _delta))
+#				if calc_inertia.x < 0:
+#					calc_inertia.x = move_toward(calc_inertia.x, 0, abs(calc_friction.x * _delta))
+#				if calc_inertia.x > 0:
+#					calc_inertia.x = move_toward(calc_inertia.x, 0, abs(calc_friction.x * _delta) * -1)
 			else:
 				## no residual acceleration (friction) applies, kill the momentum
 				calc_inertia.x = 0.0
@@ -287,7 +303,9 @@ func new_move_actor_as_desired(_delta :float,
 	else:
 		## inertia is just base speed
 		calc_inertia.x = h_speed.x
-		calc_inertial_dir.x = 0.0
+		calc_inertial_dir.x = 0.0 # sign(calc_inertia.x) 
+#		if move_direction.x == 0:
+#			calc_inertial_dir.x = sign(h_speed.x)
 		
 		
 	## Another idea, just return the calculated velocity in PPS	

lib/classes/state_modifier.gd

@@ -10,6 +10,7 @@ extends Reference
 ##
 ## @WIP
 
+## Deprecated, should use modifier level 
 # Used for mutually exclusive modifiers to aid merging 
 enum TYPE {
 	NONE, # Usually just a physics modifier
@@ -104,6 +105,7 @@ func setup(modifier_name:String, type = TYPE.NONE,_timeout_seconds : float = 0):
 func reset():
 	name = ''
 	modifier_type = TYPE.NONE
+	is_active = false
 
 func copy(_copy_state: StateModifier):
 	## This should really be the other way.

lib/classes/state_modifier_animation.gd

@@ -8,6 +8,13 @@ var animation_suffix: String = ''
 var animation_starting_frame: int = 0
 var animation_speed: float
 
+enum SUB_TYPE {
+	NONE, 			# Usually just a physics modifier
+	EXIT_ANIMATION 	# Adds an animation at the end? Not really sure anymore
+	ANIMATION_SUFFIX, # Adds an animation suffix to aid slightly modified animations
+	REPLACE_ANIMATION # Completely replaces a state animation.
+}
+
 func _to_string():
 	return "StateModifierAnimatedActor"
 
@@ -38,6 +45,7 @@ func copy(_copy_state: StateModifier):
 
 func merge(_merge_from_modifier: StateModifier):
 	.merge(_merge_from_modifier)
+	is_active = _merge_from_modifier.is_active
 	#print(_merge_from_modifier.to_string(), " I'm a mod named: ", _merge_from_modifier.get_class())
 	#if _merge_from_modifier is StateModifierAnimatedActor:
 	if _merge_from_modifier.to_string() == "StateModifierAnimatedActor":

lib/classes/state_modifier_movement.gd

@@ -12,12 +12,17 @@ var jerk_factor: float = 0
 
 var gravity: int = 0
 
+enum SUB_TYPE {
+	NONE, 			# Basic physics modifier just adds numbers
+	PASS_ZERO		# Allows ability to surpass zero and move backwords
+}
+
 func _to_string():
 	return "StateModifierMovement"
 
 func reset():
 	.reset()
-
+	modifier_type = SUB_TYPE.NONE
 	horizontal_speed = 0
 	horizontal_acceleration = 0
 	## Movement Speed Offsets (Positive or Negative)
@@ -28,14 +33,23 @@ func reset():
 
 func copy(_copy_state: StateModifier):
 	.copy(_copy_state)
+	modifier_type = _copy_state.modifier_type
 	if _copy_state.to_string() == "StateModifierMovement":
 		_copy_state.horizontal_speed = horizontal_speed
 		_copy_state.horizontal_acceleration = horizontal_acceleration
 
 func merge(_merge_from_modifier: StateModifier):
 	.merge(_merge_from_modifier)
+	is_active = _merge_from_modifier.is_active
+	if modifier_type != SUB_TYPE.NONE and _merge_from_modifier.modifier_type != SUB_TYPE.NONE:
+		push_warning( "Attempt to push modifier type over existing one. Wut du?" )
 	if _merge_from_modifier.to_string() == "StateModifierMovement":
-		horizontal_speed += _merge_from_modifier.horizontal_speed
+		if modifier_type == SUB_TYPE.NONE and _merge_from_modifier.modifier_type != SUB_TYPE.NONE:
-		horizontal_acceleration += _merge_from_modifier.horizontal_acceleration
+			modifier_type = _merge_from_modifier.modifier_type
-		horizontal_speed_offset += _merge_from_modifier.horizontal_speed_offset
+
-		horizontal_speed_offset_acceleration += _merge_from_modifier.horizontal_speed_offset_acceleration
+		match _merge_from_modifier.modifier_type:
+			_:
+				horizontal_speed += _merge_from_modifier.horizontal_speed
+				horizontal_acceleration += _merge_from_modifier.horizontal_acceleration
+				horizontal_speed_offset += _merge_from_modifier.horizontal_speed_offset
+				horizontal_speed_offset_acceleration += _merge_from_modifier.horizontal_speed_offset_acceleration

src/actors/players/playerE/PlayerE.gd

@@ -69,7 +69,7 @@ func _ready():
 	
 	movement_component.state_stamina_cost = state_stamina_cost
 	
-	tired_debuff_modifier.setup('so_tired', StateModifier.TYPE.NONE)
+	tired_debuff_modifier.setup('so_tired', StateModifierMovement.SUB_TYPE.NONE)
 	tired_debuff_modifier.horizontal_speed = -40
 	movement_state_machine.push_state_modifier(tired_debuff_modifier)