more survivor stuff update

Author: TheGoatGod

data/Unleash_The_Mods/mods/More_Survivor_Stuff/items/armor.json

@@ -35,7 +35,7 @@
     "price": "200 USD",
     "price_postapoc": "200 USD",
     "to_hit": -1,
-    "bashing": 1,
+    "melee_damage": { "bash": 1 },
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
     "looks_like": "boots",
@@ -60,7 +60,7 @@
     "price": "450 USD",
     "price_postapoc": "40 USD",
     "to_hit": -1,
-    "bashing": 7,
+    "melee_damage": { "bash": 7 },
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
     "looks_like": "helmet_army",
@@ -115,7 +115,7 @@
     "price": "580 USD",
     "price_postapoc": "20 USD",
     "to_hit": -1,
-    "bashing": 6,
+    "melee_damage": { "bash": 6 },
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
     "looks_like": "hood_lsurvivor",
@@ -193,7 +193,7 @@
     "price": "260 USD",
     "price_postapoc": "260 USD",
     "to_hit": -1,
-    "bashing": 2,
+    "melee_damage": { "bash": 2 },
     "material": [ "kevlar", "steel" ],
     "symbol": "[",
     "looks_like": "boots_hsurvivor",
@@ -218,7 +218,7 @@
     "price": "600 USD",
     "price_postapoc": "120 USD",
     "to_hit": -2,
-    "bashing": 12,
+    "melee_damage": { "bash": 12 },
     "material": [ "kevlar", "steel" ],
     "symbol": "[",
     "looks_like": "helmet_survivor",
@@ -274,7 +274,7 @@
     "price": "580 USD",
     "price_postapoc": "60 USD",
     "to_hit": -1,
-    "bashing": 10,
+    "melee_damage": { "bash": 10 },
     "material": [ "kevlar", "steel", "leather" ],
     "symbol": "[",
     "looks_like": "hood_survivor",
@@ -300,7 +300,7 @@
     "price": "2500 USD",
     "price_postapoc": "500 USD",
     "to_hit": -3,
-    "bashing": 8,
+    "melee_damage": { "bash": 8 },
     "material": [ "steel", "kevlar", "leather" ],
     "symbol": "[",
     "looks_like": "hsurvivor_suit",
@@ -375,7 +375,7 @@
     "price": "400 USD",
     "price_postapoc": "40 USD",
     "to_hit": -2,
-    "bashing": 7,
+    "melee_damage": { "bash": 7 },
     "material": [ "steel", "leather" ],
     "symbol": "[",
     "looks_like": "fire_gauntlets",
@@ -400,7 +400,7 @@
     "price": "500 USD",
     "price_postapoc": "70 USD",
     "to_hit": -2,
-    "bashing": 7,
+    "melee_damage": { "bash": 7 },
     "material": [ "steel", "leather" ],
     "symbol": "[",
     "looks_like": "boots_steel",
@@ -424,7 +424,7 @@
     "longest_side": "50 cm",
     "price": "400 USD",
     "price_postapoc": "120 USD",
-    "bashing": 10,
+    "melee_damage": { "bash": 10 },
     "material": [ "steel", "leather" ],
     "symbol": "[",
     "looks_like": "helmet_barbute",
@@ -450,7 +450,7 @@
     "price": "7800 USD",
     "price_postapoc": "100 USD",
     "to_hit": -5,
-    "bashing": 8,
+    "melee_damage": { "bash": 8 },
     "material": [ "steel", "leather" ],
     "symbol": "[",
     "looks_like": "armor_lightplate",

data/Unleash_The_Mods/mods/More_Survivor_Stuff/items/books.json

@@ -9,7 +9,7 @@
     "longest_side": "15 cm",
     "price": "45 USD",
     "price_postapoc": "10 USD",
-    "bashing": 5,
+    "melee_damage": { "bash": 5 },
     "material": [ "paper" ],
     "symbol": "?",
     "color": "red",
