small fixes

remove duplications and fixed bugs
SuddenEyePuncture · Jul 22, 2021 · 2d32b3c · 2d32b3c
2 parents d1b95a6 + 959ca88
commit 2d32b3c
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 28 deletions.
diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -261,6 +261,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/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
@@ -123,5 +123,35 @@
     "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/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
@@ -2021,23 +2021,6 @@
     "special_attacks": [ { "type": "leap", "cooldown": 4, "max_range": 4, "allow_no_target": true }, [ "EAT_CROP", 120 ] ],
     "fear_triggers": [ "HURT", "FIRE" ],
     "flags": [ "SEES", "HEARS", "SMELLS", "CLIMBS", "LARVA", "STUMBLES", "PATH_AVOID_FIRE" ]
-  },
-   {
-    "id": "mon_aphid_small",
-    "type": "MONSTER",
-    "name": { "str": "big aphid" },
-    "description": "This huge aphid is as big as a hamster.  It's not as thirsty as bigger ones, but a herd of these could eat your crops easily.",
-    "copy-from": "mon_aphid",
-    "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.5 },
-    "volume": "96 ml",
-    "weight": "96 g",
-    "special_attacks": [ [ "EAT_FOOD", 400 ], [ "EAT_CROP", 600 ] ],
-    "delete": {
-      "reproduction": { "baby_monster": "mon_aphid", "baby_count": 1, "baby_timer": 20 },
-      "baby_flags": [ "SPRING", "SUMMER" ]
-    },
-    "biosignature": { "biosig_item": "honeydew", "biosig_timer": 7000 },
-    "upgrades": { "half_life": 14, "into": "mon_aphid" }
   },
   {
     "id": "mon_aphid_small",
@@ -2054,7 +2037,7 @@
       "baby_flags": [ "SPRING", "SUMMER" ]
     },
     "biosignature": { "biosig_item": "honeydew", "biosig_timer": 7000 },
-    "upgrades": { "half_life": 14, "into": "mon_aphid" }
+    "upgrades": { "age_grow": 8, "into": "mon_aphid" }
   },
   {
     "id": "mon_aphid",
@@ -2103,7 +2086,11 @@
     "volume": "60 L",
     "weight": "80 kg",
     "melee_cut": 8,
-    "upgrades": { "half_life": 14, "into": "mon_mantis_giant" }
+    "delete": {
+    "reproduction": { "baby_egg": "egg_mantis", "baby_count": 1, "baby_timer": 30 },
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ]
+    },
+    "upgrades": { "age_grow": 14, "into": "mon_mantis_giant" }
   },
   {
     "id": "mon_mantis_giant",
@@ -2142,12 +2129,15 @@
     "harvest": "arachnid",
     "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ],
     "fear_triggers": [ "FIRE", "HURT" ],
+    "reproduction": { "baby_egg": "egg_mantis", "baby_count": 1, "baby_timer": 30 },
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
     "death_function": [ "NORMAL" ],
     "special_attacks": [
       [ "RANGED_PULL", 30 ],
       [ "GRAB_DRAG", 10 ],
       { "type": "leap", "cooldown": 8, "max_range": 5, "allow_no_target": false }
     ],
+    "upgrades": { "age_grow": 21, "into": "mon_mantis_mega" },
     "flags": [ "SEES", "HEARS", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ]
   },
   {
@@ -2162,7 +2152,14 @@
     "color": "red_green",
     "weight": "815 kg",
     "melee_dice": 2,
-    "melee_cut": 20,
+    "melee_damage":
+  [ 
+  {
+    "damage_type": "cut",
+    "amount": 15.0,
+    "armor_penetration": 16
+  }
+  ],
     "dodge": 2,
     "attack_cost": 25,
     "special_attacks": [
@@ -2174,11 +2171,13 @@
         "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_penetration": 0.6 } ]
       },
       [ "RANGED_PULL", 30 ],
-      [ "GRAB_DRAG", 10 ],
-      { "type": "leap", "cooldown": 8, "max_range": 5, "allow_no_target": false }
+      [ "GRAB_DRAG", 10 ]
     ],
     "extend": { "flags": [ "DESTROYS", "PUSH_MON", "PUSH_VEH" ] },
