Add startingBonusRolls on feature and background

lang/en.json

@@ -249,6 +249,8 @@
   "PB.Starting": "Starting",
   "PB.StartingBonusItemInvalid": "Item must exist in a compendium pack to be able to be used as a starting bonus item.",
   "PB.StartingBonusItems": "Starting Bonus Items",
+  "PB.StartingBonusRolls": "Starting Bonus Rolls",
+
   "PB.StartingMacro": "Starting Macro",
   "PB.StartingItems": "Starting Items",
   "PB.StartingRolls": "Starting Rolls",

module/combat.js

@@ -31,7 +31,6 @@ export const rollIndividualInitiative = async (actor) => {
   if (game.combats && game.combat) {
     const combatant = game.combat.combatants.find((i) => i.data.actorId === actor.id);
     if (combatant) {
-      console.log('rolling combat init');
       game.combat.rollInitiative(combatant.id);
       return;
     }
@@ -69,7 +68,6 @@ export class PBCombat extends Combat {
   }
 
   isFriendlyCombatant(combatant) {
-    console.log("isFriendlyCombatant", combatant);
     if (combatant._token) {
       // v8 compatible
       return combatant._token.data.disposition === 1;

module/scvm/scvmfactory.js

@@ -205,6 +205,16 @@ export const findStartingBonusItems = async (features) => {
   return results;
 };
 
+export const findStartingBonusRollsItems = async (features) => {
+  let results = [];
+  for (const feature of features) {
+    if (feature.data.data.startingBonusRolls) {
+      results = results.concat(await rollRollItems(feature.data.data.startingBonusRolls));
+    }
+  }
+  return results;
+};
+
 export const handleActorGettingBetterItems = async (actor) => {
   const actorClass = actor.getClass();
   const baseClass = await actor.getBaseClass();
@@ -346,6 +356,12 @@ export const rollScvmForClass = async (clazz) => {
     background
   ]);
 
+  const startingBonusRollItems = await findStartingBonusRollsItems([
+    ...(features || []), 
+    ...(startingRollItems || []),
+    background
+  ]);
+
   const description = generateDescription(clazz, baseTables);
 
   const allDocs = [
@@ -356,6 +372,7 @@ export const rollScvmForClass = async (clazz) => {
     ...(startingRollItems || []),
     ...(startingItems || []),
     ...(startingBonusItems || []),
+    ...(startingBonusRollItems || []),
     clazz,
   ];
 

packs/class-buccaneer.db

@@ -7,3 +7,8 @@
 {"_id":"faput8RkeUiNkwzx","name":"Crack Shot","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"<p>All ranged attacks are DR10. <strong>If taken again, DR8.</strong></p>","featureType":"Class","maxQuantity":2,"quantity":1,"actionMacro":"pirateborg.macros-pirateborg;Generic Item","actionMacroLabel":"Use","startingBonusItems":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}}
 {"_id":"lgzHS7vSvM7xgDOv","name":"Wildlife Tracker","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"<p>When tracking, you always know your target&rsquo;s direction from your current location, and can tell approximately how long ago it left. Can only be taken once.</p>","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"pirateborg.macros-pirateborg;Generic Item","actionMacroLabel":"Use","startingBonusItems":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}}
 {"_id":"vKcCqgp5tTmwYaWd","name":"Focused Aim","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"<p>Attacks to hit an enemy you have already shot at this combat are DR8. <strong>If taken again: they also deal d4 extra damage.</strong></p>","featureType":"Class","maxQuantity":2,"quantity":1,"actionMacro":"pirateborg.macros-pirateborg;Generic Item","actionMacroLabel":"Use","startingBonusItems":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}}
+{"_id":"a44UBgayTh0aBtcy","name":"Fast Reloader","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"<p>You can reload and shoot in the same turn. Can only be taken once.</p>","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"pirateborg.macros-pirateborg;Generic Item","actionMacroLabel":"Use","startingBonusItems":"","startingBonusRolls":"pirateborg.class-pirateborg;Generic Item"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{"core":{"sourceId":"Item.AxeYPFRnlVp2Z2Fv"}}}
+{"_id":"a44UBgayTh0aBtcy","name":"Fast Reloader","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"<p>You can reload and shoot in the same turn. Can only be taken once.</p>","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"pirateborg.macros-pirateborg;Generic Item","actionMacroLabel":"Use","startingBonusItems":"","startingBonusRolls":"pirateborg.rolls-character-creation;d12 Arcane Rituals"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{"core":{"sourceId":"Item.AxeYPFRnlVp2Z2Fv"}}}
+{"_id":"a44UBgayTh0aBtcy","name":"Fast Reloader","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"<p>You can reload and shoot in the same turn. Can only be taken once.</p>","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"pirateborg.macros-pirateborg;Generic Item","actionMacroLabel":"Use","startingBonusItems":"","startingBonusRolls":"pirateborg.rolls-character-creation;d12 Arcane rituals"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{"core":{"sourceId":"Item.AxeYPFRnlVp2Z2Fv"}}}
+{"_id":"a44UBgayTh0aBtcy","name":"Fast Reloader","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"<p>You can reload and shoot in the same turn. Can only be taken once.</p>","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"pirateborg.macros-pirateborg;Generic Item","actionMacroLabel":"Use","startingBonusItems":"","startingBonusRolls":"pirateborg.rolls-character-creation;d20 Arcane rituals"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{"core":{"sourceId":"Item.AxeYPFRnlVp2Z2Fv"}}}
+{"_id":"a44UBgayTh0aBtcy","name":"Fast Reloader","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"<p>You can reload and shoot in the same turn. Can only be taken once.</p>","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"pirateborg.macros-pirateborg;Generic Item","actionMacroLabel":"Use","startingBonusItems":"","startingBonusRolls":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{"core":{"sourceId":"Item.AxeYPFRnlVp2Z2Fv"}}}

template.json

@@ -130,7 +130,8 @@
       "description": "",
       "startingGold": "2d6 * 10",
       "quantity": 1,
-      "startingBonusItems": ""
+      "startingBonusItems": "",
+      "startingBonusRolls": ""
     },
     "feature": {
       "description": "",
@@ -139,7 +140,8 @@
       "quantity": 1,
       "actionMacro": "",
       "actionMacroLabel": "",
-      "startingBonusItems": ""
+      "startingBonusItems": "",
+      "startingBonusRolls": ""
     },
     "class": {
       "description": "",

templates/item/background-sheet.html

@@ -36,6 +36,11 @@ <h1 class="item-name">
         <label>{{localize "PB.StartingBonusItems"}}:</label>
         <textarea name="data.startingBonusItems" placeholder="compendium;item" rows="4">{{data.data.startingBonusItems}}</textarea>
       </div>
+
+      <div class="form-group">
+        <label>{{localize "PB.StartingBonusRolls"}}:</label>
+        <textarea name="data.startingBonusRolls" placeholder="compendium;table;count" rows="4">{{data.data.startingBonusRolls}}</textarea>
+      </div>
     </div>
   </section>
 </form>

templates/item/feature-sheet.html

@@ -61,6 +61,11 @@ <h4 class="item-type">{{item.type}}</h4>
         <label>{{localize "PB.StartingBonusItems"}}:</label>
         <textarea name="data.startingBonusItems" placeholder="compendium;item" rows="4">{{data.data.startingBonusItems}}</textarea>
       </div>
+
+      <div class="form-group">
+        <label>{{localize "PB.StartingBonusRolls"}}:</label>
+        <textarea name="data.startingBonusRolls" placeholder="compendium;table;count" rows="4">{{data.data.startingBonusRolls}}</textarea>
+      </div>
     </div>
   </section>
 </form>