Level-stats selection settings

Resolves #113.
MrAlaux · Sep 25, 2024 · ad2afe1 · ad2afe1
1 parent 2ae249b
commit ad2afe1
Show file tree

Hide file tree

Showing 7 changed files with 127 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - **_Flip Levels_** setting [thanks @ceski-1]
 - **_Allow [Weapon] Switch Interruption_** setting
 - **_Message Flash_** setting
+- **Level-Stats Selection** settings
 - **Support for powerup-timer icons**
   - Replaced `hud_stats_icons` with `hud_allow_icons` [1]
 - **Support for crouching-player sprites**

diff --git a/README.md b/README.md
@@ -113,6 +113,7 @@ For these settings, their CVAR names are provided alongside the _CFG-only_ label
 - **_Show Powerup Timers_** setting
 - **Show SSG availability in the Shotgun slot of the Arms widget** setting (CFG-only: `show_ssg`) [p.f. Crispy Doom]
 - **_Level-Stats Format_** settings [i.b. Crispy Doom]
+- **Level-Stats Selection** settings (CFG-only: `hud_stats_#[_map]`)
 - **_Highlight Current/Pending Weapon_** setting [i.b. PSX Doom]
 - **_Alternative Arms Display_** setting, to show the Chainsaw or SSG's availability on the Arms widget in place of the trivial Pistol
 - **Event Timers:**

diff --git a/src/am_map.c b/src/am_map.c
@@ -884,6 +884,8 @@ void AM_ChangeMode(automapmode_t mode)
       AM_activateNewScale();
     }
   }
+
+  HU_Start();
 }
 
 //

diff --git a/src/doomstat.c b/src/doomstat.c
@@ -212,6 +212,8 @@ int message_flash;
 int show_ssg; // CFG-only
 int hud_stats_format;
 int hud_stats_format_map;
+int hud_stats_show[NUMSHOWSTATS];
+int hud_stats_show_map[NUMSHOWSTATS];
 int hud_allow_icons;
 int hud_highlight_weapon;
 int alt_arms;

diff --git a/src/doomstat.h b/src/doomstat.h
@@ -596,8 +596,18 @@ enum {
 };
 extern int hud_stats_format;
 extern int hud_stats_format_map;
-extern int hud_allow_icons;
 
+enum {
+  SHOWSTATS_KILLS,
+  SHOWSTATS_ITEMS,
+  SHOWSTATS_SECRETS,
+
+  NUMSHOWSTATS
+};
+extern int hud_stats_show[];
+extern int hud_stats_show_map[];
+
+extern int hud_allow_icons;
 extern int hud_highlight_weapon;
 extern int alt_arms;
 

diff --git a/src/hu_stuff.c b/src/hu_stuff.c
@@ -737,9 +737,18 @@ void HU_Start(void)
                        &boom_font, colrngs[CR_GRAY],
                        NULL, deathmatch ? HU_widget_build_frag : HU_widget_build_keys);
 
+  // [Nugget] /---------------------------------------------------------------
+
+  const int *const showstats = (automapactive == AM_FULL) ? hud_stats_show_map : hud_stats_show;
+  int statslines = 0;
+
+  for (int i = 0;  i < NUMSHOWSTATS;  i++) { statslines += showstats[i]; }
+
+  // [Nugget] ---------------------------------------------------------------/
+
   // create the hud monster/secret widget
   HUlib_init_multiline(&w_monsec,
-                       MULTILINE(nughud.sts_ml) ? 3 : 1, // [Nugget] NUGHUD
+                       MULTILINE(nughud.sts_ml) ? statslines : MIN(1, statslines), // [Nugget] NUGHUD
                        &boom_font, colrngs[CR_GRAY],
                        NULL, HU_widget_build_monsec);
   // [FG] in deathmatch: w_keys.builder = HU_widget_build_frag()
