feat(content,port): Wasp overhaul (#4255)

* initial commit Co-Authored-By: Venera3 <72006894+venera3@users.noreply.github.com> * style(autofix.ci): automated formatting * Update harvest.json * Update monster_factions.json Co-Authored-By: Venera3 <72006894+venera3@users.noreply.github.com> * Update monster_factions.json Co-Authored-By: Venera3 <72006894+venera3@users.noreply.github.com> * Update data/json/monstergroups/bugs.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> * Update data/json/monstergroups/bugs.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> --------- Co-authored-by: Venera3 <72006894+venera3@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
cataclysmbnteam · Feb 26, 2024 · 5326323 · 5326323
1 parent 9ae281d
commit 5326323
Show file tree

Hide file tree

Showing 21 changed files with 627 additions and 136 deletions.
diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -535,18 +535,34 @@
   {
     "id": "arachnid_wasp",
     "type": "harvest",
-    "message": "There's a faintly hairy, skin-like membrane, covered in blood vessels, beneath the chitin of this creature.  Inside it is a bundle of bubble-like tissue sacs that appear to be floating, which doesn't fit with what you know about real wasps.",
+    "message": "<wasp_harvest>",
     "entries": [
-      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 },
-      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.3 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.003 },
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.01 },
       { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.1 },
-      { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
-      { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
+      { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.01 },
+      { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.03 },
       { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" },
       { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
+  {
+    "id": "arachnid_wasp_queen",
+    "type": "harvest",
+    "message": "<wasp_queen_harvest>",
+    "entries": [
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.2 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.003 },
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.01 },
+      { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.1 },
+      { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.01 },
+      { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.03 },
+      { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" },
+      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "egg_wasp", "type": "offal", "base_num": [ 10, 30 ], "scale_num": [ 5, 5 ] }
+    ]
+  },
   {
     "id": "arachnid_dragonfly_mega",
     "type": "harvest",

diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -238,6 +238,18 @@
     "rot_spawn": "GROUP_EGG_CENTIPEDE",
     "rot_spawn_chance": 50
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_wasp",
+    "name": { "str": "wasp egg" },
+    "copy-from": "egg_insect",
+    "color": "white",
+    "symbol": "o",
+    "spoils_in": "2 days",
+    "description": "A white, flexible wasp egg.  It looks like a pristine grain of rice, grown to the size of your palm.",
+    "rot_spawn": "GROUP_EGG_WASP",
+    "rot_spawn_chance": 100
+  },
   {
     "type": "COMESTIBLE",
     "id": "razorclaw_roe",

diff --git a/data/json/mapgen/map_extras/nest_wasp.json b/data/json/mapgen/map_extras/nest_wasp.json
@@ -17,7 +17,7 @@
         "     ---.---.,---.-     ",
         "    t-.--.,--...-.--    ",
         "      --...-.--.--.     ",
-        "     -..-,-..-,-..-t  t ",
+        "     -..-,-..*,-..-t  t ",
         " t   --....-.-..---     ",
         "     t---.,.-.---..-    ",
         "      -.---.---..---    ",
@@ -34,9 +34,11 @@
         "t": [ "t_region_tree", "t_region_groundcover_swamp" ],
         ",": [ "t_region_tree" ],
         "-": [ "t_paper" ],
-        ".": [ "t_floor_paper" ]
+        ".": [ "t_floor_paper" ],
+        "*": [ "t_floor_paper" ]
       },
-      "place_monsters": [ { "monster": "GROUP_WASP", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 0, 3 ], "density": 0.1 } ]
+      "monster": { "*": { "group": "GROUP_WASP_QUEEN" } },
+      "place_monster": [ { "group": "GROUP_WASP_NEST", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 15 ] } ]
     }
   }
 ]
diff --git a/data/json/monster_attacks.json b/data/json/monster_attacks.json
@@ -90,6 +90,22 @@
     "no_dmg_msg_u": "The %1$s tries to stab you, but fails to penetrate your armor.",
     "no_dmg_msg_npc": "The %1$s tries to stab <npcname>, but fails to penetrate their armor!."
   },
+  {
+    "type": "monster_attack",
+    "attack_type": "melee",
+    "id": "sting",
+    "cooldown": 20,
+    "move_cost": 260,
+    "damage_max_instance": [ { "damage_type": "stab", "amount": 10 } ],
+    "body_parts": [ [ "leg_l", 2 ], [ "leg_r", 2 ], [ "head", 1 ], [ "arm_l", 2 ], [ "arm_r", 2 ], [ "torso", 3 ] ],
+    "effects": [ { "id": "venom_weaken", "duration": 400, "chance": 50 } ],
+    "hit_dmg_u": "The %1$s stings your %2$s!",
+    "hit_dmg_npc": "The %1$s stings <npcname>'s %2$s!",
+    "miss_msg_u": "The %1$s tries to sting you, but you dodge!",
+    "miss_msg_npc": "The %1$s tries to sting <npcname>, but they dodge!",
+    "no_dmg_msg_u": "The %1$s tries to sting your %2$s, but it fails to penetrate your armor.",
+    "no_dmg_msg_npc": "The %1$s tries to sting <npcname>'s %2$s, but it fails to penetrate their armor."
+  },
   {
     "id": "acid_spray",
     "type": "GUN",

diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json
@@ -143,6 +143,13 @@
     "name": "mosquito",
     "base_faction": "insect"
   },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "wasp",
