Merge branch 'master' into afs_enforcer_station

.github/labeler.yml

@@ -222,6 +222,9 @@
   - data/mods/Aftershock/**/*
   - data/mods/aftershock_exoplanet/**/*
 
+"Mods: Backrooms":
+  - data/mods/Backrooms/**/*
+
 "Mods: Dark Days of the Dead":
   - data/mods/classic_zombies/**/*
 

.github/reviewers.yml

@@ -2,6 +2,8 @@ files:
   'data/mods/Aftershock/**':
     - Maleclypse
     - John-Candlebury
+  'data/mods/Backrooms/**':
+    - onura46
   'data/mods/DinoMod/**':
     - LyleSY
   'data/mods/BombasticPerks/**':

build-scripts/get_all_mods.py

@@ -10,10 +10,20 @@
 
 mods_this_time = []
 
+exclusions = [
+    # #74443 - incompatibility between mindovermatter and aftershock due to bug
+    ('mindovermatter', 'aftershock')
+]
+
 
 def compatible_with(mod, existing_mods):
     if mod in total_conversions and total_conversions & set(existing_mods):
         return False
+    for entry in exclusions:
+        if entry[0] == mod and entry[1] in existing_mods:
+            return False
+        if entry[1] == mod and entry[0] in existing_mods:
+            return False
     return True
 
 
@@ -23,11 +33,14 @@ def add_mods(mods):
             # Either an invalid mod id, or blacklisted.
             return False
     for mod in mods:
-        if mod not in mods_this_time and compatible_with(mod, mods_this_time):
-            if add_mods(all_mod_dependencies[mod]):
-                mods_this_time.append(mod)
-            else:
-                return False
+        if mod in mods_this_time:
+            continue
+        if not compatible_with(mod, mods_this_time):
+            return False
+        if add_mods(all_mod_dependencies[mod]):
+            mods_this_time.append(mod)
+        else:
+            return False
     return True
 
 

data/changelog.txt

@@ -120,6 +120,10 @@ Add new function follower_present for use in JSON
 Graphical construction preview
 Resume butchering
 The player can swap between defined outfits with the 'set of clothes' item
+Corpses can decay into bones etc (defined as a harvest group)
+Support WASM build via emscripten
+Allow ammo effects to cast spells
+Automatic turrets will not fire guns if they are going to overheat
 
 
 ## Content:
@@ -252,6 +256,17 @@ Add Snow Cones and Snow Machines
 Add three new locations to Aftershock
 New jewelry added
 Night vision helmet attachments
+Add murky water, make regular water safer
+Add Alcoholic Snow Cones
+10/22 Pistol
+Adds a variety of marine plants.
+Adds bench vise
+Full auto 10/22s
+Reduces craters
+fish emulsion
+Static NPC factions have their own camps and food stores
+Regen serum
+Vitamin Cost per mutation
 
 
 ## Interface:
@@ -316,7 +331,8 @@ Adding Classless as a supernatural category
 Mission UI migrated to imGUI
 Provide a visual UI for changing vehicle part shapes
 Display RAS weapon reload time in aim ui
-
+Warn on setting an auto feature when auto features are off
+support selecting all npcs
 
 
 ## Mods:
@@ -479,6 +495,13 @@ Being mute prevents casting VERBAL spells
 [Xedra Evolved] Make Paraclesian fae's magic easier in appropriate terrain
 Aftershock: Basic Hacking EOCs
 [Xedra Evolved] Make Paraclesian fae's magic harder in some circumstances
+Adds another variant of Habitat Block to Aftershock. Also adds a new item group and monster group.
+[Aftershock] Add the Esper scenario
+Aftershock: Adds one variant of Habitat Block to the Aftershock Exoplanet. Also adds hackable display cases and doors.
+Psionic powers say "Power level" instead of "Spell level" in the UI
+[MoM] Torrential channeling research no longer has required proficiencies
+Aftershock: Add urban farms as town buildings
+Summon Mojocycle gets better at lvl 10
 
 
 ## Balance:
@@ -551,6 +574,9 @@ Added limb blocking to bionic styles
 The average skill level of NPCs will rise over time
 Random NPCs have the same starting skills and proficiencies as the average new character
 Food continues to rot at temp above 63C
+Adjust Alpha to make breach harder while supporting future mutations
+Lower the warmth values of some undergarments and thin clothes.
+Switched Reload Speeds for Plasma Rifle and PPA
 
 
 ## Bugfixes:
@@ -723,6 +749,12 @@ Prevent segfault when butcher target disappears
 Make Skunks Less Bloodthirsty
 Oops - remove cramped space when no longer cramped
 Correctly display the cost to learn the proficiency
