vitamins do things (CleverRaven#50273)

* remove all unlikely deficiencies and excess json lines, max fatigue for scurvy
Venera3 · Sep 21, 2021 · fbf85ec · fbf85ec
1 parent 2deae96
commit fbf85ec
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 53 deletions.
diff --git a/data/json/effects.json b/data/json/effects.json
@@ -1984,21 +1984,6 @@
     "base_mods": { "speed_mod": [ -1000 ], "dex_mod": [ -100 ] },
     "show_in_info": true
   },
-  {
-    "type": "effect_type",
-    "id": "hypocalcemia",
-    "name": [ "Hypocalcemia", "Weak bones", "Brittle bones" ],
-    "desc": [ "A lack of calcium in your diet will make your bones progressively weaker." ],
-    "apply_message": "Your bones are becoming more brittle.",
-    "remove_message": "Your bones regain their usual strength.",
-    "decay_messages": [
-      [ "Your calcium deficiency is nearly resolved.", "good" ],
-      [ "Your bones become stronger as your calcium deficiency improves.", "good" ]
-    ],
-    "max_intensity": 3,
-    "rating": "bad",
-    "blood_analysis_description": "Hypocalcemia"
-  },
   {
     "type": "effect_type",
     "id": "anemia",
@@ -2074,36 +2059,6 @@
     },
     "blood_analysis_description": "Anemia"
   },
-  {
-    "type": "effect_type",
-    "id": "hypovitA",
-    "name": [ "VitA deficiency", "Poor vision", "Night blindness" ],
-    "desc": [ "A lack of vitamin A in your diet will progressively worsen your vision." ],
-    "apply_message": "You start struggling to make out the finer details.",
-    "remove_message": "Your normal visual acuity returns.",
-    "decay_messages": [
-      [ "Your vitamin A deficiency is nearly resolved.", "good" ],
-      [ "Your vision improves as your Vitamin A deficiency improves.", "good" ]
-    ],
-    "max_intensity": 3,
-    "rating": "bad",
-    "blood_analysis_description": "Vitamin A Deficiency"
-  },
-  {
-    "type": "effect_type",
-    "id": "hypovitB",
-    "name": [ "B12 deficiency", "Slow healing", "No healing" ],
-    "desc": [ "A lack of vitamin B12 in your diet will affect your ability to heal." ],
-    "apply_message": "Simple wounds are starting to concern you more than usual.",
-    "remove_message": "Your wounds now heal normally.",
-    "decay_messages": [
-      [ "Your vitamin B12 deficiency is starting to resolve.", "good" ],
-      [ "Your ability to heal returns as your Vitamin B12 deficiency improves.", "good" ]
-    ],
-    "max_intensity": 3,
-    "rating": "bad",
-    "blood_analysis_description": "Vitamin B Deficiency"
-  },
   {
     "type": "effect_type",
     "id": "scurvy",
@@ -2116,6 +2071,27 @@
       [ "Your scurvy lessens as your Vitamin C deficiency improves.", "good" ]
     ],
     "max_intensity": 3,
+    "base_mods": {
+      "pain_max_val": [ 35 ],
+      "pain_chance": [ 900 ],
+      "pain_min": [ 1 ],
+      "pain_max": [ 5 ],
+      "fatigue_chance": [ 900 ],
+      "fatigue_max_val": [ 500, 200 ],
+      "fatigue_min": [ 10 ],
+      "h_mod_min": [ -1 ],
+      "h_mod_min_val": [ 0 ],
+      "h_mod_chance": [ 900 ]
+    },
+    "scaling_mods": {
+      "pain_chance": [ -150 ],
+      "fatigue_chance": [ -200 ],
+      "h_mod_min": [ -1 ],
+      "h_mod_min_val": [ -100 ],
+      "h_mod_chance": [ -300 ],
+      "str_mod": [ -0.5 ],
+      "speed_mod": [ -2 ]
+    },
     "rating": "bad",
     "blood_analysis_description": "Scurvy"
   },

diff --git a/data/json/vitamin.json b/data/json/vitamin.json
@@ -5,8 +5,7 @@
     "vit_type": "vitamin",
     "name": { "str": "Calcium" },
     "min": -12000,
-    "rate": "15 m",
-    "disease": [ [ -4800, -5600 ], [ -5601, -6400 ], [ -6401, -12000 ] ]
+    "rate": "90 m"
   },
   {
     "id": "iron",
@@ -17,7 +16,7 @@
     "deficiency": "anemia",
     "min": -12000,
     "max": 3600,
-    "rate": "15 m",
+    "rate": "30 m",
     "disease": [ [ -4800, -5600 ], [ -5601, -6400 ], [ -6401, -12000 ] ]
   },
   {
@@ -28,26 +27,26 @@
     "excess": "hypervitaminosis",
     "min": -8400,
     "max": 3600,
-    "rate": "15 m",
-    "disease": [ [ -2000, -4800 ], [ -4801, -5600 ], [ -5601, -8400 ] ]
+    "rate": "180 m"
   },
   {
     "id": "vitB",
     "type": "vitamin",
     "vit_type": "vitamin",
     "name": { "str": "Vitamin B12" },
     "min": -5600,
-    "rate": "15 m",
-    "disease": [ [ -2800, -3600 ], [ -3601, -4400 ], [ -4401, -5600 ] ]
+    "max": 2000,
+    "rate": "360 m"
   },
   {
     "id": "vitC",
     "type": "vitamin",
     "vit_type": "vitamin",
     "name": { "str": "Vitamin C" },
+    "deficiency": "scurvy",
     "min": -5600,
     "rate": "15 m",
-    "disease": [ [ -2800, -3600 ], [ -3601, -4400 ], [ -4401, -5600 ] ]
+    "disease": [ [ -2800, -3600, 1 ], [ -3601, -4400, 2 ], [ -4401, -5600, 3 ] ]
   },
   {
     "id": "mutant_toxin",