Mantis and ladybug rebalance

Implement Venera's comments
SuddenEyePuncture · Jun 15, 2021 · e21179f · e21179f
2 parents 2af2bd9 + 8e7ddc9
commit e21179f
Show file tree

Hide file tree

Showing 29 changed files with 121 additions and 69 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -178,6 +178,8 @@ jobs:
           mv cataclysmdda-0.E.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
       - name: Build CDDA (osx)
         if: runner.os == 'macOS'
+        env:
+          USE_HOME_DIR: 1
         run: |
           cat >VERSION.txt <<EOL
           build type: ${{ matrix.artifact }}
@@ -237,3 +239,13 @@ jobs:
           asset_path: cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
           asset_name: cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
           asset_content_type: ${{ matrix.content }}
+      - name: Trigger GitHub pages rebuild
+        run: |
+          curl --fail --request POST \
+            --url https://api.github.com/repos/${{ github.repository }}/pages/builds \
+            --header "Authorization: Bearer $USER_TOKEN" \
+            --header "Accept: application/vnd.github.v3+json"
+        env:
+          # You must create a personal token with repo access as GitHub does
+          # not yet support server-to-server page builds.
+          USER_TOKEN: ${{ secrets.USER_TOKEN }}
diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -770,6 +770,8 @@
       { "item": "hamburger", "count": [ 0, 3 ] },
       { "item": "sloppyjoe", "count": [ 0, 3 ] },
       { "item": "fries", "count": [ 0, 3 ] },
+      { "item": "hotdogs_cooked", "count": [ 0, 3 ] },
+      { "item": "corndogs_cooked", "count": [ 0, 3 ] },
       { "item": "bacon", "count": [ 0, 3 ] }
     ]
   },

diff --git a/data/json/mapgen/basement/basement_game.json b/data/json/mapgen/basement/basement_game.json
@@ -3,7 +3,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "basement" ],
-    "//": "used by house_31 and house_32 and house_32",
+    "//": "used by house_31 and house_32",
     "weight": 250,
     "object": {
       "rotation": [ 0, 3 ],

diff --git a/data/json/mapgen/basement/basement_lab_stairs.json b/data/json/mapgen/basement/basement_lab_stairs.json
@@ -25,7 +25,7 @@
         "|.ccccccc.|..|xh..h..hx|",
         "|.........|7.|d..dxd..d|",
         "|---------|..|---------|",
-        "########--|LL6--########",
+        "########--|LL!--########",
         "########=,,,,,,=########",
         "########=,,,,,,=########",
         "########=,,,,,,=########",
@@ -38,8 +38,8 @@
       "terrain": {
         "=": "t_wall",
         ",": "t_rock_floor",
-        "6": "t_card_science",
-        "7": "t_rock_floor",
+        "!": "t_card_science",
+        "7": "t_thconc_floor",
         "<": "t_stairs_up",
         ">": "t_stairs_down"
       },

diff --git a/data/json/mapgen/church.json b/data/json/mapgen/church.json
@@ -33,7 +33,15 @@
         "      ^^    ss    ^^   s ",
         "      ^^    ss    ^^   s "
       ],
-      "terrain": { "p": "t_floor", "W": "t_floor", "<": "t_stairs_up", "y": "t_floor", "r": "t_carpet_red" },
+      "terrain": {
+        "p": "t_floor",
+        "6": "t_floor",
+        "W": "t_floor",
+        "<": "t_stairs_up",
+        "y": "t_floor",
+        "t": "t_carpet_red",
+        "r": "t_carpet_red"
+      },
       "furniture": { "p": "f_piano", "W": "f_wardrobe" },
       "palettes": [ "church" ],
       "mapping": { "b": { "furniture": "f_brazier" } },
@@ -265,6 +273,7 @@
         "<": "t_stairs_up",
         ",": "t_floor",
         "t": "t_floor",
