cm: added support for 1.36, fixed importer

- Added support for Card Maker 1.36.xx
- Added cards importer to ONGEKI importer
- Added 4 new 1.36 gachas (requires importing them from opt files)
- Fixed version for Card Maker opt importer

titles/ongeki/schema/profile.py

@@ -180,7 +180,7 @@ region = Table(
     mysql_charset='utf8mb4'
 )
 
-training_room = Table (
+training_room = Table(
     "ongeki_profile_training_room",
     metadata,
     Column("id", Integer, primary_key=True, nullable=False),
@@ -193,7 +193,7 @@ training_room = Table (
     mysql_charset='utf8mb4'
 )
 
-kop = Table (
+kop = Table(
     "ongeki_profile_kop",
     metadata,
     Column("id", Integer, primary_key=True, nullable=False),
@@ -219,6 +219,7 @@ rival = Table(
     mysql_charset='utf8mb4'
 )
 
+
 class OngekiProfileData(BaseData):
     def __init__(self, cfg: CoreConfig, conn: Connection) -> None:
         super().__init__(cfg, conn)
@@ -287,14 +288,14 @@ class OngekiProfileData(BaseData):
         result = self.execute(sql)
         if result is None: return None
         return result.fetchall()
-    
+
     def get_kop(self, aime_id: int) -> Optional[List[Row]]:
         sql = select(kop).where(kop.c.user == aime_id)
 
         result = self.execute(sql)
         if result is None: return None
         return result.fetchall()
-    
+
     def get_rivals(self, aime_id: int) -> Optional[List[Row]]:
         sql = select(rival.c.rivalUserId).where(rival.c.user == aime_id)
 

titles/ongeki/schema/static.py

@@ -192,7 +192,7 @@ class OngekiStaticData(BaseData):
 
     def get_gacha(self, version: int, gacha_id: int) -> Optional[Dict]:
         sql = gachas.select(and_(
-            gachas.c.version == version,
+            gachas.c.version <= version,
             gachas.c.gachaId == gacha_id
         ))