diff --git a/data/mods/Aftershock/items/ammo.json b/data/mods/Aftershock/items/ammo.json index 05957fd52ba3e..4418e44ec8ab2 100644 --- a/data/mods/Aftershock/items/ammo.json +++ b/data/mods/Aftershock/items/ammo.json @@ -12,7 +12,7 @@ "volume": "250 ml", "weight": "1 g", "ammo_type": "acidic_bore", - "damage": 5, + "damage": { "damage_type": "stab", "amount": 5 }, "dispersion": 100, "count": 80, "stack_size": 80, diff --git a/data/mods/Aftershock/items/bioparts.json b/data/mods/Aftershock/items/bioparts.json index 36590bec9cc98..c30e44d4dc71b 100644 --- a/data/mods/Aftershock/items/bioparts.json +++ b/data/mods/Aftershock/items/bioparts.json @@ -97,8 +97,7 @@ "color": "magenta", "skill": "launcher", "range": 30, - "ranged_damage": 19, - "pierce": 12, + "ranged_damage": { "damage_type": "stab", "amount": 19, "armor_penetration": 12 }, "dispersion": 90, "durability": 7, "loudness": 4, diff --git a/data/mods/Aftershock/items/gun/laser.json b/data/mods/Aftershock/items/gun/laser.json index 950770c71333f..c44c67eb0bfc2 100644 --- a/data/mods/Aftershock/items/gun/laser.json +++ b/data/mods/Aftershock/items/gun/laser.json @@ -11,8 +11,7 @@ "material": [ "superalloy", "plastic" ], "color": "cyan", "range": 10, - "ranged_damage": 5, - "pierce": 15, + "ranged_damage": { "damage_type": "stab", "amount": 5, "armor_penetration": 15 }, "dispersion": 500, "ups_charges": 25, "ammo_effects": [ "LASER", "BEANBAG" ], @@ -26,8 +25,7 @@ "description": "A powerful tri-barreled laser weapon, still mounted to the robotic hand of the wraitheon drone it originally belonged too. Can still be fired when connected to an UPS.", "color": "red", "range": 10, - "ranged_damage": 25, - "pierce": 15, + "ranged_damage": { "damage_type": "stab", "amount": 25, "armor_penetration": 15 }, "ups_charges": 50, "modes": [ [ "MULTI", "trilaser", 3 ] ], "ammo_effects": [ "LASER" ], diff --git a/data/mods/Aftershock/items/materials.json b/data/mods/Aftershock/items/materials.json index bc83b65808ea0..acb94c9bbd9f0 100644 --- a/data/mods/Aftershock/items/materials.json +++ b/data/mods/Aftershock/items/materials.json @@ -6,6 +6,7 @@ "density": 10, "bash_resist": 4, "cut_resist": 9, + "bullet_resist": 7, "acid_resist": 14, "fire_resist": 4, "elec_resist": 8, @@ -25,6 +26,7 @@ "latent_heat": 273, "bash_resist": 3, "cut_resist": 3, + "bullet_resist": 2, "acid_resist": 5, "fire_resist": 5, "elec_resist": 0, diff --git a/data/mods/Aftershock/items/weapons.json b/data/mods/Aftershock/items/weapons.json index ca62bd7998fd0..1461065ff9e31 100644 --- a/data/mods/Aftershock/items/weapons.json +++ b/data/mods/Aftershock/items/weapons.json @@ -87,12 +87,11 @@ "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 7 }, "reload_noise_volume": 0, "loudness": 0, - "ranged_damage": 30, + "ranged_damage": { "damage_type": "stab", "amount": 30, "armor_penetration": 15 }, "range": 30, "dispersion": 80, "durability": 6, "reload": 50, - "pierce": 15, "ups_charges": 20, "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ] ] }, @@ -176,7 +175,7 @@ "ammo": "battery", "skill": "rifle", "range": 10, - "ranged_damage": 20, + "ranged_damage": { "damage_type": "stab", "amount": 20 }, "dispersion": 150, "durability": 10, "loudness": 8, diff --git a/data/mods/Aftershock/mobs/PrepPhyle_mobs.json b/data/mods/Aftershock/mobs/PrepPhyle_mobs.json index cf04f8589113e..4fbe2be621f28 100644 --- a/data/mods/Aftershock/mobs/PrepPhyle_mobs.json +++ b/data/mods/Aftershock/mobs/PrepPhyle_mobs.json @@ -19,6 +19,7 @@ "dodge": 3, "armor_bash": 8, "armor_cut": 14, + "armor_bullet": 11, "looks_like": "mon_dog_gpyrenees", "vision_day": 30, "vision_night": 8, diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json index 216ad92f5e25c..fcf84606c794f 100644 --- a/data/mods/Aftershock/mobs/robots.json +++ b/data/mods/Aftershock/mobs/robots.json @@ -57,6 +57,7 @@ "melee_cut": 0, "armor_bash": 18, "armor_cut": 14, + "armor_bullet": 11, "vision_day": 50, "vision_night": 35, "revert_to_itype": "bot_chickenbot", @@ -89,6 +90,7 @@ "melee_cut": 0, "armor_bash": 90, "armor_cut": 90, + "armor_bullet": 72, "vision_day": 50, "revert_to_itype": "bot_tankbot", "starting_ammo": { "40x46mm_m433": 200, "556": 3000 }, @@ -131,6 +133,7 @@ "melee_cut": 6, "armor_bash": 12, "armor_cut": 8, + "armor_bullet": 6, "path_settings": { "max_dist": 5 }, "revert_to_itype": "bot_tripod", "starting_ammo": { "napalm": 10000 }, @@ -181,6 +184,7 @@ "dodge": 8, "armor_bash": 10, "armor_cut": 20, + "armor_bullet": 16, "vision_day": 6, "vision_night": 6, "path_settings": { "max_dist": 6 }, @@ -228,6 +232,7 @@ "melee_cut": 12, "armor_bash": 2, "armor_cut": 8, + "armor_bullet": 6, "revert_to_itype": "bot_bloodhound_drone", "death_drops": { "groups": [ [ "robots", 4 ], [ "manhack", 1 ], [ "turret_searchlight", 1 ] ] }, "death_function": [ "BROKEN" ], diff --git a/data/mods/CRT_EXPANSION/crt_materials.json b/data/mods/CRT_EXPANSION/crt_materials.json index 97cbc58a0b0e8..070e5cecc4951 100644 --- a/data/mods/CRT_EXPANSION/crt_materials.json +++ b/data/mods/CRT_EXPANSION/crt_materials.json @@ -7,6 +7,7 @@ "soft": false, "bash_resist": 5, "cut_resist": 1, + "bullet_resist": 1, "acid_resist": 8, "fire_resist": 1, "elec_resist": 20, diff --git a/data/mods/CRT_EXPANSION/items/crt_ammo.json b/data/mods/CRT_EXPANSION/items/crt_ammo.json index 98683ce367a7f..6cda7f55f7e5a 100644 --- a/data/mods/CRT_EXPANSION/items/crt_ammo.json +++ b/data/mods/CRT_EXPANSION/items/crt_ammo.json @@ -11,7 +11,7 @@ "volume": "200ml", "weight": "2 g", "ammo_type": "pellets", - "damage": 4, + "damage": { "damage_type": "stab", "amount": 4 }, "dispersion": 100, "count": 100, "stack_size": 200, @@ -28,7 +28,7 @@ "material": "steel", "symbol": "=", "color": "dark_gray", - "relative": { "price": 300, "damage": 6, "pierce": 1, "dispersion": -20 } + "relative": { "price": 300, "damage": { "damage_type": "stab", "amount": 6, "armor_penetration": 1 }, "dispersion": -20 } }, { "id": "hp_pellet", @@ -40,7 +40,7 @@ "material": "steel", "symbol": "=", "color": "dark_gray", - "relative": { "price": 200, "damage": 3, "pierce": 3 } + "relative": { "price": 200, "damage": { "damage_type": "stab", "amount": 3, "armor_penetration": 3 } } }, { "id": "alloy_pellet", @@ -51,7 +51,7 @@ "material": "steel", "symbol": "=", "color": "dark_gray", - "relative": { "price": 500, "pierce": 2, "loudness": 25, "dispersion": 20 } + "relative": { "price": 500, "damage": { "damage_type": "stab", "armor_penetration": 2 }, "loudness": 25, "dispersion": 20 } }, { "type": "AMMO", diff --git a/data/mods/CRT_EXPANSION/items/crt_gun.json b/data/mods/CRT_EXPANSION/items/crt_gun.json index 2ec1f43db2220..65f351baf1a8a 100644 --- a/data/mods/CRT_EXPANSION/items/crt_gun.json +++ b/data/mods/CRT_EXPANSION/items/crt_gun.json @@ -14,8 +14,7 @@ "color": "red", "skill": "pistol", "range": 20, - "ranged_damage": 6, - "pierce": 10, + "ranged_damage": { "damage_type": "stab", "amount": 6, "armor_penetration": 10 }, "dispersion": 150, "durability": 9, "loudness": 14, @@ -50,8 +49,7 @@ "color": "cyan", "skill": "launcher", "range": 30, - "ranged_damage": 9, - "pierce": 8, + "ranged_damage": { "damage_type": "stab", "amount": 9, "armor_penetration": 8 }, "dispersion": 45, "durability": 9, "loudness": 28, @@ -77,8 +75,7 @@ "color": "blue", "skill": "smg", "range": 25, - "ranged_damage": 13, - "pierce": 9, + "ranged_damage": { "damage_type": "stab", "amount": 13, "armor_penetration": 9 }, "dispersion": 15, "durability": 8, "modes": [ [ "DEFAULT", "semi-auto", 1 ] ], @@ -149,7 +146,7 @@ "color": "yellow", "skill": "smg", "range": 2, - "ranged_damage": -2, + "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 150, "durability": 10, "loudness": 30, @@ -214,7 +211,7 @@ "bashing": 10, "to_hit": -1, "range": 17, - "ranged_damage": 5, + "ranged_damage": { "damage_type": "stab", "amount": 5 }, "dispersion": 120, "durability": 8, "loudness": 18, @@ -350,8 +347,7 @@ "color": "yellow", "skill": "rifle", "range": 10, - "ranged_damage": 20, - "pierce": 3, + "ranged_damage": { "damage_type": "stab", "amount": 20, "armor_penetration": 3 }, "dispersion": 150, "durability": 10, "loudness": 10, diff --git a/data/mods/CRT_EXPANSION/items/crt_gunmods.json b/data/mods/CRT_EXPANSION/items/crt_gunmods.json index b6ce28ff018ab..3f938c4605831 100644 --- a/data/mods/CRT_EXPANSION/items/crt_gunmods.json +++ b/data/mods/CRT_EXPANSION/items/crt_gunmods.json @@ -60,7 +60,7 @@ "name": { "str": "diffracting lens", "str_pl": "diffracting lenses" }, "description": "A set of optics made to fit on laser weapons, which will diffract the laser beam into several lower powered beams. This slightly increases point-blank damage and makes it difficult to not hit, but reduces range", "range_modifier": -7, - "damage_modifier": 2, + "damage_modifier": { "damage_type": "stab", "amount": 2 }, "ammo_effects": [ "SHOT" ], "min_skills": [ [ "weapon", 1 ] ], "mod_targets": [ "rifle", "pistol", "smg", "shotgun" ] diff --git a/data/mods/CRT_EXPANSION/monsters/crt_monster.json b/data/mods/CRT_EXPANSION/monsters/crt_monster.json index 5632c88b31483..32bf1fb739c10 100644 --- a/data/mods/CRT_EXPANSION/monsters/crt_monster.json +++ b/data/mods/CRT_EXPANSION/monsters/crt_monster.json @@ -108,6 +108,7 @@ "dodge": 1, "armor_cut": 15, "armor_stab": 30, + "armor_bullet": 30, "armor_acid": 4, "vision_day": 25, "vision_night": 3, @@ -178,6 +179,7 @@ "dodge": 5, "armor_bash": 10, "armor_cut": 10, + "armor_bullet": 8, "vision_day": 30, "vision_night": 5, "harvest": "zombie", diff --git a/data/mods/CRT_EXPANSION/monsters/monster.json b/data/mods/CRT_EXPANSION/monsters/monster.json index 61e07bd845c9a..84da8e0aae1cc 100644 --- a/data/mods/CRT_EXPANSION/monsters/monster.json +++ b/data/mods/CRT_EXPANSION/monsters/monster.json @@ -23,6 +23,7 @@ "dodge": 3, "armor_bash": 10, "armor_cut": 16, + "armor_bullet": 13, "harvest": "zombie", "special_attacks": [ [ "TENTACLE", 2 ], [ "scratch", 10 ] ], "death_function": [ "NORMAL" ], diff --git a/data/mods/CrazyCataclysm/crazy_items.json b/data/mods/CrazyCataclysm/crazy_items.json index 4ec363efd73b4..827f501822e4a 100644 --- a/data/mods/CrazyCataclysm/crazy_items.json +++ b/data/mods/CrazyCataclysm/crazy_items.json @@ -69,8 +69,7 @@ "color": "cyan", "skill": "rifle", "range": 45, - "ranged_damage": 250, - "pierce": 20, + "ranged_damage": { "damage_type": "stab", "amount": 250, "armor_penetration": 20 }, "dispersion": 10, "recoil": 100, "durability": 10, diff --git a/data/mods/Dark-Skies-Above/monsters/mongun.json b/data/mods/Dark-Skies-Above/monsters/mongun.json index 4a5c1a59c0c57..e1bdd03ff1128 100644 --- a/data/mods/Dark-Skies-Above/monsters/mongun.json +++ b/data/mods/Dark-Skies-Above/monsters/mongun.json @@ -20,7 +20,7 @@ "description": "Fires an explosive bolt of firey energy. If you're seeing this, it's a bug.", "skill": "launcher", "range": 15, - "ranged_damage": 5, + "ranged_damage": { "damage_type": "stab", "amount": 5 }, "flags": [ "NEVER_JAMS" ], "ammo_effects": [ "NAPALM", "PLASMA", "STREAM_BIG", "INCENDIARY" ] }, diff --git a/data/mods/DinoMod/dinosaur.json b/data/mods/DinoMod/dinosaur.json index 894cdb7bc0681..0995ead92c191 100644 --- a/data/mods/DinoMod/dinosaur.json +++ b/data/mods/DinoMod/dinosaur.json @@ -75,6 +75,7 @@ "dodge": 3, "armor_bash": 1, "armor_cut": 1, + "armor_bullet": 1, "hp": 40, "death_function": [ "NORMAL" ], "description": "A feathered bipedal dinosaur, standing as tall as a human. It looks somewhat like a reptilian ostrich.", @@ -160,6 +161,7 @@ "dodge": 0, "armor_bash": 4, "armor_cut": 2, + "armor_bullet": 2, "hp": 400, "death_function": [ "NORMAL" ], "description": "A huge dinosaur about the size of a small house, with a ferocious crocodile-like head and a sail on its back.", @@ -206,6 +208,7 @@ "dodge": 0, "armor_bash": 4, "armor_cut": 2, + "armor_bullet": 2, "hp": 300, "death_function": [ "NORMAL" ], "description": "Look at those teeth! Tiny little claws though.", @@ -241,6 +244,7 @@ "dodge": 0, "armor_bash": 4, "armor_cut": 2, + "armor_bullet": 2, "hp": 150, "death_function": [ "NORMAL" ], "description": "A massive rhino-like dinosaur with a bony crest from which three large horns emerge.", @@ -285,6 +289,7 @@ "dodge": 1, "armor_bash": 3, "armor_cut": 1, + "armor_bullet": 1, "hp": 150, "death_function": [ "NORMAL" ], "description": "A large quadruped dinosaur with plates on its back, and a spiked tail.", @@ -318,6 +323,7 @@ "dodge": 1, "armor_bash": 6, "armor_cut": 4, + "armor_bullet": 3, "hp": 120, "death_function": [ "NORMAL" ], "description": "This dinosaur looks like a giant prehistoric armadillo. Its tail ends in a massive spiked club of bone.", @@ -351,6 +357,7 @@ "dodge": 1, "armor_bash": 3, "armor_cut": 1, + "armor_bullet": 1, "hp": 120, "death_function": [ "NORMAL" ], "description": "A large predatory bipedal dinosaur, with tiger-like stripes on its broad back.", @@ -417,6 +424,7 @@ "dodge": 3, "armor_bash": 1, "armor_cut": 1, + "armor_bullet": 1, "hp": 30, "death_function": [ "NORMAL" ], "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true } ], @@ -452,6 +460,7 @@ "dodge": 2, "armor_bash": 1, "armor_cut": 1, + "armor_bullet": 1, "hp": 60, "death_function": [ "NORMAL" ], "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true } ], @@ -487,6 +496,7 @@ "dodge": 1, "armor_bash": 2, "armor_cut": 1, + "armor_bullet": 1, "hp": 100, "death_function": [ "NORMAL" ], "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true } ], @@ -522,6 +532,7 @@ "dodge": 0, "armor_bash": 4, "armor_cut": 4, + "armor_bullet": 3, "hp": 300, "death_function": [ "NORMAL" ], "description": "A huge mottled dinosaur with a blunt head crest. It contentedly strips leaves from a nearby shrub.", @@ -587,6 +598,7 @@ "dodge": 1, "armor_bash": 3, "armor_cut": 1, + "armor_bullet": 1, "hp": 120, "death_function": [ "NORMAL" ], "special_attacks": [ [ "BOOMER", 20 ] ], diff --git a/data/mods/Generic_Guns/ammo/grenade.json b/data/mods/Generic_Guns/ammo/grenade.json index e72361994c769..91c4b493a548d 100644 --- a/data/mods/Generic_Guns/ammo/grenade.json +++ b/data/mods/Generic_Guns/ammo/grenade.json @@ -21,7 +21,7 @@ "type": "AMMO", "name": { "str": "beanbag grenade cartridge" }, "description": "A less-lethal beanbag grenade cartridge that delivers strong impact on target, causing major pain and disorientation. May still injure or kill.", - "damage": 20, + "damage": { "damage_type": "bullet", "amount": 20 }, "extend": { "effects": [ "LARGE_BEANBAG" ] } }, { @@ -40,7 +40,7 @@ "name": { "str": "buckshot grenade cartridge" }, "description": "A grenade cartridge with a powerful buckshot load, designed to provide some defensive options when carrying a grenade launcher.", "range": 12, - "damage": 85, + "damage": { "damage_type": "bullet", "amount": 85 }, "recoil": 525, "extend": { "effects": [ "SHOT" ] } }, @@ -68,7 +68,7 @@ "type": "AMMO", "name": "slug grenade cartridge", "description": "A grenade cartridge loaded with a massive bullet. Say goodbye to your shoulder, I guess.", - "damage": 130, + "damage": { "damage_type": "bullet", "amount": 130 }, "recoil": 875, "extend": { "effects": [ "LARGE_BEANBAG" ] } } diff --git a/data/mods/Generic_Guns/ammo/pistol.json b/data/mods/Generic_Guns/ammo/pistol.json index 516de93f9b394..da3c15fd612e2 100644 --- a/data/mods/Generic_Guns/ammo/pistol.json +++ b/data/mods/Generic_Guns/ammo/pistol.json @@ -14,14 +14,14 @@ "copy-from": "pistol_ball", "name": { "str": "pistol ammo, JHP", "str_pl": "pistol ammo, JHP" }, "description": "Modern ubiquitous medium pistol ammo, popularized by usage in two wars and almost a century of post-war defensive and duty usage. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.", - "relative": { "damage": 3, "pierce": -6 } + "relative": { "damage": { "damage_type": "bullet", "amount": 3, "armor_penetration": -6 } } }, { "id": "reloaded_pistol_ball", "type": "AMMO", "copy-from": "pistol_ball", "name": { "str": "pistol ammo, ball (reloaded)", "str_pl": "pistol ammo, ball (reloaded)" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -29,7 +29,7 @@ "type": "AMMO", "copy-from": "pistol_jhp", "name": { "str": "pistol ammo, JHP (reloaded)", "str_pl": "pistol ammo, JHP (reloaded)" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -37,7 +37,12 @@ "copy-from": "pistol_ball", "type": "AMMO", "name": { "str": "pistol ammo, ball (black powder)", "str_pl": "pistol ammo, ball (black powder)" }, - "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 }, + "recoil": 0.76, + "dispersion": 1.2 + }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -46,7 +51,12 @@ "copy-from": "pistol_jhp", "type": "AMMO", "name": { "str": "pistol ammo, JHP (black powder)", "str_pl": "pistol ammo, JHP (black powder)" }, - "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 }, + "recoil": 0.76, + "dispersion": 1.2 + }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } } diff --git a/data/mods/Generic_Guns/ammo/pistol_magnum.json b/data/mods/Generic_Guns/ammo/pistol_magnum.json index af4f6c1c5ce14..f3e67d6c8f035 100644 --- a/data/mods/Generic_Guns/ammo/pistol_magnum.json +++ b/data/mods/Generic_Guns/ammo/pistol_magnum.json @@ -14,14 +14,14 @@ "copy-from": "pistol_magnum_ball", "name": { "str": "magnum ammo, JHP", "str_pl": "magnum ammo, JHP" }, "description": "Magnum ammunition, developed from early handgun hunting efforts and popularized by law enforcement usage. It is more powerful than common pistol ammo. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.", - "relative": { "damage": 3, "pierce": -6 } + "relative": { "damage": { "damage_type": "bullet", "amount": 3, "armor_penetration": -6 } } }, { "id": "reloaded_pistol_magnum_ball", "type": "AMMO", "copy-from": "pistol_magnum_ball", "name": { "str": "magnum ammo, ball (reloaded)", "str_pl": "magnum ammo, ball (reloaded)" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -29,7 +29,7 @@ "type": "AMMO", "copy-from": "pistol_magnum_jhp", "name": { "str": "magnum ammo, JHP (reloaded)", "str_pl": "magnum ammo, JHP (reloaded)" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -37,7 +37,12 @@ "copy-from": "pistol_magnum_ball", "type": "AMMO", "name": { "str": "magnum ammo, ball (black powder)", "str_pl": "magnum ammo, ball (black powder)" }, - "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 }, + "recoil": 0.76, + "dispersion": 1.2 + }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -46,7 +51,12 @@ "copy-from": "pistol_magnum_jhp", "type": "AMMO", "name": { "str": "magnum ammo, JHP (black powder)", "str_pl": "magnum ammo, JHP (black powder)" }, - "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 }, + "recoil": 0.76, + "dispersion": 1.2 + }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } } diff --git a/data/mods/Generic_Guns/ammo/pistol_tiny.json b/data/mods/Generic_Guns/ammo/pistol_tiny.json index 257b2148edff3..13c6eca41c902 100644 --- a/data/mods/Generic_Guns/ammo/pistol_tiny.json +++ b/data/mods/Generic_Guns/ammo/pistol_tiny.json @@ -7,7 +7,7 @@ "ammo_type": "ammo_pistol_tiny", "casing": "pistol_tiny_casing", "description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century sidearms. Sold in great quantities preceding the riots. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead.", - "relative": { "damage": -2, "pierce": 3 } + "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 3 } } }, { "id": "tiny_pistol_jhp", @@ -15,14 +15,14 @@ "copy-from": "tiny_pistol_ball", "name": { "str": "tiny pistol ammo, JHP", "str_pl": "tiny pistol ammo, JHP" }, "description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century sidearms. Sold in great quantities preceding the riots. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.", - "relative": { "damage": 2, "pierce": -3 } + "relative": { "damage": { "damage_type": "bullet", "amount": 2, "armor_penetration": -3 } } }, { "id": "reloaded_tiny_pistol_ball", "type": "AMMO", "copy-from": "tiny_pistol_ball", "name": { "str": "tiny pistol ammo, ball (reloaded)", "str_pl": "tiny pistol ammo, ball (reloaded)" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -30,7 +30,7 @@ "type": "AMMO", "copy-from": "tiny_pistol_jhp", "name": { "str": "tiny pistol ammo, JHP (reloaded)", "str_pl": "tiny pistol ammo, JHP (reloaded)" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -38,7 +38,12 @@ "type": "AMMO", "copy-from": "tiny_pistol_ball", "name": { "str": "tiny pistol ammo, ball (black powder)", "str_pl": "tiny pistol ammo, ball (black powder)" }, - "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 }, + "recoil": 0.57, + "dispersion": 1.2 + }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -47,7 +52,12 @@ "type": "AMMO", "copy-from": "tiny_pistol_jhp", "name": { "str": "tiny pistol ammo, JHP (black powder)", "str_pl": "tiny pistol ammo, JHP (black powder)" }, - "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 }, + "recoil": 0.57, + "dispersion": 1.2 + }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } } diff --git a/data/mods/Generic_Guns/ammo/rifle.json b/data/mods/Generic_Guns/ammo/rifle.json index 77432fedbe4e8..868590810d685 100644 --- a/data/mods/Generic_Guns/ammo/rifle.json +++ b/data/mods/Generic_Guns/ammo/rifle.json @@ -14,14 +14,14 @@ "copy-from": "rifle_ball", "name": { "str": "rifle ammo, AP", "str_pl": "rifle ammo, AP" }, "description": "Modern rifle ammunition, ubiquitous and affordable. It's suitable for international conflicts, hunting small to large game, home defense, and these days, zombies. This 'armor piercing' variant features a mild steel penetrator for environmental friendliness, improved barrier penetration, and enhanced effect on armor.", - "relative": { "damage": -2, "pierce": 4 } + "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 } } }, { "id": "reloaded_rifle_ball", "type": "AMMO", "copy-from": "rifle_ball", "name": { "str": "rifle ammo, ball (reloaded)", "str_pl": "rifle ammo, ball (reloaded)" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -29,7 +29,7 @@ "type": "AMMO", "copy-from": "rifle_AP", "name": { "str": "rifle ammo, AP (reloaded)", "str_pl": "rifle ammo, AP (reloaded)" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -37,7 +37,12 @@ "copy-from": "rifle_ball", "type": "AMMO", "name": { "str": "rifle ammo, ball (black powder)", "str_pl": "rifle ammo, ball (black powder)" }, - "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 }, + "recoil": 0.57, + "dispersion": 1.2 + }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -46,7 +51,12 @@ "copy-from": "rifle_AP", "type": "AMMO", "name": { "str": "rifle ammo, AP (black powder)", "str_pl": "rifle ammo, AP (black powder)" }, - "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 }, + "recoil": 0.57, + "dispersion": 1.2 + }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } } diff --git a/data/mods/Generic_Guns/ammo/rifle_huge.json b/data/mods/Generic_Guns/ammo/rifle_huge.json index fbcfb67328671..d2e8b4c0b851e 100644 --- a/data/mods/Generic_Guns/ammo/rifle_huge.json +++ b/data/mods/Generic_Guns/ammo/rifle_huge.json @@ -14,14 +14,14 @@ "copy-from": "rifle_huge_ball", "name": { "str": "huge rifle ammo, AP", "str_pl": "huge rifle ammo, AP" }, "description": "Huge rifle ammunition like this bridges the gap between light cannons and big game rifles. It's suitable for taking on light vehicles and other materiel, or hunting extremely large game. These armor piercing munitions feature tungsten steel penetrators for use against light-skinned vehicles.", - "relative": { "damage": -10, "pierce": 20 } + "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } } }, { "id": "reloaded_rifle_huge_ball", "type": "AMMO", "copy-from": "rifle_huge_ball", "name": { "str": "huge rifle ammo, ball (reloaded)", "str_pl": "huge rifle ammo, ball (reloaded)" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -29,7 +29,7 @@ "type": "AMMO", "copy-from": "rifle_huge_AP", "name": { "str": "huge rifle ammo, AP (reloaded)", "str_pl": "huge rifle ammo, AP (reloaded)" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -37,7 +37,12 @@ "copy-from": "rifle_huge_ball", "type": "AMMO", "name": { "str": "rifle ammo, ball (black powder)", "str_pl": "rifle ammo, ball (black powder)" }, - "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 }, + "recoil": 0.57, + "dispersion": 1.2 + }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -46,7 +51,12 @@ "copy-from": "rifle_huge_AP", "type": "AMMO", "name": { "str": "rifle ammo, AP (black powder)", "str_pl": "rifle ammo, AP (black powder)" }, - "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 }, + "recoil": 0.57, + "dispersion": 1.2 + }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } } diff --git a/data/mods/Generic_Guns/ammo/shot.json b/data/mods/Generic_Guns/ammo/shot.json index 59d7c9608824f..880b3740818f5 100644 --- a/data/mods/Generic_Guns/ammo/shot.json +++ b/data/mods/Generic_Guns/ammo/shot.json @@ -12,7 +12,14 @@ "type": "AMMO", "name": { "str": "shotshell, beanbag", "str_pl": "shotshell, beanbag" }, "description": "A beanbag round for shotguns, not deadly but designed to disable.", - "proportional": { "price": 0.5, "price_postapoc": 0.5, "count": 0.5, "damage": 0.1, "recoil": 0.4, "loudness": 0.6 }, + "proportional": { + "price": 0.5, + "price_postapoc": 0.5, + "count": 0.5, + "damage": { "damage_type": "bullet", "amount": 0.1 }, + "recoil": 0.4, + "loudness": 0.6 + }, "extend": { "effects": [ "BEANBAG", "NOGIB" ] } }, { @@ -22,7 +29,7 @@ "name": { "str": "shotshell, birdshot", "str_pl": "shotshell, birdshot" }, "description": "A shotshell filled with numerous small pellets. Designed for hunting birds and other small game, its applications in combat are very limited.", "price_postapoc": 2400, - "proportional": { "price": 0.2, "damage": 0.3, "recoil": 0.6, "loudness": 0.8 }, + "proportional": { "price": 0.2, "damage": { "damage_type": "bullet", "amount": 0.3 }, "recoil": 0.6, "loudness": 0.8 }, "extend": { "effects": [ "NOGIB" ] } }, { @@ -32,7 +39,7 @@ "name": { "str": "shotshell, slug", "str_pl": "shotshell, slug" }, "description": "A shotshell with a single projectile, shaped somewhat like a shuttlecock. Slugs are used with shotguns to give them extra range, allowing them to stand in for a rifle. Extremely damaging but rather inaccurate.", "dispersion": 100, - "relative": { "range": 12, "pierce": 6 }, + "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetratoin": 6 } }, "proportional": { "price": 1.4, "price_postapoc": 1.4, "recoil": 1.4 }, "delete": { "effects": [ "SHOT" ] } }, @@ -42,7 +49,15 @@ "type": "AMMO", "name": { "str": "shotshell, pyrotechnical", "str_pl": "shotshell, pyrotechnical" }, "description": "A novelty shotgun shell filled with a simple pyrotechnical charge. The payload is light and won't wound very well, but the flash and sparks will certainly be impressive, in addition to being an extreme fire hazard.", - "proportional": { "price": 2, "price_postapoc": 2, "damage": 0.2, "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2, "range": 0.5 }, + "proportional": { + "price": 2, + "price_postapoc": 2, + "damage": { "damage_type": "bullet", "amount": 0.2 }, + "recoil": 0.6, + "loudness": 0.8, + "dispersion": 1.2, + "range": 0.5 + }, "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] } }, { @@ -51,7 +66,7 @@ "type": "AMMO", "name": { "str": "shotshell, junk", "str_pl": "shotshell, junk" }, "description": "A shotgun shell filled with whatever was lying around. They are more damaging than birdshot, but fairly inaccurate.", - "proportional": { "price": 0.4, "damage": 0.6, "dispersion": 1.2 }, + "proportional": { "price": 0.4, "damage": { "damage_type": "bullet", "amount": 0.6 }, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -60,7 +75,7 @@ "copy-from": "shot_buck", "name": { "str": "shotshell, buckshot (reloaded)", "str_pl": "shotshell, buckshot (reloaded)" }, "type": "AMMO", - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -69,7 +84,7 @@ "copy-from": "shot_fowl", "name": { "str": "shotshell, birdshot (reloaded)", "str_pl": "shotshell, birdshot (reloaded)" }, "type": "AMMO", - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -78,7 +93,7 @@ "copy-from": "shot_foster", "name": { "str": "shotshell, slug (reloaded)", "str_pl": "shotshell, slug (reloaded)" }, "type": "AMMO", - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -87,7 +102,7 @@ "copy-from": "shot_pyro", "name": { "str": "shotshell, pyrotechnical (reloaded)", "str_pl": "shotshell, pyrotechnical (reloaded)" }, "type": "AMMO", - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -99,7 +114,7 @@ "type": "AMMO", "description": "A shotgun shell filled with tiny steel darts, definitely not a factory loading. Flechettes won't pattern as well as normal shot, and they'll likely do less damage. However, they may fare better against armor than other shotgun loads.", "relative": { "pierce": 12 }, - "proportional": { "price": 2, "price_postapoc": 2, "count": 0.5, "damage": 0.8 }, + "proportional": { "price": 2, "price_postapoc": 2, "count": 0.5, "damage": { "damage_type": "bullet", "amount": 0.8 } }, "extend": { "effects": [ "RECYCLED" ] } }, { @@ -107,7 +122,7 @@ "copy-from": "shot_buck", "name": { "str": "shotshell, buckshot (black powder)", "str_pl": "shotshell, buckshot (black powder)" }, "type": "AMMO", - "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 }, + "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -116,7 +131,7 @@ "copy-from": "shot_fowl", "name": { "str": "shotshell, birdshot (black powder)", "str_pl": "shotshell, birdshot (black powder)" }, "type": "AMMO", - "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 }, + "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -125,7 +140,7 @@ "copy-from": "shot_foster", "name": { "str": "shotshell, slug (black powder)", "str_pl": "shotshell, slug (black powder)" }, "type": "AMMO", - "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 }, + "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -134,7 +149,7 @@ "copy-from": "shot_pyro", "name": { "str": "shotshell, pyrotechnical (black powder)", "str_pl": "shotshell, pyrotechnical (black powder)" }, "type": "AMMO", - "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 }, + "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -143,7 +158,7 @@ "copy-from": "reloaded_shot_dart", "name": { "str": "shotshell, flechette (black powder)", "str_pl": "shotshell, flechette (black powder)" }, "type": "AMMO", - "proportional": { "price": 0.86, "damage": 0.88, "dispersion": 1.09 }, + "proportional": { "price": 0.86, "damage": { "damage_type": "bullet", "amount": 0.88 }, "dispersion": 1.09 }, "extend": { "effects": [ "MUZZLE_SMOKE", "BLACKPOWDER" ] } }, { @@ -151,7 +166,7 @@ "copy-from": "reloaded_shot_junk", "type": "AMMO", "name": { "str": "shotshell, junk (black powder)", "str_pl": "shotshell, junk (black powder)" }, - "proportional": { "price": 0.6, "damage": 0.8 }, + "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 } }, "extend": { "effects": [ "MUZZLE_SMOKE" ] } } ] diff --git a/data/mods/Generic_Guns/firearms/pistol_magnum.json b/data/mods/Generic_Guns/firearms/pistol_magnum.json index 035f42c5b1a3c..36ef07c042240 100644 --- a/data/mods/Generic_Guns/firearms/pistol_magnum.json +++ b/data/mods/Generic_Guns/firearms/pistol_magnum.json @@ -54,7 +54,7 @@ "type": "GUN", "name": { "str": "pipe magnum" }, "ammo": [ "ammo_pistol_magnum", "ammo_pistol" ], - "ranged_damage": -2, + "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "description": "A firearm made from a stout pipe, reinforced at the chamber. It holds a single a round of standard or magnum pistol ammunition, and has a crude assembly to fire it. There's no extractor, so it might be slow to reload, and its construction makes for poor reliability and longevity.", "dispersion": 440, "reload": 110 diff --git a/data/mods/Magiclysm/enchanted/enchanted_ranged.json b/data/mods/Magiclysm/enchanted/enchanted_ranged.json index a2b0bf51b0c8e..acc086957cea2 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_ranged.json +++ b/data/mods/Magiclysm/enchanted/enchanted_ranged.json @@ -74,7 +74,7 @@ "techniques": [ "WBLOCK_2" ], "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 20 ] ], "skill": "shotgun", - "ranged_damage": 1, + "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 600, "durability": 6, "blackpowder_tolerance": 66, diff --git a/data/mods/Magiclysm/enchanted/enchanted_unarmed.json b/data/mods/Magiclysm/enchanted/enchanted_unarmed.json index 19bcce03d43bd..f7acb6f83caaa 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_unarmed.json +++ b/data/mods/Magiclysm/enchanted/enchanted_unarmed.json @@ -80,7 +80,7 @@ "material": [ "steel" ], "techniques": [ "WBLOCK_1", "BRUTAL" ], "min_strength": 7, - "ranged_damage": 1, + "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 855, "durability": 6, "blackpowder_tolerance": 66, diff --git a/data/mods/Magiclysm/items/archery.json b/data/mods/Magiclysm/items/archery.json index 93d421aeef96c..cf8fbd19cbf8f 100644 --- a/data/mods/Magiclysm/items/archery.json +++ b/data/mods/Magiclysm/items/archery.json @@ -19,7 +19,7 @@ "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 14 }, "reload_noise_volume": 2, "loudness": 5, - "ranged_damage": 25, + "ranged_damage": { "damage_type": "stab", "amount": 25 }, "range": 20, "dispersion": 95, "durability": 6, @@ -40,8 +40,7 @@ "volume": "145 ml", "weight": "30 g", "bashing": 12, - "prop_damage": 1.95, - "pierce": 20, + "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.95, "armor_penetration": 20 }, "dispersion": 35, "loudness": 0, "range": 7, diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json index 45b4b9b62ab9c..23aedaecbf130 100644 --- a/data/mods/Magiclysm/items/ethereal_items.json +++ b/data/mods/Magiclysm/items/ethereal_items.json @@ -302,7 +302,7 @@ "to_hit": 1, "reload_noise_volume": 3, "loudness": 6, - "ranged_damage": 29, + "ranged_damage": { "damage_type": "stab", "amount": 29 }, "range": 12, "dispersion": 950, "durability": 6, diff --git a/data/mods/Magiclysm/items/fuel.json b/data/mods/Magiclysm/items/fuel.json index daf47ea19aa2c..b95c042fc69db 100644 --- a/data/mods/Magiclysm/items/fuel.json +++ b/data/mods/Magiclysm/items/fuel.json @@ -14,9 +14,8 @@ "phase": "liquid", "category": "fuel", "ammo_type": "dragon_blood", - "damage": 5, + "damage": { "damage_type": "stab", "amount": 5, "armor_penetration": 5 }, "range": 4, - "pierce": 5, "effects": [ "FLAME", "STREAM", "INCENDIARY", "NEVER_MISFIRES" ], "fuel": { "energy": 50, diff --git a/data/mods/Magiclysm/materials.json b/data/mods/Magiclysm/materials.json index 542ce333f8402..c05a926842f5a 100644 --- a/data/mods/Magiclysm/materials.json +++ b/data/mods/Magiclysm/materials.json @@ -11,6 +11,7 @@ "reinforces": true, "bash_resist": 14, "cut_resist": 18, + "bullet_resist": 14, "acid_resist": 4, "fire_resist": 20, "elec_resist": 2, @@ -29,6 +30,7 @@ "latent_heat": 333, "bash_resist": 5, "cut_resist": 8, + "bullet_resist": 6, "acid_resist": 40, "fire_resist": 1, "elec_resist": 1, @@ -49,6 +51,7 @@ "latent_heat": 333, "bash_resist": 1, "cut_resist": 10, + "bullet_resist": 8, "acid_resist": 3, "fire_resist": 18, "elec_resist": 2, @@ -74,6 +77,7 @@ "specific_heat_solid": 0.45, "latent_heat": 273, "cut_resist": 20, + "bullet_resist": 16, "acid_resist": 7, "fire_resist": 3, "elec_resist": 0, diff --git a/data/mods/Magiclysm/monsters.json b/data/mods/Magiclysm/monsters.json index d1a4187b75e89..07bf47dfa2ebe 100644 --- a/data/mods/Magiclysm/monsters.json +++ b/data/mods/Magiclysm/monsters.json @@ -46,6 +46,7 @@ "luminance": 16, "armor_bash": 2, "armor_cut": 2, + "armor_bullet": 2, "vision_day": 30, "vision_night": 30, "material": [ "steel" ], diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index d525b3a311e7f..d0e74e158df4d 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -47,6 +47,7 @@ "armor_bash": 1, "armor_cut": 8, "armor_stab": 8, + "armor_bullet": 8, "armor_acid": 3, "armor_fire": 80, "vision_day": 5, @@ -83,6 +84,7 @@ "armor_bash": 5, "armor_cut": 45, "armor_stab": 60, + "armor_bullet": 60, "armor_acid": 10, "armor_fire": 80, "vision_day": 6, diff --git a/data/mods/Magiclysm/monsters/dragon.json b/data/mods/Magiclysm/monsters/dragon.json index 94518d93dfdca..047432a20b584 100644 --- a/data/mods/Magiclysm/monsters/dragon.json +++ b/data/mods/Magiclysm/monsters/dragon.json @@ -90,6 +90,7 @@ "dodge": 5, "armor_bash": 2, "armor_cut": 12, + "armor_bullet": 10, "armor_acid": 600, "vision_day": 30, "vision_night": 20, @@ -131,6 +132,7 @@ "melee_cut": 16, "armor_bash": 8, "armor_cut": 20, + "armor_bullet": 16, "special_attacks": [ { "type": "bite", "cooldown": 10 }, [ "scratch", 3 ], @@ -151,6 +153,7 @@ "melee_cut": 28, "armor_bash": 14, "armor_cut": 30, + "armor_bullet": 24, "dodge": 3, "//": "Large means powerful, but it does not mean fast.", "speed": 100, diff --git a/data/mods/Magiclysm/monsters/golems.json b/data/mods/Magiclysm/monsters/golems.json index 6dcb10f70ca71..dc5f4b68e40d2 100644 --- a/data/mods/Magiclysm/monsters/golems.json +++ b/data/mods/Magiclysm/monsters/golems.json @@ -23,6 +23,7 @@ "melee_cut": 5, "armor_bash": 10, "armor_cut": 10, + "armor_bullet": 8, "dodge": 0, "vision_day": 40, "vision_night": 40, @@ -47,6 +48,7 @@ "morale": 100, "armor_bash": 18, "armor_cut": 6, + "armor_bullet": 5, "melee_skill": 5, "melee_dice": 3, "melee_dice_sides": 6, @@ -82,6 +84,7 @@ "melee_cut": 6, "armor_bash": 20, "armor_cut": 20, + "armor_bullet": 16, "dodge": 0, "vision_day": 40, "vision_night": 40, @@ -114,6 +117,7 @@ "melee_cut": 7, "armor_bash": 32, "armor_cut": 32, + "armor_bullet": 26, "dodge": 0, "vision_day": 40, "vision_night": 40, diff --git a/data/mods/Magiclysm/monsters/lizardfolk.json b/data/mods/Magiclysm/monsters/lizardfolk.json index 010800cc17ca9..8622404c106b8 100644 --- a/data/mods/Magiclysm/monsters/lizardfolk.json +++ b/data/mods/Magiclysm/monsters/lizardfolk.json @@ -24,6 +24,7 @@ "dodge": 5, "armor_bash": 2, "armor_cut": 12, + "armor_bullet": 10, "armor_stab": 6, "harvest": "lizardfolk", "death_function": [ "NORMAL" ], diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 7c4b78554dded..de043cea2e404 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -23,6 +23,7 @@ "dodge": 3, "armor_bash": 5, "armor_cut": 2, + "armor_bullet": 2, "vision_night": 20, "path_settings": { "max_dist": 25 }, "harvest": "owlbear", @@ -156,6 +157,7 @@ "dodge": 2, "armor_bash": 32, "armor_cut": 30, + "armor_bullet": 24, "harvest": "bulette", "anger_triggers": [ "SOUND" ], "death_function": [ "NORMAL" ], @@ -239,6 +241,7 @@ "melee_cut": 12, "dodge": 1, "armor_cut": 16, + "armor_bullet": 13, "vision_day": 40, "vision_night": 3, "harvest": "human_large_leather", diff --git a/data/mods/My_Sweet_Cataclysm/sweet_materials.json b/data/mods/My_Sweet_Cataclysm/sweet_materials.json index 2dca3b289edc8..ac10868c8817d 100644 --- a/data/mods/My_Sweet_Cataclysm/sweet_materials.json +++ b/data/mods/My_Sweet_Cataclysm/sweet_materials.json @@ -10,6 +10,7 @@ "edible": true, "bash_resist": 0, "cut_resist": 0, + "bullet_resist": 0, "acid_resist": 1, "fire_resist": 1, "elec_resist": 1, diff --git a/data/mods/My_Sweet_Cataclysm/sweet_monsters.json b/data/mods/My_Sweet_Cataclysm/sweet_monsters.json index 15f607f9effb9..f9bb0fd4162d5 100644 --- a/data/mods/My_Sweet_Cataclysm/sweet_monsters.json +++ b/data/mods/My_Sweet_Cataclysm/sweet_monsters.json @@ -94,6 +94,7 @@ "melee_dice_sides": 8, "armor_bash": 2, "armor_cut": 3, + "armor_bullet": 2, "vision_night": 4, "harvest": "marshmallow_boy", "special_attacks": [ [ "SMASH", 30 ] ], @@ -124,6 +125,7 @@ "melee_dice_sides": 8, "armor_bash": 6, "armor_cut": 9, + "armor_bullet": 7, "vision_day": 50, "vision_night": 4, "harvest": "marshmallow_boy", @@ -153,6 +155,7 @@ "color": "white_red", "armor_bash": 2, "armor_cut": 3, + "armor_bullet": 2, "harvest": "armored_marshmallow_boy", "upgrades": { "half_life": 14, "into": "mon_marshmallow_guy_armored" } }, @@ -166,6 +169,7 @@ "color": "white_magenta", "armor_bash": 3, "armor_cut": 4, + "armor_bullet": 3, "harvest": "armored_marshmallow_boy", "upgrades": { "half_life": 14, "into": "mon_marshmallow_buff_armored" }, "reproduction": { "baby_egg": "smores", "baby_count": 5, "baby_timer": 14 } @@ -180,6 +184,7 @@ "color": "yellow_magenta", "armor_bash": 6, "armor_cut": 7, + "armor_bullet": 6, "harvest": "armored_marshmallow_boy", "upgrades": { "half_life": 14, "into": "mon_marshmallow_goliath_armored" }, "reproduction": { "baby_egg": "smores", "baby_count": 7, "baby_timer": 12 } @@ -195,6 +200,7 @@ "color": "brown_magenta", "armor_bash": 9, "armor_cut": 11, + "armor_bullet": 9, "reproduction": { "baby_egg": "smores", "baby_count": 10, "baby_timer": 10 } }, { @@ -270,6 +276,7 @@ "melee_cut": 2, "dodge": 4, "armor_cut": 10, + "armor_bullet": 8, "armor_stab": 25, "vision_day": 30, "vision_night": 3, @@ -301,6 +308,7 @@ "melee_cut": 4, "dodge": 3, "armor_cut": 20, + "armor_bullet": 27, "armor_stab": 27, "vision_day": 30, "vision_night": 3, @@ -366,6 +374,7 @@ "dodge": 2, "armor_bash": 2, "armor_cut": 4, + "armor_bullet": 3, "vision_day": 5, "vision_night": 5, "harvest": "gum_spider", @@ -398,6 +407,7 @@ "dodge": 4, "armor_bash": 4, "armor_cut": 8, + "armor_bullet": 6, "vision_day": 5, "vision_night": 5, "harvest": "caff_gum_spider",