From fb639cc266350b9e78a361778756fe2d46d6561a Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com>
Date: Fri, 4 Jun 2021 09:17:22 +0300
Subject: [PATCH 01/19] Update insect_spider.json

---
 data/json/monsters/insect_spider.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 846063e339465..4c64b105171ee 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1986,7 +1986,6 @@
     "melee_dice": 4,
     "melee_dice_sides": 6,
     "melee_cut": 10,
-    "dodge": 0,
     "armor_bash": 15,
     "armor_cut": 18,
     "armor_bullet": 20,
@@ -2105,7 +2104,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 8,
     "melee_cut": 6,
-    "dodge": 0,
     "armor_bash": 4,
     "armor_cut": 10,
     "armor_bullet": 10,

From 33f6b3025d942d3806fccc6262d8b2457a5563b8 Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com>
Date: Fri, 4 Jun 2021 09:20:08 +0300
Subject: [PATCH 02/19] Update other.json

---
 data/json/items/comestibles/other.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index 5f4e5259b2cdc..9190ec4bb405e 100644
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -94,10 +94,8 @@
     "symbol": "~",
     "material": [ "honey" ],
   "quench": 4,
-    "healthy": 0,
     "calories": 67,
   "charges": 16,
-    "stim": 0,
     "fun": 2  , 
   "comestible_type": "FOOD" ,
   "flags": ["NUTRIENT_OVERRIDE"],

From 31383d0304a1e779a2819198f905a411288ce3da Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com>
Date: Fri, 4 Jun 2021 13:47:39 +0300
Subject: [PATCH 03/19] Update insect_spider.json

---
 data/json/monsters/insect_spider.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 4c64b105171ee..2ed8529b554d4 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -2087,7 +2087,7 @@
     "id": "mon_antlion_larva",
     "type": "MONSTER",
     "name": { "str": "giant antlion larva", "str_pl": "giant antlion larvae" },
-    "description": "This huge grub has powerful mandibles and a hungry look.  It hides in dirt and waits for pray to come clother.",
+    "description": "This huge grub has powerful mandibles and a hungry look.  It hides in dirt and waits for prey to come clother.",
     "default_faction": "antlion",
     "bodytype": "insect",
     "species": [ "INSECT" ],
@@ -2159,7 +2159,7 @@
     "id": "mon_strider_small",
     "type": "MONSTER",
     "name": { "str": "big water strider" },
-    "description": "This water bug is a few times bigger, than a reguar one.  It's moves are fast and fluid.",
+    "description": "This water bug is a few times bigger, than a regular one.  It's moves are fast and fluid.",
     "copy-from": "mon_strider_giant",
     "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.50 },
     "volume": "3 L",

From 2627d80752501a7570cf62ee1bc637d4763aba07 Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com>
Date: Fri, 4 Jun 2021 13:55:54 +0300
Subject: [PATCH 04/19] Spelling fixes