+        "6": "t_floor",
         "y": "t_floor"
       },
       "items": {

diff --git a/data/json/mapgen/house/house31.json b/data/json/mapgen/house/house31.json
@@ -2,7 +2,7 @@
   {
     "method": "json",
     "om_terrain": "house_31",
-    "//": "used by legacy basements including lab basements, no dedicated stairs added.",
+    "//": "used by lab basements.",
     "type": "mapgen",
     "weight": 100,
     "object": {
@@ -20,7 +20,7 @@
         ")  hhhh        #~~~~~~~#",
         ")  ffff        +~~~~~~~#",
         ")  hhhh        #U~NN~~q#",
-        "#        RRT   #########",
+        "#       >RRT   #########",
         "#6  Y||||||||   | I@@I #",
         "#6  J|RIII  +   +  @@  o",
         "o7  J|  h   ||+||     b#",

diff --git a/data/json/mapgen/house/house32.json b/data/json/mapgen/house/house32.json
@@ -2,7 +2,7 @@
   {
     "method": "json",
     "om_terrain": "house_32",
-    "//": "used by lab basements, no dedicated stairs added.",
+    "//": "used by lab basements.",
     "type": "mapgen",
     "weight": 100,
     "object": {
@@ -14,7 +14,7 @@
         "#~~~~~~~~+    *````.....",
         "#~~~~~~~~#    o.......^.",
         "#~~~~~~~U#L   ###]]]]###",
-        "#~~~~~~~U#       HHHH T#",
+        "#~~~~~~~U#>      HHHH T#",
         "#~~~~~~~q#R       ll  x#",
         "#~~NN~~qq#R            o",
         "##########c      HHHH  #",

diff --git a/data/json/monsters/cyborgs.json b/data/json/monsters/cyborgs.json
@@ -33,7 +33,7 @@
       "SEES",
       "HEARS",
       "BASHES",
-      "ATTACKMON",
+      "PUSH_MON",
       "ELECTRONIC",
       "NO_BREATHE",
       "REVIVES",
@@ -78,7 +78,7 @@
       "SEES",
       "HEARS",
       "BASHES",
-      "ATTACKMON",
+      "PUSH_MON",
       "ELECTRONIC",
       "WARM",
       "STUMBLES",

diff --git a/data/json/monsters/fungus.json b/data/json/monsters/fungus.json
@@ -450,7 +450,6 @@
       "BASHES",
       "DESTROYS",
       "POISON",
-      "ATTACKMON",
       "NO_BREATHE",
       "PUSH_MON",
       "PUSH_VEH",

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
@@ -1938,8 +1938,8 @@
     "material": [ "iflesh" ],
     "symbol": "M",
     "color": "light_green",
-    "aggression": 50,
-    "morale": 80,
+    "aggression": 20,
+    "morale": 30,
     "melee_skill": 8,
     "melee_dice": 1,
     "melee_dice_sides": 6,
@@ -1948,8 +1948,8 @@
     "armor_bash": 10,
     "armor_cut": 16,
     "armor_bullet": 13,
-    "vision_day": 15,
-    "vision_night": 5,
+    "vision_day": 8,
+    "vision_night": 4,
     "harvest": "arachnid",
     "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ],
     "fear_triggers": [ "FIRE", "HURT" ],
@@ -1975,13 +1975,16 @@
     "melee_dice": 2,
     "melee_cut": 20,
     "dodge": 2,
+    "attack_cost":25,
     "special_attacks": [
       {
         "type": "bite",
         "cooldown": 4,
         "accuracy": 5,
-        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ]
-      }
+        "no_infection_chance": 25,
+        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_penetration": 0.6 } ]
+      },
+      [ "RANGED_PULL", 30 ], [ "GRAB_DRAG", 10 ], { "type": "leap", "cooldown": 8, "max_range": 5, "allow_no_target": false }
     ],
     "extend": { "flags": [ "DESTROYS", "PUSH_MON", "PUSH_VEH" ] },
     "delete": { "type": "leap", "cooldown": 8, "max_range": 5, "allow_no_target": false }
@@ -2030,21 +2033,21 @@
     "species": [ "INSECT" ],
     "volume": "400 L",
     "weight": "533 kg",
-    "hp": 160,
+    "hp": 350,
     "speed": 110,
     "material": [ "iflesh" ],
     "symbol": "B",
     "color": "red",
-    "morale": 80,
-    "aggression": 40,
+    "morale": 40,
+    "aggression": 20,
     "melee_skill": 6,
     "melee_dice": 2,
     "melee_dice_sides": 6,
     "melee_cut": 8,
     "dodge": 1,
     "armor_bash": 7,
-    "armor_cut": 12,
-    "armor_bullet": 10,
+    "armor_cut": 20,
+    "armor_bullet": 30,
     "vision_day": 20,
     "vision_night": 5,
     "harvest": "arachnid",
@@ -2056,10 +2059,10 @@
         "type": "bite",
         "cooldown": 4,
         "accuracy": 6,
-        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ]
-      }
+        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_penetration": 0.6 } ]
+ } 
     ],
-    "flags": [ "POISON", "SEES", "HEARS", "SMELLS", "FLIES", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ]
+    "flags": ["POISON", "SEES", "HEARS", "SMELLS", "FLIES" , "PATH_AVOID_FIRE" ]
   },
   {
     "id": "mon_grasshopper_small",
@@ -2143,8 +2146,9 @@
         "type": "bite",
         "cooldown": 4,
         "accuracy": 8,
-        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ]
-      }
+        "no_infection_chance": 25,
+        "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_penetration": 0.6 } ]
+      } 
     ],
     "flags": [ "POISON", "SEES", "SMELLS", "IMMOBILE", "DIGS", "RANGED_ATTACKER" ]
   },

diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
@@ -98,7 +98,7 @@
     "//": "220 days gestation period, the mother and cubs remain together for 16-17 months.",
     "baby_flags": [ "SPRING" ],
     "special_attacks": [ [ "EAT_FOOD", 20 ] ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "ATTACKMON" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "PUSH_MON" ]
   },
   {
     "id": "mon_beaver",
@@ -1854,7 +1854,7 @@
     "harvest": "mammal_large_leather",
     "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 8 },
     "special_attacks": [ [ "EAT_CROP", 60 ] ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "ATTACKMON" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ]
   },
   {
     "id": "mon_muskrat",
@@ -1920,7 +1920,7 @@
     "death_function": [ "NORMAL" ],
     "regenerates": 10,
     "regen_morale": true,
-    "flags": [ "ATTACKMON", "BORES", "CAN_DIG", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "WARM" ],
+    "flags": [ "PUSH_MON", "BORES", "CAN_DIG", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "WARM" ],
     "//": "Reinsert GOODHEARING when z-level tunneling is possible."
   },
   {

diff --git a/data/json/monsters/mutant_mammal.json b/data/json/monsters/mutant_mammal.json
@@ -39,7 +39,7 @@
     "placate_triggers": [ "MEAT" ],
     "death_function": [ "NORMAL" ],
     "harvest": "mutant_mammal_large_fur",
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "ATTACKMON", "STUMBLES", "KEENNOSE" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "PUSH_MON", "STUMBLES", "KEENNOSE" ]
   },
   {
     "id": "mon_beaver_mutant_huge",

diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json
@@ -302,7 +302,8 @@
       "NOHEAD",
       "BASHES",
       "FLIES",
-      "ATTACKMON",
+      "PUSH_MON",
+      "PUSH_VEH",
       "PLASTIC",
       "NO_BREATHE",
       "HIT_AND_RUN",

diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json
@@ -88,7 +88,7 @@
     "fear_triggers": [ "FIRE", "HURT" ],
     "placate_triggers": [ "MEAT" ],
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "ATTACKMON", "SWIMS" ]
+    "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "PUSH_MON", "SWIMS" ]
   },
   {
     "id": "mon_rattlesnake",

diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json
@@ -461,8 +461,7 @@
       "REVIVES",
       "FILTHY",
       "PUSH_MON",
-      "PUSH_VEH",
-      "ATTACKMON"
+      "PUSH_VEH"
     ]
   },
   {

diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json
@@ -549,7 +549,6 @@
       "BASHES",
       "DESTROYS",
       "POISON",
-      "ATTACKMON",
       "NO_BREATHE",
       "REVIVES",
       "PUSH_MON",

diff --git a/data/json/monsters/zed_skeletal.json b/data/json/monsters/zed_skeletal.json
@@ -154,7 +154,6 @@
       "BASHES",
       "DESTROYS",
       "POISON",
-      "ATTACKMON",
       "NO_BREATHE",
       "REVIVES",
       "PUSH_MON",

diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -655,6 +655,7 @@
     "type": "city_building",
     "id": "house_31",
     "locations": [ "land" ],
+    "//": "The generic basement of this house is a target for the hidden lab map special",
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "house_31_north" },
       { "point": [ 0, 0, 1 ], "overmap": "house_31_roof_north" },
@@ -665,6 +666,7 @@
     "type": "city_building",
     "id": "house_32",
     "locations": [ "land" ],
+    "//": "The generic basement of this house is a target for the hidden lab map special",
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "house_32_north" },
       { "point": [ 0, 0, 1 ], "overmap": "house_32_roof_north" },

diff --git a/data/json/overmap/overmap_connections.json b/data/json/overmap/overmap_connections.json
@@ -41,5 +41,10 @@
       { "terrain": "railroad_level_crossing", "locations": [ "railroad_level_crossing_allowed" ], "basic_cost": 1 },
       { "terrain": "railroad_bridge", "locations": [ "water" ], "basic_cost": 1, "flags": [ "ORTHOGONAL" ] }
     ]
+  },
+  {
+    "type": "overmap_connection",
+    "id": "hidden_lab_basement",
+    "subtypes": [ { "terrain": "basement", "locations": [ "potential_basement_lab_entrance" ], "basic_cost": 0 } ]
   }
 ]
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
@@ -7323,5 +7323,16 @@
     "city_sizes": [ 0, 12 ],
     "occurrences": [ 10, 100 ],
     "flags": [ "CLASSIC", "UNIQUE" ]
+  },
+  {
+    "type": "overmap_special",
+    "id": "basement_hidden_lab_entrance",
+    "overmaps": [ { "point": [ 0, 0, -1 ], "overmap": "basement_hidden_lab_stairs" } ],
+    "connections": [ { "point": [ 0, 0, -1 ], "connection": "hidden_lab_basement", "terrain": "basement", "existing": true } ],
+    "rotate": false,
+    "locations": [ "potential_basement_lab_entrance" ],
+    "//": "Low chance to find a matching location, so always try to place it",
+    "occurrences": [ 100, 100 ],
+    "flags": [ "LAB", "UNIQUE" ]
   }
 ]
diff --git a/data/json/overmap/special_locations.json b/data/json/overmap/special_locations.json
@@ -119,5 +119,10 @@
     "type": "overmap_location",
     "id": "lake_shore",
     "terrains": [ "lake_shore" ]
+  },
+  {
+    "type": "overmap_location",
+    "id": "potential_basement_lab_entrance",
+    "terrains": [ "basement" ]
   }
 ]