Fix Tired status showing up with delay after fatigue penalties start (C…

…leverRaven#59055)
Maleclypse · Jul 8, 2022 · 658bbe4 · 658bbe4
1 parent e4a81da
commit 658bbe4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/data/json/ui/fatigue.json b/data/json/ui/fatigue.json
@@ -10,8 +10,8 @@
         "color": "yellow",
         "condition": {
           "and": [
-            { "compare_int": [ { "u_val": "fatigue" }, ">", { "const": 191 } ] },
-            { "compare_int": [ { "u_val": "fatigue" }, "<=", { "const": 383 } ] }
+            { "compare_int": [ { "u_val": "fatigue" }, ">=", { "const": 191 } ] },
+            { "compare_int": [ { "u_val": "fatigue" }, "<", { "const": 383 } ] }
           ]
         }
       },
@@ -21,16 +21,16 @@
         "color": "light_red",
         "condition": {
           "and": [
-            { "compare_int": [ { "u_val": "fatigue" }, ">", { "const": 383 } ] },
-            { "compare_int": [ { "u_val": "fatigue" }, "<=", { "const": 575 } ] }
+            { "compare_int": [ { "u_val": "fatigue" }, ">=", { "const": 383 } ] },
+            { "compare_int": [ { "u_val": "fatigue" }, "<", { "const": 575 } ] }
           ]
         }
       },
       {
         "id": "exhausted",
         "text": "Exhausted",
         "color": "red",
-        "condition": { "compare_int": [ { "u_val": "fatigue" }, ">", { "const": 575 } ] }
+        "condition": { "compare_int": [ { "u_val": "fatigue" }, ">=", { "const": 575 } ] }
       }
     ]
   },

diff --git a/src/display.cpp b/src/display.cpp
@@ -822,13 +822,13 @@ std::pair<std::string, nc_color> display::fatigue_text_color( const Character &u
     int fatigue = u.get_fatigue();
     std::string fatigue_string;
     nc_color fatigue_color = c_white;
-    if( fatigue > fatigue_levels::EXHAUSTED ) {
+    if( fatigue >= fatigue_levels::EXHAUSTED ) {
         fatigue_color = c_red;
         fatigue_string = translate_marker( "Exhausted" );
-    } else if( fatigue > fatigue_levels::DEAD_TIRED ) {
+    } else if( fatigue >= fatigue_levels::DEAD_TIRED ) {
         fatigue_color = c_light_red;
         fatigue_string = translate_marker( "Dead Tired" );
-    } else if( fatigue > fatigue_levels::TIRED ) {
+    } else if( fatigue >= fatigue_levels::TIRED ) {
         fatigue_color = c_yellow;
         fatigue_string = translate_marker( "Tired" );
     }