Backport some of the optimizations and bugfixes from my work porting to DDA.

1 files changed, 28 insertions, 52 deletions

diff --git a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
index f2a7575..60d4c43 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
@@ -8,8 +8,8 @@
     "weight": "3150 g",
     "volume": "4 L",
     "symbol": "!",
-    "price": "2470 USD",
-    "price_postapoc": "780 USD",
+    "price": 247000,
+    "price_postapoc": 78000,
     "to_hit": 1,
     "bashing": 11,
     "cutting": 33,
@@ -21,21 +21,16 @@
   },
   {
     "id": "sword_sipplus",
+    "copy-from": "sword_sip",
     "type": "GENERIC",
     "name": { "str": "blood sipper+", "str_pl": "blood sippers+" },
     "description": "A large, dual-handed, heavily serrated sword, textured in red hue. The blade retracts into a horizontal closed maw when not in use.",
     "weight": "3300 g",
-    "volume": "4 L",
-    "symbol": "!",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "to_hit": 1,
+    "price": 0,
+    "price_postapoc": 0,
     "bashing": 12,
     "cutting": 35,
     "material": [ "steel", "compactblood" ],
-    "color": "red",
-    "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
-    "flags": [ "SHEATH_SWORD", "DURABLE_MELEE", "ALWAYS_TWOHAND" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 22 ] ]
   },
   {
@@ -46,8 +41,8 @@
     "weight": "475 g",
     "volume": "250 ml",
     "symbol": "f",
-    "price": "1905 USD",
-    "price_postapoc": "490 USD",
+    "price": 190500,
+    "price_postapoc": 49000,
     "to_hit": 2,
     "cutting": 14,
     "bashing": 2,
@@ -59,21 +54,16 @@
   },
   {
     "id": "sword_diveplus",
+    "copy-from": "sword_dive",
     "type": "GENERIC",
     "name": { "str": "blood diver+", "str_pl": "blood divers+" },
     "description": "A small, serrated dagger, textured in red hue. 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": "725 g",
-    "volume": "250 ml",
-    "symbol": "f",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "to_hit": 2,
+    "price": 0,
+    "price_postapoc": 0,
     "cutting": 16,
     "bashing": 3,
     "material": [ "steel", "compactblood" ],
-    "color": "red",
-    "techniques": [ "RAPID" ],
-    "flags": [ "SHEATH_KNIFE", "DURABLE_MELEE", "STAB" ],
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 37 ] ]
   },
   {
@@ -84,8 +74,8 @@
     "weight": "850 g",
     "volume": "500 ml",
     "symbol": "f",
-    "price": "1665 USD",
-    "price_postapoc": "585 USD",
+    "price": 166500,
+    "price_postapoc": 58500,
     "to_hit": 2,
     "cutting": 8,
     "bashing": 4,
@@ -95,20 +85,16 @@
   },
   {
     "id": "punchie_bitieplus",
+    "copy-from": "punchie_bitie",
     "type": "GENERIC",
     "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, textured in red hue. Every successful impact will cause it to bite into its prey.",
     "weight": "1000 g",
-    "volume": "500 ml",
-    "symbol": "f",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "to_hit": 2,
+    "price": 0,
+    "price_postapoc": 0,
     "cutting": 10,
     "bashing": 5,
-    "material": [ "steel", "compactblood" ],
-    "color": "red",
-    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "STAB" ]
+    "material": [ "steel", "compactblood" ]
   },
   {
     "id": "hammerius",
@@ -118,8 +104,8 @@
     "weight": "4520 g",
     "volume": "5 L",
     "symbol": "T",
-    "price": "3105 USD",
-    "price_postapoc": "1035 USD",
+    "price": 310500,
+    "price_postapoc": 103500,
     "to_hit": 1,
     "bashing": 30,
     "cutting": 12,
@@ -130,21 +116,16 @@
   },
   {
     "id": "hammeriusplus",
+    "copy-from": "hammerius",
     "type": "GENERIC",
     "name": { "str": "hammerius+", "str_pl": "hammeriuses+" },
     "description": "A huge, fearsome battle hammer, textured in red hue. Its flattened surface has symmetrical holes, concealing teeth that deploy just before impact.",
     "weight": "3705 g",
-    "volume": "5 L",
-    "symbol": "T",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "to_hit": 1,
+    "price": 0,
+    "price_postapoc": 0,
     "bashing": 31,
     "cutting": 14,
-    "material": [ "steel", "compactblood" ],
-    "color": "red",
-    "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
-    "flags": [ "STAB", "DURABLE_MELEE", "ALWAYS_TWOHAND" ]
+    "material": [ "steel", "compactblood" ]
   },
   {
     "id": "falc_crimsword",
@@ -154,8 +135,8 @@
     "weight": "2680 g",
     "volume": "3 L",
     "symbol": "!",
-    "price": "20500 USD",
-    "price_postapoc": "780 USD",
+    "price": 2050000,
+    "price_postapoc": 78000,
     "to_hit": 2,
     "bashing": 4,
     "cutting": 24,
@@ -167,21 +148,16 @@
   },
   {
     "id": "falc_crimswordplus",
+    "copy-from": "falc_crimsword",
     "type": "GENERIC",
     "name": { "str": "fanged falchion+", "str_pl": "fanged falchions+" },
     "description": "A longsword hued in crimson with peculiar hilt and forked tip mimicking a pair of fangs.",
     "weight": "2785 g",
-    "volume": "3 L",
-    "symbol": "!",
-    "price_postapoc": "0 cent",
-    "price": "0 cent",
-    "to_hit": 2,
+    "price": 0,
+    "price_postapoc": 0,
     "bashing": 5,
     "cutting": 26,
-    "material": [ "steel" ],
-    "color": "red",
-    "techniques": [ "WBLOCK_2" ],
-    "flags": [ "SHEATH_SWORD", "DURABLE_MELEE" ],
+    "material": [ "steel", "compactblood" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 22 ] ]
   }
 ]