From 501f544ff8339b107896988292dc0d1ed0730479 Mon Sep 17 00:00:00 2001 From: FAL-Guys <85888040+FAL-Guys@users.noreply.github.com> Date: Fri, 19 Aug 2022 21:40:08 +0430 Subject: [PATCH 1/6] Epic mode in keepaway.py Added Epic mode support. --- assets/src/ba_data/python/bastd/game/keepaway.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/src/ba_data/python/bastd/game/keepaway.py b/assets/src/ba_data/python/bastd/game/keepaway.py index 0dd355ee..e3b4eca7 100644 --- a/assets/src/ba_data/python/bastd/game/keepaway.py +++ b/assets/src/ba_data/python/bastd/game/keepaway.py @@ -76,6 +76,7 @@ class KeepAwayGame(ba.TeamGameActivity[Player, Team]): ], default=1.0, ), + ba.BoolSetting('Epic Mode', default=False), ] scoreconfig = ba.ScoreConfig(label='Time Held') default_music = ba.MusicType.KEEP_AWAY @@ -115,6 +116,8 @@ class KeepAwayGame(ba.TeamGameActivity[Player, Team]): self._flag: Flag | None = None self._hold_time = int(settings['Hold Time']) self._time_limit = float(settings['Time Limit']) + self._epic_mode = bool(settings['Epic Mode']) + self.slow_motion = self._epic_mode def get_instance_description(self) -> str | Sequence: return 'Carry the flag for ${ARG1} seconds.', self._hold_time From 23d2f9ec539335c2f927cec13fafecffc3a1f58c Mon Sep 17 00:00:00 2001 From: FAL-Guys <85888040+FAL-Guys@users.noreply.github.com> Date: Fri, 19 Aug 2022 21:53:30 +0430 Subject: [PATCH 2/6] Update kingofthehill.py --- assets/src/ba_data/python/bastd/game/kingofthehill.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/src/ba_data/python/bastd/game/kingofthehill.py b/assets/src/ba_data/python/bastd/game/kingofthehill.py index becdc8b7..c573141b 100644 --- a/assets/src/ba_data/python/bastd/game/kingofthehill.py +++ b/assets/src/ba_data/python/bastd/game/kingofthehill.py @@ -79,6 +79,7 @@ class KingOfTheHillGame(ba.TeamGameActivity[Player, Team]): ], default=1.0, ), + ba.BoolSetting('Epic Mode', default=False), ] scoreconfig = ba.ScoreConfig(label='Time Held') @@ -115,6 +116,7 @@ class KingOfTheHillGame(ba.TeamGameActivity[Player, Team]): self._scoring_team: weakref.ref[Team] | None = None self._hold_time = int(settings['Hold Time']) self._time_limit = float(settings['Time Limit']) + self._epic_mode = bool(settings['Epic Mode']) self._flag_region_material = ba.Material() self._flag_region_material.add_actions( conditions=('they_have_material', shared.player_material), @@ -128,6 +130,7 @@ class KingOfTheHillGame(ba.TeamGameActivity[Player, Team]): )) # Base class overrides. + self.slow_motion = self._epic_mode self.default_music = ba.MusicType.SCARY def get_instance_description(self) -> str | Sequence: From 6fbbe5ca52f545d0043e6c2cc03c57a167bfd4fc Mon Sep 17 00:00:00 2001 From: FAL-Guys <85888040+FAL-Guys@users.noreply.github.com> Date: Thu, 1 Sep 2022 19:48:02 +0430 Subject: [PATCH 3/6] Update keepaway.py --- assets/src/ba_data/python/bastd/game/keepaway.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/bastd/game/keepaway.py b/assets/src/ba_data/python/bastd/game/keepaway.py index e3b4eca7..2e179534 100644 --- a/assets/src/ba_data/python/bastd/game/keepaway.py +++ b/assets/src/ba_data/python/bastd/game/keepaway.py @@ -79,7 +79,6 @@ class KeepAwayGame(ba.TeamGameActivity[Player, Team]): ba.BoolSetting('Epic Mode', default=False), ] scoreconfig = ba.ScoreConfig(label='Time Held') - default_music = ba.MusicType.KEEP_AWAY @classmethod def supports_session_type(cls, sessiontype: type[ba.Session]) -> bool: @@ -118,6 +117,8 @@ class KeepAwayGame(ba.TeamGameActivity[Player, Team]): self._time_limit = float(settings['Time Limit']) self._epic_mode = bool(settings['Epic Mode']) self.slow_motion = self._epic_mode + self.default_music = (ba.MusicType.EPIC if self._epic_mode else + ba.MusicType.KEEP_AWAY) def get_instance_description(self) -> str | Sequence: return 'Carry the flag for ${ARG1} seconds.', self._hold_time From d6f7971af7e26c4dc5f0d5646e1a6dc182e57a99 Mon Sep 17 00:00:00 2001 From: FAL-Guys <85888040+FAL-Guys@users.noreply.github.com> Date: Thu, 1 Sep 2022 19:49:02 +0430 Subject: [PATCH 4/6] Update kingofthehill.py --- assets/src/ba_data/python/bastd/game/kingofthehill.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/bastd/game/kingofthehill.py b/assets/src/ba_data/python/bastd/game/kingofthehill.py index c573141b..87b8080e 100644 --- a/assets/src/ba_data/python/bastd/game/kingofthehill.py +++ b/assets/src/ba_data/python/bastd/game/kingofthehill.py @@ -131,7 +131,8 @@ class KingOfTheHillGame(ba.TeamGameActivity[Player, Team]): # Base class overrides. self.slow_motion = self._epic_mode - self.default_music = ba.MusicType.SCARY + self.default_music = (ba.MusicType.EPIC if self._epic_mode else + ba.MusicType.SCARY) def get_instance_description(self) -> str | Sequence: return 'Secure the flag for ${ARG1} seconds.', self._hold_time From de44f8b459f9cbb707cf5ac5d8d992bdc84eae87 Mon Sep 17 00:00:00 2001 From: FAL-Guys <85888040+FAL-Guys@users.noreply.github.com> Date: Thu, 1 Sep 2022 20:02:11 +0430 Subject: [PATCH 5/6] Update hockey.py --- assets/src/ba_data/python/bastd/game/hockey.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/bastd/game/hockey.py b/assets/src/ba_data/python/bastd/game/hockey.py index 97213a60..77a95ce0 100644 --- a/assets/src/ba_data/python/bastd/game/hockey.py +++ b/assets/src/ba_data/python/bastd/game/hockey.py @@ -137,8 +137,8 @@ class HockeyGame(ba.TeamGameActivity[Player, Team]): ], default=1.0, ), + ba.BoolSetting('Epic Mode', default=False), ] - default_music = ba.MusicType.HOCKEY @classmethod def supports_session_type(cls, sessiontype: type[ba.Session]) -> bool: @@ -203,6 +203,10 @@ class HockeyGame(ba.TeamGameActivity[Player, Team]): self._puck: Puck | None = None self._score_to_win = int(settings['Score to Win']) self._time_limit = float(settings['Time Limit']) + self._epic_mode = bool(settings['Epic Mode']) + self.slow_motion = self._epic_mode + self.default_music = (ba.MusicType.EPIC if self._epic_mode else + ba.MusicType.HOCKEY) def get_instance_description(self) -> str | Sequence: if self._score_to_win == 1: From 8793937c16bcf22cdc911caccf470042175a8da2 Mon Sep 17 00:00:00 2001 From: FAL-Guys <85888040+FAL-Guys@users.noreply.github.com> Date: Thu, 1 Sep 2022 20:06:44 +0430 Subject: [PATCH 6/6] Update football.py --- assets/src/ba_data/python/bastd/game/football.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/src/ba_data/python/bastd/game/football.py b/assets/src/ba_data/python/bastd/game/football.py index c499435f..63236c19 100644 --- a/assets/src/ba_data/python/bastd/game/football.py +++ b/assets/src/ba_data/python/bastd/game/football.py @@ -106,8 +106,8 @@ class FootballTeamGame(ba.TeamGameActivity[Player, Team]): ], default=1.0, ), + ba.BoolSetting('Epic Mode', default=False), ] - default_music = ba.MusicType.FOOTBALL @classmethod def supports_session_type(cls, sessiontype: type[ba.Session]) -> bool: @@ -143,6 +143,10 @@ class FootballTeamGame(ba.TeamGameActivity[Player, Team]): self._flag_respawn_light: ba.NodeActor | None = None self._score_to_win = int(settings['Score to Win']) self._time_limit = float(settings['Time Limit']) + self._epic_mode = bool(settings['Epic Mode']) + self.slow_motion = self._epic_mode + self.default_music = (ba.MusicType.EPIC if self._epic_mode else + ba.MusicType.FOOTBALL) def get_instance_description(self) -> str | Sequence: touchdowns = self._score_to_win / 7 @@ -330,7 +334,6 @@ class FootballCoopGame(ba.CoopGameActivity[Player, Team]): tips = ['Use the pick-up button to grab the flag < ${PICKUP} >'] scoreconfig = ba.ScoreConfig(scoretype=ba.ScoreType.MILLISECONDS, version='B') - default_music = ba.MusicType.FOOTBALL # FIXME: Need to update co-op games to use getscoreconfig. def get_score_type(self) -> str: