diff --git a/README.md b/README.md index 26aa42c..25819a3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # FoundryVTT - Forien's Armoury -**[Current version]**: v0.2.4 +**[Current version]**: v0.2.5 **[Compatibility]**: *FoundryVTT* 0.6.0+, *WFRP4e* 1.5.5+ **[Optional modules]**: *Babele* 1.19+ (required for translations) @@ -21,6 +21,7 @@ This module is a collection of custom trappings and features for Warhammer Fanta * Prepared groundwork for translation using Babele to any language * Started translating Forien's Armoury compendium to Polish (all names and most descriptions done) * Added notification when combat ends about all recovered ammunition. Only owner and GM see it. +* Restored support for retrieving ammunition out of combat ## Installation @@ -56,7 +57,6 @@ Module contains single Compendium pack containing at the moment 34 items. ## Future plans ### Features -* fix out-of-encounter bug with arrow reclamation * add checkboxes in weapon test dialog that would allow to override arrow recovery system ### Content diff --git a/changelog.md b/changelog.md index 06b8018..45f80a0 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,11 @@ ## v0.X.X ### v0.2.X +#### v0.2.5 +* Fixed some GWMWG weapons according to Rat Catchers Guild update, thanks to hamofficer +* Added support for retrieving arrows out of combat +* removed unnecessary logging + #### v0.2.4 * Added notification when combat ends about all recovered ammunition. Only owner and GM see it. * fixed Unbreakable diff --git a/icons/mace.png b/icons/mace.png new file mode 100644 index 0000000..39eac96 Binary files /dev/null and b/icons/mace.png differ diff --git a/module.json b/module.json index bf018fd..31810be 100644 --- a/module.json +++ b/module.json @@ -14,14 +14,14 @@ } ], "system": "wfrp4e", - "version": "0.2.4", + "version": "0.2.5", "minimumCoreVersion": "0.6.0", "compatibleCoreVersion": "0.6.2", "url": "https://github.com/Forien/foundryvtt-forien-armoury", - "manifest": "https://raw.githubusercontent.com/Forien/foundryvtt-forien-armoury/v0.2.4/module.json", - "download": "https://github.com/Forien/foundryvtt-forien-armoury/archive/v0.2.4.zip", - "readme": "https://github.com/Forien/foundryvtt-forien-armoury/blob/v0.2.4/README.md", - "changelog": "https://github.com/Forien/foundryvtt-forien-armoury/blob/v0.2.4/changelog.md", + "manifest": "https://raw.githubusercontent.com/Forien/foundryvtt-forien-armoury/v0.2.5/module.json", + "download": "https://github.com/Forien/foundryvtt-forien-armoury/archive/v0.2.5.zip", + "readme": "https://github.com/Forien/foundryvtt-forien-armoury/blob/v0.2.5/README.md", + "changelog": "https://github.com/Forien/foundryvtt-forien-armoury/blob/v0.2.5/changelog.md", "bugs": "https://github.com/Forien/foundryvtt-forien-armoury/issues", "packs": [ { diff --git a/packs/armoury.db b/packs/armoury.db index bd76c3e..eff8b1f 100644 --- a/packs/armoury.db +++ b/packs/armoury.db @@ -5,7 +5,7 @@ {"name":"Bardiche","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":2},"price":{"type":"String","label":"Price","gc":"0","ss":"15","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Hack"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":700000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/great-axe-fine.png","_id":"myRwNERNl07ThdEk"} {"name":"Basket-hilt Sword","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":1},"price":{"type":"String","label":"Price","gc":"2","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":""},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":100000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Sword-HW.png","_id":"PrqcXOCswRsi5ot2"} {"name":"Battleaxe","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":2},"price":{"type":"String","label":"Price","gc":"1","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Hack"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":300000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/great-axe.png","_id":"ZyyHI4ghmJAzHb5M"} -{"name":"Bear Spear","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Tool Grade Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":2},"price":{"type":"String","label":"Price","gc":"0","ss":"10","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Impale"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":500000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Spear.png","_id":"rSozsXeyDHd39fQa"} +{"name":"Bear Spear","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Tool Grade Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":2},"price":{"type":"String","label":"Price","gc":"0","ss":"10","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+3","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Impale"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":500000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Spear.png","_id":"rSozsXeyDHd39fQa"} {"name":"Bec de Corbin","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"3","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"rare"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+5","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Damaging,Defensive,Impale,Pummel"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":300000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/war-pick.png","_id":"nOtKqrWJ4G4vMFzO"} {"name":"Bodkin Arrow","permission":{"default":0,"BROkitc7mTvifSer":3},"type":"ammunition","data":{"description":{"type":"String","label":"Description","value":"

