Merge branch 'dormant_zombie' of https://github.com/gkarfakis19/Catac…

…lysm-DDA into dormant_zombie

data/changelog.txt

@@ -87,6 +87,7 @@ Allow for a "variant" field when using the add_trait effect
 There's an ocean in the East (or wherever you set the json) now. NBD.  Feel free to add content for it.
 Make run_eocs/queue_eocs support variable objects
 Protein bars now give character a psychological trauma
+Adds sand to ocean beaches
 
 
 ## Content:
@@ -163,6 +164,11 @@ Add's more fungal insect monsters, fixes bugs I forgot in last PR.
 Adds most kinds of Arisaka rifles to the game, cartridges, and item spawns.
 update filter guide to indicate that flags were added as filter option following PR #70212
 Adds .45 LC cowboy loads and ballistics data
+Add a 1 cylinder diesel engine to the game.
+Vehicles spawn on bridges
+Added creatures to populate the new edge ocean.
+Major board game expansion
+Allow the Nunez family to move to Tacoma Commune if you help them set it up.
 
 
 ## Interface:
@@ -212,6 +218,8 @@ Show the mass of vitamins in food items
 Melee weapons tell you your skill is too low to see melee values instead of just hiding them
 Shows the starting location for a scenario when there is only one possible option.
 Show language selection window in options menu
+Hide AIM during directional prompts
+Keep displaying selected outfit throughout chargen
 
 
 ## Mods:
@@ -298,6 +306,7 @@ Add Bombastic Perk compatibility to Defense Mode.
 [Sky Island] teleporting items back home
 [MoM] Change electrokinetic overload
 [Sky Island] Allow selection of room teleport behavior
+[MOM] Allow high nether attunement to induce hallucinations.
 
 
 ## Balance:
@@ -448,6 +457,10 @@ prevent_death EOC can sometimes fail and lead to permadeath
 Adds annotations to construction menu entries done indoors, in trees, and that require supporting walls.
 Fix AIM allowing distant container interactions
 Show correct bodypart in grabs
+[MoM] Quell Walls
+Vehicle parts check creature size, increases storage of dumpster and vehicle parts
+Prevent softlock when sleeping in cramped spaces
+Invalidate draw point cache if viewport size or position changes
 
 
 ## Performance:
@@ -502,6 +515,9 @@ Add u_has_proficiency to EoC conditions
 JSON-ify hallucinations
 Parameterize new geography changes to overmaps
 Allow items to provide martial art techniques when not wielded
+Remove hardcoded mapgen for fields
+Simplify/jsonify NPC generation from npc classes
+Consolidate `suspendable` and `no_resume` activity parameters
 
 
 ## Build:
@@ -513,6 +529,7 @@ Fast Windows iteration with llvm-lib and lld-link
 Cross compile object creator from linux to Windows using Devcontainer
 add object creator to releases
 Add a launch and debug configuration to VS Code Dev Container
+Enable tests for merge queue
 
 
 ## I18N and A11Y:

data/json/construction.json

@@ -20,7 +20,6 @@
     "time": "10 s",
     "pre_note": "Certain terrain and furniture can be deconstructed without any tools.",
     "pre_flags": "EASY_DECONSTRUCT",
-    "pre_special": "check_deconstruct",
     "post_flags": [ "keep_items" ],
     "post_special": "done_deconstruct"
   },
@@ -964,7 +963,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "16 m",
-    "components": [ [ [ "sandbag", 16 ] ] ],
+    "components": [ [ [ "bag_durasack", 16 ], [ "bag_canvas", 16 ] ], [ [ "material_sand", 32000 ] ] ],
     "pre_note": "Can be deconstructed without tools.",
     "pre_special": "check_empty",
     "post_terrain": "f_sandbag_half"
@@ -977,7 +976,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
-    "components": [ [ [ "sandbag", 20 ] ] ],
+    "components": [ [ [ "bag_durasack", 20 ], [ "bag_canvas", 20 ] ], [ [ "material_sand", 40000 ] ] ],
     "pre_note": "Can be deconstructed without tools.",
     "pre_terrain": "f_sandbag_half",
     "post_terrain": "f_sandbag_wall"
@@ -989,7 +988,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "16 m",
-    "components": [ [ [ "gravelbag", 16 ] ] ],
+    "components": [ [ [ "bag_durasack", 16 ], [ "bag_canvas", 16 ] ], [ [ "material_gravel", 32000 ] ] ],
     "pre_note": "Can be deconstructed without tools.",
     "pre_special": "check_empty",
     "post_terrain": "f_gravelbag_half"
@@ -1001,7 +1000,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
-    "components": [ [ [ "gravelbag", 20 ] ] ],
+    "components": [ [ [ "bag_durasack", 20 ], [ "bag_canvas", 20 ] ], [ [ "material_gravel", 40000 ] ] ],
     "pre_note": "Can be deconstructed without tools.",
     "pre_terrain": "f_gravelbag_half",
     "post_terrain": "f_gravelbag_wall"
@@ -1014,7 +1013,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "16 m",
-    "components": [ [ [ "earthbag", 16 ] ] ],
+    "components": [ [ [ "bag_durasack", 16 ], [ "bag_canvas", 16 ] ], [ [ "material_soil", 48 ] ] ],
     "pre_note": "Can be deconstructed without tools.",
     "pre_special": "check_empty",
     "post_terrain": "f_earthbag_half"
@@ -1027,7 +1026,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
-    "components": [ [ [ "earthbag", 20 ] ] ],
+    "components": [ [ [ "bag_durasack", 20 ], [ "bag_canvas", 20 ] ], [ [ "material_soil", 60 ] ] ],
     "pre_note": "Can be deconstructed without tools.",
     "pre_terrain": "f_earthbag_half",
     "post_terrain": "f_earthbag_wall"

data/json/effects_on_condition/mapgen_eocs/furniture_eocs.json

@@ -72,7 +72,7 @@
     "global": true,
     "effect": {
       "weighted_list_eocs": [
-        [ { "id": "slots_lose", "effect": { "u_message": "Oh, you lost!", "popup": true } }, { "const": 1000 } ],
+        [ { "id": "slots_lose", "effect": { "u_message": "Oh, you lost!", "popup": true } }, 1000 ],
         [
           {
             "id": "three_cherries",
@@ -82,7 +82,7 @@
               { "run_eocs": "slot_machine_win_payout" }
             ]
           },
-          { "const": 200 }
+          200
         ],
         [
           {
@@ -93,7 +93,7 @@
               { "run_eocs": "slot_machine_win_payout" }
             ]
           },
-          { "const": 50 }
+          50
         ],
         [
           {
@@ -104,7 +104,7 @@
               { "run_eocs": "slot_machine_win_payout" }
             ]
           },
-          { "const": 20 }
+          20
         ],
         [
           {
@@ -115,7 +115,7 @@
               { "run_eocs": "slot_machine_win_payout" }
             ]
           },
-          { "const": 1 }
+          1
         ]
       ]
     }

data/json/effects_on_condition/mutation_eocs/changing_eocs.json

@@ -13,7 +13,7 @@
     "deactivate_condition": { "u_has_flag": "CHANGING" },
     "effect": [
       {
-        "weighted_list_eocs": [ [ "changing_failed", { "const": 2500 } ], [ "changing_successful", { "u_val": "vitamin", "name": "mutagen" } ] ]
+        "weighted_list_eocs": [ [ "changing_failed", 2500 ], [ "changing_successful", { "u_val": "vitamin", "name": "mutagen" } ] ]
       }
     ]
   },