Merge pull request #37593 from RarkGrames/Melee.json-sorting

Melee.json sorting

data/json/items/melee/fake.json

@@ -0,0 +1,34 @@
+[
+  {
+    "type": "GENERIC",
+    "id": "bio_claws_weapon",
+    "name": "bionic claws",
+    "name_plural": "bionic claws",
+    "description": "Short and sharp claws made from a high-tech metal.",
+    "to_hit": 4,
+    "color": "light_gray",
+    "symbol": "{",
+    "material": [ "superalloy" ],
+    "volume": "500 ml",
+    "bashing": 8,
+    "cutting": 16,
+    "flags": [ "STAB", "UNARMED_WEAPON", "NO_UNWIELD", "UNBREAKABLE_MELEE", "TRADER_AVOID" ],
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 12 ] ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "bio_blade_weapon",
+    "name": "monomolecular blade",
+    "description": "A foot-long blade made from high-tech alloy and edged with bonded nanocrystals.",
+    "weight": "100 g",
+    "to_hit": 3,
+    "color": "dark_gray",
+    "symbol": "{",
+    "material": [ "superalloy" ],
+    "techniques": [ "WBLOCK_2" ],
+    "volume": "750 ml",
+    "cutting": 36,
+    "flags": [ "UNARMED_WEAPON", "NO_UNWIELD", "UNBREAKABLE_MELEE", "TRADER_AVOID" ],
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 22 ] ]
+  }
+]

data/json/items/melee/misc.json

