Merge branch 'quest-json' of git.poweris.moe:xduplayer into quest-json

Css/main.css

@@ -156,6 +156,12 @@ body { margin: 0; height: 100%; }
 
 #modal-buttons { bottom: 0; margin-top: auto; width: 100%; display: flex; justify-content: space-between; min-height: 21px; }
 
+#mission-modal .follow-links { margin-top: auto; display: flex; flex-direction: column; text-align: center; width:100%; }
+
+#mission-modal .follow-links .follow-links-header { font-weight: bold; }
+
+#mission-modal .follow-links .follow-links-links { display: flex; flex-direction: row; justify-content: space-around; margin-top: 5px; }
+
 @media screen and (max-width: 812px) {
 	#modal-container { top: 0; bottom: 0; left: 0; right: 0; transform: none; }
 	.modal { width: 100%; height: 100%; border-radius: 0; }

Js/Common.js

@@ -4,6 +4,11 @@ let rootUrl = `${window.location.protocol}//${window.location.host}/`;
 const baseDimensions = {width: 1334, height: 750};
 const screenRatio = 9/16;
 
+const CUSTOM = {
+    custom: 'Custom',
+    stock: 'Stock'
+}
+
 class commonFunctions {	
 	static getFileText(file) {
 		return new Promise((resolve, reject) => {

Js/Main.js

@@ -525,13 +525,13 @@ function openHelpModal(event) {
 			iOS: 11+, no audio<br/>
 			</div>
 		</div>
-		<table style="text-align: center; width: 100%; table-layout: fixed; margin-top: auto">
-			<tr><th colspan="2">Follow YameteTomete</th></tr>
-			<tr>
-				<td><a style="margin-top: auto; text-align: center; "href="https://discord.gg/fpQZQ8g" target="_blank" >Discord</a></td>
-				<td><a style="margin-top: auto; text-align: center; "href="https://twitter.com/YameteTomete" target="_blank">Twitter</a></td>
-			</tr>
-		</table>
+		<div class="follow-links">
+			<div class="follow-links-header">Follow YameteTomete</div>
+			<div class="follow-links-links">
+				<a "href="https://discord.gg/fpQZQ8g" target="_blank" >Discord</a>
+				<a "href="https://twitter.com/YameteTomete" target="_blank">Twitter</a>
+			</div>
+		</div>
 		<div style="margin-top: auto; text-align: center;">All Symphogear content belongs to its respective owners</div>
 		<div id="modal-buttons">
 			<button onclick="closeModal(event)">Close</button>

Js/Translations

@@ -1 +1 @@
-Subproject commit c472de2e64186cbd4b802dafbdd171efb7985d78
+Subproject commit 5ba53ea6230e80ebd96b5d277808296a768b68e2

Js/UtageParse.js

@@ -47,18 +47,18 @@ class UtageInfo {
 			];
 			Promise.all(promises)
 			.then((success) => {
-				this.quests['Stock'] = success[0];
-				this.questList = Object.keys(this.quests['Stock']).map((k) => {
-					return {QuestMstId: k, Name: this.quests['Stock'][k].Name, IsCustom: false};
+				this.quests[CUSTOM.stock] = success[0];
+				this.questList = Object.keys(this.quests[CUSTOM.stock]).map((k) => {
+					return {QuestMstId: k, Name: this.quests[CUSTOM.stock][k].Name, IsCustom: false};
 				});
-				this.quests['Custom'] = success[8];
-				for (const k of Object.keys(this.quests['Custom'])) {
-					this.questList.push({QuestMstId: k, Name: this.quests['Custom'][k].Name, IsCustom: true});
+				this.quests[CUSTOM.custom] = success[8];
+				for (const k of Object.keys(this.quests[CUSTOM.custom])) {
+					this.questList.push({QuestMstId: k, Name: this.quests[CUSTOM.custom][k].Name, IsCustom: true});
 				}
 				this.questList.sort((a, b) => { return a.QuestMstId - b.QuestMstId });
-				this.scenes['Stock'] = success[1];
-				for (const k of Object.keys(this.scenes['Stock'])) {
-					this.scenes['Stock'][k]['IsCustom'] = false;
+				this.scenes[CUSTOM.stock] = success[1];
+				for (const k of Object.keys(this.scenes[CUSTOM.stock])) {
+					this.scenes[CUSTOM.stock][k]['IsCustom'] = false;
 				}
 				this.parseCharacterInfo(success[2]);
 				this.parseLayerInfo(success[3]);
@@ -67,9 +67,9 @@ class UtageInfo {
 				this.parseSoundInfo(success[5]);
 				this.parseTextureInfo(success[6]);
 				this.bgmLoopData = success[7];
-				this.scenes['Custom'] = success[9];
-				for (const k of Object.keys(this.scenes['Custom'])) {
-					this.scenes['Custom'][k]['IsCustom'] = true;
+				this.scenes[CUSTOM.custom] = success[9];
+				for (const k of Object.keys(this.scenes[CUSTOM.custom])) {
+					this.scenes[CUSTOM.custom][k]['IsCustom'] = true;
 				}
 				this.parseCharacterInfo(success[10], true);
 				this.parseSoundInfo(success[11], true);
@@ -137,7 +137,7 @@ class UtageInfo {
 			Promise.all(promises)
 			.then((success) => {
 				// propagate language-based enables downwards from quests to scenes
-				for (const c of ['Custom', 'Stock']) {
+				for (const c of [CUSTOM.custom, CUSTOM.stock]) {
 					for (const k of Object.keys(this.questTranslationsInner[this.currentTranslation][c])) {
 						if (this.questTranslationsInner[this.currentTranslation][c][k].Enabled) {
 							for (const s of this.quests[c][k].Scenes) {
@@ -200,8 +200,8 @@ class UtageInfo {
 				Promise.all(promises)
 				.then((success) => {
 					this.questTranslationsInner[this.currentTranslation] = {};
-					this.questTranslationsInner[this.currentTranslation]['Stock'] = success[0];
-					this.questTranslationsInner[this.currentTranslation]['Custom'] = success[1];
+					this.questTranslationsInner[this.currentTranslation][CUSTOM.stock] = success[0];
+					this.questTranslationsInner[this.currentTranslation][CUSTOM.custom] = success[1];
 					resolve();
 				}, (failure) => {
 					console.log(failure);
@@ -223,8 +223,8 @@ class UtageInfo {
 				Promise.all(promises)
 				.then((success) => {
 					this.sceneTranslationsInner[this.currentTranslation] = {};
-					this.sceneTranslationsInner[this.currentTranslation]['Stock'] = success[0];
-					this.sceneTranslationsInner[this.currentTranslation]['Custom'] = success[1];
+					this.sceneTranslationsInner[this.currentTranslation][CUSTOM.stock] = success[0];
+					this.sceneTranslationsInner[this.currentTranslation][CUSTOM.custom] = success[1];
 					resolve();
 				}, (failure) => {
 					console.log(failure);