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] 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",