seems my upstream was not up to date. fun.

I-am-Erk · Mar 30, 2024 · c7a1191 · c7a1191
1 parent 2a0e3b4
commit c7a1191
Show file tree

Hide file tree

Showing 18 changed files with 195 additions and 195 deletions.
diff --git a/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json b/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json
@@ -309,7 +309,7 @@
     "type": "furniture",
     "id": "f_LIXA_unfold_barrier",
     "name": "wall of flat space",
-    "looks_like": "fd_fatigue",
+    "looks_like": "fd_sleepiness",
     "description": "From a distance, this looks like where the chamber ends; a flat wall, with a very detailed painting of a tunnel behind it.  But as you get closer, you can see how it ripples, like lazy water, and notice angles of the space beyond that a flat image could never give.",
     "symbol": "@",
     "color": "light_gray",

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
@@ -1127,7 +1127,7 @@
     "active": true,
     "cost": 90,
     "time": "10 s",
-    "fatigue": true,
+    "sleepiness": true,
     "kcal": true,
     "thirst": true,
     "enchantments": [ { "values": [ { "value": "MOVE_COST", "multiply": -0.1 }, { "value": "BONUS_DODGE", "add": 2 } ] } ]
@@ -3558,7 +3558,7 @@
     "cost": 90,
     "kcal": true,
     "thirst": true,