Armour piercing arrow used by military in battles, designed to counter some armour worn by enemy combatants.

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":12},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"8","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"ammunitionType":{"type":"String","label":"Ammunition Type","value":"bow"},"range":{"type":"String","label":"Range","value":"As weapon"},"damage":{"type":"String","label":"Damage","value":""},"qualities":{"type":"String","label":"Qualities","value":"Penetrating"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"source":{"type":"String","label":"Source"}},"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/ammunition/arrow.png","_id":"LNu45jrHZ1Hwd5vu"} {"name":"Bodkin Bolt","permission":{"default":0,"tHlVinqVUHEfQ3PE":3},"type":"ammunition","data":{"description":{"type":"String","label":"Description","value":"

Armour piercing bolt used by military in battles, designed to counter some armour worn by enemy combatants.

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":12},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"16","bp":"8","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"ammunitionType":{"type":"String","label":"Ammunition Type","value":"crossbow"},"range":{"type":"String","label":"Range","value":"As weapon"},"damage":{"type":"String","label":"Damage","value":"-1"},"qualities":{"type":"String","label":"Qualities","value":"Impale, Penetrating, Recoverable"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"source":{"type":"String","label":"Source"}},"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/ammunition/bolt.png","_id":"pgzR2F0db1j9eEZp"} @@ -18,7 +18,7 @@ {"name":"Cuirass","permission":{"default":0,"tHlVinqVUHEfQ3PE":3},"type":"armour","data":{"description":{"type":"String","label":"Description","value":"

Cuirass covers both front and back of torso and thus provides a better protection.

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"10","ss":"0","bp":"0"},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"worn":{"type":"Boolean","label":"Worn","value":false},"armorType":{"type":"String","label":"Armour Type","value":"plate"},"penalty":{"type":"String","label":"Penalty","value":""},"qualities":{"type":"String","label":"Qualities","value":"Impenetrable"},"flaws":{"type":"String","label":"Flaws","value":"Weakpoints"},"special":{"type":"String","label":"Special","value":""},"maxAP":{"head":0,"lArm":0,"rArm":0,"lLeg":0,"rLeg":0,"body":2},"currentAP":{"head":-1,"lArm":-1,"rArm":-1,"lLeg":-1,"rLeg":-1,"body":-1},"source":{"type":"String","label":"Source"}},"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/armour/plate-breastplate.png","_id":"tdffOEXSriY1zPR5"} {"name":"Cutlass","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Commoner's Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":1},"price":{"type":"String","label":"Price","gc":"1","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"short"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Slashing"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":100000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Sword-HW.png","_id":"zYN2ub0b5D1XFYyU"} {"name":"Dirk","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Commoner's Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"16","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+2","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"vshort"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":""},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":100000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Dagger.png","_id":"h9xl1qrAWYN89hDm"} -{"name":"Estoc","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":""},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"8","ss":"0","bp":"0"},"availability":{"type":"String","label":"Availability","value":"rare"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+5","meleeValue":"SB+3","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":true},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"twohanded"},"qualities":{"type":"String","label":"Qualities","value":"Damaging, Impale"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":700000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/foil.png","_id":"FyRy3pSrs4S9SUUK"} +{"name":"Estoc","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":""},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"8","ss":"0","bp":"0"},"availability":{"type":"String","label":"Availability","value":"rare"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+5","meleeValue":"SB+3","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":true},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"twohanded"},"qualities":{"type":"String","label":"Qualities","value":"Damaging, Impale"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":700000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Foil.png","_id":"FyRy3pSrs4S9SUUK"} {"name":"Falchion","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Commoner's Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":1},"price":{"type":"String","label":"Price","gc":"1","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+3","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Slashing"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":100000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Sword-HW.png","_id":"HHfYAI33zKIOxOm9"} {"name":"Gambeson Coat","permission":{"default":0,"tHlVinqVUHEfQ3PE":3},"type":"armour","data":{"description":{"type":"String","label":"Description","value":"

A gambeson is a padded defensive jacket, worn as armor separately, or combined with mail or plate armor. Gambesons are produced with a sewing technique called quilting. They are usually constructed of linen or wool; the stuffing varied, and could be for example scrap cloth or horse hair.

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":2},"price":{"type":"String","label":"Price","gc":"0","ss":"14","bp":"0"},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"worn":{"type":"Boolean","label":"Worn","value":false},"armorType":{"type":"String","label":"Armour Type","value":"softLeather"},"penalty":{"type":"String","label":"Penalty","value":""},"qualities":{"type":"String","label":"Qualities","value":""},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"maxAP":{"head":0,"lArm":1,"rArm":1,"lLeg":1,"rLeg":1,"body":1},"currentAP":{"head":-1,"lArm":-1,"rArm":-1,"lLeg":-1,"rLeg":-1,"body":-1}},"flags":{},"img":"modules/forien-armoury/icons/long-gambeson.png","_id":"0TcZUb9Y7tHIrMsv"} {"name":"Gambeson Coif","permission":{"default":0,"tHlVinqVUHEfQ3PE":3},"type":"armour","data":{"description":{"type":"String","label":"Description","value":""},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"6","bp":"0"},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"worn":{"type":"Boolean","label":"Worn","value":false},"armorType":{"type":"String","label":"Armour Type","value":"softLeather"},"penalty":{"type":"String","label":"Penalty","value":""},"qualities":{"type":"String","label":"Qualities","value":""},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"maxAP":{"head":1,"lArm":0,"rArm":0,"lLeg":0,"rLeg":0,"body":0},"currentAP":{"head":-1,"lArm":-1,"rArm":-1,"lLeg":-1,"rLeg":-1,"body":-1}},"flags":{},"img":"modules/forien-armoury/icons/gambeson-coif.png","_id":"mAUeLilkL8u73J0m"} @@ -30,7 +30,7 @@ {"name":"Heater Shield","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":1},"price":{"type":"String","label":"Price","gc":"3","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+2","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"vshort"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Shield 2,Defensive"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":300000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/shield.png","_id":"PSBkiom3pwi8XOpL"} {"name":"Heavy Lance","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"1","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"rare"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+6","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"vLong"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"cavalry"},"qualities":{"type":"String","label":"Qualities","value":"Impact,Impale"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":300000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/lance.png","_id":"nUoWFtUQwmN6KPYC"} {"name":"Hedgecraft Ingredient","permission":{"default":0,"BROkitc7mTvifSer":3},"type":"trapping","data":{"description":{"type":"String","label":"Description","value":"

Hedgefolk use easily sourced local materials prepared to exacting standards using special tools. So, ingredients may include things such as the wings of a dragonfly killed with a silver pin, rods of poplar polished with beeswax on Sonnstill, or bones buried beneath a hedgerow for a winter’s month.

\n

Hedgecraft ingredients can be foraged using Lore (Herbalism). Upon successful foraging roll, you receive 1 + SL ingredients.

\n

You cannot cast any Hedgecraft spell without an ingredient.

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"0","bp":"0"},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"trappingType":{"type":"String","label":"Trapping Type","value":"ingredient"},"worn":false,"spellIngredient":{"type":"String","value":""}},"flags":{},"img":"modules/forien-armoury/icons/ingredients/hedgecraft.png","_id":"vBITiimqgMp1zOSm"} -{"name":"Horseman's Pick","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":1},"price":{"type":"String","label":"Price","gc":"2","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"cavalry"},"qualities":{"type":"String","label":"Qualities","value":"Slashing"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":1231250,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Pick.png","_id":"qJxGVzFbfutOXwJA"} +{"name":"Horseman's Pick","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":1},"price":{"type":"String","label":"Price","gc":"2","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"cavalry"},"qualities":{"type":"String","label":"Qualities","value":"Impact, Pummel"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":1231250,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Pick.png","_id":"qJxGVzFbfutOXwJA"} {"name":"Hunting Arrow","permission":{"default":0,"tHlVinqVUHEfQ3PE":3},"type":"ammunition","data":{"description":{"type":"String","label":"Description","value":"

Specially designed arrows for hunting game and other big prey. It's wide and heavy arrowhead cuts deep into the flesh and can be very lethal, but range is heavily reduced. 

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":12},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"3","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"ammunitionType":{"type":"String","label":"Ammunition Type","value":"bow"},"range":{"type":"String","label":"Range","value":"Quarter weapon"},"damage":{"type":"String","label":"Damage","value":"+2"},"qualities":{"type":"String","label":"Qualities","value":"Impale, Sturdy"},"flaws":{"type":"String","label":"Flaws","value":"Unreliable"},"special":{"type":"String","label":"Special","value":""},"source":{"type":"String","label":"Source"}},"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/ammunition/arrow.png","_id":"ETuzeEabGepX7Rl3"} {"name":"Hunting Bolt","permission":{"default":0,"tHlVinqVUHEfQ3PE":3},"type":"ammunition","data":{"description":{"type":"String","label":"Description","value":"

Specially designed bolts for hunting game and other big prey. It's wide and heavy arrowhead cuts deep into the flesh and can be very lethal, but range is heavily reduced. 

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":12},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"3","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"ammunitionType":{"type":"String","label":"Ammunition Type","value":"crossbow"},"range":{"type":"String","label":"Range","value":"Quarter weapon"},"damage":{"type":"String","label":"Damage","value":"+2"},"qualities":{"type":"String","label":"Qualities","value":"Impale, Sturdy"},"flaws":{"type":"String","label":"Flaws","value":"Unreliable"},"special":{"type":"String","label":"Special","value":""},"source":{"type":"String","label":"Source"}},"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/ammunition/bolt.png","_id":"V9zTRpuug6nnolFh"} {"name":"Hysh Ingredient","permission":{"default":0,"BROkitc7mTvifSer":3},"type":"trapping","data":{"description":{"type":"String","label":"Description","value":"

Generic ingredient used in channeling Hysh. Commonly used ingredients are artefacts associated with holiness and holy places, supplemented by crystals, glass, pyramidions, and small statues, all carved with sacred symbols, twisting snakes, and moral tales. White candles, silver carvings, and bleached paper are also common.

\n

Ingredient's price depends on spell for which it is destined. Set price to X ss, where X is equal to spell's CN. 

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"0","bp":"0"},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"trappingType":{"type":"String","label":"Trapping Type","value":"ingredient"},"worn":false,"spellIngredient":{"type":"String","value":""}},"flags":{},"img":"modules/forien-armoury/icons/ingredients/light.png","_id":"ebkgqZULF24opCLL"} @@ -46,16 +46,16 @@ {"name":"Long Gambeson","permission":{"default":0,"tHlVinqVUHEfQ3PE":3},"type":"armour","data":{"description":{"type":"String","label":"Description","value":"

A gambeson is a padded defensive jacket, worn as armor separately, or combined with mail or plate armor. Gambesons are produced with a sewing technique called quilting. They are usually constructed of linen or wool; the stuffing varied, and could be for example scrap cloth or horse hair.

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":1},"price":{"type":"String","label":"Price","gc":"0","ss":"12","bp":"0"},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"worn":{"type":"Boolean","label":"Worn","value":false},"armorType":{"type":"String","label":"Armour Type","value":"softLeather"},"penalty":{"type":"String","label":"Penalty","value":""},"qualities":{"type":"String","label":"Qualities","value":""},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"maxAP":{"head":0,"lArm":0,"rArm":0,"lLeg":1,"rLeg":1,"body":1},"currentAP":{"head":-1,"lArm":-1,"rArm":-1,"lLeg":-1,"rLeg":-1,"body":-1}},"flags":{},"img":"modules/forien-armoury/icons/long-gambeson.png","_id":"nCwPgRXNXzjYtzQx"} {"name":"Longsword","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":2},"price":{"type":"String","label":"Price","gc":"8","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+5","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":true},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"twohanded"},"qualities":{"type":"String","label":"Qualities","value":"Damaging,Defensive"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":300000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Sword-HW.png","_id":"lpnkGfPreSCtbAj1"} {"name":"Lucerne","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"3","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"rare"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"vLong"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Damaging,Defensive,Impale,Pummel"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":900000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Warhammer-fine.png","_id":"ym6Yu5J9WBBV1VS5"} -{"name":"Mace","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":2},"price":{"type":"String","label":"Price","gc":"1","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Pummel"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":250000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/morning-star(HW).png","_id":"0iMH2l2huXaR5bgj"} +{"name":"Mace","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":2},"price":{"type":"String","label":"Price","gc":"1","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Pummel"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":250000,"flags":{"_sheetTab":"details"},"img":"modules/forien-armoury/icons/mace.png","_id":"0iMH2l2huXaR5bgj"} {"name":"Mail Longcoat","permission":{"default":0,"tHlVinqVUHEfQ3PE":3},"type":"armour","data":{"description":{"type":"String","label":"Description","value":""},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":5},"price":{"type":"String","label":"Price","gc":"5","ss":"0","bp":"0"},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"worn":{"type":"Boolean","label":"Worn","value":false},"armorType":{"type":"String","label":"Armour Type","value":"mail"},"penalty":{"type":"String","label":"Penalty","value":""},"qualities":{"type":"String","label":"Qualities","value":"Flexible"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"maxAP":{"head":0,"lArm":2,"rArm":2,"lLeg":2,"rLeg":2,"body":2},"currentAP":{"head":-1,"lArm":-1,"rArm":-1,"lLeg":-1,"rLeg":-1,"body":-1},"source":{"type":"String","label":"Source"}},"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/armour/mail-coat.png","_id":"QyWaZSG364E4wwSd"} {"name":"Mallet","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Tool Grade Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":1},"price":{"type":"String","label":"Price","gc":"0","ss":"3","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+3","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"short"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Pummel,Undamaging"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":200000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/tools_and_kits/hammer.png","_id":"BGedEAHIdgwiqbBH"} {"name":"Marienburg Hammer","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":""},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":2},"price":{"type":"String","label":"Price","gc":"2","ss":"0","bp":"0"},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+3","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Pummel, Impale"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":700000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/cavalry-hammer.png","_id":"wwiakvAKAxmkZQ9w"} {"name":"Maul","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"5","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"rare"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+5","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":true},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"twohanded"},"qualities":{"type":"String","label":"Qualities","value":"Impact,Slow"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":1225000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/tools_and_kits/hammer.png","_id":"ziG7yniKGJNyPkqo"} {"name":"Military Arrow","permission":{"default":0,"tHlVinqVUHEfQ3PE":3},"type":"ammunition","data":{"description":{"type":"String","label":"Description","value":"

Standard arrow used by military in battles, designed to deeply pierce skin.

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":12},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"6","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"ammunitionType":{"type":"String","label":"Ammunition Type","value":"bow"},"range":{"type":"String","label":"Range","value":"As weapon"},"damage":{"type":"String","label":"Damage","value":""},"qualities":{"type":"String","label":"Qualities","value":"Impale"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"source":{"type":"String","label":"Source"}},"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/ammunition/arrow.png","_id":"BZG9otPrra3O2JxL"} {"name":"Misericorde","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"1","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+2","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"vshort"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Penetrating"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":100000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Dagger-fine.png","_id":"eSkCIL3DlAxrYzkX"} -{"name":"Morgenstern","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":1},"price":{"type":"String","label":"Price","gc":"1","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Pierce,Pummel"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":400000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/morning-star(HW).png","_id":"cYtAhCxkmbFKHxD3"} +{"name":"Morgenstern","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":1},"price":{"type":"String","label":"Price","gc":"1","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Penetrating, Pummel"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":400000,"flags":{"_sheetTab":"details"},"img":"modules/forien-armoury/icons/mace.png","_id":"cYtAhCxkmbFKHxD3"} {"name":"Needle Bolt","permission":{"default":0,"tHlVinqVUHEfQ3PE":3},"type":"ammunition","data":{"description":{"type":"String","label":"Description","value":"

Wooden bolt, designed to deeply pierce skin and preferably break upon impact.

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":12},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"6","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"ammunitionType":{"type":"String","label":"Ammunition Type","value":"crossbow"},"range":{"type":"String","label":"Range","value":"As weapon"},"damage":{"type":"String","label":"Damage","value":""},"qualities":{"type":"String","label":"Qualities","value":"Impale, Slashing"},"flaws":{"type":"String","label":"Flaws","value":"Frail"},"special":{"type":"String","label":"Special","value":""},"source":{"type":"String","label":"Source"}},"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/ammunition/bolt.png","_id":"RvM2xDnylw1779pL"} -{"name":"Pickaxe","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Tool Grade Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"0","ss":"18","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Impale, Slow"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":500000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/tools_and_kits/pick.png","_id":"IaJ9xAgWzHPYivDQ"} +{"name":"Pickaxe","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Tool Grade Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"0","ss":"18","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"average"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"twohanded"},"qualities":{"type":"String","label":"Qualities","value":"Impale, Slow"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":500000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/tools_and_kits/pick.png","_id":"IaJ9xAgWzHPYivDQ"} {"name":"Pitch Fork","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Tool Grade Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"0","ss":"5","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+3","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"vLong"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Impale, Undamaging"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":500000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/tools_and_kits/broom.png","_id":"C23OaROXBhK5IQVX"} {"name":"Pollaxe","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"3","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+5","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Defensive,Hack,Impale"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":300000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/Halberd.png","_id":"EOskGFJAbBRBTTVz"} {"name":"Rondel Dagger","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Commoner's Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"12","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+2","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"vshort"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"basic"},"qualities":{"type":"String","label":"Qualities","value":"Undamaging"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":100000,"flags":{"_sheetTab":"description"},"img":"systems/wfrp4e/icons/equipment/weapons/dagger2.png","_id":"nb37OJz60GdIi7jm"} @@ -74,4 +74,4 @@ {"name":"Voulge","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"1","ss":"0","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"scarce"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"vLong"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Hack,Impale"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":800000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/great-axe-fine.png","_id":"yE7NAeGNcMqbR2r0"} {"name":"War Scythe","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Knightly Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"1","ss":"10","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"rare"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+5","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"vLong"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Hack"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":1000000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/tools_and_kits/sickle.png","_id":"xzQNgH7wMA5YKTFd"} {"name":"Witchcraft Ingredient","permission":{"default":0,"BROkitc7mTvifSer":3},"type":"trapping","data":{"description":{"type":"String","label":"Description","value":"

Witches use a horrific mixture of animal body parts, often harvested when a creature is still alive. It is not uncommon to find them clutching lizard eyes, dog toes, donkey gizzard, or much, much worse in their bloody hands as they cast their foul magics.

\n

Ingredient's price depends on spell for which it is destined. Set price to X bp, where X is equal to spell's CN.

\n

Alternatively, successful foraging roll using Outdoor Survival grants you 1 + SL ingredients.

\n

Channelling or casting spells from this Lore automatically require a roll on the Minor Miscast table unless cast with an ingredient , where the ingredient provides no further protection should you roll a Miscast.

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":0},"price":{"type":"String","label":"Price","gc":"0","ss":"0","bp":"0"},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"trappingType":{"type":"String","label":"Trapping Type","value":"ingredient"},"worn":false,"spellIngredient":{"type":"String","value":""}},"flags":{},"img":"modules/forien-armoury/icons/ingredients/witchcraft.png","_id":"UfwpasKrjtvjIExB"} -{"name":"Woodcutter's Axe","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Tool Grade Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"0","ss":"10","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"polearm"},"qualities":{"type":"String","label":"Qualities","value":"Hack, Slow"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":500000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/great-axe-flaw.png","_id":"koVifdGICXhPZ3c1"} +{"name":"Woodcutter's Axe","permission":{"default":0},"type":"weapon","data":{"description":{"type":"String","label":"Description","value":"

Tool Grade Weapon

"},"gmdescription":{"type":"String","label":"Description","value":""},"quantity":{"type":"Number","label":"Quantity","value":1},"encumbrance":{"type":"Number","label":"Encumbrance","value":3},"price":{"type":"String","label":"Price","gc":"0","ss":"10","bp":"0","value":""},"availability":{"type":"String","label":"Availability","value":"common"},"location":{"type":"Number","label":"Location","value":0},"damage":{"type":"String","label":"Damage","value":"SB+4","meleeValue":"SB+4","rangedValue":""},"reach":{"type":"String","label":"Reach","value":"long"},"range":{"type":"String","label":"Range","value":""},"twohanded":{"type":"Boolean","label":"Two-Handed","value":false},"ammunitionGroup":{"type":"String","label":"Ammunition Group","value":"none"},"currentAmmo":{"type":"Number","value":0},"weaponGroup":{"type":"String","label":"Weapon Group","value":"twohanded"},"qualities":{"type":"String","label":"Qualities","value":"Hack, Slow"},"flaws":{"type":"String","label":"Flaws","value":""},"special":{"type":"String","label":"Special","value":""},"equipped":false,"source":{"type":"String","label":"Source"}},"sort":500000,"flags":{"_sheetTab":"details"},"img":"systems/wfrp4e/icons/equipment/weapons/great-axe-flaw.png","_id":"koVifdGICXhPZ3c1"} diff --git a/packs/pl/forien-armoury.forien-armoury.json b/packs/pl/forien-armoury.forien-armoury.json index 2b9eb2e..51f5655 100644 --- a/packs/pl/forien-armoury.forien-armoury.json +++ b/packs/pl/forien-armoury.forien-armoury.json @@ -429,7 +429,7 @@ "id": "Morgenstern", "name": "Morgensztern", "description": "

Knightly Weapon

", - "qualities": "Pierce,Pummel", + "qualities": "Penetrating, Pummel", "flaws": "", "special": "" }, diff --git a/packs/templates/forien-armoury.forien-armoury.json b/packs/templates/forien-armoury.forien-armoury.json index fca31cf..f863bdb 100644 --- a/packs/templates/forien-armoury.forien-armoury.json +++ b/packs/templates/forien-armoury.forien-armoury.json @@ -429,7 +429,7 @@ "id": "Morgenstern", "name": "Morgenstern", "description": "

Knightly Weapon

", - "qualities": "Pierce,Pummel", + "qualities": "Penetrating, Pummel", "flaws": "", "special": "" }, diff --git a/scripts/arrows-reclamation.js b/scripts/arrows-reclamation.js index 5730bf4..a2fb236 100644 --- a/scripts/arrows-reclamation.js +++ b/scripts/arrows-reclamation.js @@ -28,7 +28,9 @@ ForienArmoury.ArrowReclamation = class ArrowReclamation { ammoReplenish[actorId] = actorData; // set (overwrite) flag with updated data - game.combat.setFlag('forien-armoury', 'ammoReplenish', ammoReplenish); + game.combat.unsetFlag('forien-armoury', 'ammoReplenish').then(() => { + game.combat.setFlag('forien-armoury', 'ammoReplenish', ammoReplenish); + }); } /** @@ -40,15 +42,18 @@ ForienArmoury.ArrowReclamation = class ArrowReclamation { * @param userId * @param bulk */ - static replenishAmmo(actorId, ammoId, quantity, userId, bulk = false) { - let actor = game.actors.find(a => a._id === actorId); - let ammoEntity = duplicate(actor.getEmbeddedEntity("OwnedItem", ammoId)); - - ammoEntity.data.quantity.value += quantity; - actor.updateEmbeddedEntity("OwnedItem", {_id: ammoId, "data.quantity.value": ammoEntity.data.quantity.value}); - - if (bulk) - this.notifyAmmoReturned(actor, ammoEntity, userId, quantity); + static replenishAmmo(actorId, ammoId, quantity, userId, bulk = false, ) { + let timeout = bulk ? 0 : 300; + setTimeout(() => { + let actor = game.actors.find(a => a._id === actorId); + let ammoEntity = duplicate(actor.getEmbeddedEntity("OwnedItem", ammoId)); + + ammoEntity.data.quantity.value += quantity; + actor.updateEmbeddedEntity("OwnedItem", {_id: ammoId, "data.quantity.value": ammoEntity.data.quantity.value}); + + if (bulk) + this.notifyAmmoReturned(actor, ammoEntity, userId, quantity); + }, timeout); } /** @@ -130,7 +135,7 @@ ForienArmoury.ArrowReclamation = class ArrowReclamation { // define chat messages type = game.i18n.localize("FArmoury." + type); - // let messageNow = game.i18n.format("FArmoury.recovered", {type}); + let messageNow = game.i18n.format("FArmoury.recovered", {type}); let messageFuture = game.i18n.format("FArmoury.recoveredFuture", {type}); @@ -148,9 +153,9 @@ ForienArmoury.ArrowReclamation = class ArrowReclamation { if (recovered === true) { if (game.combat == null) { - return; // broken at the moment - // message = messageNow; - // ForienArmoury.ArrowReclamation.replenishAmmo(actorId, ammoId, 1); + // return; // broken at the moment + message = messageNow; + ForienArmoury.ArrowReclamation.replenishAmmo(actorId, ammoId, 1); } else { message = messageFuture; if (game.user.isGM) { @@ -307,7 +312,6 @@ ForienArmoury.ArrowReclamation = class ArrowReclamation { if (data.winner === "defender") return; - console.log(data); let target = canvas.tokens.get(data.speakerDefend.token); let armor = target.actor.prepareItems().AP; let hitLocation = data.hitloc.value; diff --git a/scripts/utils.js b/scripts/utils.js index 7eceddb..7230d79 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -7,7 +7,6 @@ ForienArmoury.Utils = class { else objData = {...arrData}; - console.log(arrData, objData); return game.i18n.format(stringId, objData); }); }