Hay1tsme/artemis
25
47
Fork 38
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: Hay1tsme:0e3265a162e67fb3688a43424f5c26edc8153359
Branches Tags
Hay1tsme:master
Hay1tsme:develop
Hay1tsme:diva_handler_classes
...
compare: Hay1tsme:e98a7c8ae0468de18248b903de29f36687148110
Branches Tags
Hay1tsme:develop
Hay1tsme:master
Hay1tsme:diva_handler_classes

10 Commits
0e3265a162 ... e98a7c8ae0

Author SHA1 Message Date
Midorica
e98a7c8ae0 Merge pull request 'Chunithm New!! (Plus)' (#7) from Dniel97/artemis:chuni_importer_fix into develop 
Reviewed-on: #7
 2023-03-01 20:19:40 +00:00
Dniel97
842e3a313e
chuni: use title hostname instead of server hostname 2023-03-01 21:18:29 +01:00
Dniel97
b81767af8a
Chunithm New!!+ Importer and settings fixed 2023-03-01 21:09:06 +01:00
Dniel97
435a098fe0
Merge branch 'develop' into fork_develop 2023-02-28 23:45:34 +01:00
Dniel97
d3862b7483
Merge branch 'develop' into fork_develop 2023-02-27 17:57:21 +01:00
Dniel97
b30e9570e7
Merge branch 'develop' into fork_develop 2023-02-27 17:47:28 +01:00
Dniel97
0b76c61059
Merge branch 'diva_card_procedure' into fork_develop 2023-02-20 20:44:39 +01:00
Dniel97
18a1923f6a
Merge remote-tracking branch 'origin/develop' into fork_develop 2023-02-20 20:44:35 +01:00
Dniel97
285bb966a5
Merge branch 'diva_card_procedure' into fork_develop 2023-02-19 18:24:27 +01:00
Dniel97
d1535d7be1
Merge branch 'develop' into fork_develop 2023-02-19 16:40:15 +01:00
6 changed files with 12 additions and 10 deletions
Show Stats Expand all files Collapse all files

1
core/data/schema/versions/SDHD_1_rollback.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE chuni_static_music CHANGE COLUMN worldsEndTag worldsEndTag VARCHAR(20) NULL DEFAULT NULL ;

1
core/data/schema/versions/SDHD_2_upgrade.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE chuni_static_music CHANGE COLUMN worldsEndTag worldsEndTag VARCHAR(7) NULL DEFAULT NULL ;

8
titles/chuni/new.py
View File

@ -47,10 +47,10 @@ class ChuniNew(ChuniBase):
"matchErrorLimit": 9999, "matchErrorLimit": 9999,
"romVersion": "2.00.00", "romVersion": "2.00.00",
"dataVersion": "2.00.00", "dataVersion": "2.00.00",
"matchingUri": f"http://{self.core_cfg.server.hostname}:{self.core_cfg.title.port}/SDHD/200/ChuniServlet/", "matchingUri": f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/200/ChuniServlet/",
"matchingUriX": f"http://{self.core_cfg.server.hostname}:{self.core_cfg.title.port}/SDHD/200/ChuniServlet/", "matchingUriX": f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/200/ChuniServlet/",
"udpHolePunchUri": f"http://{self.core_cfg.server.hostname}:{self.core_cfg.title.port}/SDHD/200/ChuniServlet/", "udpHolePunchUri": f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/200/ChuniServlet/",
"reflectorUri": f"http://{self.core_cfg.server.hostname}:{self.core_cfg.title.port}/SDHD/200/ChuniServlet/", "reflectorUri": f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/200/ChuniServlet/",
}, },
"isDumpUpload": "false", "isDumpUpload": "false",
"isAou": "false", "isAou": "false",

8
titles/chuni/newplus.py
View File

@ -16,8 +16,8 @@ class ChuniNewPlus(ChuniNew):
ret = super().handle_get_game_setting_api_request(data) ret = super().handle_get_game_setting_api_request(data)
ret["gameSetting"]["romVersion"] = "2.05.00" ret["gameSetting"]["romVersion"] = "2.05.00"
ret["gameSetting"]["dataVersion"] = "2.05.00" ret["gameSetting"]["dataVersion"] = "2.05.00"
ret["gameSetting"]["matchingUri"] = f"http://{self.core_cfg.server.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" ret["gameSetting"]["matchingUri"] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/"
ret["gameSetting"]["matchingUriX"] = f"http://{self.core_cfg.server.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" ret["gameSetting"]["matchingUriX"] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/"
ret["gameSetting"]["udpHolePunchUri"] = f"http://{self.core_cfg.server.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" ret["gameSetting"]["udpHolePunchUri"] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/"
ret["gameSetting"]["reflectorUri"] = f"http://{self.core_cfg.server.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" ret["gameSetting"]["reflectorUri"] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/"
return ret return ret

2
titles/chuni/read.py
View File

@ -82,7 +82,7 @@ class ChuniReader(BaseReader):
for MusicFumenData in fumens.findall('MusicFumenData'): for MusicFumenData in fumens.findall('MusicFumenData'):
fumen_path = MusicFumenData.find('file').find("path") fumen_path = MusicFumenData.find('file').find("path")
if fumen_path.text is not None: if fumen_path is not None:
chart_id = MusicFumenData.find('type').find('id').text chart_id = MusicFumenData.find('type').find('id').text
if chart_id == "4": if chart_id == "4":
level = float(xml_root.find("starDifType").text) level = float(xml_root.find("starDifType").text)

2
titles/chuni/schema/static.py
View File

@ -34,7 +34,7 @@ music = Table(
Column("level", Float), Column("level", Float),
Column("genre", String(255)), Column("genre", String(255)),
Column("jacketPath", String(255)), Column("jacketPath", String(255)),
Column("worldsEndTag", String(20)), Column("worldsEndTag", String(7)),
UniqueConstraint("version", "songId", "chartId", name="chuni_static_music_uk"), UniqueConstraint("version", "songId", "chartId", name="chuni_static_music_uk"),
mysql_charset='utf8mb4' mysql_charset='utf8mb4'
) )