Thanks for fixing my spelling

Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
---
 data/json/monsters/insect_spider.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 2ed8529b554d4..5e0d0e7b48954 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1861,7 +1861,7 @@
   {
     "id": "mon_aphid",
     "type": "MONSTER",
-    "name": { "str": "giant aphid", "str_pl": "giant aphids" },
+    "name": { "str": "giant aphid" },
     "description": "A green aphid about a size of a rabbit.  It is constantly searching for plants to suck from.  Probably you could sate it for a moment with cattle fodder.",
     "default_faction": "ant",
     "bodytype": "insect",
@@ -1898,7 +1898,7 @@
     "id": "mon_mantis_small",
     "type": "MONSTER",
     "name": { "str": "huge praying mantis" },
-    "description": "A green mutant insect with sharp grappling spikes on it's front legs.  It's a little smaller than an adult person.",
+    "description": "A green mutant insect with sharp grappling spikes on its front legs.  It's a little smaller than an adult person.",
     "copy-from": "mon_mantis_giant",
     "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 },
     "volume": "60 L",
@@ -1909,7 +1909,7 @@
   {
     "id": "mon_mantis_giant",
     "type": "MONSTER",
-    "name": { "str": "giant praying mantis", "str_pl": "giant praying mantises" },
+    "name": { "str": "giant praying mantis" },
     "description": "An enormous green creature grown about a size of a bear.  It dances weirdly and ready to chop your head off in any moment.",
     "default_faction": "mantis",
     "bodytype": "insect",
@@ -1943,8 +1943,8 @@
   {
     "id": "mon_mantis_mega",
     "type": "MONSTER",
-    "name": { "str": "great mantis", "str_pl": "great mantises" },
-    "description": "This ferocious creature is lurking through the land.  It's probably capable of killing a moose with it's powerful arms.",
+    "name": { "str": "great mantis" },
+    "description": "This ferocious creature is lurking through the land.  It's probably capable of killing a moose with its powerful arms.",
     "copy-from": "mon_mantis_giant",
     "proportional": { "hp": 20, "speed": 0.25, "vision_day": 2 },
     "volume": "625 L",
@@ -2086,7 +2086,7 @@
   {
     "id": "mon_antlion_larva",
     "type": "MONSTER",
-    "name": { "str": "giant antlion larva", "str_pl": "giant antlion larvae" },
+    "name": { "str": "giant antlion larva" },
     "description": "This huge grub has powerful mandibles and a hungry look.  It hides in dirt and waits for prey to come clother.",
     "default_faction": "antlion",
     "bodytype": "insect",
@@ -2171,7 +2171,7 @@
     "id": "mon_strider_giant",
     "type": "MONSTER",
     "name": { "str": "giant water strider"  },
-    "description": "This water glider is about as big as a domestic cat.  It's legs are more fin-like and a swollen body is mostly submerged underwater.",
+    "description": "This water glider is about as big as a domestic cat.  Its legs are more fin-like and a swollen body is mostly submerged underwater.",
     "default_faction": "strider",
     "bodytype": "insect",
     "species": [ "INSECT" ],

From b6cdcce463837cf2564fa8203052ec9d2e4b6c14 Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com>
Date: Sat, 5 Jun 2021 05:21:03 +0300
Subject: [PATCH 05/19] Spelling

Spelling fixes

Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com>
---
 data/json/items/comestibles/other.json |  2 +-
 data/json/monsters/insect_spider.json  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index 9190ec4bb405e..0809a0399098e 100644
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -88,7 +88,7 @@
     "type": "COMESTIBLE",
     "id": "honeydew",
     "name": { "str": "honeydew" },
-    "description": "It's a sugar-rich sticky substance, produced by aphids from plant's sap.  Ants and bees love it.",
+    "description": "A sugar-rich sticky substance, produced by aphids from plant sap.  Ants and bees love it.",
     "weight": "22 g",
     "color": "green",
     "symbol": "~",
diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 5e0d0e7b48954..feeaf64c651b0 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1862,7 +1862,7 @@
     "id": "mon_aphid",
     "type": "MONSTER",
     "name": { "str": "giant aphid" },
-    "description": "A green aphid about a size of a rabbit.  It is constantly searching for plants to suck from.  Probably you could sate it for a moment with cattle fodder.",
+    "description": "A green aphid about the size of a rabbit.  It is constantly searching for plants to suck from.  You could probably sate it for a moment with cattle fodder.",
     "default_faction": "ant",
     "bodytype": "insect",
     "species": [ "INSECT" ],
@@ -1910,7 +1910,7 @@
     "id": "mon_mantis_giant",
     "type": "MONSTER",
     "name": { "str": "giant praying mantis" },
-    "description": "An enormous green creature grown about a size of a bear.  It dances weirdly and ready to chop your head off in any moment.",
+    "description": "An enormous green creature grown about a size of a bear.  It dances weirdly and looks ready to chop your head off at any moment.",
     "default_faction": "mantis",
     "bodytype": "insect",
     "species": [ "INSECT" ],
@@ -2003,7 +2003,7 @@
     "id": "mon_lady_bug_giant",
     "type": "MONSTER",
     "name": { "str": "giant lady bug" },
-    "description": "A red lady bug covered in black spots about a size of a horse.  Despite cute looks it is a ferocious predator capable of killing swarms of ants and aphids.",
+    "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.",
     "default_faction": "ladybug",
     "bodytype": "insect",
     "species": [ "INSECT" ],
@@ -2055,7 +2055,7 @@
     "id": "mon_grasshopper_giant",
     "type": "MONSTER",
     "name": { "str": "giant grasshopper", "str_pl": "giant grasshoppers" },
-    "description": "A huge green grasshopper about a size of a big dog with long and strong back legs.  It hops, it hops and never stops.",
+    "description": "A huge green grasshopper about the size of a big dog, with long and strong back legs.  It hops, it hops and never stops.",
     "default_faction": "insect",
     "bodytype": "insect",
     "species": [ "INSECT" ],
@@ -2087,7 +2087,7 @@
     "id": "mon_antlion_larva",
     "type": "MONSTER",
     "name": { "str": "giant antlion larva" },
-    "description": "This huge grub has powerful mandibles and a hungry look.  It hides in dirt and waits for prey to come clother.",
+    "description": "This huge grub has powerful mandibles and a hungry look.  It hides in the dirt and awaits its prey.",
     "default_faction": "antlion",
     "bodytype": "insect",
     "species": [ "INSECT" ],
@@ -2159,7 +2159,7 @@
     "id": "mon_strider_small",
     "type": "MONSTER",
     "name": { "str": "big water strider" },
-    "description": "This water bug is a few times bigger, than a regular one.  It's moves are fast and fluid.",
+    "description": "This water bug is several times larger than a regular one.  It's moves are fast and fluid.",
     "copy-from": "mon_strider_giant",
     "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.50 },
     "volume": "3 L",

From b19d9ed969eb4b7e0165ac42e629429688bc9c8e Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com>
Date: Sat, 5 Jun 2021 05:23:25 +0300
Subject: [PATCH 06/19] Spelling

Spelling fix

Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com>
---
 data/json/monsters/insect_spider.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index feeaf64c651b0..0d8d7d5072c10 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1969,7 +1969,7 @@
     "id": "mon_mole_cricket",
     "type": "MONSTER",
     "name": { "str": "giant mole cricket" },
-    "description": "An enormous underground bug.  It's a common garden pest.  Beware ear-splitting screech and strong shovel-like front legs.",
+    "description": "An enormous underground bug.  Beware the ear-splitting screech and strong shovel-like front legs.",
     "default_faction": "insect",
     "bodytype": "insect",
     "species": [ "INSECT" ],

From aba883b11b349ea7d5924c69a085d8dde8ab002b Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <trezwiy_olkash@mail.ru>
Date: Sat, 5 Jun 2021 20:59:32 +0300
Subject: [PATCH 07/19] Aphids taming fix

You can't tame aphids. If you want to transport aphids try scaring them instead. Also, I've lowered aphid's agression and shortened description.
---
 data/json/monsters/insect_spider.json | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 846063e339465..14e05b9d42212 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1862,7 +1862,7 @@
     "id": "mon_aphid",
     "type": "MONSTER",
     "name": { "str": "giant aphid", "str_pl": "giant aphids" },
-    "description": "A green aphid about a size of a rabbit.  It is constantly searching for plants to suck from.  Probably you could sate it for a moment with cattle fodder.",
+    "description": "A green aphid about a size of a rabbit.  It is constantly searching for plants to suck from.",
     "default_faction": "ant",
     "bodytype": "insect",
     "species": [ "INSECT" ],
@@ -1873,8 +1873,8 @@
     "material": [ "iflesh" ],
     "symbol": "a",
     "color": "light_green",
-    "morale": 20,
-    "aggression": -40,
+    "morale": 10,
+    "aggression": -90,
     "melee_skill": 1,
     "melee_dice": 1,
     "melee_dice_sides": 2,
@@ -1886,13 +1886,14 @@
     "vision_day": 10,
     "vision_night": 5,
     "harvest": "arachnid",
-    "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "FIRE" ],
+    "regen_morale": true,
+    "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "FIRE", "PLAYER_CLOSE" ],
     "death_function": [ "NORMAL" ],
     "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CROP", 80 ] ],
     "reproduction": { "baby_monster": "mon_aphid", "baby_count": 1, "baby_timer": 20 },
     "baby_flags": [ "SPRING", "SUMMER"],
     "biosignature": { "biosig_item": "honeydew", "biosig_timer": 600 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL", "CATTLEFODDER", "PET_WONT_FOLLOW" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ]
   },
   {
     "id": "mon_mantis_small",

From 3d538055b9c27672341573c243490541a00bd0d8 Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <trezwiy_olkash@mail.ru>
Date: Sat, 5 Jun 2021 21:36:41 +0300
Subject: [PATCH 08/19] Update insect_spider.json

---
 data/json/monsters/insect_spider.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 14e05b9d42212..ce62c1cc6ff1f 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1861,8 +1861,8 @@
   {
     "id": "mon_aphid",
     "type": "MONSTER",
-    "name": { "str": "giant aphid", "str_pl": "giant aphids" },
-    "description": "A green aphid about a size of a rabbit.  It is constantly searching for plants to suck from.",
+    "name": { "str": "giant aphid" },
+    "description": "A green aphid about the size of a rabbit.  It is constantly searching for plants to suck from.",
     "default_faction": "ant",
     "bodytype": "insect",
     "species": [ "INSECT" ],

From f7b0ba9909b3b55fa626ac74bcc62d858d5d1340 Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com>
Date: Sun, 6 Jun 2021 12:59:00 +0300
Subject: [PATCH 09/19] Apply suggestions from code review

Removed some insects from spawn groups

Co-authored-by: Venera3 <72006894+Venera3@users.noreply.github.com>
---
 data/json/monstergroups/bugs.json       | 2 --
 data/json/monstergroups/wilderness.json | 2 --
 2 files changed, 4 deletions(-)

diff --git a/data/json/monstergroups/bugs.json b/data/json/monstergroups/bugs.json
index 940f732f91e63..d058854445be9 100644
--- a/data/json/monstergroups/bugs.json
+++ b/data/json/monstergroups/bugs.json
@@ -16,9 +16,7 @@
     "default": "mon_ant_small",
     "is_animal": true,
     "monsters": [
-      { "monster": "mon_ant_larva", "freq": 40, "cost_multiplier": 0 },
       { "monster": "mon_ant_soldier", "freq": 90, "cost_multiplier": 5 },
-      { "monster": "mon_ant_queen", "freq": 0, "cost_multiplier": 0 },
       { "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 },
diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json
index 9064ece6899a0..3690a527add8b 100644
--- a/data/json/monstergroups/wilderness.json
+++ b/data/json/monstergroups/wilderness.json
@@ -2871,9 +2871,7 @@
       },
       { "monster": "mon_mutant_experimental", "freq": 2, "cost_multiplier": 6 },
       {"monster": "mon_mantis_small", "freq": 2, "cost_multiplier": 8},
-      {"monster": "mon_aphid", "freq": 10, "cost_multiplier": 0},
       { "monster": "mon_antlion_giant", "freq": 4, "cost_multiplier": 10 },
-      { "monster": "mon_strider_small", "freq": 15, "cost_multiplier": 3, "pack_size": [ 4, 8 ] }
     ]
   },
   {

From 60adaf172c44b02579a255152c66d6729d9e3cae Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <trezwiy_olkash@mail.ru>
Date: Sun, 6 Jun 2021 13:22:16 +0300
Subject: [PATCH 10/19] Changed spawn of insects

removed mole crickets and ladybugs from some locations
---
 data/json/monstergroups/lab.json  | 5 ++---
 data/json/monstergroups/misc.json | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/data/json/monstergroups/lab.json b/data/json/monstergroups/lab.json
index 1c7698d128935..3a2439aefb1c1 100644
--- a/data/json/monstergroups/lab.json
+++ b/data/json/monstergroups/lab.json
@@ -53,8 +53,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_lady_bug_giant", "freq": 15, "cost_multiplier": 2},
-      {"monster": "mon_mole_cricket", "freq": 20, "cost_multiplier": 3}
+      { "monster": "mon_mole_cricket", "freq": 20, "cost_multiplier": 3}
     ],
     "freq_total": 2592
   },
@@ -165,7 +164,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": 20, "cost_multiplier": 3}
+      { "monster": "mon_mole_cricket", "freq": 2, "cost_multiplier": 3}
     ]
   }
 ]
diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
index f25d4e62dd35b..e137a6cb04c65 100644
--- a/data/json/monstergroups/misc.json
+++ b/data/json/monstergroups/misc.json
@@ -171,7 +171,6 @@
       { "monster": "mon_gator", "freq": 40, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
       { "monster": "mon_nakedmolerat_giant", "freq": 25, "cost_multiplier": 3 },
       { "monster": "mon_frog_mother", "freq": 10, "cost_multiplier": 3 },
-      {"monster": "mon_mole_cricket", "freq": 30, "cost_multiplier": 3}
     ]
   },
   {

From c3f63df15ed915e4a2008c6e70523ed0142044ef Mon Sep 17 00:00:00 2001
From: Ilya Agafonov <tairesh.rus@gmail.com>
Date: Wed, 9 Jun 2021 22:35:28 +0500
Subject: [PATCH 11/19] lint json

---
 data/json/items/comestibles/other.json  | 14 +++---
 data/json/monster_factions.json         |  8 ++--
 data/json/monstergroups/bugs.json       |  2 +-
 data/json/monstergroups/lab.json        |  4 +-
 data/json/monstergroups/misc.json       |  2 +-
 data/json/monstergroups/wilderness.json | 12 ++---
 data/json/monsters/insect_spider.json   | 63 ++++++++++++++-----------
 7 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index 0809a0399098e..10523357ab338 100644
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -93,14 +93,14 @@
     "color": "green",
     "symbol": "~",
     "material": [ "honey" ],
-  "quench": 4,
+    "quench": 4,
     "calories": 67,
-  "charges": 16,
-    "fun": 2  , 
-  "comestible_type": "FOOD" ,
-  "flags": ["NUTRIENT_OVERRIDE"],
-  "volume": "250 ml"  
- },
+    "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
index 32d4460e0fd71..b2afbe38ac595 100644
--- a/data/json/monster_factions.json
+++ b/data/json/monster_factions.json
@@ -383,24 +383,24 @@
     "hate": [ "insect", "small_animal", "ant", "acid_ant" ]
   },
   {
-   "type": "MONSTER_FACTION",
+    "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"]
+    "hate": [ "small_animal", "fish" ]
   },
   {
     "type": "MONSTER_FACTION",
diff --git a/data/json/monstergroups/bugs.json b/data/json/monstergroups/bugs.json
index d058854445be9..2b821dabd2e81 100644
--- a/data/json/monstergroups/bugs.json
+++ b/data/json/monstergroups/bugs.json
@@ -18,7 +18,7 @@
     "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_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 }
     ]
