Merge branch 'dev_1.5.0'

Galdormin · Jan 29, 2025 · 7eb323e · 7eb323e
2 parents 20ac7ca + 6d93ed2
commit 7eb323e
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Patch Notes:
 
+## Version 1.5.0
+
+* Add the copy options on aspects #19
+* Add `global` tag in the tracker window for global aspects
+
 ## Version 1.4.1
 
 * Fix aspect settings related to font #25

diff --git a/lang/en.json b/lang/en.json
@@ -20,13 +20,15 @@
   "FateAspectTracker.aspecttrackerwindow.decreaseinvoke": "Decrease Invoke",
   "FateAspectTracker.aspecttrackerwindow.title": "Fate Aspect Tracker",
   "FateAspectTracker.aspecttrackerwindow.deleteaspect": "Delete Aspect",
+  "FateAspectTracker.aspecttrackerwindow.copyaspect": "Copy Aspect",
   "FateAspectTracker.aspecttrackerwindow.editaspect": "Edit Aspect",
   "FateAspectTracker.aspecttrackerwindow.newaspect": "New Aspect",
   "FateAspectTracker.aspecttrackerwindow.placeholder": "There's no aspect at the moment.",
   "FateAspectTracker.aspecttrackerwindow.tags.situation": "situation",
   "FateAspectTracker.aspecttrackerwindow.tags.boost": "boost",
   "FateAspectTracker.aspecttrackerwindow.tags.resources": "resources",
   "FateAspectTracker.aspecttrackerwindow.showplayers": "Show Players",
+  "FateAspectTracker.aspecttrackerwindow.global": "Global",
 
   "FateAspectTracker.aspectText.error": "You dragged the aspect outside the canvas",
 

diff --git a/lang/es.json b/lang/es.json
@@ -21,12 +21,14 @@
     "FateAspectTracker.aspecttrackerwindow.title": "Tracker de Aspectos Fate",
     "FateAspectTracker.aspecttrackerwindow.deleteaspect": "Borrar Aspecto",
     "FateAspectTracker.aspecttrackerwindow.editaspect": "Editar Aspecto",
+    "FateAspectTracker.aspecttrackerwindow.copyaspect": "Copiar Aspecto",
     "FateAspectTracker.aspecttrackerwindow.newaspect": "Crear Aspecto",
     "FateAspectTracker.aspecttrackerwindow.placeholder": "No hay ningún Aspecto",
     "FateAspectTracker.aspecttrackerwindow.tags.situation": "situación",
     "FateAspectTracker.aspecttrackerwindow.tags.boost": "boost",
     "FateAspectTracker.aspecttrackerwindow.tags.resources": "recursos",
     "FateAspectTracker.aspecttrackerwindow.showplayers": "Mostrar a Jugadores",
+    "FateAspectTracker.aspecttrackerwindow.global": "Global",
 
     "FateAspectTracker.aspectText.error": "Has arrastrado el aspecto fuera del área de dibujo",
 

diff --git a/lang/fr.json b/lang/fr.json
@@ -19,14 +19,16 @@
   "FateAspectTracker.aspecttrackerwindow.increaseinvoke": "Augmenter les invocations",
   "FateAspectTracker.aspecttrackerwindow.decreaseinvoke": "Diminuer les invocations",
   "FateAspectTracker.aspecttrackerwindow.title": "Gestionnaire d'Aspect Fate",
-  "FateAspectTracker.aspecttrackerwindow.deleteaspect": "Supprimer l'Aspect",
+  "FateAspectTracker.aspecttrackerwindow.deleteaspect": "Supprimer l'aspect",
+  "FateAspectTracker.aspecttrackerwindow.copyaspect": "Copier l'aspect",
   "FateAspectTracker.aspecttrackerwindow.editaspect": "Éditer l'aspect",
   "FateAspectTracker.aspecttrackerwindow.newaspect": "Nouvel aspect",
   "FateAspectTracker.aspecttrackerwindow.placeholder": "Il n'y a pas d'aspect pour le moment.",
   "FateAspectTracker.aspecttrackerwindow.tags.situation": "situation",
   "FateAspectTracker.aspecttrackerwindow.tags.boost": "coup de pouce",
   "FateAspectTracker.aspecttrackerwindow.tags.resources": "ressources",
   "FateAspectTracker.aspecttrackerwindow.showplayers": "Show Players",