-    "fatigue": true
+    "sleepiness": true
   },
   {
     "type": "mutation",
@@ -3576,7 +3576,7 @@
     "cost": 90,
     "kcal": true,
     "thirst": true,
-    "fatigue": true
+    "sleepiness": true
   },
   {
     "type": "mutation",
@@ -8929,7 +8929,7 @@
     "name": { "str": "Debug Life Support" },
     "points": 99,
     "valid": false,
-    "description": "Holds hunger, thirst, and fatigue stable.  You can debug all year long with this one!",
+    "description": "Holds hunger, thirst, and sleepiness stable.  You can debug all year long with this one!",
     "debug": true
   },
   {

diff --git a/data/json/ui/zenfs/complete_health_panel.json b/data/json/ui/zenfs/complete_health_panel.json
@@ -32,14 +32,14 @@
     "type": "widget",
     "style": "layout",
     "arrange": "minimum_columns",
-    "widgets": [ "zenfs_malus_weariness_power", "zenfs_stamina_pain_mana", "zenfs_activity_fatigue_blood" ]
+    "widgets": [ "zenfs_malus_weariness_power", "zenfs_stamina_pain_mana", "zenfs_activity_sleepiness_blood" ]
   },
   {
     "id": "zenfs_physical_num_block",
     "type": "widget",
     "style": "layout",
     "arrange": "minimum_columns",
-    "widgets": [ "zenfs_num_malus_weariness_power", "zenfs_num_stamina_pain_mana", "zenfs_num_activity_fatigue_blood" ],
+    "widgets": [ "zenfs_num_malus_weariness_power", "zenfs_num_stamina_pain_mana", "zenfs_num_activity_sleepiness_blood" ],
     "padding": 3
   },
   {
@@ -178,7 +178,7 @@
       "zenfs_weariness_bar_10",
       "zenfs_weariness_trans_malus",
       "zenfs_activity_desc",
-      "zenfs_fatigue_desc"
+      "zenfs_sleepiness_desc"
     ]
   },
   {
@@ -193,7 +193,7 @@
       "zenfs_weariness_num",
       "zenfs_weariness_trans_malus_num",
       "zenfs_activity_desc_A",
-      "zenfs_fatigue_desc_F"
+      "zenfs_sleepiness_desc_F"
     ]
   },
   {
@@ -254,12 +254,12 @@
     "widgets": [ "zenfs_stamina_bar_12", "zenfs_pain_bar_15", "zenfs_mana_bar_15" ]
   },
   {
-    "id": "zenfs_activity_fatigue_blood",
+    "id": "zenfs_activity_sleepiness_blood",
     "type": "widget",
     "style": "layout",
     "arrange": "rows",
     "width": 21,
-    "widgets": [ "zenfs_activity_desc", "zenfs_fatigue_desc", "zenfs_blood" ]
+    "widgets": [ "zenfs_activity_desc", "zenfs_sleepiness_desc", "zenfs_blood" ]
   },
   {
     "id": "zenfs_num_malus_weariness_power",
@@ -278,12 +278,12 @@
     "widgets": [ "zenfs_stamina_num", "zenfs_pain_num", "zenfs_mana_num_with_max" ]
   },
   {
-    "id": "zenfs_num_activity_fatigue_blood",
+    "id": "zenfs_num_activity_sleepiness_blood",
     "type": "widget",
     "style": "layout",
     "arrange": "rows",
     "width": 19,
-    "widgets": [ "zenfs_activity_desc", "zenfs_fatigue_desc", "zenfs_blood" ],
+    "widgets": [ "zenfs_activity_desc", "zenfs_sleepiness_desc", "zenfs_blood" ],
     "padding": 0
   },
   {

diff --git a/data/json/ui/zenfs/health.json b/data/json/ui/zenfs/health.json
@@ -38,41 +38,41 @@
     "padding": 0
   },
   {
-    "id": "zenfs_fatigue_bar",
+    "id": "zenfs_sleepiness_bar",
     "type": "widget",
     "style": "layout",
     "arrange": "minimum_columns",
-    "widgets": [ "zenfs_fatigue_bar_label", "zenfs_fatigue_bar_12" ]
+    "widgets": [ "zenfs_sleepiness_bar_label", "zenfs_sleepiness_bar_12" ]
   },
   {
-    "id": "zenfs_fatigue_bar_slim",
+    "id": "zenfs_sleepiness_bar_slim",
     "type": "widget",
     "style": "layout",
     "arrange": "minimum_columns",
-    "widgets": [ "zenfs_fatigue_bar_label", "zenfs_fatigue_bar_14" ]
+    "widgets": [ "zenfs_sleepiness_bar_label", "zenfs_sleepiness_bar_14" ]
   },
   {
-    "id": "zenfs_fatigue_desc",
+    "id": "zenfs_sleepiness_desc",
     "type": "widget",
     "style": "layout",
     "arrange": "minimum_columns",
-    "widgets": [ "zenfs_fatigue_bar_label", "zenfs_fatigue_desc_no_label" ],
+    "widgets": [ "zenfs_sleepiness_bar_label", "zenfs_sleepiness_desc_no_label" ],
     "padding": 0
   },
   {
-    "id": "zenfs_fatigue_desc_F",
+    "id": "zenfs_sleepiness_desc_F",
     "type": "widget",
     "style": "layout",
     "arrange": "minimum_columns",
-    "widgets": [ "zenfs_fatigue_label_F", "zenfs_fatigue_desc_no_label" ],
+    "widgets": [ "zenfs_sleepiness_label_F", "zenfs_sleepiness_desc_no_label" ],
     "padding": 0
   },
   {
-    "id": "zenfs_fatigue_num",
+    "id": "zenfs_sleepiness_num",
     "type": "widget",
     "style": "layout",
     "arrange": "minimum_columns",
-    "widgets": [ "zenfs_fatigue_bar_label", "zenfs_fatigue_num_no_label" ],
+    "widgets": [ "zenfs_sleepiness_bar_label", "zenfs_sleepiness_num_no_label" ],
     "padding": 0
   },
   {
@@ -157,37 +157,37 @@
     "padding": 0
   },
   {
-    "id": "zenfs_fatigue_bar_template",
+    "id": "zenfs_sleepiness_bar_template",
     "type": "widget",
-    "var": "fatigue",
+    "var": "sleepiness",
     "style": "graph",
     "symbols": "·−=≡≣",
     "colors": [ "c_dark_gray", "c_green", "c_light_green", "c_yellow", "c_light_red", "c_red" ]
   },
   {
-    "id": "zenfs_fatigue_num_no_label",
+    "id": "zenfs_sleepiness_num_no_label",
     "type": "widget",
-    "var": "fatigue",
+    "var": "sleepiness",
     "style": "number",
     "colors": [ "c_dark_gray", "c_green", "c_light_green", "c_yellow", "c_light_red", "c_red" ],
     "text_align": "right",
     "flags": [ "W_NO_LABEL" ],
     "padding": 0
   },
   {
-    "id": "zenfs_fatigue_bar_12",
+    "id": "zenfs_sleepiness_bar_12",
     "type": "widget",
-    "copy-from": "zenfs_fatigue_bar_template",
+    "copy-from": "zenfs_sleepiness_bar_template",
     "width": 12
   },
   {
-    "id": "zenfs_fatigue_bar_14",
+    "id": "zenfs_sleepiness_bar_14",
     "type": "widget",
-    "copy-from": "zenfs_fatigue_bar_template",
+    "copy-from": "zenfs_sleepiness_bar_template",
     "width": 14
   },
   {
-    "id": "zenfs_fatigue_desc_no_label",
+    "id": "zenfs_sleepiness_desc_no_label",
     "type": "widget",
     "style": "text",
     "text_align": "right",
@@ -197,31 +197,31 @@
         "id": "well_rested",
         "text": "Well Rested",
         "color": "blue",
-        "condition": { "math": [ "u_val('fatigue')", "<", "95" ] }
+        "condition": { "math": [ "u_val('sleepiness')", "<", "95" ] }
       },
       {
         "id": "rested",
         "text": "Rested",
         "color": "green",
-        "condition": { "and": [ { "math": [ "u_val('fatigue')", ">=", "95" ] }, { "math": [ "u_val('fatigue')", "<", "191" ] } ] }
+        "condition": { "and": [ { "math": [ "u_val('sleepiness')", ">=", "95" ] }, { "math": [ "u_val('sleepiness')", "<", "191" ] } ] }
       },
       {
         "id": "tired",
         "text": "Tired",
         "color": "yellow",
-        "condition": { "and": [ { "math": [ "u_val('fatigue')", ">=", "191" ] }, { "math": [ "u_val('fatigue')", "<", "383" ] } ] }
+        "condition": { "and": [ { "math": [ "u_val('sleepiness')", ">=", "191" ] }, { "math": [ "u_val('sleepiness')", "<", "383" ] } ] }
       },
       {
         "id": "dead_tired",
         "text": "Dead Tired",
         "color": "light_red",
-        "condition": { "and": [ { "math": [ "u_val('fatigue')", ">=", "383" ] }, { "math": [ "u_val('fatigue')", "<", "575" ] } ] }
+        "condition": { "and": [ { "math": [ "u_val('sleepiness')", ">=", "383" ] }, { "math": [ "u_val('sleepiness')", "<", "575" ] } ] }
       },
       {
         "id": "exhausted",
         "text": "Exhausted",
         "color": "red",
-        "condition": { "math": [ "u_val('fatigue')", ">=", "575" ] }
+        "condition": { "math": [ "u_val('sleepiness')", ">=", "575" ] }
       }
     ],
     "padding": 0
