Compare commits

..

6 Commits

6 changed files with 10 additions and 35 deletions

2
.gitmodules vendored
View File

@ -1,7 +1,7 @@
[submodule "Js/Translations"]
path = Js/Translations
url = https://git.poweris.moe/yttt-xdu/xdutranslations.git
branch = master
branch = .
[submodule "CustomData"]
path = CustomData
url = https://git.poweris.moe/yttt-xdu/customdata.git

View File

@ -43,8 +43,4 @@ Fix MoveCamera macro
## V1.4.0 (2019-09-29)
Updated Pixi.js to v5
## V1.5.0 (2020-07-31)
XDU Global support
Updated Pixi.js to v5

View File

@ -84,8 +84,6 @@ body { margin: 0; height: 100%; }
#text-container.rus { font-family: 'PTSans'; }
#text-container.cze { font-family: 'PTSans'; }
#text-container #fullscreen-button { position: absolute; top: 0.5rem; left: 0.5rem; font-size: 30px; line-height: 30px; opacity: 0.35; z-index: 11; }
#text-container #title { position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center; font-size: 20px; transition: opacity 0.3s; cursor: default; user-select: none; }

View File

@ -10,8 +10,8 @@ const shaders = new Shaders();
const textFunc = new TextFunctions();
let audio = undefined; //Cant create a audio context without user input.
const player = new Player(pixiApp, utage, textFunc, audio, shaders);
const languages = ["eng", "jpn", "rus", "cze", "enm", "kor", "zho"];
const version = "YameteTomete XDUPlayer V1.5.0";
const languages = ["eng", "jpn", "rus", "enm", "kor", "zho"];
const version = "YameteTomete XDUPlayer V1.4.0";
let bodyLoaded = false;
let utageLoaded = false;
let languagesLoaded = false;
@ -285,10 +285,6 @@ function sceneDropDownChanged(event) {
let name = scene.Name;
let summary = scene.SummaryText;
let image = questSceneMstId;
if ("Image" in scene) {
image = scene.Image;
}
let credits = "";
let tl_key = utage.sceneTranslations[cust][questSceneMstId];
@ -311,8 +307,8 @@ function sceneDropDownChanged(event) {
chapterSelect += `<option value="${p}">${p}</option>`
}
let detailSrc = `${utage.rootDirectory}${(scene.IsCustom ? "CustomData" : "XDUData")}/Asset/Image/Quest/Snap/Detail/${image}.png`;
let iconSrc = `${utage.rootDirectory}${(scene.IsCustom ? "CustomData" : "XDUData")}/Asset/Image/Quest/Snap/Icon/${image}.png`;
let detailSrc = `${utage.rootDirectory}${(scene.IsCustom ? "CustomData" : "XDUData")}/Asset/Image/Quest/Snap/Detail/${questSceneMstId}.png`;
let iconSrc = `${utage.rootDirectory}${(scene.IsCustom ? "CustomData" : "XDUData")}/Asset/Image/Quest/Snap/Icon/${questSceneMstId}.png`;
chapterSelect += '</select></div>';
cont.innerHTML = `
<div id="mission-modal" class="modal">

View File

@ -960,12 +960,7 @@ class Player {
let text = cur.English ? (this.utage.translations ? (this.utage.translations[cur.English] || cur.Text) : cur.Text) : cur.Text;
text = commonFunctions.convertUtageTextTags(text);
if(cur.Arg2 && cur.Arg2.toLowerCase() === "<off>") {
let nameFullWidth = cur.Arg1.replace(/[A-Za-z0-9]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) + 0xFEE0);});
let nameHalfWidth = cur.Arg1.replace(/[---]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) - 0xFEE0)});
this.text.characterName(true, this.utage.charTranslations[cur.Arg1]
|| this.utage.charTranslations[nameFullWidth]
|| this.utage.charTranslations[nameHalfWidth]
|| cur.Arg1);
this.text.characterName(true, this.utage.charTranslations[cur.Arg1] || cur.Arg1);
this.text.dialogText(true, commonFunctions.convertUtageTextTags(text));
} else {
let found = false;
@ -980,12 +975,7 @@ class Player {
if(cur.Character) {
nameToUse = cur.Arg1;
}
let nameFullWidth = nameToUse.replace(/[A-Za-z0-9]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) + 0xFEE0);});
let nameHalfWidth = nameToUse.replace(/[---]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) - 0xFEE0)});
this.text.characterName(true, this.utage.charTranslations[nameToUse]
|| this.utage.charTranslations[nameFullWidth]
|| this.utage.charTranslations[nameHalfWidth]
|| nameToUse);
this.text.characterName(true, this.utage.charTranslations[nameToUse] || nameToUse);
this.text.dialogText(true, text);
//restoreTint is set from a colorTo command.
//We want to maintain the tint change from colorTo during speaking still.
@ -1023,12 +1013,7 @@ class Player {
}
//If we didnt find the character just dump the text anyways with Arg1 as the name
if(!found) {
let nameFullWidth = cur.Arg1.replace(/[A-Za-z0-9]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) + 0xFEE0);});
let nameHalfWidth = cur.Arg1.replace(/[---]/g, function(s) {return String.fromCharCode(s.charCodeAt(0) - 0xFEE0)});
this.text.characterName(true, this.utage.charTranslations[cur.Arg1]
|| this.utage.charTranslations[nameFullWidth]
|| this.utage.charTranslations[nameHalfWidth]
|| cur.Arg1);
this.text.characterName(true, this.utage.charTranslations[cur.Arg1] || cur.Arg1);
this.text.dialogText(true, text);
}
}

@ -1 +1 @@
Subproject commit ac0bfbd699431e9befdd843379e7c91ad1014cec
Subproject commit bb6b8748a985ea6662300faaba12dcac2c8e0a45