Max/asphyxia_plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Merge branch 'sdvx_mod_webui' into sdvx_mod

Browse Source
This commit is contained in:
vvo
2022-10-22 12:11:29 +08:00
parent d9915bd77f 11d8cd3869
commit 3aeb040819
3 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdvx@asphyxia/utils.ts
+17 -9
View File
@@ -163,8 +163,11 @@ export const copyResourcesFromGame = async (data: {}) => {
}
newNemsysData.forEach(fileName => {
if(parseInt(fileName.substring(7, 11))) {
resourceJsonData.nemsys.push({"value": parseInt(fileName.substring(7, 11)), "name": fileName + " (please rename)"})
if(fileName.match(/([0-9]+)/g) != undefined) {
let nemsysId = parseInt(fileName.match(/([0-9]+)/g)[0])
if(nemsysId && resourceJsonData.nemsys.find(nem => nem.value == nemsysId) == undefined) {
resourceJsonData.nemsys.push({"value": nemsysId, "name": fileName + " (please rename)"})
}
}
})
} else {
@@ -177,7 +180,7 @@ export const copyResourcesFromGame = async (data: {}) => {
if(IO.Exists(U.GetConfig('sdvx_eg_root_dir') + "/data/graphics/submonitor_bg")) {
let subBGFiles = await IO.ReadDir(U.GetConfig('sdvx_eg_root_dir') + "/data/graphics/submonitor_bg")
for await (const subbg of subBGFiles) {
if (subbg.name.substring(subbg.name.length-4, subbg.name.length).match(/(\.png|\.jpg)/g)) {
if (subbg.name.match(/(\.png|\.jpg)/g)) {
let fileToWrite = await IO.ReadFile(U.GetConfig('sdvx_eg_root_dir') + "/data/graphics/submonitor_bg/" + subbg.name)
if(!IO.Exists('webui/asset/submonitor_bg/' + subbg.name.substring(0, (subbg.name.length - 4)) + ".png") && !IO.Exists('webui/asset/submonitor_bg/' + subbg.name.substring(0, (subbg.name.length - 4)) + ".jpg")) {
IO.WriteFile('webui/asset/submonitor_bg/' + subbg.name, fileToWrite)
@@ -189,8 +192,13 @@ export const copyResourcesFromGame = async (data: {}) => {
}
newSubBGData.forEach(fileName => {
if(parseInt(fileName.substring(6, 10))) {
resourceJsonData.subbg.push({"value": parseInt(fileName.substring(6, 10)), "name": fileName + " (please rename)"})
let subbgId = parseInt(fileName.match(/([0-9]+)/g)[0])
if(subbgId) {
let foundSubbg = resourceJsonData.subbg.find(subbg => subbg.value === subbgId)
if(foundSubbg == undefined) {
if(fileName.match(/(subbg_[0-9]+_[0-9]+)/g)) fileName = fileName.match(/(subbg_[0-9]+)/g)
resourceJsonData.subbg.push({"value": subbgId, "name": fileName + " (please rename)"})
}
}
})
} else {
@@ -203,7 +211,7 @@ export const copyResourcesFromGame = async (data: {}) => {
if(IO.Exists(U.GetConfig('sdvx_eg_root_dir') + "/data/sound/custom")) {
let bgmFiles = await IO.ReadDir(U.GetConfig('sdvx_eg_root_dir') + "/data/sound/custom")
for await (const bgm of bgmFiles) {
if (bgm.name.substring(bgm.name.length-4, bgm.name.length) == '.s3p') {
if (bgm.name.match(/(\.s3p)/g)) {
let folderName = bgm.name.match(/(custom|special)_([0-9]*)/g)[0]
if(folderName != '') {
let fileToWrite = await IO.ReadFile(U.GetConfig('sdvx_eg_root_dir') + "/data/sound/custom/" + bgm.name)
@@ -218,9 +226,9 @@ export const copyResourcesFromGame = async (data: {}) => {
}
newBGMData.forEach(fileName => {
let bgmId = fileName.match(/(?<=(custom|special)_)([0-9]*)/g)[0]
if(parseInt(bgmId)) {
resourceJsonData.bgm.push({"value": parseInt(bgmId), "name": fileName + " (please rename)"})
let bgmId = parseInt(fileName.match(/(?<=(custom|special)_)([0-9]*)/g)[0])
if(bgmId && resourceJsonData.bgm.find(bgm => bgm.value == bgmId) == undefined) {
resourceJsonData.bgm.push({"value": bgmId, "name": fileName + " (please rename)"})
}
})
} else {
sdvx@asphyxia/webui/asset/js/preview.js
+11 -4
View File
@@ -9,6 +9,11 @@ function getImageFileFormat(assetType, id) {
}
}
function checkPregeneSubbg(subbg) {
pregeneSlideshows = [166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185]
return pregeneSlideshows.includes(parseInt(subbg))
}
;
(function($) {
$.preload = function() {
@@ -36,7 +41,7 @@ $('#nemsys_select').change(function() {
});
$('[name="subbg"]').change(function() {
$('#sub_pre').fadeOut(200, () => { $('#sub_pre').attr("src", "static/asset/submonitor_bg/subbg_" + zeroPad($('[name="subbg"]').val(), 4) + getImageFileFormat(0, parseInt(zeroPad($('[name="subbg"]').val(), 4)) )); });
$('#sub_pre').fadeOut(200, () => { $('#sub_pre').attr("src", checkPregeneSubbg($('[name="subbg"]').val()) ? "static/asset/submonitor_bg/subbg_" + zeroPad($('[name="subbg"]').val(), 4) + "_0" + (Math.floor(Math.random() * 3) + 1) + getImageFileFormat(0, parseInt(zeroPad($('[name="subbg"]').val(), 4))) : "static/asset/submonitor_bg/subbg_" + zeroPad($('[name="subbg"]').val(), 4) + getImageFileFormat(0, parseInt(zeroPad($('[name="subbg"]').val(), 4)) )); });
$('#sub_pre').fadeIn(200);
});
@@ -136,8 +141,7 @@ $(document).ready(function() {
items_bgm = JSON.parse(document.getElementById("data-pass-bgm").innerText);
items_nemsys = JSON.parse(document.getElementById("data-pass-nemsys").innerText);
unlock_all = (document.getElementById("data-pass-unlock-all").innerText === 'true');
console.log(unlock_all);
$.getJSON("static/asset/json/data.json", function(json) {
database = json;
@@ -163,13 +167,16 @@ $(document).ready(function() {
$('#nemsys_select').val(profile_data["nemsys"]);
for (var i in json["subbg"]) {
if(unlock_all || (json["subbg"][i].value === 0 || items_subbg.find(x => x.id === json["subbg"][i].value))) {
$('[name="subbg"]').append($('<option>', {
value: json["subbg"][i].value,
text: json["subbg"][i].name,
}));
var image = new Image();
image.src = "static/asset/submonitor_bg/subbg_" + zeroPad(json["subbg"][i].value, 4) + getImageFileFormat(0, parseInt(zeroPad(json["subbg"][i].value, 4)));
if (checkPregeneSubbg(json["subbg"][i].value)) {
image.src = "static/asset/submonitor_bg/subbg_" + zeroPad(json["subbg"][i].value, 4) + "_0" + (Math.floor(Math.random() * 3) + 1) + getImageFileFormat(0, parseInt(zeroPad(json["subbg"][i].value, 4)));
} else image.src = "static/asset/submonitor_bg/subbg_" + zeroPad(json["subbg"][i].value, 4) + getImageFileFormat(0, parseInt(zeroPad(json["subbg"][i].value, 4)));
// console.log(image);
//console.log(profile_data["subbg"])
sdvx@asphyxia/webui/asset/js/updateResources.js
+47 -42
View File
@@ -16,8 +16,11 @@ $(document).ready(async function() {
document.getElementById("logtextarea").textContent = 'Running....\n'
await emit("copyResourcesFromGame").then(
function(response){
document.getElementById("logtextarea").textContent += 'Done.\n\n\n'
document.getElementById("logtextarea").textContent += 'Done.\n'
$.getJSON( "static/asset/logs/copyResourcesFromGame.json", function( data ) {
document.getElementById("logtextarea").textContent += 'NOTE:\n- labels for these new files (nemsys, bgm, submonitor bg, chat stamps) in the asset/json/data.json file needs to be updated.\n'
document.getElementById("logtextarea").textContent += '- for converting s3p files to mp3, check guide in the notes section above.\n'
if(data['errors'].length > 0) {
document.getElementById("logtextarea").textContent += 'Errors: \n'
$.each(data['errors'], function(key, val) {
@@ -26,48 +29,8 @@ $(document).ready(async function() {
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['nemsys'].length > 0) {
document.getElementById("logtextarea").textContent += 'New nemsys: \n'
$.each(data['nemsys'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val + '\n'
})
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['apCard'].length > 0) {
document.getElementById("logtextarea").textContent += 'New appeal cards: \n'
$.each(data['apCard'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val + '\n'
})
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['subbg'].length > 0) {
document.getElementById("logtextarea").textContent += 'New submonitor backgrounds: \n'
$.each(data['subbg'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val + '\n'
})
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['bgm'].length > 0) {
document.getElementById("logtextarea").textContent += 'New bgm: \n'
$.each(data['bgm'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val + '\n'
})
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['chatStamp'].length > 0) {
document.getElementById("logtextarea").textContent += 'New chat stamps: \n'
$.each(data['chatStamp'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val + '\n'
})
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['versionSongs'].length > 0) {
document.getElementById("logtextarea").textContent += 'New songs in latest data: \n'
document.getElementById("logtextarea").textContent += 'New songs in latest version data: \n'
$.each(data['versionSongs'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val[1] + '\n'
})
@@ -91,6 +54,48 @@ $(document).ready(async function() {
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['nemsys'].length > 0) {
document.getElementById("logtextarea").textContent += 'New nemsys: \n'
$.each(data['nemsys'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val + '\n'
})
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['bgm'].length > 0) {
document.getElementById("logtextarea").textContent += 'New bgm: \n'
$.each(data['bgm'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val + '\n'
})
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['apCard'].length > 0) {
document.getElementById("logtextarea").textContent += 'New appeal cards: \n'
$.each(data['apCard'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val + '\n'
})
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['subbg'].length > 0) {
document.getElementById("logtextarea").textContent += 'New submonitor backgrounds: \n'
$.each(data['subbg'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val + '\n'
})
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['chatStamp'].length > 0) {
document.getElementById("logtextarea").textContent += 'New chat stamps: \n'
$.each(data['chatStamp'], function(key, val) {
document.getElementById("logtextarea").textContent += "- " + val + '\n'
})
document.getElementById("logtextarea").textContent += '\n\n'
}
if(data['valgeneItemFiles'].length > 0) {
document.getElementById("logtextarea").textContent += 'New valgene_item files: \n'
$.each(data['valgeneItemFiles'], function(key, val) {