Merge branch '0.D-branch'

* 0.D-branch: Fix sleep deprivation messages triggering for NPCs Don't unequip holsters on wielding from them Add scaling factor option Remove all the problematic group spawn entries.
CleverRaven · Feb 24, 2019 · f07c447 · f07c447
2 parents bf99f81 + c5d1def
commit f07c447
Show file tree

Hide file tree

Showing 26 changed files with 439 additions and 668 deletions.
diff --git a/data/json/items/biosignatures.json b/data/json/items/biosignatures.json
@@ -18,9 +18,7 @@
     "volume": 1,
     "charges": 4,
     "stack_size": 4,
-    "fun": -25,
-    "rot_spawn": "GROUP_BIOSIG_BIRD",
-    "rot_spawn_chance": 5
+    "fun": -25
   },
   {
     "type": "COMESTIBLE",
@@ -29,9 +27,7 @@
     "copy-from": "feces_bird",
     "weight": 750,
     "volume": 4,
-    "description": "A fresh cow pie, could probably be used to make some great fertilizer.",
-    "rot_spawn": "GROUP_BIOSIG_LARGE_HERBIVORE",
-    "rot_spawn_chance": 2
+    "description": "A fresh cow pie, could probably be used to make some great fertilizer."
   },
   {
     "type": "COMESTIBLE",
@@ -47,15 +43,13 @@
     "copy-from": "feces_bird",
     "weight": 250,
     "volume": 2,
-    "description": "Common manure, could probably be used to make some great fertilizer.",
-    "rot_spawn": "GROUP_BIOSIG_LARGE_HERBIVORE"
+    "description": "Common manure, could probably be used to make some great fertilizer."
   },
   {
     "type": "COMESTIBLE",
     "id": "feces_roach",
     "name": "roach dirt",
     "copy-from": "feces_bird",
-    "description": "Large black pellets of rotting material.",
-    "rot_spawn": "GROUP_BIOSIG_ROACH"
+    "description": "Large black pellets of rotting material."
   }
 ]
diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json
@@ -79,8 +79,7 @@
     "volume": 3,
     "charges": 8,
     "flags": [ "EATEN_HOT" ],
