Second attempt to get files to work....

... with both JSQuest and QEditor

Author: ThePix

index.html

@@ -12,19 +12,23 @@
   >
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css" integrity="sha512-+4zCK9k+qNFUR5X+cKL9EIR+ZOhtIloNl9GIKS57V1MyNsYpYcUrUeQc9vNfzsWfV28IaLL3i96P9sdNyeRssA==" crossorigin="anonymous" />
 
-  <script src="lib/_util.js"></script>
-  <script src="lib/_settings.js"></script>
+
   <script>
-    let folder = 'game'
+    let folder = 'game/'
     let loaded = false
-    if (window.location.search)
-    folder += '-' + window.location.search.substring(1)
+    if (window.location.search) folder = 'game-' + window.location.search.substring(1) + '/'
+    const qeditor = false
+    const resourcesFolder = ''
+  </script>
 
+  <script src="lib/_util.js"></script>
+  <script src="lib/_settings.js"></script>
 
+  <script>
     const myScript = document.createElement("script")
     myScript.setAttribute("src", folder + '/settings.js')
     myScript.onload = function() {
-      settings.writeScript(folder)
+      settings.writeScript(folder, "", "")
     }
     myScript.onerror = function() {
       console.log("Failed to load file \"" + folder + "/settings.js\".")

lib/_settings.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// Comment necessary for require in QEdit
 
 
 // Check the browser is compatible. Named capture groups is the most recent feature, so assume if this works evetything does.
@@ -24,11 +23,11 @@ const settings = {
   files:["code", "data"], // Additional files to load
   libraries:["_file_saver", "_saveload", "_text", "_io", "_command", "_defaults", "_templates", "_world", "_npc", "_parser", "_commands"],  // util already loaded
   customLibraries:[],
-  imagesFolder:'assets/images/',
-  iconsFolder:'assets/icons/',
-  soundsFolder:'assets/audio/',
-  videosFolder:'assets/video/',
-  cssFolder:'assets/css/',
+  imagesFolder:resourcesFolder + 'assets/images/',
+  iconsFolder:resourcesFolder + 'assets/icons/',
+  soundsFolder:resourcesFolder + 'assets/audio/',
+  videosFolder:resourcesFolder + 'assets/video/',
+  cssFolder:resourcesFolder + 'assets/css/',
   themes:['sans-serif'],
   styleFile:'style',
   soundsFileExt:'.mp3',
@@ -187,7 +186,7 @@ const settings = {
     for (let file of settings.themes) {
       settings.loadCssFile(settings.cssFolder + file + '.css', doc, path)
     }
-    settings.loadCssFile(settings.folder + settings.styleFile + '.css', doc, path)
+    settings.loadCssFile(folder + settings.styleFile + '.css', doc, path)
   },
 
 
@@ -267,23 +266,23 @@ const settings = {
 
     settings.performanceLog('Queue files')
     if (settings.tests && settings.playMode === 'dev') {
-      settings.loadScript('lib/test-lib.js')
-      settings.loadScript(settings.folder + 'tests.js')
+      settings.loadScript(resourcesFolder + 'lib/test-lib.js')
+      settings.loadScript(folder + 'tests.js')
     }
-    settings.loadScript((folder ? 'lang/' : '' ) + settings.lang + '.js')
+    settings.loadScript(resourcesFolder + 'lang/' + settings.lang + '.js')
     if (settings.customExits) {
-      settings.loadScript(settings.folder + settings.customExits + '.js')
+      settings.loadScript(folder + settings.customExits + '.js')
     }
     for (let file of settings.libraries) {
-      settings.loadScript((folder ? 'lib/' : '' ) + file + '.js')
+      settings.loadScript(resourcesFolder + 'lib/' + file + '.js')
     }
     for (let lib of settings.customLibraries) {
       for (let file of lib.files) {
-        settings.loadScript((folder ? lib.folder + '/' : '') + file + '.js')
+        settings.loadScript(resourcesFolder + lib.folder + file + '.js')
       }
     }
     for (let file of settings.files) {
-      settings.loadScript(settings.folder + file + '.js')
+      settings.loadScript(folder + file + '.js')
     }
     settings.performanceLog('Files queued')
   }