Merge pull request #105 from gymnast86/logic

App:Various minor fixes
gamestabled · Apr 10, 2021 · e598976 · e598976
2 parents 3c72a23 + 3fd91cf
commit e598976
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 16 deletions.
diff --git a/code/src/item_effect.c b/code/src/item_effect.c
@@ -173,11 +173,11 @@ void ItemEffect_PlaceMagicArrowsInInventory(SaveContext* saveCtx, s16 arg1, s16
         ResetItemSlotsIfMatchesID(ItemSlots[ITEM_ARROW_ICE]);
         ResetItemSlotsIfMatchesID(ItemSlots[ITEM_ARROW_LIGHT]);
     } else if (saveCtx->items[ItemSlots[ITEM_BOW]] == ITEM_NONE) {
-        if (arg1 == 1) { // Fire Arrow
+        if (arg1 == 1 && saveCtx->items[ItemSlots[ITEM_ARROW_FIRE]] == ITEM_NONE) { // Fire Arrow
             PushSlotIntoInventoryMenu(ItemSlots[ITEM_ARROW_FIRE]);
-        } else if (arg1 == 2) { // Ice Arrow
+        } else if (arg1 == 2 && saveCtx->items[ItemSlots[ITEM_ARROW_ICE]] == ITEM_NONE) { // Ice Arrow
             PushSlotIntoInventoryMenu(ItemSlots[ITEM_ARROW_ICE]);
-        } else if (arg1 == 3) { // Light Arrow
+        } else if (arg1 == 3 && saveCtx->items[ItemSlots[ITEM_ARROW_LIGHT]] == ITEM_NONE) { // Light Arrow
             PushSlotIntoInventoryMenu(ItemSlots[ITEM_ARROW_LIGHT]);
         }
     }

diff --git a/code/src/settings.h b/code/src/settings.h
@@ -138,6 +138,11 @@ typedef enum {
   EXCLUDE,
 } ExcludeLocationSetting;
 
+typedef enum {
+  TRICK_DISABLED,
+  TRICK_ENABLED,
+} LogicTrickSetting;
+
 typedef enum {
   DAMAGEMULTIPLIER_HALF,
   DAMAGEMULTIPLIER_DEFAULT,

diff --git a/source/fill.cpp b/source/fill.cpp
@@ -231,14 +231,14 @@ static std::vector<ItemLocation*> GetAccessibleLocations(std::vector<ItemLocatio
                 }
               }
               //Triforce has been found, seed is beatable, nothing else in this or future spheres matters
-              else if (location->GetPlacedItem().GetName() == "Triforce") {
+              else if (location->GetPlacedItem() == I_Triforce) {
                 sphere.clear();
                 sphere.push_back(location);
                 playthroughBeatable = true;
               }
             }
             //All we care about is if the game is beatable, used to pare down playthrough
-            else if (mode == CHECK_BEATABLE && location->GetPlacedItem().GetName() == "Triforce") {
+            else if (mode == CHECK_BEATABLE && location->GetPlacedItem() == I_Triforce) {
               playthroughBeatable = true;
               return {}; //Return early for efficiency
             }

diff --git a/source/location_access.cpp b/source/location_access.cpp
@@ -2045,9 +2045,12 @@ namespace Exits { //name, scene, hint, events, locations, exits
 
   Exit SpiritTemple_ChildClimb = Exit("Child Spirit Temple Climb", "Spirit Temple", "", NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  ItemLocationPairing(&SpiritTemple_ChildClimbNorthChest, []{return HasProjectile("Both") || ((SmallKeys(SpiritTempleKeys, 3) || (SmallKeys(SpiritTempleKeys, 2) && BombchusInLogic && !ShuffleDungeonEntrances)) && CanUse(CanUseItem::Silver_Gauntlets) && HasProjectile("Adult")) || (SmallKeys(SpiritTempleKeys, 5) && IsChild && HasProjectile("Child"));}),
-                  ItemLocationPairing(&SpiritTemple_ChildClimbEastChest,  []{return HasProjectile("Both") || ((SmallKeys(SpiritTempleKeys, 3) || (SmallKeys(SpiritTempleKeys, 2) && BombchusInLogic && !ShuffleDungeonEntrances)) && CanUse(CanUseItem::Silver_Gauntlets) && HasProjectile("Adult")) || (SmallKeys(SpiritTempleKeys, 5) && IsChild && HasProjectile("Child"));}),
-                  ItemLocationPairing(&SpiritTemple_GS_SunOnFloorRoom,    []{return HasProjectile("Both") || CanUse(CanUseItem::Dins_Fire) || ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) || Fairy || CanUse(CanUseItem::Nayrus_Love)) && (Sticks || KokiriSword || HasProjectile("Child"))) || (IsChild && SmallKeys(SpiritTempleKeys, 5) && HasProjectile("Child")) || ((SmallKeys(SpiritTempleKeys, 3) || (SmallKeys(SpiritTempleKeys, 2) && BombchusInLogic && !ShuffleDungeonEntrances)) && CanUse(CanUseItem::Silver_Gauntlets) && (HasProjectile("Adult") || DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) || Fairy || CanUse(CanUseItem::Nayrus_Love)));}),
+                  ItemLocationPairing(&SpiritTemple_ChildClimbNorthChest, []{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(SpiritTempleKeys, 3) || (SmallKeys(SpiritTempleKeys, 2) && BombchusInLogic && !ShuffleDungeonEntrances)) && CanUse(CanUseItem::Silver_Gauntlets) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(SpiritTempleKeys, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}),
+                  ItemLocationPairing(&SpiritTemple_ChildClimbEastChest,  []{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(SpiritTempleKeys, 3) || (SmallKeys(SpiritTempleKeys, 2) && BombchusInLogic && !ShuffleDungeonEntrances)) && CanUse(CanUseItem::Silver_Gauntlets) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(SpiritTempleKeys, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}),
+                  ItemLocationPairing(&SpiritTemple_GS_SunOnFloorRoom,    []{return HasProjectile(HasProjectileAge::Both) || CanUse(CanUseItem::Dins_Fire) ||
+                                                                                      ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) || Fairy || CanUse(CanUseItem::Nayrus_Love)) && (Sticks || KokiriSword || HasProjectile(HasProjectileAge::Child))) ||
+                                                                                        (IsChild && SmallKeys(SpiritTempleKeys, 5) && HasProjectile(HasProjectileAge::Child)) ||
+                                                                                          ((SmallKeys(SpiritTempleKeys, 3) || (SmallKeys(SpiritTempleKeys, 2) && BombchusInLogic && !ShuffleDungeonEntrances)) && CanUse(CanUseItem::Silver_Gauntlets) && (HasProjectile(HasProjectileAge::Adult) || DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) || Fairy || CanUse(CanUseItem::Nayrus_Love)));}),
                 }, {
                   //Exits
                   ExitPairing::Both(&SpiritTemple_CentralChamber, []{return HasExplosives;}),

diff --git a/source/logic.cpp b/source/logic.cpp
@@ -382,12 +382,12 @@ namespace Logic {
            (IsChildItem(itemName)  && HasItem(itemName) && IsChild);
   }
 
-  bool HasProjectile(std::string_view age) {
+  bool HasProjectile(HasProjectileAge age) {
     return HasExplosives ||
-           (age == "Child"  && (Slingshot || Boomerang)) ||
-           (age == "Adult"  && (Hookshot  || Bow      )) ||
-           (age == "Both"   && (Slingshot || Boomerang)  && (Hookshot || Bow)) ||
-           (age == "Either" && (Slingshot || Boomerang   ||  Hookshot || Bow));
+           (age == HasProjectileAge::Child  && (Slingshot || Boomerang)) ||
+           (age == HasProjectileAge::Adult  && (Hookshot  || Bow      )) ||
+           (age == HasProjectileAge::Both   && (Slingshot || Boomerang)  && (Hookshot || Bow)) ||
+           (age == HasProjectileAge::Either && (Slingshot || Boomerang   ||  Hookshot || Bow));
   }
 
   //Updates all logic helpers. Should be called whenever a non-helper is changed

diff --git a/source/logic.hpp b/source/logic.hpp
@@ -313,10 +313,17 @@ namespace Logic {
     Light_Arrows,
   };
 
+  enum class HasProjectileAge {
+    Adult,
+    Child,
+    Both,
+    Either,
+  };
+
   extern void UpdateHelpers();
   extern bool CanPlay(bool song);
   extern bool CanUse(CanUseItem itemName);
-  extern bool HasProjectile(std::string_view age);
+  extern bool HasProjectile(HasProjectileAge age);
   extern bool SmallKeys(u8 dungeonKeyCount, u8 requiredAmount);
   extern bool EventsUpdated();
   extern void LogicReset();

diff --git a/source/spoiler_log.cpp b/source/spoiler_log.cpp
@@ -121,7 +121,7 @@ static void WriteSettings() {
   //List Excluded Locations
   logtxt += "\nExcluded Locations:\n";
   for (auto& l : Settings::excludeLocationsOptions) {
-    if (l->GetSelectedOptionText() == "Exclude") {
+    if (l->GetSelectedOptionIndex() == EXCLUDE) {
       std::string name = l->GetName().data();
 
       //get rid of newline characters if necessary
@@ -137,7 +137,7 @@ static void WriteSettings() {
   //List Enabled Tricks
   logtxt += "\nEnabled Tricks:\n";
   for (auto& l : Settings::detailedLogicOptions) {
-    if (l->GetSelectedOptionText() == "Enabled" && l->IsCategory(OptionCategory::Setting)) {
+    if (l->GetSelectedOptionIndex() == TRICK_ENABLED && l->IsCategory(OptionCategory::Setting)) {
       std::string name = l->GetName().data();
 
       //get rid of newline characters if necessary