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

Regex fix

Browse Source
This commit is contained in:
fire bingo 2018-07-29 12:14:01 -07:00
parent 6b8cae2c00
commit b31d712782
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Js/Player.js
View File

@ -58,10 +58,10 @@ class Player {
//They use this to set the sprite set for a charater but have an alternate name displayed //They use this to set the sprite set for a charater but have an alternate name displayed
if(c.Arg2 && c.Arg2.toLowerCase().includes("<character=")) { if(c.Arg2 && c.Arg2.toLowerCase().includes("<character=")) {
try { try {
let reg = /<Character=.*?>/; let reg = /<Character=.*?>/i;
let match = c.Arg2.match(reg); let match = c.Arg2.match(reg);
c.Arg2 = c.Arg2.replace(reg, ""); c.Arg2 = c.Arg2.replace(reg, "");
c.Character = match[0].match(/(?<=<Character=)(.*)(?=>)/)[0]; c.Character = match[0].match(/<Character=(.*?)>/i)[1];
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
@ -1212,6 +1212,10 @@ class Player {
if(!this.currentCharacters[c]) { continue; } if(!this.currentCharacters[c]) { continue; }
if(this.currentCharacters[c].charName === cur.Arg1 || this.currentCharacters[c].charName === cur.Character) { if(this.currentCharacters[c].charName === cur.Arg1 || this.currentCharacters[c].charName === cur.Character) {
let nameToUse = this.currentCharacters[c].character.NameText; let nameToUse = this.currentCharacters[c].character.NameText;
//If cur.Character is set that means the line had a <character= included so we want to use the name from arg1 instead.
if(cur.Character) {
nameToUse = cur.Arg1;
}
this.text.characterName(true, utage.charTranslations[nameToUse] || nameToUse); this.text.characterName(true, utage.charTranslations[nameToUse] || nameToUse);
this.text.dialogText(true, text); this.text.dialogText(true, text);
this.currentCharacters[c].sprite.tint = 0xFFFFFF; this.currentCharacters[c].sprite.tint = 0xFFFFFF;

2
Js/Translations

@ -1 +1 @@
Subproject commit d7302ef841e2bf204453660f71d30defeb3365b3 Subproject commit 63ae85550715dfa5aa7cce931e82fc88a8345790