Merge branch 'master' into MonsterImmunity

data/json/effects.json

@@ -553,7 +553,8 @@
     "type": "effect_type",
     "id": "foodpoison",
     "name": [ "Food Poisoning" ],
-    "desc": [ "Your stomach is extremely upset, and you are quite nauseous." ],
+    "desc": [ "Your stomach is extremely upset, and you are quite nauseated." ],
+    "//": "In formal usage, 'nauseous' technically means 'to cause nausea [in others],' not 'feeling sick.'",
     "miss_messages": [ [ "Your stomach bothers you.", 1 ] ],
     "rating": "bad",
     "resist_traits": [ "POISRESIST" ],
@@ -608,8 +609,8 @@
     "type": "effect_type",
     "id": "nausea",
     "name": [ "Nausea" ],
-    "desc": [ "You feel nauseous.  Even a thought of food makes you feel sick." ],
-    "remove_message": "You no longer feel nauseous.",
+    "desc": [ "You feel nauseated.  Even a thought of food makes you feel sick." ],
+    "remove_message": "You no longer feel nauseated.",
     "rating": "bad",
     "int_dur_factor": "5 m",
     "max_intensity": 3,
@@ -837,7 +838,7 @@
     "desc": [ "You are covered in webs!" ],
     "apply_message": "You're covered in webs!",
     "rating": "bad",
-    "miss_messages": [ [ "The webs constrict your movement.", 4 ] ],
+    "miss_messages": [ [ "The webs restrict your movement.", 4 ] ],
     "max_intensity": 3,
     "base_mods": { "speed_mod": [ -20 ] },
     "scaling_mods": { "speed_mod": [ -5 ] },
@@ -848,9 +849,9 @@
     "id": "sludged",
     "name": [ "sludged" ],
     "desc": [ "You're standing in sludge!" ],
-    "apply_message": "You're stepped into some sludge!",
+    "apply_message": "You've stepped into some sludge!",
     "rating": "bad",
-    "miss_messages": [ [ "The sludge constricts your movement.", 4 ] ],
+    "miss_messages": [ [ "The sludge restricts your movement.", 4 ] ],
     "max_intensity": 3,
     "show_in_info": true
   },
@@ -1028,7 +1029,7 @@
     "type": "effect_type",
     "id": "rat",
     "name": [ "Ratting" ],
-    "desc": [ "You feel nauseous and rat-like." ],
+    "desc": [ "You feel nauseated and rat-like." ],
     "max_intensity": 100,
     "base_mods": { "int_mod": [ -0.5 ], "str_mod": [ -0.2 ], "per_mod": [ -0.4 ] },
     "scaling_mods": { "int_mod": [ -0.5 ], "str_mod": [ -0.2 ], "per_mod": [ -0.4 ] }
@@ -1844,14 +1845,14 @@
     "id": "anemia",
     "name": [ "Early iron deficiency", "Iron deficiency", "Acute iron deficiency" ],
     "desc": [
-      "A lack of iron in your diet has hampered efficiency and regeneration of your red blood cells.",
-      "Prolonged lack of iron in your diet has compromised efficiency and regeneration of your red blood cells.",
+      "A lack of iron in your diet has hampered the efficiency and regeneration of your red blood cells.",
+      "Prolonged lack of iron in your diet has compromised the efficiency and regeneration of your red blood cells.",
       "Severe lack of iron in your diet results in your red blood cells dying faster then they are regenerating."
     ],
     "apply_message": "You begin feeling increasingly tired and listless.",
     "remove_message": "You are no longer in risk of becoming anemic.",
     "decay_messages": [
-      [ "Your irom deficiency is nearly resolved.", "good" ],
+      [ "Your iron deficiency is nearly resolved.", "good" ],
       [ "Your feel stronger as your iron deficiency starts to improve.", "good" ]
     ],
     "max_intensity": 3,
@@ -2001,15 +2002,15 @@
     "name": [ "Mild hypovolemic shock", "Moderate hypovolemic shock", "Advanced hypovolemic shock", "Severe hypovolemic shock" ],
     "desc": [
       "You've lost some blood and look somewhat pale.",
-      "You've lost large amount of blood, and you're not feeling well.",
+      "You've lost a large amount of blood, and you're not feeling well.",
       "You've lost an awful lot of blood, and your condition is severe.  Seek medical attention.",
       "You've lost tremendous amount of blood, and you're standing on death's door.  Transfusion might save you."
     ],