@@ -1326,6 +1335,15 @@ static void HU_widget_build_frag (void)
 
 static void HU_widget_build_monsec(void)
 {
+  // [Nugget] /---------------------------------------------------------------
+
+  const int *const showstats = (automapactive == AM_FULL) ? hud_stats_show_map : hud_stats_show;
+
+  if (!(showstats[SHOWSTATS_KILLS] || showstats[SHOWSTATS_ITEMS] || showstats[SHOWSTATS_SECRETS]))
+  { return; }
+
+  // [Nugget] ---------------------------------------------------------------/
+
   char hud_monsecstr[HU_MAXLINELENGTH];
   int i;
   int fullkillcount, fullitemcount, fullsecretcount;
@@ -1439,30 +1457,57 @@ static void HU_widget_build_monsec(void)
 
   if (MULTILINE(nughud.sts_ml)) // [Nugget] NUGHUD
   {
-    // [Nugget] HUD icons
-    // [Nugget] Stats formats from Crispy
+    // [Nugget] HUD icons | Stats formats from Crispy
 
-    M_snprintf(hud_monsecstr, sizeof(hud_monsecstr),
-      "\x1b%c%c\t\x1b%c%s", killlabelcolor, killlabel, killcolor, kill_str);
-    HUlib_add_string_to_cur_line(&w_monsec, hud_monsecstr);
+    if (showstats[SHOWSTATS_KILLS])
+    {
+      M_snprintf(hud_monsecstr, sizeof(hud_monsecstr),
+        "\x1b%c%c\t\x1b%c%s", killlabelcolor, killlabel, killcolor, kill_str);
+      HUlib_add_string_to_cur_line(&w_monsec, hud_monsecstr);
+    }
 
-    M_snprintf(hud_monsecstr, sizeof(hud_monsecstr),
-      "\x1b%c%c\t\x1b%c%s", itemlabelcolor, itemlabel, itemcolor, item_str);
-    HUlib_add_string_to_cur_line(&w_monsec, hud_monsecstr);
+    if (showstats[SHOWSTATS_ITEMS])
+    {
+      M_snprintf(hud_monsecstr, sizeof(hud_monsecstr),
+        "\x1b%c%c\t\x1b%c%s", itemlabelcolor, itemlabel, itemcolor, item_str);
+      HUlib_add_string_to_cur_line(&w_monsec, hud_monsecstr);
+    }
 
-    M_snprintf(hud_monsecstr, sizeof(hud_monsecstr),
-      "\x1b%c%c\t\x1b%c%s", secretlabelcolor, secretlabel, secretcolor, secret_str);
-    HUlib_add_string_to_cur_line(&w_monsec, hud_monsecstr);
+    if (showstats[SHOWSTATS_SECRETS])
+    {
+      M_snprintf(hud_monsecstr, sizeof(hud_monsecstr),
+        "\x1b%c%c\t\x1b%c%s", secretlabelcolor, secretlabel, secretcolor, secret_str);
+      HUlib_add_string_to_cur_line(&w_monsec, hud_monsecstr);
+    }
   }
   else
   {
-    // [Nugget] HUD icons
-    // [Nugget] Stats formats from Crispy
-    M_snprintf(hud_monsecstr, sizeof(hud_monsecstr),
-      "\x1b%c%c \x1b%c%s \x1b%c%c \x1b%c%s \x1b%c%c \x1b%c%s",
-      killlabelcolor, killlabel, killcolor, kill_str,
-      itemlabelcolor, itemlabel, itemcolor, item_str,
-      secretlabelcolor, secretlabel, secretcolor, secret_str);
+    // [Nugget] HUD icons | Stats formats from Crispy
+
+    int offset = 0;
+
+    if (showstats[SHOWSTATS_KILLS])
+    {
+      offset += M_snprintf(hud_monsecstr + offset, sizeof(hud_monsecstr),
+        "\x1b%c%c \x1b%c%s%s",
+        killlabelcolor, killlabel, killcolor, kill_str,
+        (showstats[SHOWSTATS_ITEMS] || showstats[SHOWSTATS_SECRETS]) ? " " : "");
+    }
+
+    if (showstats[SHOWSTATS_ITEMS])
+    {
+      offset += M_snprintf(hud_monsecstr + offset, sizeof(hud_monsecstr),
+        "\x1b%c%c \x1b%c%s%s",
+        itemlabelcolor, itemlabel, itemcolor, item_str,
+        showstats[SHOWSTATS_SECRETS] ? " " : "");
+    }
+
+    if (showstats[SHOWSTATS_SECRETS])
+    {
+      offset += M_snprintf(hud_monsecstr + offset, sizeof(hud_monsecstr),
+        "\x1b%c%c \x1b%c%s",
+        secretlabelcolor, secretlabel, secretcolor, secret_str);
+    }
 
     HUlib_add_string_to_cur_line(&w_monsec, hud_monsecstr);
   }

diff --git a/src/m_config.c b/src/m_config.c
@@ -3792,6 +3792,52 @@ default_t defaults[] = {
 
   // [Nugget] ---------------------------------------------------------------/
 
+  // [Nugget] /---------------------------------------------------------------
+
+  {
+    "hud_stats_kills",
+    (config_t *) &hud_stats_show[SHOWSTATS_KILLS], NULL,
+    {1}, {0,1}, number, ss_none, wad_no,
+    "1 to show the kill count on the stats display"
+  },
+
+  {
+    "hud_stats_items",
+    (config_t *) &hud_stats_show[SHOWSTATS_ITEMS], NULL,
+    {1}, {0,1}, number, ss_none, wad_no,
+    "1 to show the item count on the stats display"
+  },
+
+  {
+    "hud_stats_secrets",
+    (config_t *) &hud_stats_show[SHOWSTATS_SECRETS], NULL,
+    {1}, {0,1}, number, ss_none, wad_no,
+    "1 to show the item count on the stats display"
+  },
+
+  {
+    "hud_stats_kills_map",
+    (config_t *) &hud_stats_show_map[SHOWSTATS_KILLS], NULL,
+    {1}, {0,1}, number, ss_none, wad_no,
+    "1 to show the kill count on the automap's stats display"
+  },
+
+  {
+    "hud_stats_items_map",
+    (config_t *) &hud_stats_show_map[SHOWSTATS_ITEMS], NULL,
+    {1}, {0,1}, number, ss_none, wad_no,
+    "1 to show the item count on the automap's stats display"
+  },
+
+  {
+    "hud_stats_secrets_map",
+    (config_t *) &hud_stats_show_map[SHOWSTATS_SECRETS], NULL,
+    {1}, {0,1}, number, ss_none, wad_no,
+    "1 to show the item count on the automap's stats display"
+  },
+
+  // [Nugget] ---------------------------------------------------------------/
+
   { // [Nugget]
     "hud_allow_icons",
     (config_t *) &hud_allow_icons, NULL,