fix auto hispeed caps, fix quick retire no press on result screen

dist/popnhax/popnhax.xml

@@ -19,8 +19,6 @@
     <freeze_timer __type="bool">0</freeze_timer>
     <!-- Force skip menu and long note tutorials without a card -->
     <skip_tutorials __type="bool">0</skip_tutorials>
-    <!-- Force full options to display (useful when no numpad is available) -->
-    <force_full_opt __type="bool">0</force_full_opt>
 
   <!-- Stage management -->
     <!-- Premium free (unlimited stages per credit) -->
@@ -33,17 +31,38 @@
     <!-- Bring back score challenge in the game for servers supporting it (only for kaimei onwards) -->
     <score_challenge __type="bool">0</score_challenge>
 
+  <!-- Audio offset -->
+    <!-- Offset the audio by x ms (negative plays audio earlier). This will disable keysounds -->
+    <audio_offset __type="s8">0</audio_offset>
+
   <!-- Visual offset -->
     <!-- Hidden+ setting (press 0 for advanced options) is now a visual offset adjust (negative means you have to hit earlier) -->
     <hidden_is_offset __type="bool">0</hidden_is_offset>
     <!-- Display offset adjust value on score result screen (requires hidden_is_offset, won't be sent over network) -->
     <show_offset __type="bool">0</show_offset>
-    <!-- Display fast/slow counter on result screen even on judge+ off/lost/panic -->
-    <show_fast_slow __type="bool">0</show_fast_slow>
 
-  <!-- Audio offset -->
+  <!-- Option patches -->
-    <!-- Offset the audio by x ms (negative plays audio earlier). This will disable keysounds -->
+    <!-- Auto set hi-speed to match previously set BPM (0: off, 1: target higher bpm on soflan, 2: target lower bpm on soflan, 3: target longest bpm on soflan) -->
-    <audio_offset __type="s8">0</audio_offset>
+    <hispeed_auto __type="u8">0</hispeed_auto>
+    <!-- Default target BPM, 0 to disable (requires hispeed_auto) -->
+    <!-- Note: target is still updated when manually changing hi-speed (except soflan and "?" charts) -->
+    <hispeed_default_bpm __type="u16">0</hispeed_default_bpm>
+
+    <!-- IIDX-like hard gauge (start with full gauge, instant fail if gauge drops to 0) -->
+    <!-- Gauge details: increment: +0.1% for each cool/great/good (like spicy gauge), decrement: -9% for each bad, or -4.5% if gauge <=30% ) -->
+    <iidx_hard_gauge __type="bool">0</iidx_hard_gauge>
+    <!-- Force full options by default (useful when no numpad is available) -->
+    <force_full_opt __type="bool">0</force_full_opt>
+    <!-- Guide SE defaults to OFF (useful for Battle mode) -->
+    <guidese_off __type="bool">0</guidese_off>
+    <!-- All net Ojama default to OFF (useful for Local mode) -->
+    <netvs_off __type="bool">0</netvs_off>
+
+  <!-- Result screen display patches -->
+    <!-- Details on result screen by default (no need to press yellow button) -->
+    <show_details __type="bool">0</show_details>
+    <!-- Fast/Slow counter on result screen even on judge+ off/lost/panic -->
+    <show_fast_slow __type="bool">0</show_fast_slow>
 
   <!-- Input polling -->
     <!-- 1000Hz polling rate (no more shifting timing windows/magic bpm, consistent scoring independently of framerate) -->
@@ -118,4 +137,12 @@
     <!-- Dump applied translations and dll runtime data to help debug translation -->
     <translation_debug __type="bool">0</translation_debug>
 
+  <!-- HARD Gauge alteration modes -->
+    <!-- Turn hard gauge into survival gauge (1: former COURSE gauge (-3.42%), 2: NORMAL gauge decrease rate (-4.99%), 3: IIDX HARD gauge decrease rate (-9%), 4: HARD gauge decrease rate (-19.94%)) -->
+    <survival_gauge __type="u8">0</survival_gauge>
+    <!-- Survival gauge has IIDX-like decrease rate adjustment (decrease amount halved when gauge is at 30% or less) -->
+    <survival_iidx __type="bool">0</survival_iidx>
+    <!-- Set survival gauge increase rate to spicy (+01/+01 instead of +02/+01) -->
+    <survival_spicy __type="bool">0</survival_spicy>
+
 </popnhax>

popnhax/config.h

@@ -6,8 +6,10 @@
 struct popnhax_config {
     bool practice_mode;
     bool hidden_is_offset;
+    bool iidx_hard_gauge;
     bool show_offset;
     bool show_fast_slow;
+    bool show_details;
     bool pfree;
     bool quick_retire;
     bool back_to_song_select;
@@ -22,6 +24,8 @@ struct popnhax_config {
     bool freeze_timer;
     bool skip_tutorials;
     bool force_full_opt;
+    bool netvs_off;
+    bool guidese_off;
 
     bool patch_db;
     bool disable_expansions;
@@ -42,6 +46,11 @@ struct popnhax_config {
     uint8_t debounce;
     bool enhanced_polling_stats;
     int8_t enhanced_polling_priority;
+    uint8_t hispeed_auto;
+    uint16_t hispeed_default_bpm;
+    uint8_t survival_gauge;
+    bool survival_iidx;
+    bool survival_spicy;
 };
 
 #endif