diff --git a/titles/ongeki/brightmemory2.py b/titles/ongeki/brightmemory2.py deleted file mode 100644 index ebe1710..0000000 --- a/titles/ongeki/brightmemory2.py +++ /dev/null @@ -1,17 +0,0 @@ -from core.config import CoreConfig -from titles.ongeki.brightmemory import OngekiBrightMemory -from titles.ongeki.config import OngekiConfig -from titles.ongeki.const import OngekiConstants - - -class OngekiBrightMemoryAct2(OngekiBrightMemory): - def __init__(self, core_cfg: CoreConfig, game_cfg: OngekiConfig) -> None: # noqa: F821 - super().__init__(core_cfg, game_cfg) - self.version = OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY_ACT2 - - async def handle_get_game_setting_api_request(self, data: dict) -> dict: - ret = await super().handle_get_game_setting_api_request(data) - ret["gameSetting"]["dataVersion"] = "1.40.00" - ret["gameSetting"]["onlineDataVersion"] = "1.40.00" - - return ret diff --git a/titles/ongeki/const.py b/titles/ongeki/const.py index c21e8d8..0d3cbac 100644 --- a/titles/ongeki/const.py +++ b/titles/ongeki/const.py @@ -14,7 +14,6 @@ class OngekiConstants: VER_ONGEKI_RED_PLUS = 5 VER_ONGEKI_BRIGHT = 6 VER_ONGEKI_BRIGHT_MEMORY = 7 - VER_ONGEKI_BRIGHT_MEMORY_ACT2 = 8 VER_ONGEKI_BRIGHT_MEMORY_ACT3 = 9 EVT_TYPES = Enum( @@ -103,7 +102,7 @@ class OngekiConstants: "ONGEKI R.E.D. +", "ONGEKI bright", "ONGEKI bright MEMORY", - "ONGEKI bright MEMORY Act.2", + "", "ONGEKI bright MEMORY Act.3", ) diff --git a/titles/ongeki/index.py b/titles/ongeki/index.py index 855c412..5362b7d 100644 --- a/titles/ongeki/index.py +++ b/titles/ongeki/index.py @@ -51,7 +51,8 @@ class OngekiServlet(BaseServlet): OngekiRedPlus(core_cfg, self.game_cfg), OngekiBright(core_cfg, self.game_cfg), OngekiBrightMemory(core_cfg, self.game_cfg), - OngekiBrightMemoryAct2(core_cfg, self.game_cfg), + # OngekiBrightMemoryAct2(core_cfg, self.game_cfg), + None, OngekiBrightMemoryAct3(core_cfg, self.game_cfg), ] @@ -145,10 +146,8 @@ class OngekiServlet(BaseServlet): internal_ver = OngekiConstants.VER_ONGEKI_RED_PLUS elif version >= 130 and version < 135: # Bright internal_ver = OngekiConstants.VER_ONGEKI_BRIGHT - elif version >= 135 and version < 140: # Bright Memory + elif version >= 135 and version < 145: # Bright Memory internal_ver = OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY - elif version >= 140 and version < 145: - internal_ver = OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY_ACT2 elif version >= 145: internal_ver = OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY_ACT3 diff --git a/titles/ongeki/read.py b/titles/ongeki/read.py index d6660cd..5c732ce 100644 --- a/titles/ongeki/read.py +++ b/titles/ongeki/read.py @@ -53,7 +53,7 @@ class OngekiReader(BaseReader): "1025": OngekiConstants.VER_ONGEKI_RED_PLUS, "1030": OngekiConstants.VER_ONGEKI_BRIGHT, "1035": OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY, - "1040": OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY_ACT2, + "1040": OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY, "1045": OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY_ACT3, }