+  "FateAspectTracker.aspecttrackerwindow.global": "Global",
 
   "FateAspectTracker.aspectText.error": "Vous avez fait glisser l'aspect en dehors de la scène",
 

diff --git a/lang/it.json b/lang/it.json
@@ -20,13 +20,15 @@
   "FateAspectTracker.aspecttrackerwindow.decreaseinvoke": "Decrementare  Invocazioni",
   "FateAspectTracker.aspecttrackerwindow.title": "Gestore degli Aspetti di Fate",
   "FateAspectTracker.aspecttrackerwindow.deleteaspect": "Cancella Aspetto",
+  "FateAspectTracker.aspecttrackerwindow.copyaspect": "Copia Aspetto",
   "FateAspectTracker.aspecttrackerwindow.editaspect": "Modifica Aspetto",
   "FateAspectTracker.aspecttrackerwindow.newaspect": "Nuovo Aspetto",
   "FateAspectTracker.aspecttrackerwindow.placeholder": "Non ci sono Aspetti al momento",
   "FateAspectTracker.aspecttrackerwindow.tags.situation": "situazione",
   "FateAspectTracker.aspecttrackerwindow.tags.boost": "beneficio",
   "FateAspectTracker.aspecttrackerwindow.tags.resources": "risorse",
   "FateAspectTracker.aspecttrackerwindow.showplayers": "Show Players",
+  "FateAspectTracker.aspecttrackerwindow.global": "Global",
 
   "FateAspectTracker.aspectText.error": "Hai trascinato l'Aspetto nell'Area di Gioco",
 