-    "delete": { "type": "leap", "cooldown": 8, "max_range": 5, "allow_no_target": false }
+    "delete": {
+    "type": "leap", "cooldown": 8, "max_range": 5, "allow_no_target": false,
+    "upgrades": { "age_grow": 21, "into": "mon_mantis_mega" }
+    }
   },
   {
     "id": "mon_mole_cricket",
@@ -2207,17 +2206,19 @@
     "vision_day": 10,
     "vision_night": 15,
     "harvest": "arachnid",
+    "reproduction": { "baby_egg": "egg_mole_cricket", "baby_count": 1, "baby_timer": 20 },
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
     "special_attacks": [ [ "SHRIEK_ALERT", 10 ], [ "SHRIEK_STUN", 5 ], [ "impale", 15 ] ],
     "anger_triggers": [ "HURT", "SOUND", "STALK" ],
     "fear_triggers": [ "FIRE" ],
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "BORES", "DESTROYS", "PUSH_VEH", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ]
+    "flags": [ "SEES", "BORES", "PUSH_VEH", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ]
   },
   {
     "id": "mon_lady_bug_giant",
     "type": "MONSTER",
     "name": { "str": "giant lady bug" },
-    "description": "A lady beetle roughly the size of a horse.  Its forewings are red with black spots, a distinctive appearance traditionally associated with good luck and adored by children.  Despite cute looks it is a ferocious predator capable of killing swarms of ants and aphids.",
+    "description": "This monster was cute with its black spotted red forewings and was adored by children as well as associated with good luck when it was the normal size, but this is clearly a ferocious predator capable of killing swarms of ants and aphids.",
     "default_faction": "ladybug",
     "bodytype": "insect",
     "species": [ "INSECT" ],
@@ -2241,6 +2242,8 @@
     "vision_day": 20,
     "vision_night": 5,
     "harvest": "arachnid",
+    "reproduction": { "baby_egg": "egg_lady_bug", "baby_count": 1, "baby_timer": 30 },
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
     "anger_triggers": [ "PLAYER_CLOSE" ],
     "fear_triggers": [ "HURT" ],
     "death_function": [ "NORMAL" ],
@@ -2263,7 +2266,11 @@
     "proportional": { "hp": 0.5, "speed": 1.1 },
     "volume": "750 ml",
     "weight": "1 kg",
-    "upgrades": { "half_life": 7, "into": "mon_mantis_giant" }
+    "delete": {
+    "reproduction": { "baby_egg": "egg_grasshopper", "baby_count": 3, "baby_timer": 15 },
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ]
+    },
+    "upgrades": { "age_grow": 8, "into": "mon_grasshopper_giant" }
   },
   {
     "id": "mon_grasshopper_giant",
@@ -2292,6 +2299,8 @@
     "vision_day": 20,
     "vision_night": 20,
     "harvest": "arachnid",
+    "reproduction": { "baby_egg": "egg_grasshopper", "baby_count": 3, "baby_timer": 15 },
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
     "fear_triggers": [ "FIRE", "PLAYER_CLOSE" ],
     "death_function": [ "NORMAL" ],
     "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CROP", 80 ], { "type": "leap", "cooldown": 3, "max_range": 10, "allow_no_target": true } ],
@@ -2324,7 +2333,7 @@
     "vision_day": 8,
     "vision_night": 5,
     "harvest": "arachnid",
-    "upgrades": { "half_life": 12, "into": "mon_antlion_giant" },
+    "upgrades": { "age_grow": 12, "into": "mon_antlion_giant" },
     "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ],
     "fear_triggers": [ "FIRE" ],
     "death_function": [ "NORMAL" ],
@@ -2385,7 +2394,11 @@
     "volume": "3 L",
     "weight": "4 kg",
     "melee_cut": 8,
-    "upgrades": { "half_life": 14, "into": "mon_strider_giant" }
+    "delete": {
+    "reproduction": { "baby_egg": "egg_strider", "baby_count": 3, "baby_timer": 10 },
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ]
+    },
+    "upgrades": { "age_grow": 7, "into": "mon_strider_giant" }
   },
   {
     "id": "mon_strider_giant",
@@ -2416,6 +2429,8 @@
     "vision_day": 12,
     "vision_night": 5,
     "harvest": "arachnid",
+    "reproduction": { "baby_egg": "egg_strider", "baby_count": 3, "baby_timer": 10 },
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
     "anger_triggers": [ "PLAYER_WEAK" ],
     "fear_triggers": [ "FIRE", "PLAYER_CLOSE" ],
     "death_function": [ "NORMAL" ],