@@ -241,7 +241,7 @@
     "width": 4
   },
   {
-    "id": "zenfs_fatigue_label_F",
+    "id": "zenfs_sleepiness_label_F",
     "type": "widget",
     "style": "text",
     "string": "F",
@@ -250,14 +250,14 @@
     "flags": [ "W_NO_PADDING" ]
   },
   {
-    "id": "zenfs_fatigue_bar_label",
+    "id": "zenfs_sleepiness_bar_label",
     "type": "widget",
     "style": "text",
     "string": "Fatigue",
     "width": 7
   },
   {
-    "id": "zenfs_fatigue_num_label",
+    "id": "zenfs_sleepiness_num_label",
     "type": "widget",
     "style": "text",
     "string": "Fatig",

diff --git a/data/mods/BombasticPerks/perks.json b/data/mods/BombasticPerks/perks.json
@@ -586,10 +586,10 @@
       {
         "condition": "ALWAYS",
         "values": [
-          { "value": "STRENGTH", "add": { "math": [ "(u_val('thirst')/120) + (u_val('fatigue')/150)" ] } },
-          { "value": "DEXTERITY", "add": { "math": [ "(u_val('thirst')/120) + (u_val('fatigue')/150)" ] } },
-          { "value": "INTELLIGENCE", "add": { "math": [ "(u_val('thirst')/120) + (u_val('fatigue')/150)" ] } },
-          { "value": "PERCEPTION", "add": { "math": [ "(u_val('thirst')/120) + (u_val('fatigue')/150)" ] } },
+          { "value": "STRENGTH", "add": { "math": [ "(u_val('thirst')/120) + (u_val('sleepiness')/150)" ] } },
+          { "value": "DEXTERITY", "add": { "math": [ "(u_val('thirst')/120) + (u_val('sleepiness')/150)" ] } },
+          { "value": "INTELLIGENCE", "add": { "math": [ "(u_val('thirst')/120) + (u_val('sleepiness')/150)" ] } },
+          { "value": "PERCEPTION", "add": { "math": [ "(u_val('thirst')/120) + (u_val('sleepiness')/150)" ] } },
           { "value": "SPEED", "add": { "math": [ "clamp(( (u_val('thirst') - 80 ) / 10 ) , 0, 50)" ] } }
         ]
       },

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json
@@ -652,7 +652,7 @@
     },
     "effect": [
       { "u_message": "As you unleash your powers, you feel tired.", "type": "bad" },
-      { "math": [ "u_val('fatigue')", "+=", "rng(30,90)" ] }
+      { "math": [ "u_val('sleepiness')", "+=", "rng(30,90)" ] }
     ]
   },
   {
@@ -1056,7 +1056,7 @@
       ]
     },
     "effect": [
-      { "u_set_field": "fd_fatigue", "radius": 0, "intensity": 3, "hit_player": false },
+      { "u_set_field": "fd_sleepiness", "radius": 0, "intensity": 3, "hit_player": false },
       { "u_message": "As you unleash your powers, the air around you twists and warps in on itself.", "type": "bad" }
     ]
   },