Merge pull request #611 from waveyl/master

Rename fatigue to sleepiness
Noctifer-de-Mortem · Apr 5, 2024 · 8028502 · 8028502
2 parents a696e83 + 29cbcf8
commit 8028502
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 47 deletions.
diff --git a/nocts_cata_mod_DDA/Mutations/c_bio_mutation.json b/nocts_cata_mod_DDA/Mutations/c_bio_mutation.json
@@ -128,7 +128,7 @@
     "types": [ "METABOLISM" ],
     "cancels": [ "THIRST" ],
     "bodytemp_modifiers": [ 0, 2000 ],
-    "enchantments": [ { "values": [ { "value": "METABOLISM", "multiply": 1.25 } ] }],
+    "enchantments": [ { "values": [ { "value": "METABOLISM", "multiply": 1.25 } ] } ],
     "vitamins_absorb_multi": [ [ "all", [ [ "mutant_toxin", 0.25 ] ] ] ]
   },
   {
@@ -168,10 +168,7 @@
     "cancels": [ "NEURO_BAD_BIOWEAPON", "FASTREADER", "SLOWREADER" ],
     "enchantments": [
       {
-        "values": [
-          { "value": "READING_SPEED_MULTIPLIER", "multiply": -0.25 },
-          { "value": "FATIGUE", "multiply": 0.75 }
-        ]
+        "values": [ { "value": "READING_SPEED_MULTIPLIER", "multiply": -0.25 }, { "value": "SLEEPINESS", "multiply": 0.75 } ]
       }
     ],
     "craft_skill_bonus": [
@@ -247,7 +244,7 @@
           { "value": "REGEN_HP", "multiply": 1.0 },
           { "value": "MENDING_MODIFIER", "multiply": 9.0 }
         ]
-      } 
+      }
     ]
   },
   {
@@ -290,10 +287,10 @@
       {
         "values": [
           { "value": "METABOLISM", "multiply": -0.25 },
-          { "value": "FATIGUE", "multiply": -0.25 },
+          { "value": "SLEEPINESS", "multiply": -0.25 },
           { "value": "STAMINA_REGEN_MOD", "add": -0.5 },
-          { "value": "REGEN_HP", "multiply": -0.5},
-          { "value": "MENDING_MODIFIER", "multiply": -0.75}
+          { "value": "REGEN_HP", "multiply": -0.5 },
+          { "value": "MENDING_MODIFIER", "multiply": -0.75 }
         ]
       }
     ]
@@ -343,14 +340,7 @@
     "purifiable": false,
     "profession": true,
     "cancels": [ "LIGHTSTEP", "CLUMSY" ],