diff --git a/data/json/monstergroups/lab.json b/data/json/monstergroups/lab.json
index 3a2439aefb1c1..3ad3f28789663 100644
--- a/data/json/monstergroups/lab.json
+++ b/data/json/monstergroups/lab.json
@@ -53,7 +53,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_mole_cricket", "freq": 20, "cost_multiplier": 3 }
     ],
     "freq_total": 2592
   },
@@ -164,7 +164,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_mole_cricket", "freq": 2, "cost_multiplier": 3 }
     ]
   }
 ]
diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
index e137a6cb04c65..f7dcb784e3f2c 100644
--- a/data/json/monstergroups/misc.json
+++ b/data/json/monstergroups/misc.json
@@ -170,7 +170,7 @@
       { "monster": "mon_albino_penguin", "freq": 10, "cost_multiplier": 5, "pack_size": [ 3, 9 ] },
       { "monster": "mon_gator", "freq": 40, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
       { "monster": "mon_nakedmolerat_giant", "freq": 25, "cost_multiplier": 3 },
-      { "monster": "mon_frog_mother", "freq": 10, "cost_multiplier": 3 },
+      { "monster": "mon_frog_mother", "freq": 10, "cost_multiplier": 3 }
     ]
   },
   {
diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json
index 3690a527add8b..5fe74ffaf53d8 100644
--- a/data/json/monstergroups/wilderness.json
+++ b/data/json/monstergroups/wilderness.json
@@ -1873,9 +1873,9 @@
       { "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_mantis_small", "freq": 8, "cost_multiplier": 10 },
-      { "monster": "mon_lady_bug_giant", "freq": 5, "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_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 }
     ]
@@ -2870,8 +2870,8 @@
         "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
       },
       { "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 },
+      { "monster": "mon_mantis_small", "freq": 2, "cost_multiplier": 8 },
+      { "monster": "mon_antlion_giant", "freq": 4, "cost_multiplier": 10 }
     ]
   },
   {
@@ -2903,8 +2903,8 @@
       { "monster": "mon_squirrel", "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_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 }
diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 827b10c89d06b..366959e4b8739 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1891,7 +1891,7 @@
     "death_function": [ "NORMAL" ],
     "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CROP", 80 ] ],
     "reproduction": { "baby_monster": "mon_aphid", "baby_count": 1, "baby_timer": 20 },
-    "baby_flags": [ "SPRING", "SUMMER"],
+    "baby_flags": [ "SPRING", "SUMMER" ],
     "biosignature": { "biosig_item": "honeydew", "biosig_timer": 600 },
     "flags": [ "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ]
   },
@@ -1935,12 +1935,16 @@
     "vision_day": 15,
     "vision_night": 5,
     "harvest": "arachnid",
-    "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE"],
+    "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ],
     "fear_triggers": [ "FIRE" ],
     "death_function": [ "NORMAL" ],
-    "special_attacks": [  [ "RANGED_PULL", 30 ], [ "GRAB_DRAG", 10 ], { "type": "leap", "cooldown": 8, "max_range": 5, "allow_no_target": false }],
-    "flags": ["POISON", "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FIRE","PATH_AVOID_FALL", "STUMBLES" ]
-  }, 
+    "special_attacks": [
+      [ "RANGED_PULL", 30 ],
+      [ "GRAB_DRAG", 10 ],
+      { "type": "leap", "cooldown": 8, "max_range": 5, "allow_no_target": false }
+    ],
+    "flags": [ "POISON", "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL", "STUMBLES" ]
+  },
   {
     "id": "mon_mantis_mega",
     "type": "MONSTER",
@@ -1964,9 +1968,9 @@
       }
     ],
     "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 }
   },
