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

Maleclypse · Sep 11, 2021 · 33faaf8 · 33faaf8
2 parents 514a1bd + ace0efb
commit 33faaf8
Show file tree

Hide file tree

Showing 657 changed files with 171,792 additions and 177,672 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 *.o
 *.tmp
 *.zip
+*.apk
 /WinDepend/
 /bindist/
 /build/
@@ -205,3 +206,11 @@ Xcode/
 /tests/catch/catch.hpp.gch
 /tests/catch/catch.hpp.pch
 weather.output
+
+# bundler local directories and files for jekyll site
+/.bundle/
+/_site/
+/vendor/
+.sass-cache
+.jekyll-metadata
+Gemfile.lock
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -3435,7 +3435,7 @@
     "time": "15 m",
     "pre_special": "check_empty",
     "components": [
-      [ [ "pillow", 19 ], [ "down_pillow", 19 ], [ "mattress", 4 ] ],
+      [ [ "pillow", 19 ], [ "down_pillow", 19 ], [ "makeshift_pillow", 19 ], [ "mattress", 4 ] ],
       [ [ "down_blanket", 3 ], [ "blanket", 3 ], [ "fur_blanket", 3 ] ]
     ],
     "pre_terrain": "t_floor",
@@ -3450,7 +3450,7 @@
     "time": "15 m",
     "pre_special": "check_empty",
     "components": [
-      [ [ "pillow", 4 ], [ "down_pillow", 4 ] ],
+      [ [ "pillow", 4 ], [ "down_pillow", 4 ], [ "makeshift_pillow", 4 ] ],
       [ [ "down_blanket", 2 ], [ "blanket", 2 ], [ "fur_blanket", 2 ] ],
       [ [ "box_large", 1 ] ],
       [ [ "plastic_sheet", 1 ] ],

diff --git a/data/json/effect_on_condition.json b/data/json/effect_on_condition.json
@@ -8,7 +8,7 @@
       "and": [
         { "or": [ { "is_weather": "thunder" }, { "is_weather": "lightning" } ] },
         { "one_in_chance": 50 },
-        { "u_is_height": 0 }
+        { "compare_int": [ { "u_val": "pos_z" }, { "const": 0 } ], "op": ">=" }
       ]
     },
     "deactivate_condition": { "not": { "or": [ { "is_weather": "thunder" }, { "is_weather": "lightning" } ] } },
@@ -22,7 +22,13 @@
     "id": "lightning",
     "recurrence_min": 1,
     "recurrence_max": 1,
