Cool_Tools/bemaniutils
1
0
Fork 0
mirror of synced 2025-02-20 20:50:59 +01:00
Code Releases Activity

Fix a few miscellaneous things with eclale/usaneko.

Browse Source
This commit is contained in:
Jennifer Taylor 2021-09-02 01:09:17 +00:00
parent 31df2d5506
commit 8fdacf017a
2 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bemani/backend/popn/eclale.py
View File

@ -497,13 +497,13 @@ class PopnMusicEclale(PopnMusicBase):
# Account stuff
account = Node.void('account')
root.add_child(account)
account.add_child(Node.string('g_pm_id', self.format_extid(profile.extid))) # Eclale formats on its own
account.add_child(Node.string('g_pm_id', self.format_extid(profile.extid)))
account.add_child(Node.string('name', profile.get_str('name', 'なし')))
account.add_child(Node.s8('tutorial', profile.get_int('tutorial')))
account.add_child(Node.s16('area_id', profile.get_int('area_id')))
account.add_child(Node.s16('lumina', profile.get_int('lumina', 300)))
account.add_child(Node.s16('read_news', profile.get_int('read_news')))
account.add_child(Node.bool('welcom_pack', profile.get_bool('welcom_pack')))
account.add_child(Node.bool('welcom_pack', False)) # Set this to true to grant extra stage no matter what.
account.add_child(Node.s16_array('medal_set', profile.get_int_array('medal_set', 4)))
account.add_child(Node.s16_array('nice', profile.get_int_array('nice', 30, [-1] * 30)))
account.add_child(Node.s16_array('favorite_chara', profile.get_int_array('favorite_chara', 20, [-1] * 20)))
@ -688,9 +688,6 @@ class PopnMusicEclale(PopnMusicBase):
def unformat_profile(self, userid: UserID, request: Node, oldprofile: Profile) -> Profile:
newprofile = copy.deepcopy(oldprofile)
# Set that we've seen this profile
newprofile.replace_bool('welcom_pack', True)
account = request.child('account')
if account is not None:
newprofile.replace_int('tutorial', account.child_value('tutorial'))

47
bemani/backend/popn/usaneko.py
View File

@ -235,7 +235,7 @@ class PopnMusicUsaNeko(PopnMusicBase):
subnode.add_child(Node.u8('clear_type', ach.data.get_int('clear_type')))
subnode.add_child(Node.u8('clear_rank', ach.data.get_int('clear_rank')))
for area_id in range(1, 17):
for area_id in range(0, 16):
area = Node.void('area')
root.add_child(area)
area.add_child(Node.s16('area_id', area_id))
@ -243,7 +243,7 @@ class PopnMusicUsaNeko(PopnMusicBase):
area.add_child(Node.s16('medal_id', area_id))
area.add_child(Node.bool('is_limit', False))
for choco_id in range(1, 6):
for choco_id in range(0, 5):
choco = Node.void('choco')
root.add_child(choco)
choco.add_child(Node.s16('choco_id', choco_id))
@ -807,7 +807,7 @@ class PopnMusicUsaNeko(PopnMusicBase):
account.add_child(Node.s32('chocolate_pass_cnt', profile.get_int('chocolate_pass_cnt')))
account.add_child(Node.s32('chocolate_hon_cnt', profile.get_int('chocolate_hon_cnt')))
account.add_child(Node.s16_array('teacher_setting', profile.get_int_array('teacher_setting', 10, [-1] * 10)))
account.add_child(Node.bool('welcom_pack', profile.get_bool('welcome_pack')))
account.add_child(Node.bool('welcom_pack', False)) # Set to true to grant extra stage no matter what.
account.add_child(Node.s32('ranking_node', profile.get_int('ranking_node')))
account.add_child(Node.s32('chara_ranking_kind_id', profile.get_int('chara_ranking_kind_id')))
account.add_child(Node.s8('navi_evolution_flg', profile.get_int('navi_evolution_flg')))
@ -1110,44 +1110,6 @@ class PopnMusicUsaNeko(PopnMusicBase):
mission.add_child(Node.u32('gauge_point', points))
mission.add_child(Node.u32('mission_comp', complete))
# Scores
scores = self.data.remote.music.get_scores(self.game, self.version, userid)
for score in scores:
# Skip any scores for chart types we don't support
if score.chart not in [
self.CHART_TYPE_EASY,
self.CHART_TYPE_NORMAL,
self.CHART_TYPE_HYPER,
self.CHART_TYPE_EX,
]:
continue
music = Node.void('music')
root.add_child(music)
music.add_child(Node.s16('music_num', score.id))
music.add_child(Node.u8('sheet_num', {
self.CHART_TYPE_EASY: self.GAME_CHART_TYPE_EASY,
self.CHART_TYPE_NORMAL: self.GAME_CHART_TYPE_NORMAL,
self.CHART_TYPE_HYPER: self.GAME_CHART_TYPE_HYPER,
self.CHART_TYPE_EX: self.GAME_CHART_TYPE_EX,
}[score.chart]))
music.add_child(Node.s32('score', score.points))
music.add_child(Node.u8('clear_type', {
self.PLAY_MEDAL_CIRCLE_FAILED: self.GAME_PLAY_MEDAL_CIRCLE_FAILED,
self.PLAY_MEDAL_DIAMOND_FAILED: self.GAME_PLAY_MEDAL_DIAMOND_FAILED,
self.PLAY_MEDAL_STAR_FAILED: self.GAME_PLAY_MEDAL_STAR_FAILED,
self.PLAY_MEDAL_EASY_CLEAR: self.GAME_PLAY_MEDAL_EASY_CLEAR,
self.PLAY_MEDAL_CIRCLE_CLEARED: self.GAME_PLAY_MEDAL_CIRCLE_CLEARED,
self.PLAY_MEDAL_DIAMOND_CLEARED: self.GAME_PLAY_MEDAL_DIAMOND_CLEARED,
self.PLAY_MEDAL_STAR_CLEARED: self.GAME_PLAY_MEDAL_STAR_CLEARED,
self.PLAY_MEDAL_CIRCLE_FULL_COMBO: self.GAME_PLAY_MEDAL_CIRCLE_FULL_COMBO,
self.PLAY_MEDAL_DIAMOND_FULL_COMBO: self.GAME_PLAY_MEDAL_DIAMOND_FULL_COMBO,
self.PLAY_MEDAL_STAR_FULL_COMBO: self.GAME_PLAY_MEDAL_STAR_FULL_COMBO,
self.PLAY_MEDAL_PERFECT: self.GAME_PLAY_MEDAL_PERFECT,
}[score.data.get_int('medal')]))
music.add_child(Node.u8('clear_rank', self.__score_to_rank(score.points)))
music.add_child(Node.s16('cnt', score.plays))
# Player netvs section
netvs = Node.void('netvs')
root.add_child(netvs)
@ -1184,9 +1146,6 @@ class PopnMusicUsaNeko(PopnMusicBase):
def unformat_profile(self, userid: UserID, request: Node, oldprofile: Profile) -> Profile:
newprofile = copy.deepcopy(oldprofile)
# Set that we've seen this profile
newprofile.replace_bool('welcome_pack', True)
account = request.child('account')
if account is not None:
newprofile.replace_int('tutorial', account.child_value('tutorial'))