Earthworm audit

data/json/mapgen/bugs/graboid_field.json

@@ -0,0 +1,12 @@
+[
+  {
+    "om_terrain": "field_graboid",
+    "type": "mapgen",
+    "weight": 100,
+    "method": "json",
+    "object": {
+      "predecessor_mapgen": "field",
+      "place_monster": [ { "monster": "mon_graboid", "name": "Little Guy", "x": 12, "y": 12 } ]
+    }
+  }
+]

data/json/monster_factions.json

@@ -291,11 +291,6 @@
     "by_mood": [ "animal" ],
     "hate": [ "small_animal", "insect" ]
   },
-  {
-    "type": "MONSTER_FACTION",
-    "name": "worm",
-    "base_faction": "mutant"
-  },
   {
     "type": "MONSTER_FACTION",
     "name": "slug",
@@ -437,6 +432,11 @@
     "neutral": [ "fish", "bot", "aquatic_predator" ],
     "by_mood": [ "insect" ]
   },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "worm",
+    "base_faction": "insect"
+  },
   {
     "type": "MONSTER_FACTION",
     "name": "locust",

data/json/monster_special_attacks/monster_deaths.json

@@ -155,17 +155,47 @@
     "id": "death_halfworm",
     "type": "SPELL",
     "name": { "str": "Half Worm Death" },
-    "description": "Spawns two half worms.",
+    "description": "Spawns one or two half worms.",
     "valid_targets": [ "ground", "self" ],
-    "min_damage": 2,
+    "min_damage": 1,
     "max_damage": 2,
-    "flags": [ "SILENT", "HOSTILE_SUMMON", "PERMANENT", "SPAWN_WITH_DEATH_DROPS", "NO_EXPLOSION_SFX" ],
+    "flags": [ "SILENT", "HOSTILE_SUMMON", "PERMANENT", "SPAWN_WITH_DEATH_DROPS", "NO_EXPLOSION_SFX", "RANDOM_DAMAGE" ],
     "shape": "blast",
     "effect": "summon",
     "effect_str": "mon_halfworm",
     "min_aoe": 2,
     "max_aoe": 2
   },
+  {
+    "id": "death_halfworm_small",
+    "type": "SPELL",
+    "name": { "str": "Small Half Worm Death" },
+    "description": "Spawns one or two small half worms.",
+    "valid_targets": [ "ground", "self" ],
+    "min_damage": 1,
+    "max_damage": 2,
+    "flags": [ "SILENT", "HOSTILE_SUMMON", "PERMANENT", "SPAWN_WITH_DEATH_DROPS", "NO_EXPLOSION_SFX", "RANDOM_DAMAGE" ],
+    "shape": "blast",
+    "effect": "summon",
+    "effect_str": "mon_halfworm_small",
+    "min_aoe": 2,
+    "max_aoe": 2
+  },
+  {
+    "id": "death_halfworm_graboid",
+    "type": "SPELL",
+    "name": { "str": "Graboid Half Worm Death" },
+    "description": "Spawns one or two graboid half worms.",
+    "valid_targets": [ "ground", "self" ],
+    "min_damage": 1,
+    "max_damage": 2,
+    "flags": [ "SILENT", "HOSTILE_SUMMON", "PERMANENT", "SPAWN_WITH_DEATH_DROPS", "NO_EXPLOSION_SFX", "RANDOM_DAMAGE" ],
+    "shape": "blast",
+    "effect": "summon",
+    "effect_str": "mon_halfworm_graboid",
+    "min_aoe": 2,
+    "max_aoe": 2
+  },
   {
     "id": "death_blobsplit_large",
     "type": "SPELL",

data/json/monsters/insect_spider.json

@@ -63,23 +63,24 @@
     "id": "mon_graboid",
     "type": "MONSTER",
     "name": { "str": "graboid" },
-    "description": "A monstrous beast the size of a semi truck with a tripartite mouth that opens to reveal hundreds of writhing tongues with razor sharp edges.  It keeps most of its enormous body hidden underground.",
+    "description": "This huge subterranean creature is a far cry from its earthworm ancestors.  Despite only seeing its head, you can tell its grown to a mind-boggling size.  While the image may be quite unsettling, it doesn't appear to pay you any mind.",
     "default_faction": "worm",
     "bodytype": "snake",
     "species": [ "WORM" ],
-    "volume": "875000 ml",
-    "weight": "200 kg",
-    "hp": 210,
-    "speed": 180,
+    "volume": "600 L",
+    "weight": "800 kg",
+    "hp": 600,
+    "speed": 95,
     "material": [ "flesh" ],
     "symbol": "W",
-    "color": "white",
-    "aggression": 40,
-    "morale": 120,
+    "color": "pink",
+    "aggression": -15,
+    "morale": 8,
     "melee_skill": 5,
     "melee_dice": 3,
-    "melee_dice_sides": 12,
-    "melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
+    "melee_dice_sides": 7,
+    "melee_damage": [ { "damage_type": "bash", "amount": 5 } ],
+    "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CARRION", 60 ], [ "EAT_CROP", 60 ] ],
     "bleed_rate": 60,
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ],
     "harvest": "mutant_meatslug",
