summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2023-03-31 12:13:36 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2023-03-31 12:13:36 -0700
commit3dfb4cdfbaf30c3824f7eaf370105bc137f1b743 (patch)
tree1e4517bcc786e83cae27bf3ae98d1e5c0c7fe21e
parentBackport some of the optimizations and bugfixes from my work porting to DDA. (diff)
downloadcataclysm-bn-mod_vampire-stuff-redone-3dfb4cdfbaf30c3824f7eaf370105bc137f1b743.tar.xz
Convert to weapon categories.
Add custom category for vampiric weapons.
-rw-r--r--vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json5
-rw-r--r--vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json6
-rw-r--r--vamp_stuff/Modification_Files/Items/Weapons/weapons_categories.json8
-rw-r--r--vamp_stuff/Modification_Files/Spells/Misc/v_spell_item.json1
4 files changed, 20 insertions, 0 deletions
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
index 60d4c43..bfad68e 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
@@ -3,6 +3,7 @@
"//": "Bloodrune upgrade add 2 cutting and 1 bashing damage, and its ultimate techniques are learned for that weapon (if available)",
"id": "sword_sip",
"type": "GENERIC",
+ "weapon_category": [ "2H_SWORDS", "MEDIEVAL_SWORDS", "VAMPIRE_WEAPONS" ],
"name": { "str": "blood sipper", "str_pl": "blood sippers" },
"description": "A large, dual-handed, heavily serrated sword. The blade retracts into a horizontal closed maw when not in use.",
"weight": "3150 g",
@@ -36,6 +37,7 @@
{
"id": "sword_dive",
"type": "GENERIC",
+ "weapon_category": [ "KNIVES", "VAMPIRE_WEAPONS" ],
"name": { "str": "blood diver", "str_pl": "blood divers" },
"description": "A small, serrated dagger. Its handle is made for quick precise cuts, and the light weight of this weapon makes it versatile to use. The blade is also great for skinning, but it was made for combat.",
"weight": "475 g",
@@ -69,6 +71,7 @@
{
"id": "punchie_bitie",
"type": "GENERIC",
+ "weapon_category": [ "FIST_WEAPONS", "VAMPIRE_WEAPONS" ],
"name": { "str": "pair of knuckle biters", "str_pl": "pairs of Knuckle Biters" },
"description": "A pair of knuckles designed to imitate a jaw with heavily arranged metal teeth. Every successful impact will cause it to bite into its prey.",
"weight": "850 g",
@@ -99,6 +102,7 @@
{
"id": "hammerius",
"type": "GENERIC",
+ "weapon_category": [ "2H_HAMMERS", "VAMPIRE_WEAPONS" ],
"name": { "str": "hammerius", "str_pl": "hammeriuses" },
"description": "A huge, fearsome battle hammer. Its flattened surface has symmetrical holes, concealing teeth that deploy just before impact.",
"weight": "4520 g",
@@ -130,6 +134,7 @@
{
"id": "falc_crimsword",
"type": "GENERIC",
+ "weapon_category": [ "1H_SWORDS", "MEDIEVAL_SWORDS", "VAMPIRE_WEAPONS" ],
"name": { "str": "fanged falchion" },
"description": "A longsword with peculiar hilt and forked tip mimicking a pair of fangs.",
"weight": "2680 g",
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
index ab40a41..3a50c40 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
@@ -2,6 +2,7 @@
{
"id": "invy_bow",
"type": "GUN",
+ "weapon_category": [ "BOWS", "ELASTIC", "VAMPIRE_WEAPONS" ],
"symbol": "{",
"price": 0,
"price_postapoc": 0,
@@ -29,6 +30,7 @@
{
"id": "b11_striker",
"type": "GUN",
+ "weapon_category": [ "SHOTGUNS", "AUTOLOADING", "VAMPIRE_WEAPONS" ],
"symbol": "(",
"color": "red",
"name": { "str": "blood striker" },
@@ -66,6 +68,7 @@
{
"id": "blood_slinger",
"type": "GUN",
+ "weapon_category": [ "PISTOLS", "AUTOLOADING", "VAMPIRE_WEAPONS" ],
"symbol": "(",
"color": "red",
"name": { "str": "blood slinger" },
@@ -102,6 +105,7 @@
{
"id": "blood_stinger",
"type": "GUN",
+ "weapon_category": [ "RIFLES", "AUTOLOADING", "VAMPIRE_WEAPONS" ],
"symbol": "(",
"color": "red",
"name": { "str": "blood stinger" },
@@ -142,6 +146,7 @@
{
"id": "blood_stream_shooter",
"type": "GUN",
+ "weapon_category": [ "MACHINE_GUNS", "AUTOLOADING", "VAMPIRE_WEAPONS" ],
"symbol": "(",
"color": "red",
"name": { "str": "blood stream shooter" },
@@ -178,6 +183,7 @@
{
"id": "blood_sprayer",
"type": "GUN",
+ "weapon_category": [ "SUBMACHINE_GUNS", "AUTOLOADING", "VAMPIRE_WEAPONS" ],
"symbol": "(",
"color": "red",
"name": { "str": "blood sprayer" },
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/weapons_categories.json b/vamp_stuff/Modification_Files/Items/Weapons/weapons_categories.json
new file mode 100644
index 0000000..d2b5d85
--- /dev/null
+++ b/vamp_stuff/Modification_Files/Items/Weapons/weapons_categories.json
@@ -0,0 +1,8 @@
+[
+ {
+ "type": "weapon_category",
+ "id": "VAMPIRE_WEAPONS",
+ "name": "Vampiric Weapons",
+ "//": "Weapons invented by Vampires."
+ }
+]
diff --git a/vamp_stuff/Modification_Files/Spells/Misc/v_spell_item.json b/vamp_stuff/Modification_Files/Spells/Misc/v_spell_item.json
index 4860bef..f13f1e1 100644
--- a/vamp_stuff/Modification_Files/Spells/Misc/v_spell_item.json
+++ b/vamp_stuff/Modification_Files/Spells/Misc/v_spell_item.json
@@ -3,6 +3,7 @@
"id": "v_hemo_whip",
"type": "GENERIC",
"category": "weapons",
+ "weapon_category": [ "1H_SWORDS", "MEDIEVAL_SWORDS", "VAMPIRE_WEAPONS" ],
"name": { "str": "blood sword" },
"description": "A vicious dire broadsword that serves its creator with an unbreakable loyalty. It pulses with life and radiates a faint, black aura.",
"weight": "2110 g",