From 87dab94b480e2319f26cbe6ae6fd642bd843f7ad Mon Sep 17 00:00:00 2001 From: vvo <> Date: Thu, 13 Jun 2024 13:05:09 +0800 Subject: [PATCH] 240604 --- sdvx@asphyxia/README.md | 37 ++++++++---------- sdvx@asphyxia/data/exg.ts | 39 ++++++++++--------- sdvx@asphyxia/handlers/common.ts | 17 +++++++- sdvx@asphyxia/index.ts | 1 + .../webui/asset/json/valgene_data.json | 32 +++++++++------ 5 files changed, 75 insertions(+), 51 deletions(-) diff --git a/sdvx@asphyxia/README.md b/sdvx@asphyxia/README.md index 8da3595..d01cac6 100644 --- a/sdvx@asphyxia/README.md +++ b/sdvx@asphyxia/README.md @@ -1,8 +1,8 @@ # SOUND VOLTEX -**Plugin Version:** fork-6.0.3.2 +**Plugin Version:** fork-6.0.3.3 -**Supported game versions:** EXCEED GEAR (2024043001) +**Supported game versions:** EXCEED GEAR (2024060401) **Unsupported game versions:** Every other game, as they're untested. @@ -16,6 +16,21 @@ Changelog =========== +## fork-6.0.3.3 + +### New: + +1. Main: + - 2024060401 support + - Added PREMIUM GENERATOR (角巻わため､ / Tsunomaki Watame set) + - Note: subbg files from this pregene set are missing on some leaked update data, you will not be able to use those until those files are in your data. + - Added Watame songs to licensed songs list (exg.ts) + - Watame crew usable (exg.ts) + +2. Misc + - Added option to hide/show serverside-removed music (enabled by default) + + ## fork-6.0.3.2 ### New: @@ -49,24 +64,6 @@ Changelog - Cleaned up stamp event code & data. -## fork-6.0.3.0 - -### New: - -1. Main: - - Added Premium Generator Set 4 (BPL S3) - - Updated events.json to add weeks 6 & 7 of BPL event songs -2. Misc: - - Fixed ARENA Season 12 rule from 1 (point system) to 2 (voting system) - - Added ARENA-related startup flags to exg.ts (arena room id input, online/local match rule voting system, etc.) - - Updated system backgrounds list in customize\_data\_ext.json (forgot to update it as it's manual, sorry...) - - Added new APRIL\_RAINBOW\_LINE\_ACTIVE to startup flags toggle list. - - Enables April Fools 2024 Effect. Toggle this flag on and type V-RAN on the song search bar to activate it. - - Added lounge code (checks for active matches to toggle 'matching' indicator in lounge) - - Fixes to profile customization WebUI js where 1: subbg selection doesn't match the one previewed, and 2: it provides the incorrect subbg file format. - - Some online matchmaking experimentations (still can't make it work though) - - ### Todo: 1. Figure out how to use image (png) files to appear in information/news popup. diff --git a/sdvx@asphyxia/data/exg.ts b/sdvx@asphyxia/data/exg.ts index 9db9c27..ad09161 100644 --- a/sdvx@asphyxia/data/exg.ts +++ b/sdvx@asphyxia/data/exg.ts @@ -24,7 +24,7 @@ export const EVENT6 = [ 'PLAYERJUDGEADJ_ENABLE', 'MIXID_INPUT_ENABLE', 'DISP_PASELI_BANNER', - 'CHARACTER_IGNORE_DISABLE\t122,123,131,139,140,143,149', + 'CHARACTER_IGNORE_DISABLE\t122,123,131,139,140,143,149,160', 'OMEGA_ENABLE\t1,2,3,4,5,6,7,8,9', 'OMEGA_ARS_ENABLE', 'HEXA_ENABLE\t1,2,3,4,5,6,7,8,9,10', @@ -65,24 +65,16 @@ export const LICENSED_SONGS6 = [ '1471', '1477', '1634', '1635', '1636', '1637', '1649', '1650', '1653', '1654', '1655', '1657', '1658', '1739', '1740', '1741', '1744', '1753', '1754', '1755', '1756', '1757', '1758', '1759', '1760', '1761', '1810', '1813', '1814', '1821', - '1866', '1867', '1871', '1872', '1873', '1874', - // 0726 - 1018 - '1857', '1858', '1860', '1861', '1862', '1856', '1859', '1863', '1864', '1865', - '1903', '1904', '1911', '1916', '1917', - // 230228 - 230425 - '1960', '1961', '1962', '2028', '2029', '1912', '1913', '2030', - // 230518 - 230912 - '2031', '2032', '2033', '2034', '2035', '2036', '1905', '1882', '2058', - // 231005 - '2069', '2070', '2071', '2072', '2073', - // 231107 - '2074', '2075', - // 231219 - '2076', - // 240116 - '2066', '2067', '2068', - // 240220 - '2165', '2166', '2167' + '1866', '1867', '1871', '1872', '1873', '1874', '1857', '1858', '1860', '1861', + '1862', '1856', '1859', '1863', '1864', '1865', '1903', '1904', '1911', '1916', + '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' ] export const STAMP_EVENTS6 = { @@ -2483,6 +2475,15 @@ export const PREGENE = [ "sysbg": [17, 18, 19] }, probability: [0.05, 0.39, 0.6, 0.9] + }, + { + id: 11, + items: { + "crew": [160], + "stamp": [368, 369, 370, 371, 372, 373, 374, 375, 376, 377], + "subbg": [464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482] + }, + probability: [0.05, 0.39, 0.6] } ] diff --git a/sdvx@asphyxia/handlers/common.ts b/sdvx@asphyxia/handlers/common.ts index ea5f85e..1a43149 100644 --- a/sdvx@asphyxia/handlers/common.ts +++ b/sdvx@asphyxia/handlers/common.ts @@ -1,7 +1,8 @@ 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 + LICENSED_SONGS6, ARENA, VALGENE, INFORMATION6, STAMP_EVENTS6, + REMOVED_SONGS6 } from '../data/exg'; import { COURSE2 } from '../data/inf'; import {getVersion, getRandomIntInclusive} from '../utils'; @@ -102,6 +103,10 @@ 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; @@ -125,6 +130,16 @@ 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/sdvx@asphyxia/index.ts b/sdvx@asphyxia/index.ts index d9eb76f..00eb038 100644 --- a/sdvx@asphyxia/index.ts +++ b/sdvx@asphyxia/index.ts @@ -41,6 +41,7 @@ export function register() { 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.'}) diff --git a/sdvx@asphyxia/webui/asset/json/valgene_data.json b/sdvx@asphyxia/webui/asset/json/valgene_data.json index 1aa5cf4..6e3328d 100644 --- a/sdvx@asphyxia/webui/asset/json/valgene_data.json +++ b/sdvx@asphyxia/webui/asset/json/valgene_data.json @@ -76,10 +76,10 @@ "name": "Premium Generator（ここなつ）", "jpn_exc": false, "items": { - "crew": [146, 147], - "stamp": [259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278], - "subbg": [382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396], - "sysbg": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] + "crew": [146, 147], + "stamp": [259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278], + "subbg": [382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396], + "sysbg": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] } }, { @@ -87,9 +87,9 @@ "name": "Premium Generator（猫又おかゆ）", "jpn_exc": false, "items": { - "crew": [149], - "stamp": [312, 313, 314, 315, 316, 317, 318, 319, 320, 321], - "subbg": [419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438] + "crew": [149], + "stamp": [312, 313, 314, 315, 316, 317, 318, 319, 320, 321], + "subbg": [419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438] } }, { @@ -97,10 +97,20 @@ "name": "Premium Generator Vol. 4", "jpn_exc": false, "items": { - "crew": [150, 151, 152], - "stamp": [322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333], - "subbg": [439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455], - "sysbg": [17, 18, 19] + "crew": [150, 151, 152], + "stamp": [322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333], + "subbg": [439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455], + "sysbg": [17, 18, 19] + } + }, + { + "id": 11, + "name": "Premium Generator（角巻わため）", + "jpn_exc": false, + "items": { + "crew": [160], + "stamp": [368, 369, 370, 371, 372, 373, 374, 375, 376, 377], + "subbg": [464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482] } } ],