-    "enchantments": [
-      {
-        "values": [
-          { "value": "STEALTH_MODIFIER", "add": 30 },
-          { "value": "FOOTSTEP_NOISE", "multiply": -0.5 }
-        ]
-      }
-    ],
+    "enchantments": [ { "values": [ { "value": "STEALTH_MODIFIER", "add": 30 }, { "value": "FOOTSTEP_NOISE", "multiply": -0.5 } ] } ],
     "social_modifiers": { "persuade": 25, "lie": 50 }
   },
   {
@@ -364,14 +354,7 @@
     "profession": true,
     "cancels": [ "TOUGH", "FLIMSY", "FLIMSY2", "FLIMSY3", "GLASSJAW", "GOODCARDIO", "BADCARDIO" ],
     "types": [ "SIZE" ],
-    "enchantments": [
-      {
-        "values": [ 
-          { "value": "MAX_HP", "add": 50 },
-          { "value": "CARDIO_MULTIPLIER", "multiply": 0.3}
-        ]
-      }
-    ],
+    "enchantments": [ { "values": [ { "value": "MAX_HP", "add": 50 }, { "value": "CARDIO_MULTIPLIER", "multiply": 0.3 } ] } ],
     "flags": [ "LARGE" ]
   },
   {

diff --git a/nocts_cata_mod_DDA/Mutations/c_bio_mutation_super_soldier.json b/nocts_cata_mod_DDA/Mutations/c_bio_mutation_super_soldier.json
@@ -183,12 +183,12 @@
     "category": [ "SUPER_SOLDIER" ],
     "armor": [ { "parts": "ALL", "electric": -1 } ],
     "enchantments": [
-      { 
-        "values": [ 
+      {
+        "values": [
           { "value": "BONUS_DODGE", "add": 1 },
           { "value": "MOVE_COST", "multiply": -0.125 },
           { "value": "ATTACK_SPEED", "multiply": -0.0625 },
-          { "value": "FATIGUE", "multiply": 0.25 }
+          { "value": "SLEEPINESS", "multiply": 0.25 }
         ]
       }
     ]
@@ -209,12 +209,12 @@
     "category": [ "SUPER_SOLDIER" ],
     "armor": [ { "parts": "ALL", "electric": -2 } ],
     "enchantments": [
-      { 
-        "values": [ 
+      {
+        "values": [
           { "value": "BONUS_DODGE", "add": 2 },
           { "value": "MOVE_COST", "multiply": -0.25 },
           { "value": "ATTACK_SPEED", "multiply": -0.125 },
-          { "value": "FATIGUE", "multiply": 0.5 }
+          { "value": "SLEEPINESS", "multiply": 0.5 }
         ]
       }
     ],
@@ -236,12 +236,12 @@
     "threshreq": [ "THRESH_SUPER_SOLDIER" ],
     "armor": [ { "parts": "ALL", "electric": -4 } ],
     "enchantments": [
-      { 
-        "values": [ 
+      {
+        "values": [
           { "value": "BONUS_DODGE", "add": 4 },
           { "value": "MOVE_COST", "multiply": -0.5 },
           { "value": "ATTACK_SPEED", "multiply": -0.25 },
-          { "value": "FATIGUE", "multiply": 1.0 }
+          { "value": "SLEEPINESS", "multiply": 1.0 }
         ]
       }
     ]
@@ -659,13 +659,6 @@
       { "part": "hand_r", "neutral": 18 },
       { "part": "torso", "neutral": 15 }
     ],
-    "enchantments": [
-      "C_MEP_SENTINEL_MENT",
-      {
-        "values": [
-          { "value": "FATIGUE_REGEN", "multiply": 0.5 }
-        ]
-      }
-    ]
+    "enchantments": [ "C_MEP_SENTINEL_MENT", { "values": [ { "value": "SLEEPINESS_REGEN", "multiply": 0.5 } ] } ]
   }
 ]
diff --git a/nocts_cata_mod_DDA/Surv_help/c_effects.json b/nocts_cata_mod_DDA/Surv_help/c_effects.json
@@ -68,8 +68,8 @@
       "hurt_min": [ 1 ],
       "hurt_max": [ 3 ],
       "vomit_chance": [ 600 ],
-      "fatigue_chance": [ 250 ],
-      "fatigue_min": [ 1 ]
+      "sleepiness_chance": [ 250 ],
+      "sleepiness_min": [ 1 ]
     }
   },
   {
@@ -129,8 +129,8 @@
     "id": "c_mi_go_carapace_stamina",
     "base_mods": {
       "stamina_min": [ 20 ],
-      "fatigue_min": [ 1 ],
-      "fatigue_tick": [ 300 ],
+      "sleepiness_min": [ 1 ],
+      "sleepiness_tick": [ 300 ],
       "health_min": [ 1 ],
       "health_tick": [ 300 ],
       "h_mod_min": [ 1 ],
@@ -155,7 +155,7 @@
     "type": "effect_type",
     "id": "c_mi_go_wings_immunity",
     "removes_effects": [ "downed", "bouldering" ],
-    "base_mods": { "fatigue_min": [ 1 ], "fatigue_tick": [ 300 ] },
+    "base_mods": { "sleepiness_min": [ 1 ], "sleepiness_tick": [ 300 ] },
     "flags": [ "EFFECT_FEATHER_FALL" ]
   },
   {