Merge pull request #10 from orffen/devel

r3 merge

Author: orffen

lang/en.json

@@ -29,7 +29,7 @@
 
   "BASICFANTASYRPG.SaveDeath": "Death Ray or Poison",
   "BASICFANTASYRPG.SaveWands": "Magic Wands",
-  "BASICFANTASYRPG.SaveParalysis": "Paralysis or Turn to Stone",
+  "BASICFANTASYRPG.SaveParalysis": "Paralysis or Petrify",
   "BASICFANTASYRPG.SaveBreath": "Dragon Breath",
   "BASICFANTASYRPG.SaveSpells": "Rods, Staves, and Spells",
 

module/documents/item.mjs

@@ -36,7 +36,7 @@ export class BasicFantasyRPGItem extends Item {
     // Initialize chat data.
     const speaker = ChatMessage.getSpeaker({ actor: this.actor });
     const rollMode = game.settings.get('core', 'rollMode');
-    const label = `${game.i18n.localize('ITEM.Type' + item.type.capitalize())} - ${item.name}`;
+    const label = `Roll: ${game.i18n.localize('ITEM.Type' + item.type.capitalize())} - ${item.name}`;
 
     // If there's no roll data, or the formula is empty, send a chat message.
     if (!this.data.data.formula || !this.data.data.formula.value) {
@@ -57,7 +57,7 @@ export class BasicFantasyRPGItem extends Item {
       roll.toMessage({
         speaker: speaker,
         rollMode: rollMode,
-        flavor: label,
+        flavor: label
       });
       return roll;
     }

system.json

@@ -2,7 +2,7 @@
   "name": "basicfantasyrpg",
   "title": "Basic Fantasy RPG",
   "description": "The Basic Fantasy RPG system for FoundryVTT!",
-  "version": "r2",
+  "version": "r3",
   "minimumCoreVersion": "0.8.9",
   "compatibleCoreVersion": "9",
   "author": "Orffen",
@@ -23,6 +23,6 @@
   "secondaryTokenAttribute": null,
   "url": "https://github.com/orffen/basicfantasyrpg",
   "manifest": "https://raw.githubusercontent.com/orffen/basicfantasyrpg/main/system.json",
-  "download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r2.zip",
+  "download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r3.zip",
   "license": "LICENSE.txt"
 }

templates/actor/actor-character-sheet.html

@@ -17,7 +17,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
         </div>
 
         <div class="resource flex-group-center">
-          <label for="data.level.value" class="resource-label">{{localize data.class.label}} / {{localize data.level.label}}</label>
+          <label for="data.level.value" class="resource-label">{{localize data.class.label}}&nbsp;/&nbsp;{{localize data.level.label}}</label>
           <div class="resource-content flexrow flex-center flex-between">
             <input type="text" name="data.class.value" value="{{data.class.value}}" data-dtype="String"/>
             <span class="flexshrink">&nbsp;</span>
@@ -26,7 +26,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
         </div>
 
         <div class="resource flex-group-center">
-          <label for="data.xp.value" class="resource-label">{{localize data.xp.abbr}} / {{localize 'BASICFANTASYRPG.NextLevel'}}</label>
+          <label for="data.xp.value" class="resource-label">{{localize data.xp.abbr}}&nbsp;/&nbsp;{{localize 'BASICFANTASYRPG.NextLevel'}}</label>
           <div class="resource-content flexrow flex-center flex-between">
             <input type="text" name="data.xp.value" value="{{data.xp.value}}" data-dtype="Number"/>
             <span class="flexshrink">&nbsp;/&nbsp;</span>

templates/actor/actor-monster-sheet.html

@@ -17,7 +17,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
         </div>
 
         <div class="resource flex-group-center">
-          <label for="data.hitDice" class="resource-label"><a class="rollable" data-roll="{{data.hitDice.number}}+{{data.hitDice.size}}+{{data.hitDice.mod}}" data-label="{{localize data.hitDice.label}}">{{localize data.hitDice.abbr}} / {{localize data.specialAbility.label}}</a></label>
+          <label for="data.hitDice" class="resource-label"><a class="rollable" data-roll="{{data.hitDice.number}}{{data.hitDice.size}}+{{data.hitDice.mod}}" data-label="{{localize data.hitDice.label}}">{{localize data.hitDice.abbr}}&nbsp;/&nbsp;{{localize data.specialAbility.label}}</a></label>
           <div class="resource-content flexrow flex-center flex-between">
             <input type="number" name="data.hitDice.number" value="{{data.hitDice.number}}" data-dtype="Number"/>
             <input type="text" name="data.hitDice.size" value="{{data.hitDice.size}}" data-dtype="String"/>

templates/actor/parts/actor-combat.html

@@ -33,7 +33,7 @@
 <ol class="items-list">
   <li class="item flexrow items-header">
     <div class="item-name">{{localize 'ITEM.TypeWeapon'}}</div>
-    <div class="item-detail">{{localize 'BASICFANTASYRPG.Attack'}} / {{localize 'BASICFANTASYRPG.DamageAbbr'}}</div>
+    <div class="item-detail">{{localize 'BASICFANTASYRPG.Attack'}}&nbsp;/&nbsp;{{localize 'BASICFANTASYRPG.DamageAbbr'}}</div>
     <div class="item-controls">
       <a class="item-control item-create" title="Create item" data-type="weapon"><i class="fas fa-plus"></i> {{localize 'BASICFANTASYRPG.Add'}}</a>
     </div>
@@ -47,10 +47,10 @@
         <h4>{{weapon.name}}</h4>
       </div>
       <div class="item-prop item-image">
-        <a class="rollable" data-roll-type="weapon" data-attack="melee"><img src="icons/skills/melee/strike-sword-gray.webp" title="{{localize 'BASICFANTASYRPG.Melee'}} {{localize 'BASICFANTASYRPG.Attack'}}" width="24" height="24"/></a>
-        <a class="rollable" data-roll-type="weapon" data-attack="ranged"><img src="icons/skills/ranged/arrow-flying-gray-brown.webp" title="{{localize 'BASICFANTASYRPG.Ranged'}} {{localize 'BASICFANTASYRPG.Attack'}}" width="24" height="24"/></a>
+        <a class="rollable" data-roll-type="weapon" data-attack="melee"><img src="icons/skills/melee/weapons-crossed-poleaxes-white.webp" title="{{localize 'BASICFANTASYRPG.Melee'}} {{localize 'BASICFANTASYRPG.Attack'}}" width="24" height="24"/></a>
+        <a class="rollable" data-roll-type="weapon" data-attack="ranged"><img src="icons/skills/ranged/arrows-flying-salvo-gray.webp" title="{{localize 'BASICFANTASYRPG.Ranged'}} {{localize 'BASICFANTASYRPG.Attack'}}" width="24" height="24"/></a>
         <span class="flexshrink">/</span>
-        <a class="rollable" data-roll-type="damage" data-roll="{{weapon.data.damage.value}}" data-label="{{weapon.name}} {{localizeLowerCase weapon.data.damage.label}}"><img src="icons/skills/melee/shield-damaged-broken-blue.webp" title="{{weapon.data.damage.value}}" width="24" height="24"/></a>
+        <a class="rollable" data-roll-type="damage" data-roll="{{weapon.data.damage.value}}" data-label="{{weapon.name}} {{localizeLowerCase weapon.data.damage.label}}"><img src="icons/skills/melee/shield-damaged-broken-brown.webp" title="{{weapon.data.damage.value}}" width="24" height="24"/></a>
       </div>
       <div class="item-controls">
         <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>

templates/actor/parts/actor-features.html

@@ -10,7 +10,7 @@
     <li class="item flexrow" data-item-id="{{item._id}}">
       <div class="item-name">
         <div class="item-image">
-          <a class="rollable" data-roll-type="item" data-label="{{localize 'ITEM.TypeFeature'}} - {{item.name}}"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></a>
+          <a class="rollable" data-roll-type="item"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></a>
         </div>
         <h4>{{item.name}}</h4>
       </div>