-    "apply_message": "You have lost lot of blood, and your condition worsens.",
+    "apply_message": "You have lost a lot of blood, and your condition worsens.",
     "remove_message": "You are no longer in shock.",
     "decay_messages": [
-      [ "Your blood level increase, and you feel better, but still look pale.", "good" ],
-      [ "Your feel stronger as your blood levels starts to improve.", "good" ],
+      [ "Your blood volume increases, and you feel better; but still, you look pale.", "good" ],
+      [ "You feel stronger as your blood volume starts to improve.", "good" ],
       [ "You're not dying from lack of blood, but you're not out of the woods yet.", "good" ]
     ],
     "max_intensity": 4,
@@ -2349,13 +2350,13 @@
     "type": "effect_type",
     "id": "weary_1",
     "name": [ "Lightly Weary" ],
-    "desc": [ "You've been pretty active for a while, operating at the highest levels of activity will be impaired." ]
+    "desc": [ "You've been pretty active for a while; operating at the highest levels of activity will be impaired." ]
   },
   {
     "type": "effect_type",
     "id": "weary_2",
     "name": [ "Moderately Weary" ],
-    "desc": [ "You've been quite active for a while, operating at higher levels of activity will be impaired." ]
+    "desc": [ "You've been quite active for a while; operating at higher levels of activity will be impaired." ]
   },
   {
     "type": "effect_type",
@@ -2385,7 +2386,7 @@
     "type": "effect_type",
     "id": "weary_7",
     "name": [ "Extremely Weary" ],
-    "desc": [ "You've been extremely active for a while, it's time to stop." ]
+    "desc": [ "You've been extremely active for a while; it's time to stop." ]
   },
   {
     "type": "effect_type",

data/json/itemgroups/furniture.json

@@ -35,7 +35,9 @@
       { "item": "down_blanket", "prob": 13 },
       { "item": "pillow", "prob": 30 },
       { "item": "down_pillow", "prob": 15 },
-      { "item": "electric_blanket", "prob": 4 }
+      { "item": "electric_blanket", "prob": 4 },
+      { "item": "quilt", "prob": 10 },
+      { "item": "quilt_patchwork", "prob": 8 }
     ]
   },
   {

data/json/items/armor/ammo_pouch.json

@@ -3,7 +3,7 @@
     "id": "ammo_pouch",
     "type": "ARMOR",
     "name": { "str": "ammo pouch", "str_pl": "ammo pouches" },
-    "description": "A small pouch that can be used to store most types of small ammunition, rockets will not fit.  Use insert to store ammunition.",
+    "description": "A small pouch that can be used to store most types of small ammunition; rockets, however, will not fit.  Use insert to store ammunition.",
     "weight": "490 g",
     "volume": "500 ml",
     "price": 1000,
@@ -75,7 +75,7 @@
     "id": "ammo_satchel",
     "type": "ARMOR",
     "name": { "str": "ammo satchel" },
-    "description": "A fabric ammo bag worn at the waist which is capable of holding a single large magazine close at hand.",
+    "description": "A fabric ammo bag worn at the waist.  It is capable of holding a single large magazine close at hand.",
     "weight": "180 g",
     "volume": "500 ml",
     "price": 2000,
@@ -104,7 +104,7 @@
     "id": "chestpouch",
     "type": "ARMOR",
     "name": { "str": "chest ammo pouch", "str_pl": "chest ammo pouches" },
-    "description": "A fabric ammo pouch that can be strapped to your chest which is capable of holding a single magazine close at hand.",
+    "description": "A fabric ammo pouch that can be strapped to your chest and hold a single magazine close at hand.",
     "weight": "140 g",
     "volume": "250 ml",
     "price": 1250,
@@ -182,15 +182,15 @@
     "type": "ARMOR",
     "copy-from": "chestrig",
     "name": { "str": "oversize chestrig" },
-    "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest.  This one can hold four magazines in its pouches and fits larger than human forms.",
+    "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest.  This one can hold four magazines in its pouches and fits larger-than-human forms.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
   },
   {
     "id": "javelin_bag",
     "type": "ARMOR",
     "name": { "str": "javelin bag" },
-    "description": "An open medieval-looking bag, designed to store javelins for easy reach.",
+    "description": "An open medieval-looking bag, designed to store javelins within easy reach.",
     "weight": "600 g",
     "volume": "1250 ml",
     "price": 6000,
@@ -257,7 +257,7 @@
     "id": "legpouch",
     "type": "ARMOR",
     "name": { "str": "ankle ammo pouch", "str_pl": "ankle ammo pouches" },
-    "description": "A small fabric ammo pouch that can be strapped to your ankle which is capable of holding a single small magazine close at hand.",
+    "description": "A small fabric ammo pouch that can be strapped to your ankle and hold a single small magazine close at hand.",
     "volume": "250 ml",
     "weight": "60 g",
     "price": 2000,
@@ -287,7 +287,7 @@
     "type": "ARMOR",
     "id": "legpouch_large",
     "name": { "str": "leg ammo pouch", "str_pl": "leg ammo pouches" },
-    "description": "A fabric ammo pouch that can be strapped to your leg and capable of holding two magazine close at hand.",
+    "description": "A fabric ammo pouch that can be strapped to your leg and hold two magazines close at hand.",
     "weight": "120 g",
     "volume": "250 ml",
     "price": 2000,
@@ -473,7 +473,7 @@
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "XL Kevlar vest" },
-    "description": "A massive, hand-built Kevlar vest based on the design of existing bullet resistant vests.  It has four pouches capable of carrying magazines.",
+    "description": "A massive, hand-built Kevlar vest based on the design of existing bullet-resistant vests.  It has four pouches capable of carrying magazines.",
     "looks_like": "modularvest",
     "weight": "5148 g",
     "volume": "10750 ml",

