Merge branch 'master' into Strider-speed-fix

data/json/items/comestibles/other.json

@@ -88,21 +88,19 @@
     "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,
+    "quench": 4,
     "calories": 67,
-  "charges": 16,
-    "stim": 0,
-    "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",

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

data/json/monstergroups/bugs.json

@@ -16,11 +16,9 @@
     "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_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 }
     ]

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

data/json/monstergroups/misc.json

@@ -170,8 +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_mole_cricket", "freq": 30, "cost_multiplier": 3}
+      { "monster": "mon_frog_mother", "freq": 10, "cost_multiplier": 3 }
     ]
   },
   {

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,10 +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_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 ] }
+      { "monster": "mon_mantis_small", "freq": 2, "cost_multiplier": 8 },
+      { "monster": "mon_antlion_giant", "freq": 4, "cost_multiplier": 10 }
     ]
   },
   {
@@ -2905,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 }

data/json/monsters/insect_spider.json

@@ -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"],
+    "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",
@@ -1910,7 +1911,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 the 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" ],
@@ -1934,17 +1935,21 @@
     "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",
     "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.",
+    "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",
@@ -1963,13 +1968,13 @@
       }
     ],
     "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" },
-    "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 +1991,6 @@
     "melee_dice": 4,
     "melee_dice_sides": 6,
     "melee_cut": 10,
-    "dodge": 0,
     "armor_bash": 15,
     "armor_cut": 18,
     "armor_bullet": 20,
@@ -1997,14 +2001,14 @@
     "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" },
-    "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" ],
@@ -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" }
@@ -2056,7 +2060,7 @@
     "id": "mon_grasshopper_giant",
     "type": "MONSTER",
     "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.",
+    "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" ],
@@ -2079,16 +2083,16 @@
     "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",
     "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 pray 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" ],
@@ -2105,26 +2109,28 @@
     "melee_dice": 1,
     "melee_dice_sides": 8,
     "melee_cut": 6,
-    "dodge": 0,
     "armor_bash": 4,
     "armor_cut": 10,
     "armor_bullet": 10,
     "vision_day": 8,
     "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",
@@ -2157,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 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 },
+    "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.5 },
     "volume": "3 L",
     "weight": "4 kg",
     "melee_cut": 8,
@@ -2172,8 +2178,8 @@
   {
     "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.",
+    "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",
     "species": [ "INSECT" ],
@@ -2199,7 +2205,7 @@
     "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", "AQUATIC" ]
   }