@@ -0,0 +1,61 @@
+[
+  {
+    "id": "bullwhip",
+    "type": "GENERIC",
+    "symbol": "/",
+    "color": "brown",
+    "name": "bullwhip",
+    "description": "A long strip of braided leather with a handle on one end.  Originally developed to settle disagreements with cattle, it's better used now for flaying the rotten flesh off of walking corpses.  Great for when a problem comes along.",
+    "weight": "3460 g",
+    "volume": "2 L",
+    "price": 3500,
+    "material": [ "leather" ],
+    "flags": [ "REACH_ATTACK", "REACH3", "WHIP" ],
+    "cutting": 3,
+    "category": "weapons"
+  },
+  {
+    "id": "lobotomizer",
+    "type": "TOOL",
+    "name": "lobotomizer",
+    "description": "This is a hand-forged collapsible tool that has two axe heads and sharp shovel-like tip on one end.  It can be used as a shovel, or you could chop some zombies with it instead.",
+    "weight": "2722 g",
+    "volume": "1750 ml",
+    "price": 25000,
+    "to_hit": -3,
+    "bashing": 13,
+    "cutting": 26,
+    "material": [ "steel" ],
+    "symbol": "/",
+    "color": "dark_gray",
+    "qualities": [ [ "DIG", 2 ], [ "AXE", 1 ], [ "CUT", 1 ], [ "BUTCHER", -11 ], [ "COOK", 1 ] ],
+    "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
+    "flags": [ "NEEDS_UNFOLD", "BELT_CLIP", "SHEATH_AXE" ]
+  },
+  {
+    "id": "tazer",
+    "type": "TOOL",
+    "category": "weapons",
+    "name": "tazer",
+    "description": "This is a high-powered stun gun.  Use this item to attempt to electrocute an adjacent enemy, damaging and temporarily paralyzing them.  Because the shock can actually jump through the air, it is difficult to miss.",
+    "weight": "151 g",
+    "volume": "250 ml",
+    "price": 14000,
+    "to_hit": -1,
+    "bashing": 6,
+    "//": "Yes, this is smaller than it's magazine well. Go with it.",
+    "material": [ "plastic", "aluminum" ],
+    "symbol": ";",
+    "color": "dark_gray",
+    "ammo": "battery",
+    "charges_per_use": 100,
+    "use_action": "TAZER",
+    "magazines": [
+      [
+        "battery",
+        [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
+      ]
+    ],
+    "magazine_well": 2
+  }
+]

data/json/items/melee/spears_and_polearms.json

@@ -1,4 +1,23 @@
 [
+  {
+    "type": "GENERIC",
+    "id": "pitchfork",
+    "name": "pitchfork",
+    "category": "tools",
+    "description": "An agricultural tool with long wooden shaft and four spikes.  Is used to lift hay.",
+    "weight": "1000 g",
+    "to_hit": 1,
+    "color": "brown",
+    "symbol": "/",
+    "material": [ "steel", "wood" ],
+    "techniques": [ "WBLOCK_1", "DEF_DISARM" ],
+    "volume": "1750 ml",
+    "bashing": 5,
+    "cutting": 18,
+    "qualities": [ [ "COOK", 1 ] ],
+    "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ],
+    "price": 2000
+  },
   {
     "type": "GENERIC",
     "id": "pointy_stick",

data/json/items/melee/unarmed_weapons.json

@@ -0,0 +1,110 @@
+[
+  {
+    "type": "GENERIC",
+    "id": "bagh_nakha",
+    "name": "tiger claws",
+    "name_plural": "tiger claws",
+    "description": "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon from India designed to be concealed under and against the palm.",
+    "weight": "92 g",
+    "to_hit": 3,
+    "color": "dark_gray",
+    "symbol": "{",
+    "material": [ "steel" ],
+    "bashing": 1,
+    "cutting": 6,
+    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE" ],
+    "price": 20000,
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 14 ] ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "cestus",
+    "symbol": "3",
+    "color": "light_gray",
+    "name": "cestus",
+    "name_plural": "cestuses",
+    "description": "A leather hand and arm wrap incorporating metal plates over the knuckles to improve punching power and defence.",
+    "material": [ "leather", "steel" ],
+    "volume": "100 ml",
+    "weight": "300 g",
+    "bashing": 2,
+    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "NONCONDUCTIVE" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "knuckle_brass",
+    "symbol": "3",
+    "color": "yellow",
+    "name": "pair of brass knuckles",
+    "name_plural": "pairs of brass knuckles",
+    "category": "weapons",
+    "description": "A metal weapon made of brass, designed to be gripped in the palm and cause punches to do extra damage.  A good, quick weapon - but you have to get within punching range to use it.",
+    "material": "brass",
+    "weight": "320 g",
+    "bashing": 6,
+    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "knuckle_katar",
+    "symbol": "!",
+    "color": "dark_gray",
+    "name": "razorbar katar",
+    "description": "Five pieces of rebar sharpened to cruel points and strapped to a brace fastened at wrist and forearm on both arms.  The next bub better watch out.",
+    "material": "steel",
+    "volume": "500 ml",
+    "weight": "1150 g",
+    "cutting": 16,
+    "to_hit": 2,
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
+    "flags": [ "UNARMED_WEAPON" ],
+    "techniques": [ "WBLOCK_1" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "knuckle_nail",
+    "symbol": "]",
+    "color": "brown",
+    "name": "pair of nail knuckles",
+    "name_plural": "pairs of nail knuckles",
+    "description": "A pair of knuckles consisting of two small squares of wood with several nails coming through them.  Useful in nasty street fights.",
+    "material": "wood",
+    "volume": "250 ml",
+    "weight": "430 g",
+    "bashing": 4,
+    "cutting": 6,
+    "flags": [ "UNARMED_WEAPON" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "knuckle_steel",
+    "symbol": "3",
+    "color": "dark_gray",
+    "name": "pair of steel knuckles",
+    "name_plural": "pairs of steel knuckles",
+    "description": "A mass of scrap metal crudely beat into shape, with folded rags underneath to protect the wearers knuckles.  A good, quick weapon - but you have to get within punching range to use it.",
+    "material": "steel",
+    "volume": "250 ml",
+    "weight": "430 g",
+    "bashing": 8,
+    "qualities": [ [ "HAMMER", 1 ] ],
+    "flags": [ "UNARMED_WEAPON" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "punch_dagger",
+    "name": "punch dagger",
+    "description": "A short and sharp double edged dagger made to be gripped in the palm, with the blade protruding between the fingers.",
+    "weight": "168 g",
+    "to_hit": 2,
+    "color": "dark_gray",
+    "symbol": "{",
+    "material": [ "steel" ],
+    "volume": "250 ml",
+    "bashing": 2,
+    "cutting": 10,
+    "flags": [ "STAB", "UNARMED_WEAPON", "DURABLE_MELEE", "SHEATH_KNIFE" ],
+    "price": 10000,
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 14 ] ]
+  }
+]

data/json/items/ranged/throwing.json

@@ -0,0 +1,51 @@
+[
+  {
+    "id": "bolas",
+    "type": "AMMO",
+    "category": "weapons",
+    "name": "bolas",
+    "name_plural": "bolases",
+    "description": "Some ropes with weights, designed to tangle the legs of a target when thrown, usually at an animal.  Used by the Gauchos of Argentina.",
+    "weight": "400 g",
+    "volume": "750 ml",
+    "price": 600,
+    "material": [ "cotton", "stone" ],
+    "symbol": ";",
+    "color": "blue",
+    "to_hit": -1,
+    "ammo_type": "thrown",
+    "flags": [ "NOGIB", "TANGLE", "PRIMITIVE_RANGED_WEAPON" ]
+  },
+  {
+    "id": "net",
+    "type": "AMMO",
+    "category": "weapons",
+    "name": "net",
+    "description": "A mesh of string and weights, traditionally used to catch fish, and to entangle opponents in combat.",
+    "weight": "1100 g",
+    "volume": "1500 ml",
+    "price": 650,
+    "material": [ "cotton", "stone" ],
+    "symbol": "H",
+    "color": "white",
+    "to_hit": -2,
+    "ammo_type": "thrown",
+    "flags": [ "NOGIB", "TANGLE", "PRIMITIVE_RANGED_WEAPON" ]
+  },
+  {
+    "id": "throwing_stick",
+    "type": "AMMO",
+    "category": "weapons",
+    "name": "throwing stick",
+    "description": "A stick carved into a shape suitable for throwing at a target.  Not a boomerang, so don't expect it to return to your hand.",
+    "weight": "574 g",
+    "volume": "500 ml",
+    "price": 200,
+    "bashing": 5,
+    "material": "wood",
+    "symbol": ";",
+    "color": "brown",
+    "ammo_type": "thrown",
+    "flags": [ "NOGIB" ]
+  }
+]