+    "base_faction": "insect",
+    "by_mood": [ "centipede", "spider" ],
+    "hate": [ "bee", "insect", "small_animal", "dragonfly" ]
+  },
   {
     "type": "MONSTER_FACTION",
     "name": "dragonfly",

diff --git a/data/json/monstergroups/bugs.json b/data/json/monstergroups/bugs.json
@@ -84,10 +84,171 @@
     "monsters": [  ]
   },
   {
-    "name": "GROUP_WASP",
+    "name": "GROUP_WASP_NEST",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      {
+        "monster": "mon_wasp_small",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "ends": 180,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp_small",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "starts": 180,
+        "ends": 540,
+        "pack_size": [ 2, 4 ],
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp_small_guard",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "ends": 180,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp_small_guard",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "starts": 180,
+        "ends": 540,
+        "pack_size": [ 2, 4 ],
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "starts": 180,
+        "ends": 540,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "starts": 540,
+        "pack_size": [ 2, 4 ],
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp_guard",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "starts": 180,
+        "ends": 540,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp_guard",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "starts": 540,
+        "pack_size": [ 2, 4 ],
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      }
+    ]
+  },
+  {
+    "name": "GROUP_WASP_FORAGER",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      {
+        "monster": "mon_wasp_small",
+        "freq": 1000,
+        "cost_multiplier": 1,
+        "ends": 180,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp_small",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "starts": 180,
+        "ends": 540,
+        "pack_size": [ 2, 4 ],
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp",
+        "freq": 1000,
+        "cost_multiplier": 1,
+        "starts": 360,
+        "ends": 720,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp",
+        "freq": 1000,
+        "cost_multiplier": 1,
+        "starts": 720,
+        "pack_size": [ 2, 4 ],
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      }
+    ]
+  },
+  {
+    "name": "GROUP_WASP_GUARD",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      {
+        "monster": "mon_wasp_small_guard",
+        "freq": 1000,
+        "cost_multiplier": 1,
+        "ends": 180,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp_small_guard",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "starts": 180,
+        "ends": 540,
+        "pack_size": [ 2, 4 ],
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp_guard",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "starts": 180,
+        "ends": 540,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_wasp_guard",
+        "freq": 500,
+        "cost_multiplier": 1,
+        "starts": 540,
+        "pack_size": [ 2, 4 ],
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      }
+    ]
+  },
+  {
+    "name": "GROUP_WASP_QUEEN",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      { "monster": "mon_wasp_queen", "freq": 1000, "cost_multiplier": 50, "ends": 720 },
+      { "monster": "mon_wasp_mega", "freq": 1000, "cost_multiplier": 50, "starts": 360 }
+    ]
+  },
+  {
+    "name": "GROUP_WASP_PUPA",
     "type": "monstergroup",
     "default": "mon_wasp",
-    "monsters": [ { "monster": "mon_wasp", "freq": 100, "cost_multiplier": 1, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] } ]
+    "monsters": [
+      { "monster": "mon_wasp_guard", "freq": 50, "cost_multiplier": 1 },
+      { "monster": "mon_wasp", "freq": 500, "cost_multiplier": 1 }
+    ]
   },
   {
     "type": "monstergroup",

diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
@@ -127,6 +127,12 @@
     "default": "mon_centipede_small",
     "monsters": [ { "monster": "mon_centipede_small", "freq": 1000, "cost_multiplier": 1 } ]
   },
+  {
+    "name": "GROUP_EGG_WASP",
+    "type": "monstergroup",
+    "default": "mon_wasp_larva",
+    "monsters": [ { "monster": "mon_wasp_larva", "freq": 1000, "cost_multiplier": 1, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] } ]
+  },
   {
     "name": "GROUP_EGG_DRAGONFLY",
     "type": "monstergroup",

diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
@@ -121,7 +121,7 @@
       { "monster": "mon_rattlesnake", "freq": 10, "cost_multiplier": 1 },
       { "monster": "mon_rattlesnake_giant", "freq": 5, "cost_multiplier": 2 },
       { "monster": "mon_worm", "freq": 20, "cost_multiplier": 1 },
-      { "monster": "mon_wasp", "freq": 10, "cost_multiplier": 1 }
+      { "monster": "mon_wasp_small", "freq": 10, "cost_multiplier": 1 }
     ]
   },
   {
@@ -140,7 +140,7 @@
       { "monster": "mon_spider_widow_giant", "freq": 30, "cost_multiplier": 1, "pack_size": [ 2, 4 ] },
       { "monster": "mon_giant_cockroach", "freq": 50, "cost_multiplier": 1, "pack_size": [ 3, 6 ] },
       { "monster": "mon_black_rat", "freq": 30, "cost_multiplier": 1, "pack_size": [ 4, 8 ] },
-      { "monster": "mon_wasp", "freq": 50, "cost_multiplier": 1, "pack_size": [ 3, 6 ] },
+      { "monster": "mon_wasp_small", "freq": 50, "cost_multiplier": 1, "pack_size": [ 2, 4 ] },
       { "monster": "mon_zombie_child", "freq": 20, "cost_multiplier": 1, "pack_size": [ 2, 6 ] },
       { "monster": "mon_zombie", "freq": 20, "cost_multiplier": 1, "pack_size": [ 2, 6 ] },
       { "monster": "mon_zombie_rot", "freq": 10, "cost_multiplier": 1, "pack_size": [ 1, 5 ] },