Move spells/rank translation, ran code changes through prettier

rayners · May 20, 2024 · 89c509c · 89c509c
1 parent af998c2
commit 89c509c
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 49 deletions.
diff --git a/src/languages/en.json b/src/languages/en.json
@@ -37,9 +37,6 @@
       "hp": "HP",
       "wp": "WP"
     },
-    "spells":{
-      "rank": "Rank {rank}"
-    },
     "tooltips": {
       "heroic-ability": "Heroic Ability",
       "wp-cost": "WP Cost"
@@ -56,6 +53,9 @@
       "attributes-and-skills": "Attributes & Skills",
       "skills": "Skills",
       "magic": "Magic",
+      "spells": {
+        "rank": "Rank {rank}"
+      },
       "secondary-skills": "Secondary Skills",
       "weapons": "Weapons",
       "attribute": "Attribute",

diff --git a/src/languages/sv.json b/src/languages/sv.json
@@ -37,9 +37,6 @@
       "hp": "KP",
       "wp": "VP"
     },
-    "spells":{
-      "rank": "Nivå {rank}"
-    },
     "tooltips": {
       "heroic-ability": "Hjälteförmåga",
       "wp-cost": "VP-kostnad"
@@ -56,6 +53,9 @@
       "attributes-and-skills": "Grundegenskaper och färdigheter",
       "skills": "Färdigheter",
       "magic": "Magi",
+      "spells": {
+        "rank": "Nivå {rank}"
+      },
       "secondary-skills": "Sekundära färdigheter",
       "weapons": "Vapen",
       "attribute": "Grundegenskaper",
@@ -69,4 +69,4 @@
       }
     }
   }
