diff --git a/sdvx@asphyxia/data/exg.ts b/sdvx@asphyxia/data/exg.ts index 6ea9a29..15ea4f3 100644 --- a/sdvx@asphyxia/data/exg.ts +++ b/sdvx@asphyxia/data/exg.ts @@ -461,6 +461,83 @@ export const ARENA = { param: 8, }, ], + }, + 'Set 5 (12/22/22)': { + details: { + // season: 4, + time_start: BigInt(Date.parse('22 Dec 2022 00:00:00 GMT')), + time_end: BigInt(Date.parse('31 Dec 2099 23:59:59 GMT')), + shop_start: BigInt(Date.parse('22 Dec 2022 00:00:00 GMT')), + shop_end: BigInt(Date.parse('31 Dec 2099 23:59:59 GMT')), + is_open: 1, + is_shop: 1 + }, + arena_items: [ + { + catalog_id: 1, + catalog_type: 1, + price: 15000, + item_type: 11, + item_id: 112, + param: 1, + }, + { + catalog_id: 1, + catalog_type: 1, + price: 8000, + item_type: 0, + item_id: 1745, + param: 23, + }, + { + catalog_id: 1, + catalog_type: 1, + price: 8000, + item_type: 0, + item_id: 1742, + param: 23, + }, + { + catalog_id: 1, + catalog_type: 1, + price: 8000, + item_type: 0, + item_id: 632, + param: 8, + }, + { + catalog_id: 1, + catalog_type: 1, + price: 4000, + item_type: 0, + item_id: 37, + param: 8, + }, + { + catalog_id: 1, + catalog_type: 1, + price: 4000, + item_type: 0, + item_id: 239, + param: 8, + }, + { + catalog_id: 1, + catalog_type: 1, + price: 2000, + item_type: 0, + item_id: 111, + param: 8, + }, + { + catalog_id: 1, + catalog_type: 1, + price: 2000, + item_type: 0, + item_id: 132, + param: 8, + } + ] } // 'debug': { // details: { @@ -775,13 +852,22 @@ export const VALGENE = { export const PREGENE = [ { - id: 1, + id: 0, items: { 'crew': [131], 'stamp': [69, 70, 71, 72, 73, 74, 75, 76, 77, 78], 'subbg': [166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185] }, probability: [0.01, 0.39, 0.6] + }, + { + id: 1, + items: { + 'crew': [134], + 'stamp': [110, 111, 112, 113, 114, 115, 116, 117, 118, 119], + 'subbg': [200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223] + }, + probability: [0.01, 0.39, 0.6] } ] diff --git a/sdvx@asphyxia/handlers/common.ts b/sdvx@asphyxia/handlers/common.ts index 789fd34..911daca 100644 --- a/sdvx@asphyxia/handlers/common.ts +++ b/sdvx@asphyxia/handlers/common.ts @@ -98,7 +98,7 @@ export const common: EPR = async (info, data, send) => { if(foundSongIndex != -1) { var songData = mdb.mdb.music[foundSongIndex]; if(gameVersion === 6 || gameVersion === -6) { - if(!RESTRICT_SONGS.includes(i.toString())) { + if(!RESTRICT_SONGS.includes(i.toString()) && parseInt(songData['info']['distribution_date']['#text']) <= currentYMDDate) { limitedNo = 2; if(songData.info.version['#text'] === '6') { // if song is released during exceed gear if(MISSINGSONGS6.includes(i.toString())) { diff --git a/sdvx@asphyxia/webui/asset/js/generator.js b/sdvx@asphyxia/webui/asset/js/generator.js index 55d49d0..f897d21 100644 --- a/sdvx@asphyxia/webui/asset/js/generator.js +++ b/sdvx@asphyxia/webui/asset/js/generator.js @@ -53,8 +53,10 @@ async function loadItems(itemSet, gene_edition, items_crew, items_stamp, items_s if(itemCounts[0] >= itemCounts[1]) $('#pregene-roll').attr('disabled', 'disabled') $('.count').text('Unlocked items: ' + itemCounts[0] + "/" + itemCounts[1]) - if(itemSet === 1) { - $('.setinfo').append('
These items are only usable in Japan. Change region to Japan in the ea3-config.xml file.
') + if(itemSet === 0) { + $('.setinfo').append('These items are only usable in Japan. Change region to Japan in the ea3-config.xml file.
') + } else { + $('.jpn-excl').remove() } if('crew' in geneItems.items) { @@ -101,7 +103,7 @@ async function loadValgeneData(gene_edition) { $('#set_select').append('') } } - + $('#set_select').val($("#set_select option").length - 1) } $(document).ready(function() { @@ -130,7 +132,7 @@ $(document).ready(function() { let gene_edition = document.getElementById("generator-edition").innerText; loadValgeneData(gene_edition) loadItems(1, gene_edition, items_crew, items_stamp, items_subbg, items_bgm, items_nemsys) - + $('#set_select').change(function() { $('.count').text('') $('.item_banners').empty() diff --git a/sdvx@asphyxia/webui/asset/json/valgene_data.json b/sdvx@asphyxia/webui/asset/json/valgene_data.json index d973a26..31f79f9 100644 --- a/sdvx@asphyxia/webui/asset/json/valgene_data.json +++ b/sdvx@asphyxia/webui/asset/json/valgene_data.json @@ -1,13 +1,22 @@ { "pregene": [ { - "id": 1, - "name": "Premium Generator 1 (Aqua Set)", + "id": 0, + "name": "Premium Generator (Aqua Set)", "items": { "crew": [131], "stamp": [69, 70, 71, 72, 73, 74, 75, 76, 77, 78], "subbg": [166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185] } + }, + { + "id": 1, + "name": "Premium Generator Vol. 1", + "items": { + "crew": [134], + "stamp": [110, 111, 112, 113, 114, 115, 116, 117, 118, 119], + "subbg": [200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223] + } } ], "valgene":[