From 2a780d6ff992e9b784371e1be521f4311915938c Mon Sep 17 00:00:00 2001 From: Vishal Date: Sat, 30 Nov 2024 11:34:35 +0530 Subject: [PATCH 1/4] Removing the hard-coded lines. --- .../ba_data/python/baclassic/_appsubsystem.py | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/src/assets/ba_data/python/baclassic/_appsubsystem.py b/src/assets/ba_data/python/baclassic/_appsubsystem.py index 99702dc2..72c28c77 100644 --- a/src/assets/ba_data/python/baclassic/_appsubsystem.py +++ b/src/assets/ba_data/python/baclassic/_appsubsystem.py @@ -5,6 +5,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, override import random +import inspect import logging import weakref @@ -177,27 +178,9 @@ class ClassicAppSubsystem(babase.AppSubsystem): if not env.debug and not env.test and not plus.is_blessed(): babase.screenmessage('WARNING: NON-BLESSED BUILD', color=(1, 0, 0)) - # FIXME: This should not be hard-coded. - for maptype in [ - stdmaps.HockeyStadium, - stdmaps.FootballStadium, - stdmaps.Bridgit, - stdmaps.BigG, - stdmaps.Roundabout, - stdmaps.MonkeyFace, - stdmaps.ZigZag, - stdmaps.ThePad, - stdmaps.DoomShroom, - stdmaps.LakeFrigid, - stdmaps.TipTop, - stdmaps.CragCastle, - stdmaps.TowerD, - stdmaps.HappyThoughts, - stdmaps.StepRightUp, - stdmaps.Courtyard, - stdmaps.Rampage, - ]: - bascenev1.register_map(maptype) + for _, maptype in inspect.getmembers(stdmaps, inspect.isclass): + if issubclass(maptype, bascenev1.Map): + bascenev1.register_map(maptype) spazappearance.register_appearances() bascenev1.init_campaigns() From 692ee04db03af7202700d34d3f833bc0c043f02f Mon Sep 17 00:00:00 2001 From: Vishal Date: Sat, 18 Jan 2025 00:25:57 +0530 Subject: [PATCH 2/4] Making register_all_maps function --- .../ba_data/python/baclassic/_appsubsystem.py | 5 +--- .../ba_data/python/bascenev1lib/maps.py | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/assets/ba_data/python/baclassic/_appsubsystem.py b/src/assets/ba_data/python/baclassic/_appsubsystem.py index 72c28c77..84a7fbd0 100644 --- a/src/assets/ba_data/python/baclassic/_appsubsystem.py +++ b/src/assets/ba_data/python/baclassic/_appsubsystem.py @@ -5,7 +5,6 @@ from __future__ import annotations from typing import TYPE_CHECKING, override import random -import inspect import logging import weakref @@ -178,9 +177,7 @@ class ClassicAppSubsystem(babase.AppSubsystem): if not env.debug and not env.test and not plus.is_blessed(): babase.screenmessage('WARNING: NON-BLESSED BUILD', color=(1, 0, 0)) - for _, maptype in inspect.getmembers(stdmaps, inspect.isclass): - if issubclass(maptype, bascenev1.Map): - bascenev1.register_map(maptype) + stdmaps.register_all_maps() spazappearance.register_appearances() bascenev1.init_campaigns() diff --git a/src/assets/ba_data/python/bascenev1lib/maps.py b/src/assets/ba_data/python/bascenev1lib/maps.py index 04f5b361..d519e076 100644 --- a/src/assets/ba_data/python/bascenev1lib/maps.py +++ b/src/assets/ba_data/python/bascenev1lib/maps.py @@ -14,6 +14,29 @@ from bascenev1lib.gameutils import SharedObjects if TYPE_CHECKING: from typing import Any +ALL_MAPS = [ + HockeyStadium, + FootballStadium, + Bridgit, + BigG, + Roundabout, + MonkeyFace, + ZigZag, + ThePad, + DoomShroom, + LakeFrigid, + TipTop, + CragCastle, + TowerD, + HappyThoughts, + StepRightUp, + Courtyard, + Rampage, +] + +def register_all_maps(): + for maptype in ALL_MAPS: + bascenev1.register_map(maptype) class HockeyStadium(bs.Map): """Stadium map used for ice hockey games.""" From 17609e68ae2896f1382e046b3e136d69fd691e12 Mon Sep 17 00:00:00 2001 From: Vishal Date: Sat, 18 Jan 2025 00:35:07 +0530 Subject: [PATCH 3/4] Fixing a bit --- .../ba_data/python/bascenev1lib/maps.py | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/assets/ba_data/python/bascenev1lib/maps.py b/src/assets/ba_data/python/bascenev1lib/maps.py index d519e076..04bea24d 100644 --- a/src/assets/ba_data/python/bascenev1lib/maps.py +++ b/src/assets/ba_data/python/bascenev1lib/maps.py @@ -14,29 +14,29 @@ from bascenev1lib.gameutils import SharedObjects if TYPE_CHECKING: from typing import Any -ALL_MAPS = [ - HockeyStadium, - FootballStadium, - Bridgit, - BigG, - Roundabout, - MonkeyFace, - ZigZag, - ThePad, - DoomShroom, - LakeFrigid, - TipTop, - CragCastle, - TowerD, - HappyThoughts, - StepRightUp, - Courtyard, - Rampage, -] -def register_all_maps(): - for maptype in ALL_MAPS: - bascenev1.register_map(maptype) +def register_all_maps() -> None: + for maptype in [ + HockeyStadium, + FootballStadium, + Bridgit, + BigG, + Roundabout, + MonkeyFace, + ZigZag, + ThePad, + DoomShroom, + LakeFrigid, + TipTop, + CragCastle, + TowerD, + HappyThoughts, + StepRightUp, + Courtyard, + Rampage, + ]: + bs.register_map(maptype) + class HockeyStadium(bs.Map): """Stadium map used for ice hockey games.""" From 46b7c9d03ccd27dde6b0546cc06d767a6278a4c8 Mon Sep 17 00:00:00 2001 From: Vishal Date: Sat, 18 Jan 2025 00:39:08 +0530 Subject: [PATCH 4/4] Fixing CI --- src/assets/ba_data/python/bascenev1lib/maps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/ba_data/python/bascenev1lib/maps.py b/src/assets/ba_data/python/bascenev1lib/maps.py index 04bea24d..6646b722 100644 --- a/src/assets/ba_data/python/bascenev1lib/maps.py +++ b/src/assets/ba_data/python/bascenev1lib/maps.py @@ -16,6 +16,7 @@ if TYPE_CHECKING: def register_all_maps() -> None: + """Registering all maps.""" for maptype in [ HockeyStadium, FootballStadium,