@@ -88,63 +89,62 @@
     "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
     "death_function": {
       "message": "The %s splits in two!",
-      "effect": { "id": "death_halfworm", "hit_self": true },
+      "effect": { "id": "death_halfworm_graboid", "hit_self": true },
       "corpse_type": "NO_CORPSE"
     },
-    "zombify_into": "mon_meat_cocoon_med",
-    "flags": [ "DIGS", "HEARS", "POISON", "GOODHEARING", "BASHES", "DESTROYS", "ATTACK_LOWER" ],
-    "armor": { "bash": 12, "cut": 8, "bullet": 6, "electric": 2 }
+    "zombify_into": "mon_meat_cocoon_large",
+    "flags": [ "DIGS", "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "EATS", "BASHES", "DESTROYS", "PUSH_VEH" ],
+    "armor": { "bash": 16, "cut": 6, "bullet": 4, "electric": 2 }
+  },
+  {
+    "id": "mon_halfworm_graboid",
+    "type": "MONSTER",
+    "name": { "str": "graboid half worm" },
+    "description": "A squiggling severed portion of a wounded graboid.",
+    "copy-from": "mon_graboid",
+    "proportional": { "hp": 0.4, "speed": 0.67, "volume": 0.475, "weight": 0.475 },
+    "morale": -5,
+    "dissect": "dissect_troglobite_sample_large",
+    "upgrades": { "age_grow": 10, "into": "mon_graboid" },
+    "zombify_into": "mon_meat_cocoon_large",
+    "armor": { "bash": 12, "cut": 4, "bullet": 2 },
+    "extend": { "flags": [ "NO_BREED" ] }
   },
   {
     "id": "mon_halfworm",
     "type": "MONSTER",
-    "name": { "str": "half worm" },
+    "name": { "str": "giant half worm" },
     "description": "A squiggling severed portion of a wounded giant worm.",
-    "default_faction": "worm",
-    "bodytype": "snake",
-    "species": [ "WORM" ],
-    "volume": "45 L",
-    "weight": "60 kg",
-    "hp": 20,
-    "speed": 80,
-    "material": [ "flesh" ],
-    "symbol": "s",
-    "color": "pink",
-    "aggression": 10,
-    "morale": 40,
-    "melee_skill": 4,
-    "melee_dice": 2,
-    "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ],
-    "harvest": "mutant_meatslug",
+    "copy-from": "mon_worm",
+    "proportional": { "hp": 0.4, "speed": 0.67, "volume": 0.475, "weight": 0.475 },
+    "morale": -15,
     "dissect": "dissect_troglobite_sample_single",
     "upgrades": { "age_grow": 10, "into": "mon_worm" },
     "zombify_into": "mon_meat_cocoon_small",
-    "flags": [ "DIGS", "HEARS", "GOODHEARING", "ATTACK_LOWER" ],
-    "armor": { "bash": 2 }
+    "armor": { "bash": 4 },
+    "extend": { "flags": [ "NO_BREED" ] }
   },
   {
     "id": "mon_worm",
     "type": "MONSTER",
-    "name": { "str": "giant worm" },
-    "description": "A huge, mutated creature that might once have been a nightcrawler.  It possesses a large fanged mouth and a long slender body that comes up to your shoulder, with even more surely hiding underground.",
+    "name": { "str": "giant earthworm" },
+    "description": "A huge, mutated garden worm peeking out from the earth - pink, ringed, and most importantly docile.  Despite its size and looks, it appears to be peaceful.",
     "default_faction": "worm",
     "bodytype": "snake",
     "species": [ "WORM" ],
     "volume": "108500 ml",
-    "weight": "120 kg",
-    "hp": 50,
-    "speed": 80,
+    "weight": "122250 g",
+    "hp": 115,
+    "speed": 55,
     "material": [ "flesh" ],
     "symbol": "W",
     "color": "pink",
-    "aggression": 30,
-    "morale": 100,
-    "melee_skill": 4,
-    "melee_dice": 4,
-    "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
+    "aggression": -60,
+    "morale": 5,
+    "melee_skill": 3,
+    "melee_dice": 2,
+    "melee_dice_sides": 3,
+    "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CARRION", 60 ], [ "EAT_CROP", 60 ] ],
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ],
     "harvest": "mutant_meatslug",
     "dissect": "dissect_troglobite_sample_small",
