yttt-xdu/XDUPlayer
6
0
Fork 0
Code Issues Pull Requests Releases Activity

custom macros

Browse Source 
dug out an old copy of the Macros file from the wedding gears
event and set up the player to merge removed macros
This commit is contained in:
louis f 2019-05-13 17:41:01 -04:00
parent 269592c3d6
commit 737b13da42
3 changed files with 22 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -30,6 +30,4 @@ Fix noise\_disappearance commands
## V1.3.0 (2019-05-13) ## V1.3.0 (2019-05-13)
Macro support Macro support
Webpack distribution
ES6 modules
DivaMovie DivaMovie

108
Js/Player.js
View File

@ -49,13 +49,17 @@ class Player {
return runningPromise; return runningPromise;
} }
loadFilesFromCommand(c, toLoadSe, toLoadBgm) { loadFilesFromCommand(c, toLoadSe, toLoadBgm, custom = false) {
let command = c.Command ? c.Command.toLowerCase() : ''; let command = c.Command ? c.Command.toLowerCase() : '';
switch(command) { switch(command) {
//BG images //BG images
case "divaeffectstart": { case "divaeffectstart": {
let file = c.Arg1.split('/').pop(); let file = c.Arg1.split('/').pop();
if (!custom) {
this.loader.add(`bg|${file}`, `${this.utage.rootDirectory}XDUData/${c.Arg1}`.replace(/bg_adv/, "FUCK_EASYLIST")); this.loader.add(`bg|${file}`, `${this.utage.rootDirectory}XDUData/${c.Arg1}`.replace(/bg_adv/, "FUCK_EASYLIST"));
} else {
this.loader.add(`bg|${file}`, `${this.utage.rootDirectory}CustomData/${c.Arg1}`.replace(/bg_adv/, "FUCK_EASYLIST"));
}
break; break;
} }
case "divadecorateneutral": case "divadecorateneutral":
@ -140,54 +144,6 @@ class Player {
} }
break; break;
} }
case "somethingnew_appearance01":
case "unhappyseed_appearance01":
case "unhappyseed_appearance02":
case "arcanoise_appearance02":
case "arcanoise_appearance03":
case "darkaura01": {
switch(c.Command ? c.Command.toLowerCase() : '') {
case "somethingnew_appearance01":
if(this.utage.soundInfo['Se_サムシング・ニューの叫び声(アアア”ア”ア”)']) {
toLoadSe['Se_サムシング・ニューの叫び声(アアア”ア”ア”)'] = this.utage.soundInfo['Se_サムシング・ニューの叫び声(アアア”ア”ア”)'];
} else {
console.log(`Failed to get somethingnew_appearance01 SE: Se_サムシング・ニューの叫び声(アアア”ア”ア”)`);
}
break;
case "darkaura01":
case "unhappyseed_appearance02":
case "unhappyseed_appearance01":
if(this.utage.soundInfo['Se_不幸のオーラ(ヴォォオンン)']) {
toLoadSe['Se_不幸のオーラ(ヴォォオンン)'] = this.utage.soundInfo['Se_不幸のオーラ(ヴォォオンン)'];
} else {
console.log(`Failed to get unhappyseed_appearance SE: Se_不幸のオーラ(ヴォォオンン)`);
}
break;
}
let pat = this.defaultCharPattern;
if(c.Arg1) {
if(this.utage.characterInfo[c.Arg1] && this.utage.characterInfo[c.Arg1][pat]) {
if(!this.loader.resources[`char|${c.Arg1}|${pat}`]) {
this.loader.add(`char|${c.Arg1}|${pat}`, this.utage.characterInfo[c.Arg1][pat].FileName);
}
}
}
if(c.Arg2) {
if(this.utage.characterInfo[c.Arg2] && this.utage.characterInfo[c.Arg2][pat]) {
if(!this.loader.resources[`char|${c.Arg2}|${pat}`]) {
this.loader.add(`char|${c.Arg2}|${pat}`, this.utage.characterInfo[c.Arg2][pat].FileName);
}
}
}
if(c.Arg3) {
if(this.utage.characterInfo[c.Arg3] && this.utage.characterInfo[c.Arg3][pat]) {
if(!this.loader.resources[`char|${c.Arg3}|${pat}`]) {
this.loader.add(`char|${c.Arg3}|${pat}`, this.utage.characterInfo[c.Arg3][pat].FileName);
}
}
}
break;
}
default: default:
break; break;
} }
@ -235,8 +191,12 @@ class Player {
for (let key of Object.keys(m)) { for (let key of Object.keys(m)) {
m[key] = m[key].replace(/%Arg[1-6]/g, (x) => {return c[x.slice(1)];}).replace(/%Text/g, c.Text); m[key] = m[key].replace(/%Arg[1-6]/g, (x) => {return c[x.slice(1)];}).replace(/%Text/g, c.Text);
} }
if (c.Command === "SceneTitlebridal" && m.Command === "DivaEffectStart") {
this.loadFilesFromCommand(m, toLoadSe, toLoadBgm, true);
} else {
this.loadFilesFromCommand(m, toLoadSe, toLoadBgm); this.loadFilesFromCommand(m, toLoadSe, toLoadBgm);
} }
}
} else { } else {
this.loadFilesFromCommand(c, toLoadSe, toLoadBgm); this.loadFilesFromCommand(c, toLoadSe, toLoadBgm);
} }
@ -762,45 +722,6 @@ class Player {
texture.baseTexture.source.addEventListener('ended', (event) => { this.manualNext = false; }, false); texture.baseTexture.source.addEventListener('ended', (event) => { this.manualNext = false; }, false);
break; break;
} }
case "unhappyseed_appearance01": { //312000112
this.audio.stopSound('Se_不幸のオーラ(ヴォォオンン)');
this.audio.playSound('Se_不幸のオーラ(ヴォォオンン)', 'Se');
this.waitTime = 2000;
let customCommand = { Command: "", Arg1: cur.Arg1, Arg2: this.defaultCharPattern, Arg3: 'キャラ中央', Arg6: .5 };
this.checkPutCharacterScreen(customCommand, false);
break;
}
case "unhappyseed_appearance02": { //312000111
let spawnTime = 0.5;
this.audio.stopSound('Se_不幸のオーラ(ヴォォオンン)');
this.audio.playSound('Se_不幸のオーラ(ヴォォオンン)', 'Se');
this.waitTime = 3000;
spawnTime = 2.5;
if(cur.Arg1 && cur.Arg2) {
let customCommand1 = { Command: "", Arg1: cur.Arg1, Arg2: this.defaultCharPattern, Arg3: 'キャラ右', Arg6: spawnTime };
this.checkPutCharacterScreen(customCommand1, false);
let customCommand2 = { Command: "", Arg1: cur.Arg2, Arg2: this.defaultCharPattern, Arg3: 'キャラ左', Arg6: spawnTime };
this.checkPutCharacterScreen(customCommand2, false);
}
break;
}
case "darkaura01": //312000111
this.audio.stopSound('Se_不幸のオーラ(ヴォォオンン)');
this.audio.playSound('Se_不幸のオーラ(ヴォォオンン)', 'Se');
this.waitTime = 2500;
break;
case "somethingnew_appearance01": { //312000111
this.audio.playSound('Se_サムシング・ニューの叫び声(アアア”ア”ア”)', 'Se');
let c = this.currentCharacters['キャラ中央'];
this.waitTime = 4000;
if(c) {
this.lerpTargets.push({type: 'alpha', object: c.sprite, curTime: 0, time: 3000, finalV: 0, initV: 1, post: "destroy" });
}
let customCommand = { Command: "", Arg1: cur.Arg1, Arg2: this.defaultCharPattern, Arg3: 'キャラ中央', Arg6: 3 };
this.checkPutCharacterScreen(customCommand, false, true);
break;
}
} }
} catch(error) { } catch(error) {
console.log(error); console.log(error);
@ -820,13 +741,12 @@ class Player {
this.waitTime = 2360; this.waitTime = 2360;
} else if (effect.startsWith("noise_crushing")) { } else if (effect.startsWith("noise_crushing")) {
this.waitTime = Number(command.Arg1) * 1000; this.waitTime = Number(command.Arg1) * 1000;
} } else if (effect === "darkaura01") {
switch (effect) { this.waitTime = 2500;
case "henshin": } else if (effect === "darkaura_appear01") {
this.waitTime = 4000;
} else if (effect === "henshin") {
this.waitTime = 3850; this.waitTime = 3850;
break;
default:
break;
} }
} }

