From 83892aea752322f45042e5b77f0978d8d9b99f34 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 16 Aug 2022 18:27:08 -0500 Subject: [PATCH] update bemapi to include music_rate and jubeat festo --- bemani/api/app.py | 1 + bemani/api/objects/records.py | 1 + bemani/data/api/client.py | 1 + bemani/data/api/music.py | 4 +++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bemani/api/app.py b/bemani/api/app.py index 0c48ca6..009acaf 100644 --- a/bemani/api/app.py +++ b/bemani/api/app.py @@ -245,6 +245,7 @@ def lookup(protoversion: str, requestgame: str, requestversion: str) -> Dict[str '6': VersionConstants.JUBEAT_PROP, '7': VersionConstants.JUBEAT_QUBELL, '8': VersionConstants.JUBEAT_CLAN, + '9': VersionConstants.JUBEAT_FESTO, }, GameConstants.MUSECA: { '1': VersionConstants.MUSECA, diff --git a/bemani/api/objects/records.py b/bemani/api/objects/records.py index 7564deb..edeaed9 100644 --- a/bemani/api/objects/records.py +++ b/bemani/api/objects/records.py @@ -89,6 +89,7 @@ class RecordsObject(BaseObject): 'status': status, 'combo': record.data.get_int('combo', -1), 'ghost': ghost, + 'music_rate': record.data.get_int('music_rate'), } def __format_museca_record(self, record: Score) -> Dict[str, Any]: diff --git a/bemani/data/api/client.py b/bemani/data/api/client.py index aeb0122..a92c972 100644 --- a/bemani/data/api/client.py +++ b/bemani/data/api/client.py @@ -150,6 +150,7 @@ class APIClient: VersionConstants.JUBEAT_PROP: '6', VersionConstants.JUBEAT_QUBELL: '7', VersionConstants.JUBEAT_CLAN: '8', + VersionConstants.JUBEAT_FESTO: '9', }, GameConstants.MUSECA: { VersionConstants.MUSECA: '1', diff --git a/bemani/data/api/music.py b/bemani/data/api/music.py index f17022a..c22a300 100644 --- a/bemani/data/api/music.py +++ b/bemani/data/api/music.py @@ -139,7 +139,8 @@ class GlobalMusicData(BaseGlobalData): { 'medal': status, 'combo': int(data.get('combo', -1)), - 'ghost': [int(x) for x in data.get('ghost', [])] + 'ghost': [int(x) for x in data.get('ghost', [])], + 'music_rate': int(data.get('music_rate')), }, ) @@ -358,6 +359,7 @@ class GlobalMusicData(BaseGlobalData): 'ghost': oldscore.data.get('ghost') if oldscore.points > newscore.points else newscore.data.get('ghost'), 'combo': self.__max(oldscore.data['combo'], newscore.data['combo']), 'medal': self.__max(oldscore.data['medal'], newscore.data['medal']), + 'music_rate': self.__max(oldscore.data['music_rate'], newscore.data['music_rate']), }, )