final changes for 1.1.0

moo-man · Feb 21, 2024 · e90aba5 · e90aba5
1 parent df96225
commit e90aba5
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 16 deletions.
diff --git a/src/apps/module-initialization.js b/src/apps/module-initialization.js
@@ -211,9 +211,9 @@ class ModuleDocumentResolver extends FormApplication
         options.resizable = true;
         options.height = 600;
         options.width = 400;
-        options.template = "systems/wfrp4e/templates/apps/document-resolver.hbs";
-        options.classes.push("document-resolver");
-        options.title = game.i18n.localize("INIT.ResolveDuplicates");
+        options.template = "systems/impmal/templates/apps/document-resolver.hbs";
+        options.classes = options.classes.concat(["document-resolver", "impmal"]);
+        options.title = game.i18n.localize("IMPMAL.ResolveDuplicates");
         return options;
     }
 

diff --git a/src/system/hooks/loadScripts.js b/src/system/hooks/loadScripts.js
diff --git a/src/system/settings.js b/src/system/settings.js
@@ -46,9 +46,9 @@ export default function registerSettings()
             "crithead" : "dvsiB3K8ezHI8F7M",
             "critbody" : "kCP63j7ZWPVquLqW",
             "critvehicle" : "wyIDvsnkkI18FbJy",
-            "fumble" : "3uBH6hO5EoJUORN9",
-            "perils" : "90WGBoSRiUCOdFVS",
-            "phenomena" : "Syx01tKswPV4oEsz",
+            "fumble" : "HL6DtTGWIUQy5NZ9",
+            "perils" : "2YYlAUyaVIt4bZVa",
+            "phenomena" : "9aSbu2mswOOI43J1",
             "talents" : "9SLhM8FOgluaUwvO"
         }
     });

diff --git a/static/lang/en.json b/static/lang/en.json
@@ -507,6 +507,8 @@
     "IMPMAL.RerollTest" : "Reroll Test",
     "IMPMAL.RerollTestFate" : "Fate Reroll Test",
     "IMPMAL.Resolve" : "Resolve",
+    "IMPMAL.ResolveDuplicates" : "Resolve Duplicates",
+    "IMPMAL.ResolveDuplicatesNote" : "These Documents already exist in the world; would you like to apply the data from the initialized module instead?<br><br>Leaving a Document checked will apply the new data, otherwise no modifications will be made.",
     "IMPMAL.Resist" : "Resist",
     "IMPMAL.RestrainedThreshold" : "Restrained Threshold",
     "IMPMAL.Restricted" : "Restricted",

diff --git a/static/templates/apps/document-resolver.hbs b/static/templates/apps/document-resolver.hbs
@@ -0,0 +1,15 @@
+<form autocomplete="off">
+    <div>
+        <p class="note">{{{localize "IMPMAL.ResolveDuplicatesNote"}}}</p>
+        {{#each object}}
+            <div class="document">
+                <img src="{{this.img}}">
+                <a>{{this.name}}</a>
+                <input type="checkbox" name="{{this.id}}" checked="true">
+            </div>
+        {{/each}}
+    </div>
+
+    <button type="submit" name="submit">{{localize "Submit"}}</button>
+</form>
+
diff --git a/static/templates/apps/module-updater.hbs b/static/templates/apps/module-updater.hbs
@@ -1,16 +1,15 @@
 <form>
 
-<p>{{localize "Updater1"}} <b>{{localize "Updater2"}}</b></p>
-<p>{{localize "Updater3"}}</p>
+<p>{{{localize "IMPMAL.UpdaterContent"}}}</p>
 <ul>
-    <li><input type="checkbox" name="actors" checked> {{localize "UPDATER.OverwriteActors"}}</li>
-    <li><input type="checkbox" name="journals" checked> {{localize "UPDATER.OverwriteJournals"}}</li>
-    <li><input type="checkbox" name="items" checked> {{localize "UPDATER.OverwriteItems"}}</li>
-    <li><input type="checkbox" name="tables" checked> {{localize "UPDATER.OverwriteTables"}}</li>
-    <li><input type="checkbox" name="scenes" checked> {{localize "UPDATER.OverwriteScenes"}}</li>
+    <li><input type="checkbox" name="actors" checked> {{localize "IMPMAL.UpdaterOverwriteActors"}}</li>
+    <li><input type="checkbox" name="journals" checked> {{localize "IMPMAL.UpdaterOverwriteJournals"}}</li>
+    <li><input type="checkbox" name="items" checked> {{localize "IMPMAL.UpdaterOverwriteItems"}}</li>
+    <li><input type="checkbox" name="tables" checked> {{localize "IMPMAL.UpdaterOverwriteTables"}}</li>
+    <li><input type="checkbox" name="scenes" checked> {{localize "IMPMAL.UpdaterOverwriteScenes"}}</li>
 </ul>
 <ul>
-    <li><input type="checkbox" name="excludeNameChange" checked> {{localize "UPDATER.Exclude"}} <i title="{{localize 'UPDATER.ExcludeHint'}}" class="far fa-question-circle"></i></li>
+    <li><input type="checkbox" name="excludeNameChange" checked> {{localize "IMPMAL.UpdaterExclude"}} <i title="{{localize 'IMPMAL.UpdaterExcludeHint'}}" class="far fa-question-circle"></i></li>
 </ul>
 
 </form>

diff --git a/style/apps/_document-resolver.scss b/style/apps/_document-resolver.scss
@@ -0,0 +1,31 @@
+.impmal.document-resolver {
+    form {
+        height: 100%;
+
+        > div {
+            height: calc(100% - 45px);
+            overflow: auto;
+            color: #CCC
+        }
+    }
+
+    .document {
+        height: 100px;
+        display: flex;
+        align-items: center;
+        img {
+            object-fit: contain;
+            flex: 0 0 100px;
+            width: 100px;
+            height: 100px;
+            padding: 10px;
+        }
+        a {
+            flex: 1
+        }
+        input {
+            flex: 0 0 20px
+        }
+    }
+
+}
diff --git a/style/impmal.scss b/style/impmal.scss
@@ -8,6 +8,7 @@
 @import "./apps/form";
 @import "./apps/choice-config";
 @import "./apps/effect-config";
+@import "./apps/document-resolver";
 @import "./apps/dialogs/test-dialog";
 @import "./chat/roll";
 @import "./chat/item-post";

diff --git a/system.json b/system.json
@@ -50,7 +50,7 @@
   "url": "https://github.com/moo-man/ImpMal-FoundryVTT",
   "socket": true,
   "manifest": "https://github.com/moo-man/ImpMal-FoundryVTT/releases/latest/download/system.json",
-  "download": "https://github.com/moo-man/ImpMal-FoundryVTT/releases/download/1.0.2/impmal.zip",
+  "download": "https://github.com/moo-man/ImpMal-FoundryVTT/releases/download/1.1.0/impmal.zip",
   "license": "LICENSE.txt"
 }