From 825e2621b0713cdb1ce0a173d1001e077f5b6674 Mon Sep 17 00:00:00 2001 From: vvo <> Date: Mon, 12 Aug 2024 17:48:49 +0800 Subject: [PATCH] some fixes --- data/exg.ts | 6 +----- handlers/common.ts | 19 ++----------------- index.ts | 4 +--- webui/asset/json/events.json | 2 +- 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/data/exg.ts b/data/exg.ts index 082b973..c85710d 100644 --- a/data/exg.ts +++ b/data/exg.ts @@ -70,11 +70,7 @@ export const LICENSED_SONGS6 = [ '1917', '1960', '1961', '1962', '2028', '2029', '1912', '1913', '2030', '2031', '2032', '2033', '2034', '2035', '2036', '1905', '1882', '2058', '2069', '2070', '2071', '2072', '2073', '2074', '2075', '2076', '2066', '2067', '2068', '2165', - '2166', '2167', '2172', '2173', '2174', '2175' -] - -export const REMOVED_SONGS6 = [ - '1873', '1874', '1759', '1760', '1761', '476' + '2166', '2167', '2172', '2173', '2174', '2175', '2184' ] export const STAMP_EVENTS6 = { diff --git a/handlers/common.ts b/handlers/common.ts index d2ff895..b6fb691 100644 --- a/handlers/common.ts +++ b/handlers/common.ts @@ -1,8 +1,7 @@ import { EVENT4, COURSES4, EXTENDS4 } from '../data/hvn'; import { EVENT5, COURSES5, EXTENDS5 } from '../data/vvw'; import { EVENT6, COURSES6, EXTENDS6, APRILFOOLSSONGS, VALKYRIE_SONGS, - LICENSED_SONGS6, ARENA, VALGENE, INFORMATION6, STAMP_EVENTS6, - REMOVED_SONGS6 + LICENSED_SONGS6, ARENA, VALGENE, INFORMATION6, STAMP_EVENTS6 } from '../data/exg'; import { COURSE2 } from '../data/inf'; import {getVersion, getRandomIntInclusive} from '../utils'; @@ -103,15 +102,11 @@ export const common: EPR = async (info, data, send) => { limitedNo = 2; // if song is released during exceed gear if(songData.info.version['#text'] === '6') { - // Songs are removed for multiple reasons, this will check whether to show or hide them (for songs released during EG) - if(REMOVED_SONGS6.includes(i.toString()) && !U.GetConfig('enable_removed_songs')) { - limitedNo -= 1; - } // Licensed songs released in Exceed Gear needs limited=3 to appear if(LICENSED_SONGS6.includes(i.toString())) { limitedNo += 1; } - else if(VALKYRIE_SONGS.includes(i.toString()) && (!U.GetConfig('enable_valk_songs') && info.model.split(":")[2].match(/^(G|H)$/g) == null)){ + else if(VALKYRIE_SONGS.includes(i.toString()) && info.model.split(":")[2].match(/^(G|H)$/g) == null){ limitedNo -= 1; } for(let j = 0; j < 5; j++) { @@ -130,16 +125,6 @@ export const common: EPR = async (info, data, send) => { limited: K.ITEM('u8', limitedNo), }); } - // Songs are removed for multiple reasons, this will check whether to show or hide them (for songs released before EG) - else if(REMOVED_SONGS6.includes(i.toString()) && !U.GetConfig('enable_removed_songs')) { - for(let j = 0; j < 5; j++) { - songs.push({ - music_id: K.ITEM('s32', i), - music_type: K.ITEM('u8', j), - limited: K.ITEM('u8', 2), - }); - } - } } } } diff --git a/index.ts b/index.ts index bc526b5..c4c3d8f 100644 --- a/index.ts +++ b/index.ts @@ -34,16 +34,14 @@ export function register() { R.Contributor("ovv (this fork)"); R.GameCode('KFC'); + R.Config('sdvx_eg_root_dir', { type: 'string', needRestart: true, default: '', name: 'Exceed Gear Data Directory', desc: 'The root directory of your SDVX Exceed Gear game files (for asset copying)'}); R.Config('arena_szn',{ type: 'string', options: Object.keys(ARENA), default: 'None', name: 'Ranked Match Season', desc: 'Current ARENA/SINGLE BATTLE ranked season. Also sets ARENA STATION catalog corresponding to that season.'}); - R.Config('enable_valk_songs' ,{ type: 'boolean', default: false, name:'Enable Valkyrie Model Songs', desc:'Enable the valkyrie model songs on non-valkyrie mode.'}); R.Config('use_blasterpass',{ type: 'boolean', default: true, name:'Use Blaster Pass', desc:'Enable Blaster Pass for VW and EG'}); R.Config('tama_track_lib',{ type: 'boolean', default: true, name:'Enable Track Liberation', desc:'(Requires TAMANEKO adventure event to be enabled) A TAMANEKO adventure map that will unlock a random song that has no unlock condition. OVER ADVENTURE will be displayed if this is disabled and if you have completed all other adventures.'}); R.Config('unlock_all_valk_items', { type: 'boolean', default: false, name:'Unlock All Valkyrie and Premium Items', desc: 'Unlock Nemsys, BGM, Submonitor BG, System BG and Stamp Items (Valk crews not included; check \'unlock all navigators\' option)'}); R.Config('unlock_all_songs', { type: 'boolean', default: false, name:'Unlock All Songs'}); R.Config('unlock_all_navigators', { type: 'boolean', default: false, name:'Unlock All Navigators'} ); R.Config('unlock_all_appeal_cards', { type: 'boolean', default: false, name:'Unlock All Appeal Cards'}); - R.Config('enable_removed_songs', {type: 'boolean', default: true, name:'Enable removed songs', desc: 'Songs hidden or removed server-side will appear.'}) - R.Config('sdvx_eg_root_dir', { type: 'string', needRestart: true, default: '', name: 'Exceed Gear Data Directory', desc: 'The root directory of your SDVX Exceed Gear game files (for asset copying)'}); R.Config('use_information' ,{ type: 'boolean', default: true, name:'Use Asphyxia Information', desc:'Enable the Asphyxia information section after entry. Otherwise, it will try to look for official information data and display them.'}); R.Config('use_asphyxia_gameover',{ type: 'boolean', default: true, name:'Use Asphyxia Gameover', desc:'Enable the Asphyxia gameover message after ending the game.'}) R.Config('april_fools',{ type: 'boolean', default: false, name:'April Fools', desc:'Enable April Fools Event (toggles Grace crew + April Fools songs)'}); diff --git a/webui/asset/json/events.json b/webui/asset/json/events.json index 105dbeb..5cf2dd6 100644 --- a/webui/asset/json/events.json +++ b/webui/asset/json/events.json @@ -326,7 +326,7 @@ { "id": "demoloopinfo", "key": "DEMOLOOP_INFORMATION", - "str": "DEMOLOOP_INFORMATION\tdemo_info/240129_bpls3_streaming.png", + "str": "DEMOLOOP_INFORMATION\tdemo_info/240604_bpls4iidx_demo.png", "explain": "Enables display of available information in attract mode." }, {