Merge remote-tracking branch 'origin/pr/49170'

* origin/pr/49170: (52 commits) Remove duplicated antlion egg Update egg.json Update data/json/monster_factions.json Update insect_spider.json Update insect_spider.json Update eggs.json add more eggs Update egg.json Update insect_spider.json aphids reproduction fix lint json Remove poison flag Fixed antlions factions Update mob description Commits Aphid reproduction Antlion harvest Antlion reproduction fixed striders swimming Apply suggestions from code review ...
SuddenEyePuncture · Jul 23, 2021 · b1b40ff · b1b40ff
2 parents cb7f752 + 2d60945
commit b1b40ff
Show file tree

Hide file tree

Showing 11 changed files with 620 additions and 11 deletions.
diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -249,6 +249,72 @@
     "rot_spawn": "GROUP_EGG_WASP",
     "rot_spawn_chance": 100
   },
+  { "id": "egg_antlion",
+    "name": { "str": "antlion egg" },
+    "copy-from": "egg_insect",
+    "color": "yellow",
+    "symbol": "o",
+    "proportional": { "weight": 2, "calories": 2, "volume": 2 },
+    "vitamins": [ [ "vitA", 38 ], [ "calcium", 14 ], [ "iron", 36 ], [ "vitB", 132 ], [ "mutant_toxin", 50 ] ],
+    "spoils_in": "5 days",
+    "description": "A large white antlion egg.  There is something hard inside.",
+    "rot_spawn": "GROUP_EGG_ANTLION",
+    "rot_spawn_chance": 50
+  },
+  {
+    "id": "egg_strider",
+    "name": { "str": "water strider egg" },
+    "copy-from": "egg_insect",
+    "color": "light_gray",
+    "symbol": "o",
+    "spoils_in": "3 days",
+    "description": "A large, sticky and wet water strider egg.  You should probably put it back in the water.",
+    "rot_spawn": "GROUP_EGG_STRIDER",
+    "rot_spawn_chance": 100
+  },
+  {
+    "id": "egg_grasshopper",
+    "name": { "str": "grasshopper egg" },
+    "copy-from": "egg_insect",
+    "color": "light_green",
+    "symbol": "o",
+    "description": "A white and long pill-shaped grasshopper egg.  Inside you can see two twitching legs.",
+    "rot_spawn": "GROUP_EGG_GRASSHOPPER",
+    "rot_spawn_chance": 100
+  },
+  {
+    "id": "egg_lady_bug",
+    "name": { "str": "lady bug egg" },
+    "copy-from": "egg_insect",
+    "color": "light_red",
+    "symbol": "o",
+    "spoils_in": "7 days",
+    "description": "A lady bug egg.  It looks like a huge yellow rice grain.  Inside there is a hungry translucent lavrae.",
+    "rot_spawn": "GROUP_EGG_LADY_BUG",
+    "rot_spawn_chance": 50
+  },
+  {
+    "id": "egg_mole_cricket",
+    "name": { "str": "mole cricket egg" },
+    "copy-from": "egg_insect",
+    "color": "brown",
+    "symbol": "o",
+    "spoils_in": "9 days",
+    "description": "A mole cricket egg covered in bits of sand and dirt.  It's brown with a few black dots on it.",
+    "rot_spawn": "GROUP_EGG_MOLE_CRICKET",
+    "rot_spawn_chance": 50
+  },
+  {
+    "id": "egg_mantis",
+    "name": { "str": "praying mantis egg case" },
+    "copy-from": "egg_insect",
+    "color": "green",
+    "symbol": "%",
+    "spoils_in": "13 days",
+    "description": "Praying mantis eggs glued to each other inside a strange-looking case.  It resembles a trilobite or woodlouse.",
+    "rot_spawn": "GROUP_EGG_MANTIS",
+    "rot_spawn_chance": 50
+  },
   {
     "type": "COMESTIBLE",
     "id": "razorclaw_roe",

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -84,6 +84,23 @@
     "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ],
     "fun": -5
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "honeydew",
+    "name": { "str": "honeydew" },
+    "description": "A sugar-rich sticky substance, produced by aphids from plant sap.  Ants and bees love it.",
+    "weight": "22 g",
+    "color": "green",
+    "symbol": "~",
+    "material": [ "honey" ],
+    "quench": 4,
+    "calories": 67,
+    "charges": 16,
+    "fun": 2,
+    "comestible_type": "FOOD",
+    "flags": [ "NUTRIENT_OVERRIDE" ],
+    "volume": "250 ml"
+  },
   {
     "type": "COMESTIBLE",
     "id": "marloss_berry",

diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json
@@ -365,20 +365,62 @@
     "type": "MONSTER_FACTION",
     "name": "ant",
     "base_faction": "insect",
-    "by_mood": [ "zombie", "fungus" ]
+    "by_mood": [ "zombie", "fungus" ],
+    "neutral": [ "aphid" ]
   },
   {
     "type": "MONSTER_FACTION",
     "name": "acid_ant",
     "base_faction": "insect",
-    "by_mood": [ "zombie", "fungus" ]
+    "by_mood": [ "zombie", "fungus" ],
+    "neutral": [ "aphid" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "aphid",
+    "base_faction": "insect",
+    "neutral": [ "ant", "acid_ant" ]
   },
   {
     "type": "MONSTER_FACTION",
     "name": "crayfish",
     "base_faction": "insect",
     "hate": "fish"
   },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "antlion_grub",
+    "base_faction": "insect",
+    "neutral": [ "antlion_grub", "antlion_adult" ],
+    "by_mood": [ "zombie", "fungus", "bee" ],
+    "hate": [ "insect", "small_animal", "ant", "acid_ant" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "antlion_adult",
+    "base_faction": "insect",
+    "neutral": [ "antlion_grub", "antlion_adult" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "ladybug",
+    "base_faction": "insect",
+    "by_mood": [ "zombie", "bee", "insect" ],
+    "hate": [ "small_animal", "ant", "acid_ant" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "mantis",
+    "base_faction": "insect",
+    "by_mood": [ "centipede", "spider", "ant", "acid_ant" ],
+    "hate": [ "insect", "small_animal" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "strider",
+    "base_faction": "insect",
+    "hate": [ "small_animal", "fish" ]
+  },
   {
     "type": "MONSTER_FACTION",
     "name": "fungus",

diff --git a/data/json/monstergroups/bugs.json b/data/json/monstergroups/bugs.json
@@ -10,6 +10,19 @@
       { "monster": "mon_ant_queen", "freq": 0, "cost_multiplier": 0 }
     ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_ANT_SURFACE",
+    "default": "mon_ant_small",
+    "is_animal": true,
+    "monsters": [
+      { "monster": "mon_ant_soldier", "freq": 90, "cost_multiplier": 5 },
+      { "monster": "mon_aphid", "freq": 40, "pack_size": [ 3, 10 ], "cost_multiplier": 0 },
+      { "monster": "mon_lady_bug_giant", "freq": 10, "pack_size": [ 1, 3 ], "cost_multiplier": 10 },
+      { "monster": "mon_antlion_larva", "freq": 5, "cost_multiplier": 10 },
+      { "monster": "mon_antlion_giant", "freq": 3, "cost_multiplier": 10 }
+    ]
+  },
   {
     "type": "monstergroup",
     "name": "GROUP_ANT_ACID",

diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
@@ -117,5 +117,41 @@
       { "monster": "mon_dragonfly_naiad", "freq": 500, "cost_multiplier": 1, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] },
       { "monster": "mon_dragonfly_naiad", "freq": 500, "cost_multiplier": 1, "conditions": [ "SUMMER" ] }
     ]
+  },
+  {
+    "name": "GROUP_EGG_ANTLION",
+    "type": "monstergroup",
+    "default": "mon_antlion_larva",
+    "monsters": [ { "monster": "mon_antlion_larva", "freq": 1000, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_STRIDER",
+    "type": "monstergroup",
+    "default": "mon_strider_small",
+    "monsters": [ { "monster": "mon_strider_small", "freq": 1000, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_GRASSHOPPER",
+    "type": "monstergroup",
+    "default": "mon_grasshopper_small",
+    "monsters": [ { "monster": "mon_grasshopper_small", "freq": 1000, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_LADY_BUG",
+    "type": "monstergroup",
+    "default": "mon_lady_bug_giant",
+    "monsters": [ { "monster": "mon_lady_bug_giant", "freq": 1000, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_MOLE_CRICKET",
+    "type": "monstergroup",
+    "default": "mon_mole_cricket",
+    "monsters": [ { "monster": "mon_mole_cricket", "freq": 1000, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_MANTIS",
+    "type": "monstergroup",
+    "default": "mon_mantis_small",
+    "monsters": [ { "monster": "mon_mantis_small", "freq": 1000, "cost_multiplier": 1 } ]
   }
 ]
diff --git a/data/json/monstergroups/fish.json b/data/json/monstergroups/fish.json
@@ -324,7 +324,8 @@
         "cost_multiplier": 3,
         "conditions": [ "SPRING", "SUMMER" ],
         "pack_size": [ 1, 3 ]
-      }
+      },
+      { "monster": "mon_strider_small", "freq": 35, "cost_multiplier": 3, "pack_size": [ 3, 6 ] }
     ],
     "freq_total": 1740
   },

diff --git a/data/json/monstergroups/lab.json b/data/json/monstergroups/lab.json
@@ -58,6 +58,7 @@
       { "monster": "mon_zombie_electric", "freq": 50, "cost_multiplier": 3 },
       { "monster": "mon_zombie_necro", "freq": 15, "cost_multiplier": 15 },
       { "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 },
+      { "monster": "mon_mole_cricket", "freq": 20, "cost_multiplier": 3 },
       { "monster": "mon_lab_rat", "freq": 30, "cost_multiplier": 20, "pack_size": [ 4, 8 ] }
     ],
     "freq_total": 2622
@@ -183,6 +184,7 @@
       { "monster": "mon_zombie_electric", "freq": 10, "cost_multiplier": 3 },
       { "monster": "mon_zombie_necro", "freq": 1, "cost_multiplier": 15 },
       { "monster": "mon_zombie_brute_shocker", "freq": 1, "cost_multiplier": 5 },
+      { "monster": "mon_mole_cricket", "freq": 2, "cost_multiplier": 3 },
       { "monster": "mon_lab_rat", "freq": 20, "cost_multiplier": 20, "pack_size": [ 2, 8 ] }
     ]
   },

diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json
@@ -9,7 +9,8 @@
       { "monster": "mon_bear", "freq": 100, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
       { "monster": "mon_cougar", "freq": 100, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
       { "monster": "mon_mutant_experimental", "freq": 25, "cost_multiplier": 3 },
-      { "monster": "mon_nakedmolerat_giant", "freq": 100, "cost_multiplier": 3 }
+      { "monster": "mon_nakedmolerat_giant", "freq": 100, "cost_multiplier": 3 },
+      { "monster": "mon_mole_cricket", "freq": 60, "cost_multiplier": 3 }
     ]
   },
   {
@@ -1808,7 +1809,13 @@
         "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
       },
       { "monster": "mon_nakedmolerat_giant", "freq": 1, "cost_multiplier": 3, "conditions": [ "DUSK", "NIGHT" ] },
-      { "monster": "mon_mutant_experimental", "freq": 3, "cost_multiplier": 0, "conditions": [ "DUSK", "NIGHT" ] }
+      { "monster": "mon_mutant_experimental", "freq": 3, "cost_multiplier": 0, "conditions": [ "DUSK", "NIGHT" ] },
+      { "monster": "mon_mantis_small", "freq": 8, "cost_multiplier": 10 },
+      { "monster": "mon_lady_bug_giant", "freq": 5, "cost_multiplier": 10 },
+      { "monster": "mon_aphid", "freq": 15, "pack_size": [ 1, 5 ], "cost_multiplier": 0 },
+      { "monster": "mon_grasshopper_small", "freq": 15, "pack_size": [ 1, 3 ], "cost_multiplier": 0 },
+      { "monster": "mon_antlion_larva", "freq": 7, "cost_multiplier": 10 },
+      { "monster": "mon_antlion_giant", "freq": 2, "cost_multiplier": 10 }
     ]
   },
   {
@@ -2219,7 +2226,8 @@
       },
       { "monster": "mon_fish_blinky", "freq": 5, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
       { "monster": "mon_dragonfly_naiad", "freq": 10, "cost_multiplier": 2, "ends": 168 },
-      { "monster": "mon_dragonfly_naiad", "freq": 30, "cost_multiplier": 3, "starts": 168, "pack_size": [ 1, 3 ] }
+      { "monster": "mon_dragonfly_naiad", "freq": 30, "cost_multiplier": 3, "starts": 168, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_strider_small", "freq": 15, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }
     ]
   },
   {
@@ -2759,7 +2767,9 @@
         "starts": 360,
         "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
       },
-      { "monster": "mon_mutant_experimental", "freq": 2, "cost_multiplier": 6 }
+      { "monster": "mon_mutant_experimental", "freq": 2, "cost_multiplier": 6 },
+      { "monster": "mon_mantis_small", "freq": 2, "cost_multiplier": 8 },
+      { "monster": "mon_antlion_giant", "freq": 4, "cost_multiplier": 10 }
     ]
   },
   {
@@ -2789,7 +2799,13 @@
       { "monster": "mon_fox_red", "freq": 50, "cost_multiplier": 0 },
       { "monster": "mon_rabbit", "freq": 50, "cost_multiplier": 0 },
       { "monster": "mon_squirrel", "freq": 50, "cost_multiplier": 0 },
-      { "monster": "mon_squirrel_red", "freq": 50, "cost_multiplier": 0 }
+      { "monster": "mon_squirrel_red", "freq": 50, "cost_multiplier": 0 },
+      { "monster": "mon_mantis_small", "freq": 5, "cost_multiplier": 10 },
+      { "monster": "mon_lady_bug_giant", "freq": 8, "cost_multiplier": 10 },
+      { "monster": "mon_aphid", "freq": 20, "cost_multiplier": 0 },
+      { "monster": "mon_grasshopper_small", "freq": 30, "cost_multiplier": 0 },
+      { "monster": "mon_antlion_larva", "freq": 7, "cost_multiplier": 10 },
+      { "monster": "mon_antlion_giant", "freq": 5, "cost_multiplier": 10 }
     ]
   },
   {
@@ -2872,7 +2888,8 @@
     "monsters": [
       { "monster": "mon_fish_bluegill", "freq": 50, "cost_multiplier": 0 },
       { "monster": "mon_fish_carp", "freq": 50, "cost_multiplier": 0 },
-      { "monster": "mon_fish_sbass", "freq": 50, "cost_multiplier": 0 }
+      { "monster": "mon_fish_sbass", "freq": 50, "cost_multiplier": 0 },
+      { "monster": "mon_strider_small", "freq": 30, "cost_multiplier": 0, "pack_size": [ 3, 6 ] }
     ]
   }
 ]