Cool_Tools/bemaniutils
1
0
Fork 0
mirror of synced 2025-01-18 22:24:04 +01:00
Code Releases Activity

iidx: Fix logic for saving miss count

Browse Source
This commit is contained in:
seth 2021-08-18 22:43:51 +00:00 committed by Jennifer Taylor
parent 010fd87338
commit d60fb8de17
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bemani/backend/iidx/base.py
View File

@ -349,10 +349,11 @@ class IIDXBase(CoreHandler, CardManagerHandler, PASELIHandler, Base):
# If it is a new score, create a new dictionary to add to
scoredata = ValidatedDict({
'clear_status': clear_status,
'miss_count': miss_count,
'pgreats': pgreats,
'greats': greats,
})
if miss_count != -1:
scoredata.replace_int('miss_count', miss_count)
if ghost is not None:
scoredata['ghost'] = ghost
raised = True
@ -364,8 +365,12 @@ class IIDXBase(CoreHandler, CardManagerHandler, PASELIHandler, Base):
ex_score = max(ex_score, oldscore.points)
scoredata = oldscore.data
scoredata.replace_int('clear_status', max(scoredata.get_int('clear_status'), clear_status))
if miss_count != -1:
if scoredata.get_int('miss_count', -1) == -1:
scoredata.replace_int('miss_count', miss_count)
else:
scoredata.replace_int('miss_count', min(scoredata.get_int('miss_count'), miss_count))
if raised:
scoredata.replace_int('miss_count', miss_count)
scoredata.replace_int('pgreats', pgreats)
scoredata.replace_int('greats', greats)
if ghost is not None:

6
bemani/frontend/iidx/iidx.py
View File

@ -216,7 +216,7 @@ class IIDXFrontend(FrontendBase):
def format_score(self, userid: UserID, score: Score) -> Dict[str, Any]:
formatted_score = super().format_score(userid, score)
formatted_score['miss_count'] = score.data.get_int('miss_count')
formatted_score['miss_count'] = score.data.get_int('miss_count', -1)
formatted_score['lamp'] = score.data.get_int('clear_status')
formatted_score['status'] = {
IIDXBase.CLEAR_STATUS_NO_PLAY: 'NO PLAY',
@ -232,7 +232,7 @@ class IIDXFrontend(FrontendBase):
def format_top_score(self, userid: UserID, score: Score) -> Dict[str, Any]:
formatted_score = super().format_score(userid, score)
formatted_score['miss_count'] = score.data.get_int('miss_count')
formatted_score['miss_count'] = score.data.get_int('miss_count', -1)
formatted_score['lamp'] = score.data.get_int('clear_status')
formatted_score['ghost'] = [x for x in (score.data.get_bytes('ghost') or b'')]
formatted_score['status'] = {
@ -249,7 +249,7 @@ class IIDXFrontend(FrontendBase):
def format_attempt(self, userid: UserID, attempt: Attempt) -> Dict[str, Any]:
formatted_attempt = super().format_attempt(userid, attempt)
formatted_attempt['miss_count'] = attempt.data.get_int('miss_count')
formatted_attempt['miss_count'] = attempt.data.get_int('miss_count', -1)
formatted_attempt['status'] = {
IIDXBase.CLEAR_STATUS_NO_PLAY: 'NO PLAY',
IIDXBase.CLEAR_STATUS_FAILED: 'FAILED',