Merge branch 'master' into antlion-agression

SuddenEyePuncture · Jun 14, 2021 · 1df0fd0 · 1df0fd0
2 parents 4b8999f + 54b035c
commit 1df0fd0
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 81 deletions.
diff --git a/data/json/items/comestibles/other.json b/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",

diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json
@@ -395,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/monstergroups/bugs.json b/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 }
     ]

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

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