Merge branch 'master' into mob-spawn-fix

data/json/items/comestibles/other.json

@@ -88,16 +88,14 @@
     "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": "~",
     "material": [ "honey" ],
   "quench": 4,
-    "healthy": 0,
     "calories": 67,
   "charges": 16,
-    "stim": 0,
     "fun": 2  , 
   "comestible_type": "FOOD" ,
   "flags": ["NUTRIENT_OVERRIDE"],

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 },

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 ] }
     ]
   },
   {

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" ],
@@ -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,19 +1886,20 @@
     "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",
     "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,8 +1910,8 @@
   {
     "id": "mon_mantis_giant",
     "type": "MONSTER",
-    "name": { "str": "giant praying mantis", "str_pl": "giant praying mantises" },
-    "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.",
+    "name": { "str": "giant praying mantis" },
+    "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" ],
@@ -1943,8 +1944,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",
@@ -1969,7 +1970,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" ],
@@ -1986,7 +1987,6 @@
     "melee_dice": 4,
     "melee_dice_sides": 6,
     "melee_cut": 10,
-    "dodge": 0,
     "armor_bash": 15,
     "armor_cut": 18,
     "armor_bullet": 20,
@@ -2004,7 +2004,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" ],
@@ -2056,7 +2056,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,8 +2087,8 @@
   {
     "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.",
+    "name": { "str": "giant antlion larva" },
+    "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" ],
@@ -2105,7 +2105,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 8,
     "melee_cut": 6,
-    "dodge": 0,
     "armor_bash": 4,
     "armor_cut": 10,
     "armor_bullet": 10,
@@ -2161,7 +2160,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 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",
@@ -2173,7 +2172,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" ],