Add Hearts requirements for LACS and Bridge

gamestabled · Jul 22, 2023 · 0b312a9 · 0b312a9
1 parent 3042ce7
commit 0b312a9
Show file tree

Hide file tree

Showing 12 changed files with 117 additions and 11 deletions.
diff --git a/code/src/actors/rainbow_bridge.c b/code/src/actors/rainbow_bridge.c
@@ -46,6 +46,8 @@ u32 BgGjyoBridge_CheckCondition(void) {
             return BgGjyoBridge_ConditionDungeons();
         case RAINBOWBRIDGE_TOKENS:
             return gSaveContext.gsTokens >= gSettingsContext.bridgeTokenCount;
+        case RAINBOWBRIDGE_HEARTS:
+            return gSaveContext.healthCapacity >= gSettingsContext.bridgeHeartCount * 16;
         default:
             return BgGjyoBridge_ConditionVanilla();
     }

diff --git a/code/src/cutscenes.c b/code/src/cutscenes.c
@@ -56,6 +56,8 @@ void Cutscene_OverrideLACS(void) {
             break;
         case LACSCONDITION_TOKENS:
             conditionMet = LACS_ConditionTokens();
+        case LACSCONDITION_HEARTS:
+            conditionMet = gSaveContext.healthCapacity >= gSettingsContext.lacsHeartCount * 16;
             break;
     }
     if (conditionMet) {

diff --git a/code/src/settings.h b/code/src/settings.h
@@ -69,6 +69,7 @@ typedef enum {
     RAINBOWBRIDGE_REWARDS,
     RAINBOWBRIDGE_DUNGEONS,
     RAINBOWBRIDGE_TOKENS,
+    RAINBOWBRIDGE_HEARTS,
 } RainbowBridgeSetting;
 
 typedef enum {
@@ -78,6 +79,7 @@ typedef enum {
     LACSCONDITION_REWARDS,
     LACSCONDITION_DUNGEONS,
     LACSCONDITION_TOKENS,
+    LACSCONDITION_HEARTS,
 } LACSConditionSetting;
 
 typedef enum {
@@ -235,6 +237,7 @@ typedef enum {
     GANONSBOSSKEY_LACS_REWARDS,
     GANONSBOSSKEY_LACS_DUNGEONS,
     GANONSBOSSKEY_LACS_TOKENS,
+    GANONSBOSSKEY_LACS_HEARTS,
 } GanonsBossKeySetting;
 
 typedef enum {
@@ -467,6 +470,7 @@ typedef struct {
     u8 bridgeRewardCount;
     u8 bridgeDungeonCount;
     u8 bridgeTokenCount;
+    u8 bridgeHeartCount;
     u8 randomGanonsTrials;
     u8 ganonsTrialsCount;
 
@@ -522,6 +526,7 @@ typedef struct {
     u8 lacsRewardCount;
     u8 lacsDungeonCount;
     u8 lacsTokenCount;
+    u8 lacsHeartCount;
 
     u8 ringFortress;
     u8 ringForest;

diff --git a/source/descriptions.cpp b/source/descriptions.cpp
@@ -148,6 +148,8 @@ string_view bridgeDungeons            = "The Rainbow Bridge requires completing
                                         "into the blue warp at the end of them.";          //
 string_view bridgeTokens              = "The Rainbow Bridge requires collecting a\n"       //
                                         "configurable number of Gold Skulltula Tokens.";   //
+string_view bridgeHearts              = "The Rainbow Bridge requires collecting a\n"       //
+                                        "configurable number of Hearts.";                  //
 /*------------------------------                                                           //
 |      BRIDGE CONDITIONS       |                                                           //
 ------------------------------*/                                                           //
@@ -162,6 +164,8 @@ string_view bridgeDungeonCountDesc    = "Set the number of completed dungeons re
                                         "spawn the Rainbow Bridge.";                       //
 string_view bridgeTokenCountDesc      = "Set the number of Gold Skulltula Tokens required\n"
                                         "to spawn the Rainbow Bridge.";                    //
+string_view bridgeHeartCountDesc      = "Set the number of Hearts required to spawn the\n" //
+                                        "Rainbow Bridge.";                                 //
 /*------------------------------                                                           //
 |     RANDOM GANONS TRIALS     |                                                           //
 ------------------------------*/                                                           //
@@ -643,6 +647,8 @@ string_view lacsDungeonCountDesc      = "Set the number of completed dungeons re
                                         "into the blue warp at the end of them.";          //
 string_view lacsTokenCountDesc        = "Set the number of Gold Skulltula Tokens required\n"
                                         "to trigger the Light Arrow Cutscene.";            //
+string_view lacsHeartCountDesc        = "Set the number of Hearts required to trigger the\n"
+                                        "Light Arrow Cutscene.";                           //
 /*------------------------------                                                           //
 |      SKIP CHILD STEALTH      |                                                           //
 ------------------------------*/                                                           //

diff --git a/source/descriptions.hpp b/source/descriptions.hpp
@@ -55,12 +55,14 @@ extern string_view bridgeMedallions;
 extern string_view bridgeRewards;
 extern string_view bridgeDungeons;
 extern string_view bridgeTokens;
+extern string_view bridgeHearts;
 
 extern string_view bridgeStoneCountDesc;
 extern string_view bridgeMedallionCountDesc;
 extern string_view bridgeRewardCountDesc;
 extern string_view bridgeDungeonCountDesc;
 extern string_view bridgeTokenCountDesc;
+extern string_view bridgeHeartCountDesc;
 
 extern string_view randomGanonsTrialsDesc;
 
@@ -207,6 +209,7 @@ extern string_view lacsStoneCountDesc;
 extern string_view lacsRewardCountDesc;
 extern string_view lacsDungeonCountDesc;
 extern string_view lacsTokenCountDesc;
+extern string_view lacsHeartCountDesc;
 
 extern string_view childStealthDesc;
 

diff --git a/source/hint_list.cpp b/source/hint_list.cpp
@@ -1855,6 +1855,15 @@ void HintTable_Init() {
                 /*german*/"Die Weisen werden darauf&warten, dass der Held #%d&|Skulltula-Symbol|Skulltula-Symbole|# sammelt."},
     });
 
+    hintTable[BRIDGE_HEARTS_HINT] = HintText::Bridge({
+                     // obscure text
+                     Text{"The awakened ones will await for the&Hero to collect #%d |Heart|Hearts|#.",
+                /*french*/"Les êtres de sagesse attendront le&héros muni de #%d |cœur|cœurs|#.",
+               /*spanish*/"Los sabios aguardarán a que el héroe&obtenga #%d |corazón|corazones|#.",
+               /*italian*/"I Saggi aspetteranno che l'Eroe&ottenga #%d |cuore|cuori|#.",
+                /*german*/"Die Weisen werden darauf&warten, dass der Held #%d&|Herz|Herzen|# sammelt."},
+    });
+
     /*--------------------------
     | GANON BOSS KEY HINT TEXT |
     ---------------------------*/
@@ -1979,6 +1988,15 @@ void HintTable_Init() {
                /*italian*/"E la chiave del #re del male# sarà&ricevuta da Zelda dopo aver ottenuto&#%d |teschio|teschi| d'oro#.",
                 /*german*/"Und der #Schlüssel des Bösen# wird&von Zelda verliehen, sobald #%d&|Skulltula-Symbol# gesammelt wurde|Skulltula-Symbole# gesammelt wurden|."},
     });
+
+    hintTable[LACS_HEARTS_HINT] = HintText::LACS({
+                     // obscure text                                                     singular  plural
+                     Text{"And the #evil one#'s key will be&provided by Zelda once #%d |Heart#&is|Hearts#&are| retrieved.",
+                /*french*/"Aussi, Zelda crééra la clé du&#Malin# avec #%d |cœur|cœurs|#.",
+               /*spanish*/"Y Zelda entregará la llave&del #señor del mal# tras obtener&#%d |corazón|corazones|#.",
+               /*italian*/"E la chiave del #re del male# sarà&ricevuta da Zelda dopo aver ottenuto&#%d |cuore|cuori|#.",
+                /*german*/"Und der #Schlüssel des Bösen# wird&von Zelda verliehen, sobald #%d&|Herz# gesammelt wurde|Herzen# gesammelt wurden|."},
+    });
     /*--------------------------
     |     TRIAL HINT TEXT      |
     ---------------------------*/

diff --git a/source/hints.cpp b/source/hints.cpp
@@ -666,6 +666,9 @@ static Text BuildBridgeReqsText() {
 
     } else if (Bridge.Is(RAINBOWBRIDGE_TOKENS)) {
         bridgeText = BuildCountReq(BRIDGE_TOKENS_HINT, BridgeTokenCount);
+
+    } else if (Bridge.Is(RAINBOWBRIDGE_HEARTS)) {
+        bridgeText = BuildCountReq(BRIDGE_HEARTS_HINT, BridgeHeartCount);
     }
 
     return Text() + ITEM_OBTAINED(ITEM_ARROW_LIGHT) + bridgeText + "^";
@@ -709,6 +712,9 @@ static Text BuildGanonBossKeyText() {
 
     } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_TOKENS)) {
         ganonBossKeyText = BuildCountReq(LACS_TOKENS_HINT, LACSTokenCount);
+
+    } else if (GanonsBossKey.Is(GANONSBOSSKEY_LACS_HEARTS)) {
+        ganonBossKeyText = BuildCountReq(LACS_HEARTS_HINT, LACSHeartCount);
     }
 
     return Text() + ITEM_OBTAINED(ITEM_KEY_BOSS) + ganonBossKeyText + "^";

