Merge pull request #7 from orffen/devel

r2 merge

Author: orffen

README.md

@@ -16,9 +16,17 @@ Initiative automatically includes the character's Dexterity modifier. The charac
 
 The system does not yet automatically reset initiative at the end of each combat round, but this can be manually done in FoundryVTT's initiative tracker.
 
+### Roll Formulas
+
+To add ability bonuses/penalties to roll formulas (damage or special ability), you can use `@str.bonus`. Replace `str` with `int`, `wis`, `dex`, `con` or `cha`. You can use the full ability with just `@str`, for example if you wanted to do something like `d20<=@str`. `@lvl` is available as short-hand for the character level.
+
+### Character Special Abilities
+
+Special Abilities are a flexible item type with just a description and a roll formula. They can be used for thief abilities (formula: d100), open doors checks (d6), or even just as text (formula left blank). Clicking the icon in the list will either roll the formula if present, or output the description to the chat window.
+
 ### Monster Special Abilities
 
-The monster sheet has a "special abilities" field. This field should be 0, 1, or 2, depending on how many asterisks appear after the monster's hit dice value. XP values for monsters are automatically calculated.
+The monster sheet has a "special abilities" field. This field should be 0, 1, or 2, depending on how many asterisks appear after the monster's hit dice value. XP values and attack bonus for monsters are automatically calculated.
 
 ## License
 

module/sheets/actor-sheet.mjs

