Animal ports from TropiCata to Mainline + egg density fixes for insects and birds

data/json/items/biosignatures.json

@@ -71,5 +71,23 @@
       "charges_to_use": 1,
       "effects": [ { "id": "fetid_goop", "duration": 3600 } ]
     }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "insect_dust",
+    "name": { "str_sp": "chitin dust" },
+    "category": "spare_parts",
+    "weight": "40 g",
+    "color": "white",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "description": "The dust left over by winged insects such as butterflies or moths.  It's mostly chitin but may also contain dirt and other gross materials.",
+    "price": 0,
+    "price_postapoc": 0,
+    "material": [ "chitin" ],
+    "flags": [ "NO_SALVAGE" ],
+    "volume": "250 ml",
+    "charges": 4,
+    "stack_size": 4
   }
 ]

data/json/items/comestibles/egg.json

@@ -3,7 +3,7 @@
     "type": "COMESTIBLE",
     "id": "egg_bird",
     "name": { "str": "bird egg" },
-    "weight": "57 g",
+    "weight": "55 g",
     "color": "brown",
     "spoils_in": "7 days",
     "comestible_type": "FOOD",
@@ -113,8 +113,8 @@
     "name": { "str": "goose egg" },
     "copy-from": "egg_chicken",
     "calories": 266,
-    "volume": "125 ml",
-    "weight": "144 g",
+    "volume": "130 ml",
+    "weight": "143 g",
     "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ],
     "rot_spawn": "GROUP_EGG_GOOSE_CANADIAN"
   },
@@ -176,7 +176,7 @@
     "material": [ "egg" ],
     "stack_size": 1,
     "volume": "250 ml",
-    "weight": "300 g",
+    "weight": "275 g",
     "calories": 240,
     "quench": 10,
     "fun": -20,
@@ -637,5 +637,104 @@
     "volume": "650 ml",
     "description": "A large clump of the eggs of a frog.  The eggs themselves are gelatinous and transparent.",
     "rot_spawn": "GROUP_EGG_FROG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_goose",
+    "name": "goose egg",
+    "copy-from": "egg_goose_canadian",
+    "rot_spawn": "GROUP_EGG_GOOSE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_goose_golden",
+    "name": "golden goose egg",
+    "copy-from": "egg_goose_canadian",
+    "proportional": { "weight": 2, "calories": 2, "volume": 2 },
+    "rot_spawn": "GROUP_EGG_GOOSE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_hummingbird",
+    "name": "hummingbird egg",
+    "copy-from": "egg_crow",
+    "volume": "1 ml",
+    "weight": "1 g",
+    "rot_spawn": "GROUP_EGG_HUMMINGBIRD"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_woodpecker",
+    "name": "woodpecker egg",
+    "copy-from": "egg_crow",
+    "rot_spawn": "GROUP_EGG_WOODPECKER"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_coot",
+    "name": "coot egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_COOT"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_cormorant",
+    "name": "cormorant egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_CORMORANT"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_moorhen",
+    "name": "moorhen egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_MOORHEN"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_grebe",
+    "name": "grebe egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_GREBE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_toad",
+    "name": { "str": "cluster of toad's eggs", "str_pl": "clusters of toad's eggs" },
+    "copy-from": "egg_frog",
+    "description": "A large clump of the eggs of a toad.  The eggs themselves are gelatinous and transparent.",
+    "rot_spawn": "GROUP_EGG_TOAD"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_water_beetle",
+    "name": "water beetle egg",
+    "copy-from": "egg_strider",
+    "description": "The egg of a water beetle, usually found near aquatic grass.",
+    "rot_spawn": "GROUP_EGG_WATER_BEETLE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_water_bug",
+    "name": "water scorpion egg",
+    "copy-from": "egg_strider",
+    "description": "The egg of a water scorpion, usually found near aquatic grass.",
+    "rot_spawn": "GROUP_EGG_WATER_BUG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_butterfly",
+    "name": "butterfly egg",
+    "copy-from": "egg_insect",
+    "description": "The egg of a butterfly.  They are usually found clustered on leaves.",
+    "rot_spawn": "GROUP_EGG_BUTTERFLY"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_cicada",
+    "name": "cicada egg",
+    "copy-from": "egg_insect",
+    "description": "The egg of a cicada.  They are usually found near trees.",
+    "rot_spawn": "GROUP_EGG_CICADA"
   }
 ]

data/json/monster_factions.json

@@ -603,5 +603,10 @@
     "name": "dark_wyrm",
     "base_faction": "mutant",
     "neutral": [ "dark_wyrm" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "beetle",
+    "//": "faction for non-stag beetles, ported from TropiCata"
   }
 ]

data/json/monstergroups/bugs.json

@@ -269,5 +269,22 @@
       { "monster": "mon_halfworm", "weight": 0, "cost_multiplier": 0 },
       { "monster": "mon_worm_small", "weight": 970, "cost_multiplier": 0 }
     ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_BUTTERFLY",
+    "default": "mon_butterfly",
+    "monsters": [ { "monster": "mon_butterfly", "weight": 50 }, { "monster": "mon_moth", "weight": 50 } ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_BUTTERFLY_GIANT",
+    "default": "mon_butterfly_giant",
+    "monsters": [
+      { "monster": "mon_butterfly_giant", "weight": 45 },
+      { "monster": "mon_butterfly_titan", "weight": 5, "cost_multiplier": 2 },
+      { "monster": "mon_moth_giant", "weight": 45 },
+      { "monster": "mon_moth_titan", "weight": 5, "cost_multiplier": 2 }
+    ]
   }
 ]

data/json/monstergroups/eggs.json