+Hordes won't wander without a reason
+Allow using hotkeys to select spells in other categories
+Monster difficulty (and exp for killing them) cannot be lower than 1
+Fix connections like roads sometimes failing to gen on cityless overmaps
+Correctly display pain penalties.
+Removes Railgun Fouling
 
 
 ## Performance:
@@ -751,6 +783,7 @@ Avoid wasteful loop in map special road connections
 Decrease memory overhead by about 200MB or about 15% by slimming down mapgen data structure.
 Faster ascii overmap drawing
 Optimize item::stacks as well as allocation patterns in item and elsewhere
+cache available recipe list in craft menu
 
 
 ## Infrastructure:
@@ -808,6 +841,7 @@ Use test enumerating item spawns to make assertions about the rate of appearance
 Add perceived kwarg to pain_eval math function, apply it in Mind Over Matter
 refactored ImTuis drawing code to fix a black screen issue, and to improve performance
 refactor cataimgui::draw_colored_text
+Create header for forward declarations of point types
 
 
 ## Build:
@@ -827,6 +861,7 @@ Use one precompiled header
 Fix zlib old-style-cast build breakage
 Fix crash with imgui and CMake
 Update Flatpak manifest to use clang and include the default soundpack
+stl_emulation span::count_ is not const anymore
 
 
 ## I18N and A11Y:

data/json/achievements.json

@@ -2011,7 +2011,7 @@
       {
         "event_statistic": "last_overmap_special_avatar_entered",
         "is": "==",
-        "target": [ "overmap_special_id", "Isherwood Farms" ],
+        "target": [ "overmap_special_id", "Isherwood Farm Mutable" ],
         "visible": "when_achievement_completed",
         "description": "Reach Isherwood Farms"
       }

data/json/ammo_effects.json

@@ -170,11 +170,6 @@
     "type": "ammo_effect",
     "//": "Applies sensor-stunning effect to robots. Hardcoded"
   },
-  {
-    "id": "RECOVER_X",
-    "type": "ammo_effect",
-    "//": " Has a [(X-1)/X] probability to create a single charge of the used ammo at the point of impact. Change the X with any number, like 'RECOVER_2' means [(2-1)/2]=50% chance. Hardcoded"
-  },
   {
     "id": "RECYCLED",
     "type": "ammo_effect",

data/json/construction/misc.json

@@ -3,23 +3,25 @@
     "type": "construction",
     "id": "constr_deconstruct",
     "group": "deconstruct_furniture",
-    "category": "FURN",
+    "category": "OTHER",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "PRY", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ] ],
     "pre_special": "check_deconstruct",
+    "do_turn_special": "do_turn_deconstruct",
     "post_flags": [ "keep_items" ],
     "post_special": "done_deconstruct"
   },
   {
     "type": "construction",
     "id": "constr_deconstruct_simple",
     "group": "deconstruct_simple_furniture",
-    "category": "FURN",
+    "category": "OTHER",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "10 s",
     "pre_note": "Certain terrain and furniture can be deconstructed without any tools.",
     "pre_flags": "EASY_DECONSTRUCT",
+    "do_turn_special": "do_turn_deconstruct",
     "post_flags": [ "keep_items" ],
     "post_special": "done_deconstruct"
   },

data/json/construction_group.json

@@ -957,12 +957,12 @@
   {
     "type": "construction_group",
     "id": "deconstruct_furniture",
-    "name": "Deconstruct Furniture"
+    "name": "Deconstruct Terrain/Furniture"
   },
   {
     "type": "construction_group",
     "id": "deconstruct_simple_furniture",
-    "name": "Deconstruct Simple Furniture"
+    "name": "Deconstruct Simple Terrain/Furniture"
   },
   {
     "type": "construction_group",

data/json/flags.json

@@ -2479,5 +2479,10 @@
     "id": "PREFIX_XS",
     "type": "json_flag",
     "item_prefix": "XS "
+  },
+  {
+    "id": "DECAYS_IN_AIR",
+    "type": "json_flag",
+    "info": "This will eventually <bad>go bad</bad> if left in the open air too long."
   }
 ]

data/json/furniture_and_terrain/furniture-decorative.json

@@ -232,6 +232,24 @@
       ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_lighthouse_light",
