From f557fb489b87cb5e173aa775a50f9b5db0fbedf0 Mon Sep 17 00:00:00 2001 From: Anton Burmistrov Date: Tue, 1 Aug 2023 21:25:59 +0400 Subject: [PATCH] New item categories for martial arts manuals and traps (#67345) * Added separate item category for martial arts manuals * Added separate item category for traps --- data/json/item_category.json | 14 ++++++++++++++ data/json/items/book/abstract.json | 2 +- data/json/items/tool/traps.json | 12 ++++++++++++ data/json/loot_zones.json | 14 ++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/data/json/item_category.json b/data/json/item_category.json index 9681fa4992b17..eca3d897fdf58 100644 --- a/data/json/item_category.json +++ b/data/json/item_category.json @@ -133,6 +133,20 @@ "zone": "LOOT_SEEDS", "sort_rank": -7 }, + { + "id": "ma_manuals", + "type": "ITEM_CATEGORY", + "name": { "str": "MARTIAL ARTS MANUALS" }, + "zone": "LOOT_MA_MANUALS", + "sort_rank": -6 + }, + { + "id": "traps", + "type": "ITEM_CATEGORY", + "name": { "str": "TRAPS" }, + "zone": "LOOT_TRAPS", + "sort_rank": -5 + }, { "id": "chems", "type": "ITEM_CATEGORY", diff --git a/data/json/items/book/abstract.json b/data/json/items/book/abstract.json index 51e6a8cfb4adf..fd31bc91dcba5 100644 --- a/data/json/items/book/abstract.json +++ b/data/json/items/book/abstract.json @@ -355,7 +355,7 @@ { "abstract": "book_martial", "type": "BOOK", - "category": "manuals", + "category": "ma_manuals", "name": { "str": "martial art manual" }, "weight": "150 g", "volume": "250 ml", diff --git a/data/json/items/tool/traps.json b/data/json/items/tool/traps.json index 5fbb0d4ba3d97..0c4865c3bf3c2 100644 --- a/data/json/items/tool/traps.json +++ b/data/json/items/tool/traps.json @@ -3,6 +3,7 @@ "id": "beartrap", "type": "TOOL", "name": { "str": "bear trap" }, + "category": "traps", "description": "A spring-loaded pair of steel jaws connected to a sensitive pressure plate. Use it to set it on the ground, creating a trap that will ensnare and damage anything that steps on it. If you are carrying a shovel, you will have the option of burying it.", "weight": "14000 g", "volume": "1500 ml", @@ -29,6 +30,7 @@ "id": "light_snare_kit", "type": "TOOL", "name": "light snare kit", + "category": "traps", "description": "A simple loop snare, comprising a carefully wound loop of string, two anchor points, and a tool to hammer them in. It is suitable for immobilizing only small animals. It has no means of harming its target, as live meat lasts longer.", "weight": "2500 g", "volume": "3150 ml", @@ -51,6 +53,7 @@ "id": "blade_trap", "type": "TOOL", "name": { "str": "blade trap" }, + "category": "traps", "description": "A machete attached laterally to a motor, with a tripwire controlling its throttle. When the tripwire is pulled, the blade is swung around with great force. The trap forms a 3x3 area of effect.", "weight": "10142 g", "volume": "9500 ml", @@ -75,6 +78,7 @@ "id": "board_trap", "type": "TOOL", "name": { "str": "nailboard trap" }, + "category": "traps", "description": "Several pieces of wood nailed together, with some nails sticking straight up. If an unsuspecting victim steps on it, they'll get nails through the foot.", "weight": "3917 g", "volume": "3750 ml", @@ -100,6 +104,7 @@ "id": "boobytrap", "type": "TOOL", "name": { "str": "booby trap" }, + "category": "traps", "description": "A crude explosive device triggered by a piece of string. Use it to set it up and wait for some poor bastard to trigger it.", "weight": "586 g", "volume": "750 ml", @@ -122,6 +127,7 @@ "id": "bubblewrap", "type": "TOOL", "name": { "str": "bubble wrap" }, + "category": "traps", "description": "A sheet of plastic covered with air-filled bubbles. Use it to set it on the ground, creating a trap that will warn you with noise when something steps on it.", "weight": "6 g", "volume": "250 ml", @@ -144,6 +150,7 @@ "id": "caltrops", "type": "TOOL", "name": { "str_sp": "loose caltrops" }, + "category": "traps", "description": "A handful of small metal objects covered with many sharp points. If an unsuspecting victim steps on one, they'll get a spine through the foot.", "weight": "264 g", "volume": "250 ml", @@ -167,6 +174,7 @@ "id": "caltrops_glass", "type": "TOOL", "name": { "str_sp": "loose glass caltrops" }, + "category": "traps", "description": "A handful of glass shards glued together to expose all their sharp edges. If an unsuspecting victim steps on one, they'll get cut.", "weight": "264 g", "volume": "500 ml", @@ -190,6 +198,7 @@ "id": "crossbow_trap", "type": "TOOL", "name": { "str": "crossbow trap" }, + "category": "traps", "description": "A simple tripwire attached to the trigger of a loaded crossbow. When the tripwire is pulled, the crossbow fires. Only a single bolt can be used, after which the trap is disabled.", "weight": "1772 g", "volume": "1750 ml", @@ -213,6 +222,7 @@ "id": "landmine", "type": "TOOL", "name": { "str": "land mine" }, + "category": "traps", "description": "A military anti-personnel fragmentation mine that is triggered when stepped on.", "weight": "2360 g", "volume": "500 ml", @@ -238,6 +248,7 @@ "id": "shotgun_trap", "type": "TOOL", "name": { "str": "shotgun trap" }, + "category": "traps", "description": "A simple tripwire attached to the trigger of a loaded double slam-fire shotgun. When the tripwire is pulled, the shotgun fires. Two shells are loaded; the first time the trigger is pulled, one or both shells may be discharged.", "weight": "2922 g", "volume": "1750 ml", @@ -261,6 +272,7 @@ "id": "tripwire", "type": "TOOL", "name": { "str": "tripwire trap" }, + "category": "traps", "description": "A length of thin string with some affixing tools on either end. It must be placed across a doorway or other thin passage to function. Its purpose is to trip up trespassers, causing them to stumble and possibly hurt themselves slightly.", "weight": "40 g", "volume": "250 ml", diff --git a/data/json/loot_zones.json b/data/json/loot_zones.json index 3b59a661c009c..33c51ff42e826 100644 --- a/data/json/loot_zones.json +++ b/data/json/loot_zones.json @@ -111,6 +111,20 @@ "can_be_personal": true, "description": "Destination for instructional books and magazines." }, + { + "id": "LOOT_MA_MANUALS", + "type": "LOOT_ZONE", + "name": "Loot: Martial arts manuals", + "can_be_personal": true, + "description": "Destination for manuals for martial arts." + }, + { + "id": "LOOT_TRAPS", + "type": "LOOT_ZONE", + "name": "Loot: Traps", + "can_be_personal": true, + "description": "Destination for traps." + }, { "id": "LOOT_MODS", "type": "LOOT_ZONE",