diff --git a/assets/src/ba_data/python/bastd/game/capturetheflag.py b/assets/src/ba_data/python/bastd/game/capturetheflag.py index c32526f9..c123eaa7 100644 --- a/assets/src/ba_data/python/bastd/game/capturetheflag.py +++ b/assets/src/ba_data/python/bastd/game/capturetheflag.py @@ -290,6 +290,9 @@ class CaptureTheFlagGame(ba.TeamGameActivity): if (not team.gamedata['home_flag_at_base'] and flag.held_count == 0): time_out_counting_down = True + if flag.time_out_respawn_time is None: + flag.reset_return_times() + assert flag.time_out_respawn_time is not None flag.time_out_respawn_time -= 1 if flag.time_out_respawn_time <= 0: flag.handlemessage(ba.DieMessage()) diff --git a/assets/src/ba_data/python/bastd/game/elimination.py b/assets/src/ba_data/python/bastd/game/elimination.py index 6843a453..58c4cf8d 100644 --- a/assets/src/ba_data/python/bastd/game/elimination.py +++ b/assets/src/ba_data/python/bastd/game/elimination.py @@ -59,7 +59,7 @@ class Icon(ba.Actor): icon = player.get_icon() self.node = ba.newnode('image', - owner=self, + delegate=self, attrs={ 'texture': icon['texture'], 'tint_texture': icon['tint_texture'], diff --git a/assets/src/ba_data/python/bastd/game/hockey.py b/assets/src/ba_data/python/bastd/game/hockey.py index 7fae6d79..95705d6d 100644 --- a/assets/src/ba_data/python/bastd/game/hockey.py +++ b/assets/src/ba_data/python/bastd/game/hockey.py @@ -69,6 +69,7 @@ class Puck(ba.Actor): 'position': self._spawn_pos, 'materials': pmats }) + ba.animate(self.node, "model_scale", {0: 0, 0.2: 1.3, 0.26: 1}) def handlemessage(self, msg: Any) -> Any: if isinstance(msg, ba.DieMessage): diff --git a/assets/src/ba_data/python/bastd/game/onslaught.py b/assets/src/ba_data/python/bastd/game/onslaught.py index 35f76656..959c603e 100644 --- a/assets/src/ba_data/python/bastd/game/onslaught.py +++ b/assets/src/ba_data/python/bastd/game/onslaught.py @@ -430,11 +430,11 @@ class OnslaughtGame(ba.CoopGameActivity): {'entries': [ {'type': spazbot.ChargerBotProShielded, 'point': 'bottom_right'}, - {'type': spazbot.ChargerBotProShielded, 'point': 'Bottom'} + {'type': spazbot.ChargerBotProShielded, 'point': 'bottom'} if player_count > 2 else None, {'type': spazbot.ChargerBotProShielded, 'point': 'bottom_left'}, - {'type': spazbot.ChargerBotProShielded, 'point': 'Top'} + {'type': spazbot.ChargerBotProShielded, 'point': 'top'} if hard else None, {'type': spazbot.BomberBotProStatic, 'point': 'turret_top_middle'},