@@ -119,9 +119,12 @@ export class BasicFantasyRPGActorSheet extends ActorSheet {
     let carriedWeight = {
       "value": 0,
       _addWeight (moreWeight, quantity) {
+        if (!quantity || quantity == '' || Number.isNaN(quantity) || quantity < 0) {
+          return; // check we have a valid quantity, and do nothing if we do not
+        }
         let q = Math.floor(quantity / 10);
-        if (!Number.isNaN(parseInt(moreWeight))) {
-          this.value += parseInt(moreWeight) * quantity;
+        if (!Number.isNaN(parseFloat(moreWeight))) {
+          this.value += parseFloat(moreWeight) * quantity;
         } else if (moreWeight === '*' && q > 0) {
           this.value += q;
         }
@@ -163,7 +166,7 @@ export class BasicFantasyRPGActorSheet extends ActorSheet {
     context.armors = armors;
     context.spells = spells;
     context.features = features;
-    context.carriedWeight = carriedWeight.value;
+    context.carriedWeight = Math.floor(carriedWeight.value); // we discard fractions of weight when we update the sheet
   }
 
   /* -------------------------------------------- */
@@ -194,6 +197,17 @@ export class BasicFantasyRPGActorSheet extends ActorSheet {
       li.slideUp(200, () => this.render(false));
     });
 
+    // Prepare Spells
+    html.find('.spell-prepare').click(ev => {
+      const change = event.currentTarget.dataset.change;
+      if (parseInt(change)) {
+        const li = $(ev.currentTarget).parents(".item");
+        const item = this.actor.items.get(li.data("itemId"));
+        let newValue = item.data.data.prepared.value + parseInt(change);
+        item.update({"data.prepared.value": newValue});
+      }
+    });
+
     // Active Effect management
     html.find(".effect-control").click(ev => onManageActiveEffect(ev, this.actor));
 

styles/basicfantasyrpg.css

@@ -386,12 +386,17 @@
 .basicfantasyrpg .sheet-body .editor,
 .basicfantasyrpg .sheet-body .tab,
 .basicfantasyrpg .sheet-body .tab .editor {
-  height: 100%;
+  height: calc(100% - 2px);
+}
+
+.basicfantasyrpg .sheet-body .tab.biography {
+  max-height: calc(100% - 53px);
 }
 
 .basicfantasyrpg .editor-content {
   font-family: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-primary);
   font-size: 18px;
+  overflow-y: hidden;
 }
 
 .basicfantasyrpg .tox .tox-editor-container {

system.json

@@ -2,7 +2,7 @@
   "name": "basicfantasyrpg",
   "title": "Basic Fantasy RPG",
   "description": "The Basic Fantasy RPG system for FoundryVTT!",
-  "version": "r1",
+  "version": "r2",
   "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/r1.zip",
+  "download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r2.zip",
   "license": "LICENSE.txt"
 }

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">{{localize data.hitDice.abbr}} / {{localize data.specialAbility.label}}</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}} / {{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"/>
@@ -33,14 +33,14 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
       <div class="resources grid grid-4col">
 
         <div class="resource flex-group-center">
-          <label for="data.numberAppearing.value" class="resource-label">{{localize data.numberAppearing.label}}</label>
+          <label for="data.numberAppearing.value" class="resource-label"><a class="rollable" data-roll="{{data.numberAppearing.value}}" data-label="{{localize data.numberAppearing.label}}">{{localize data.numberAppearing.label}}</a></label>
           <div class="resource-content flexrow flex-center flex-between">
             <input type="text" name="data.numberAppearing.value" value="{{data.numberAppearing.value}}" data-dtype="String"/>
           </div>
         </div>
 
         <div class="resource flex-group-center">
-          <label for="data.morale.value" class="resource-label">{{localize data.morale.label}}</label>
+          <label for="data.morale.value" class="resource-label"><a class="rollable" data-roll="2d6" data-label="{{localize data.morale.label}} ({{data.morale.value}})">{{localize data.morale.label}}</a></label>
           <div class="resource-content flexrow flex-center flex-between">
             <input type="number" name="data.morale.value" value="{{data.morale.value}}" data-dtype="Number"/>
           </div>
@@ -92,6 +92,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
         {{!-- For the main combat list, span the right two columns --}}
         <section class="main grid-span-2">
           {{> "systems/basicfantasyrpg/templates/actor/parts/actor-combat.html"}}
+          {{> "systems/basicfantasyrpg/templates/actor/parts/actor-features.html"}}
         </section>
 
       </section>
@@ -106,3 +107,4 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
   </section>
 </form>
 
+<!-- <script>document.getElementsByName('data.attackBonus.value')[0].disabled = true;</script> -->

templates/actor/parts/actor-combat.html

@@ -10,7 +10,7 @@
   <div class="resource flex-group-center">
     <label for="data.attackBonus.value" class="resource-label">{{localize data.attackBonus.abbr}}</label>
     <div class="resource-content flexrow flex-center flex-between">
-      <input type="number" name="data.attackBonus.value" value="{{data.attackBonus.value}}" data-dtype="Number"/>
+      <input type="number" name="data.attackBonus.value" value="{{data.attackBonus.value}}" data-dtype="Number" {{#if (eq actor.type "monster")}}disabled{{/if}}/>
     </div>
   </div>
 
@@ -50,7 +50,7 @@ <h4>{{weapon.name}}</h4>
         <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>
         <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}} {{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-blue.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

@@ -1,7 +1,7 @@
 <ol class="items-list">
   <li class="item flexrow items-header">
     <div class="item-name">{{localize 'ITEM.TypeFeature'}}</div>
-    <div class="item-formula">{{localize 'BASICFANTASYRPG.Formula'}}</div>
+    <div class="item-detail">{{localize 'BASICFANTASYRPG.Formula'}}</div>
     <div class="item-controls">
       <a class="item-control item-create" title="Create item" data-type="feature"><i class="fas fa-plus"></i> {{localize 'BASICFANTASYRPG.Add'}}</a>
     </div>

templates/actor/parts/actor-items.html

@@ -53,9 +53,12 @@
         <div class="item-image">
           <a class="rollable" data-roll-type="item"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></a>
         </div>
-        <h4>{{item.name}}</h4>
+        <h4>{{item.data.quantity.value}} {{item.name}}</h4>
+      </div>
+      <div class="item-prop grid grid-2col">
+        <div class="flex-left align-right">{{item.data.weight.value}} lbs.</div>
+        <div class="flex-right">{{item.data.price.value}}</div>
       </div>
-      <div class="item-prop">{{item.data.weight.value}}</div>
       <div class="item-controls">
         <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
         <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>

templates/actor/parts/actor-spells.html

@@ -27,7 +27,11 @@
           </div>
           <h4>{{item.name}}</h4>
         </div>
-        <div class="item-prop">{{localize item.data.prepared.label}}: {{item.data.prepared.value}}</div>
+        <div class="item-prop grid grid-3col">
+          <div class="flex-group-right"><a class="item-control spell-prepare" data-change="-1"><i class="fas fa-minus"></i></a></div>
+          <div class="flex-group-center">{{item.data.prepared.value}}</div>
+          <div class="flex-group-left"><a class="item-control spell-prepare" data-change="+1"><i class="fas fa-plus"></i></a></div>
+        </div>
         <div class="item-controls">
           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
           <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>