Merge pull request #19 from CleverRaven/master

Update

data/json/flags.json

@@ -242,6 +242,12 @@
     "context": [ "GENERIC", "TOOL" ],
     "description": "This item can be stored in a scabbard of the appropriate size."
   },
+  {
+    "id": "SHEATH_SPEAR",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "description": "This item can be stored in a sling of the appropriate size."
+  },
   {
     "id": "SKINTIGHT",
     "type": "json_flag",
@@ -250,6 +256,18 @@
     "info": "This clothing <info>lies close</info> to the skin.",
     "conflicts": [ "BELTED", "OUTER", "WAIST" ]
   },
+  {
+    "id": "SLOWS_MOVEMENT",
+    "type": "json_flag",
+    "context": [ "ARMOR", "TOOL_ARMOR" ],
+    "info": "This clothing is restrictive and <bad>slows your movement speed</bad>."
+  },
+  {
+    "id": "SLOWS_THIRST",
+    "type": "json_flag",
+    "context": [ "ARMOR", "TOOL_ARMOR" ],
+    "info": "This clothing <good>slows your thirst</good> by reducing moisture loss."
+  },
   {
     "id": "STURDY",
     "type": "json_flag",

data/json/furniture.json

@@ -2091,7 +2091,7 @@
         "type" : "furniture",
         "id" : "f_still",
         "name": "still",
-        "description": "Invaluable equipment in brewery and chemisty, that distiles liquids.",
+        "description": "Invaluable equipment in brewery and chemisty, that distills liquids.",
         "symbol": "^",
         "color": "light_red",
         "move_cost_mod": -1,

data/json/game_balance.json

@@ -32,14 +32,14 @@
     "name": "GUN_DISPERSION_MULT_PRE_SKILL_THRESHOLD",
     "info": "Gun dispersion multiplier for lack of skill before threshold. GUN_DISPERSION_MULT_POST_SKILL_THRESHOLD will be added on top of it. GUN_DISPERSION_MULT_POST_SKILL_THRESHOLD=3.75 GUN_DISPERSION_MULT_POST_SKILL_THRESHOLD=1.25 means that zero skill character gets 3.75 + 1.25 = 5 extra weapon diseprsion multiplier.",
     "stype": "float",
-    "value": 3.75
+    "value": 4.5
   },
   {
     "type": "EXTERNAL_OPTION",
     "name": "GUN_DISPERSION_MULT_POST_SKILL_THRESHOLD",
     "info": "Gun dispersion multiplier for lack of skill after threshold. 1.25 means that character with skill level 5 gets 1.25 extra weapon dispersion multiplier.",
     "stype": "float",
-    "value": 1.25
+    "value": 1.5
   },
   {
     "type": "EXTERNAL_OPTION",
@@ -97,6 +97,13 @@
     "stype": "bool",
     "value": false
   },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "SAFE_AUTODOC",
+    "info": "Makes autodoc operations completely safe, independent of the players skill",
+    "stype": "bool",
+    "value": false
+  },
   {
     "type": "EXTERNAL_OPTION",
     "name": "FILTHY_WOUNDS",

data/json/items/armor.json

@@ -1169,6 +1169,32 @@
     },
     "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ]
   },
+  {
+    "id": "spearsling",
+    "type": "ARMOR",
+    "name": "spear strap",
+    "description": "A cloth strap tied around the torso for toting spears while keeping your hands free.  You have to duck to get through doors while one's in it, though.  Activate to holster/draw a weapon.",
+    "weight": 160,
+    "volume": 2,
+    "price": 5200,
+    "to_hit": -1,
+    "material": [ "leather" ],
+    "symbol": "[",
+    "color": "brown",
+    "covers": [ "TORSO" ],
+    "coverage": 5,
+    "encumbrance": 4,
+    "material_thickness": 1,
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Holster spear",
+      "holster_msg": "You holster your %s.",
+      "max_volume": 14,
+      "draw_cost": 50,
+      "flags": [ "SHEATH_SPEAR" ]
+    },
+    "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ]
+  },
   {
     "id": "bowhat",
     "type": "ARMOR",
@@ -8076,7 +8102,7 @@
     "encumbrance": 18,
     "warmth": 15,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT", "HOOD", "WATERPROOF" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "HOOD", "WATERPROOF", "SLOWS_THIRST", "SLOWS_MOVEMENT" ]
   },
   {
     "id": "stockings",