data/json/items/armor/torso_armor.json

@@ -406,7 +406,7 @@
   {
     "id": "xl_lsurvivor_armor",
     "type": "ARMOR",
-    "name": { "str": "light survivor body armor" },
+    "name": { "str": "XL light survivor body armor" },
     "copy-from": "lsurvivor_armor",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY", "OVERSIZE" ]

data/json/items/generic/bedding.json

@@ -86,6 +86,36 @@
     "environmental_protection": 1,
     "flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS" ]
   },
+  {
+    "id": "quilt",
+    "type": "ARMOR",
+    "name": "quilt",
+    "description": "A big, comfy quilt made of thick wool in a triangle pattern.  Extremely cozy!",
+    "weight": "1814 g",
+    "volume": "5 L",
+    "price": 5500,
+    "to_hit": -1,
+    "material": [ "wool" ],
+    "symbol": "[",
+    "color": "white",
+    "covers": [ "torso", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ],
+    "coverage": 100,
+    "encumbrance": 40,
+    "warmth": 75,
+    "material_thickness": 3,
+    "environmental_protection": 2,
+    "flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS" ],
+    "looks_like": "down_blanket"
+  },
+  {
+    "id": "quilt_patchwork",
+    "type": "ARMOR",
+    "copy-from": "quilt",
+    "name": "patchwork quilt",
+    "description": "A huge, patchwork wool quilt.  Very, very warm.",
+    "encumbrance": 50,
+    "warmth": 70
+  },
   {
     "id": "sleeping_bag",
     "type": "ARMOR",

data/json/items/tool_armor.json

@@ -181,7 +181,7 @@
     "encumbrance": 70,
     "warmth": 5,
     "material_thickness": 1,
-    "flags": [ "WATER_FRIENDLY", "OUTER", "SPLINT" ]
+    "flags": [ "WATER_FRIENDLY", "OUTER", "SPLINT", "ALLOWS_TAIL" ]
   },
   {
     "id": "leg_xlsplint",
@@ -194,7 +194,7 @@
     "price": 25000,
     "price_postapoc": 50,
     "encumbrance": 140,
-    "flags": [ "OVERSIZE", "WATER_FRIENDLY", "OUTER", "SPLINT" ]
+    "flags": [ "OVERSIZE", "WATER_FRIENDLY", "OUTER", "SPLINT", "ALLOWS_TAIL" ]
   },
   {
     "id": "miner_hat",

data/json/professions.json

@@ -309,32 +309,32 @@
   },
   {
     "type": "profession_item_substitutions",
-    "item": "glasses_eye",
+    "group": { "items": [ "glasses_eye" ] },
     "bonus": { "present": [ "MYOPIC" ], "absent": [ "HYPEROPIC" ] }
   },
   {
     "type": "profession_item_substitutions",
-    "item": "glasses_bifocal",
+    "group": { "items": [ "glasses_bifocal" ] },
     "bonus": { "present": [ "HYPEROPIC", "MYOPIC" ] }
   },
   {
     "type": "profession_item_substitutions",
-    "item": "glasses_reading",
+    "group": { "items": [ "glasses_reading" ] },
     "bonus": { "present": [ "HYPEROPIC" ], "absent": [ "MYOPIC" ] }
   },
   {
     "type": "profession_item_substitutions",
-    "item": "inhaler",
+    "group": { "entries": [ { "item": "inhaler", "ammo-item": "albuterol", "charges": 100 } ] },
     "bonus": { "present": [ "ASTHMA" ] }
   },
   {
     "type": "profession_item_substitutions",
-    "item": "thorazine",
+    "group": { "items": [ "thorazine" ] },
     "bonus": { "present": [ "SCHIZOPHRENIC" ] }
   },
   {
     "type": "profession_item_substitutions",
-    "item": "teleumbrella",
+    "group": { "items": [ "teleumbrella" ] },
     "bonus": { "present": [ "ALBINO" ] }
   },
   {

data/json/vehicleparts/rams.json

@@ -166,7 +166,10 @@
     "durability": 40,
     "description": "A mattress, strapped onto the vehicle.  It could serve to blunt any impact.",
     "breaks_into": [ { "item": "rag", "count": [ 40, 55 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 0 ] ], "time": "5 m", "using": [ [ "rope_natural_short", 2 ] ] } },
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 0 ] ], "time": "5 m", "using": [ [ "rope_natural_short", 2 ] ] },
+      "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "5 m", "using": [  ] }
+    },
     "damage_reduction": { "bash": 20 },
     "flags": [ "PROTRUSION", "OBSTACLE", "OPAQUE" ]
   },