-    "fun": 2,
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "fun": 2
   },
   {
     "type": "COMESTIBLE",
@@ -97,8 +96,7 @@
     "price": 23,
     "material": "wheat",
     "volume": 1,
-    "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ]
   },
   {
     "type": "COMESTIBLE",
@@ -119,8 +117,7 @@
     "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 1,
-    "vitamins": [ [ "calcium", 4 ], [ "iron", 2 ] ],
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "vitamins": [ [ "calcium", 4 ], [ "iron", 2 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -141,8 +138,7 @@
     "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 2,
-    "vitamins": [ [ "calcium", 2 ], [ "iron", 1 ] ],
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "vitamins": [ [ "calcium", 2 ], [ "iron", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -162,8 +158,7 @@
     "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 2,
-    "vitamins": [ [ "calcium", 1 ], [ "iron", 2 ] ],
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "vitamins": [ [ "calcium", 1 ], [ "iron", 2 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -183,8 +178,7 @@
     "volume": 1,
     "charges": 2,
     "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
-    "fun": 1,
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "fun": 1
   },
   {
     "type": "COMESTIBLE",
@@ -226,8 +220,7 @@
     "charges": 2,
     "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
     "fun": 1,
-    "vitamins": [ [ "calcium", 3 ], [ "iron", 3 ] ],
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "vitamins": [ [ "calcium", 3 ], [ "iron", 3 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -250,7 +243,6 @@
     "flags": [ "EATEN_HOT" ],
     "fun": -1,
     "vitamins": [ [ "calcium", 3 ] ],
-    "//": "this item will generally inherit its values, so it is essentially a copy of bread",
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "//": "this item will generally inherit its values, so it is essentially a copy of bread"
   }
 ]
diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -8,8 +8,7 @@
     "symbol": "%",
     "color": "red",
     "parasites": 32,
-    "vitamins": [  ],
-    "rot_spawn": "GROUP_CARRION"
+    "vitamins": [  ]
   },
   {
     "id": "fish",
@@ -129,9 +128,7 @@
     "health": -25,
     "fun": -25,
     "use_action": "POISON",
-    "vitamins": [  ],
-    "rot_spawn": "GROUP_CARRION",
-    "rot_spawn_chance": 101
+    "vitamins": [  ]
   },
   {
     "id": "meat_cooked",
@@ -511,9 +508,7 @@
     "material": "flesh",
     "volume": 1,
     "stack_size": 1,
-    "fun": -20,
-    "rot_spawn": "GROUP_CARRION",
-    "rot_spawn_chance": 15
+    "fun": -20
   },
   {
     "type": "COMESTIBLE",
@@ -563,9 +558,7 @@
     "volume": 1,
     "fun": -10,
     "flags": [ "TRADER_AVOID", "SMOKABLE" ],
-    "smoking_result": "dry_meat_tainted",
-    "rot_spawn": "GROUP_CARRION_INFECTED",
-    "rot_spawn_chance": 15
+    "smoking_result": "dry_meat_tainted"
   },
   {
     "type": "COMESTIBLE",
@@ -612,9 +605,7 @@
     "//": "Not for use in edible recipes, and should require ~200% as much as normal for applicable inedible recipes.",
     "material": "flesh",
     "volume": 1,
-    "fun": -10,
-    "rot_spawn": "GROUP_CARRION_INFECTED",
-    "rot_spawn_chance": 15
+    "fun": -10
   },
   {
     "type": "COMESTIBLE",
@@ -653,9 +644,7 @@
     "material": "flesh",
     "volume": 1,
     "flags": [ "EATEN_HOT" ],
-    "fun": -5,
-    "rot_spawn": "GROUP_CARRION",
-    "rot_spawn_chance": 15
+    "fun": -5
   },
   {
     "type": "COMESTIBLE",
@@ -680,9 +669,7 @@
     "material": "flesh",
     "volume": 1,
     "flags": [ "EATEN_HOT" ],
-    "fun": -3,
-    "rot_spawn": "GROUP_CARRION",
-    "rot_spawn_chance": 12
+    "fun": -3
   },
   {
     "type": "COMESTIBLE",
@@ -711,8 +698,7 @@
     "flags": "TRADER_AVOID",
     "volume": "25ml",
     "stack_size": 1,
-    "fun": -12,
-    "rot_spawn": "GROUP_CARRION"
+    "fun": -12
   },
   {
     "type": "COMESTIBLE",
@@ -722,8 +708,7 @@
     "spoils_in": "6 hours",
     "use_action": "POISON",
     "description": "A carefully folded poisonous raw skin harvested from an unnatural creature.  You can cure it for storage and tanning.",
-    "price": 0,
-    "rot_spawn": "GROUP_CARRION_INFECTED"
+    "price": 0
   },
   {
     "type": "COMESTIBLE",
@@ -752,8 +737,7 @@
     "flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
     "volume": "25ml",
     "stack_size": 1,
-    "fun": -24,
-    "rot_spawn": "GROUP_CARRION"
+    "fun": -24
   },
   {
     "type": "COMESTIBLE",
@@ -764,8 +748,7 @@
     "use_action": "POISON",
     "description": "A carefully folded raw skin harvested from a fur-bearing unnatural creature.  It still has the fur attached and is poisonous.  You can cure it for storage and tanning.",
     "price": 0,
-    "flags": [ "NO_SALVAGE" ],
-    "rot_spawn": "GROUP_CARRION_INFECTED"
+    "flags": [ "NO_SALVAGE" ]
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json
@@ -17,8 +17,7 @@
     "phase": "liquid",
     "flags": [ "FREEZERBURN" ],
     "fun": 15,
-    "vitamins": [ [ "calcium", 8 ] ],
-    "rot_spawn": "GROUP_CARRION"
+    "vitamins": [ [ "calcium", 8 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -38,8 +37,7 @@
     "phase": "liquid",
     "fun": 20,
     "flags": [ "FREEZERBURN" ],
-    "vitamins": [ [ "calcium", 2 ] ],
-    "rot_spawn": "GROUP_CARRION"
+    "vitamins": [ [ "calcium", 2 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -101,8 +99,7 @@
     "volume": 1,
     "charges": 8,
     "fun": 7,
-    "vitamins": [ [ "vitA", 1 ], [ "calcium", 3 ] ],
-    "rot_spawn": "GROUP_CARRION"
+    "vitamins": [ [ "vitA", 1 ], [ "calcium", 3 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -123,8 +120,7 @@
     "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 6,
-    "vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ], [ "iron", 2 ] ],
-    "rot_spawn": "GROUP_CARRION"
+    "vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ], [ "iron", 2 ] ]
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
@@ -19,8 +19,7 @@
     "charges": 8,
     "phase": "liquid",
     "flags": [ "EATEN_HOT" ],
-    "fun": 1,
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "fun": 1
   },
   {
     "id": "maple_sap",

diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -224,9 +224,7 @@
     "volume": "25 ml",
     "stack_size": 4,
     "fun": 1,
-    "vitamins": [ [ "vitC", 1 ], [ "vitB", 24 ] ],
-    "rot_spawn": "GROUP_CARRION",
-    "rot_spawn_chance": 20
+    "vitamins": [ [ "vitC", 1 ], [ "vitB", 24 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -264,8 +262,7 @@
     "volume": "125 ml",
     "charges": 2,
     "flags": [ "EATEN_HOT", "FREEZERBURN" ],
-    "fun": 3,
-    "rot_spawn": "GROUP_CARRION"
+    "fun": 3
   },
   {
     "type": "COMESTIBLE",
@@ -280,8 +277,7 @@
     "price": 95,
     "material": "egg",
     "fun": 2,
-    "flags": [ "FREEZERBURN" ],
-    "rot_spawn": "GROUP_CARRION"
+    "flags": [ "FREEZERBURN" ]
   },
   {
     "type": "COMESTIBLE",
@@ -295,7 +291,6 @@
     "description": "A pickled egg.  Rather salty, but tastes good and lasts for a long time.",
     "price": 95,
     "material": "egg",
-    "fun": 2,
-    "rot_spawn": "GROUP_CARRION"
+    "fun": 2
   }
 ]
diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
@@ -74,8 +74,7 @@
     "material": "fruit",
     "volume": 1,
     "fun": 5,
-    "vitamins": [ [ "vitA", 1 ], [ "vitC", 2 ], [ "iron", 1 ] ],
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "vitamins": [ [ "vitA", 1 ], [ "vitC", 2 ], [ "iron", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -95,8 +94,7 @@
     "material": "fruit",
     "volume": 1,
     "fun": 7,
-    "vitamins": [ [ "vitC", 5 ], [ "calcium", 1 ], [ "iron", 1 ] ],
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "vitamins": [ [ "vitC", 5 ], [ "calcium", 1 ], [ "iron", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -198,8 +196,7 @@
     "price": 900,
     "material": "fruit",
     "volume": 1,
-    "fun": 4,
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "fun": 4
   },
   {
     "type": "COMESTIBLE",
@@ -220,8 +217,7 @@
     "volume": 1,
     "charges": 4,
     "fun": 3,
-    "vitamins": [ [ "iron", 2 ] ],
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "vitamins": [ [ "iron", 2 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -243,7 +239,6 @@
     "volume": 1,
     "stack_size": 2,
     "fun": 1,
-    "vitamins": [ [ "iron", 2 ] ],
-    "rot_spawn": "GROUP_ROTTING_PLANT"
+    "vitamins": [ [ "iron", 2 ] ]
   }
 ]