Cool_Tools/bemaniutils
1
0
Fork 0
mirror of synced 2025-02-17 11:18:33 +01:00
Code Releases Activity

Fix key error in merging jubeat songs that don't have a set music rate.

Browse Source
This commit is contained in:
Jennifer Taylor 2022-11-12 22:56:06 +00:00
parent d13eb62b30
commit 6de1cd7e6d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bemani/data/api/music.py
View File

@ -401,6 +401,10 @@ class GlobalMusicData(BaseGlobalData):
def __merge_jubeat_score( def __merge_jubeat_score(
self, version: int, oldscore: Score, newscore: Score self, version: int, oldscore: Score, newscore: Score
) -> Score: ) -> Score:
rate = self.__max(
oldscore.data.get("music_rate", -1), newscore.data.get("music_rate", -1)
)
return Score( return Score(
-1, -1,
oldscore.id, oldscore.id,
@ -419,9 +423,8 @@ class GlobalMusicData(BaseGlobalData):
else newscore.data.get("ghost"), else newscore.data.get("ghost"),
"combo": self.__max(oldscore.data["combo"], newscore.data["combo"]), "combo": self.__max(oldscore.data["combo"], newscore.data["combo"]),
"medal": self.__max(oldscore.data["medal"], newscore.data["medal"]), "medal": self.__max(oldscore.data["medal"], newscore.data["medal"]),
"music_rate": self.__max( # Conditionally include this if we have any info for it.
oldscore.data["music_rate"], newscore.data["music_rate"] **({"music_rate": rate} if rate >= 0 else {}),
),
}, },
) )