Continue cleaning up dog JSON (#75231)

* standard dogs

* mutants

data/json/monsters/mammal.json

@@ -1034,7 +1034,7 @@
  "bodytype": "dog",
  "categories": [ "WILDLIFE" ],
  "species": [ "MAMMAL" ],
- "volume": "30000 ml",
+ "volume": "30 L",
  "weight": "30 kg",
  "harvest": "dog_with_skull_fur",
  "dissect": "dissect_lupine_sample_single",
@@ -1089,6 +1089,25 @@
  "EATS"
  ]
  },
+ {
+ "abstract": "mon_dog_small",
+ "type": "MONSTER",
+ "name": { "str": "Small dog abstract" },
+ "description": "This is an abstract for small dogs to copy from, so that they are less likely to mess up fields like zombification by accident.",
+ "copy-from": "mon_dog",
+ "volume": "10 L",
+ "weight": "6 kg",
+ "harvest": "dog_small_with_skull_fur",
+ "hp": 7,
+ "speed": 135,
+ "dodge": 4,
+ "stomach_size": 150,
+ "zombify_into": "",
+ "burn_into": "",
+ "fear_triggers": [ "HURT" ],
+ "//": "NEVER use this abstract without overwriting the reproduction field, otherwise the monster copying from this will birth Labrador puppies",
+ "extend": { "flags": [ "SMALL_HIDER" ] }
+ },
  {
  "id": "mon_dog_pup",
  "type": "MONSTER",
@@ -1097,11 +1116,10 @@
  "description": "An adorable, defenseless Labrador puppy. Much safer to tame than an adult dog.",
  "volume": "750 ml",
  "weight": "1 kg",
- "hp": 8,
+ "hp": 5,
  "speed": 98,
  "aggression": -13,
  "morale": 8,
- "aggro_character": false,
  "melee_skill": 2,
  "melee_dice": 1,
  "melee_dice_sides": 1,
@@ -1124,7 +1142,7 @@
  "type": "MONSTER",
  "name": { "str": "bulldog" },
  "description": "The American bulldog is a hardy, well-built dog that seems suited for surviving the apocalypse.",
- "volume": "25000 ml",
+ "volume": "25 L",
  "weight": "25 kg",
  "hp": 47,
  "speed": 135,
@@ -1142,7 +1160,6 @@
  "copy-from": "mon_dog_pup",
  "name": { "str": "bulldog puppy", "str_pl": "bulldog puppies" },
  "description": "An adorable, defenseless American bulldog puppy. Much safer to tame than an adult dog.",
- "hp": 12,
  "speed": 88,
  "aggression": -11,
  "melee_skill": 1,
@@ -1175,7 +1192,6 @@
  "copy-from": "mon_dog_pup",
  "name": { "str": "pit bull puppy", "str_pl": "pit bull puppies" },
  "description": "An adorable, defenseless pit bull puppy. Much safer to tame than an adult dog.",
- "hp": 7,
  "speed": 88,
  "aggression": -12,
  "morale": 6,
@@ -1184,38 +1200,31 @@
  },
  {
  "id": "mon_dog_beagle",
- "copy-from": "mon_dog",
+ "copy-from": "mon_dog_small",
  "type": "MONSTER",
  "name": { "str": "beagle" },
  "description": "An adorable beagle that has managed to survive the apocalypse. Small and agile, but not especially tough. Generally attacks in packs.",
  "weight": "10 kg",
  "harvest": "dog_small_with_skull_leather",
  "hp": 13,
- "speed": 135,
  "melee_skill": 2,
  "melee_dice": 1,
  "melee_dice_sides": 1,
  "stomach_size": 115,
  "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
- "zombify_into": "",
- "burn_into": "",
- "fear_triggers": [ "HURT" ],
  "reproduction": { "baby_monster": "mon_dog_beagle_pup", "baby_count": 4, "baby_timer": 270 },
- "//": "1-4 puppies & 270 days per-litter for size tiny canines",
- "extend": { "flags": [ "HARDTOSHOOT", "SMALL_HIDER" ] }
+ "//": "1-4 puppies & 270 days per-litter for size tiny canines"
  },
  {
  "id": "mon_dog_beagle_pup",
  "type": "MONSTER",
  "copy-from": "mon_dog_pup",
  "name": { "str": "beagle puppy", "str_pl": "beagle puppies" },
  "description": "An adorable, defenseless beagle puppy. Much safer to tame than an adult dog.",
- "hp": 4,
  "speed": 88,
  "stomach_size": 100,
  "harvest": "dog_tiny_with_skull",
- "upgrades": { "age_grow": 42, "into": "mon_dog_beagle" },
- "extend": { "flags": [ "HARDTOSHOOT" ] }
+ "upgrades": { "age_grow": 42, "into": "mon_dog_beagle" }
  },
  {
  "id": "mon_dog_bcollie",
@@ -1240,7 +1249,6 @@
  "copy-from": "mon_dog_pup",
  "name": { "str": "border collie puppy", "str_pl": "border collie puppies" },
  "description": "An adorable, defenseless Border Collie puppy. Much safer to tame than an adult dog.",
- "hp": 5,
  "speed": 130,
  "aggression": -12,
  "morale": 5,
@@ -1274,24 +1282,21 @@
  "copy-from": "mon_dog_pup",
  "name": { "str": "boxer puppy", "str_pl": "boxer puppies" },
  "description": "An adorable, defenseless boxer puppy. Much safer to tame than an adult dog.",
- "diff": 3,
- "hp": 7,
  "aggression": -12,
  "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
  "vision_night": 3,
  "upgrades": { "age_grow": 42, "into": "mon_dog_boxer" }
  },
  {
  "id": "mon_dog_chihuahua",
- "copy-from": "mon_dog",
+ "copy-from": "mon_dog_small",
  "type": "MONSTER",
  "name": { "str": "Chihuahua" },
  "description": "It's a tiny Chihuahua. How it has managed to survive is a miracle, although its small size and aggressive nature may have proven useful.",
  "default_faction": "dog_small",
  "volume": "750 ml",
  "weight": "2200 g",
  "hp": 6,
- "speed": 135,
  "aggression": 4,
  "morale": 8,
  "melee_skill": 3,
@@ -1300,10 +1305,6 @@
  "stomach_size": 115,
  "vision_night": 6,
  "harvest": "dog_tiny_with_skull",
- "fear_triggers": [ "HURT" ],
- "zombify_into": "",
- "burn_into": "",
- "extend": { "flags": [ "HARDTOSHOOT", "SMALL_HIDER" ] },
  "reproduction": { "baby_monster": "mon_dog_chihuahua_pup", "baby_count": 3, "baby_timer": 240 },
  "//": "1-3 puppies & 240 days per-litter for size tiny canines"
  },
