Update mods

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,

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,

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" ],

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,

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,

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,

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" ],

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",

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,

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" ]

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",

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" ],

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,

data/mods/DinoMod/dinosaur.json

@@ -76,6 +76,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.",
@@ -162,6 +163,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.",
@@ -208,6 +210,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.",
@@ -244,6 +247,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.",
@@ -288,6 +292,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.",
@@ -321,6 +326,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.",
@@ -354,6 +360,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.",
@@ -420,6 +427,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 } ],
@@ -455,6 +463,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 } ],
@@ -490,6 +499,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 } ],
@@ -525,6 +535,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.",
@@ -593,6 +604,7 @@
     "dodge": 1,
     "armor_bash": 3,
     "armor_cut": 1,
+    "armor_bullet": 1,
     "hp": 120,
     "death_function": [ "NORMAL" ],
     "special_attacks": [ [ "BOOMER", 20 ] ],

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" ] }
   }