Leahnaya/artemis
1
0
Fork 0
mirror of https://gitea.tendokyu.moe/Hay1tsme/artemis.git synced 2026-05-05 20:56:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'SoulGateKey-circle(plus)_support' into develop

Browse Source 
# Conflicts:
#	titles/mai2/const.py
This commit is contained in:
SoulGateKey 2026-04-03 07:45:55 +08:00
commit 9a65428a80
7 changed files with 75 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/game_specific_info.md
View File

@ -232,6 +232,8 @@ Presents are items given to the user when they login, with a little animation (f
| SDEZ | 22 | maimai DX BUDDiES PLUS |
| SDEZ | 23 | maimai DX PRiSM |
| SDEZ | 24 | maimai DX PRiSM PLUS |
| SDEZ | 25 | maimai DX CiRCLE |
| SDEZ | 26 | maimai DX CiRCLE PLUS |
### Importer

1
readme.md
View File

@ -85,6 +85,7 @@ Games listed below have been tested and confirmed working. Only game versions ol
+ BUDDiES PLUS
+ PRiSM
+ PRiSM PLUS
+ CiRCLE
+ O.N.G.E.K.I.
+ SUMMER

4
titles/cm/read.py
View File

@ -209,7 +209,9 @@ class CardMakerReader(BaseReader):
"1.40": Mai2Constants.VER_MAIMAI_DX_BUDDIES,
"1.45": Mai2Constants.VER_MAIMAI_DX_BUDDIES_PLUS,
"1.50": Mai2Constants.VER_MAIMAI_DX_PRISM,
"1.55": Mai2Constants.VER_MAIMAI_DX_PRISM_PLUS
"1.55": Mai2Constants.VER_MAIMAI_DX_PRISM_PLUS,
"1.60": Mai2Constants.VER_MAIMAI_DX_CIRCLE,
"1.65": Mai2Constants.VER_MAIMAI_DX_CIRCLE_PLUS
}
for root, dirs, files in os.walk(base_dir):

20
titles/mai2/circle.py Normal file
View File

@ -0,0 +1,20 @@
from typing import Dict
from core.config import CoreConfig
from titles.mai2.prismplus import Mai2PrismPlus
from titles.mai2.const import Mai2Constants
from titles.mai2.config import Mai2Config
class Mai2Circle(Mai2PrismPlus):
def __init__(self, cfg: CoreConfig, game_cfg: Mai2Config) -> None:
super().__init__(cfg, game_cfg)
self.version = Mai2Constants.VER_MAIMAI_DX_CIRCLE
async def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict:
user_data = await super().handle_cm_get_user_preview_api_request(data)
# hardcode lastDataVersion for CardMaker
user_data["lastDataVersion"] = "1.60.00"
return user_data

25
titles/mai2/circleplus.py Normal file
View File

@ -0,0 +1,25 @@
from typing import Dict
from core.config import CoreConfig
from titles.mai2.circle import Mai2Circle
from titles.mai2.const import Mai2Constants
from titles.mai2.config import Mai2Config
class Mai2CirclePlus(Mai2Circle):
def __init__(self, cfg: CoreConfig, game_cfg: Mai2Config) -> None:
super().__init__(cfg, game_cfg)
self.version = Mai2Constants.VER_MAIMAI_DX_CIRCLE_PLUS
async def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict:
user_data = await super().handle_cm_get_user_preview_api_request(data)
# hardcode lastDataVersion for CardMaker
user_data["lastDataVersion"] = "1.65.00"
return user_data
async def handle_get_game_national_data_api_request(self, data: Dict) -> Dict:
return {
"nextIndex": 0,
"nationalDataList": []
}

10
titles/mai2/const.py
View File

@ -62,6 +62,8 @@ class Mai2Constants:
VER_MAIMAI_DX_BUDDIES_PLUS = 22
VER_MAIMAI_DX_PRISM = 23
VER_MAIMAI_DX_PRISM_PLUS = 24
VER_MAIMAI_DX_CIRCLE = 25
VER_MAIMAI_DX_CIRCLE_PLUS = 26
VERSION_STRING = (
"maimai",
@ -88,7 +90,9 @@ class Mai2Constants:
"maimai DX BUDDiES",
"maimai DX BUDDiES PLUS",
"maimai DX PRiSM",
"maimai DX PRiSM PLUS"
"maimai DX PRiSM PLUS",
"maimai DX CiRCLE",
"maimai DX CiRCLE PLUS"
)
KALEIDXSCOPE_KEY_CONDITION={
1: [11009, 11008, 11100, 11097, 11098, 11099, 11163, 11162, 11161, 11228, 11229, 11231, 11463, 11464, 11465, 11538, 11539, 11541, 11620, 11622, 11623, 11737, 11738, 11164, 11230, 11466, 11540, 11621, 11739],
@ -140,7 +144,9 @@ class Mai2Constants:
"140": VER_MAIMAI_DX_BUDDIES,
"145": VER_MAIMAI_DX_BUDDIES_PLUS,
"150": VER_MAIMAI_DX_PRISM,
"155": VER_MAIMAI_DX_PRISM_PLUS
"155": VER_MAIMAI_DX_PRISM_PLUS,
"160": VER_MAIMAI_DX_CIRCLE,
"165": VER_MAIMAI_DX_CIRCLE_PLUS
}
@classmethod

20
titles/mai2/index.py
View File

@ -33,6 +33,8 @@ from .buddies import Mai2Buddies
from .buddiesplus import Mai2BuddiesPlus
from .prism import Mai2Prism
from .prismplus import Mai2PrismPlus
from .circle import Mai2Circle
from .circleplus import Mai2CirclePlus
class Mai2Servlet(BaseServlet):
@ -70,7 +72,9 @@ class Mai2Servlet(BaseServlet):
Mai2Buddies,
Mai2BuddiesPlus,
Mai2Prism,
Mai2PrismPlus
Mai2PrismPlus,
Mai2Circle,
Mai2CirclePlus
]
self.logger = logging.getLogger("mai2")
@ -349,8 +353,12 @@ class Mai2Servlet(BaseServlet):
internal_ver = Mai2Constants.VER_MAIMAI_DX_BUDDIES_PLUS
elif version >= 150 and version < 155:
internal_ver = Mai2Constants.VER_MAIMAI_DX_PRISM
elif version >= 155:
elif version >= 155 and version < 160:
internal_ver = Mai2Constants.VER_MAIMAI_DX_PRISM_PLUS
elif version >= 160 and version < 165:
internal_ver = Mai2Constants.VER_MAIMAI_DX_CIRCLE
elif version >= 165:
internal_ver = Mai2Constants.VER_MAIMAI_DX_CIRCLE_PLUS
elif game_code == "SDGA": # Int
if version < 105: # 1.0
@ -375,9 +383,13 @@ class Mai2Servlet(BaseServlet):
internal_ver = Mai2Constants.VER_MAIMAI_DX_BUDDIES_PLUS
elif version >= 150 and version < 155:
internal_ver = Mai2Constants.VER_MAIMAI_DX_PRISM
elif version >= 155:
elif version >= 155 and version < 160:
internal_ver = Mai2Constants.VER_MAIMAI_DX_PRISM_PLUS
elif version >= 160 and version < 165:
internal_ver = Mai2Constants.VER_MAIMAI_DX_CIRCLE
elif version >= 165:
internal_ver = Mai2Constants.VER_MAIMAI_DX_CIRCLE_PLUS
elif game_code == "SDGB": # Chn
if version < 110: # Muji
internal_ver = Mai2Constants.VER_MAIMAI_DX