Implement blast mask cooldown changes. Includes new comfort menu. (#57)

Z3DR · Feb 22, 2024 · 82d9ec6 · 82d9ec6
1 parent 26a4184
commit 82d9ec6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/Z3DR b/Z3DR
diff --git a/source/setting_descriptions.cpp b/source/setting_descriptions.cpp
@@ -393,17 +393,13 @@ string_view removeDDDesc              = "If set the double defense item will be
 /*------------------------------                                                           //
 |     BLAST MASK COOLDOWN      |                                                           //
 ------------------------------*/                                                           //
-string_view blastDefault              = "**OPTION CURRENTLY WIP**\n"                       //
-                                        "Sets the cooldown time on the blastmask to \n"    //
+string_view blastDefault              = "Sets the cooldown time on the blastmask to \n"    //
                                         "the default cooldown time of 10 seconds";         //
-string_view blastInstant              = "**OPTION CURRENTLY WIP**\n"                       //
-                                        "Sets the cooldown time on the blastmask to \n"    //
+string_view blastInstant              = "Sets the cooldown time on the blastmask to \n"    //
                                         "have no cooldown time";                           //
-string_view blastVeryShort            = "**OPTION CURRENTLY WIP**\n"                       //
-                                        "Sets the cooldown time on the blastmask to \n"    //
-                                        "have an even shorter cooldown time of 1 second";  //
-string_view blastShort                = "**OPTION CURRENTLY WIP**\n"                       //
-                                        "Sets the cooldown time on the blastmask to \n"    //
+string_view blastVeryShort            = "Sets the cooldown time on the blastmask to \n"    //
+                                        "have an even shorter cooldown time of 3 seconds"; //
+string_view blastShort                = "Sets the cooldown time on the blastmask to \n"    //
                                         "have a shorter cooldown time of 5 seconds";       //
 string_view blastLong                 = "**OPTION CURRENTLY WIP**\n"                       //
                                         "Sets the cooldown time on the blastmask to \n"    //

diff --git a/source/settings.cpp b/source/settings.cpp
@@ -360,7 +360,7 @@ namespace Settings {
 
   /*COMFORT*/
 
-  Option BlastMaskCooldown      = Option::U8("Blast Mask Cooldown",        { "Default", "Instant", "Very Short", "Short", "Long", "Very Long" }, { blastDefault, blastInstant, blastVeryShort, blastShort, blastLong, blastVeryLong });
+  Option BlastMaskCooldown      = Option::U8("Blast Mask Cooldown",        {"Default", "Short", "Very Short", "Instant"},                        { blastDefault, blastShort, blastVeryShort, blastInstant });
   Option UnderwaterOcarina      = Option::Bool("Underwater Ocarina",       { "No","Yes" },                                                       { underwaterOcarinaDesc },                                                         OptionCategory::Toggle);
   Option FierceDeityAnywhere    = Option::Bool("Fierce Deity Anywhere",    { "No","Yes" },                                                       { fierceDeityAnywhereDesc },                                                       OptionCategory::Toggle);
   Option ProgressiveGildedSword = Option::Bool("Progressive Gilded Sword", { "Off", "On" },                                                      { progressiveGildedSwordDesc });
@@ -372,12 +372,12 @@ namespace Settings {
   std::vector<Option*> comfortOptions = {
 
      &BlastMaskCooldown,
-     &UnderwaterOcarina,
-     &FierceDeityAnywhere,
+     // &UnderwaterOcarina,
+     // &FierceDeityAnywhere,
      //&ProgressiveGildedSword,
-     &StartingSpin,
-     &AmmoDrops,
-     &HeartDropRefills,
+     // &StartingSpin,
+     // &AmmoDrops,
+     // &HeartDropRefills,
      //&BombchusInLogic,
   };
 
@@ -543,7 +543,7 @@ namespace Settings {
 
 
   //Menu mainSettings = Menu::SubMenu("Main Settings", &mainSettingsOptions);
-  Menu comfort = Menu::SubMenu("Comfort", &comfortOptions);
+  Menu comfort = Menu::SubMenu("Comfort Settings", &comfortOptions);
   Menu restorationSettings = Menu::SubMenu("Restoration Settings", &restorationOptions);
   Menu cutsceneSettings = Menu::SubMenu("Cutscene Settings", &cutsceneOptions);
   Menu settingsPresets          = Menu::SubMenu("Settings Presets",           &settingsPresetItems);
@@ -563,7 +563,7 @@ namespace Settings {
     &itemPool,
     &startingInventory,
     &detailLogic,
-    //&comfort,
+    &comfort,
     &restorationSettings,
     &cutsceneSettings,
     &otherSettings,
@@ -637,7 +637,7 @@ namespace Settings {
     ctx.ingameSpoilers = (IngameSpoilers) ? 1 : 0;
     //ctx.menuOpeningButton = MenuOpeningButton.Value<u8>();
 
-    //ctx.blastMaskCooldown = BlastMaskCooldown.Value<u8>();
+    ctx.blastMaskCooldown = BlastMaskCooldown.Value<u8>();
     //ctx.underwaterOcarina = (UnderwaterOcarina) ? 1 : 0;
     //ctx.fierceDeityAnywhere = (FierceDeityAnywhere) ? 1 : 0;
     ctx.skipMinigamePhases = (SkipMinigamePhases) ? 1 : 0;
+15 −0		code/include/rnd/blastmask.h
+3 −0		code/include/rnd/settings.h
+4 −0		code/mm.ld
+33 −0		code/source/asm/hooks.s
+5 −0		code/source/asm/patches.s
+9 −0		code/source/rnd/blastmask.cpp