cm: card maker 1.35 support added

docs/game_specific_info.md

@@ -236,7 +236,7 @@ python dbutils.py --game SDDT --version 4 upgrade
 | Version ID | Version Name    |
 |------------|-----------------|
 | 0          | Card Maker 1.34 |
-| 1          | Card Maker 1.36 |
+| 1          | Card Maker 1.35 |
 
 
 ### Support status
@@ -246,13 +246,11 @@ python dbutils.py --game SDDT --version 4 upgrade
   * maimai DX Universe: Yes
   * O.N.G.E.K.I. Bright: Yes
 
-* Card Maker 1.36:
+* Card Maker 1.35:
   * Chunithm New!!+: Yes
   * maimai DX Universe PLUS: Yes
   * O.N.G.E.K.I. Bright Memory: Yes
 
-Card Maker 1.35 is not actively supported, but may work.
-
 
 ### Importer
 
@@ -301,10 +299,10 @@ from a given gacha but made sure you cannot pull the same card twice in the same
 
 ### Notes
 
-Card Maker 1.34 will only load an O.N.G.E.K.I. Bright profile (1.30). Card Maker 1.36 will only load an O.N.G.E.K.I.
+Card Maker 1.34 will only load an O.N.G.E.K.I. Bright profile (1.30). Card Maker 1.35 will only load an O.N.G.E.K.I.
 Bright Memory profile (1.35).
 The gachas inside the `ongeki.yaml` will make sure only the right gacha ids for the right CM version will be loaded.
-Gacha IDs up to 1140 will be loaded for CM 1.34 and all gachas will be loaded for CM 1.36.
+Gacha IDs up to 1140 will be loaded for CM 1.34 and all gachas will be loaded for CM 1.35.
 
 **NOTE: There is currently no way to load/use the (printed) maimai DX cards!**
 

titles/chuni/newplus.py

@@ -35,7 +35,5 @@ class ChuniNewPlus(ChuniNew):
         user_data = super().handle_cm_get_user_preview_api_request(data)
 
         # hardcode lastDataVersion for CardMaker 1.35
-        #  user_data["lastDataVersion"] = "2.05.00"
-        # hardcode lastDataVersion for CardMaker 1.36
-        user_data["lastDataVersion"] = "2.10.00"
+        user_data["lastDataVersion"] = "2.05.00"
         return user_data

titles/cm/cm135.py

@@ -11,7 +11,7 @@ from titles.cm.const import CardMakerConstants
 from titles.cm.config import CardMakerConfig
 
 
-class CardMaker136(CardMakerBase):
+class CardMaker135(CardMakerBase):
     def __init__(self, core_cfg: CoreConfig, game_cfg: CardMakerConfig) -> None:
         super().__init__(core_cfg, game_cfg)
         self.version = CardMakerConstants.VER_CARD_MAKER_136
@@ -26,7 +26,7 @@ class CardMaker136(CardMakerBase):
         ret["gameConnectList"][0]["titleUri"] = f"{uri}/SDHD/205/"
         ret["gameConnectList"][1]["titleUri"] = f"{uri}/SDEZ/125/"
         ret["gameConnectList"][2]["titleUri"] = f"{uri}/SDDT/135/"
-        
+
         return ret
 
     def handle_get_game_setting_api_request(self, data: Dict) -> Dict:

titles/cm/const.py

@@ -4,9 +4,9 @@ class CardMakerConstants:
     CONFIG_NAME = "cardmaker.yaml"
 
     VER_CARD_MAKER = 0
-    VER_CARD_MAKER_136 = 1
+    VER_CARD_MAKER_135 = 1
 
-    VERSION_NAMES = ("Card Maker 1.34", "Card Maker 1.36")
+    VERSION_NAMES = ("Card Maker 1.34", "Card Maker 1.35")
 
     @classmethod
     def game_ver_to_string(cls, ver: int):

titles/cm/index.py

@@ -15,7 +15,7 @@ from core.config import CoreConfig
 from titles.cm.config import CardMakerConfig
 from titles.cm.const import CardMakerConstants
 from titles.cm.base import CardMakerBase
-from titles.cm.cm136 import CardMaker136
+from titles.cm.cm135 import CardMaker135
 
 
 class CardMakerServlet:
@@ -29,7 +29,7 @@ class CardMakerServlet:
 
         self.versions = [
             CardMakerBase(core_cfg, self.game_cfg),
-            CardMaker136(core_cfg, self.game_cfg),
+            CardMaker135(core_cfg, self.game_cfg),
         ]
 
         self.logger = logging.getLogger("cardmaker")
@@ -87,8 +87,8 @@ class CardMakerServlet:
 
         if version >= 130 and version < 135:  # Card Maker
             internal_ver = CardMakerConstants.VER_CARD_MAKER
-        elif version >= 135 and version < 140:  # Card Maker
-            internal_ver = CardMakerConstants.VER_CARD_MAKER_136
+        elif version >= 135 and version < 136:  # Card Maker 1.35
+            internal_ver = CardMakerConstants.VER_CARD_MAKER_135
 
         if all(c in string.hexdigits for c in endpoint) and len(endpoint) == 32:
             # If we get a 32 character long hex string, it's a hash and we're

titles/mai2/universeplus.py

@@ -18,7 +18,5 @@ class Mai2UniversePlus(Mai2Universe):
         user_data = super().handle_cm_get_user_preview_api_request(data)
 
         # hardcode lastDataVersion for CardMaker 1.35
-        #  user_data["lastDataVersion"] = "1.25.00"
-        # hardcode lastDataVersion for CardMaker 1.36
-        user_data["lastDataVersion"] = "1.30.00"
+        user_data["lastDataVersion"] = "1.25.00"
         return user_data