+    "name": "lighthouse light",
+    "description": "Very high power, modern lighthouse LED light source with attached heatsinks.",
+    "symbol": "%",
+    "color": "light_gray",
+    "required_str": -1,
+    "move_cost_mod": -1,
+    "deconstruct": { "items": [ { "item": "lightstrip_inactive" }, { "item": "material_aluminium_ingot", "count": 4 } ] },
+    "bash": {
+      "str_min": 18,
+      "str_max": 80,
+      "sound": "clang!",
+      "sound_fail": "ting.",
+      "items": [ { "item": "material_aluminium_ingot", "count": [ 1, 4 ] }, { "item": "e_scrap", "count": [ 1, 4 ] } ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_winter_wreath",

data/json/furniture_and_terrain/furniture-fireplaces.json

@@ -69,6 +69,34 @@
       ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_makeshift_brazier",
+    "name": "makeshift brazier",
+    "looks_like": "bucket",
+    "description": "A metal bucket with holes, in which you can safely start a fire.  It's too small to fit any fuel item larger than some splintered wood.",
+    "symbol": "#",
+    "color": "red",
+    "move_cost_mod": 2,
+    "coverage": 35,
+    "required_str": 4,
+    "max_volume": "5 L",
+    "crafting_pseudo_item": "fake_fireplace",
+    "flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
+    "deployed_item": "makeshift_brazier",
+    "examine_action": "fireplace",
+    "bash": {
+      "str_min": 8,
+      "str_max": 30,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "scrap", "count": [ 3, 6 ] },
+        { "item": "steel_chunk", "count": [ 1, 3 ] },
+        { "item": "sheet_metal_small", "count": [ 1, 3 ] }
+      ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_hobo_stove",

data/json/furniture_and_terrain/terrain-doors.json

@@ -1222,6 +1222,55 @@
       "items": [ { "item": "glass_shard", "count": [ 42, 84 ] } ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_door_lighthouse_lens_c",
+    "name": "closed lighthouse lens hinged section",
+    "description": "An intricate arrangement of glass, designed to focus light from within to be visible over long distances.  This section of the lens is on hinges and can be opened for maintenance.",
+    "symbol": "+",
+    "looks_like": "t_door_glass_c",
+    "color": "light_cyan",
+    "move_cost": 0,
+    "connect_groups": "WALL",
+    "connects_to": "WALL",
+    "rotates_to": "INDOORFLOOR",
+    "flags": [ "TRANSPARENT", "DOOR", "NOITEM", "BLOCK_WIND" ],
+    "open": "t_door_lighthouse_lens_o",
+    "bash": {
+      "str_min": 6,
+      "str_max": 20,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 10,
+      "ter_set": "t_null",
+      "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, { "item": "scrap", "count": [ 3, 6 ] } ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_door_lighthouse_lens_o",
+    "name": "open lighthouse lens hinged section",
+    "description": "An intricate arrangement of glass, designed to focus light from within to be visible over long distances.  This section of the lens is hinged and is currently open.",
+    "symbol": "'",
+    "looks_like": "t_door_glass_o",
+    "color": "light_cyan",
+    "move_cost": 2,
+    "connect_groups": "WALL",
+    "connects_to": "WALL",
+    "flags": [ "TRANSPARENT" ],
+    "close": "t_door_lighthouse_lens_c",
+    "bash": {
+      "str_min": 4,
+      "str_max": 20,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 10,
+      "ter_set": "t_null",
+      "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, { "item": "scrap", "count": [ 3, 6 ] } ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_door_c_peep",

data/json/furniture_and_terrain/terrain-floors-indoor.json

@@ -442,6 +442,20 @@
     "flags": [ "TRANSPARENT", "INDOORS", "COLLAPSES", "SUPPORTS_ROOF", "FLAT", "ROAD" ],
     "bash": { "ter_set": "t_null", "str_min": 75, "str_max": 400, "str_min_supported": 100, "bash_below": true }
   },
+  {
+    "type": "terrain",
+    "id": "t_stone_masonry_floor",
+    "name": "stone masonry floor",
+    "description": "A floor of carefully cut and laid stones, joined with mortar.",
+    "symbol": ".",
+    "color": "light_gray",
+    "looks_like": "t_rock_floor",
+    "connect_groups": "ROCKFLOOR",
+    "connects_to": "ROCKFLOOR",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
+    "bash": { "ter_set": "t_null", "str_min": 75, "str_max": 400, "str_min_supported": 100, "bash_below": true }
+  },
   {
     "type": "terrain",
     "id": "t_floor_warped",

data/json/furniture_and_terrain/terrain-roofs.json

@@ -307,6 +307,18 @@
     "flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
     "bash": { "str_min": 200, "str_max": 500, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
   },
+  {
+    "type": "terrain",
+    "id": "t_metal_roof_red",
+    "name": "red metal roof",
+    "description": "A sturdy section of metallic rooftop, painted red for visibility and weather resistance.",
+    "symbol": ".",
+    "looks_like": "t_metal_roof",
+    "color": "red",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
+    "bash": { "str_min": 200, "str_max": 500, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_null", "bash_below": false }
+  },
   {
     "type": "terrain",
     "id": "t_log_sod_roof",