diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/blaze_override.json b/data/Legacy_mods/mods/blazemod/Blazemod/blaze_override.json deleted file mode 100644 index a182e1c54..000000000 --- a/data/Legacy_mods/mods/blazemod/Blazemod/blaze_override.json +++ /dev/null @@ -1,123 +0,0 @@ -[ - { - "id": "flamethrower", - "copy-from": "flamethrower", - "type": "vehicle_part", - "name": { "str": "manual flamethrower" }, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "auto_m1918", - "copy-from": "mounted_m1918", - "type": "vehicle_part", - "name": { "str": "BAR turret" }, - "color": "brown", - "size": 40, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "am249", - "copy-from": "m249", - "type": "vehicle_part", - "name": { "str": "M249 turret" }, - "size": 40, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "aplasma_gun", - "copy-from": "plasma_gun", - "type": "vehicle_part", - "name": { "str": "plasma turret" }, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "afusion_gun", - "copy-from": "turret", - "type": "vehicle_part", - "name": { "str": "mounted fusion turret" }, - "size": 10, - "item": "ftk93", - "categories": [ "warfare" ], - "color": "magenta", - "broken_color": "magenta", - "breaks_into": [ { "item": "ftk93", "prob": 50 } ], - "requirements": { - "install": { "skills": [ [ "mechanics", 6 ], [ "electronics", 6 ] ], "time": "100 s" }, - "removal": { "skills": [ [ "mechanics", 4 ] ] } - }, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "am2browning", - "copy-from": "mounted_browning", - "type": "vehicle_part", - "name": { "str": "M2 Browning turret" }, - "size": 40, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "auto_m240", - "copy-from": "mounted_m240", - "type": "vehicle_part", - "name": { "str": "M240 turret" }, - "size": 40, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "auto_m60", - "copy-from": "mounted_m60", - "type": "vehicle_part", - "name": { "str": "M60 turret" }, - "size": 40, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "auto_abzats", - "copy-from": "mounted_bigun", - "type": "vehicle_part", - "name": { "str": "auto-shotgun turret" }, - "size": 40, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "auto_m134", - "copy-from": "mounted_m134", - "type": "vehicle_part", - "name": { "str": "M134D-H Minigun turret" }, - "size": 40, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "auto_mk19", - "copy-from": "mounted_mk19", - "type": "vehicle_part", - "name": { "str": "Mark 19 turret" }, - "size": 40, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "auto_rm614", - "copy-from": "mounted_rm614", - "type": "vehicle_part", - "name": { "str": "RM614 turret" }, - "broken_color": "light_gray", - "size": 40, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "auto_rm298", - "copy-from": "mounted_rm298", - "type": "vehicle_part", - "name": { "str": "RM298 turret" }, - "broken_color": "light_gray", - "size": 40, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - }, - { - "id": "awatercannon", - "copy-from": "watercannon", - "type": "vehicle_part", - "name": { "str": "water cannon turret" }, - "variants": [ { "symbols": "t", "symbols_broken": "#" } ] - } -] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/blob_construction.json b/data/Legacy_mods/mods/blazemod/Blazemod/blob_construction.json index 8cf2c83ce..9cb657af8 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/blob_construction.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/blob_construction.json @@ -41,7 +41,7 @@ "sound_fail": "squish!", "items": [ { "item": "bfeed", "count": [ 250, 500 ] } ] }, - "flags": [ "WALL", "TRANSPARENT", "EASY_DECONSTRUCT" ] + "flags": [ "WALL", "TRANSPARENT" ] }, { "id": "blob_pit_slime", @@ -59,6 +59,6 @@ "sound_fail": "squish!", "items": [ { "item": "bfeed", "count": [ 50, 250 ] } ] }, - "flags": [ "WALL", "TRANSPARENT", "EASY_DECONSTRUCT" ] + "flags": [ "WALL", "TRANSPARENT" ] } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/flags.json b/data/Legacy_mods/mods/blazemod/Blazemod/flags.json index 5abed44c3..bd69e9de8 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/flags.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/flags.json @@ -10,5 +10,17 @@ { "id": "TURRET", "type": "json_flag" + }, + { + "id": "NON-FOULING", + "type": "json_flag" + }, + { + "id": "FOLDABLE", + "type": "json_flag" + }, + { + "id": "OVER", + "type": "json_flag" } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/blaze_ammo.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/blaze_ammo.json index 11fe22263..3e8a26a4f 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/blaze_ammo.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/blaze_ammo.json @@ -3,7 +3,6 @@ "abstract": "canbomb_generic", "type": "AMMO", "name": { "str": "IED" }, - "bashing": 8, "material": [ "iron" ], "symbol": "*", "color": "red", @@ -89,7 +88,6 @@ "weight": "3816 g", "volume": "250 ml", "price": "1800 USD", - "bashing": 8, "material": [ "plastic" ], "symbol": "*", "color": "green", @@ -108,7 +106,6 @@ "weight": "1455 g", "volume": "2500 ml", "price": "10 USD", - "bashing": 5, "material": [ "wood" ], "symbol": "=", "color": "brown", @@ -122,7 +119,6 @@ "type": "AMMO", "name": { "str": "IED rigged bolt" }, "volume": "250 ml", - "bashing": 8, "material": [ "iron" ], "symbol": "*", "color": "red", @@ -190,7 +186,6 @@ "weight": "2055 g", "volume": "1250 ml", "price": "20 USD", - "bashing": 1, "material": [ "wood", "iron" ], "symbol": "=", "color": "green", @@ -208,7 +203,6 @@ "weight": "3816 g", "volume": "250 ml", "price": "1800 USD", - "bashing": 8, "material": [ "plastic" ], "symbol": "*", "color": "green", @@ -227,7 +221,6 @@ "weight": "1555 g", "volume": "1250 ml", "price": "10 USD", - "bashing": 1, "material": [ "wood" ], "symbol": "=", "color": "green", @@ -246,7 +239,6 @@ "volume": "250 ml", "price": "2 USD", "to_hit": -3, - "bashing": 8, "material": [ "steel" ], "symbol": "*", "color": "blue", @@ -264,7 +256,6 @@ "weight": "1255 g", "volume": "250 ml", "price": "2 USD", - "bashing": 1, "material": [ "steel" ], "symbol": "=", "color": "green", @@ -282,7 +273,6 @@ "weight": "1 g", "volume": "250 ml", "price": "0 cent", - "bashing": 1, "material": [ "iron" ], "symbol": "=", "color": "blue", diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/diamond_ammo.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/diamond_ammo.json index afd035c0a..6b35cbb1d 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/diamond_ammo.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/diamond_ammo.json @@ -15,7 +15,6 @@ "weight": "3 g", "volume": "250 ml", "price": "100 USD", - "bashing": 1, "material": [ "diamond" ], "symbol": "=", "color": "white", diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/fusion.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/fusion.json index 0ec3f90c7..1414a2e46 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/fusion.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/fusion.json @@ -28,7 +28,6 @@ "material": [ "plastic" ], "volume": "250 ml", "weight": "68 g", - "bashing": 1, "ammo_type": "fusion", "damage": { "damage_type": "stab", "amount": 11, "armor_penetration": 14 }, "range": 30, diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/metal_rail.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/metal_rail.json new file mode 100644 index 000000000..cfe56d38e --- /dev/null +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/metal_rail.json @@ -0,0 +1,41 @@ +[ + { + "id": "rebar_rail", + "type": "AMMO", + "name": { "str": "rebar rail" }, + "description": "A short piece of ferromagnetic rebar which has been straightened and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.", + "weight": "236 g", + "longest_side": "16 cm", + "volume": "300 ml", + "price": 1000, + "price_postapoc": 250, + "to_hit": -1, + "material": [ "steel" ], + "symbol": "=", + "color": "light_gray", + "count": 10, + "ammo_type": "metal_rail", + "range": 40, + "damage": { "damage_type": "stab", "amount": 70, "armor_penetration": 25 }, + "dispersion": 150, + "effects": [ "RECYCLED", "NON_FOULING" ], + "melee_damage": { "bash": 5, "cut": 1 } + }, + { + "id": "steel_rail", + "copy-from": "rebar_rail", + "type": "AMMO", + "name": { "str": "steel rail" }, + "description": "A short piece of steel which has been forged true and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.", + "weight": "212 g", + "volume": "270 ml", + "price": 1500, + "price_postapoc": 500, + "material": [ "steel" ], + "color": "light_gray", + "dispersion": 0, + "effects": [ "NEVER_MISFIRES", "NON_FOULING" ], + "relative": { "range": 10, "damage": { "damage_type": "stab", "amount": -5, "armor_penetration": 15 } }, + "melee_damage": { "bash": 4, "cut": 2 } + } +] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/vortex_ammo.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/vortex_ammo.json index b929aab3b..6705934ab 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/vortex_ammo.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/vortex_ammo.json @@ -7,7 +7,6 @@ "description": "Seeing this is a bug.", "weight": "3 g", "volume": "3 ml", - "bashing": 1, "phase": "solid", "material": [ "vpower" ], "flags": [ "PSEUDO", "PERPETUAL" ], diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo_types.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo_types.json new file mode 100644 index 000000000..ae315b2b2 --- /dev/null +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/ammo_types.json @@ -0,0 +1,8 @@ +[ + { + "type": "ammunition_type", + "id": "metal_rail", + "name": "ferrous rail projectile", + "default": "rebar_rail" + } +] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/Guns.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/Guns.json index 9b5f69ef5..db5295088 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/Guns.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/Guns.json @@ -7,7 +7,6 @@ "name": { "str": "nail rifle" }, "description": "This is a nailgun that has been extensively modified with the addition of a short barrel, stock and hand guard. It can be reloaded using detachable magazines and is an overall much more effective weapon.", "to_hit": -1, - "bashing": 12, "price_postapoc": 750, "skill": "rifle", "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], @@ -32,7 +31,8 @@ "max_contains_weight": "20 kg", "item_restriction": [ "nailmag" ] } - ] + ], + "melee_damage": { "bash": 12 } }, { "id": "rebar_rifle", @@ -46,7 +46,6 @@ "price": 550000, "price_postapoc": 6000, "to_hit": -3, - "bashing": 10, "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", @@ -55,7 +54,6 @@ "dispersion": 90, "durability": 6, "clip_size": 1, - "ups_charges": 40, "reload": 200, "valid_mod_locations": [ [ "emitter", 1 ], @@ -67,7 +65,9 @@ [ "underbarrel mount", 1 ] ], "ammo_effects": [ "INCENDIARY", "TRAIL" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "metal_rail": 1 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "metal_rail": 1 } } ], + "flags": [ "USE_UPS" ], + "melee_damage": { "bash": 10 } }, { "id": "tihar", @@ -86,7 +86,6 @@ "ammo": [ "pebble" ], "weight": "4211 g", "volume": "2750 ml", - "bashing": 8, "to_hit": -1, "ranged_damage": { "damage_type": "stab", "amount": 15 }, "range": 15, @@ -106,7 +105,8 @@ [ "rail mount", 1 ], [ "underbarrel mount", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 15 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 15 } } ], + "melee_damage": { "bash": 8 } }, { "id": "helsing", @@ -125,7 +125,6 @@ "ammo": [ "bolt" ], "weight": "3110 g", "volume": "3 L", - "bashing": 12, "to_hit": -1, "ranged_damage": { "damage_type": "stab", "amount": 5 }, "range": 20, @@ -144,7 +143,8 @@ [ "rail mount", 1 ], [ "underbarrel mount", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "bolt": 8 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "bolt": 8 } } ], + "melee_damage": { "bash": 12 } }, { "id": "ftk93", @@ -157,13 +157,11 @@ "price": 980000, "material": [ "steel", "plastic" ], "ammo_effects": [ "PLASMA", "EXPLOSIVE", "FLAME" ], - "flags": [ "NEVER_JAMS" ], - "ups_charges": 5, + "flags": [ "NEVER_JAMS", "USE_UPS" ], "skill": "rifle", "ammo": [ "fusion" ], "weight": "2267 g", "volume": "3500 ml", - "bashing": 10, "to_hit": -1, "ranged_damage": { "damage_type": "stab", "amount": 40 }, "dispersion": 30, @@ -180,7 +178,8 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "fusion": 2 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "fusion": 2 } } ], + "melee_damage": { "bash": 10 } }, { "id": "an94", @@ -195,7 +194,6 @@ "price": 420000, "price_postapoc": 4500, "to_hit": -1, - "bashing": 11, "material": [ "steel", "plastic" ], "symbol": "(", "color": "brown", @@ -227,7 +225,8 @@ "max_contains_weight": "20 kg", "item_restriction": [ "ak74mag", "rpk74mag" ] } - ] + ], + "melee_damage": { "bash": 11 } }, { "id": "flamethrower_simple", @@ -239,7 +238,6 @@ "volume": "5 L", "price": 20000, "to_hit": -1, - "bashing": 8, "material": [ "steel", "plastic" ], "range": 4, "dispersion": 600, @@ -247,13 +245,13 @@ "relative": { "reload": 2 }, "pocket_data": [ { + "magazine_well": "1196 ml", "pocket_type": "MAGAZINE_WELL", - "holster": true, - "max_contains_volume": "20 L", - "max_contains_weight": "20 kg", - "item_restriction": [ "aux_pressurized_tank", "pressurized_tank" ] + "rigid": false, + "item_restriction": [ "pressurized_tank", "pressurized_tank_modern" ] } - ] + ], + "melee_damage": { "bash": 8 } }, { "id": "heavy_rail_rifle", @@ -267,7 +265,6 @@ "price": 900000, "price_postapoc": 9000, "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", @@ -278,7 +275,6 @@ "dispersion": 100, "durability": 7, "clip_size": 10, - "ups_charges": 100, "reload": 200, "valid_mod_locations": [ [ "accessories", 4 ], @@ -291,8 +287,9 @@ [ "underbarrel", 1 ] ], "ammo_effects": [ "INCENDIARY", "TRAIL" ], - "flags": [ "RELOAD_ONE" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "metal_rail": 10 } } ] + "flags": [ "RELOAD_ONE", "USE_UPS" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "metal_rail": 10 } } ], + "melee_damage": { "bash": 12 } }, { "id": "survivor_special_700", @@ -330,7 +327,6 @@ "volume": "2 L", "price": 500000, "to_hit": -2, - "bashing": 5, "material": [ "steel", "plastic" ], "symbol": "(", "color": "magenta", @@ -340,7 +336,6 @@ "dispersion": 180, "durability": 4, "loudness": 7, - "ups_charges": 20, "reload": 300, "valid_mod_locations": [ [ "accessories", 2 ], @@ -353,7 +348,8 @@ [ "underbarrel mount", 1 ] ], "ammo_effects": [ "LASER", "INCENDIARY" ], - "flags": [ "NO_UNLOAD" ] + "flags": [ "NO_UNLOAD", "USE_UPS" ], + "melee_damage": { "bash": 5 } }, { "id": "acr", @@ -368,7 +364,6 @@ "price": 234300, "price_postapoc": 6000, "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", @@ -402,7 +397,8 @@ "survivor223mag" ] } - ] + ], + "melee_damage": { "bash": 12 } }, { "id": "h&k416a5", @@ -418,7 +414,6 @@ "price": 540000, "price_postapoc": 2250, "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", @@ -450,7 +445,8 @@ "survivor223mag" ] } - ] + ], + "melee_damage": { "bash": 12 } }, { "id": "m1014", @@ -465,7 +461,6 @@ "price": 169900, "price_postapoc": 3500, "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 345, @@ -484,7 +479,8 @@ [ "underbarrel mount", 1 ] ], "flags": [ "RELOAD_ONE", "NEEDS_UNFOLD" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 8 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 8 } } ], + "melee_damage": { "bash": 12 } }, { "id": "m27iar", @@ -527,14 +523,12 @@ "type": "GUN", "name": { "str": "M4A1" }, "description": "A popular carbine, long used by the US military. Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained.", - "ascii_picture": "m4a1", "weight": "2880 g", "volume": "3310 ml", "longest_side": "758 mm", "price": 240000, "price_postapoc": 5000, "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", @@ -566,7 +560,8 @@ "survivor223mag" ] } - ] + ], + "melee_damage": { "bash": 12 } }, { "id": "scar_l", @@ -582,7 +577,6 @@ "price": 280000, "price_postapoc": 6000, "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", @@ -614,6 +608,7 @@ "survivor223mag" ] } - ] + ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/blaze_weapons.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/blaze_weapons.json index 4735a81cb..b74ebd648 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/blaze_weapons.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/blaze_weapons.json @@ -9,7 +9,6 @@ "volume": "3750 ml", "price": "3500 USD", "to_hit": -3, - "bashing": 6, "material": [ "steel" ], "symbol": "(", "color": "dark_gray", @@ -31,7 +30,8 @@ "item_restriction": [ "bolt_hopper" ] } ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], + "melee_damage": { "bash": 6 } }, { "id": "cangun", @@ -43,7 +43,6 @@ "volume": "5500 ml", "price": "600 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", @@ -66,7 +65,8 @@ } ], "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ], + "melee_damage": { "bash": 12 } }, { "id": "cutter", @@ -78,7 +78,6 @@ "volume": "2 L", "price": "100 USD", "to_hit": -1, - "bashing": 10, "material": [ "steel", "wood" ], "symbol": "(", "color": "white", @@ -92,7 +91,8 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "holster": true, "rigid": true, "ammo_restriction": { "ripdisk": 5 } } ], "reload": 1250, "valid_mod_locations": [ ], - "flags": [ "MOUNTED_GUN", "NEVER_JAMS", "NON-FOULING" ] + "flags": [ "MOUNTED_GUN", "NEVER_JAMS", "NON-FOULING" ], + "melee_damage": { "bash": 10 } }, { "id": "gattler", @@ -104,7 +104,6 @@ "volume": "3750 ml", "price": "800 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", @@ -119,7 +118,8 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "holster": true, "rigid": true, "ammo_restriction": { "flintlock": 12 } } ], "reload": 750, "valid_mod_locations": [ ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], + "melee_damage": { "bash": 12 } }, { "id": "lasgun", @@ -131,7 +131,6 @@ "volume": "3 L", "price": "2700 USD", "to_hit": -1, - "bashing": 8, "material": [ "steel", "plastic" ], "symbol": "(", "color": "blue", @@ -140,10 +139,10 @@ "ranged_damage": { "damage_type": "heat", "amount": 150, "armor_penetration": 100 }, "sight_dispersion": 150, "durability": 8, - "ups_charges": 249, "valid_mod_locations": [ ], "ammo_effects": [ "LASER", "WIDE" ], - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "MOUNTED_GUN", "USE_UPS" ], + "melee_damage": { "bash": 8 } }, { "id": "lasgunp", @@ -155,7 +154,6 @@ "volume": "3 L", "price": "7500 USD", "to_hit": -1, - "bashing": 8, "material": [ "steel", "plastic" ], "symbol": "(", "color": "blue", @@ -165,10 +163,10 @@ "sight_dispersion": 150, "durability": 8, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], - "ups_charges": 29, "valid_mod_locations": [ ], "ammo_effects": [ "LASER", "WIDE" ], - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "MOUNTED_GUN", "USE_UPS" ], + "melee_damage": { "bash": 8 } }, { "id": "lasgunx", @@ -180,7 +178,6 @@ "volume": "4500 ml", "price": "7500 USD", "to_hit": -1, - "bashing": 8, "material": [ "steel", "plastic" ], "symbol": "(", "color": "magenta", @@ -189,10 +186,10 @@ "ranged_damage": { "damage_type": "heat", "amount": 200, "armor_penetration": 100 }, "sight_dispersion": 150, "durability": 8, - "ups_charges": 499, "valid_mod_locations": [ ], "ammo_effects": [ "EXPLOSIVE", "LASER", "WIDE" ], - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "MOUNTED_GUN", "NON-FOULING" ] + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "MOUNTED_GUN", "NON-FOULING", "USE_UPS" ], + "melee_damage": { "bash": 8 } }, { "id": "nailer", @@ -204,7 +201,6 @@ "volume": "2500 ml", "price": "500 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_blue", @@ -214,7 +210,6 @@ "ranged_damage": { "damage_type": "stab", "amount": 25, "armor_penetration": 30 }, "sight_dispersion": 150, "durability": 5, - "ups_charges": 9, "reload": 150, "valid_mod_locations": [ ], "pocket_data": [ @@ -227,7 +222,8 @@ "item_restriction": [ "nailmag" ] } ], - "flags": [ "MOUNTED_GUN", "NEVER_JAMS", "NON-FOULING" ] + "flags": [ "MOUNTED_GUN", "NEVER_JAMS", "NON-FOULING", "USE_UPS" ], + "melee_damage": { "bash": 12 } }, { "id": "needler", @@ -239,7 +235,6 @@ "volume": "3750 ml", "price": "1100 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", @@ -262,7 +257,8 @@ "item_restriction": [ "nailmag" ] } ], - "flags": [ "MOUNTED_GUN", "NEVER_JAMS" ] + "flags": [ "MOUNTED_GUN", "NEVER_JAMS" ], + "melee_damage": { "bash": 12 } }, { "id": "railturret", @@ -274,7 +270,6 @@ "volume": "4 L", "price": "5500 USD", "to_hit": -3, - "bashing": 10, "material": [ "steel", "wood" ], "symbol": "(", "color": "magenta", @@ -286,10 +281,10 @@ "durability": 6, "clip_size": 1, "pocket_data": [ { "pocket_type": "MAGAZINE", "holster": true, "rigid": true, "ammo_restriction": { "metal_rail": 1 } } ], - "ups_charges": 249, "reload": 200, "valid_mod_locations": [ ], - "ammo_effects": [ "FRAG", "TRAIL", "WIDE" ] + "ammo_effects": [ "FRAG", "TRAIL", "WIDE", "USE_UPS" ], + "melee_damage": { "bash": 10 } }, { "id": "ripper", @@ -301,7 +296,6 @@ "volume": "3750 ml", "price": "950 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel" ], "symbol": "(", "color": "dark_gray", @@ -317,7 +311,8 @@ "reload": 750, "valid_mod_locations": [ ], "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ], + "melee_damage": { "bash": 12 } }, { "id": "rslauncher", @@ -329,7 +324,6 @@ "volume": "4500 ml", "price": "2800 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", @@ -345,7 +339,8 @@ "reload": 2500, "valid_mod_locations": [ ], "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ], + "melee_damage": { "bash": 12 } }, { "id": "scorpion", @@ -357,7 +352,6 @@ "volume": "5 L", "price": "1500 USD", "to_hit": -1, - "bashing": 12, "material": [ "wood", "steel" ], "symbol": "(", "color": "dark_gray", @@ -372,7 +366,8 @@ "reload": 750, "valid_mod_locations": [ ], "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ], + "melee_damage": { "bash": 12 } }, { "id": "shardgun", @@ -384,7 +379,6 @@ "volume": "3500 ml", "price": "500 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_blue", @@ -396,7 +390,6 @@ "sight_dispersion": 150, "durability": 5, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 25 ] ], - "ups_charges": 1, "reload": 150, "valid_mod_locations": [ ], "pocket_data": [ @@ -409,7 +402,8 @@ "item_restriction": [ "bb_hopper" ] } ], - "flags": [ "MOUNTED_GUN", "NEVER_JAMS", "NON-FOULING" ] + "flags": [ "MOUNTED_GUN", "NEVER_JAMS", "NON-FOULING", "USE_UPS" ], + "melee_damage": { "bash": 12 } }, { "id": "slauncher", @@ -421,7 +415,6 @@ "volume": "4 L", "price": "1100 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", @@ -437,7 +430,8 @@ "reload": 750, "valid_mod_locations": [ ], "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ], + "melee_damage": { "bash": 12 } }, { "id": "teslagun", @@ -449,7 +443,6 @@ "volume": "3750 ml", "price": "2800 USD", "to_hit": -1, - "bashing": 8, "material": [ "steel", "plastic" ], "symbol": "(", "color": "blue", @@ -457,10 +450,10 @@ "range": 20, "ranged_damage": { "damage_type": "electric", "amount": 30, "armor_penetration": 10 }, "durability": 8, - "ups_charges": 249, "valid_mod_locations": [ ], "ammo_effects": [ "BOUNCE", "LIGHTNING" ], - "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "MOUNTED_GUN", "USE_UPS" ], + "melee_damage": { "bash": 8 } }, { "id": "tiharturret", @@ -472,7 +465,6 @@ "volume": "3750 ml", "price": "1550 USD", "to_hit": -3, - "bashing": 6, "material": [ "steel" ], "symbol": "(", "color": "light_gray", @@ -494,7 +486,8 @@ } ], "reload": 150, - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NON-FOULING" ], + "melee_damage": { "bash": 6 } }, { "id": "rifle_308", @@ -508,7 +501,6 @@ "volume": "2 L", "price": "100 USD", "to_hit": -1, - "bashing": 10, "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", @@ -542,7 +534,8 @@ "max_contains_weight": "20 kg", "item_restriction": [ "g3_makeshiftmag", "g3mag", "g3bigmag" ] } - ] + ], + "melee_damage": { "bash": 10 } }, { "id": "surv_carbine_223", @@ -556,7 +549,6 @@ "volume": "1500 ml", "price": "100 USD", "to_hit": -1, - "bashing": 6, "material": [ "steel", "wood" ], "symbol": "(", "color": "brown", @@ -602,6 +594,7 @@ "stanag150" ] } - ] + ], + "melee_damage": { "bash": 6 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/blob_turret.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/blob_turret.json index 541da4b2f..72388bbb5 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/blob_turret.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/blob_turret.json @@ -7,7 +7,6 @@ "weight": "18331 g", "volume": "5500 ml", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "blue", @@ -21,7 +20,8 @@ "clip_size": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "bfeed": 50 } } ], "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], + "melee_damage": { "bash": 10 } }, { "id": "clutter", @@ -31,7 +31,6 @@ "weight": "7252 g", "volume": "3 L", "to_hit": -5, - "bashing": 10, "material": [ "flesh", "bone" ], "symbol": "&", "color": "magenta", @@ -44,7 +43,8 @@ "durability": 10, "clip_size": 10, "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "bfeed": 10 } } ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], + "melee_damage": { "bash": 10 } }, { "id": "freezie", @@ -54,7 +54,6 @@ "weight": "21331 g", "volume": "4500 ml", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "light_blue", @@ -69,7 +68,8 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "water": 100 } } ], "ammo_effects": [ "WIDE" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD" ], - "ammo_to_fire": 20 + "ammo_to_fire": 20, + "melee_damage": { "bash": 10 } }, { "id": "fuzzle", @@ -79,7 +79,6 @@ "weight": "22331 g", "volume": "6500 ml", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "brown", @@ -93,7 +92,8 @@ "clip_size": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "bfeed": 50 } } ], "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], + "melee_damage": { "bash": 10 } }, { "id": "horror", @@ -103,7 +103,6 @@ "weight": "24331 g", "volume": "7500 ml", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "blue", @@ -117,7 +116,8 @@ "clip_size": 240, "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "bfeed": 240 } } ], "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], + "melee_damage": { "bash": 10 } }, { "id": "inkie", @@ -128,7 +128,6 @@ "weight": "15531 g", "volume": "4 L", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "brown", @@ -143,7 +142,8 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "gasoline": 250 } } ], "ammo_effects": [ "JET", "BEANBAG", "BLINDS_EYES", "RECOVER_100", "WIDE", "CUSTOM_EXPLOSION" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "ammo_to_fire": 20 + "ammo_to_fire": 20, + "melee_damage": { "bash": 10 } }, { "id": "meltie", @@ -153,7 +153,6 @@ "weight": "15553 g", "volume": "4500 ml", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "light_red", @@ -168,7 +167,8 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "water": 250 } } ], "ammo_effects": [ "JET", "ACID_BOMB", "WIDE" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "ammo_to_fire": 20 + "ammo_to_fire": 20, + "melee_damage": { "bash": 10 } }, { "id": "razorqueen", @@ -178,7 +178,6 @@ "weight": "24121 g", "volume": "6500 ml", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "cyan", @@ -193,7 +192,8 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "bfeed": 250 } } ], "ammo_effects": [ "FRAG", "WIDE" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "ammo_to_fire": 20 + "ammo_to_fire": 20, + "melee_damage": { "bash": 10 } }, { "id": "spouterqueen", @@ -203,7 +203,6 @@ "weight": "21331 g", "volume": "20 L", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "looks_like": "razorqueen", "symbol": ")", @@ -219,7 +218,8 @@ "ammo_effects": [ "WIDE", "ACT_ON_RANGED_HIT", "RECOVER_100", "NO_EMBED", "CUSTOM_EXPLOSION" ], "qualities": [ [ "JACK", 12 ] ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "ammo_to_fire": 100 + "ammo_to_fire": 100, + "melee_damage": { "bash": 10 } }, { "id": "sharp", @@ -229,7 +229,6 @@ "weight": "15103 g", "volume": "4 L", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "light_blue", @@ -242,7 +241,8 @@ "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], "clip_size": 36, "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "bfeed": 36 } } ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], + "melee_damage": { "bash": 10 } }, { "id": "gelrazor", @@ -252,7 +252,6 @@ "weight": "17121 g", "volume": "5500 ml", "to_hit": -5, - "bashing": 10, "material": [ "flesh", "bone" ], "symbol": "&", "color": "blue", @@ -265,7 +264,8 @@ "clip_size": 20, "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "bfeed": 20 } } ], "ammo_effects": [ "BOUNCE", "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], + "melee_damage": { "bash": 10 } }, { "id": "sparkie", @@ -275,7 +275,6 @@ "weight": "14321 g", "volume": "3750 ml", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "cyan", @@ -284,9 +283,9 @@ "ranged_damage": { "damage_type": "electric", "amount": 30 }, "sight_dispersion": 150, "durability": 10, - "ups_charges": 19, "ammo_effects": [ "LIGHTNING", "BEANBAG", "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "USE_UPS" ], + "melee_damage": { "bash": 10 } }, { "id": "stickie", @@ -296,7 +295,6 @@ "weight": "11331 g", "volume": "4500 ml", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "yellow", @@ -311,7 +309,8 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "water": 500 } } ], "ammo_effects": [ "JET", "BEANBAG", "WIDE" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "ammo_to_fire": 20 + "ammo_to_fire": 20, + "melee_damage": { "bash": 10 } }, { "id": "torchie", @@ -322,7 +321,6 @@ "weight": "16331 g", "volume": "4 L", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "light_red", @@ -338,7 +336,8 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "watertight": true, "ammo_restriction": { "gasoline": 180 } } ], "ammo_effects": [ "INCENDIARY", "FLARE", "WIDE", "STREAM" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "ammo_to_fire": 20 + "ammo_to_fire": 20, + "melee_damage": { "bash": 10 } }, { "id": "voideater", @@ -348,7 +347,6 @@ "weight": "17331 g", "volume": "5250 ml", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": "&", "color": "cyan", @@ -357,8 +355,8 @@ "ranged_damage": { "damage_type": "electric", "amount": 80 }, "sight_dispersion": 150, "durability": 10, - "ups_charges": 199, "ammo_effects": [ "LIGHTNING", "EXPLOSIVE", "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "USE_UPS" ], + "melee_damage": { "bash": 10 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/diamond_turret.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/diamond_turret.json index e137db228..dbdfd3fc2 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/diamond_turret.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/diamond_turret.json @@ -8,7 +8,6 @@ "volume": "5500 ml", "price": "600 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", @@ -23,7 +22,8 @@ "valid_mod_locations": [ ], "ammo_effects": [ "SHOT" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "charcoal": 50 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "charcoal": 50 } } ], + "melee_damage": { "bash": 12 } }, { "id": "diamondnova", @@ -35,7 +35,6 @@ "volume": "5500 ml", "price": "600 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", @@ -50,6 +49,7 @@ "valid_mod_locations": [ ], "ammo_effects": [ "SHOT", "FRAG", "FLASHBANG" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "charcoal": 50 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "charcoal": 50 } } ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/vortex_turret.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/vortex_turret.json index 278772451..74f653cf0 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/vortex_turret.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/guns/vortex_turret.json @@ -8,7 +8,6 @@ "volume": "2500 ml", "price": "600 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", @@ -24,7 +23,8 @@ "valid_mod_locations": [ ], "ammo_effects": [ "SHOT" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "BB": 250 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "BB": 250 } } ], + "melee_damage": { "bash": 12 } }, { "id": "vortexbolter", @@ -35,7 +35,6 @@ "volume": "2500 ml", "price": "900 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", @@ -52,7 +51,8 @@ "valid_mod_locations": [ ], "ammo_effects": [ "SHOT" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "bolt": 30 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "bolt": 30 } } ], + "melee_damage": { "bash": 12 } }, { "id": "vortexcannon", @@ -63,7 +63,6 @@ "volume": "5 L", "price": "600 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", @@ -78,7 +77,8 @@ "valid_mod_locations": [ ], "ammo_effects": [ "SHOT" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "metal_rail": 12 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "metal_rail": 12 } } ], + "melee_damage": { "bash": 12 } }, { "id": "vortexrifle", @@ -89,7 +89,6 @@ "volume": "2500 ml", "price": "900 USD", "to_hit": -1, - "bashing": 12, "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", @@ -106,6 +105,7 @@ "valid_mod_locations": [ ], "ammo_effects": [ "SHOT" ], "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "pebble": 250 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "pebble": 250 } } ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/tools/blob_tools.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/tools/blob_tools.json index 47745067a..6173420cb 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/tools/blob_tools.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/tools/blob_tools.json @@ -93,10 +93,10 @@ "volume": "5 L", "price": "5 USD", "to_hit": -3, - "bashing": 9, "material": [ "flesh" ], "symbol": "]", - "color": "light_blue" + "color": "light_blue", + "melee_damage": { "bash": 9 } }, { "id": "frostiegrow", diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/tools/vortex_tools.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/tools/vortex_tools.json index 2e3c0d81e..b976b99d9 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/tools/vortex_tools.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/tools/vortex_tools.json @@ -8,10 +8,10 @@ "weight": "62071 g", "volume": "56250 ml", "price": "15 kUSD", - "bashing": 4, "material": [ "steel" ], "symbol": ",", - "color": "magenta" + "color": "magenta", + "melee_damage": { "bash": 4 } }, { "id": "vgen2", @@ -22,9 +22,9 @@ "weight": "48066 g", "volume": "50 L", "price": "15 kUSD", - "bashing": 4, "material": [ "steel" ], "symbol": ",", - "color": "magenta" + "color": "magenta", + "melee_damage": { "bash": 4 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_other.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_other.json index 73e895233..88b9bf313 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_other.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_other.json @@ -9,10 +9,10 @@ "volume": "50 L", "price": "15 kUSD", "to_hit": -4, - "bashing": 2, "material": [ "steel", "plastic" ], "symbol": "]", - "color": "cyan" + "color": "cyan", + "melee_damage": { "bash": 2 } }, { "id": "vehicle_shelving", @@ -25,10 +25,10 @@ "symbol": "]", "material": [ "steel", "plastic" ], "volume": "200 L", - "bashing": 2, "category": "veh_parts", "price": "800 USD", - "price_postapoc": "10 USD" + "price_postapoc": "10 USD", + "melee_damage": { "bash": 2 } }, { "id": "afs_fridge", @@ -44,9 +44,9 @@ "price_postapoc": "100 USD", "material": [ "steel" ], "to_hit": -4, - "bashing": 8, "flags": [ "DURABLE_MELEE" ], - "looks_like": "minifridge" + "looks_like": "minifridge", + "melee_damage": { "bash": 8 } }, { "id": "afs_freezer", diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_solar.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_solar.json index 51850b2f1..dfba93063 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_solar.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_solar.json @@ -9,10 +9,10 @@ "volume": "62500 ml", "price": "1200 USD", "to_hit": -4, - "bashing": 1, "material": [ "glass" ], "symbol": "]", - "color": "yellow" + "color": "yellow", + "melee_damage": { "bash": 1 } }, { "id": "solar_array2", @@ -24,10 +24,10 @@ "volume": "62500 ml", "price": "1500 USD", "to_hit": -4, - "bashing": 1, "material": [ "glass" ], "symbol": "]", - "color": "yellow" + "color": "yellow", + "melee_damage": { "bash": 1 } }, { "id": "solar_array2r", @@ -39,9 +39,9 @@ "volume": "80500 ml", "price": "1500 USD", "to_hit": -4, - "bashing": 1, "material": [ "glass", "steel" ], "symbol": "]", - "color": "light_blue" + "color": "light_blue", + "melee_damage": { "bash": 1 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_treads.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_treads.json index c3543cbd9..a7847db77 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_treads.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blaze_treads.json @@ -9,12 +9,12 @@ "volume": "50 L", "price": "255 USD", "to_hit": -3, - "bashing": 30, "material": [ "plastic", "steel" ], "symbol": "]", "color": "white", "diameter": 30, - "width": 15 + "width": 15, + "melee_damage": { "bash": 30 } }, { "id": "tread2", @@ -26,12 +26,12 @@ "volume": "75 L", "price": "455 USD", "to_hit": -3, - "bashing": 30, "material": [ "steel" ], "symbol": "]", "color": "white", "diameter": 50, - "width": 25 + "width": 25, + "melee_damage": { "bash": 30 } }, { "id": "tread3", @@ -43,11 +43,11 @@ "volume": "87500 ml", "price": "755 USD", "to_hit": -3, - "bashing": 30, "material": [ "qt_steel", "steel" ], "symbol": "]", "color": "white", "diameter": 60, - "width": 30 + "width": 30, + "melee_damage": { "bash": 30 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_lights.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_lights.json index 4d7e78bc6..533609eba 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_lights.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_lights.json @@ -10,9 +10,9 @@ "volume": "5 L", "price": "5 USD", "to_hit": -3, - "bashing": 9, "material": [ "flesh" ], "symbol": "]", - "color": "cyan" + "color": "cyan", + "melee_damage": { "bash": 9 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_treads.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_treads.json index 4caca5142..fe3557c7a 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_treads.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_treads.json @@ -9,12 +9,12 @@ "volume": "50 L", "price": "255 USD", "to_hit": -3, - "bashing": 30, "material": [ "plastic", "steel" ], "symbol": "]", "color": "white", "diameter": 30, - "width": 15 + "width": 15, + "melee_damage": { "bash": 30 } }, { "id": "oozletread", @@ -26,12 +26,12 @@ "volume": "50 L", "price": "255 USD", "to_hit": -3, - "bashing": 30, "material": [ "plastic", "steel" ], "symbol": "]", "color": "white", "diameter": 50, - "width": 25 + "width": 25, + "melee_damage": { "bash": 30 } }, { "id": "graytread", @@ -43,11 +43,11 @@ "volume": "50 L", "price": "255 USD", "to_hit": -3, - "bashing": 30, "material": [ "plastic", "steel" ], "symbol": "]", "color": "white", "diameter": 60, - "width": 30 + "width": 30, + "melee_damage": { "bash": 30 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_vehicleparts.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_vehicleparts.json index aead794ba..282cd9d84 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_vehicleparts.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_vehicleparts.json @@ -7,11 +7,11 @@ "weight": "6112 g", "volume": "5 L", "to_hit": -3, - "bashing": 9, "material": [ "flesh" ], "symbol": "o", "color": "light_blue", - "category": "veh_parts" + "category": "veh_parts", + "melee_damage": { "bash": 9 } }, { "id": "queen", @@ -22,9 +22,9 @@ "weight": "21331 g", "volume": "20 L", "to_hit": -5, - "bashing": 10, "material": [ "flesh" ], "symbol": ")", - "color": "red" + "color": "red", + "melee_damage": { "bash": 10 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_wheel.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_wheel.json index 595489692..36b8f04ac 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_wheel.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/blob_wheel.json @@ -8,12 +8,12 @@ "weight": "6112 g", "volume": "5 L", "to_hit": -3, - "bashing": 9, "material": [ "flesh" ], "symbol": "]", "color": "light_blue", "diameter": 40, - "width": 15 + "width": 15, + "melee_damage": { "bash": 9 } }, { "id": "gloople_wheel", @@ -24,12 +24,12 @@ "weight": "30062 g", "volume": "12500 ml", "to_hit": -3, - "bashing": 9, "material": [ "flesh" ], "symbol": "]", "color": "light_green", "diameter": 15, - "width": 15 + "width": 15, + "melee_damage": { "bash": 9 } }, { "id": "gray_wheel", @@ -40,12 +40,12 @@ "weight": "53262 g", "volume": "30 L", "to_hit": -3, - "bashing": 9, "material": [ "flesh" ], "symbol": "]", "color": "light_gray", "diameter": 40, - "width": 40 + "width": 40, + "melee_damage": { "bash": 9 } }, { "id": "grinder", @@ -57,12 +57,12 @@ "volume": "50 L", "price": "5 USD", "to_hit": -3, - "bashing": 9, "material": [ "stone", "flesh" ], "symbol": "]", "color": "light_gray", "diameter": 60, - "width": 60 + "width": 60, + "melee_damage": { "bash": 9 } }, { "id": "oozle_wheel", @@ -73,11 +73,11 @@ "weight": "50262 g", "volume": "30 L", "to_hit": -3, - "bashing": 9, "material": [ "flesh" ], "symbol": "]", "color": "green", "diameter": 30, - "width": 30 + "width": 30, + "melee_damage": { "bash": 9 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/diamond_vehicleparts.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/diamond_vehicleparts.json index aae626309..efb67ab87 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/diamond_vehicleparts.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/diamond_vehicleparts.json @@ -10,11 +10,11 @@ "volume": "10 L", "price": "100 kUSD", "to_hit": -3, - "bashing": 15, "material": [ "diamond" ], "symbol": "]", "color": "light_gray", - "techniques": [ "DEF_DISARM" ] + "techniques": [ "DEF_DISARM" ], + "melee_damage": { "bash": 15 } }, { "id": "diamondplate", @@ -26,10 +26,10 @@ "volume": "3 L", "price": "120 kUSD", "to_hit": -3, - "bashing": 15, "material": [ "diamond" ], "symbol": "]", "color": "light_gray", - "techniques": [ "DEF_DISARM" ] + "techniques": [ "DEF_DISARM" ], + "melee_damage": { "bash": 15 } } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/rifles.json b/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/rifles.json deleted file mode 100644 index d0abf469e..000000000 --- a/data/Legacy_mods/mods/blazemod/Blazemod/items/vehicle/rifles.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "id": "mounted_rebar_rifle", - "copy-from": "turret", - "type": "vehicle_part", - "name": { "str": "mounted ferromagnetic rail rifle" }, - "item": "rebar_rifle", - "categories": [ "warfare" ], - "color": "magenta", - "broken_color": "magenta", - "breaks_into": [ { "item": "scrap", "count": 9 }, { "item": "steel_chunk", "count": 5 }, { "item": "steel_lump", "count": 2 } ], - "requirements": { - "install": { "skills": [ [ "mechanics", 5 ], [ "electronics", 5 ] ] }, - "removal": { "skills": [ [ "mechanics", 3 ] ] } - } - }, - { - "id": "mounted_heavy_rail_rifle", - "copy-from": "turret", - "type": "vehicle_part", - "name": { "str": "mounted heavy rail rifle" }, - "item": "heavy_rail_rifle", - "categories": [ "warfare" ], - "color": "magenta", - "broken_color": "magenta", - "breaks_into": [ { "item": "scrap", "count": 30 }, { "item": "steel_chunk", "count": 10 }, { "item": "steel_lump", "count": 6 } ], - "requirements": { - "install": { "skills": [ [ "mechanics", 5 ], [ "electronics", 5 ] ] }, - "removal": { "skills": [ [ "mechanics", 3 ] ] } - } - } -] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blaze_other_parts.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blaze_other_parts.json index 9d4ffbaf3..c300be9af 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blaze_other_parts.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blaze_other_parts.json @@ -196,14 +196,6 @@ }, "flags": [ "CARGO", "OBSTACLE", "COVERED" ], "pseudo_tools": [ { "id": "welder", "hotkey": "w" }, { "id": "soldering_iron", "hotkey": "s" }, { "id": "forge" }, { "id": "kiln" } ], - "breaks_into": [ - { "item": "steel_lump", "count": [ 3, 6 ] }, - { "item": "steel_chunk", "count": [ 3, 6 ] }, - { "item": "scrap", "count": [ 3, 6 ] }, - { "item": "welder", "charges": 0, "prob": 50 }, - { "item": "forge", "charges": 0, "prob": 50 }, - { "item": "kiln", "charges": 0, "prob": 50 } - ], "variants": [ { "symbols": "&", "symbols_broken": "x" } ] }, { @@ -234,15 +226,6 @@ { "id": "chemistry_set" }, { "id": "electrolysis_kit" } ], - "breaks_into": [ - { "item": "steel_lump", "count": [ 6, 9 ] }, - { "item": "steel_chunk", "count": [ 6, 9 ] }, - { "item": "scrap", "count": [ 6, 9 ] }, - { "item": "pot", "prob": 50 }, - { "item": "pan", "prob": 50 }, - { "item": "chemistry_set", "charges": 0, "prob": 50 }, - { "item": "hotplate", "charges": 0, "prob": 50 } - ], "variants": [ { "symbols": "&", "symbols_broken": "x" } ] }, { @@ -279,20 +262,6 @@ { "id": "electrolysis_kit" }, { "id": "water_purifier", "hotkey": "p" } ], - "breaks_into": [ - { "item": "steel_lump", "count": [ 9, 18 ] }, - { "item": "steel_chunk", "count": [ 9, 18 ] }, - { "item": "scrap", "count": [ 9, 18 ] }, - { "item": "pot", "prob": 50 }, - { "item": "pan", "prob": 50 }, - { "item": "chemistry_set", "charges": 0, "prob": 50 }, - { "item": "hotplate", "charges": 0, "prob": 50 }, - { "item": "water_purifier", "charges": 0, "prob": 50 }, - { "item": "vac_sealer", "charges": 0, "prob": 50 }, - { "item": "dehydrator", "charges": 0, "prob": 50 }, - { "item": "food_processor", "charges": 0, "prob": 50 }, - { "item": "press", "prob": 50 } - ], "variants": [ { "symbols": "&", "symbols_broken": "x" } ] } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blaze_weapons_parts.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blaze_weapons_parts.json index 8c74ae000..a66ce63d7 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blaze_weapons_parts.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blaze_weapons_parts.json @@ -82,12 +82,12 @@ } }, { - "id": "mounted_ak74", + "id": "mounted_ak74_semi", "copy-from": "turret", "type": "vehicle_part", - "name": { "str": "AK74 turret" }, - "item": "ak74", - "breaks_into": [ { "item": "ak74", "prob": 50 } ], + "name": { "str": "AK74 semi turret" }, + "item": "ak74_semi", + "breaks_into": [ { "item": "ak74_semi", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, @@ -194,12 +194,12 @@ } }, { - "id": "mounted_ar15", + "id": "mounted_modular_ar15", "copy-from": "turret", "type": "vehicle_part", - "name": { "str": "AR-15 turret" }, - "item": "ar15", - "breaks_into": [ { "item": "ar15", "prob": 50 } ], + "name": { "str": "Modular AR-15 turret" }, + "item": "modular_ar15", + "breaks_into": [ { "item": "modular_ar15", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, @@ -458,12 +458,12 @@ "extend": { "flags": [ "USE_TANKS" ] } }, { - "id": "mounted_fn_fal", + "id": "mounted_fn_fal_semi", "copy-from": "turret", "type": "vehicle_part", - "name": { "str": "FN FAL turret" }, - "item": "fn_fal", - "breaks_into": [ { "item": "fn_fal", "prob": 50 } ], + "name": { "str": "FN FAL semi turret" }, + "item": "fn_fal_semi", + "breaks_into": [ { "item": "fn_fal_semi", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, @@ -523,12 +523,12 @@ } }, { - "id": "mounted_hk_g36", + "id": "mounted_sig_assault_rifle", "copy-from": "turret", "type": "vehicle_part", - "name": { "str": "H&K G36 turret" }, - "item": "hk_g36", - "breaks_into": [ { "item": "hk_g36", "prob": 50 } ], + "name": { "str": "SIG civilian rifle turret" }, + "item": "sig_assault_rifle", + "breaks_into": [ { "item": "sig_assault_rifle", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, @@ -575,12 +575,12 @@ } }, { - "id": "mounted_hk_ump45", + "id": "mounted_modular_ump", "copy-from": "turret", "type": "vehicle_part", - "name": { "str": "H&K UMP45 turret" }, - "item": "hk_ump45", - "breaks_into": [ { "item": "hk_ump45", "prob": 50 } ], + "name": { "str": "UMP submachine gun turret" }, + "item": "modular_ump", + "breaks_into": [ { "item": "modular_ump", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, @@ -614,12 +614,12 @@ } }, { - "id": "mounted_launcher_simple", + "id": "mounted_m79", "copy-from": "turret", "type": "vehicle_part", - "name": { "str": "40mm launcher turret" }, - "item": "launcher_simple", - "breaks_into": [ { "item": "launcher_simple", "prob": 50 } ], + "name": { "str": "M79 launcher" }, + "item": "m79", + "breaks_into": [ { "item": "m79", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, @@ -705,12 +705,12 @@ } }, { - "id": "mounted_m2browning_sawn", + "id": "mounted_m2browning", "copy-from": "turret", "type": "vehicle_part", - "name": { "str": ".50 caliber turret" }, - "item": "m2browning_sawn", - "breaks_into": [ { "item": "m2browning_sawn", "prob": 50 } ], + "name": { "str": ".50-caliber heavy machine gun turret" }, + "item": "m2browning", + "breaks_into": [ { "item": "m2browning", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, @@ -756,19 +756,6 @@ "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "25 m", "using": [ [ "welding_standard", 5 ] ] } } }, - { - "id": "mounted_m79", - "copy-from": "turret", - "type": "vehicle_part", - "name": { "str": "M79 turret" }, - "item": "m79", - "breaks_into": [ { "item": "m79", "prob": 50 } ], - "requirements": { - "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, - "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "25 m", "using": [ [ "welding_standard", 5 ] ] } - } - }, { "id": "mounted_mac_10", "copy-from": "turret", @@ -835,12 +822,12 @@ } }, { - "id": "mounted_needlegun", + "id": "mounted_nailgun", "copy-from": "turret", "type": "vehicle_part", - "name": { "str": "RM216 SPIW turret" }, - "item": "needlegun", - "breaks_into": [ { "item": "needlegun", "prob": 50 } ], + "name": { "str": "nail gun turret" }, + "item": "nailgun", + "breaks_into": [ { "item": "nailgun", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, @@ -967,12 +954,12 @@ } }, { - "id": "mounted_rifle_9mm", + "id": "mounted_rifle_38", "copy-from": "turret", "type": "vehicle_part", - "name": { "str": "9x19mm pipe rifle turret" }, - "item": "rifle_9mm", - "breaks_into": [ { "item": "rifle_9mm", "prob": 50 } ], + "name": { "str": "pipe rifle: .38 Special turret" }, + "item": "rifle_38", + "breaks_into": [ { "item": "rifle_38", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, @@ -1045,19 +1032,6 @@ "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "25 m", "using": [ [ "welding_standard", 5 ] ] } } }, - { - "id": "mounted_rm802", - "copy-from": "turret", - "type": "vehicle_part", - "name": { "str": "RM802 turret" }, - "item": "rm802", - "breaks_into": [ { "item": "rm802", "prob": 50 } ], - "requirements": { - "install": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, - "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "45 m", "using": [ [ "vehicle_wrench_2", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "25 m", "using": [ [ "welding_standard", 5 ] ] } - } - }, { "id": "mounted_rm88_battle_rifle", "copy-from": "turret", diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_boards.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_boards.json index a5a91f36c..c3339a243 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_boards.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_boards.json @@ -30,7 +30,7 @@ "breaks_into": [ { "item": "glooplegrow" } ], "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "flags": [ "OPAQUE", "OBSTACLE", "FOLDABLE", "FULL_BOARD" ], - "variants": [ { "symbols": "\"", "symbols_broken": "0" } ] + "variants": [ { "symbols": "H", "symbols_broken": "#" } ] }, { "id": "grayboard_horizontal", @@ -47,7 +47,7 @@ "description": "A living blob, formed into a vehicle wall. Keeps zombies outside the vehicle and prevents people from seeing through it.", "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "flags": [ "OPAQUE", "OBSTACLE", "FOLDABLE", "FULL_BOARD" ], - "variants": [ { "symbols": "\"", "symbols_broken": "0" } ] + "variants": [ { "symbols": "H", "symbols_broken": "#" } ] }, { "id": "halfgloopleboard_board", @@ -64,7 +64,7 @@ "description": "A living blob, formed into a half-height vehicle wall. Keeps zombies outside the vehicle but allows people to see over it.", "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "flags": [ "OBSTACLE", "FOLDABLE", "HALF_BOARD" ], - "variants": [ { "symbols": "\"", "symbols_broken": "0" } ] + "variants": [ { "symbols": "H", "symbols_broken": "#" } ] }, { "id": "halfgrayboard_board", @@ -81,7 +81,7 @@ "description": "A living blob, formed into a half-height vehicle wall. Keeps zombies outside the vehicle but allows people to see over it.", "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "flags": [ "OBSTACLE", "FOLDABLE", "HALF_BOARD" ], - "variants": [ { "symbols": "\"", "symbols_broken": "0" } ] + "variants": [ { "symbols": "H", "symbols_broken": "#" } ] }, { "id": "halfoozleboard_board", @@ -98,7 +98,7 @@ "description": "A living blob, formed into a half-height vehicle wall. Keeps zombies outside the vehicle but allows people to see over it.", "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "flags": [ "OBSTACLE", "FOLDABLE", "HALF_BOARD" ], - "variants": [ { "symbols": "\"", "symbols_broken": "0" } ] + "variants": [ { "symbols": "H", "symbols_broken": "#" } ] }, { "id": "oozleboard_board", @@ -115,6 +115,6 @@ "description": "A living blob, formed into a vehicle wall. Keeps zombies outside the vehicle and prevents people from seeing through it.", "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "flags": [ "OPAQUE", "OBSTACLE", "FOLDABLE", "FULL_BOARD" ], - "variants": [ { "symbols": "\"", "symbols_broken": "0" } ] + "variants": [ { "symbols": "H", "symbols_broken": "#" } ] } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_frames.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_frames.json index b51952209..64f970b2d 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_frames.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_frames.json @@ -14,7 +14,7 @@ "description": "A living blob, shaped to provide attachment points for other blobs. Other vehicle components and blobs can be mounted on it. If all the frames and components of a vehicle are foldable or made from blobs, the vehicle can be folding into a small package and picked up as a normal item.", "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "flags": [ "FOLDABLE", "MOUNTABLE", "INITIAL_PART" ], - "variants": [ { "symbols": "!", "symbols_broken": "0" } ] + "variants": [ { "symbols": "H", "symbols_broken": "#" } ] }, { "id": "gray_frame", @@ -31,7 +31,7 @@ "description": "A living blob, shaped to provide attachment points for other blobs. Other vehicle components and blobs can be mounted on it. If all the frames and components of a vehicle are foldable or made from blobs, the vehicle can be folding into a small package and picked up as a normal item.", "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "flags": [ "FOLDABLE", "MOUNTABLE", "INITIAL_PART" ], - "variants": [ { "symbols": "!", "symbols_broken": "0" } ] + "variants": [ { "symbols": "H", "symbols_broken": "#" } ] }, { "id": "oozle_frame", @@ -48,6 +48,6 @@ "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "description": "A living blob, shaped to provide attachment points for other blobs. Other vehicle components and blobs can be mounted on it. If all the frames and components of a vehicle are foldable or made from blobs, the vehicle can be folding into a small package and picked up as a normal item.", "flags": [ "FOLDABLE", "MOUNTABLE", "INITIAL_PART" ], - "variants": [ { "symbols": "!", "symbols_broken": "0" } ] + "variants": [ { "symbols": "H", "symbols_broken": "#" } ] } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_treads.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_treads.json index 851a36d70..d36876e3b 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_treads.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_treads.json @@ -17,7 +17,6 @@ "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "10 m" }, "repair": { "skills": [ [ "mechanics", 1 ] ], "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "wheel_type": "treads", "contact_area": 2500, "rolling_resistance": 6, "flags": [ "WHEEL", "VARIABLE_SIZE", "MULTISQUARE", "TRACKED", "FOLDABLE", "STABLE" ], diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_turret.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_turret.json index 6b3f19fb2..8fd073ef7 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_turret.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_turret.json @@ -23,7 +23,6 @@ { "abstract": "blob_turret", "type": "vehicle_part", - "symbol": "t", "durability": 200, "damage_modifier": 80, "location": "on_roof", diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_vehicleparts.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_vehicleparts.json index d5ce8476c..eb6e5bee3 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_vehicleparts.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_vehicleparts.json @@ -97,7 +97,6 @@ "color": "light_green", "broken_color": "light_green", "durability": 250, - "size": 5000, "damage_modifier": 10, "folded_volume": "5 L", "breaks_into": [ { "item": "glooplegrow" } ], @@ -112,7 +111,6 @@ "copy-from": "gloople_tank", "name": { "str": "gel tank (60L)" }, "item": "gloople_tank_large", - "size": 60000, "folded_volume": "60 L" }, { @@ -288,7 +286,6 @@ "color": "light_gray", "broken_color": "light_gray", "durability": 1000, - "size": 10000, "damage_modifier": 10, "folded_volume": "10 L", "breaks_into": [ { "item": "graygrow" } ], @@ -303,7 +300,6 @@ "copy-from": "gray_tank", "name": { "str": "gray tank (100L)" }, "item": "gray_tank_large", - "size": 100000, "folded_volume": "100 L" }, { @@ -433,25 +429,6 @@ "flags": [ "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "FOLDABLE" ], "variants": [ { "symbols": "+", "symbols_broken": "&" } ] }, - { - "id": "grinder", - "type": "vehicle_part", - "name": { "str": "earthen roller" }, - "item": "grinder", - "location": "structure", - "color": "brown", - "broken_color": "brown", - "durability": 2500, - "damage_modifier": 250, - "folded_volume": "250 ml", - "breaks_into": [ { "item": "gray" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "rolling_resistance": 6, - "wheel_type": "rigid", - "contact_area": 500, - "flags": [ "WHEEL", "FOLDABLE", "PROTRUSION", "STABLE", "TRACKED" ], - "variants": [ { "symbols": "O", "symbols_broken": "#" } ] - }, { "id": "oozle_amalgam", "type": "vehicle_part", @@ -498,7 +475,6 @@ "color": "green", "broken_color": "green", "durability": 500, - "size": 7500, "damage_modifier": 10, "folded_volume": "7500 ml", "breaks_into": [ { "item": "oozlegrow" } ], @@ -513,7 +489,6 @@ "copy-from": "oozle_tank", "name": { "str": "ooze tank (80L)" }, "item": "oozle_tank_large", - "size": 8000, "folded_volume": "80 L" }, { diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_wheel.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_wheel.json index f7b61c96b..46d8d42ff 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_wheel.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/blob_wheel.json @@ -14,7 +14,6 @@ "description": "A living blob, existing in a super-cooled state. It acts as a wheel.", "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "rolling_resistance": 1.5, - "wheel_type": "standard", "contact_area": 153, "flags": [ "WHEEL", "FOLDABLE", "EXTRA_DRAG", "SHARP", "TRACKED", "STABLE" ], "variants": [ { "symbols": "|", "symbols_broken": "x" } ] @@ -41,8 +40,7 @@ "type": "vehicle_part", "name": { "str": "gelatinous wheel" }, "item": "gloople_wheel", - "location": "under",, - "variants": [ { "symbols": "|", "symbols_broken": "x" } ] + "location": "under", "color": "light_green", "broken_color": "light_green", "durability": 250, @@ -52,7 +50,6 @@ "breaks_into": [ { "item": "glooplegrow" }, { "item": "water", "count": [ 50, 100 ] } ], "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "rolling_resistance": 1.75, - "wheel_type": "standard", "contact_area": 153, "flags": [ "WHEEL", "FOLDABLE", "TRACKED", "STABLE" ], "variants": [ { "symbols": "|", "symbols_broken": "x" } ] @@ -72,7 +69,6 @@ "breaks_into": [ { "item": "graygrow" }, { "item": "water", "count": [ 100, 200 ] } ], "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "rolling_resistance": 1.25, - "wheel_type": "standard", "contact_area": 153, "flags": [ "WHEEL", "FOLDABLE", "TRACKED", "STABLE" ], "variants": [ { "symbols": "|", "symbols_broken": "x" } ] @@ -91,7 +87,6 @@ "breaks_into": [ { "item": "gray" } ], "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "rolling_resistance": 6, - "wheel_type": "rigid", "contact_area": 500, "flags": [ "WHEEL", "FOLDABLE", "PROTRUSION", "STABLE", "TRACKED" ], "variants": [ { "symbols": "O", "symbols_broken": "#" } ] @@ -110,7 +105,6 @@ "breaks_into": [ { "item": "oozlegrow" }, { "item": "water", "count": [ 100, 200 ] } ], "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "rolling_resistance": 1.5, - "wheel_type": "standard", "contact_area": 153, "flags": [ "WHEEL", "FOLDABLE", "TRACKED", "STABLE" ], "variants": [ { "symbols": "|", "symbols_broken": "x" } ] diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/diamond_turret.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/diamond_turret.json index 9f0f814c6..c69a196c7 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/diamond_turret.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/diamond_turret.json @@ -7,7 +7,6 @@ "item": "diamondlance", "color": "white", "broken_color": "white", - "size": 10, "folded_volume": "5500 ml", "breaks_into": [ { "item": "diamondlance", "count": [ 0, 1 ] } ], "requirements": { @@ -24,7 +23,6 @@ "item": "diamondnova", "color": "white", "broken_color": "white", - "size": 10, "folded_volume": "5500 ml", "breaks_into": [ { "item": "diamondnova", "count": [ 0, 1 ] } ], "requirements": { diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/vortex_parts.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/vortex_parts.json index 7f87b97b2..a7411c1f5 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/vortex_parts.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/vortex_parts.json @@ -12,7 +12,6 @@ "//": "Here power is a multiplier on power efficiency, though ignored because of the PERPTUAL flag", "power": 100, "epower": 37300, - "size": 100, "damage_modifier": 10, "breaks_into": [ { "item": "spiral_stone" }, @@ -45,7 +44,6 @@ "epower": 1865, "noise_factor": 25, "m2c": 90, - "size": 100, "damage_modifier": 10, "breaks_into": [ { "item": "spiral_stone" }, diff --git a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/vortex_turret.json b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/vortex_turret.json index cc3d7b429..1aafbbf05 100644 --- a/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/vortex_turret.json +++ b/data/Legacy_mods/mods/blazemod/Blazemod/vehicleparts/vortex_turret.json @@ -7,7 +7,6 @@ "item": "vortexaccelerator", "color": "pink", "broken_color": "pink", - "size": 1000, "folded_volume": "2500 ml", "breaks_into": [ { "item": "vortexaccelerator", "count": [ 0, 1 ] } ], "requirements": { @@ -24,7 +23,6 @@ "item": "vortexbolter", "color": "pink", "broken_color": "pink", - "size": 10, "folded_volume": "2500 ml", "breaks_into": [ { "item": "vortexbolter", "count": [ 0, 1 ] } ], "requirements": { @@ -41,7 +39,6 @@ "item": "vortexcannon", "color": "pink", "broken_color": "pink", - "size": 10, "folded_volume": "5 L", "breaks_into": [ { "item": "vortexcannon", "count": [ 0, 1 ] } ], "requirements": { @@ -58,7 +55,6 @@ "item": "vortexrifle", "color": "pink", "broken_color": "pink", - "size": 40, "folded_volume": "2500 ml", "breaks_into": [ { "item": "vortexrifle", "count": [ 0, 1 ] } ], "requirements": {