Merge branch 'develop' of https://gitea.tendokyu.moe/Hay1tsme/artemis into develop

core/allnet.py

@@ -191,7 +191,7 @@ class AllnetServlet:
         
         self.logger.debug(f"request {req_dict}")
 
-        rsa = RSA.import_key(open(self.config.billing.sign_key, 'rb').read())
+        rsa = RSA.import_key(open(self.config.billing.signing_key, 'rb').read())
         signer = PKCS1_v1_5.new(rsa)
         digest = SHA.new()
 

core/data/schema/versions/SDDT_2_rollback.sql

@@ -0,0 +1,7 @@
+SET FOREIGN_KEY_CHECKS=0;
+ALTER TABLE ongeki_profile_data DROP COLUMN isDialogWatchedSuggestMemory;
+ALTER TABLE ongeki_score_best DROP COLUMN platinumScoreMax;
+ALTER TABLE ongeki_score_playlog DROP COLUMN platinumScore;
+ALTER TABLE ongeki_score_playlog DROP COLUMN platinumScoreMax;
+DROP TABLE IF EXISTS `ongeki_user_memorychapter`;
+SET FOREIGN_KEY_CHECKS=1;

core/data/schema/versions/SDDT_3_upgrade.sql

@@ -0,0 +1,27 @@
+SET FOREIGN_KEY_CHECKS=0;
+
+ALTER TABLE ongeki_profile_data ADD COLUMN isDialogWatchedSuggestMemory BOOLEAN;
+ALTER TABLE ongeki_score_best ADD COLUMN platinumScoreMax INTEGER;
+ALTER TABLE ongeki_score_playlog ADD COLUMN platinumScore INTEGER;
+ALTER TABLE ongeki_score_playlog ADD COLUMN platinumScoreMax INTEGER;
+
+CREATE TABLE ongeki_user_memorychapter (
+    id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+    user INT NOT NULL,
+    chapterId INT NOT NULL,
+    gaugeId INT NOT NULL,
+    gaugeNum INT NOT NULL,
+    jewelCount INT NOT NULL,
+    isStoryWatched BOOLEAN NOT NULL,
+    isBossWatched BOOLEAN NOT NULL,
+    isDialogWatched BOOLEAN NOT NULL,
+    isEndingWatched BOOLEAN NOT NULL,
+    isClear BOOLEAN NOT NULL,
+    lastPlayMusicId INT NOT NULL,
+    lastPlayMusicLevel INT NOT NULL,
+    lastPlayMusicCategory INT NOT NULL,
+    UNIQUE KEY ongeki_user_memorychapter_uk (user, chapterId),
+    CONSTRAINT ongeki_user_memorychapter_ibfk_1 FOREIGN KEY (user) REFERENCES aime_user (id) ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+SET FOREIGN_KEY_CHECKS=1;

index.py

@@ -29,6 +29,7 @@ class HttpDispatcher(resource.Resource):
         self.map_post.connect('allnet_poweron', '/sys/servlet/PowerOn', controller="allnet", action='handle_poweron', conditions=dict(method=['POST']))
         self.map_post.connect('allnet_downloadorder', '/sys/servlet/DownloadOrder', controller="allnet", action='handle_dlorder', conditions=dict(method=['POST']))
         self.map_post.connect('allnet_billing', '/request', controller="allnet", action='handle_billing_request', conditions=dict(method=['POST']))
+        self.map_post.connect('allnet_billing', '/request/', controller="allnet", action='handle_billing_request', conditions=dict(method=['POST']))
 
         self.map_post.connect('mucha_boardauth', '/mucha/boardauth.do', controller="mucha", action='handle_boardauth', conditions=dict(method=['POST']))
         self.map_post.connect('mucha_updatacheck', '/mucha/updatacheck.do', controller="mucha", action='handle_updatacheck', conditions=dict(method=['POST']))

readme.md

@@ -16,7 +16,7 @@ Games listed below have been tested and confirmed working. Only game versions ol
     + All versions
 
 + Ongeki
-    + All versions up to Bright
+    + All versions up to Bright Memory
 
 + Wacca
     + Lily R

titles/ongeki/base.py

@@ -788,6 +788,10 @@ class OngekiBase():
             for x in upsert["userChapterList"]:
                 self.data.item.put_chapter(user_id, x)
                 
+        if "userMemoryChapterList" in upsert:
+            for x in upsert["userMemoryChapterList"]:
+                self.data.item.put_memorychapter(user_id, x)
+        
         if "userItemList" in upsert:
             for x in upsert["userItemList"]:
                 self.data.item.put_item(user_id, x)

titles/ongeki/brightmemory.py

@@ -0,0 +1,58 @@
+from datetime import date, datetime, timedelta
+from typing import Any, Dict
+import pytz
+import json
+
+from core.config import CoreConfig
+from titles.ongeki.base import OngekiBase
+from titles.ongeki.const import OngekiConstants
+from titles.ongeki.config import OngekiConfig
+
+class OngekiBrightMemory(OngekiBase):
+
+    def __init__(self, core_cfg: CoreConfig, game_cfg: OngekiConfig) -> None:
+        super().__init__(core_cfg, game_cfg)
+        self.version = OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY
+
+    def handle_get_game_setting_api_request(self, data: Dict) -> Dict:
+        ret = super().handle_get_game_setting_api_request(data)
+        ret["gameSetting"]["dataVersion"] = "1.35.00"
+        ret["gameSetting"]["onlineDataVersion"] = "1.35.00"
+        ret["gameSetting"]["maxCountCharacter"] = 50
+        ret["gameSetting"]["maxCountCard"] = 300
+        ret["gameSetting"]["maxCountItem"] = 300
+        ret["gameSetting"]["maxCountMusic"] = 50
+        ret["gameSetting"]["maxCountMusicItem"] = 300
+        ret["gameSetting"]["maxCountRivalMusic"] = 300
+        return ret
+
+    def handle_get_user_memory_chapter_api_request(self, data: Dict) -> Dict:
+        memories = self.data.item.get_memorychapters(data["userId"])
+        if not memories: 
+            return {"userId": data["userId"], "length":6, "userMemoryChapterList":[
+            {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70001, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0},
+            {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70002, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0},
+            {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70003, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0},
+            {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70004, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0},
+            {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70005, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0},
+            {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70099, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0}
+        ]}
+        
+        memory_chp = []
+        for chp in memories:
+            tmp = chp._asdict()
+            tmp.pop("id")
+            tmp.pop("user")
+            memory_chp.append(tmp)
+        
+        return {
+            "userId": data["userId"], 
+            "length": len(memory_chp), 
+            "userMemoryChapterList": memory_chp
+        }
+
+    def handle_get_game_music_release_state_api_request(self, data: Dict) -> Dict:
+        return {
+            "techScore": 0,
+            "cardNum": 0
+        }

titles/ongeki/const.py

@@ -10,6 +10,7 @@ class OngekiConstants():
     VER_ONGEKI_RED = 4
     VER_ONGEKI_RED_PLUS = 5
     VER_ONGEKI_BRIGHT = 6
+    VER_ONGEKI_BRIGHT_MEMORY = 7
 
     EVT_TYPES: Enum = Enum('EVT_TYPES', [
         'None',
@@ -43,7 +44,7 @@ class OngekiConstants():
         Lunatic = 10
 
     VERSION_NAMES = ("ONGEKI", "ONGEKI+", "ONGEKI Summer", "ONGEKI Summer+", "ONGEKI Red", "ONGEKI Red+", 
-        "ONGEKI Bright")
+        "ONGEKI Bright", "ONGEKI Bright Memory")
 
     @classmethod
     def game_ver_to_string(cls, ver: int):

titles/ongeki/index.py

@@ -17,6 +17,7 @@ from titles.ongeki.summerplus import OngekiSummerPlus
 from titles.ongeki.red import OngekiRed
 from titles.ongeki.redplus import OngekiRedPlus
 from titles.ongeki.bright import OngekiBright
+from titles.ongeki.brightmemory import OngekiBrightMemory
 
 class OngekiServlet():
     def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None:
@@ -32,6 +33,7 @@ class OngekiServlet():
             OngekiRed(core_cfg, self.game_cfg),
             OngekiRedPlus(core_cfg, self.game_cfg),
             OngekiBright(core_cfg, self.game_cfg),
+            OngekiBrightMemory(core_cfg, self.game_cfg),
         ]
 
         self.logger = logging.getLogger("ongeki")
@@ -69,8 +71,10 @@ class OngekiServlet():
             internal_ver = OngekiConstants.VER_ONGEKI_RED
         elif version >= 125 and version < 130: # Red Plus
             internal_ver = OngekiConstants.VER_ONGEKI_RED_PLUS
-        elif version >= 130 and version < 135: # Red Plus
+        elif version >= 130 and version < 135: # Bright
             internal_ver = OngekiConstants.VER_ONGEKI_BRIGHT
+        elif version >= 135 and version < 140: # Bright Memory
+            internal_ver = OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY
 
         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/ongeki/schema/item.py

@@ -107,6 +107,27 @@ chapter = Table(
     mysql_charset='utf8mb4'
 )
 
+memorychapter = Table(
+    "ongeki_user_memorychapter",
+    metadata,
+    Column("id", Integer, primary_key=True, nullable=False),
+    Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade")),
+    Column("chapterId", Integer),
+    Column("gaugeId", Integer),
+    Column("gaugeNum", Integer),
+    Column("jewelCount", Integer),
+    Column("isStoryWatched", Boolean),
+    Column("isBossWatched", Boolean),
+    Column("isDialogWatched", Boolean),
+    Column("isEndingWatched", Boolean),
+    Column("isClear", Boolean),
+    Column("lastPlayMusicId", Integer),
+    Column("lastPlayMusicLevel", Integer),
+    Column("lastPlayMusicCategory", Integer),
+    UniqueConstraint("user", "chapterId", name="ongeki_user_memorychapter_uk"),
+    mysql_charset='utf8mb4'
+)
+
 item = Table(
     "ongeki_user_item",
     metadata,
@@ -524,3 +545,22 @@ class OngekiItemData(BaseData):
 
         if result is None: return None
         return result.fetchall()
+    
+    def put_memorychapter(self, aime_id: int, memorychapter_data: Dict) -> Optional[int]:
+        memorychapter_data["user"] = aime_id
+
+        sql = insert(memorychapter).values(**memorychapter_data)
+        conflict = sql.on_duplicate_key_update(**memorychapter_data)
+        result = self.execute(conflict)
+
+        if result is None:
+            self.logger.warn(f"put_memorychapter: Failed to update! aime_id: {aime_id}")
+            return None
+        return result.lastrowid
+    
+    def get_memorychapters(self, aime_id: int) -> Optional[List[Dict]]:
+        sql = select(memorychapter).where(memorychapter.c.user == aime_id)
+
+        result = self.execute(sql)
+        if result is None: return None
+        return result.fetchall()

titles/ongeki/schema/profile.py

@@ -78,6 +78,7 @@ profile = Table(
     Column("overDamageBattlePoint", Integer, server_default="0"),
     Column("bestBattlePoint", Integer, server_default="0"),
     Column("lastEmoneyBrand", Integer, server_default="0"),
+    Column("isDialogWatchedSuggestMemory", Boolean),
     UniqueConstraint("user", "version", name="ongeki_profile_profile_uk"),
     mysql_charset='utf8mb4'
 )

titles/ongeki/schema/score.py

@@ -28,6 +28,7 @@ score_best = Table(
     Column("isLock", Boolean, nullable=False),
     Column("clearStatus", Boolean, nullable=False),
     Column("isStoryWatched", Boolean, nullable=False),
+    Column("platinumScoreMax", Integer),
     UniqueConstraint("user", "musicId", "level", name="ongeki_best_score_uk"),
     mysql_charset='utf8mb4'
 )
@@ -96,6 +97,8 @@ playlog = Table(
     Column("isAllBreak", Boolean),
     Column("playerRating", Integer),
     Column("battlePoint", Integer),
+    Column("platinumScore", Integer),
+    Column("platinumScoreMax", Integer),
     mysql_charset='utf8mb4'
 )