mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-02-05 23:13:46 +08:00
In actors: all _handle_message_sanity_check called only if __debug__
In games: all get_team() replaced by team (idk why ¯\_(ツ)_/¯)
This commit is contained in:
parent
c28966dbfa
commit
22c97baf01
@ -594,7 +594,8 @@ class Blast(ba.Actor):
|
|||||||
ba.timer(0.4, _extra_debris_sound)
|
ba.timer(0.4, _extra_debris_sound)
|
||||||
|
|
||||||
def handlemessage(self, msg: Any) -> Any:
|
def handlemessage(self, msg: Any) -> Any:
|
||||||
self._handlemessage_sanity_check()
|
if __debug__:
|
||||||
|
self._handlemessage_sanity_check()
|
||||||
|
|
||||||
if isinstance(msg, ba.DieMessage):
|
if isinstance(msg, ba.DieMessage):
|
||||||
if self.node:
|
if self.node:
|
||||||
|
|||||||
@ -333,7 +333,8 @@ class Flag(ba.Actor):
|
|||||||
1.0, ba.WeakCall(self._hide_score_text))
|
1.0, ba.WeakCall(self._hide_score_text))
|
||||||
|
|
||||||
def handlemessage(self, msg: Any) -> Any:
|
def handlemessage(self, msg: Any) -> Any:
|
||||||
self._handlemessage_sanity_check()
|
if __debug__:
|
||||||
|
self._handlemessage_sanity_check()
|
||||||
if isinstance(msg, ba.DieMessage):
|
if isinstance(msg, ba.DieMessage):
|
||||||
if self.node:
|
if self.node:
|
||||||
self.node.delete()
|
self.node.delete()
|
||||||
|
|||||||
@ -221,7 +221,8 @@ class PlayerSpaz(Spaz):
|
|||||||
# pylint: disable=too-many-branches
|
# pylint: disable=too-many-branches
|
||||||
# pylint: disable=too-many-statements
|
# pylint: disable=too-many-statements
|
||||||
# pylint: disable=too-many-nested-blocks
|
# pylint: disable=too-many-nested-blocks
|
||||||
self._handlemessage_sanity_check()
|
if __debug__:
|
||||||
|
self._handlemessage_sanity_check()
|
||||||
|
|
||||||
# Keep track of if we're being held and by who most recently.
|
# Keep track of if we're being held and by who most recently.
|
||||||
if isinstance(msg, ba.PickedUpMessage):
|
if isinstance(msg, ba.PickedUpMessage):
|
||||||
|
|||||||
@ -289,7 +289,8 @@ class PowerupBox(ba.Actor):
|
|||||||
|
|
||||||
def handlemessage(self, msg: Any) -> Any:
|
def handlemessage(self, msg: Any) -> Any:
|
||||||
# pylint: disable=too-many-branches
|
# pylint: disable=too-many-branches
|
||||||
self._handlemessage_sanity_check()
|
if __debug__:
|
||||||
|
self._handlemessage_sanity_check()
|
||||||
|
|
||||||
if isinstance(msg, ba.PowerupAcceptMessage):
|
if isinstance(msg, ba.PowerupAcceptMessage):
|
||||||
factory = get_factory()
|
factory = get_factory()
|
||||||
|
|||||||
@ -513,7 +513,8 @@ class SpazBot(basespaz.Spaz):
|
|||||||
|
|
||||||
def handlemessage(self, msg: Any) -> Any:
|
def handlemessage(self, msg: Any) -> Any:
|
||||||
# pylint: disable=too-many-branches
|
# pylint: disable=too-many-branches
|
||||||
self._handlemessage_sanity_check()
|
if __debug__:
|
||||||
|
self._handlemessage_sanity_check()
|
||||||
|
|
||||||
# Keep track of if we're being held and by who most recently.
|
# Keep track of if we're being held and by who most recently.
|
||||||
if isinstance(msg, ba.PickedUpMessage):
|
if isinstance(msg, ba.PickedUpMessage):
|
||||||
|
|||||||
@ -176,7 +176,7 @@ class AssaultGame(ba.TeamGameActivity):
|
|||||||
return
|
return
|
||||||
|
|
||||||
# If its another team's player, they scored.
|
# If its another team's player, they scored.
|
||||||
player_team = player.get_team()
|
player_team = player.team
|
||||||
if player_team is not team:
|
if player_team is not team:
|
||||||
|
|
||||||
# Prevent multiple simultaneous scores.
|
# Prevent multiple simultaneous scores.
|
||||||
|
|||||||
@ -63,7 +63,8 @@ class CTFFlag(stdflag.Flag):
|
|||||||
self.touch_return_time = float(
|
self.touch_return_time = float(
|
||||||
self.activity.settings['Flag Touch Return Time'])
|
self.activity.settings['Flag Touch Return Time'])
|
||||||
|
|
||||||
def get_team(self) -> ba.Team:
|
@property
|
||||||
|
def team(self) -> ba.Team:
|
||||||
"""return the flag's team."""
|
"""return the flag's team."""
|
||||||
return self._team
|
return self._team
|
||||||
|
|
||||||
@ -224,7 +225,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity):
|
|||||||
flag = ba.get_collision_info("opposing_node").getdelegate()
|
flag = ba.get_collision_info("opposing_node").getdelegate()
|
||||||
assert isinstance(flag, CTFFlag)
|
assert isinstance(flag, CTFFlag)
|
||||||
|
|
||||||
if flag.get_team() is team:
|
if flag.team is team:
|
||||||
team.gamedata['home_flag_at_base'] = True
|
team.gamedata['home_flag_at_base'] = True
|
||||||
|
|
||||||
# If the enemy flag is already here, score!
|
# If the enemy flag is already here, score!
|
||||||
@ -331,7 +332,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity):
|
|||||||
except Exception:
|
except Exception:
|
||||||
return # Can happen when we kill a flag.
|
return # Can happen when we kill a flag.
|
||||||
|
|
||||||
if flag.get_team() is team:
|
if flag.team is team:
|
||||||
|
|
||||||
# Check times here to prevent too much flashing.
|
# Check times here to prevent too much flashing.
|
||||||
if ('last_flag_leave_time' not in team.gamedata
|
if ('last_flag_leave_time' not in team.gamedata
|
||||||
@ -487,7 +488,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity):
|
|||||||
elif isinstance(msg, stdflag.FlagDeathMessage):
|
elif isinstance(msg, stdflag.FlagDeathMessage):
|
||||||
assert isinstance(msg.flag, CTFFlag)
|
assert isinstance(msg.flag, CTFFlag)
|
||||||
ba.timer(0.1,
|
ba.timer(0.1,
|
||||||
ba.Call(self._spawn_flag_for_team, msg.flag.get_team()))
|
ba.Call(self._spawn_flag_for_team, msg.flag.team))
|
||||||
elif isinstance(msg, stdflag.FlagPickedUpMessage):
|
elif isinstance(msg, stdflag.FlagPickedUpMessage):
|
||||||
# Store the last player to hold the flag for scoring purposes.
|
# Store the last player to hold the flag for scoring purposes.
|
||||||
assert isinstance(msg.flag, CTFFlag)
|
assert isinstance(msg.flag, CTFFlag)
|
||||||
|
|||||||
@ -228,10 +228,10 @@ class ConquestGame(ba.TeamGameActivity):
|
|||||||
except Exception:
|
except Exception:
|
||||||
return # Player may have left and his body hit the flag.
|
return # Player may have left and his body hit the flag.
|
||||||
|
|
||||||
if flag.get_team() is not player.get_team():
|
if flag.team is not player.team:
|
||||||
flag.set_team(player.get_team())
|
flag.set_team(player.team)
|
||||||
flag.light.color = player.get_team().color
|
flag.light.color = player.team.color
|
||||||
flag.node.color = player.get_team().color
|
flag.node.color = player.team.color
|
||||||
self.stats.player_scored(player, 10, screenmessage=False)
|
self.stats.player_scored(player, 10, screenmessage=False)
|
||||||
ba.playsound(self._swipsound)
|
ba.playsound(self._swipsound)
|
||||||
self._flash_flag(flag)
|
self._flash_flag(flag)
|
||||||
|
|||||||
@ -255,7 +255,7 @@ class HockeyGame(ba.TeamGameActivity):
|
|||||||
except Exception:
|
except Exception:
|
||||||
player = puck = None
|
player = puck = None
|
||||||
if player and puck:
|
if player and puck:
|
||||||
puck.last_players_to_touch[player.get_team().get_id()] = player
|
puck.last_players_to_touch[player.team.get_id()] = player
|
||||||
|
|
||||||
def _kill_puck(self) -> None:
|
def _kill_puck(self) -> None:
|
||||||
self._puck = None
|
self._puck = None
|
||||||
|
|||||||
@ -241,7 +241,7 @@ class RaceGame(ba.TeamGameActivity):
|
|||||||
|
|
||||||
player.gamedata['last_region'] = this_region
|
player.gamedata['last_region'] = this_region
|
||||||
if last_region >= len(self._regions) - 2 and this_region == 0:
|
if last_region >= len(self._regions) - 2 and this_region == 0:
|
||||||
team = player.get_team()
|
team = player.team
|
||||||
player.gamedata['lap'] = min(self.settings['Laps'],
|
player.gamedata['lap'] = min(self.settings['Laps'],
|
||||||
player.gamedata['lap'] + 1)
|
player.gamedata['lap'] + 1)
|
||||||
|
|
||||||
@ -283,10 +283,10 @@ class RaceGame(ba.TeamGameActivity):
|
|||||||
# If the whole team has finished the race.
|
# If the whole team has finished the race.
|
||||||
if team.gamedata['lap'] == self.settings['Laps']:
|
if team.gamedata['lap'] == self.settings['Laps']:
|
||||||
ba.playsound(self._score_sound)
|
ba.playsound(self._score_sound)
|
||||||
player.get_team().gamedata['finished'] = True
|
player.team.gamedata['finished'] = True
|
||||||
assert self._timer is not None
|
assert self._timer is not None
|
||||||
self._last_team_time = (
|
self._last_team_time = (
|
||||||
player.get_team().gamedata['time']) = (
|
player.team.gamedata['time']) = (
|
||||||
ba.time() - self._timer.getstarttime())
|
ba.time() - self._timer.getstarttime())
|
||||||
self._check_end_game()
|
self._check_end_game()
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user