Merge remote-tracking branch 'upstream/master'

ashGlaw · Jul 6, 2023 · d2f2ce6 · d2f2ce6
2 parents 1e09d60 + d55d1c4
commit d2f2ce6
Show file tree

Hide file tree

Showing 61 changed files with 1,650 additions and 4,130 deletions.
diff --git a/data/changelog.txt b/data/changelog.txt
@@ -32,6 +32,7 @@ Asynchronous animations including sprinting and smashing
 Added enable and disable mutation EOCs
 3D vision for isometric tilesets
 Unhardcode dragging, grab fixes
+Make vehicle doors lockable and pickable
 
 
 ## Content:
@@ -59,6 +60,7 @@ Living lore document
 Gastropod Foot Limb: Mutant limbs can be added in json
 Added a small office building fortified by bandits
 New location: speedway
+You can now choose a new leader for your faction without dying
 
 
 ## Interface:
@@ -101,6 +103,7 @@ Alchemy Perks for Xedra Evolved
 Bombastic Perks adds Playstyle Perks
 [Magiclysm] Ways to boost your caster level
 Disable the Bionic Professions mod by default
+Add the Mind Over Matter mod to the CDDA repository
 
 
 ## Balance:
@@ -169,6 +172,7 @@ Charge integrated magazines when plugged in
 Don't allow to scan books that are owned by other characters
 Fix NPC putting items in open air when fetching items during an activity when 3D FOV is on
 Trees and other FLAMMABLE_ASH terrain leaves behind ash when burned down
+Do not report monsters breaking free of unknown grabbers if the player cannot see them
 
 
 ## Performance:

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -5587,7 +5587,7 @@
   },
   {
     "type": "construction",
-    "id": "constr_dock",
+    "id": "constr_dock_moving",
     "group": "build_river_dock_shallow_bridge",
     "//": "Set up dock",
     "category": "CONSTRUCT",
@@ -5600,7 +5600,20 @@
   },
   {
     "type": "construction",
-    "id": "constr_dock_deep_pile",
+    "id": "constr_dock",
+    "group": "build_river_dock_shallow_bridge",
+    "//": "Set up dock",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 4 ] ],
+    "time": "40 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
+    "components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ],
+    "pre_terrain": "t_water_sh",
+    "post_terrain": "t_dock"
+  },
+  {
+    "type": "construction",
+    "id": "constr_dock_deep_pile_moving",
     "group": "build_deep_river_dock",
     "//": "Step 1: securing a pile down on the riverbed; not easy work without machinery",
     "category": "CONSTRUCT",
@@ -5611,6 +5624,19 @@
     "pre_terrain": "t_water_moving_dp",
     "post_terrain": "t_dock_deep_pile"
   },
+  {
+    "type": "construction",
+    "id": "constr_dock_deep_pile",
+    "group": "build_deep_river_dock",
+    "//": "Step 1: securing a pile down on the lakebed; not easy work without machinery",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 6 ] ],
+    "time": "720 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ],
+    "components": [ [ [ "wood_beam", 1 ] ], [ [ "spike", 4 ] ] ],
+    "pre_terrain": "t_water_dp",
+    "post_terrain": "t_dock_deep_pile"
+  },
   {
     "type": "construction",
     "id": "constr_dock_deep_frame",

diff --git a/data/json/faults/fixes_gun.json b/data/json/faults/fixes_gun.json
@@ -21,7 +21,7 @@
     "faults_removed": [ "fault_gun_blackpowder" ],
     "faults_added": [ "fault_gun_unlubricated" ],
     "skills": { "mechanics": 1 },
-    "set_variables": { "dirt": "0" },
+    "set_variables": { "dirt": "0", "rust_timer": "0" },
     "requirements": [ [ "gun_cleaning_bp", 1 ] ],
     "time_save_profs": { "prof_gun_cleaning": 0.5 },
     "time_save_flags": { "EASY_CLEAN": 0.5 }
@@ -46,7 +46,7 @@
     "time": "60 m",
     "faults_removed": [ "fault_gun_blackpowder", "fault_gun_unlubricated" ],
     "skills": { "mechanics": 1 },
-    "set_variables": { "dirt": "0" },
+    "set_variables": { "dirt": "0", "rust_timer": "0" },
     "requirements": [ [ "gun_cleaning_bp", 1 ], [ "gun_lubrication", 1 ] ],
     "time_save_profs": { "prof_gun_cleaning": 0.5 },
     "time_save_flags": { "EASY_CLEAN": 0.5 }

diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json
@@ -129,24 +129,12 @@
   {
     "id": "boots_xlsurvivor",
     "type": "ARMOR",
-    "category": "armor",
+    "copy-from": "boots_survivor",
+    "looks_like": "boots_survivor",
+    "proportional": { "weight": 1.4, "volume": 1.4 },
     "name": { "str": "pair of XL survivor boots", "str_pl": "pairs of XL survivor boots" },
     "description": "A pair of huge, custom-made boots constructed of thick Kevlar and a chemical resistant layer, featuring steel toes for extra protection.  Keeps your feet safe from the myriad dangers of the apocalypse.",
-    "weight": "2460 g",
-    "volume": "5 L",
-    "price": 24000,
-    "price_postapoc": 4000,
-    "to_hit": -1,
-    "material": [ "kevlar", "leather" ],
-    "symbol": "[",
-    "looks_like": "boots_combat",
-    "color": "brown",
-    "warmth": 15,
-    "material_thickness": 4,
-    "environmental_protection": 3,
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ],
-    "armor": [ { "encumbrance": 38, "coverage": 100, "covers": [ "foot_l", "foot_r" ] } ],
-    "melee_damage": { "bash": 1 }
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "boots_xssurvivor",

diff --git a/data/json/items/armor/bespoke_armor/custom_storage.json b/data/json/items/armor/bespoke_armor/custom_storage.json
@@ -85,6 +85,7 @@
         "max_contains_volume": "65 L",
         "max_contains_weight": "90 kg",
         "max_item_length": "65 cm",
+        "watertight": true,
         "magazine_well": "5 L",
         "moves": 450
       },

diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json
@@ -1035,6 +1035,7 @@
         "max_contains_volume": "60 L",
         "max_contains_weight": "90 kg",
         "max_item_length": "65 cm",
+        "watertight": true,
         "magazine_well": "5 L",
         "moves": 450
       },