6
Js/UtageParse.js
View File

@ -38,6 +38,7 @@ class UtageInfo {
commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomSound.tsv`), //9 commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomSound.tsv`), //9
commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomTexture.tsv`), //10 commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomTexture.tsv`), //10
commonFunctions.getFileText(`${this.rootDirectory}XDUData/Utage/Diva/Scenario/Macro.tsv`), //11 commonFunctions.getFileText(`${this.rootDirectory}XDUData/Utage/Diva/Scenario/Macro.tsv`), //11
commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomMacro.tsv`), //12
]; ];
Promise.all(promises) Promise.all(promises)
.then((success) => { .then((success) => {
@ -57,6 +58,7 @@ class UtageInfo {
this.parseSoundInfo(success[9], true); this.parseSoundInfo(success[9], true);
this.parseTextureInfo(success[10], true); this.parseTextureInfo(success[10], true);
this.parseMacroFile(success[11]); this.parseMacroFile(success[11]);
this.parseMacroFile(success[12]);
resolve(); resolve();
}, (failure) => { }, (failure) => {
reject(failure); reject(failure);
@ -221,10 +223,12 @@ class UtageInfo {
if (line && !line.comment) { if (line && !line.comment) {
if (macro === false) { if (macro === false) {
if (line.Command[0] === '*') { if (line.Command[0] === '*') {
macro = true;
name = line.Command.slice(1); name = line.Command.slice(1);
if (!(name in this.macros)) {
macro = true;
this.macros[name] = []; this.macros[name] = [];
} }
}
} else { } else {
if (line.Command === "EndMacro") { if (line.Command === "EndMacro") {
macro = false; macro = false;