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

…into ench_tests
CleverRaven · Mar 29, 2024 · 1c0e24c · 1c0e24c
2 parents 6bef5d4 + dd4e109
commit 1c0e24c
Show file tree

Hide file tree

Showing 125 changed files with 1,542 additions and 1,104 deletions.
diff --git a/data/json/artifact/artifact_item_types.json b/data/json/artifact/artifact_item_types.json
@@ -345,7 +345,7 @@
     "material": [ "wood", "steel" ],
     "symbol": ";",
     "color": "light_gray",
-    "techniques": [ "WBLOCK_1", "RAPID" ],
+    "techniques": [ "WBLOCK_1" ],
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 11 ] ],
     "weapon_category": [ "KNIVES" ],
     "flags": [ "SHEATH_KNIFE", "TRADER_AVOID" ],

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -567,7 +567,7 @@
       { "limb_score": "manip", "modifier": 0.8 },
       { "limb_score": "grip", "modifier": 0.8 }
     ],
-    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+    "flags": [ "EFFECT_LIMB_SCORE_MOD", "EFFECT_LIMB_DISABLE_CONDITIONAL_FLAGS" ]
   },
   {
     "type": "effect_type",
@@ -591,7 +591,7 @@
       { "limb_score": "footing", "modifier": 0.5 },
       { "limb_score": "balance", "modifier": 0.5 }
     ],
-    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+    "flags": [ "EFFECT_LIMB_SCORE_MOD", "EFFECT_LIMB_DISABLE_CONDITIONAL_FLAGS" ]
   },
   {
     "type": "effect_type",

diff --git a/data/json/effects_on_condition/nether_eocs/LIXA_EOCs_spells_traps.json b/data/json/effects_on_condition/nether_eocs/LIXA_EOCs_spells_traps.json
@@ -498,82 +498,103 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_1",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "1" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [ { "math": [ "u_LIXA_entry", "=", "1" ] }, { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_2",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "2" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [ { "math": [ "u_LIXA_entry", "=", "2" ] }, { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_3",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "3" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [ { "math": [ "u_LIXA_entry", "=", "3" ] }, { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_4",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "4" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [ { "math": [ "u_LIXA_entry", "=", "4" ] }, { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_5",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "5" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [ { "math": [ "u_LIXA_entry", "=", "5" ] }, { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_6",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "6" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [ { "math": [ "u_LIXA_entry", "=", "6" ] }, { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_7",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "7" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [ { "math": [ "u_LIXA_entry", "=", "7" ] }, { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_8",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "8" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [ { "math": [ "u_LIXA_entry", "=", "8" ] }, { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_9",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "9" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [ { "math": [ "u_LIXA_entry", "=", "9" ] }, { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_10",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "10" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [
+      { "math": [ "u_LIXA_entry", "=", "10" ] },
+      { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] }
+    ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_11",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "11" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [
+      { "math": [ "u_LIXA_entry", "=", "11" ] },
+      { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] }
+    ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_12",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "12" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [
+      { "math": [ "u_LIXA_entry", "=", "12" ] },
+      { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] }
+    ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_13",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "13" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [
+      { "math": [ "u_LIXA_entry", "=", "13" ] },
+      { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] }
+    ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_14",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "14" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [
+      { "math": [ "u_LIXA_entry", "=", "14" ] },
+      { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] }
+    ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_15",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "15" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [
+      { "math": [ "u_LIXA_entry", "=", "15" ] },
+      { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] }
+    ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_LIXA_UNFOLD_ENTRY_SETUP_16",
-    "effect": [ { "math": [ "u_LIXA_entry", "=", "16" ] }, { "run_eocs": "EOC_LIXA_UNFOLD_ENTRY" } ]
+    "effect": [
+      { "math": [ "u_LIXA_entry", "=", "16" ] },
+      { "run_eocs": [ "EOC_LIXA_UNFOLD_ENTRY", "capture_generic_nre_anomaly" ] }
+    ]
   },
   {
     "type": "effect_on_condition",

diff --git a/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json
@@ -1318,7 +1318,10 @@
             { "compare_string": [ "mon_hallucinator", { "context_val": "victim_type" } ] },
             { "compare_string": [ "mon_archunk_strong", { "context_val": "victim_type" } ] },
             { "compare_string": [ "mon_void_spider", { "context_val": "victim_type" } ] },
-            { "compare_string": [ "mon_XEDRA_officer", { "context_val": "victim_type" } ] }
+            { "compare_string": [ "mon_XEDRA_officer", { "context_val": "victim_type" } ] },
+            { "compare_string": [ "LIXA_eigenspectre_3", { "context_val": "victim_type" } ] },
+            { "compare_string": [ "LIXA_eigenspectre_4", { "context_val": "victim_type" } ] },
+            { "compare_string": [ "LIXA_living_vector", { "context_val": "victim_type" } ] }
           ]
         }
       ]

diff --git a/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json b/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json
@@ -46,7 +46,7 @@
   {
     "type": "terrain",
     "id": "t_LIXA_portal_pulse",
-    "name": "spacial compressor",
+    "name": "spatial compressor",
     "description": "A dizzyingly complex series of devices and readouts is on the outside of this machine's casing.  You imagine the inside would be incomprehensible.",
     "symbol": "{",
     "color": "light_gray",
@@ -279,7 +279,7 @@
     "type": "terrain",
     "id": "t_LIXA_laser",
     "name": "precision laser emitter",
-    "description": "A huge casing for a device that generates and focuses a laser of incredible wavelength purity and precision.",
+    "description": "A huge casing for a device that generates and focuses a laser of an incredibly precise wavelength.",
     "symbol": "$",
     "color": "yellow",
     "looks_like": "t_machinery_electronic",

diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -1565,6 +1565,22 @@
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }
     ]
   },
