From 43339c7e44566aa32056b04dc3a80fb3e6a94594 Mon Sep 17 00:00:00 2001 From: Jennifer Taylor Date: Fri, 10 Sep 2021 04:46:43 +0000 Subject: [PATCH] Disable Net Taisen for all Pop'n versions. --- TODO.md | 2 +- bemani/backend/popn/eclale.py | 11 +++++- bemani/backend/popn/lapistoria.py | 11 +++++- bemani/backend/popn/peace.py | 22 ++++++------ bemani/backend/popn/usaneko.py | 57 ++++++++++++++++++------------- 5 files changed, 65 insertions(+), 38 deletions(-) diff --git a/TODO.md b/TODO.md index b2a2584..65ae074 100644 --- a/TODO.md +++ b/TODO.md @@ -6,4 +6,4 @@ Things that I have not gotten around to doing. - Prettify the frontend. Its a bit utilitarian right now, aside from some minor color flare. - Make the frontend work better on mobile. It works well enough, but it could be a much better experience. - Support for DanEvo. I meant to do this but my DanEvo ended up in storage before I could tackle it, so the only thing that exists at the moment is a rudimentary music DB parser. - - Figure out phase/unlock/etc bits for some older IIDX and Pop'n Music versions and hook them up to the Arcade panel to allow switching events. + - Figure out phase/unlock/etc bits for some older IIDX versions and hook them up to the Arcade panel to allow switching events. diff --git a/bemani/backend/popn/eclale.py b/bemani/backend/popn/eclale.py index f20772e..7d1babb 100644 --- a/bemani/backend/popn/eclale.py +++ b/bemani/backend/popn/eclale.py @@ -93,6 +93,14 @@ class PopnMusicEclale(PopnMusicBase): 'category': 'game_config', 'setting': 'starmaker_enable', }, + # We don't currently support lobbies or anything, so this is commented out until + # somebody gets around to implementing it. + # { + # 'name': 'Net Taisen', + # 'tip': 'Enable Net Taisen, including win/loss display on song select', + # 'category': 'game_config', + # 'setting': 'enable_net_taisen', + # }, { 'name': 'Force Song Unlock', 'tip': 'Force unlock all songs.', @@ -106,6 +114,7 @@ class PopnMusicEclale(PopnMusicBase): game_config = self.get_game_config() music_phase = game_config.get_int('music_phase') music_sub_phase = game_config.get_int('music_sub_phase') + enable_net_taisen = False # game_config.get_bool('enable_net_taisen') # Event phases. Eclale seems to be so basic that there is no way to disable/enable # the starmaker event. It is just baked into the game. @@ -152,7 +161,7 @@ class PopnMusicEclale(PopnMusicBase): # Unknown event, maybe something to do with song categories? (0-1) 11: 1, # Enable Net Taisen, including win/loss sort option on music select (0-1) - 12: 1, + 12: 1 if enable_net_taisen else 0, # Enable local and server-side matching when selecting a song (0-4) 13: 4, } diff --git a/bemani/backend/popn/lapistoria.py b/bemani/backend/popn/lapistoria.py index c3c6c30..9b50dfc 100644 --- a/bemani/backend/popn/lapistoria.py +++ b/bemani/backend/popn/lapistoria.py @@ -109,6 +109,14 @@ class PopnMusicLapistoria(PopnMusicBase): }, ], 'bools': [ + # We don't currently support lobbies or anything, so this is commented out until + # somebody gets around to implementing it. + # { + # 'name': 'Net Taisen', + # 'tip': 'Enable Net Taisen, including win/loss display on song select', + # 'category': 'game_config', + # 'setting': 'enable_net_taisen', + # }, { 'name': 'Force Song Unlock', 'tip': 'Force unlock all songs.', @@ -122,6 +130,7 @@ class PopnMusicLapistoria(PopnMusicBase): game_config = self.get_game_config() story_phase = game_config.get_int('story_phase') music_phase = game_config.get_int('music_phase') + enable_net_taisen = False # game_config.get_bool('enable_net_taisen') phases = { # Default song phase availability (0-16) @@ -173,7 +182,7 @@ class PopnMusicLapistoria(PopnMusicBase): # When in phase 1 or 2, the following songs are available for unlock: 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360 4: 2, # Unknown event, something to do with net taisen (0-2) - 5: 2, + 5: 2 if enable_net_taisen else 0, # Unknown event (0-1) 6: 1, # Unknown event (0-1) diff --git a/bemani/backend/popn/peace.py b/bemani/backend/popn/peace.py index 169a569..420196a 100644 --- a/bemani/backend/popn/peace.py +++ b/bemani/backend/popn/peace.py @@ -98,8 +98,7 @@ class PopnMusicPeace(PopnMusicModernBase): # The following values control the pop'n music event archive. Setting the flag to the following values has the # corresponding effect. Each value will include the events above it, for example setting it to 5 gives you the # pop'n 15 event, as well as SP, 12, and 11 events. Setting it to 0 disabled the event and skips the entire screen, - #setting it to 20 makes all of the events available for selection. Completing the minigame unlocks the associated content. - + # setting it to 20 makes all of the events available for selection. Completing the minigame unlocks the associated content. 'name': 'Event Archive Phase', 'tip': 'Event Archive mini-game phase for all players.', 'category': 'game_config', @@ -130,13 +129,14 @@ class PopnMusicPeace(PopnMusicModernBase): }, ], 'bools': [ - # Enable Net Taisen, including win/loss display on song select (0-1) - { - 'name': 'Net Taisen', - 'tip': 'Enable Net Taisen, including win/loss display on song select', - 'category': 'game_config', - 'setting': 'enable_net_taisen', - }, + # We don't currently support lobbies or anything, so this is commented out until + # somebody gets around to implementing it. + # { + # 'name': 'Net Taisen', + # 'tip': 'Enable Net Taisen, including win/loss display on song select', + # 'category': 'game_config', + # 'setting': 'enable_net_taisen', + # }, { 'name': 'Force Song Unlock', 'tip': 'Force unlock all songs.', @@ -151,7 +151,7 @@ class PopnMusicPeace(PopnMusicModernBase): music_phase = game_config.get_int('music_phase') event_archive_phase = game_config.get_int('event_archive_phase') holiday_greeting = game_config.get_int('holiday_greeting') - enable_net_taisen = game_config.get_bool('enable_net_taisen') + enable_net_taisen = False # game_config.get_bool('enable_net_taisen') navikun_phase = game_config.get_int('navikun_phase') # Event phases @@ -193,7 +193,7 @@ class PopnMusicPeace(PopnMusicModernBase): # Unknown event (0-1) 4: 1, # Enable Net Taisen, including win/loss display on song select (0-1) - 5: enable_net_taisen, + 5: 1 if enable_net_taisen else 0, # Enable NAVI-kun shunkyoku toujou, allows song 1608 to be unlocked (0-1) 6: 1, # Unknown event (0-1) diff --git a/bemani/backend/popn/usaneko.py b/bemani/backend/popn/usaneko.py index 63263fb..82ac23d 100644 --- a/bemani/backend/popn/usaneko.py +++ b/bemani/backend/popn/usaneko.py @@ -54,29 +54,6 @@ class PopnMusicUsaNeko(PopnMusicModernBase): 11: 'Phase MAX', } }, - { - # For festive times, it's possible to change the welcome greeting. I'm not sure why you would want to change this, but now you can. - 'name': 'Holiday Greeting', - 'tip': 'Changes the payment selection confirmation sound.', - 'category': 'game_config', - 'setting': 'holiday_greeting', - 'values': { - 0: 'Okay!', - 1: 'Merry Christmas!', - 2: 'Happy New Year!', - } - }, - { - 'name': 'Active Event', - 'tip': 'Active event for all players.', - 'category': 'game_config', - 'setting': 'active_event', - 'values': { - 0: 'No event', - 1: 'NAVI-Kun event', - 2: 'Daily Mission event', - }, - }, { 'name': 'NAVI-Kun Event Phase', 'tip': 'NAVI-Kun event phase for all players.', @@ -101,8 +78,39 @@ class PopnMusicUsaNeko(PopnMusicModernBase): 15: 'Phase MAX', }, }, + { + # For festive times, it's possible to change the welcome greeting. I'm not sure why you would want to change this, but now you can. + 'name': 'Holiday Greeting', + 'tip': 'Changes the payment selection confirmation sound.', + 'category': 'game_config', + 'setting': 'holiday_greeting', + 'values': { + 0: 'Okay!', + 1: 'Merry Christmas!', + 2: 'Happy New Year!', + } + }, + { + 'name': 'Active Event', + 'tip': 'Active event for all players.', + 'category': 'game_config', + 'setting': 'active_event', + 'values': { + 0: 'No event', + 1: 'NAVI-Kun event', + 2: 'Daily Mission event', + }, + }, ], 'bools': [ + # We don't currently support lobbies or anything, so this is commented out until + # somebody gets around to implementing it. + # { + # 'name': 'Net Taisen', + # 'tip': 'Enable Net Taisen, including win/loss display on song select', + # 'category': 'game_config', + # 'setting': 'enable_net_taisen', + # }, { 'name': 'Force Song Unlock', 'tip': 'Force unlock all songs.', @@ -118,6 +126,7 @@ class PopnMusicUsaNeko(PopnMusicModernBase): holiday_greeting = game_config.get_int('holiday_greeting') active_event = game_config.get_int('active_event') navikun_phase = game_config.get_int('navikun_phase') + enable_net_taisen = False # game_config.get_bool('enable_net_taisen') navikun_enabled = active_event == 1 daily_mission_enabled = active_event == 2 @@ -148,7 +157,7 @@ class PopnMusicUsaNeko(PopnMusicModernBase): # Unknown event (0-1) 4: 1, # Enable Net Taisen, including win/loss display on song select (0-1) - 5: 1, + 5: 1 if enable_net_taisen else 0, # Enable NAVI-kun shunkyoku toujou, allows song 1608 to be unlocked (0-1) 6: 1, # Unknown event (0-1)