Merge 'upstream/master' into aim-act-act

data/json/bionics.json

@@ -710,7 +710,7 @@
     "description": "When active, this bionic eliminates all light within a 2 tile radius through destructive interference.",
     "occupied_bodyparts": [ [ "torso", 16 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "enchantments": [ "ENCH_INVISIBILITY" ],
+    "enchantments": [ "ENCH_SHADOW_CLOUD" ],
     "act_cost": "9 kJ",
     "react_cost": "9 kJ",
     "time": 1

data/json/clothing_mods.json

@@ -30,7 +30,7 @@
     "type": "clothing_mod",
     "id": "kevlar_padded",
     "flag": "kevlar_padded",
-    "item": "kevlar_plate",
+    "item": "sheet_kevlar_layered",
     "implement_prompt": "Pad with Kevlar",
     "destroy_prompt": "Destroy Kevlar padding",
     "mod_value": [

data/json/effects.json

@@ -862,6 +862,30 @@
     "resist_traits": [ "POISRESIST" ],
     "base_mods": { "speed_mod": [ -10 ], "str_mod": [ -1 ], "dex_mod": [ -1 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "taint",
+    "name": [ "Touched mind", "Touched mind", "Tainted mind", "Badly tainted mind" ],
+    "miss_messages": [ [ "Your sense of reality warps!", 3 ] ],
+    "speed_name": "Tainted",
+    "desc": [
+      "You are disoriented as strange visions flash through your mind.",
+      "You are overwhelmed by the disturbing imagery and concepts you're flooded with.",
+      "You can't comprehend the things around you…",
+      "You don't know what is and isn't real anymore…"
+    ],
+    "rating": "bad",
+    "max_intensity": 4,
+    "max_duration": "2 h",
+    "int_add_val": 1,
+    "int_dur_factor": "5 m",
+    "base_mods": { "speed_mod": [ -20 ], "str_mod": [ 0 ], "dex_mod": [ -1 ], "per_mod": [ -2 ], "vomit_chance": [ 20 ] },
+    "scaling_mods": { "speed_mod": [ -10 ], "int_mod": [ -2 ], "str_mod": [ -1 ], "dex_mod": [ -1 ], "per_mod": [ -2 ] }
+  },
+  {
+    "type": "effect_type",
+    "id": "tindrift"
+  },
   {
     "type": "effect_type",
     "id": "visuals",
@@ -1950,5 +1974,51 @@
     "id": "ignore_fall_damage",
     "//": "Used for translocation via teleporter_list as a way to avoid fall damage by teleporting Z levels",
     "flags": [ "EFFECT_FEATHER_FALL" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "hunger_full",
+    "name": [ "Full" ],
+    "desc": [ "You feel quite full, and a bit sluggish." ],
+    "apply_message": "You feel quite full, and a bit sluggish.",
+    "rating": "bad",
+    "base_mods": { "speed_mod": [ -2 ], "fatigue_amount": [ 1 ] }
+  },
+  {
+    "type": "effect_type",
+    "id": "hunger_engorged",
+    "name": [ "Engorged" ],
+    "desc": [ "Your stomach is full to bursting. This was a mistake." ],
+    "apply_message": "Your stomach is full to bursting. This was a mistake.",
+    "rating": "bad",
+    "base_mods": { "speed_mod": [ -10 ], "fatigue_amount": [ 2 ], "vomit_chance": [ 5 ], "vomit_tick": [ 60 ], "pain_amount": [ 3 ] }
+  },
+  {
+    "type": "effect_type",
+    "id": "hunger_satisfied"
+  },
+  {
+    "type": "effect_type",
+    "id": "hunger_hungry"
+  },
+  {
+    "type": "effect_type",
+    "id": "hunger_very_hungry"
+  },
+  {
+    "type": "effect_type",
+    "id": "hunger_near_starving"
+  },
+  {
+    "type": "effect_type",
+    "id": "hunger_starving"
+  },
+  {
+    "type": "effect_type",
+    "id": "hunger_famished"
+  },
+  {
+    "type": "effect_type",
+    "id": "hunger_blank"
   }
 ]

data/json/emit.json

@@ -130,6 +130,14 @@
     "intensity": 3,
     "chance": 50
   },
+  {
+    "id": "emit_shadow_field",
+    "type": "emit",
+    "field": "fd_shadow",
+    "intensity": 1,
+    "qty": 10,
+    "chance": 100
+  },
   {
     "id": "emit_shock_burst",
     "type": "emit",

data/json/enchantments.json

@@ -4,5 +4,12 @@
     "id": "ENCH_INVISIBILITY",
     "condition": "ALWAYS",
     "ench_effects": [ { "effect": "invisibility", "intensity": 1 } ]
+  },
+  {
+    "type": "enchantment",
+    "id": "ENCH_SHADOW_CLOUD",
+    "condition": "ALWAYS",
+    "ench_effects": [ { "effect": "invisibility", "intensity": 1 } ],
+    "emitter": "emit_shadow_field"
   }
 ]

data/json/field_type.json

@@ -518,6 +518,13 @@
     "display_field": true,
     "looks_like": "fd_fire"
   },
+  {
+    "id": "fd_shadow",
+    "type": "field_type",
+    "intensity_levels": [ { "name": "shadow", "light_override": 3.7 } ],
+    "half_life": "10 seconds",
+    "percent_spread": 50
+  },
   {
     "id": "fd_flame_burst",
     "type": "field_type",

data/json/furniture_and_terrain/furniture-appliances.json

@@ -4,7 +4,7 @@
     "id": "f_air_conditioner",
     "name": "cooling unit",
     "looks_like": "t_machinery_light",
-    "description": "A big, blocky metal device for refrigerating large areas.",
+    "description": "A large, blocky appliance encased in sheet metal.  This commonplace fixture is used for cooling large indoor areas.",
     "symbol": "{",
     "bgcolor": "white",
     "move_cost_mod": -1,
@@ -44,7 +44,7 @@
     "type": "furniture",
     "id": "f_air_filter",
     "name": "central air filter",
-    "description": "Cleans out dust mites, smoke particles, and more!",
+    "description": "A large synthetic membrane used to filter out dust, smoke, mites, and other contaminants from air that passes through it.",
     "symbol": "#",
     "bgcolor": "white",
     "move_cost_mod": -1,
@@ -85,7 +85,7 @@
     "id": "f_dishwasher",
     "name": "dishwasher",
     "looks_like": "f_oven",
-    "description": "This metal box used to spray hot water and soap at dirty dishes to make them clean and to save people an unpleasant chore.  Now, with the power gone and it sitting for a while, it's starting to smell a bit off.",
+    "description": "A large, boxy machine that uses hot water and soap to efficiently clean batches of dishes.  Now that it's sat powerless for a while, a putrid scent of rot is leaking from inside.",
     "symbol": "{",
     "bgcolor": "white",
     "move_cost_mod": -1,
@@ -129,7 +129,7 @@
     "type": "furniture",
     "id": "f_dryer",
     "name": "dryer",
-    "description": "'Dry your clothes!' would be what you'd do if electricity was running.",
+    "description": "A common household appliance used to quickly dry large batches of clothing after they have been washed.",
     "symbol": "{",
     "bgcolor": "white",
     "move_cost_mod": -1,
@@ -170,7 +170,7 @@
     "id": "f_fridge",
     "name": "refrigerator",
     "symbol": "{",
-    "description": "Freeze your food with the amazing science of electricity!  Oh wait, none is flowing.  Well, as long as you don't open it, maybe it'll stay cool for awhile.",
+    "description": "A tall metal storage container that, if powered, will freeze food and other perishables for preservation.",
     "color": "light_cyan",
     "move_cost_mod": -1,
     "coverage": 90,
@@ -216,7 +216,7 @@
     "name": "glass door fridge",
     "symbol": "{",
     "color": "light_cyan",
-    "description": "Wow!  See INTO your fridge before you open it and discover it's not working!",
+    "description": "A modern refrigerator with a thick sheet of glass in the door, often specially treated to be more insulative.  Allows seeing the contents without letting out the cold air, which used to be a minor convenience, and now saves precious minutes until spoilage.",
     "move_cost_mod": -1,
     "coverage": 90,
     "required_str": 10,
@@ -260,7 +260,7 @@
     "id": "f_home_furnace",
     "name": "furnace",
     "looks_like": "t_sewage_pipe",
-    "description": "A gas-powered forced-air central heating unit, with an internal fan to push the air through a building's air ducts and keep it warm.",
+    "description": "A gas-powered forced-air central heating unit, with an internal fan to push the air through a building's ventilation system to keep it warm.",
     "symbol": "0",
     "bgcolor": "white",
     "move_cost_mod": -1,
@@ -300,7 +300,7 @@
     "type": "furniture",
     "id": "f_washer",
     "name": "washing machine",
-    "description": "You could wash your dirty clothes if electricity was running.",
+    "description": "A large, chunky machine that uses soap and large amounts of water to wash batches of clothes with minimal effort.",
     "symbol": "{",
     "bgcolor": "white",
     "move_cost_mod": -1,
@@ -343,7 +343,7 @@
     "id": "f_oven",
     "name": "oven",
     "symbol": "#",
-    "description": "Used for heating and cooking food with electricity.  Doesn't look like it's working, although it still has parts.  It might be safe to light a fire inside of it, if you had to.",
+    "description": "A standard convection-based oven, commonly used for heating and cooking food.  Despite it no longer working, you could safely light a fire inside.",
     "color": "dark_gray",
     "move_cost_mod": 2,
     "coverage": 60,
@@ -383,7 +383,7 @@
     "id": "f_bellows",
     "name": "blacksmith bellows",
     "symbol": "#",
-    "description": "Used for delivering air to increase the combustion and heat output of a forge.  Doesn't look like it's working, although it still has parts.",
+    "description": "An old device for pushing air into a blacksmith's forge to strengthen the fire and maintain a high temperature.  Useless in its current state, but good for parts.",
     "color": "dark_gray",
     "looks_like": "t_machinery_old",
     "move_cost_mod": 2,
@@ -417,7 +417,7 @@
     "id": "f_drophammer",
     "name": "blacksmith drop hammer",
     "symbol": "#",
-    "description": "Used for fast production of metal items.  Doesn't look like it's working, although it still has parts.",
+    "description": "An anvil with a large metal hammer suspended above it in a metal framework.  If it were working, it would be useful for shaping softened metal plates, though now it is only useful for parts.",
     "color": "white",
     "looks_like": "t_machinery_old",
     "move_cost_mod": 2,
@@ -453,7 +453,7 @@
     "type": "furniture",
     "id": "f_shredder",
     "name": "document shredder",
-    "description": "It's not all about hiding government secrets, sometimes you just want to stop identity theft.",
+    "description": "A simple electronic device mounted to a large basket.  It is designed to efficiently destroy paper documents with sensitive information.  Good for parts, as identity theft and corporate espionage probably aren't big concerns anymore.",
     "symbol": "H",
     "bgcolor": "white",
     "move_cost_mod": 5,
@@ -496,7 +496,7 @@
     "id": "f_server",
     "looks_like": "f_utility_shelf",
     "name": "server stack",
-    "description": "This is a big pile of computers.  They're all turned off.",
+    "description": "A large rack of specialized computers for storing and transmitting information.  Powerless and largely useless for its intended purpose, the laptops mounted inside can still be used if removed.",
     "symbol": ":",
     "color": "blue_white",
     "move_cost_mod": -1,
@@ -532,7 +532,7 @@
     "id": "f_satellite",
     "name": "large satellite dish",
     "looks_like": "t_radio_tower",
-    "description": "Somewhere up there, there are still satellites, orbiting and doing their thing, sending signals down to an Earth that is no longer listening.",
+    "description": "A large concave metal panel with simple electronics used to receive signals from sattelites.  While the hundreds of expensive machines orbitting the planet will likely continue to function indefinately, their various purposes have all been lost.",
     "symbol": ")",
     "color": "white_green",
     "move_cost_mod": -1,
@@ -573,7 +573,7 @@
     "type": "furniture",
     "id": "f_solar_unit",
     "name": "mounted solar panel",
-    "description": "A mounted solar panel.",
+    "description": "A set of photovoltaic power generators, which turns solar radiation into useable electricity.  While useful before the cataclysm, they have become priceless tools, invaluable to any survivor.",
     "symbol": "#",
     "color": "yellow",
     "move_cost_mod": 2,

data/json/furniture_and_terrain/furniture-barriers.json

@@ -5,7 +5,7 @@
     "name": "road barricade",
     "symbol": "#",
     "bgcolor": "yellow",
-    "description": "A road barricade.  For barricading roads.",
+    "description": "A large wooden blockade used to block passage through a road.  It is lined with reflective tape to increase visibility.  Despite the name, it does little to stop a moving car.",
     "move_cost_mod": -1,
     "coverage": 30,
     "required_str": 5,
@@ -27,7 +27,7 @@
     "symbol": "#",
     "looks_like": "f_sandbag_half",
     "bgcolor": "brown",
-    "description": "An earthbag barricade, typically used for blocking bullets.",
+    "description": "A low wall made of stacked earthbags, commonly used to catch bullets and block flooding.",
     "move_cost_mod": -1,
     "coverage": 60,
     "required_str": -1,
@@ -61,7 +61,7 @@
     "bgcolor": "brown",
     "move_cost_mod": -1,
     "coverage": 95,
-    "description": "An earthbag wall.",
+    "description": "A wall of stacked earthbags, a bit taller than an average adult.",
     "required_str": -1,
     "flags": [ "NOITEM", "BLOCKSDOOR", "EASY_DECONSTRUCT", "MINEABLE", "BLOCK_WIND" ],
     "deconstruct": { "items": [ { "item": "earthbag", "count": 20 } ], "furn_set": "f_earthbag_half" },
@@ -78,7 +78,7 @@
     "type": "furniture",
     "id": "f_lane",
     "name": "lane guard",
-    "description": "Used to be used for keeping traffic.",
+    "description": "A simple wooden post to mark the separation between street lanes.",
     "symbol": "#",
     "color": "brown",
     "move_cost_mod": 1,
@@ -98,7 +98,7 @@
     "name": "sandbag barricade",
     "symbol": "#",
     "bgcolor": "brown",
-    "description": "A sandbag barricade, typically used for blocking bullets.",
+    "description": "A low wall made of canvas sacks filled with sand, commonly used to catch bullets and prevent flooding.",
     "move_cost_mod": -1,
     "coverage": 60,
     "required_str": -1,
@@ -131,7 +131,7 @@
     "bgcolor": "brown",
     "move_cost_mod": -1,
     "coverage": 95,
-    "description": "A sandbag wall.",
+    "description": "A wall of stacked sandbags, a bit taller than an average adult.",
     "required_str": -1,
     "flags": [ "NOITEM", "BLOCKSDOOR", "EASY_DECONSTRUCT", "MINEABLE", "BLOCK_WIND" ],
     "deconstruct": { "items": [ { "item": "sandbag", "count": 20 } ], "furn_set": "f_sandbag_half" },