diff --git a/module.json b/module.json
@@ -2,7 +2,7 @@
   "id": "fate-aspect-tracker",
   "title": "Fate Aspect Tracker",
   "description": "An Aspect Tracker for any Fate RPG.",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "authors": [
     {
       "name": "Théo Plénet",

diff --git a/modules/ui.js b/modules/ui.js
@@ -13,6 +13,8 @@ async function preloadTemplates() {
   const templates = [
     "modules/fate-aspect-tracker/templates/aspect-list.hbs",
     "modules/fate-aspect-tracker/templates/aspect-item-form.hbs",
+    "modules/fate-aspect-tracker/templates/aspect-drawing-settings.hbs",
+    "modules/fate-aspect-tracker/templates/partial/aspect-item.hbs",
   ];
 
   Handlebars.registerHelper("tags", function(tag, options) {
@@ -101,6 +103,9 @@ export class AspectTrackerWindow extends Application {
         case "aspect-edit":
           new AspectForm(list.aspects[index], index).render(true);
           break;
+        case "aspect-copy":
+          new AspectForm(list.aspects[index], undefined).render(true);
+          break;
         case "aspect-toggle":
           await list.toggleVisibility(index);
           break;

diff --git a/templates/aspect-list.hbs b/templates/aspect-list.hbs
@@ -2,67 +2,7 @@
   {{#if tracker.aspects }}
   <ol id="fate-aspect-tracker-list">
     {{#each tracker.aspects}}
-      {{#hideAspect hidden ../GM}}
-      <li>
-        <div class="flexrow" {{#if hidden}} style="background-color: lightgray;" {{/if}}>
-
-          {{#if ../GM}}
-          <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.hideaspect' }}" class="aspect-control" data-index="{{ @index }}" data-action="aspect-toggle">
-            {{#if hidden}}
-              <i class="fas fa-eye-slash"></i>
-            {{else}}
-              <i class="fas fa-eye"></i>
-            {{/if}}
-          </a>
-
-          <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.increaseinvoke' }}" class="aspect-control" data-index="{{ @index }}" data-action="aspect-increase-invoke">
-            <i class="fas fa-plus"></i>
-          </a>
-          {{/if}}
-
-          <span class="invoke">
-            {{ invoke }}
-          </span>
-
-          {{#if ../GM}}
-          <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.decreaseinvoke' }}" class="aspect-control" data-index="{{ @index }}" data-action="aspect-decrease-invoke">
-            <i class="fas fa-minus"></i>
-          </a>
-          {{/if}}
-
-          {{#canEdit edit ../GM}}
-            <p class="edit-description" {{#if color}}style="color: {{ color }}" {{/if}} data-index="{{ @index }}">
-              <input type="text" id="description" class="aspect-description" name="description" value="{{ description }}" data-dtype="String" required="true">
-            </p>    
-          {{else}}
-            <p class="aspect-description" {{#if color}}style="color: {{ color }}" {{/if}} data-index="{{ @index }}">
-              <span class="description">
-                {{ description }}
-              </span>
-            </p>
-          {{/canEdit}}
-
-          {{#if tag}}
-            {{#tags tag}}
-              <span class="tag">
-                {{ this }}
-              </span>
-            {{/tags}}
-          {{/if}}
-
-          {{#if ../GM}}
-          <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.editaspect' }}" class="aspect-control" data-index="{{ @index }}"
-            data-action="aspect-edit">
-            <i class="fas fa-edit"></i>
-          </a>
-          <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.deleteaspect' }}" class="aspect-control" data-index="{{ @index }}"
-            data-action="aspect-delete">
-            <i class="fas fa-trash-alt"></i>
-          </a>
-          {{/if}}
-        </div>
-      </li>
-      {{/hideAspect}}
+      {{> "modules/fate-aspect-tracker/templates/partial/aspect-item.hbs" aspect=this index=@index GM=../GM}}
     {{/each}}
   </ol>
   {{else}}

diff --git a/templates/partial/aspect-item.hbs b/templates/partial/aspect-item.hbs
@@ -0,0 +1,70 @@
+{{#hideAspect aspect.hidden GM}}
+<li>
+  <div class="flexrow" {{#if aspect.hidden}} style="background-color: lightgray;" {{/if}}>
+
+    {{#if GM}}
+    <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.hideaspect' }}" class="aspect-control" data-index="{{ index }}" data-action="aspect-toggle">
+      {{#if aspect.hidden}}
+        <i class="fas fa-eye-slash"></i>
+      {{else}}
+        <i class="fas fa-eye"></i>
+      {{/if}}
+    </a>
+
+    <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.increaseinvoke' }}" class="aspect-control" data-index="{{ index }}" data-action="aspect-increase-invoke">
+      <i class="fas fa-plus"></i>
+    </a>
+    {{/if}}
+
+    <span class="invoke">
+      {{ aspect.invoke }}
+    </span>
+
+    {{#if GM}}
+    <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.decreaseinvoke' }}" class="aspect-control" data-index="{{ index }}" data-action="aspect-decrease-invoke">
+      <i class="fas fa-minus"></i>
+    </a>
+    {{/if}}
+
+    {{#canEdit aspect.edit GM}}
+    <p class="edit-description" {{#if aspect.color}}style="color: {{ aspect.color }}" {{/if}} data-index="{{ index }}">
+      <input type="text" id="description" class="aspect-description" name="description" value="{{ aspect.description }}" data-dtype="String" required="true">
+    </p>    
+    {{else}}
+    <p class="aspect-description" {{#if aspect.color}}style="color: {{ aspect.color }}" {{/if}} data-index="{{ index }}">
+      <span class="description">
+        {{ aspect.description }}
+      </span>
+    </p>
+    {{/canEdit}}
+
+    {{#if aspect.tag}}
+    {{#tags aspect.tag}}
+      <span class="tag">
+        {{ this }}
+      </span>
+    {{/tags}}
+    {{/if}}
+    {{#if aspect.globalScope}}
+      <span class="tag">
+        {{ localize 'FateAspectTracker.aspecttrackerwindow.global' }}
+      </span>
+    {{/if}}
+
+    {{#if GM}}
+    <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.editaspect' }}" class="aspect-control" data-index="{{ index }}"
+      data-action="aspect-edit">
+      <i class="fas fa-edit"></i>
+    </a>
+    <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.copyaspect' }}" class="aspect-control" data-index="{{ index }}"
+      data-action="aspect-copy">
+      <i class="fas fa-copy"></i>
+    </a>
+    <a title="{{ localize 'FateAspectTracker.aspecttrackerwindow.deleteaspect' }}" class="aspect-control" data-index="{{ index }}"
+      data-action="aspect-delete">
+      <i class="fas fa-trash-alt"></i>
+    </a>
+    {{/if}}
+  </div>
+</li>
+{{/hideAspect}}