From c0df39f1c4846c01de09a8951a80a04035a4dea3 Mon Sep 17 00:00:00 2001 From: Jeremie Lauzon Date: Fri, 6 May 2022 18:34:07 -0400 Subject: [PATCH] Add starting items, and roll items when getting the bonus items/rolls --- module/scvm/scvmfactory.js | 4 ++++ packs/backgrounds.db | 1 + packs/class-buccaneer.db | 12 ++++++++++++ 3 files changed, 17 insertions(+) diff --git a/module/scvm/scvmfactory.js b/module/scvm/scvmfactory.js index 19ee9e57..80394f79 100644 --- a/module/scvm/scvmfactory.js +++ b/module/scvm/scvmfactory.js @@ -350,15 +350,19 @@ export const rollScvmForClass = async (clazz) => { const startingRollItems = await rollRollItems(clazz.data.data.startingRolls); const startingItems = await findItems(clazz.data.data.startingItems); + // Both of the rolls should loop until nothing is returning to have a kind of recursive configuration const startingBonusItems = await findStartingBonusItems([ ...(features || []), + ...(startingItems || []), ...(startingRollItems || []), background ]); const startingBonusRollItems = await findStartingBonusRollsItems([ ...(features || []), + ...(startingItems || []), ...(startingRollItems || []), + ...(startingBonusItems || []), background ]); diff --git a/packs/backgrounds.db b/packs/backgrounds.db index 2bae5c11..f573a01d 100755 --- a/packs/backgrounds.db +++ b/packs/backgrounds.db @@ -79,3 +79,4 @@ {"_id":"zR3yzsYmtMnbkH30","name":"Former captive","type":"background","img":"systems/pirateborg/icons/misc/background.png","data":{"description":"

2d4 x 10s & your freedom

","startingGold":"2d4 * 10","quantity":1,"startingBonusItems":"pirateborg.backgrounds-items;your freedom"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}} {"_id":"zYtisv7EoFeF6gF9","name":"Quartermaster","type":"background","img":"systems/pirateborg/icons/misc/background.png","data":{"description":"

2d6 x 10s & the respect of a ship's crew

","startingGold":"2d6 * 10","quantity":1,"startingBonusItems":"pirateborg.backgrounds-items;the respect of a ship's crew"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}} {"_id":"zr9jEZJ3QitYWE9Z","name":"Medic","type":"background","img":"systems/pirateborg/icons/misc/background.png","data":{"description":"

2d6 x 10s & a medical kit

","startingGold":"2d6 * 10","quantity":1,"startingBonusItems":"pirateborg.equipment-gear;Medical kit"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}} +{"_id":"kqZxtcxXvfKJpA74","name":"Blacksmith","type":"background","img":"systems/pirateborg/icons/misc/background.png","data":{"description":"

2d6 x 10s & a set of files and tools

","startingGold":"2d6 * 10","quantity":1,"startingBonusItems":"pirateborg.equipment-gear;Metal file\npirateborg.backgrounds-items;set of tools","startingBonusRolls":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}} diff --git a/packs/class-buccaneer.db b/packs/class-buccaneer.db index 11b57512..6cf2e949 100755 --- a/packs/class-buccaneer.db +++ b/packs/class-buccaneer.db @@ -12,3 +12,15 @@ {"_id":"a44UBgayTh0aBtcy","name":"Fast Reloader","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"

You can reload and shoot in the same turn. Can only be taken once.

","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":"

You can reload and shoot in the same turn. Can only be taken once.

","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":"

You can reload and shoot in the same turn. Can only be taken once.

","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"}}} +{"_id":"a44UBgayTh0aBtcy","name":"Fast Reloader","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"

You can reload and shoot in the same turn. Can only be taken once.

","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"pirateborg.macros-pirateborg;Generic Item","actionMacroLabel":"Use","startingBonusItems":"","startingBonusRolls":"pirateborg.rolls-sorcerer;Sorceries;1"},"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":"

You can reload and shoot in the same turn. Can only be taken once.

","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"}}} +{"_id":"AxeYPFRnlVp2Z2Fv","name":"Fast Reloading","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"

Reloading takes 1 round instead of 2

","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"","actionMacroLabel":"","startingBonusItems":"","startingBonusRolls":"pirateborg.rolls-sorcerer;Sorceries;1"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}} +{"_id":"AxeYPFRnlVp2Z2Fv","name":"Fast Reloading","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"

Reloading takes 1 round instead of 2

","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"","actionMacroLabel":"","startingBonusItems":"","startingBonusRolls":""},"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":"

You can reload and shoot in the same turn. Can only be taken once.

","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"pirateborg.macros-pirateborg;Generic Item","actionMacroLabel":"Use","startingBonusItems":"","startingBonusRolls":"pirateborg.rolls-sorcerer;Sorceries;1"},"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":"

You can reload and shoot in the same turn. Can only be taken once.

","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"}}} +{"_id":"AxeYPFRnlVp2Z2Fv","name":"Fast Reloading","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"

Reloading takes 1 round instead of 2

","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"","actionMacroLabel":"","startingBonusItems":"","startingBonusRolls":"pirateborg.rolls-sorcerer;Sorceries;1"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}} +{"_id":"AxeYPFRnlVp2Z2Fv","name":"Fast Reloading","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"

Reloading takes 1 round instead of 2

","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"","actionMacroLabel":"","startingBonusItems":"","startingBonusRolls":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}} +{"_id":"AxeYPFRnlVp2Z2Fv","name":"Fast Reloading","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"

Reloading takes 1 round instead of 2

","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"","actionMacroLabel":"","startingBonusItems":"","startingBonusRolls":"pirateborg.rolls-sorcerer;Sorceries;1"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}} +{"_id":"AxeYPFRnlVp2Z2Fv","name":"Fast Reloading","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"

Reloading takes 1 round instead of 2

","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"","actionMacroLabel":"","startingBonusItems":"","startingBonusRolls":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}} +{"_id":"AxeYPFRnlVp2Z2Fv","name":"Fast Reloading","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"

Reloading takes 1 round instead of 2

","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"","actionMacroLabel":"","startingBonusItems":"","startingBonusRolls":"pirateborg.rolls-sorcerer;Sorceries;1"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}} +{"_id":"AxeYPFRnlVp2Z2Fv","name":"Fast Reloading","type":"feature","img":"systems/pirateborg/icons/misc/class-feature.png","data":{"description":"

Reloading takes 1 round instead of 2

","featureType":"Class","maxQuantity":1,"quantity":1,"actionMacro":"","actionMacroLabel":"","startingBonusItems":"","startingBonusRolls":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"pdXclp2r5tiEF79G":3},"flags":{}}