- {
+  {
     "id": "mon_mole_cricket",
     "type": "MONSTER",
     "name": { "str": "giant mole cricket" },
@@ -1997,10 +2001,10 @@
     "anger_triggers": [ "HURT", "SOUND", "STALK" ],
     "fear_triggers": [ "FIRE" ],
     "death_function": [ "NORMAL" ],
-    "flags": [ "POISON","ATTACKMON", "BORES", "CAN_DIG", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "WARM" ],
+    "flags": [ "POISON", "ATTACKMON", "BORES", "CAN_DIG", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "WARM" ],
     "//": "Reinsert GOODHEARING when z-level tunneling is possible."
   },
-    {
+  {
     "id": "mon_lady_bug_giant",
     "type": "MONSTER",
     "name": { "str": "giant lady bug" },
@@ -2028,26 +2032,26 @@
     "vision_day": 20,
     "vision_night": 5,
     "harvest": "arachnid",
-    "anger_triggers": [  "PLAYER_CLOSE" ],
+    "anger_triggers": [ "PLAYER_CLOSE" ],
     "fear_triggers": [ "HURT" ],
     "death_function": [ "NORMAL" ],
     "special_attacks": [
-{
+      {
         "type": "bite",
         "cooldown": 4,
         "accuracy": 6,
         "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ]
- } 
+      }
     ],
-    "flags": ["POISON", "SEES", "HEARS", "SMELLS", "FLIES" , "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ]
+    "flags": [ "POISON", "SEES", "HEARS", "SMELLS", "FLIES", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ]
   },
-    {
+  {
     "id": "mon_grasshopper_small",
     "type": "MONSTER",
     "name": { "str": "huge grasshopper" },
     "description": "A large grasshopper a few times bigger than a regular one.",
     "copy-from": "mon_grasshopper_giant",
-    "proportional": { "hp": 0.5, "speed": 1.1},
+    "proportional": { "hp": 0.5, "speed": 1.1 },
     "volume": "750 ml",
     "weight": "1 kg",
     "upgrades": { "half_life": 7, "into": "mon_mantis_giant" }
@@ -2079,10 +2083,10 @@
     "vision_day": 20,
     "vision_night": 20,
     "harvest": "arachnid",
-    "fear_triggers": [ "FIRE", "PLAYER_CLOSE"],
+    "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 } ],
-    "flags": ["POISON", "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FALL", "PATH_AVOID_FIRE" ]
+    "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CROP", 80 ], { "type": "leap", "cooldown": 3, "max_range": 10, "allow_no_target": true } ],
+    "flags": [ "POISON", "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FALL", "PATH_AVOID_FIRE" ]
   },
   {
     "id": "mon_antlion_larva",
@@ -2112,18 +2116,21 @@
     "vision_night": 5,
     "harvest": "arachnid",
     "upgrades": { "half_life": 12, "into": "mon_antlion_giant" },
-    "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE"],
+    "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ],
     "fear_triggers": [ "FIRE" ],
     "death_function": [ "NORMAL" ],
-    "special_attacks": [  [ "RANGED_PULL", 10 ], [ "GRAB", 3 ], [ "impale", 10 ], 
-     {
+    "special_attacks": [
+      [ "RANGED_PULL", 10 ],
+      [ "GRAB", 3 ],
+      [ "impale", 10 ],
+      {
         "type": "bite",
         "cooldown": 4,
         "accuracy": 8,
         "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ]
-      } 
+      }
     ],
-    "flags": ["POISON", "SEES", "SMELLS", "IMMOBILE", "DIGS", "RANGED_ATTACKER" ]
+    "flags": [ "POISON", "SEES", "SMELLS", "IMMOBILE", "DIGS", "RANGED_ATTACKER" ]
   },
   {
     "id": "mon_antlion_giant",
@@ -2156,13 +2163,13 @@
     "death_function": [ "NORMAL" ],
     "flags": [ "SEES", "SMELLS", "FLIES", "HEARS", "HIT_AND_RUN", "PATH_AVOID_FIRE" ]
   },
-    {
+  {
     "id": "mon_strider_small",
     "type": "MONSTER",
     "name": { "str": "big water strider" },
     "description": "This water bug is several times larger than a regular one.  It's moves are fast and fluid.",
     "copy-from": "mon_strider_giant",
-    "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.50 },
+    "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.5 },
     "volume": "3 L",
     "weight": "4 kg",
     "melee_cut": 8,
@@ -2171,7 +2178,7 @@
   {
     "id": "mon_strider_giant",
     "type": "MONSTER",
-    "name": { "str": "giant water strider"  },
+    "name": { "str": "giant water strider" },
     "description": "This water glider is about as big as a domestic cat.  Its legs are more fin-like and a swollen body is mostly submerged underwater.",
     "default_faction": "strider",
     "bodytype": "insect",
@@ -2197,8 +2204,8 @@
     "vision_night": 5,
     "harvest": "arachnid",
     "anger_triggers": [ "PLAYER_WEAK" ],
-    "fear_triggers": [ "FIRE",  "PLAYER_CLOSE"],
+    "fear_triggers": [ "FIRE", "PLAYER_CLOSE" ],
     "death_function": [ "NORMAL" ],
-    "flags": ["POISON", "SEES", "HEARS", "SMELLS", "SWIMS" ]
+    "flags": [ "POISON", "SEES", "HEARS", "SMELLS", "SWIMS" ]
   }
 ]

From 8265a0d2503780e4af67fb6441ae7ea36fe6ca17 Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <trezwiy_olkash@mail.ru>
Date: Thu, 10 Jun 2021 09:54:22 +0300
Subject: [PATCH 12/19] Fix water striders behaviour

Water striders can't walk on land and attack slower
---
 data/json/monsters/insect_spider.json | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 88529b01f849b..fb72702f7e16d 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1861,8 +1861,8 @@
   {
     "id": "mon_aphid",
     "type": "MONSTER",
-    "name": { "str": "giant aphid", "str_pl": "giant aphids" },
-    "description": "A green aphid about a size of a rabbit.  It is constantly searching for plants to suck from.",
+    "name": { "str": "giant aphid" },
+    "description": "A green aphid about the size of a rabbit.  It is constantly searching for plants to suck from.",
     "default_faction": "ant",
     "bodytype": "insect",
     "species": [ "INSECT" ],
@@ -1909,7 +1909,7 @@
   {
     "id": "mon_mantis_giant",
     "type": "MONSTER",
-    "name": { "str": "giant praying mantis", "str_pl": "giant praying mantises" },
+    "name": { "str": "giant praying mantis" },
     "description": "An enormous green creature grown about a size of a bear.  It dances weirdly and ready to chop your head off in any moment.",
     "default_faction": "mantis",
     "bodytype": "insect",
@@ -1943,7 +1943,7 @@
   {
     "id": "mon_mantis_mega",
     "type": "MONSTER",
-    "name": { "str": "great mantis", "str_pl": "great mantises" },
+    "name": { "str": "great mantis" },
     "description": "This ferocious creature is lurking through the land.  It's probably capable of killing a moose with it's powerful arms.",
     "copy-from": "mon_mantis_giant",
     "proportional": { "hp": 20, "speed": 0.25, "vision_day": 2 },
@@ -2055,7 +2055,7 @@
   {
     "id": "mon_grasshopper_giant",
     "type": "MONSTER",
-    "name": { "str": "giant grasshopper", "str_pl": "giant grasshoppers" },
+    "name": { "str": "giant grasshopper" },
     "description": "A huge green grasshopper about a size of a big dog with long and strong back legs.  It hops, it hops and never stops.",
     "default_faction": "insect",
     "bodytype": "insect",
@@ -2087,7 +2087,7 @@
   {
     "id": "mon_antlion_larva",
     "type": "MONSTER",
-    "name": { "str": "giant antlion larva", "str_pl": "giant antlion larvae" },
+    "name": { "str": "giant antlion larva" },
     "description": "This huge grub has powerful mandibles and a hungry look.  It hides in dirt and waits for pray to come clother.",
     "default_faction": "antlion",
     "bodytype": "insect",
@@ -2167,7 +2167,7 @@
     "volume": "3 L",
     "weight": "4 kg",
     "melee_cut": 8,
-    "upgrades": { "half_life": 14, "into": "mon_mantis_giant" }
+    "upgrades": { "half_life": 14, "into": "mon_strider_giant" }
   },
   {
     "id": "mon_strider_giant",
@@ -2181,6 +2181,7 @@
     "weight": "12 kg",
     "hp": 20,
     "speed": 200,
+    "attack_cost": 200,
     "material": [ "iflesh" ],
     "symbol": "s",
     "color": "light_gray",
@@ -2200,6 +2201,6 @@
     "anger_triggers": [ "PLAYER_WEAK" ],
     "fear_triggers": [ "FIRE",  "PLAYER_CLOSE"],
     "death_function": [ "NORMAL" ],
-    "flags": ["POISON", "SEES", "HEARS", "SMELLS", "SWIMS" ]
+    "flags": ["POISON", "SEES", "HEARS", "SMELLS", "SWIMS", "AQUATIC" ]
   }
 ]

From b06e5d494d84f6c4b1dbcc9dc035e5c3e13c10bf Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com>
Date: Mon, 14 Jun 2021 06:51:26 +0300
Subject: [PATCH 13/19] Apply suggestions from code review

Added and removed some monster flags

Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
---
 data/json/monsters/insect_spider.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index a34ea981e83bf..ef5c11e01b393 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1936,14 +1936,14 @@
     "vision_night": 5,
     "harvest": "arachnid",
     "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ],
-    "fear_triggers": [ "FIRE" ],
+    "fear_triggers": [ "FIRE", "HURT" ],
     "death_function": [ "NORMAL" ],
     "special_attacks": [
       [ "RANGED_PULL", 30 ],
       [ "GRAB_DRAG", 10 ],
       { "type": "leap", "cooldown": 8, "max_range": 5, "allow_no_target": false }
     ],
-    "flags": [ "POISON", "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL", "STUMBLES" ]
+    "flags": [ "SEES", "HEARS", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ]
   },
   {
     "id": "mon_mantis_mega",
@@ -2001,7 +2001,7 @@
     "anger_triggers": [ "HURT", "SOUND", "STALK" ],
     "fear_triggers": [ "FIRE" ],
     "death_function": [ "NORMAL" ],
-    "flags": [ "POISON", "ATTACKMON", "BORES", "CAN_DIG", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "WARM" ],
+    "flags": [ "SEES", "BORES", "DESTROYS", "PUSH_VEH", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ],
     "//": "Reinsert GOODHEARING when z-level tunneling is possible."
   },
   {

From acb885d1e62f1343cbce3ed06c752dd8a1971f4d Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <trezwiy_olkash@mail.ru>
Date: Mon, 14 Jun 2021 07:05:55 +0300
Subject: [PATCH 14/19] fixed striders swimming

Lowered water striders speed to 50 and removed "aquatic" flag
---
 data/json/monsters/insect_spider.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 88529b01f849b..1b3dc1efa78c6 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -2180,7 +2180,8 @@
     "volume": "9 L",
     "weight": "12 kg",
     "hp": 20,
-    "speed": 200,
+    "speed": 50,
+    "attack_cost": 50,
     "material": [ "iflesh" ],
     "symbol": "s",
     "color": "light_gray",

From 4b8999fe04cd6a806b66ee43e64926185fecea55 Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <trezwiy_olkash@mail.ru>
Date: Mon, 14 Jun 2021 08:16:07 +0300
Subject: [PATCH 15/19] Antlion reproduction

Made antlions reproduce. Adult antlions are not predators.
---
 data/json/items/comestibles/egg.json  | 12 ++++++++++++
 data/json/monster_factions.json       | 10 ++++++++--
 data/json/monstergroups/eggs.json     |  6 ++++++
 data/json/monsters/insect_spider.json | 16 +++++++++-------
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
index f6e1070108758..bd244808b3edf 100644
--- a/data/json/items/comestibles/egg.json
+++ b/data/json/items/comestibles/egg.json
@@ -241,6 +241,18 @@
     "rot_spawn": "GROUP_EGG_CENTIPEDE",
     "rot_spawn_chance": 50
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_antlion",
+    "name": { "str": "antlion egg" },
+    "copy-from": "egg_insect",
+    "color": "yellow",
+    "symbol": "o",
+    "spoils_in": "5 days",
+    "description": "A large white antlion egg.  There is something hard inside.",
+    "rot_spawn": "GROUP_EGG_ANTLION",
+    "rot_spawn_chance": 50
+  },
   {
     "type": "COMESTIBLE",
     "id": "razorclaw_roe",
diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json
index 32d4460e0fd71..87376075dd6ad 100644
--- a/data/json/monster_factions.json
+++ b/data/json/monster_factions.json
@@ -376,12 +376,18 @@
   },
   {
     "type": "MONSTER_FACTION",
-    "name": "antlion",
+    "name": "antlion_grub",
     "base_faction": "insect",
-    "neutral": [ "antlion" ],
+    "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",
diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
index 6a0e75b2774e3..45a2da1cac5a0 100644
--- a/data/json/monstergroups/eggs.json
+++ b/data/json/monstergroups/eggs.json
@@ -111,5 +111,11 @@
       { "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 } ]
   }
 ]
diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 88529b01f849b..cb3bc1f285a43 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -2089,7 +2089,7 @@
     "type": "MONSTER",
     "name": { "str": "giant antlion larva", "str_pl": "giant antlion larvae" },
     "description": "This huge grub has powerful mandibles and a hungry look.  It hides in dirt and waits for pray to come clother.",
-    "default_faction": "antlion",
+    "default_faction": "antlion_grub",
     "bodytype": "insect",
     "species": [ "INSECT" ],
     "volume": "80 L",
@@ -2130,8 +2130,8 @@
     "id": "mon_antlion_giant",
     "type": "MONSTER",
     "name": { "str": "giant adult antlion" },
-    "description": "A ferocious mutant flying antlion as big as a cat, darting through the air with a cluster of fangs for a mouth.",
-    "default_faction": "antlion",
+    "description": "A ferocious mutant flying antlion as big as a cat, darting through the air with a cluster of fangs for a mouth.  Despite dangerous looks it doesn't seem interested in you.",
+    "default_faction": "antlion_adult",
     "bodytype": "flying insect",
     "species": [ "INSECT_FLYING" ],
     "volume": "30 L",
@@ -2141,8 +2141,8 @@
     "material": [ "iflesh" ],
     "symbol": "y",
     "color": "yellow",
-    "aggression": 20,
-    "morale": 100,
+    "aggression": -10,
+    "morale": 20,
     "melee_skill": 6,
     "melee_dice": 1,
     "melee_dice_sides": 6,
@@ -2152,8 +2152,10 @@
     "vision_day": 25,
     "vision_night": 5,
     "harvest": "arachnid",
-    "anger_triggers": [ "PLAYER_WEAK" ],
-    "fear_triggers": [ "PLAYER_CLOSE" ],
+    "reproduction": { "baby_egg": "egg_antlion", "baby_count": 1, "baby_timer": 15 },
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
+    "anger_triggers": [ "HURT" ],
+    "fear_triggers": [ "PLAYER_CLOSE", "FIRE" ],
     "death_function": [ "NORMAL" ],
     "flags": [ "SEES", "SMELLS", "FLIES", "HEARS", "HIT_AND_RUN", "PATH_AVOID_FIRE" ]
   },

From 1bf9ea9405aba804cb61fa076efdf591025d5d95 Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <trezwiy_olkash@mail.ru>
Date: Mon, 14 Jun 2021 08:29:32 +0300
Subject: [PATCH 16/19] Antlion harvest

Antlion harvest changed to "arachnid_flying"
---
 data/json/monsters/insect_spider.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 88529b01f849b..de1e19ca065a5 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -2151,7 +2151,7 @@
     "armor_cut": 4,
     "vision_day": 25,
     "vision_night": 5,
-    "harvest": "arachnid",
+    "harvest": "arachnid_flying",
     "anger_triggers": [ "PLAYER_WEAK" ],
     "fear_triggers": [ "PLAYER_CLOSE" ],
     "death_function": [ "NORMAL" ],

From 7ff3f6337e8a5ca72c6f2f3dc994f626865e52bf Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <trezwiy_olkash@mail.ru>
Date: Mon, 14 Jun 2021 12:11:55 +0300
Subject: [PATCH 17/19] Aphid reproduction

There are baby infertile aphids now
---
 data/json/monsters/insect_spider.json | 32 ++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 88529b01f849b..7bccae6768a24 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1858,11 +1858,27 @@
     "special_attacks": [ { "type": "leap", "cooldown": 4, "max_range": 4, "allow_no_target": true }, [ "EAT_CROP", 120 ] ],
     "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",
     "type": "MONSTER",
-    "name": { "str": "giant aphid", "str_pl": "giant aphids" },
-    "description": "A green aphid about a size of a rabbit.  It is constantly searching for plants to suck from.",
+    "name": { "str": "giant aphid" },
+    "description": "A green aphid about the size of a rabbit.  It is constantly searching for plants to suck from.",
     "default_faction": "ant",
     "bodytype": "insect",
     "species": [ "INSECT" ],
@@ -1892,7 +1908,7 @@
     "reproduction": { "baby_monster": "mon_aphid", "baby_count": 1, "baby_timer": 20 },
     "baby_flags": [ "SPRING", "SUMMER"],
     "biosignature": { "biosig_item": "honeydew", "biosig_timer": 600 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL", "CATTLEFODDER", "PET_WONT_FOLLOW" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL", "SWARMS" ]
   },
   {
     "id": "mon_mantis_small",
@@ -1963,9 +1979,9 @@
       }
     ],
     "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 }
   },
- {
+  {
     "id": "mon_mole_cricket",
     "type": "MONSTER",
     "name": { "str": "giant mole cricket" },
@@ -2000,7 +2016,7 @@
     "flags": [ "POISON","ATTACKMON", "BORES", "CAN_DIG", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "WARM" ],
     "//": "Reinsert GOODHEARING when z-level tunneling is possible."
   },
-    {
+  {
     "id": "mon_lady_bug_giant",
     "type": "MONSTER",
     "name": { "str": "giant lady bug" },
@@ -2041,7 +2057,7 @@
     ],
     "flags": ["POISON", "SEES", "HEARS", "SMELLS", "FLIES" , "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ]
   },
-    {
+  {
     "id": "mon_grasshopper_small",
     "type": "MONSTER",
     "name": { "str": "huge grasshopper" },
@@ -2157,7 +2173,7 @@
     "death_function": [ "NORMAL" ],
     "flags": [ "SEES", "SMELLS", "FLIES", "HEARS", "HIT_AND_RUN", "PATH_AVOID_FIRE" ]
   },
-    {
+  {
     "id": "mon_strider_small",
     "type": "MONSTER",
     "name": { "str": "big water strider" },

From f1156046b4fd10258611e5f5c1e00d7d8bc2a222 Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <trezwiy_olkash@mail.ru>
Date: Tue, 15 Jun 2021 17:34:46 +0300
Subject: [PATCH 18/19] Commits

Changed things according to venera's suggestion
---
 data/json/monsters/insect_spider.json | 32 +++++++++++++++------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 88529b01f849b..32e922bab963b 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1921,8 +1921,8 @@
     "material": [ "iflesh" ],
     "symbol": "M",
     "color": "light_green",
-    "aggression": 50,
-    "morale": 80,
+    "aggression": 20,
+    "morale": 30,
     "melee_skill": 8,
     "melee_dice": 1,
     "melee_dice_sides": 6,
@@ -1931,8 +1931,8 @@
     "armor_bash": 10,
     "armor_cut": 16,
     "armor_bullet": 13,
-    "vision_day": 15,
-    "vision_night": 5,
+    "vision_day": 8,
+    "vision_night": 4,
     "harvest": "arachnid",
     "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE"],
     "fear_triggers": [ "FIRE" ],
@@ -1954,13 +1954,16 @@
     "melee_dice": 2,
     "melee_cut": 20,
     "dodge": 2,
+    "attack_cost":25,
     "special_attacks": [
       {
         "type": "bite",
         "cooldown": 4,
         "accuracy": 5,
-        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ]
-      }
+        "no_infection_chance": 25,
+        "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 }
     ],
     "extend": { "flags": [ "DESTROYS", "PUSH_MON", "PUSH_VEH" ] },
   "delete": { "type": "leap", "cooldown": 8, "max_range": 5, "allow_no_target": false }
@@ -2010,21 +2013,21 @@
     "species": [ "INSECT" ],
     "volume": "400 L",
     "weight": "533 kg",
-    "hp": 160,
+    "hp": 350,
     "speed": 110,
     "material": [ "iflesh" ],
     "symbol": "B",
     "color": "red",
-    "morale": 80,
-    "aggression": 40,
+    "morale": 40,
+    "aggression": 20,
     "melee_skill": 6,
     "melee_dice": 2,
     "melee_dice_sides": 6,
     "melee_cut": 8,
     "dodge": 1,
     "armor_bash": 7,
-    "armor_cut": 12,
-    "armor_bullet": 10,
+    "armor_cut": 20,
+    "armor_bullet": 30,
     "vision_day": 20,
     "vision_night": 5,
     "harvest": "arachnid",
@@ -2036,10 +2039,10 @@
         "type": "bite",
         "cooldown": 4,
         "accuracy": 6,
-        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ]
+        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_penetration": 0.6 } ]
  } 
     ],
-    "flags": ["POISON", "SEES", "HEARS", "SMELLS", "FLIES" , "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ]
+    "flags": ["POISON", "SEES", "HEARS", "SMELLS", "FLIES" , "PATH_AVOID_FIRE" ]
   },
     {
     "id": "mon_grasshopper_small",
@@ -2121,7 +2124,8 @@
         "type": "bite",
         "cooldown": 4,
         "accuracy": 8,
-        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ]
+        "no_infection_chance": 25,
+        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_penetration": 0.6 } ]
       } 
     ],
     "flags": ["POISON", "SEES", "SMELLS", "IMMOBILE", "DIGS", "RANGED_ATTACKER" ]

