Merge pull request #1649 from StarWarsFoundryVTT/weapon_special_1625

fix(weapons): dice icons on special
StarWarsFoundryVTT · Aug 8, 2024 · aff3c99 · aff3c99
2 parents 75dbbed + 77e4b89
commit aff3c99
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
   * Includes species characteristics bonus when calculating upgrade cost ([#1638](https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1638))
   * Specializations: Talents are now correctly looked up in compendium
   * Removed "unused" slot checking (on combatant defeat) as they would sometimes lead to actors being unable to act
+  * Weapon "special" text now properly renders dice icons ([#1625](https://github.com/StarWarsFoundryVTT/StarWarsFFG/issues/1625))
 
 `1.902`
 * Features:

diff --git a/modules/items/item-sheet-ffg.js b/modules/items/item-sheet-ffg.js
@@ -103,6 +103,7 @@ export class ItemSheetFFG extends ItemSheet {
       case "shipweapon":
         this.position.width = 550;
         this.position.height = 750;
+        data.data.enrichedSpecial = await PopoutEditor.renderDiceImages(data?.data?.special?.value, this.actor ? this.actor : {});
         break;
       case "itemattachment":
         this.position.width = 500;

diff --git a/templates/items/ffg-weapon-sheet.html b/templates/items/ffg-weapon-sheet.html
@@ -85,7 +85,7 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
             {{#if (or (eq item.flags.starwarsffg.config.enablePrice undefined) (eq item.flags.starwarsffg.config.enablePrice true) )}}
               {{> "systems/starwarsffg/templates/parts/shared/ffg-block.html" (object blocktype="single" title="SWFFG.ItemWeaponPrice" type="Number" name="data.price.value" value=data.price.value adjusted=data.price.adjusted)}}
             {{/if}}
-            {{> "systems/starwarsffg/templates/parts/shared/ffg-block.html" (object blocktype="single" title="SWFFG.ItemWeaponSpecial" type="PopoutEditor" name="data.special.value" value=data.special.value )}}
+            {{> "systems/starwarsffg/templates/parts/shared/ffg-block.html" (object blocktype="single" title="SWFFG.ItemWeaponSpecial" type="PopoutEditor" name="data.special.value" value=data.enrichedSpecial )}}
           </div>
           <div class="flex-group-center weapon-values hidden-content">
             {{> "systems/starwarsffg/templates/parts/shared/ffg-block.html" (object blocktype="single" title="SWFFG.ItemWeaponQuantity" type="Number" name="data.quantity.value" value=data.quantity.value)}}