This commit is contained in:
Eric 2023-06-10 20:09:09 -07:00
parent 8e127a7c48
commit 08bcf88929
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 17 additions and 15 deletions

View File

@ -6,7 +6,8 @@ from __future__ import annotations
from typing import TYPE_CHECKING, TypeVar
import _babase
import babase
import _bascenev1
from bascenev1._freeforallsession import FreeForAllSession
from bascenev1._gameactivity import GameActivity
@ -15,8 +16,9 @@ from bascenev1._dualteamsession import DualTeamSession
if TYPE_CHECKING:
from typing import Any, Sequence
from bascenev1lib.actor.playerspaz import PlayerSpaz
import babase
import bascenev1
PlayerT = TypeVar('PlayerT', bound='bascenev1.Player')
@ -86,14 +88,14 @@ class TeamGameActivity(GameActivity[PlayerT, TeamT]):
# Award a few (classic) achievements.
if isinstance(self.session, FreeForAllSession):
if len(self.players) >= 2:
if _babase.app.classic is not None:
_babase.app.classic.ach.award_local_achievement(
if babase.app.classic is not None:
babase.app.classic.ach.award_local_achievement(
'Free Loader'
)
elif isinstance(self.session, DualTeamSession):
if len(self.players) >= 4:
if _babase.app.classic is not None:
_babase.app.classic.ach.award_local_achievement(
if babase.app.classic is not None:
babase.app.classic.ach.award_local_achievement(
'Team Player'
)
except Exception:

View File

@ -9,15 +9,15 @@ import random
import logging
from typing import TYPE_CHECKING
from bascenev1lib.actor.text import Text
from bascenev1lib.actor.zoomtext import ZoomText
import bascenev1 as bs
import bauiv1 as bui
from bascenev1lib.actor.text import Text
from bascenev1lib.actor.zoomtext import ZoomText
if TYPE_CHECKING:
from typing import Any, Sequence
import baclassic
from bauiv1lib.store.button import StoreButton
from bauiv1lib.league.rankbutton import LeagueRankButton

View File

@ -21,13 +21,12 @@ from collections import deque
from typing import TYPE_CHECKING
import bascenev1 as bs
from bascenev1lib.actor.spaz import Spaz
if TYPE_CHECKING:
from typing import Any, Callable, Sequence
import baclassic
def _safesetattr(node: bs.Node | None, attr: str, value: Any) -> None:
if node:

View File

@ -10,8 +10,7 @@ import babase
import bascenev1 as bs
if TYPE_CHECKING:
import baclassic
import bascenev1 as bs
pass
# FIXME: Could change this to be a classmethod of session types?
@ -31,7 +30,7 @@ class PlaylistTypeVars:
resource='playModes.teamsText', fallback_resource='teamsText'
)
self.get_default_list_call = get_default_teams_playlist
self.session_type_name = 'ba.DualTeamSession'
self.session_type_name = 'bascenev1.DualTeamSession'
self.config_name = 'Team Tournament'
self.window_title_name = babase.Lstr(
resource='playModes.teamsText', fallback_resource='teamsText'
@ -44,7 +43,7 @@ class PlaylistTypeVars:
fallback_resource='freeForAllText',
)
self.get_default_list_call = get_default_free_for_all_playlist
self.session_type_name = 'ba.FreeForAllSession'
self.session_type_name = 'bascenev1.FreeForAllSession'
self.config_name = 'Free-for-All'
self.window_title_name = babase.Lstr(
resource='playModes.freeForAllText',

View File

@ -302,6 +302,7 @@ class PluginWindow(bui.Window):
else:
# Make sure we handle all cases.
assert_never(self._category)
sub_height = 0
num_shown = 0
for i, availplug in enumerate(pluglist):
@ -320,6 +321,7 @@ class PluginWindow(bui.Window):
show = availplug.available and not active
else:
assert_never(self._category)
show = False
if not show:
continue