RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-06 07:23:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

El code

Browse Source
This commit is contained in:
3alTemp 2024-03-03 21:46:46 -06:00
parent c2d88cab28
commit 1a42c50052
No known key found for this signature in database
GPG Key ID: FC599A8DFAEC706C
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py
View File

@ -225,9 +225,22 @@ class PlayerSpaz(Spaz):
elif isinstance(msg, bs.DieMessage): elif isinstance(msg, bs.DieMessage):
# Report player deaths to the game. # Report player deaths to the game.
if not self._dead: if not self._dead:
# Was this player killed while being held?
was_held = (
self.held_count > 0
and self.last_player_held_by
)
# Was this player attacked before death?
was_attacked_recently = (
self.last_player_attacked_by
and bs.time() - self.last_attacked_time < 4.0
)
# Immediate-mode or left-game deaths don't count as 'kills'. # Immediate-mode or left-game deaths don't count as 'kills'.
killed = ( killed = (
not msg.immediate and msg.how is not bs.DeathType.LEFT_GAME not msg.immediate
and msg.how is not bs.DeathType.LEFT_GAME
or was_held
or was_attacked_recently
) )
activity = self._activity() activity = self._activity()
@ -238,7 +251,7 @@ class PlayerSpaz(Spaz):
else: else:
# If this player was being held at the time of death, # If this player was being held at the time of death,
# the holder is the killer. # the holder is the killer.
if self.held_count > 0 and self.last_player_held_by: if was_held:
killerplayer = self.last_player_held_by killerplayer = self.last_player_held_by
else: else:
# Otherwise, if they were attacked by someone in the # Otherwise, if they were attacked by someone in the
@ -248,10 +261,7 @@ class PlayerSpaz(Spaz):
# all bot kills would register as suicides; need to # all bot kills would register as suicides; need to
# change this from last_player_attacked_by to # change this from last_player_attacked_by to
# something like last_actor_attacked_by to fix that. # something like last_actor_attacked_by to fix that.
if ( if was_attacked_recently:
self.last_player_attacked_by
and bs.time() - self.last_attacked_time < 4.0
):
killerplayer = self.last_player_attacked_by killerplayer = self.last_player_attacked_by
else: else:
# ok, call it a suicide unless we're in co-op # ok, call it a suicide unless we're in co-op