diff --git a/icons/classes/tall-tale/angler-fish.png b/icons/classes/tall-tale/angler-fish.png new file mode 100755 index 00000000..60480ba7 Binary files /dev/null and b/icons/classes/tall-tale/angler-fish.png differ diff --git a/icons/classes/tall-tale/crab.png b/icons/classes/tall-tale/crab.png new file mode 100755 index 00000000..58819286 Binary files /dev/null and b/icons/classes/tall-tale/crab.png differ diff --git a/icons/classes/tall-tale/electric-eel.png b/icons/classes/tall-tale/electric-eel.png new file mode 100755 index 00000000..245b9727 Binary files /dev/null and b/icons/classes/tall-tale/electric-eel.png differ diff --git a/icons/classes/tall-tale/jellyfish.png b/icons/classes/tall-tale/jellyfish.png new file mode 100755 index 00000000..8e0aae7e Binary files /dev/null and b/icons/classes/tall-tale/jellyfish.png differ diff --git a/icons/classes/tall-tale/octopus.png b/icons/classes/tall-tale/octopus.png new file mode 100755 index 00000000..969a94ba Binary files /dev/null and b/icons/classes/tall-tale/octopus.png differ diff --git a/icons/classes/tall-tale/sea-turtle.png b/icons/classes/tall-tale/sea-turtle.png new file mode 100755 index 00000000..a430f1cb Binary files /dev/null and b/icons/classes/tall-tale/sea-turtle.png differ diff --git a/icons/classes/tall-tale/shark.png b/icons/classes/tall-tale/shark.png new file mode 100755 index 00000000..a9abcef9 Binary files /dev/null and b/icons/classes/tall-tale/shark.png differ diff --git a/icons/classes/tall-tale/the-great-old-one.png b/icons/classes/tall-tale/the-great-old-one.png new file mode 100755 index 00000000..b285e91d Binary files /dev/null and b/icons/classes/tall-tale/the-great-old-one.png differ diff --git a/lang/en.json b/lang/en.json index c9380941..335ea3cd 100644 --- a/lang/en.json +++ b/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", diff --git a/module/combat.js b/module/combat.js index b20efa27..a59b48b3 100644 --- a/module/combat.js +++ b/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; diff --git a/module/scvm/scvmfactory.js b/module/scvm/scvmfactory.js index c516dff9..19ee9e57 100644 --- a/module/scvm/scvmfactory.js +++ b/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, ]; diff --git a/packs/class-buccaneer.db b/packs/class-buccaneer.db index a84367d4..11b57512 100755 --- a/packs/class-buccaneer.db +++ b/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":"

All ranged attacks are DR10. If taken again, DR8.

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

When tracking, you always know your target’s direction from your current location, and can tell approximately how long ago it left. Can only be taken once.

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

Attacks to hit an enemy you have already shot at this combat are DR8. If taken again: they also deal d4 extra damage.

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

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

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;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"}}} diff --git a/template.json b/template.json index 69392c7e..c58ac203 100644 --- a/template.json +++ b/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": "", diff --git a/templates/item/background-sheet.html b/templates/item/background-sheet.html index 20bb7f6e..ab52b066 100755 --- a/templates/item/background-sheet.html +++ b/templates/item/background-sheet.html @@ -36,6 +36,11 @@

+ +
+ + +
diff --git a/templates/item/feature-sheet.html b/templates/item/feature-sheet.html index c9e52df6..22ddb0dd 100644 --- a/templates/item/feature-sheet.html +++ b/templates/item/feature-sheet.html @@ -61,6 +61,11 @@

{{item.type}}

+ +
+ + +