Merge branch 'master' into slow-3d-fov

CleverRaven · Dec 31, 2015 · 7393730 · 7393730
2 parents 9d3405e + a7e13d8
commit 7393730
Show file tree

Hide file tree

Showing 77 changed files with 1,768 additions and 1,212 deletions.
diff --git a/data/json/effects.json b/data/json/effects.json
@@ -230,7 +230,8 @@
         "remove_memorial_log": "Put out the fire.",
         "apply_message": "You're on fire!",
         "apply_memorial_log": "Caught on fire.",
-        "rating": "bad"
+        "rating": "bad",
+        "max_duration": 10
     },
     {
         "type": "effect_type",
@@ -818,13 +819,16 @@
             "pain_min": [1],
             "pain_chance": [2],
             "pain_max_val": [-1],
+            "hurt_min": [1],
+            "hurt_chance": [-300],
             "stamina_chance": [2]
         },
         "scaling_mods": {
             "speed_mod": [-4],
             "thirst_min": [1],
             "thirst_tick": [-100],
             "pain_max_val": [10],
+            "hurt_chance": [200],
             "stamina_min": [-1]
         }
     },

diff --git a/data/json/items/archery.json b/data/json/items/archery.json
@@ -1102,7 +1102,6 @@
         "material" : ["plastic", "iron"],
         "volume" : 2,
         "weight" : 175,
-        "bashing" : 0,
         "cutting" : 16,
         "to_hit" : -1,
         "ammo_type" : "thrown",

diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
@@ -698,7 +698,6 @@
     "volume" : 1,
     "phase" : "liquid",
     "charges" : 14,
-    "bashing" : 0,
     "category" : "chems",
     "ammo_type" : "conc_alcohol",
     "damage" : 0,
@@ -719,7 +718,6 @@
     "material": "wood",
     "weight": 500,
     "volume": 2,
-    "bashing": 0,
     "to_hit": -2
     },
     {
@@ -734,7 +732,6 @@
     "material": "wood",
     "weight": 212,
     "volume": 1,
-    "bashing": 0,
     "to_hit": -2
     }
 ]