@@ -30,7 +30,7 @@
     "longest_side": "10 cm",
     "price": "45 USD",
     "price_postapoc": "3 USD",
-    "bashing": 3,
+    "melee_damage": { "bash": 3 },
     "material": [ "paper" ],
     "symbol": "?",
     "color": "white",
@@ -51,7 +51,7 @@
     "longest_side": "10 cm",
     "price": "45 USD",
     "price_postapoc": "7 USD",
-    "bashing": 3,
+    "melee_damage": { "bash": 3 },
     "material": [ "paper" ],
     "symbol": "?",
     "color": "white",

data/Unleash_The_Mods/mods/More_Survivor_Stuff/items/gun.json

@@ -10,7 +10,7 @@
     "longest_side": "110 cm",
     "price": "750 USD",
     "to_hit": -1,
-    "bashing": 13,
+    "melee_damage": { "bash": 13 },
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -57,7 +57,7 @@
     "longest_side": "30 cm",
     "price": "300 USD",
     "to_hit": -2,
-    "bashing": 14,
+    "melee_damage": { "bash": 14 },
     "material": [ "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -96,7 +96,7 @@
     "price": "9 kUSD",
     "price_postapoc": "90 USD",
     "to_hit": -1,
-    "bashing": 12,
+    "melee_damage": { "bash": 12 },
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",

data/Unleash_The_Mods/mods/More_Survivor_Stuff/items/gunmod.json

@@ -10,8 +10,7 @@
     "price": "30 USD",
     "install_time": "30 m",
     "to_hit": -1,
-    "bashing": 15,
-    "cutting": 9,
+    "melee_damage": { "bash": 15, "cut": 9 },
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",

data/Unleash_The_Mods/mods/More_Survivor_Stuff/items/items.json

@@ -10,7 +10,7 @@
     "price": "4 kUSD",
     "price_postapoc": "200 USD",
     "to_hit": -5,
-    "bashing": 8,
+    "melee_damage": { "bash": 8 },
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "light_gray",
@@ -38,7 +38,7 @@
     "price": "400 USD",
     "price_postapoc": "100 USD",
     "to_hit": -5,
-    "bashing": 8,
+    "melee_damage": { "bash": 8 },
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "light_gray",

data/Unleash_The_Mods/mods/More_Survivor_Stuff/items/melee.json

@@ -13,8 +13,7 @@
     "techniques": [ "WBLOCK_2", "BRUTAL" ],
     "volume": "1000 ml",
     "longest_side": "100 cm",
-    "bashing": 65,
-    "cutting": 12,
+    "melee_damage": { "bash": 65, "cut": 12 },
     "price": "1100 USD",
     "qualities": [ [ "HAMMER", 1 ] ]
   },
@@ -32,8 +31,7 @@
     "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
     "volume": "1500 ml",
     "longest_side": "170 cm",
-    "bashing": 45,
-    "cutting": 45,
+    "melee_damage": { "bash": 45, "cut": 45 },
     "price": "1300 USD",
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 1 ] ]
   },
@@ -51,8 +49,7 @@
     "techniques": [ "WBLOCK_2", "BRUTAL" ],
     "volume": "2500 ml",
     "longest_side": "80 cm",
-    "bashing": 63,
-    "cutting": 4,
+    "melee_damage": { "bash": 63, "cut": 4 },
     "price": "1 kUSD",
     "qualities": [ [ "HAMMER", 1 ] ]
   },
@@ -67,8 +64,7 @@
     "volume": "500 ml",
     "longest_side": "10 cm",
     "weight": "890 g",
-    "bashing": 15,
-    "cutting": 1,
+    "melee_damage": { "bash": 15, "cut": 1 },
     "price_postapoc": "5 USD",
     "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "NONCONDUCTIVE" ],
     "techniques": [ "WBLOCK_1" ],