Merge pull request #916 from Muttley/657_consume-ammo

657 consume ammo
Muttley · Oct 18, 2024 · 179f9e6 · 179f9e6
2 parents 19f15db + d2d012a
commit 179f9e6
Show file tree

Hide file tree

Showing 162 changed files with 422 additions and 123 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,8 @@
 # vX.X.X
 
+## Enhancements
+* [#657] Consume Ammunition When Attacking With Ranged Weapons if Required
+
 ## Chores
 * [#911] Replaced compendium art mapping with default Foundry method.
 

diff --git a/data/packs/gear.db/armor__np4FRJ73NRBEQKnS.json b/data/packs/gear.db/armor__np4FRJ73NRBEQKnS.json
@@ -2,6 +2,7 @@
 	"_id": "np4FRJ73NRBEQKnS",
 	"_key": "!folders!np4FRJ73NRBEQKnS",
 	"color": "#22252b",
+	"description": "",
 	"folder": null,
 	"name": "Armor",
 	"sorting": "a",

diff --git a/data/packs/gear.db/arrows__XXwA9ZWajYEDmcea.json b/data/packs/gear.db/arrows__XXwA9ZWajYEDmcea.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Ammunition for shortbows or longbows.</p>",
 		"equipped": false,
+		"isAmmunition": true,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/backpack__oSnfz4qcWlUL6cDZ.json b/data/packs/gear.db/backpack__oSnfz4qcWlUL6cDZ.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Holds all the gear you can carry. Don't lose it.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/basic_gear__0ws7y8D3IktigkiB.json b/data/packs/gear.db/basic_gear__0ws7y8D3IktigkiB.json
@@ -2,6 +2,7 @@
 	"_id": "0ws7y8D3IktigkiB",
 	"_key": "!folders!0ws7y8D3IktigkiB",
 	"color": "#22252b",
+	"description": "",
 	"folder": null,
 	"name": "Basic Gear",
 	"sorting": "a",

diff --git a/data/packs/gear.db/bastard_sword__1T8oUkfkBtYTLNF3.json b/data/packs/gear.db/bastard_sword__1T8oUkfkBtYTLNF3.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/swords/sword-hilt-steel-green.webp",
 	"name": "Bastard Sword",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/blowgun__FkcwP4cmpdM5pcOm.json b/data/packs/gear.db/blowgun__FkcwP4cmpdM5pcOm.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/thrown/dart-feathered.webp",
 	"name": "Blowgun",
 	"system": {
+		"ammoClass": "",
 		"baseWeapon": "",
 		"bonuses": {
 			"attackBonus": 0,

diff --git a/data/packs/gear.db/bolas__iMu2tHuqGfJ7XjsS.json b/data/packs/gear.db/bolas__iMu2tHuqGfJ7XjsS.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/thrown/bolas-steel.webp",
 	"name": "Bolas",
 	"system": {
+		"ammoClass": "",
 		"baseWeapon": "",
 		"bonuses": {
 			"attackBonus": 0,

diff --git a/data/packs/gear.db/bottle__bGrhQMkhE2qwjL4j.json b/data/packs/gear.db/bottle__bGrhQMkhE2qwjL4j.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Glass containers that hold one draught of liquid.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/caltrops__SzpjMuJrhF5nMJ7H.json b/data/packs/gear.db/caltrops__SzpjMuJrhF5nMJ7H.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Tiny, triangle-shaped iron spikes. Living creatures who step on caltrops take 1 damage and can only move at half speed for 10 rounds.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/club__JM2XN855QYNhgtre.json b/data/packs/gear.db/club__JM2XN855QYNhgtre.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/clubs/club-banded-steel.webp",
 	"name": "Club",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/crawling_kit__fJHwwn6TEfbdr8CM.json b/data/packs/gear.db/crawling_kit__fJHwwn6TEfbdr8CM.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>A crawling kit costs 7 gp. It uses 7 gear slots and contains the following items.</p><p></p><ul><li><p>@UUID[Compendium.shadowdark.gear.oSnfz4qcWlUL6cDZ]{Backpack}</p></li><li><p>@UUID[Compendium.shadowdark.gear.ERprfuTIFRFEix9G]{Flint and Steel}</p></li><li><p>2x @UUID[Compendium.shadowdark.gear.z3xc7HGysC4ZCU8e]{Torch}</p></li><li><p>@UUID[Compendium.shadowdark.gear.EPndk3DPOEOSvbga]{Iron Spikes}</p></li><li><p>@UUID[Compendium.shadowdark.gear.GX6OmWQiE7MzTmjX]{Rations}</p></li><li><p>@UUID[Compendium.shadowdark.gear.fqsLWV46NWH0L53l]{Grappling Hook}</p></li><li><p>@UUID[Compendium.shadowdark.gear.6ZRwVHFlh5QiyZWC]{Rope, 60'}</p></li></ul>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/crossbow__eeVEJexfirwWzOVu.json b/data/packs/gear.db/crossbow__eeVEJexfirwWzOVu.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/crossbows/crossbow-purple.webp",
 	"name": "Crossbow",
 	"system": {
+		"ammoClass": "crossbow-bolts",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/crossbow_bolts__iv8fMPiRYfsN8ICy.json b/data/packs/gear.db/crossbow_bolts__iv8fMPiRYfsN8ICy.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Ammunition for crossbows.</p>",
 		"equipped": false,
+		"isAmmunition": true,
 		"isPhysical": true,
 		"light": {
 			"active": false,
@@ -26,6 +27,7 @@
 			"template": "torch"
 		},
 		"magicItem": false,
+		"predefinedEffects": "",
 		"quantity": 20,
 		"scroll": false,
 		"slots": {

diff --git a/data/packs/gear.db/crowbar__GbO6CggW71qMkgrG.json b/data/packs/gear.db/crowbar__GbO6CggW71qMkgrG.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Grants advantage on checks to pry open stuck objects.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/dagger__C3mc5OlKPSJNMrng.json b/data/packs/gear.db/dagger__C3mc5OlKPSJNMrng.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/daggers/dagger-jeweled-purple.webp",
 	"name": "Dagger",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/flask__W2fFimb0y85wmOMb.json b/data/packs/gear.db/flask__W2fFimb0y85wmOMb.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Glass containers that hold one draught of liquid.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/flint_and_steel__ERprfuTIFRFEix9G.json b/data/packs/gear.db/flint_and_steel__ERprfuTIFRFEix9G.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>A small fire starter. With it, routine attempts to light a fire always succeed.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/grappling_hook__fqsLWV46NWH0L53l.json b/data/packs/gear.db/grappling_hook__fqsLWV46NWH0L53l.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>A rope anchor with three, curved tines.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/greataxe__9Pnhl6SOsbf6qDmt.json b/data/packs/gear.db/greataxe__9Pnhl6SOsbf6qDmt.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/axes/axe-broad-engraved-chipped-blue.webp",
 	"name": "Greataxe",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/greatsword__eqUuf9OGupuGPsBM.json b/data/packs/gear.db/greatsword__eqUuf9OGupuGPsBM.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/swords/greatsword-crossguard-flanged-purple.webp",
 	"name": "Greatsword",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/handaxe__3DxwBvjceq0FxcsC.json b/data/packs/gear.db/handaxe__3DxwBvjceq0FxcsC.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/axes/axe-broad-purple.webp",
 	"name": "Handaxe",
 	"system": {
+		"ammoClass": "",
 		"baseWeapon": "",
 		"bonuses": {
 			"attackBonus": 0,

diff --git a/data/packs/gear.db/herbal_remedies__iHOSxtXRWKd2vx1U.json b/data/packs/gear.db/herbal_remedies__iHOSxtXRWKd2vx1U.json
@@ -2,6 +2,7 @@
 	"_id": "iHOSxtXRWKd2vx1U",
 	"_key": "!folders!iHOSxtXRWKd2vx1U",
 	"color": "#22252b",
+	"description": "",
 	"folder": null,
 	"name": "Herbal Remedies",
 	"sorting": "a",

diff --git a/data/packs/gear.db/holy_symbol__uS2iSw8NLx8V0jb7.json b/data/packs/gear.db/holy_symbol__uS2iSw8NLx8V0jb7.json
@@ -16,6 +16,7 @@
 		},
 		"description": "",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/iron_spikes__EPndk3DPOEOSvbga.json b/data/packs/gear.db/iron_spikes__EPndk3DPOEOSvbga.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Strong spikes. Each has a hole for threading</p><p>rope. Can be hammered in with weapons or other iron spikes.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/javelin__B3ZPeUtbChN8lrDm.json b/data/packs/gear.db/javelin__B3ZPeUtbChN8lrDm.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/polearms/javelin.webp",
 	"name": "Javelin",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/lantern__lCWOUkVp4N1geMRt.json b/data/packs/gear.db/lantern__lCWOUkVp4N1geMRt.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Casts light up to a double near distance (see Light, pg. 46). Requires oil. Has a shutter to hide the light.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/light_spell__PkQXG3AaHNMVwGTc.json b/data/packs/gear.db/light_spell__PkQXG3AaHNMVwGTc.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Dummy item that acts like a light source cast by the @UUID[Compendium.shadowdark.spells.N4v17mtxJlVBbgpn]{Light} spell.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/light_spell__double_range___BBDG7QpHOFXG6sKe.json b/data/packs/gear.db/light_spell__double_range___BBDG7QpHOFXG6sKe.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Dummy item that acts like a light source cast by the double range @UUID[Compendium.shadowdark.spells.N4v17mtxJlVBbgpn]{Light} spell.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/light_spell__double_time___rjNBToTJCYLLdVcT.json b/data/packs/gear.db/light_spell__double_time___rjNBToTJCYLLdVcT.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Dummy item that acts like a light source cast by the @UUID[Compendium.shadowdark.spells.N4v17mtxJlVBbgpn]{Light} spell.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/longbow__GzA5T0aewhouRsa3.json b/data/packs/gear.db/longbow__GzA5T0aewhouRsa3.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/bows/longbow-leather-green.webp",
 	"name": "Longbow",
 	"system": {
+		"ammoClass": "arrows",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/longsword__ZPUhNMmwXXrtbCXi.json b/data/packs/gear.db/longsword__ZPUhNMmwXXrtbCXi.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/swords/sword-guard.webp",
 	"name": "Longsword",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/mace__jGZyVuFJnW7QcBFX.json b/data/packs/gear.db/mace__jGZyVuFJnW7QcBFX.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/maces/mace-round-ornate-purple.webp",
 	"name": "Mace",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/mirror__GUqtnSXkcytZnNiO.json b/data/packs/gear.db/mirror__GUqtnSXkcytZnNiO.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>A small, polished mirror.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/morningstar__BThyJ1NC6JcRXxeX.json b/data/packs/gear.db/morningstar__BThyJ1NC6JcRXxeX.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/clubs/club-barbed-skull.webp",
 	"name": "Morningstar",
 	"system": {
+		"ammoClass": "",
 		"baseWeapon": "",
 		"bonuses": {
 			"attackBonus": 0,

diff --git a/data/packs/gear.db/oil__flask__80bCpXdZcj0Cz1fE.json b/data/packs/gear.db/oil__flask__80bCpXdZcj0Cz1fE.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Fuels a lantern for one hour of real time. One flask covers a close area and burns for 4 rounds, dealing 1d4 damage each round.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/pike__4nmzFv43ua8nZDS7.json b/data/packs/gear.db/pike__4nmzFv43ua8nZDS7.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/polearms/pike-flared-brown.webp",
 	"name": "Pike",
 	"system": {
+		"ammoClass": "",
 		"baseWeapon": "",
 		"bonuses": {
 			"attackBonus": 0,

diff --git a/data/packs/gear.db/pole__15X5GTX96y339EKY.json b/data/packs/gear.db/pole__15X5GTX96y339EKY.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Wooden, 10' long.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/rations__GX6OmWQiE7MzTmjX.json b/data/packs/gear.db/rations__GX6OmWQiE7MzTmjX.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>One day of food and water supply for one person.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/razor_chain__LW3MgxeOaEPPaiY2.json b/data/packs/gear.db/razor_chain__LW3MgxeOaEPPaiY2.json
@@ -7,6 +7,7 @@
 	"img": "icons/tools/fasteners/chain-hook-grey.webp",
 	"name": "Razor Chain",
 	"system": {
+		"ammoClass": "",
 		"baseWeapon": "",
 		"bonuses": {
 			"attackBonus": 0,

diff --git a/data/packs/gear.db/rope__60___6ZRwVHFlh5QiyZWC.json b/data/packs/gear.db/rope__60___6ZRwVHFlh5QiyZWC.json
@@ -16,6 +16,7 @@
 		},
 		"description": "<p>Hemp, 60’ long.</p>",
 		"equipped": false,
+		"isAmmunition": false,
 		"isPhysical": true,
 		"light": {
 			"active": false,

diff --git a/data/packs/gear.db/scimitar__DKBDkJ3LcRv8scLv.json b/data/packs/gear.db/scimitar__DKBDkJ3LcRv8scLv.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/swords/scimitar-guard-gold.webp",
 	"name": "Scimitar",
 	"system": {
+		"ammoClass": "",
 		"baseWeapon": "",
 		"bonuses": {
 			"attackBonus": 0,

diff --git a/data/packs/gear.db/shortbow__UfHAWj5weH111Bea.json b/data/packs/gear.db/shortbow__UfHAWj5weH111Bea.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/bows/shortbow-recurve-blue.webp",
 	"name": "Shortbow",
 	"system": {
+		"ammoClass": "arrows",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/shortsword__KQTWQwznjK80gVEU.json b/data/packs/gear.db/shortsword__KQTWQwznjK80gVEU.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/swords/shortsword-guard-worn.webp",
 	"name": "Shortsword",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/shuriken__sDHZZx1xaCRPmhXY.json b/data/packs/gear.db/shuriken__sDHZZx1xaCRPmhXY.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/thrown/shuriken-blue.webp",
 	"name": "Shuriken",
 	"system": {
+		"ammoClass": "",
 		"baseWeapon": "",
 		"bonuses": {
 			"attackBonus": 0,

diff --git a/data/packs/gear.db/sling__FWgFPQDKkBiTMYhd.json b/data/packs/gear.db/sling__FWgFPQDKkBiTMYhd.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/slings/slingshot-wood.webp",
 	"name": "Sling",
 	"system": {
+		"ammoClass": "",
 		"baseWeapon": "",
 		"bonuses": {
 			"attackBonus": 0,

diff --git a/data/packs/gear.db/spear__brIFMH0sOVmqX02N.json b/data/packs/gear.db/spear__brIFMH0sOVmqX02N.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/polearms/spear-hooked-double.webp",
 	"name": "Spear",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {

diff --git a/data/packs/gear.db/staff__9eTpsuEuzL3Vaxge.json b/data/packs/gear.db/staff__9eTpsuEuzL3Vaxge.json
@@ -7,6 +7,7 @@
 	"img": "icons/weapons/staves/staff-ornate-purple.webp",
 	"name": "Staff",
 	"system": {
+		"ammoClass": "",
 		"attackBonus": 0,
 		"baseWeapon": "",
 		"bonuses": {