Monster faction shenanigans

data/json/monster_factions.json

@@ -95,13 +95,20 @@
     "base_faction": "animal",
     "friendly": [ "attack_player_only" ],
     "neutral": [ "zombie", "fish", "exodii", "isolated_artisans", "nether", "animal", "yrax", "passive_machine" ],
-    "by_mood": [ "cat", "bear", "fox", "big_cat", "dog", "wolf" ]
+    "by_mood": [ "cat", "bear", "fox", "big_cat", "dog", "wolf", "dog_small" ]
   },
   {
     "type": "MONSTER_FACTION",
     "name": "herbivore",
     "base_faction": "animal",
-    "neutral": [ "small_animal", "fish", "exodii", "isolated_artisans", "yrax", "passive_machine" ]
+    "neutral": [ "small_animal", "fish", "exodii", "isolated_artisans", "yrax", "passive_machine" ],
+    "by_mood": [ "herbivore_domestic" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "herbivore_domestic",
+    "base_faction": "herbivore",
+    "by_mood": [ "herbivore" ]
   },
   {
     "type": "MONSTER_FACTION",
@@ -133,6 +140,7 @@
     "type": "MONSTER_FACTION",
     "name": "cat",
     "base_faction": "small_animal",
+    "neutral": [ "dog_small" ],
     "hate": [ "small_animal" ]
   },
   {
@@ -141,6 +149,13 @@
     "base_faction": "animal",
     "hate": [ "small_animal" ]
   },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "dog_small",
+    "base_faction": "small_animal",
+    "neutral": [ "cat" ],
+    "hate": [ "small_animal" ]
+  },
   {
     "type": "MONSTER_FACTION",
     "name": "pig",

data/json/monsters/insect_spider.json

@@ -2994,8 +2994,9 @@
   {
     "id": "mon_lady_bug_larva",
     "type": "MONSTER",
-    "name": { "str": "ladybug larva", "str_pl": "ladybug larvae" },
+    "name": { "str": "lady bug larva", "str_pl": "lady bug larvae" },
     "description": "A large armored larva looking not unlike a centipede.  Even though it's just a juvenile the armor on its back already looks functional.",
+    "default_faction": "ladybug",
     "copy-from": "mon_larva_abstract",
     "volume": "20 L",
     "weight": "10 kg",

data/json/monsters/mammal.json

@@ -774,7 +774,7 @@
     "type": "MONSTER",
     "name": { "str": "calf", "str_pl": "calves" },
     "description": "The domestic cow, a baleful, ruminating farm animal.  This one is still a juvenile; it'll take a while before you can get any milk or a meaningful amount of meat from her.",
-    "default_faction": "herbivore",
+    "default_faction": "herbivore_domestic",
     "bodytype": "dog",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
@@ -815,7 +815,7 @@
     "type": "MONSTER",
     "name": { "str": "cow" },
     "description": "The domestic cow, a baleful, ruminating farm animal.  She is quite muscular, and would be a great source of milk if domesticated or of meat and leather if slaughtered.",
-    "default_faction": "herbivore",
+    "default_faction": "herbivore_domestic",
     "bodytype": "dog",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
@@ -1543,6 +1543,7 @@
     "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,
@@ -1586,7 +1587,7 @@
     "type": "MONSTER",
     "name": { "str": "Chihuahua puppy", "str_pl": "Chihuahua puppies" },
     "description": "An adorable, defenseless Chihuahua puppy.  Much safer to tame than an adult dog.",
-    "default_faction": "dog",
+    "default_faction": "dog_small",
     "bodytype": "dog",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
@@ -2263,7 +2264,7 @@
     "name": { "str": "foal" },
     "looks_like": "mon_horse",
     "description": "A hooved grazing mammal with a mane of hair, a sweeping tail, and powerful-looking muscles.  This one is still a juvenile; it'll take a while before it can be ridden.",
-    "default_faction": "herbivore",
+    "default_faction": "herbivore_domestic",
     "bodytype": "horse",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
@@ -2311,7 +2312,7 @@
     "type": "MONSTER",
     "name": { "str": "horse" },
     "description": "A hooved grazing mammal with a mane of hair, a sweeping tail, and powerful-looking muscles.  A stalwart companion to humans for longer than recorded history, with some effort you should be able to get this one to trust you enough to ride it.",
-    "default_faction": "herbivore",
+    "default_faction": "herbivore_domestic",
     "bodytype": "horse",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
@@ -2940,7 +2941,7 @@
     "type": "MONSTER",
     "name": { "str": "lamb" },
     "description": "A timid, hooved grazing mammal, and one of the first animals ever domesticated.  Its body is covered in a thick layer of wool.",
-    "default_faction": "herbivore",
+    "default_faction": "herbivore_domestic",
     "bodytype": "dog",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
@@ -2974,7 +2975,7 @@
     "type": "MONSTER",
     "name": { "str_sp": "sheep" },
     "description": "A timid, hooved grazing mammal, and one of the first animals ever domesticated.  Its body is covered in a thick layer of wool, and the males have long, spiraling horns.",
-    "default_faction": "herbivore",
+    "default_faction": "herbivore_domestic",
     "bodytype": "dog",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
@@ -3281,7 +3282,7 @@
     "type": "MONSTER",
     "name": { "str": "llama calf" },
     "description": "A baby llama.  Unlike their parents, the calves tend to be more friendly in demeanor.",
-    "default_faction": "herbivore",
+    "default_faction": "herbivore_domestic",
     "bodytype": "horse",
     "looks_like": "mon_llama",
     "categories": [ "WILDLIFE" ],
@@ -3315,7 +3316,7 @@
     "type": "MONSTER",
     "name": { "str_sp": "llama" },
     "description": "A big and wooly herbivore domesticated by the Andean cultures of South America.  Llamas and their kin are distant relatives to camels and are adapted to mountain environments.",
-    "default_faction": "herbivore",
+    "default_faction": "herbivore_domestic",
     "bodytype": "horse",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],

data/json/monsters/mutant_mammal.json

@@ -63,7 +63,7 @@
     "type": "MONSTER",
     "name": { "str": "dambreaker" },
     "description": "This mutated beaver is almost double its normal size, and its back is covered with tough-looking bristles.",
-    "default_faction": "small_animal",
+    "default_faction": "herbivore",
     "bodytype": "bear",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],