Merge pull request #1785 from StarWarsFoundryVTT/skll_purchase_1732

fix(xp): spending symbol
StarWarsFoundryVTT · Feb 5, 2025 · fe57a62 · fe57a62
2 parents bb9a043 + 356e156
commit fe57a62
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Fixes:
   * Remove usage of deprecated `math.clamped` in favor of `math.clamp`
   * Fix skill roll sometimes showing a pool of only 2 difficulty when clicked ([#1763](/~https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1763))
+  * XP Spending now uses a generic symbol instead of a dollar sign ([#1732](/~https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1732))
 
 `1.905`
 * Fixes

diff --git a/modules/actors/actor-sheet-ffg.js b/modules/actors/actor-sheet-ffg.js
@@ -418,7 +418,7 @@ export class ActorSheetFFG extends ActorSheet {
       contextMenuOptions.push(
         {
           name: game.i18n.localize("SWFFG.Actors.Sheets.Purchase.SkillRank.ContextMenuText"),
-          icon: '<i class="fas fa-dollar"></i>',
+          icon: '<i class="fa-regular fa-circle-up"></i>',
           callback: (li) => {
             this._buySkillRank(li);
           },
@@ -1539,7 +1539,7 @@ export class ActorSheetFFG extends ActorSheet {
         content: game.i18n.format("SWFFG.Actors.Sheets.Purchase.SkillRank.Text", {cost: cost, skill: skill, old: curRank, new: curRank + 1}),
         buttons: {
           done: {
-            icon: '<i class="fas fa-dollar"></i>',
+            icon: '<i class="fa-regular fa-circle-up"></i>',
             label: game.i18n.localize("SWFFG.Actors.Sheets.Purchase.ConfirmPurchase"),
             callback: async (that) => {
               // update the form because the fields are read when an update is performed
@@ -2082,7 +2082,7 @@ export class ActorSheetFFG extends ActorSheet {
         content: content,
         buttons: {
           done: {
-            icon: '<i class="fas fa-dollar"></i>',
+            icon: '<i class="fa-regular fa-circle-up"></i>',
             label: game.i18n.localize("SWFFG.Actors.Sheets.Purchase.ConfirmPurchase"),
             callback: async (that) => {
               const cost = $("#ffgPurchase option:selected", that).data("cost");
@@ -2151,7 +2151,7 @@ export class ActorSheetFFG extends ActorSheet {
         content: game.i18n.format("SWFFG.Actors.Sheets.Purchase.Characteristic.ConfirmText", {cost: cost, level: characteristicCostValue + 1, characteristic: characteristic}),
         buttons: {
           done: {
-            icon: '<i class="fas fa-dollar"></i>',
+            icon: '<i class="fa-regular fa-circle-up"></i>',
             label: game.i18n.localize("SWFFG.Actors.Sheets.Purchase.ConfirmPurchase"),
             callback: async (that) => {
               await this.object.update({

diff --git a/modules/items/item-sheet-ffg.js b/modules/items/item-sheet-ffg.js
@@ -1028,7 +1028,7 @@ export class ItemSheetFFG extends ItemSheet {
         content: game.i18n.format("SWFFG.Actors.Sheets.Purchase.Talent.ConfirmText", {cost: cost, talent: talent}),
         buttons: {
           done: {
-            icon: '<i class="fas fa-dollar"></i>',
+            icon: '<i class="fa-regular fa-circle-up"></i>',
             label: game.i18n.localize("SWFFG.Actors.Sheets.Purchase.ConfirmPurchase"),
             callback: async (that) => {
               // update the form because the fields are read when an update is performed
@@ -1088,7 +1088,7 @@ export class ItemSheetFFG extends ItemSheet {
         content: game.i18n.format("SWFFG.Actors.Sheets.Purchase.FP.ConfirmText", {cost: cost, upgrade: upgradeName}),
         buttons: {
           done: {
-            icon: '<i class="fas fa-dollar"></i>',
+            icon: '<i class="fa-regular fa-circle-up"></i>',
             label: game.i18n.localize("SWFFG.Actors.Sheets.Purchase.ConfirmPurchase"),
             callback: async (that) => {
               // update the form because the fields are read when an update is performed
@@ -1134,7 +1134,7 @@ export class ItemSheetFFG extends ItemSheet {
         content: game.i18n.format("SWFFG.Actors.Sheets.Purchase.SA.ConfirmText", {cost: cost, upgrade: upgradeName}),
         buttons: {
           done: {
-            icon: '<i class="fas fa-dollar"></i>',
+            icon: '<i class="fa-regular fa-circle-up"></i>',
             label: game.i18n.localize("SWFFG.Actors.Sheets.Purchase.ConfirmPurchase"),
             callback: async (that) => {
               // update the form because the fields are read when an update is performed
@@ -1180,7 +1180,7 @@ export class ItemSheetFFG extends ItemSheet {
         content: game.i18n.format("SWFFG.Actors.Sheets.Purchase.Specialization.ConfirmText", {cost: cost, upgrade: upgradeName}),
         buttons: {
           done: {
-            icon: '<i class="fas fa-dollar"></i>',
+            icon: '<i class="fa-regular fa-circle-up"></i>',
             label: game.i18n.localize("SWFFG.Actors.Sheets.Purchase.ConfirmPurchase"),
             callback: async (that) => {
               // update the form because the fields are read when an update is performed

diff --git a/templates/actors/ffg-character-sheet.html b/templates/actors/ffg-character-sheet.html
@@ -30,7 +30,7 @@ <h2><input name="name" type="text" value="{{actor.name}}" placeholder="{{localiz
                   {{/each_when}}
                 </td>
                 <td style="{{#if limited}}display:none;{{/if}}">
-                  <i class="fas fa-dollar ffg-purchase" data-buy-action="signatureability" title="{{localize "SWFFG.Actors.Sheets.Purchase.Tooltip.SignatureAbility"}}"></i>
+                  <i class="fa-regular fa-circle-up ffg-purchase" data-buy-action="signatureability" title="{{localize "SWFFG.Actors.Sheets.Purchase.Tooltip.SignatureAbility"}}"></i>
                   {{localize "SWFFG.SignatureAbilities"}}:
                 </td>
                 <td style="{{#if limited}}display:none;{{/if}}">
@@ -56,7 +56,7 @@ <h2><input name="name" type="text" value="{{actor.name}}" placeholder="{{localiz
                 </td>
                 <td>
                   {{#if (or (eq actor.flags.starwarsffg.config.enableForcePool undefined) (eq actor.flags.starwarsffg.config.enableForcePool true) )}}
-                  <i class="fas fa-dollar ffg-purchase" data-buy-action="forcepower" title="{{localize "SWFFG.Actors.Sheets.Purchase.Tooltip.ForcePower"}}"></i>
+                  <i class="fa-regular fa-circle-up ffg-purchase" data-buy-action="forcepower" title="{{localize "SWFFG.Actors.Sheets.Purchase.Tooltip.ForcePower"}}"></i>
                   {{localize "SWFFG.ForcePowers"}}:
                   {{/if}}
                 </td>
@@ -74,7 +74,7 @@ <h2><input name="name" type="text" value="{{actor.name}}" placeholder="{{localiz
               </tr>
               <tr style="{{#if limited}}display:none;{{/if}}">
                 <td>
-                  <i class="fas fa-dollar ffg-purchase" data-buy-action="specialization" title="{{localize "SWFFG.Actors.Sheets.Purchase.Tooltip.Specialization" }}"></i>
+                  <i class="fa-regular fa-circle-up ffg-purchase" data-buy-action="specialization" title="{{localize "SWFFG.Actors.Sheets.Purchase.Tooltip.Specialization" }}"></i>
                   {{localize "SWFFG.Specializations"}}:
                 </td>
                 <td>

diff --git a/templates/items/ffg-forcepower-sheet.html b/templates/items/ffg-forcepower-sheet.html
@@ -52,7 +52,7 @@
         <div class="talent-modifiers">
           <a class="talent-action" data-itemid="{{key}}">
             {{#if ../item.isOwned }}
-            <i class="fas fa-dollar ffg-purchase" data-buy-action="forcepower-upgrade" data-cost="{{upgrade.cost}}" data-base-item-name="{{../item.name}}" data-upgrade-name="{{ upgrade.name }}" data-upgrade-id="{{ key }}"></i>
+            <i class="fa-regular fa-circle-up ffg-purchase" data-buy-action="forcepower-upgrade" data-cost="{{upgrade.cost}}" data-base-item-name="{{../item.name}}" data-upgrade-name="{{ upgrade.name }}" data-upgrade-id="{{ key }}"></i>
             {{/if}}
           </a>
           <a class="talent-action" data-itemid="{{key}}">

diff --git a/templates/items/ffg-signatureability-sheet.html b/templates/items/ffg-signatureability-sheet.html
@@ -78,7 +78,7 @@
         <div class="talent-modifiers">
           <a class="talent-action" data-itemid="{{key}}">
             {{#if ../item.isOwned }}
-            <i class="fas fa-dollar ffg-purchase" data-buy-action="signatureability-upgrade" data-cost="{{upgrade.cost}}" data-base-item-name="{{../item.name}}" data-upgrade-name="{{ upgrade.name }}" data-upgrade-id="{{ key }}"></i>
+            <i class="fa-regular fa-circle-up ffg-purchase" data-buy-action="signatureability-upgrade" data-cost="{{upgrade.cost}}" data-base-item-name="{{../item.name}}" data-upgrade-name="{{ upgrade.name }}" data-upgrade-id="{{ key }}"></i>
             {{/if}}
           </a>
           <a class="talent-action" data-itemid="{{key}}">

diff --git a/templates/items/ffg-specialization-sheet.html b/templates/items/ffg-specialization-sheet.html
@@ -53,7 +53,7 @@
                   {{{talent.name}}}
                   <a class="talent-action" data-itemid="{{key}}">
                     {{#if ../item.isOwned }}
-                    <i class="fas fa-dollar ffg-purchase" data-buy-action="specialization-upgrade" data-cost="{{talent.cost}}" data-base-item-name="{{../item.name}}" data-upgrade-name="{{ talent.name }}" data-upgrade-id="{{ key }}"></i>
+                    <i class="fa-regular fa-circle-up ffg-purchase" data-buy-action="specialization-upgrade" data-cost="{{talent.cost}}" data-base-item-name="{{../item.name}}" data-upgrade-name="{{ talent.name }}" data-upgrade-id="{{ key }}"></i>
                     {{/if}}
                   </a>
                 </div>

diff --git a/templates/parts/actor/ffg-skills.html b/templates/parts/actor/ffg-skills.html
@@ -26,7 +26,7 @@
         <div data-ability="{{skill.name}}" data-skilltype="{{skill.type}}" data-characteristic="{{skill.characteristic}}" class="pure-g skill" draggable="true">
           <div class="pure-u-12-24">
             <div class="skill-name">
-              {{#if (eq ../../this.actor.type "character")}}<i class="fas fa-dollar ffg-purchase" data-buy-action="skill" title="{{localize "SWFFG.Purchase.SkillRank"}}"></i>{{/if}}
+              {{#if (eq ../../this.actor.type "character")}}<i class="fa-regular fa-circle-up ffg-purchase" data-buy-action="skill" title="{{localize "SWFFG.Actors.Sheets.Purchase.Tooltip.SkilLRank"}}"></i>{{/if}}
               {{#if skill.useForInitiative}}*{{/if}}{{skill.label}} {{#with (lookup ../../this.FFG.characteristics [characteristic])~}}
               <div class="skill-characteristic" data-characteristic="{{skill.characteristic}}">({{localize abrev}})</div>
               {{/with}}