@@ -15,6 +15,8 @@
       { "monster": "mon_cardinal_chick", "weight": 15 },
       { "monster": "mon_sparrow_chick", "weight": 15 },
       { "monster": "mon_goose_canadian_chick", "weight": 100 },
+      { "monster": "mon_goose_chick", "freq": 100, "cost_multiplier": 1 },
+      { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 },
       { "monster": "mon_rattlesnake", "weight": 65 }
     ]
   },
@@ -179,5 +181,74 @@
     "name": "GROUP_EGG_FROG",
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_tadpole" } ]
+  },
+  {
+    "name": "GROUP_EGG_GOOSE",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_goose_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_GOOSE_GOLD",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_goose_golden_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_HUMMINGBIRD",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_hummingbird_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_WOODPECKER",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_woodpecker_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_COOT",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_coot_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_CORMORANT",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_cormorant_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_MOORHEN",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_moorhen_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_GREBE",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_grebe_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_TOAD",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_tadpole_brown" } ]
+  },
+  {
+    "name": "GROUP_EGG_WATER_BEETLE",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_diving_larva" } ]
+  },
+  {
+    "name": "GROUP_EGG_WATER_BUG",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_water_scorpion_larva" } ]
+  },
+  {
+    "name": "GROUP_EGG_CICADA",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_cicada_nymph" } ]
+  },
+  {
+    "name": "GROUP_EGG_BUTTERFLY",
+    "type": "monstergroup",
+    "default": "mon_caterpillar",
+    "monsters": [
+      { "monster": "mon_caterpillar_giant", "freq": 25, "cost_multiplier": 1, "starts": "28 days" },
+      { "monster": "mon_caterpillar", "freq": 100, "cost_multiplier": 1 }
+    ]
   }
 ]

data/json/monstergroups/misc.json

@@ -92,6 +92,7 @@
     "//": "Z-2 subways, some lost nether things but otherwise mostly normal mobs",
     "default": "mon_spider_jumping_small",
     "monsters": [
+      { "monster": "mon_woodlouse", "weight": 300, "pack_size": [ 1, 3 ] },
       { "monster": "mon_slug_small", "weight": 180, "ends": "180 hours" },
       { "monster": "mon_slug_giant", "weight": 180, "starts": "180 hours" },
       { "monster": "mon_nakedmolerat_giant", "weight": 100, "cost_multiplier": 2, "ends": "180 hours" },
@@ -231,14 +232,18 @@
       { "monster": "mon_pig", "weight": 10, "cost_multiplier": 25, "ends": "90 days", "pack_size": [ 1, 6 ] },
       { "monster": "mon_sheep", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 12 ] },
       { "monster": "mon_goat", "weight": 25, "cost_multiplier": 25, "pack_size": [ 1, 12 ] },
+      { "monster": "mon_goose", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] },
+      { "monster": "mon_llama", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 8 ] },
       { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "3 days", "pack_size": [ 1, 5 ] },
       { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "7 days", "pack_size": [ 1, 5 ] },
       { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "28 days", "pack_size": [ 1, 5 ] },
       { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "90 days", "pack_size": [ 1, 5 ] },
       { "monster": "mon_giant_cockroach", "weight": 10, "pack_size": [ 1, 5 ] },
       { "monster": "mon_pregnant_giant_cockroach", "weight": 1, "cost_multiplier": 3 },
       { "monster": "mon_giant_cockroach_nymph", "weight": 5 },
-      { "monster": "mon_tiger", "weight": 1, "cost_multiplier": 30 }
+      { "monster": "mon_tiger", "weight": 1, "cost_multiplier": 30 },
+      { "monster": "mon_woodlouse", "weight": 10, "pack_size": [ 1, 5 ] },
+      { "monster": "mon_woodlouse_manca", "weight": 5 }
     ]
   },
   {
@@ -282,7 +287,12 @@
       { "monster": "mon_pig", "weight": 10 },
       { "monster": "mon_sheep", "weight": 10 },
       { "monster": "mon_goat", "weight": 10 },
-      { "monster": "mon_lemming", "weight": 10 }
+      { "monster": "mon_lemming", "weight": 10 },
+      { "monster": "mon_goose", "weight": 10 },
+      { "monster": "mon_goose_golden", "weight": 1 },
+      { "monster": "mon_llama", "weight": 10 },
+      { "monster": "mon_woodlouse", "weight": 10 },
+      { "monster": "mon_cicada_nymph", "weight": 10 }
     ]
   },
   {
@@ -331,7 +341,8 @@
       { "monster": "mon_zombie_child", "weight": 20, "pack_size": [ 2, 6 ] },
       { "monster": "mon_zombie", "weight": 20, "pack_size": [ 2, 6 ] },
       { "monster": "mon_zombie_rot", "weight": 10, "pack_size": [ 1, 5 ] },
-      { "monster": "mon_beekeeper", "weight": 10, "pack_size": [ 1, 5 ] }
+      { "monster": "mon_beekeeper", "weight": 10, "pack_size": [ 1, 5 ] },
+      { "monster": "mon_woodlouse", "weight": 30, "pack_size": [ 4, 8 ] }
     ]
   },
   {
@@ -350,6 +361,9 @@
       { "monster": "mon_slug_giant", "weight": 75, "starts": "180 hours" },
       { "monster": "mon_sludge_crawler", "weight": 25 },
       { "monster": "mon_zombie_mancroc", "weight": 100, "starts": "180 hours" },
+      { "monster": "mon_toad", "weight": 100, "cost_multiplier": 0 },
+      { "monster": "mon_toad_small", "weight": 100, "cost_multiplier": 0 },
+      { "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" },
       { "monster": "mon_zombullfrog", "weight": 10, "cost_multiplier": 2 },
       { "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }
     ]