-}
+}
diff --git a/src/ts/dragonbane-actions-panel.ts b/src/ts/dragonbane-actions-panel.ts
@@ -87,10 +87,17 @@ class DragonbaneAbilityButton extends ARGON.MAIN.BUTTONS.ItemButton {
     return {
       title: this.item.name,
       subtitle: game.i18n.localize(
-          "enhancedcombathud-dragonbane.tooltips.heroic-ability",
+        "enhancedcombathud-dragonbane.tooltips.heroic-ability",
       ),
       description: this.item.system.description,
-      details: [{ label: game.i18n.localize(            "enhancedcombathud-dragonbane.tooltips.wp-cost",        ), value: this.item.system.wp }],
+      details: [
+        {
+          label: game.i18n.localize(
+            "enhancedcombathud-dragonbane.tooltips.wp-cost",
+          ),
+          value: this.item.system.wp,
+        },
+      ],
       properties: [{ label: this.item.system.abilityType, primary: true }],
       footerText: this.item.system.requirement,
     };

diff --git a/src/ts/dragonbane-drawer-panel.ts b/src/ts/dragonbane-drawer-panel.ts
@@ -12,11 +12,11 @@ export default class DragonbaneDrawerPanel extends ARGON.DRAWER.DrawerPanel {
   }
 
   get title() {
-    return this.actor.isCharacter ? game.i18n.localize(
-        "enhancedcombathud-dragonbane.drawer.attributes-and-skills",
-    ) : game.i18n.localize(
-        "enhancedcombathud-dragonbane.drawer.skills",
-    );
+    return this.actor.isCharacter
+      ? game.i18n.localize(
+          "enhancedcombathud-dragonbane.drawer.attributes-and-skills",
+        )
+      : game.i18n.localize("enhancedcombathud-dragonbane.drawer.skills");
   }
 
   get categories() {
@@ -31,7 +31,7 @@ export default class DragonbaneDrawerPanel extends ARGON.DRAWER.DrawerPanel {
           new ARGON.DRAWER.DrawerButton([
             {
               label: game.i18n.localize(
-                  "enhancedcombathud-dragonbane.drawer.attributes." + a,
+                "enhancedcombathud-dragonbane.drawer.attributes." + a,
               ),
               onClick: () => game.dragonbane.rollAttribute(this.actor, a),
             },
@@ -44,9 +44,12 @@ export default class DragonbaneDrawerPanel extends ARGON.DRAWER.DrawerPanel {
       categories.push({
         gridCols: "8fr 1fr",
         captions: [
-          { label: game.i18n.localize(
-                "enhancedcombathud-dragonbane.drawer.attribute",
-            ), align: "left" },
+          {
+            label: game.i18n.localize(
+              "enhancedcombathud-dragonbane.drawer.attribute",
+            ),
+            align: "left",
+          },
           { label: "", align: "right" },
         ],
         align: ["left", "right"],
@@ -55,18 +58,26 @@ export default class DragonbaneDrawerPanel extends ARGON.DRAWER.DrawerPanel {
     }
 
     const skillGroups = [
-      { group: "core", label: game.i18n.localize(
-            "enhancedcombathud-dragonbane.drawer.skills",
-        ) },
-      { group: "magic", label: game.i18n.localize(
-            "enhancedcombathud-dragonbane.drawer.magic",
-        ) },
-      { group: "secondary", label: game.i18n.localize(
-            "enhancedcombathud-dragonbane.drawer.secondary-skills",
-        ) },
-      { group: "weapon", label: game.i18n.localize(
-            "enhancedcombathud-dragonbane.drawer.weapons",
-        ) },
+      {
+        group: "core",
+        label: game.i18n.localize("enhancedcombathud-dragonbane.drawer.skills"),
+      },
+      {
+        group: "magic",
+        label: game.i18n.localize("enhancedcombathud-dragonbane.drawer.magic"),
+      },
+      {
+        group: "secondary",
+        label: game.i18n.localize(
+          "enhancedcombathud-dragonbane.drawer.secondary-skills",
+        ),
+      },
+      {
+        group: "weapon",
+        label: game.i18n.localize(
+          "enhancedcombathud-dragonbane.drawer.weapons",
+        ),
+      },
     ];
 
     skillGroups.forEach(({ group, label }) => {

diff --git a/src/ts/dragonbane-portrait-panel.ts b/src/ts/dragonbane-portrait-panel.ts
@@ -48,9 +48,9 @@ export default class DragonbanePortraitPanel extends ARGON.PORTRAIT
     const { system } = this.actor;
     const Blocks = [
       [
-        { text: game.i18n.localize(
-              "enhancedcombathud-dragonbane.portrait.hp",
-          ) }, // game.i18n.localize('DoD.secondaryAttributeTypes.hitPoints') },
+        {
+          text: game.i18n.localize("enhancedcombathud-dragonbane.portrait.hp"),
+        }, // game.i18n.localize('DoD.secondaryAttributeTypes.hitPoints') },
         { text: system.hitPoints.value },
         { text: "/" },
         { text: system.hitPoints.max },
@@ -60,9 +60,9 @@ export default class DragonbanePortraitPanel extends ARGON.PORTRAIT
     if (system.willPoints?.max) {
       // if they have any WP
       Blocks.push([
-        { text: game.i18n.localize(
-              "enhancedcombathud-dragonbane.portrait.wp",
-          ) }, // game.i18n.localize('DoD.secondaryAttributeTypes.willPoints') },
+        {
+          text: game.i18n.localize("enhancedcombathud-dragonbane.portrait.wp"),
+        }, // game.i18n.localize('DoD.secondaryAttributeTypes.willPoints') },
         { text: system.willPoints.value },
         { text: "/" },
         { text: system.willPoints.max },

diff --git a/src/ts/dragonbane-spells-button.ts b/src/ts/dragonbane-spells-button.ts
@@ -41,7 +41,8 @@ export class DragonbaneSpellsButton extends ARGON.MAIN.BUTTONS
           (rank) =>
             new ARGON.MAIN.BUTTON_PANELS.ACCORDION.AccordionPanelCategory({
               label: game.i18n.format(
-                  "enhancedcombathud-dragonbane.drawer.spells.rank", {rank}
+                "enhancedcombathud-dragonbane.drawer.spells.rank",
+                { rank },
               ),
               buttons: spellsByRank[rank]
                 .sort(spellSort)

diff --git a/src/ts/dragonbane-weapon-button.ts b/src/ts/dragonbane-weapon-button.ts
@@ -25,18 +25,30 @@ export class DragonbaneWeaponButton extends ARGON.MAIN.BUTTONS.ItemButton {
       title: this.item.name,
       subtitle: `${this.item.system.skill.name}: ${this.item.system.skill.value}`,
       details: [
-        { label: game.i18n.localize(
-              "enhancedcombathud-dragonbane.weapon.tooltips.damage",
-          ), value: this.item.system.damage },
-        { label: game.i18n.localize(
-              "enhancedcombathud-dragonbane.weapon.tooltips.durability",
-          ), value: this.item.system.durability },
-        { label: game.i18n.localize(
-              "enhancedcombathud-dragonbane.weapon.tooltips.range",
-          ), value: this.item.system.calculatedRange },
-        { label: game.i18n.localize(
-              "enhancedcombathud-dragonbane.weapon.tooltips.features",
-          ), value: this.item.system.features.join(", ") },
+        {
+          label: game.i18n.localize(
+            "enhancedcombathud-dragonbane.weapon.tooltips.damage",
+          ),
+          value: this.item.system.damage,
+        },
+        {
+          label: game.i18n.localize(
+            "enhancedcombathud-dragonbane.weapon.tooltips.durability",
+          ),
+          value: this.item.system.durability,
+        },
+        {
+          label: game.i18n.localize(
+            "enhancedcombathud-dragonbane.weapon.tooltips.range",
+          ),
+          value: this.item.system.calculatedRange,
+        },
+        {
+          label: game.i18n.localize(
+            "enhancedcombathud-dragonbane.weapon.tooltips.features",
+          ),
+          value: this.item.system.features.join(", "),
+        },
       ],
       properties: props.reduce((m: Array<object>, p): Array<object> => {
         if (this.item.system[p]) {