@@ -1324,29 +1325,23 @@
  "stomach_size": 100,
  "vision_night": 5,
  "harvest": "mammal_tiny",
- "upgrades": { "age_grow": 42, "into": "mon_dog_chihuahua" },
- "extend": { "flags": [ "HARDTOSHOOT" ] }
+ "upgrades": { "age_grow": 42, "into": "mon_dog_chihuahua" }
  },
  {
  "id": "mon_dog_dachshund",
- "copy-from": "mon_dog",
+ "copy-from": "mon_dog_small",
  "type": "MONSTER",
  "name": { "str": "dachshund" },
  "description": "A wiener dog! This awkward looking dog can be a useful watchdog, plus it looks adorable as it bumbles around. Needless to say, it doesn't make a good attack dog.",
  "hp": 10,
  "weight": "10 kg",
- "speed": 135,
  "aggression": -4,
  "morale": 10,
  "melee_skill": 3,
  "melee_dice_sides": 2,
  "stomach_size": 115,
  "vision_night": 6,
- "fear_triggers": [ "HURT" ],
  "harvest": "dog_small_with_skull_leather",
- "zombify_into": "",
- "burn_into": "",
- "extend": { "flags": [ "STUMBLES", "SMALL_HIDER", "HARDTOSHOOT" ] },
  "reproduction": { "baby_monster": "mon_dog_dachshund_pup", "baby_count": 4, "baby_timer": 270 },
  "//": "1-4 puppies & 270 days per-litter for size small canines"
  },
@@ -1356,23 +1351,21 @@
  "copy-from": "mon_dog_pup",
  "name": { "str": "dachshund puppy", "str_pl": "dachshund puppies" },
  "description": "An adorable, defenseless dachshund puppy. Much safer to tame than an adult dog.",
- "hp": 3,
  "aggression": -12,
  "morale": 5,
  "melee_skill": 1,
  "stomach_size": 100,
  "vision_night": 5,
  "harvest": "dog_tiny_with_skull",
- "upgrades": { "age_grow": 42, "into": "mon_dog_dachshund" },
- "extend": { "flags": [ "STUMBLES", "HARDTOSHOOT" ] }
+ "upgrades": { "age_grow": 42, "into": "mon_dog_dachshund" }
  },
  {
  "id": "mon_dog_gshepherd",
  "copy-from": "mon_dog",
  "type": "MONSTER",
  "name": { "str": "German shepherd" },
  "description": "The original K-9 breed. An easily trained and powerful attack dog that will defend its owner to the death, however they don't work well in packs.",
- "volume": "35000 ml",
+ "volume": "35 L",
  "weight": "35 kg",
  "hp": 36,
  "aggression": 2,
@@ -1390,7 +1383,6 @@
  "copy-from": "mon_dog_pup",
  "name": { "str": "German shepherd puppy", "str_pl": "German shepherd puppies" },
  "description": "An adorable, defenseless German Shepherd puppy. Much safer to tame than an adult dog.",
- "hp": 9,
  "aggression": -12,
  "morale": 5,
  "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
@@ -1427,7 +1419,6 @@
  "copy-from": "mon_dog_pup",
  "name": { "str": "Great Pyrenees puppy", "str_pl": "Great Pyrenees puppies" },
  "description": "An adorable, defenseless Great Pyrenees puppy. Much safer to tame than an adult dog.",
- "hp": 10,
  "speed": 65,
  "aggression": -12,
  "morale": 5,
@@ -1443,7 +1434,7 @@
  "name": { "str": "rottweiler" },
  "//": "Rare, location specific only",
  "description": "A terrifying breed to face feral, Rottweilers are descended from Roman legion mastiffs. It's robust, vicious, and quite capable of mauling a human to death.",
- "volume": "50000 ml",
+ "volume": "50 L",
  "weight": "50 kg",
  "hp": 42,
  "speed": 135,
@@ -1465,7 +1456,6 @@
  "copy-from": "mon_dog_pup",
  "name": { "str": "rottweiler puppy", "str_pl": "rottweiler puppies" },
  "description": "An adorable, defenseless Rottweiler puppy. Much safer to tame than an adult dog.",
- "hp": 11,
  "aggression": -11,
  "morale": 4,
  "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
@@ -1498,7 +1488,6 @@
  "copy-from": "mon_dog_pup",
  "name": { "str": "cattle dog puppy", "str_pl": "cattle dog puppies" },
  "description": "An adorable, defenseless Australian cattle dog puppy. Much safer to tame than an adult dog.",
- "hp": 5,
  "speed": 130,
  "aggression": -12,
  "morale": 5,