WindCurrent.gd: Force-add/-remove all overlapping players when the current is activated/deactivated

Author: Daniel-Cortez

Scripts/Gimmicks/WindCurrent.gd

@@ -17,6 +17,8 @@ var player_count = 0
 # the variable is only set to true after waiting for the fan to start working
 @export var activated: bool = true
 
+var players: Array[PlayerChar] = []
+
 signal player_entered
 signal all_players_exited
 
@@ -29,13 +31,13 @@ func _physics_process(_delta: float) -> void:
 	if not activated:
 		return
 
-	for player: PlayerChar in get_overlapping_bodies():
+	for player: PlayerChar in players:
 		# ignore if player is dead or hit
 		match player.get_state():
 			PlayerChar.STATES.DIE, PlayerChar.STATES.HIT:
 				continue
 
-		# Ignore if the player is on a gimmick (such as a water bar
+		# Ignore if the player is on a gimmick (such as a water bar)
 		if player.get_active_gimmick() != null:
 			continue
 
@@ -83,29 +85,48 @@ func _physics_process(_delta: float) -> void:
 			player.set_state(PlayerChar.STATES.GIMMICK, player.get_predefined_hitbox(PlayerChar.HITBOXES.HORIZONTAL))
 			player.get_avatar().get_animator().play("current")
 
+func _add_player(player: PlayerChar) -> void:
+	if player in players:
+		return
 
-func _on_current_body_entered(body: PlayerChar) -> void:
-	body.set_gimmick_var("ActiveCurrent", self)
+	players.append(player)
+	player.set_gimmick_var("ActiveCurrent", self)
 	player_entered.emit()
 	player_count += 1
 
+func _remove_player(player: PlayerChar) -> void:
+	if not player in players:
+		return
+
+	players.erase(player)
+	if player.get_gimmick_var("ActiveCurrent") == self:
+		player.unset_gimmick_var("ActiveCurrent")
+	if normal_state_on_exit and player.get_state() == PlayerChar.STATES.GIMMICK:
+		player.set_state(PlayerChar.STATES.NORMAL, player.get_predefined_hitbox(PlayerChar.HITBOXES.HORIZONTAL))
 
-func _on_current_body_exited(body: PlayerChar) -> void:
-	if body.get_gimmick_var("ActiveCurrent") == self:
-		body.unset_gimmick_var("ActiveCurrent")
-	if normal_state_on_exit and body.get_state() == PlayerChar.STATES.GIMMICK:
-		body.set_state(PlayerChar.STATES.NORMAL, body.get_predefined_hitbox(PlayerChar.HITBOXES.HORIZONTAL))
-		
 	player_count -= 1
 	if player_count == 0:
 		all_players_exited.emit()
 
+
+func _on_current_body_entered(body: PlayerChar) -> void:
+	_add_player(body)
+
+func _on_current_body_exited(body: PlayerChar) -> void:
+	_remove_player(body)
+
 func activate() -> void:
 	if activated:
 		return
+
 	activated = true
+	for player: PlayerChar in get_overlapping_bodies():
+		_add_player(player)
 
 func deactivate() -> void:
 	if not activated:
 		return
+
 	activated = false
+	for player: PlayerChar in players:
+		_remove_player(player)