data/mods/Aftershock/itemgroups/item_groups.json

@@ -79,11 +79,6 @@
     "type": "item_group",
     "items": [ [ "afs_atompot", 3 ] ]
   },
-  {
-    "id": "bed",
-    "type": "item_group",
-    "items": [ [ "afs_quilt", 10 ], [ "afs_quilt_patchwork", 8 ] ]
-  },
   {
     "id": "livingroom",
     "type": "item_group",

data/mods/Aftershock/items/corpses.json

@@ -225,7 +225,7 @@
     "copy-from": "broken_advbot_disarmed",
     "color": "magenta",
     "name": "broken Wraitheon Irradiant",
-    "description": "The irreparably broken remains of an Irradiant weapons platform.  Its mounted plasma cannon self-destructed when the robot was rendered inoperable,  but its remains could still be disassembled for some valuable parts."
+    "description": "The irreparably broken remains of an Irradiant weapons platform.  Its mounted plasma cannon self-destructed when the robot was rendered inoperable, but its remains could still be disassembled for some valuable parts."
   },
   {
     "type": "GENERIC",

data/mods/Aftershock/items/obsolete.json

@@ -182,36 +182,6 @@
     "pocket_data": [ { "ammo_restriction": { "arrow": 40, "bolt": 40 }, "moves": 20 } ],
     "flags": [ "BELTED", "OVERSIZE", "WATER_FRIENDLY" ]
   },
-  {
-    "id": "afs_quilt",
-    "type": "ARMOR",
-    "name": "quilt",
-    "description": "A big, comfy quilt made of thick wool in a triangle pattern.  Extremely cozy!",
-    "weight": "1814 g",
-    "volume": "5 L",
-    "price": 5500,
-    "to_hit": -1,
-    "material": [ "wool" ],
-    "symbol": "[",
-    "color": "white",
-    "covers": [ "torso", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ],
-    "coverage": 100,
-    "encumbrance": 40,
-    "warmth": 100,
-    "material_thickness": 3,
-    "environmental_protection": 2,
-    "flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS" ],
-    "looks_like": "down_blanket"
-  },
-  {
-    "id": "afs_quilt_patchwork",
-    "type": "ARMOR",
-    "copy-from": "afs_quilt",
-    "name": "patchwork quilt",
-    "description": "A huge, patchwork wool quilt.  Very, very warm.",
-    "encumbrance": 50,
-    "warmth": 90
-  },
   {
     "id": "afs_survivor_belt",
     "copy-from": "survivor_belt",

data/mods/Aftershock/migration.json

@@ -0,0 +1,12 @@
+[
+  {
+    "id": [ "afs_quilt" ],
+    "type": "MIGRATION",
+    "replace": "quilt"
+  },
+  {
+    "id": [ "afs_quilt_patchwork" ],
+    "type": "MIGRATION",
+    "replace": "quilt_patchwork"
+  }
+]

data/mods/Magiclysm/Spells/druid.json

@@ -179,13 +179,15 @@
     "max_damage": 1,
     "min_range": 3,
     "max_range": 5,
+    "range_increment": 0.1,
     "spell_class": "DRUID",
     "base_casting_time": 500,
     "energy_source": "MANA",
     "max_level": 25,
     "difficulty": 10,
     "min_duration": 6000,
     "max_duration": 30000,
+    "duration_increment": 1000,
     "base_energy_cost": 675,
     "final_energy_cost": 475,
     "energy_increment": -5.0,