diff --git a/source/keys.hpp b/source/keys.hpp
@@ -1674,6 +1674,7 @@ typedef enum {
     BRIDGE_REWARDS_HINT,
     BRIDGE_DUNGEONS_HINT,
     BRIDGE_TOKENS_HINT,
+    BRIDGE_HEARTS_HINT,
 
     GANON_BK_START_WITH_HINT,
     GANON_BK_VANILLA_HINT,
@@ -1689,6 +1690,7 @@ typedef enum {
     LACS_REWARDS_HINT,
     LACS_DUNGEONS_HINT,
     LACS_TOKENS_HINT,
+    LACS_HEARTS_HINT,
 
     SIX_TRIALS,
     ZERO_TRIALS,

diff --git a/source/logic.cpp b/source/logic.cpp
@@ -812,15 +812,17 @@ void UpdateHelpers() {
         (Bridge.Is(RAINBOWBRIDGE_MEDALLIONS) && MedallionCount >= BridgeMedallionCount.Value<u8>()) ||
         (Bridge.Is(RAINBOWBRIDGE_REWARDS) && StoneCount + MedallionCount >= BridgeRewardCount.Value<u8>()) ||
         (Bridge.Is(RAINBOWBRIDGE_DUNGEONS) && DungeonCount >= BridgeDungeonCount.Value<u8>()) ||
-        (Bridge.Is(RAINBOWBRIDGE_TOKENS) && GoldSkulltulaTokens >= BridgeTokenCount.Value<u8>());
+        (Bridge.Is(RAINBOWBRIDGE_TOKENS) && GoldSkulltulaTokens >= BridgeTokenCount.Value<u8>()) ||
+        (Bridge.Is(RAINBOWBRIDGE_HEARTS) && Hearts >= BridgeHeartCount.Value<u8>());
 
     CanTriggerLACS =
         (LACSCondition == LACSCONDITION_VANILLA && ShadowMedallion && SpiritMedallion) ||
         (LACSCondition == LACSCONDITION_STONES && StoneCount >= LACSStoneCount.Value<u8>()) ||
         (LACSCondition == LACSCONDITION_MEDALLIONS && MedallionCount >= LACSMedallionCount.Value<u8>()) ||
         (LACSCondition == LACSCONDITION_REWARDS && StoneCount + MedallionCount >= LACSRewardCount.Value<u8>()) ||
         (LACSCondition == LACSCONDITION_DUNGEONS && DungeonCount >= LACSDungeonCount.Value<u8>()) ||
-        (LACSCondition == LACSCONDITION_TOKENS && GoldSkulltulaTokens >= LACSTokenCount.Value<u8>());
+        (LACSCondition == LACSCONDITION_TOKENS && GoldSkulltulaTokens >= LACSTokenCount.Value<u8>()) ||
+        (LACSCondition == LACSCONDITION_HEARTS && Hearts >= LACSHeartCount.Value<u8>());
 }
 
 bool SmallKeys(Key dungeon, u8 requiredAmount) {

diff --git a/source/menu.cpp b/source/menu.cpp
@@ -204,7 +204,10 @@ void MoveCursor(u32 kDown, bool updatedByHeld) {
 
 void MenuUpdate(u32 kDown, bool updatedByHeld) {
     consoleSelect(&bottomScreen);
-    consoleClear();
+    if (currentMenu->mode != POST_GENERATE || (kDown & KEY_B)) {
+        // Don't clear console if ValidateSettings printed error
+        consoleClear();
+    }
 
     // Check for menu change
     // If user pressed A on a non-option, non-action menu, they're navigating to a new menu
@@ -707,6 +710,10 @@ static void RestoreOverrides() {
 
 void GenerateRandomizer() {
 
+    if (!Settings::ValidateSettings()) {
+        return;
+    }
+
     consoleSelect(&topScreen);
     consoleClear();
     printf("\x1b[6;10HCaching Settings...");