Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

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

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

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

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

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": {

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

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

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

data/json/monsters/fungus.json

@@ -450,7 +450,6 @@
       "BASHES",
       "DESTROYS",
       "POISON",
-      "ATTACKMON",
       "NO_BREATHE",
       "PUSH_MON",
       "PUSH_VEH",

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."
   },
   {

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

data/json/monsters/nether.json

@@ -302,7 +302,8 @@
       "NOHEAD",
       "BASHES",
       "FLIES",
-      "ATTACKMON",
+      "PUSH_MON",
+      "PUSH_VEH",
       "PLASTIC",
       "NO_BREATHE",
       "HIT_AND_RUN",

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

data/json/monsters/zed-animal.json

@@ -461,8 +461,7 @@
       "REVIVES",
       "FILTHY",
       "PUSH_MON",
-      "PUSH_VEH",
-      "ATTACKMON"
+      "PUSH_VEH"
     ]
   },
   {

data/json/monsters/zed_misc.json

@@ -549,7 +549,6 @@
       "BASHES",
       "DESTROYS",
       "POISON",
-      "ATTACKMON",
       "NO_BREATHE",
       "REVIVES",
       "PUSH_MON",

data/json/monsters/zed_skeletal.json

@@ -154,7 +154,6 @@
       "BASHES",
       "DESTROYS",
       "POISON",
-      "ATTACKMON",
       "NO_BREATHE",
       "REVIVES",
       "PUSH_MON",

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

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

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

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

data/json/vehicles/helicopters.json

@@ -467,7 +467,7 @@
     "name": "Medevac helicopter w1",
     "parts": [
       { "x": 0, "y": 0, "parts": [ "frame_cross", "seat", "controls", "dashboard", "roof" ] },
-      { "x": 0, "y": 0, "parts": [ "seatbelt", { "part": "tank_55gal_drum", "fuel": "jp8" } ] },
+      { "x": 0, "y": 0, "parts": [ "seatbelt" ] },
       { "x": 0, "y": -1, "parts": [ "frame_vertical_left", "door_nw" ] },
       { "x": 0, "y": 1, "parts": [ "frame_cross", "medium_storage_battery", "roof" ] },
       { "x": 0, "y": 1, "part": "aisle_vertical" },
@@ -484,18 +484,17 @@
       { "x": 2, "y": 2, "part": "frame_ne" },
       { "x": -1, "y": -1, "parts": [ "frame_vertical_left", "board_vertical", "roof" ] },
       { "x": -1, "y": 0, "parts": [ "frame_cross", "roof", "stowboard_horizontal" ] },
-      { "x": -1, "y": 0, "part": "tank_55gal_drum", "fuel": "jp8" },
       { "x": -1, "y": 1, "parts": [ "frame_cross", "door_internal_front", "roof" ] },
       { "x": -1, "y": 2, "parts": [ "frame_cross", "roof", "stowboard_horizontal" ] },
       { "x": -1, "y": 3, "parts": [ "frame_vertical_right", "board_vertical_right", "roof" ] },
       { "x": -2, "y": -1, "parts": [ "frame_vertical", "board_vertical", "roof" ] },
       { "x": -2, "y": 0, "parts": [ "frame_cross", "roof", "bed" ] },
-      { "x": -2, "y": 0, "part": "tank_55gal_drum", "fuel": "jp8" },
       { "x": -2, "y": 0, "part": "engine_turbine_medium" },
       { "x": -2, "y": 1, "parts": [ "frame_cross", "aisle_vertical", "roof" ] },
       { "x": -2, "y": 2, "part": "frame_cross" },
       { "x": -3, "y": -1, "parts": [ "frame_sw", "board_sw", "roof" ] },
       { "x": -3, "y": 0, "parts": [ "frame_ne", "board_ne", "roof" ] },
+      { "x": -3, "y": 0, "part": "tank_55gal_drum", "fuel": "jp8" },
       { "x": -3, "y": 1, "parts": [ "frame_cross", "roof" ] }
     ],
     "items": [
@@ -538,7 +537,6 @@
       { "x": -1, "y": -1, "parts": [ "frame_vertical", "roof" ] },
       { "x": -1, "y": 0, "parts": [ "frame_cross", "roof", "stowboard_horizontal" ] },
       { "x": -1, "y": 1, "parts": [ "frame_cross", "door_internal_front", "roof" ] },
-      { "x": -1, "y": 1, "part": "tank_55gal_drum", "fuel": "jp8" },
       { "x": -1, "y": 2, "parts": [ "frame_cross", "roof", "stowboard_horizontal" ] },
       { "x": -1, "y": 3, "parts": [ "frame_vertical_right", "roof", "door_se" ] },
       { "x": -2, "y": -1, "parts": [ "frame_vertical_left", "roof", "door_sw" ] },
@@ -550,8 +548,10 @@
       { "x": -2, "y": 3, "parts": [ "frame_vertical_right", "door_se" ] },
       { "x": -3, "y": -1, "parts": [ "frame_sw", "board_sw" ] },
       { "x": -3, "y": 0, "parts": [ "frame_ne", "board_ne", "roof" ] },
+      { "x": -3, "y": 0, "part": "tank_55gal_drum", "fuel": "jp8" },
       { "x": -3, "y": 1, "parts": [ "frame_cross", "aisle_vertical", "roof" ] },
       { "x": -3, "y": 2, "parts": [ "frame_nw", "board_nw", "roof" ] },
+      { "x": -3, "y": 2, "part": "tank_55gal_drum", "fuel": "jp8" },
       { "x": -3, "y": 3, "parts": [ "frame_se", "board_se" ] },
       { "x": -4, "y": 0, "parts": [ "frame_sw", "board_sw" ] },
       { "x": -4, "y": 1, "parts": [ "frame_cross", "roof", "board_horizontal" ] },

data/json/vehicles/military.json

@@ -659,11 +659,11 @@
       { "x": 2, "y": 3, "parts": [ "hdframe_vertical_T_right", "hdhalfboard_ne" ] },
       { "x": 2, "y": 3, "parts": [ "plating_military", "wheel_mount_heavy_steerable" ] },
       { "x": 2, "y": 3, "part": "wheel_armor" },
-      { "x": 3, "y": -1, "parts": [ "hdframe_nw", "plating_spiked" ] },
-      { "x": 3, "y": 0, "parts": [ "hdframe_horizontal_front", "plating_spiked" ] },
-      { "x": 3, "y": 1, "parts": [ "hdframe_horizontal_front", "plating_spiked" ] },
-      { "x": 3, "y": 2, "parts": [ "hdframe_horizontal_front", "plating_spiked" ] },
-      { "x": 3, "y": 3, "parts": [ "hdframe_ne", "plating_spiked" ] },
+      { "x": 3, "y": -1, "parts": [ "hdframe_nw", "plating_military" ] },
+      { "x": 3, "y": 0, "parts": [ "hdframe_horizontal_front", "plating_military" ] },
+      { "x": 3, "y": 1, "parts": [ "hdframe_horizontal_front", "plating_military" ] },
+      { "x": 3, "y": 2, "parts": [ "hdframe_horizontal_front", "plating_military" ] },
+      { "x": 3, "y": 3, "parts": [ "hdframe_ne", "plating_military" ] },
       { "x": -1, "y": -1, "parts": [ "hdframe_vertical_T_left", "hdhalfboard_sw", "muffler" ] },
       { "x": -1, "y": -1, "part": "plating_military" },
       { "x": -1, "y": 0, "part": "hdframe_horizontal" },

data/json/vehicles/vans_busses.json

@@ -44,11 +44,11 @@
       { "x": 2, "y": 3, "parts": [ "hdframe_vertical_T_right", "hdhalfboard_ne" ] },
       { "x": 2, "y": 3, "parts": [ "plating_steel", "wheel_mount_heavy_steerable" ] },
       { "x": 2, "y": 3, "part": "wheel_armor" },
-      { "x": 3, "y": -1, "parts": [ "hdframe_nw", "plating_spiked" ] },
-      { "x": 3, "y": 0, "parts": [ "hdframe_horizontal_front", "plating_spiked" ] },
-      { "x": 3, "y": 1, "parts": [ "hdframe_horizontal_front", "plating_spiked" ] },
-      { "x": 3, "y": 2, "parts": [ "hdframe_horizontal_front", "plating_spiked" ] },
-      { "x": 3, "y": 3, "parts": [ "hdframe_ne", "plating_spiked" ] },
+      { "x": 3, "y": -1, "parts": [ "hdframe_nw", "plating_steel" ] },
+      { "x": 3, "y": 0, "parts": [ "hdframe_horizontal_front", "plating_steel" ] },
+      { "x": 3, "y": 1, "parts": [ "hdframe_horizontal_front", "plating_steel" ] },
+      { "x": 3, "y": 2, "parts": [ "hdframe_horizontal_front", "plating_steel" ] },
+      { "x": 3, "y": 3, "parts": [ "hdframe_ne", "plating_steel" ] },
       { "x": -1, "y": -1, "parts": [ "hdframe_vertical_left", "hddoor_left", "plating_steel" ] },
       { "x": -1, "y": 0, "parts": [ "hdframe_cross", "seat", "seatbelt", "hdroof" ] },
       { "x": -1, "y": 1, "parts": [ "hdframe_cross", "seat", "seatbelt", "hdroof" ] },

doc/OVERMAP.md

@@ -286,9 +286,14 @@ as it corresponds to the way in which the JSON for mapgen is defined.
 
 The overmap special can be connected to the road, subway or sewer networks. Specifying a connection
 point causes the appropriate connection to be automatically generated from the nearest matching terrain
-, unless `existing` is set to true. In that case the special can only be placed if the connection point
-intersects an existing road/etc. Since the road network is sparse, and most roads will be generated to 
-connect up other specials, this lowers the chances of the special spawning considerably.
+, unless `existing` is set to true.
+
+Connections with `existing` set to true are used to test the validity of an overmap special's
+placement. Unlike normal connection points these do not have to reference road/tunnel terrain types.
+They will not generate new terrain, and may even be overwritten by the overmap special's terrain.
+However, since the overmap special algorithm considers a limited number of random locations per overmap,
+the use of `existing` connections that target a rare terrain lowers the chances of the special 
+spawning considerably.
 
 ### Occurrences (default)
 
@@ -299,8 +304,8 @@ other. In addition, there are no specials with a maximum occurrence of 1. This i
 each normal special has a very high chance of being placed at least once per overmap, owing to some 
 quirks of the code (most notably, the number of specials is only slightly more than the number of slots per
 overmap, specials that failed placement don't get disqualified and can be rolled for again, and placement iterates
-until all sectors are occupied). For specials that are not common enough to warrant appearing on all overmaps
-please use the "UNIQUE" flag.
+until all sectors are occupied). For specials that are not common enough to warrant appearing more
+than once per overmap please use the "UNIQUE" flag.
 
 ### Occurrences ( UNIQUE )