openfpsz/open-fpsz
1
0
Fork 0
mirror of https://gitlab.com/open-fpsz/open-fpsz.git synced 2026-07-13 15:34:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract MatchParticipantComponent from Player entity and fix HealthComponent tests

Browse source
This commit is contained in:
Squinty 2024-04-27 13:32:03 +00:00
parent d238c29f76
commit b339bf34f0
23 changed files with 149 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

6
maps/components/deathmatch_scoring_component.gd
View file

@ -28,9 +28,9 @@ func unsubscribe_player(player : Player) -> void:
player.died.disconnect(_on_player_died)
func _on_player_died(player : Player, killer_id : int) -> void:
if player.player_id != killer_id:
if player.match_participant_component.player_id != killer_id:
var node_name : String = str(killer_id)
if _players.has_node(node_name):
var killer : Player = _players.get_node(node_name)
_scoreboard.increment_kill_count(killer)
_scoreboard.add_score_to_player(killer, 10)
_scoreboard.increment_kill_count(killer.match_participant_component)
_scoreboard.add_score_to_player(killer.match_participant_component, 10)

10
maps/components/rabbit_scoring_component.gd
View file

@ -38,16 +38,16 @@ func setup(flag : Flag) -> void:
flag.dropped.connect(_on_flag_dropped)
func _on_flag_grabbed(grabber : Player) -> void:
grabber.team_id = _team_rabbit.team_id
_scoreboard.add_score_to_player(grabber, ON_GRAB_SCORE)
grabber.match_participant_component.team_id = _team_rabbit.team_id
_scoreboard.add_score_to_player(grabber.match_participant_component, ON_GRAB_SCORE)
_flag_carrier_scoring_timer.start()
func _on_flag_regrabbed(grabber : Player) -> void:
grabber.team_id = _team_rabbit.team_id
grabber.match_participant_component.team_id = _team_rabbit.team_id
func _on_flag_dropped(dropper : Player) -> void:
dropper.team_id = _team_chasers.team_id
dropper.match_participant_component.team_id = _team_chasers.team_id
_flag_carrier_scoring_timer.stop()
func _on_flag_carrier_scoring_timer_timeout(flag : Flag) -> void:
_scoreboard.add_score_to_player(flag.last_carrier, ON_HOLD_SCORE)
_scoreboard.add_score_to_player(flag.last_carrier.match_participant_component, ON_HOLD_SCORE)