+  {
+    "id": "zombie_rust",
+    "type": "harvest",
+    "entries": [
+      { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
+      { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.175 },
+      { "drop": "steel_chunk", "type": "flesh", "mass_ratio": 0.075 },
+      { "drop": "scrap", "type": "flesh", "mass_ratio": 0.025 },
+      { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
+      { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 },
+      { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 },
+      { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.075 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }
+    ]
+  },
   {
     "id": "zombie_humanoid_headless",
     "//": "humanoid zombies without a skull",
@@ -2238,6 +2254,15 @@
       { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 }
     ]
   },
+  {
+    "id": "dog_small_with_skull_mutant",
+    "type": "harvest",
+    "entries": [
+      { "drop": "skull_canis_medium", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
+      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.5 },
+      { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 }
+    ]
+  },
   {
     "id": "cat_small_with_skull",
     "type": "harvest",
@@ -2516,6 +2541,23 @@
       { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 }
     ]
   },
+  {
+    "id": "dog_with_skull_fur_mutant",
+    "type": "harvest",
+    "entries": [
+      { "drop": "skull_canis", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.28 },
+      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "mutant_lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "mutant_liver", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "mutant_brain", "type": "flesh", "mass_ratio": 0.005 },
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
+      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
+    ]
+  },
   {
     "id": "dog_with_skull_leather",
     "type": "harvest",
@@ -2618,6 +2660,23 @@
       { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 }
     ]
   },
+  {
+    "id": "raccoon_with_skull_mutant",
+    "type": "harvest",
+    "entries": [
+      { "drop": "skull_raccoon", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.28 },
+      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "mutant_lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "mutant_liver", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "mutant_brain", "type": "flesh", "mass_ratio": 0.005 },
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
+      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
+    ]
+  },
   {
     "id": "bear_with_skull",
     "type": "harvest",

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -83,6 +83,22 @@
       { "group": "mansion_guns", "prob": 80 }
     ]
   },
+  {
+    "id": "mansion_safe_nogun",
+    "type": "item_group",
+    "subtype": "collection",
+    "items": [
+      [ "diamond", 20 ],
+      { "item": "money_bundle_twenty", "prob": 50, "count": [ 1, 5 ] },
+      { "item": "money_bundle_fifty", "prob": 50, "count": [ 1, 5 ] },
+      { "item": "money_bundle_hundred", "prob": 20, "count": [ 1, 2 ] },
+      { "group": "stash_drugs", "prob": 5 },
+      [ "file", 70 ],
+      { "group": "jewelry_front", "prob": 40 },
+      { "group": "costume_jewelry_vampire", "prob": 5 },
+      { "group": "costume_jewelry_dark", "prob": 5 }
+    ]
+  },
   {
     "id": "mansion_gunsafe",
     "type": "item_group",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -320,11 +320,7 @@
     "type": "item_group",
     "id": "guns_pistol_improvised",
     "//": "Makeshift or otherwise poor quality pistols.",
-    "items": [
-      { "item": "ashot", "prob": 100 },
-      { "item": "surv_hand_cannon", "prob": 100, "charges-min": 0, "charges-max": 5 },
-      { "item": "surv_six_shooter", "prob": 100, "charges-min": 0, "charges-max": 6 }
-    ]
+    "items": [ { "item": "ashot", "prob": 100 } ]
   },
   {
     "type": "item_group",

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -287,7 +287,8 @@
       [ "joint", 1 ],
       [ "curler_hair", 10 ],
       [ "hairbrush", 5 ],
-      { "group": "pillbox_any_used", "prob": 10 }
+      { "group": "pillbox_any_used", "prob": 10 },
+      { "item": "home_picture", "prob": 50 }
     ]
   },
   {
@@ -645,7 +646,8 @@
       { "item": "reading_light", "prob": 9, "charges": [ 0, 50 ] },
       { "item": "balloon", "prob": 5 },
       { "group": "memorial", "prob": 3 },
-      { "item": "air_launcher", "prob": 1 }
+      { "item": "air_launcher", "prob": 1 },
+      { "item": "home_picture", "prob": 75 }
     ]
   },
   {
@@ -1230,7 +1232,8 @@
       { "item": "teddy_bear", "prob": 2 },
       { "item": "reading_light", "prob": 8, "charges": [ 0, 50 ] },
       { "item": "condom", "prob": 50, "count": [ 1, 5 ] },
-      { "item": "air_launcher", "prob": 1 }
+      { "item": "air_launcher", "prob": 1 },
+      { "item": "home_picture", "prob": 50 }
     ]
   },
   {
@@ -1371,7 +1374,8 @@
       [ "fencing_foil", 20 ],
       [ "fencing_sabre", 20 ],
       [ "fencing_epee", 20 ],
-      [ "fencing_mask", 20 ]
+      [ "fencing_mask", 20 ],
+      { "item": "home_picture", "prob": 50 }
     ]
   },
   {