@@ -155,26 +155,39 @@
       "effect": { "id": "death_halfworm", "hit_self": true },
       "corpse_type": "NO_CORPSE"
     },
-    "upgrades": { "half_life": 60, "into": "mon_graboid" },
-    "flags": [ "DIGS", "HEARS", "GOODHEARING", "ATTACK_LOWER" ],
-    "armor": { "bash": 2 }
+    "upgrades": { "age_grow": 45, "into": "mon_graboid" },
+    "flags": [ "DIGS", "HEARS", "GOODHEARING", "ATTACK_LOWER", "PATH_AVOID_FIRE", "EATS" ],
+    "armor": { "bash": 6 }
   },
   {
     "id": "mon_worm_small",
     "type": "MONSTER",
-    "name": { "str": "large worm" },
-    "description": "A disturbingly large mutated subterranean creature similar to a nightcrawler.  It possesses a fanged mouth and a long slender body that comes up to your knees, with even more surely hiding underground.",
-    "copy-from": "mon_halfworm",
-    "looks_like": "mon_worm",
-    "volume": "62500 ml",
-    "weight": "81500 g",
+    "name": { "str": "oversized earthworm" },
+    "description": "A disturbingly large wriggling earthworm with the moist earth still clinging to its slimy body.  Despite its size it appears to be peaceful, a refreshing change for once.",
+    "copy-from": "mon_worm",
+    "proportional": { "hp": 0.85, "speed": 0.85, "volume": 0.67, "weight": 0.67 },
     "dissect": "dissect_troglobite_sample_single",
-    "upgrades": { "half_life": 42, "into": "mon_worm" },
-    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ],
-    "delete": {
-      "reproduction": { "baby_egg": "egg_worm", "baby_count": 3, "baby_timer": 15 },
-      "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ]
-    }
+    "upgrades": { "age_grow": 30, "into": "mon_worm" },
+    "death_function": {
+      "message": "The %s splits in two!",
+      "effect": { "id": "death_halfworm_small", "hit_self": true },
+      "corpse_type": "NO_CORPSE"
+    },
+    "armor": { "bash": 4 },
+    "extend": { "flags": [ "NO_BREED" ] }
+  },
+  {
+    "id": "mon_halfworm_small",
+    "type": "MONSTER",
+    "name": { "str": "oversized half worm" },
+    "description": "A squiggling severed portion of a wounded oversized worm.",
+    "copy-from": "mon_worm_small",
+    "proportional": { "hp": 0.4, "speed": 0.67, "volume": 0.475, "weight": 0.475 },
+    "morale": -15,
+    "dissect": "dissect_troglobite_sample_single",
+    "upgrades": { "age_grow": 10, "into": "mon_worm_small" },
+    "zombify_into": "mon_meat_cocoon_small",
+    "armor": { "bash": 3 }
   },
   {
     "id": "mon_worm_larva",

data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json

@@ -285,10 +285,7 @@
     "start": {
       "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": 30 },
       "update_mapgen": {
-        "place_monster": [
-          { "monster": "mon_graboid", "name": "Little Guy", "x": 12, "y": 12, "target": true },
-          { "monster": "mon_graboid", "x": [ 9, 15 ], "y": [ 9, 15 ] }
-        ]
+        "place_monster": [ { "monster": "mon_spider_trapdoor_small", "x": 12, "y": 12, "target": true, "repeat": [ 3, 5 ] } ]
       }
     },
     "origins": [ "ORIGIN_SECONDARY" ],

data/json/overmap/overmap_special/specials.json

@@ -712,7 +712,8 @@
     "id": "Cabin_Lapin",
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "cabin_lapin_north" },
-      { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_lapin_north" }
+      { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_lapin_north" },
+      { "point": [ 1, 1, 0 ], "overmap": "field_graboid" }
     ],
     "connections": [ { "point": [ 0, -1, 0 ], "terrain": "forest_trail", "connection": "forest_trail" } ],
     "locations": [ "forest" ],

data/json/overmap/overmap_terrain/overmap_terrain.json

@@ -1016,5 +1016,17 @@
     "color": "yellow",
     "see_cost": 3,
     "flags": [ "RISK_HIGH" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "field_graboid",
+    "looks_like": "field",
+    "name": "field",
+    "sym": ".",
+    "color": "brown",
+    "see_cost": 2,
+    "extras": "field",
+    "travel_cost_type": "field",
+    "flags": [ "NO_ROTATE" ]
   }
 ]