From 6a2d38120f2f2c3fe941af422510c0b3b27d1e26 Mon Sep 17 00:00:00 2001
From: SuddenEyePuncture <trezwiy_olkash@mail.ru>
Date: Thu, 17 Jun 2021 15:53:12 +0300
Subject: [PATCH 19/19] Fixed antlions factions

---
 data/json/monster_factions.json       | 16 +++++++++++-----
 data/json/monsters/insect_spider.json | 14 +++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json
index 32d4460e0fd71..a7bf7aa6b13e2 100644
--- a/data/json/monster_factions.json
+++ b/data/json/monster_factions.json
@@ -376,12 +376,18 @@
   },
   {
     "type": "MONSTER_FACTION",
-    "name": "antlion",
+    "name": "antlion_grub",
     "base_faction": "insect",
-    "neutral": [ "antlion" ],
+    "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",
@@ -389,18 +395,18 @@
     "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"]
+    "hate": [ "small_animal", "fish" ]
   },
   {
     "type": "MONSTER_FACTION",
diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 88529b01f849b..2c154a4df9beb 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -1861,7 +1861,7 @@
   {
     "id": "mon_aphid",
     "type": "MONSTER",
-    "name": { "str": "giant aphid", "str_pl": "giant aphids" },
+    "name": { "str": "giant aphid" },
     "description": "A green aphid about a size of a rabbit.  It is constantly searching for plants to suck from.",
     "default_faction": "ant",
     "bodytype": "insect",
@@ -1909,7 +1909,7 @@
   {
     "id": "mon_mantis_giant",
     "type": "MONSTER",
-    "name": { "str": "giant praying mantis", "str_pl": "giant praying mantises" },
+    "name": { "str": "giant praying mantis" },
     "description": "An enormous green creature grown about a size of a bear.  It dances weirdly and ready to chop your head off in any moment.",
     "default_faction": "mantis",
     "bodytype": "insect",
@@ -1943,7 +1943,7 @@
   {
     "id": "mon_mantis_mega",
     "type": "MONSTER",
-    "name": { "str": "great mantis", "str_pl": "great mantises" },
+    "name": { "str": "great mantis" },
     "description": "This ferocious creature is lurking through the land.  It's probably capable of killing a moose with it's powerful arms.",
     "copy-from": "mon_mantis_giant",
     "proportional": { "hp": 20, "speed": 0.25, "vision_day": 2 },
@@ -2055,7 +2055,7 @@
   {
     "id": "mon_grasshopper_giant",
     "type": "MONSTER",
-    "name": { "str": "giant grasshopper", "str_pl": "giant grasshoppers" },
+    "name": { "str": "giant grasshopper" },
     "description": "A huge green grasshopper about a size of a big dog with long and strong back legs.  It hops, it hops and never stops.",
     "default_faction": "insect",
     "bodytype": "insect",
@@ -2087,9 +2087,9 @@
   {
     "id": "mon_antlion_larva",
     "type": "MONSTER",
-    "name": { "str": "giant antlion larva", "str_pl": "giant antlion larvae" },
+    "name": { "str": "giant antlion larva" },
     "description": "This huge grub has powerful mandibles and a hungry look.  It hides in dirt and waits for pray to come clother.",
-    "default_faction": "antlion",
+    "default_faction": "antlion_grub",
     "bodytype": "insect",
     "species": [ "INSECT" ],
     "volume": "80 L",
@@ -2131,7 +2131,7 @@
     "type": "MONSTER",
     "name": { "str": "giant adult antlion" },
     "description": "A ferocious mutant flying antlion as big as a cat, darting through the air with a cluster of fangs for a mouth.",
-    "default_faction": "antlion",
+    "default_faction": "antlion_adult",
     "bodytype": "flying insect",
     "species": [ "INSECT_FLYING" ],
     "volume": "30 L",