diff --git a/Css/main.css b/Css/main.css
index e61d316..d4471e5 100644
--- a/Css/main.css
+++ b/Css/main.css
@@ -52,6 +52,8 @@
to { transform: translate(0, -5px); }
}
+body { margin: 0; }
+
.centered { position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center; }
.hidden { opacity: 0; }
@@ -98,6 +100,8 @@
#dialog-scroll img { height: 35px; }
+#title-container { margin-bottom: 2px; }
+
#other-controls-container { display: flex; width: 550px; justify-content: center; }
#select-mission { min-width: 0; }
@@ -122,9 +126,11 @@
#mission-modal span { max-width: 100%; word-break: break-word; max-height: 120px; overflow: auto;}
-#mission-modal .mission-title { text-align: center; }
+#mission-modal .mission-title { font-weight: bold; text-align: center; }
-#mission-modal #mission-ids { margin-top: auto; width: 100%; display: flex; justify-content: space-around; }
+#mission-modal #mission-ids { margin-top: auto; width: 100%; display: flex; flex-direction: column; align-items: center; }
+
+#mission-modal #mission-ids div { display: flex; align-items: center; }
#modal-buttons { bottom: 0; margin-top: 10px; width: 100%; display: flex; justify-content: space-between; }
diff --git a/Images/hide_button.png b/Images/hide_button.png
index e308170..66132ad 100644
Binary files a/Images/hide_button.png and b/Images/hide_button.png differ
diff --git a/Images/skip_button.png b/Images/skip_button.png
new file mode 100644
index 0000000..8f42d13
Binary files /dev/null and b/Images/skip_button.png differ
diff --git a/Js/Common.js b/Js/Common.js
index 04e61c8..0aa7842 100644
--- a/Js/Common.js
+++ b/Js/Common.js
@@ -45,6 +45,37 @@ class commonFunctions {
});
}
+ static readQueryParameters() {
+ let params = {};
+ let indexOfStart = window.location.href.indexOf("?");
+ let toCheck = window.location.href.slice(indexOfStart + 1);
+ let name = "";
+ let value = "";
+ let nameStep = true;
+ for(let i = 0; i < toCheck.length; ++i) {
+ if(toCheck[i] === "=") {
+ name = name.toLowerCase();
+ params[decodeURIComponent(name)] = "";
+ nameStep = false
+ continue;
+ }
+ if(toCheck[i] === "&") {
+ params[name] = decodeURIComponent(value);
+ name = "";
+ value = "";
+ nameStep = true;
+ continue;
+ }
+ if(nameStep) {
+ name += toCheck[i];
+ } else {
+ value += toCheck[i];
+ }
+ }
+ params[name] = decodeURIComponent(value);
+ return params;
+ }
+
static readLine(line, headers) {
if(line.startsWith('//')) {
return {comment: line};
diff --git a/Js/Main.js b/Js/Main.js
index 649123d..e26a736 100644
--- a/Js/Main.js
+++ b/Js/Main.js
@@ -13,8 +13,13 @@ const player = new Player(pixiApp, utage, textFunc, audio, shaders);
const languages = ["eng", "jpn"];
let bodyLoaded = false;
let utageLoaded = false;
+let languagesLoaded = false;
let selectedLang = "eng";
let currentMission = undefined;
+let currentMissionMst = 0;
+let currentMissionIndex = 0;
+let currentMissionList = [];
+let urlParams = {};
let screenw = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
let screenh = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
let screenSizeTimeout = undefined;
@@ -44,14 +49,14 @@ function onBodyLoaded() {
document.getElementById('loading-font').style.cssText = "display: none;";
loadLocalStorage();
}
- if(utageLoaded) {
+ if(utageLoaded && languagesLoaded) {
document.getElementById('loading-utage').style.cssText = "display: none;";
}
- if(bodyLoaded && utageLoaded) {
+ if(bodyLoaded && utageLoaded && languagesLoaded) {
document.getElementById('loading-container').style.cssText = "opacity: 0;";
onAllLoaded();
} else {
- setTimeout(checkIsLoaded, 300);
+ setTimeout(checkIsLoaded, 200);
}
})();
@@ -65,6 +70,7 @@ function onAllLoaded(success) {
document.getElementById('parent-container').style.cssText = "opacity: 1;";
onWindowResize();
window.addEventListener("resize", onWindowResize);
+ checkQueryParameters();
}, 0);
}
@@ -91,7 +97,13 @@ function loadLocalStorage() {
if(languages.includes(lang)) {
selectedLang = lang;
}
- utage.setTranslationLanguage(selectedLang, '');
+ utage.setTranslationLanguage(selectedLang, '')
+ .then((success) => {
+ languagesLoaded = true;
+ }, (failure) => {
+ languagesLoaded = true;
+ console.log(failure);
+ });
} catch(error) {
console.log(error);
}
@@ -107,11 +119,16 @@ function buildMissionSelectList() {
opt.innerText = 'Select Mission';
} else {
let m = utage.missionsList[i];
- if(!m.includes('MA3.5-')) {
+ //Only allowing 3.5 right now
+ if(!(m.MstId >= 104001 && m.MstId <= 104008)) {
continue;
}
- opt.setAttribute('value', m);
- opt.innerText = m.replace('|', ' - ');
+ opt.setAttribute('value', m.MstId);
+ let name = m.Name;
+ if(utage.missionTranslations[m.MstId]) {
+ name = utage.missionTranslations[m.MstId].Name || name;
+ }
+ opt.innerText = name;
}
selectBox.appendChild(opt);
}
@@ -129,27 +146,46 @@ function buildLanguageList() {
selectBox.value = selectedLang;
}
+function checkQueryParameters() {
+ urlParams = commonFunctions.readQueryParameters();
+ if(urlParams['mstid'] && urlParams['id'] && utage.groupedMissions[urlParams['mstid']] && utage.groupedMissions[urlParams['mstid']].Missions[urlParams['id']]) {
+ missionChanged(urlParams['mstid'], urlParams['id']);
+ }
+}
+
function missionDropDownChanged(event) {
if(!event || !event.currentTarget || !event.currentTarget.value || event.currentTarget.value === '{Select}') { return; }
let cont = document.getElementById("modal-container");
- let misId = event.currentTarget.value.split('|')[0];
- let mis = utage.availableMissions[misId];
+ let misId = event.currentTarget.value;
+ let mis = utage.groupedMissions[misId];
if(!mis) { console.log(`Mission ${misId} not found`); return; }
- cont.innerHTML = '' +
- '' +
- `
Name: ${mis.Name || 'none'}` +
- `
` +
- `
` +
- `
Summary: ${mis.SummaryText || 'none'}` +
- '
' +
- `MstId: ${mis.MstId}` +
- `Id: ${mis.Id}` +
- '
' +
- '
' +
- '' +
- `` +
- '
' +
- '
Chapter Select:
';
+ cont.innerHTML = `
+
+
${name || 'none'}
+
+
+
Summary: ${summary || 'none'}
+
+ ${chapterSelect}
+
+
+
+ MstId: ${mis.MstId}
+
+
+
Loading Page Data...
+
Now Playing: None
🔊
@@ -36,8 +37,9 @@
Title Text
Diva Text
-
-
- test
- test
-
-
+
+
+ test
+ test
+
+
+ 
+