-    "condition": { "and": [ { "is_weather": "lightning" }, { "one_in_chance": 600 }, { "u_is_height": 0 } ] },
+    "condition": {
+      "and": [
+        { "is_weather": "lightning" },
+        { "one_in_chance": 600 },
+        { "compare_int": [ { "u_val": "pos_z" }, { "const": 0 } ], "op": ">=" }
+      ]
+    },
     "deactivate_condition": { "not": { "is_weather": "lightning" } },
     "effect": [
       { "u_message": "A flash of lightning illuminates your surroundings!" },
@@ -34,33 +40,48 @@
   {
     "type": "effect_on_condition",
     "id": "acid_drizzle",
+    "global": true,
     "recurrence_min": 1,
     "recurrence_max": 1,
-    "condition": { "and": [ { "is_weather": "acid_drizzle" }, "u_is_outside", { "not": { "u_has_pain": 30 } } ] },
+    "condition": {
+      "and": [
+        { "is_weather": "acid_drizzle" },
+        "u_is_outside",
+        { "compare_int": [ { "u_val": "pain" }, { "const": 30 } ], "op": "<" }
+      ]
+    },
     "deactivate_condition": { "not": { "is_weather": "acid_drizzle" } },
-    "effect": [ { "u_message": "The acid rain stings, but is mostly harmless for now…" }, { "u_mod_pain": 1 } ]
+    "effect": [
+      { "u_message": "The acid rain stings, but is mostly harmless for now…" },
+      { "arithmetic": [ { "u_val": "pain" }, { "u_val": "pain" }, { "const": 1 } ], "op": "+" }
+    ]
   },
   {
     "type": "effect_on_condition",
     "id": "acid_rain",
+    "global": true,
     "recurrence_min": 1,
     "recurrence_max": 1,
     "condition": {
       "and": [
         { "is_weather": "acid_rain" },
         "u_is_outside",
-        { "not": { "u_has_pain": 100 } },
+        { "compare_int": [ { "u_val": "pain" }, { "const": 100 } ], "op": "<" },
         {
           "not": { "or": [ { "u_has_wielded_with_flag": "RAIN_PROTECT" }, { "u_has_worn_with_flag": "RAINPROOF" } ] }
         }
       ]
     },
     "deactivate_condition": { "not": { "is_weather": "acid_rain" } },
-    "effect": [ { "u_message": "The acid rain burns!" }, { "u_mod_pain": 3 } ]
+    "effect": [
+      { "u_message": "The acid rain burns!" },
+      { "arithmetic": [ { "u_val": "pain" }, { "u_val": "pain" }, { "const": 3 } ], "op": "+" }
+    ]
   },
   {
     "type": "effect_on_condition",
     "id": "snow",
+    "global": true,
     "recurrence_min": 6,
     "recurrence_max": 6,
     "condition": { "and": [ { "is_weather": "snowing" }, "u_is_outside" ] },
@@ -70,6 +91,7 @@
   {
     "type": "effect_on_condition",
     "id": "snowstorm",
+    "global": true,
     "recurrence_min": 6,
     "recurrence_max": 6,
     "condition": { "and": [ { "is_weather": "snowstorm" }, "u_is_outside" ] },
@@ -79,25 +101,34 @@
   {
     "type": "effect_on_condition",
     "id": "bio_drain",
+    "run_for_npcs": true,
     "recurrence_min": "30 minutes",
     "recurrence_max": "1 hours 30 minutes",
-    "condition": { "and": [ { "u_has_bionics": "bio_drain" }, { "u_has_power": "24 kJ" } ] },
+    "condition": {
+      "and": [ { "u_has_bionics": "bio_drain" }, { "compare_int": [ { "u_val": "power" }, { "power": "25 kJ" } ], "op": ">=" } ]
+    },
     "deactivate_condition": { "not": { "u_has_bionics": "bio_drain" } },
     "effect": [
       { "u_message": "Your batteries discharge slightly.", "type": "bad" },
       { "sound_effect": "elec_crackle_low", "id": "bionics", "volume": 100 },
-      { "u_add_power": "-25kJ" }
+      { "arithmetic": [ { "u_val": "power" }, { "u_val": "power" }, { "power": "25 kJ" } ], "op": "-" }
     ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_SLEEP",
-    "effect": [ { "u_message": "You feel very sleepy…" }, { "u_mod_fatigue": 40 } ]
+    "effect": [
+      { "u_message": "You feel very sleepy…" },
+      { "arithmetic": [ { "u_val": "fatigue" }, { "u_val": "fatigue" }, { "const": 40 } ], "op": "+" }
+    ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_MINOR_SLEEP",
-    "effect": [ { "u_message": "You feel sleepy…" }, { "u_mod_fatigue": 20 } ]
+    "effect": [
+      { "u_message": "You feel sleepy…" },
+      { "arithmetic": [ { "u_val": "fatigue" }, { "u_val": "fatigue" }, { "const": 20 } ], "op": "+" }
+    ]
   },
   {
     "type": "effect_on_condition",
@@ -192,6 +223,7 @@
   {
     "type": "effect_on_condition",
     "id": "bio_trip",
+    "run_for_npcs": true,
     "recurrence_min": "25 minutes",
     "recurrence_max": "1 hours 15 minutes",
     "condition": {
@@ -210,6 +242,7 @@
   {
     "type": "effect_on_condition",
     "id": "bio_spasm",
+    "run_for_npcs": true,
     "recurrence_min": "2 hours 30 minutes",
     "recurrence_max": "7 hours 30 minutes",
     "condition": {
@@ -222,50 +255,62 @@
     "effect": [
       { "u_message": "Your malfunctioning bionic causes you to spasm and fall to the floor!", "type": "bad" },
       { "sound_effect": "elec_crackle_high", "id": "bionics", "volume": 100 },
-      { "u_mod_pain": 1 },
-      { "u_add_effect": "stunned", "duration": "1" },
-      { "u_add_effect": "downed", "duration": "1", "force": true }
+      { "arithmetic": [ { "u_val": "pain" }, { "u_val": "pain" }, { "const": 1 } ], "op": "+" },
+      { "u_add_effect": "stunned", "duration": 1 },
+      { "u_add_effect": "downed", "duration": 1, "force": true }
     ]
   },
   {
     "type": "effect_on_condition",
     "id": "bio_shakes",
+    "run_for_npcs": true,
     "recurrence_min": "1 hours",
     "recurrence_max": "3 hours",
-    "condition": { "and": [ { "u_has_bionics": "bio_shakes" }, { "u_has_power": "25 kJ" } ] },
+    "condition": {
+      "and": [ { "u_has_bionics": "bio_shakes" }, { "compare_int": [ { "u_val": "power" }, { "power": "25 kJ" } ], "op": ">=" } ]
+    },
     "deactivate_condition": { "not": { "u_has_bionics": "bio_shakes" } },
     "effect": [
       { "u_message": "Your bionics short-circuit, causing you to tremble and shiver.", "type": "bad" },
       { "sound_effect": "elec_crackle_med", "id": "bionics", "volume": 100 },
       { "u_add_effect": "shakes", "duration": "5 minutes" },
-      { "u_add_power": "-25kJ" }
+      { "arithmetic": [ { "u_val": "power" }, { "u_val": "power" }, { "power": "25kJ" } ], "op": "-" }
     ]
   },
   {
     "type": "effect_on_condition",
     "id": "bio_glowy",
+    "run_for_npcs": true,
     "recurrence_min": "25 minutes",
     "recurrence_max": "1 hours 15 minutes",
-    "condition": { "and": [ { "u_has_bionics": "bio_glowy" }, { "not": { "u_has_effect": "glowy_led" } }, { "u_has_power": "1 kJ" } ] },
+    "condition": {
+      "and": [
+        { "u_has_bionics": "bio_glowy" },
+        { "not": { "u_has_effect": "glowy_led" } },
+        { "compare_int": [ { "u_val": "power" }, { "power": "1 kJ" } ], "op": ">=" }
+      ]
+    },
     "deactivate_condition": { "not": { "u_has_bionics": "bio_glowy" } },
     "effect": [
       { "u_message": "Your malfunctioning bionic starts to glow!", "type": "bad" },
       { "u_add_effect": "glowy_led", "duration": "5 minutes" },
-      { "u_add_power": "-1kJ" }
+      { "arithmetic": [ { "u_val": "power" }, { "u_val": "power" }, { "power": "1kJ" } ], "op": "-" }
     ]
   },
   {
     "type": "effect_on_condition",
     "id": "bio_sleepy",
+    "run_for_npcs": true,
     "recurrence_min": "25 minutes",
     "recurrence_max": "1 hours 15 minutes",
     "condition": { "and": [ { "u_has_bionics": "bio_sleepy" }, { "not": { "u_has_effect": "sleep" } } ] },
     "deactivate_condition": { "not": { "u_has_bionics": "bio_sleepy" } },
-    "effect": [ { "u_mod_fatigue": 1 } ]
+    "effect": [ { "arithmetic": [ { "u_val": "fatigue" }, { "u_val": "fatigue" }, { "const": 1 } ], "op": "+" } ]
   },
   {
     "type": "effect_on_condition",
     "id": "bio_itchy",
+    "run_for_npcs": true,
     "recurrence_min": "25 minutes",
     "recurrence_max": "1 hours 15 minutes",
     "condition": { "and": [ { "u_has_bionics": "bio_itchy" }, { "not": { "u_has_effect": "formication" } } ] },
@@ -278,6 +323,7 @@
   {
     "type": "effect_on_condition",
     "id": "bio_noise",
+    "run_for_npcs": true,
     "recurrence_min": "30 minutes",
     "recurrence_max": "1 hours 30 minutes",
     "condition": { "and": [ { "u_has_bionics": "bio_noise" }, { "not": { "u_has_effect": "narcosis" } } ] },
@@ -309,6 +355,7 @@
   {
     "type": "effect_on_condition",
     "id": "bio_leaky",
+    "run_for_npcs": true,
     "recurrence_min": "3 minutes",
     "recurrence_max": "9 minutes",
     "condition": { "u_has_bionics": "bio_leaky" },

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -1190,7 +1190,9 @@
     "name": [ "Shakes" ],
     "desc": [ "Your hands just won't stop shaking." ],
     "miss_messages": [ [ "You tremble", 4 ] ],
-    "base_mods": { "str_mod": [ -1 ], "dex_mod": [ -4 ] }
+    "base_mods": { "str_mod": [ -1 ], "dex_mod": [ -4 ] },
+    "max_duration": 7200,
+    "dur_add_perc": 30
   },
   {
     "type": "effect_type",
@@ -1982,21 +1984,6 @@
     "base_mods": { "speed_mod": [ -1000 ], "dex_mod": [ -100 ] },
     "show_in_info": true
   },
-  {
-    "type": "effect_type",
-    "id": "hypocalcemia",
-    "name": [ "Hypocalcemia", "Weak bones", "Brittle bones" ],
-    "desc": [ "A lack of calcium in your diet will make your bones progressively weaker." ],
-    "apply_message": "Your bones are becoming more brittle.",
-    "remove_message": "Your bones regain their usual strength.",
-    "decay_messages": [
-      [ "Your calcium deficiency is nearly resolved.", "good" ],
-      [ "Your bones become stronger as your calcium deficiency improves.", "good" ]
-    ],
-    "max_intensity": 3,
-    "rating": "bad",
-    "blood_analysis_description": "Hypocalcemia"
-  },
   {
     "type": "effect_type",
     "id": "anemia",
@@ -2072,36 +2059,6 @@
     },
     "blood_analysis_description": "Anemia"
   },
-  {
-    "type": "effect_type",
-    "id": "hypovitA",
-    "name": [ "VitA deficiency", "Poor vision", "Night blindness" ],
-    "desc": [ "A lack of vitamin A in your diet will progressively worsen your vision." ],
-    "apply_message": "You start struggling to make out the finer details.",
-    "remove_message": "Your normal visual acuity returns.",
-    "decay_messages": [
-      [ "Your vitamin A deficiency is nearly resolved.", "good" ],
-      [ "Your vision improves as your Vitamin A deficiency improves.", "good" ]
-    ],
-    "max_intensity": 3,
-    "rating": "bad",
-    "blood_analysis_description": "Vitamin A Deficiency"
-  },
-  {
-    "type": "effect_type",
-    "id": "hypovitB",
-    "name": [ "B12 deficiency", "Slow healing", "No healing" ],
-    "desc": [ "A lack of vitamin B12 in your diet will affect your ability to heal." ],
-    "apply_message": "Simple wounds are starting to concern you more than usual.",
-    "remove_message": "Your wounds now heal normally.",
-    "decay_messages": [
-      [ "Your vitamin B12 deficiency is starting to resolve.", "good" ],
-      [ "Your ability to heal returns as your Vitamin B12 deficiency improves.", "good" ]
-    ],
-    "max_intensity": 3,
-    "rating": "bad",
-    "blood_analysis_description": "Vitamin B Deficiency"
-  },
   {
     "type": "effect_type",
     "id": "scurvy",
@@ -2114,6 +2071,27 @@
       [ "Your scurvy lessens as your Vitamin C deficiency improves.", "good" ]
     ],
     "max_intensity": 3,
+    "base_mods": {
+      "pain_max_val": [ 35 ],
+      "pain_chance": [ 900 ],
+      "pain_min": [ 1 ],
+      "pain_max": [ 5 ],
+      "fatigue_chance": [ 900 ],
+      "fatigue_max_val": [ 500, 200 ],
+      "fatigue_min": [ 10 ],
+      "h_mod_min": [ -1 ],
+      "h_mod_min_val": [ 0 ],
+      "h_mod_chance": [ 900 ]
+    },
+    "scaling_mods": {
+      "pain_chance": [ -150 ],
+      "fatigue_chance": [ -200 ],
+      "h_mod_min": [ -1 ],
+      "h_mod_min_val": [ -100 ],
+      "h_mod_chance": [ -300 ],
+      "str_mod": [ -0.5 ],
+      "speed_mod": [ -2 ]
+    },
     "rating": "bad",
     "blood_analysis_description": "Scurvy"
   },
@@ -2427,17 +2405,11 @@
     "desc": [ "AI effect to increase stats after fusing with another critter.  1 stack means one absorbed max_hp." ],
     "//": "stats modified by the zombie_fuse special attack.",
     "//1": "scaling:",
-    "//2": "/48 HP: +0,5 melee_skill, +0,5 dodge_skill (unexpected movement), +5 Speed (bigger steps&more to attack with), +4 bash",
-    "//3": "/160 HP: +1 size",
-    "max_intensity": 480,
-    "base_mods": { "hit_mod": [ 0.0104 ], "dodge_mod": [ 0.0104 ], "speed_mod": [ 0.1042 ], "bash_mod": [ 0.08333 ] },
-    "scaling_mods": {
-      "hit_mod": [ 0.0104 ],
-      "dodge_mod": [ 0.0104 ],
-      "speed_mod": [ 0.1042 ],
-      "bash_mod": [ 0.08333 ],
-      "size_mod": [ 0.00625 ]
-    },
+    "//2": "/50 HP: +0,5 melee_skill, +0,5 dodge_skill (unexpected movement), +5 Speed (bigger steps&more to attack with), +4 bash",
+    "//3": "/250 HP: +1 size",
+    "max_intensity": 500,
+    "base_mods": { "hit_mod": [ 0.01 ], "dodge_mod": [ 0.01 ], "speed_mod": [ 0.1 ], "bash_mod": [ 0.08 ] },
+    "scaling_mods": { "hit_mod": [ 0.01 ], "dodge_mod": [ 0.01 ], "speed_mod": [ 0.1 ], "bash_mod": [ 0.08 ], "size_mod": [ 0.004 ] },
     "int_decay_step": 0
   },
   {

diff --git a/data/json/furniture_and_terrain/furniture-alien.json b/data/json/furniture_and_terrain/furniture-alien.json
@@ -260,7 +260,7 @@
     "move_cost_mod": 3,
     "coverage": 30,
     "required_str": 6,
-    "light_emitted": 20,
+    "light_emitted": 90,
     "flags": [ "TRANSPARENT", "NOITEM", "BLOCKSDOOR" ],
     "bash": {
       "str_min": 20,