github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 05:43:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge pt 2

Browse source
This commit is contained in:
Ralphie Morell 2023-10-19 21:21:00 -04:00
commit 4d31463044
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
soh/soh/Enhancements/randomizer/3drando/logic.cpp
View file

@ -474,22 +474,22 @@ namespace Logic {
(age == HasProjectileAge::Either && (Slingshot || Boomerang || Hookshot || Bow)); (age == HasProjectileAge::Either && (Slingshot || Boomerang || Hookshot || Bow));
} }
bool HasBossSoul(uint32_t itemName) { bool HasBossSoul(RandomizerGet itemName) {
if (ShuffleBossSouls.Is(BOSSSOULS_OFF)) { if (ShuffleBossSouls.Is(BOSSSOULS_OFF)) {
return true; return true;
} }
if (ShuffleBossSouls.IsNot(BOSSSOULS_ON_PLUS_GANON) && itemName == GANON_BOSS_SOUL) { if (ShuffleBossSouls.IsNot(BOSSSOULS_ON_PLUS_GANON) && itemName == RG_GANON_SOUL) {
return true; return true;
} }
return (itemName == GOHMA_BOSS_SOUL && CanSummonGohma) || return (itemName == RG_GOHMA_SOUL && CanSummonGohma) ||
(itemName == KING_DODONGO_BOSS_SOUL && CanSummonKingDodongo) || (itemName == RG_KING_DODONGO_SOUL && CanSummonKingDodongo) ||
(itemName == BARINADE_BOSS_SOUL && CanSummonBarinade) || (itemName == RG_BARINADE_SOUL && CanSummonBarinade) ||
(itemName == PHANTOM_GANON_BOSS_SOUL && CanSummonPhantomGanon) || (itemName == RG_PHANTOM_GANON_SOUL && CanSummonPhantomGanon) ||
(itemName == VOLVAGIA_BOSS_SOUL && CanSummonVolvagia) || (itemName == RG_VOLVAGIA_SOUL && CanSummonVolvagia) ||
(itemName == MORPHA_BOSS_SOUL && CanSummonMorpha) || (itemName == RG_MORPHA_SOUL && CanSummonMorpha) ||
(itemName == BONGO_BONGO_BOSS_SOUL && CanSummonBongoBongo) || (itemName == RG_MORPHA_SOUL && CanSummonBongoBongo) ||
(itemName == TWINROVA_BOSS_SOUL && CanSummonTwinrova) || (itemName == RG_TWINROVA_SOUL && CanSummonTwinrova) ||
(ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON) && (itemName == GANON_BOSS_SOUL && CanSummonGanon)); (ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON) && (itemName == RG_GANON_SOUL && CanSummonGanon));
} }

1
soh/soh/Enhancements/randomizer/3drando/logic.hpp
View file

@ -377,6 +377,7 @@ void UpdateHelpers();
bool CanPlay(bool song); bool CanPlay(bool song);
bool CanUse(RandomizerGet itemName); bool CanUse(RandomizerGet itemName);
bool HasProjectile(HasProjectileAge age); bool HasProjectile(HasProjectileAge age);
bool HasBossSoul(RandomizerGet itemName);
bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount); bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount);
bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched); bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
bool CanDoGlitch(GlitchType glitch); bool CanDoGlitch(GlitchType glitch);

9
soh/soh/Enhancements/randomizer/randomizerTypes.h
View file

@ -3009,6 +3009,15 @@ typedef enum {
RHT_DEKU_STICK_CAPACITY_20, RHT_DEKU_STICK_CAPACITY_20,
RHT_DEKU_STICK_CAPACITY_30, RHT_DEKU_STICK_CAPACITY_30,
RHT_TRIFORCE_PIECE, RHT_TRIFORCE_PIECE,
RHT_GOHMA_SOUL,
RHT_KING_DODONGO_SOUL,
RHT_BARINADE_SOUL,
RHT_PHANTOM_GANON_SOUL,
RHT_VOLVAGIA_SOUL,
RHT_MORPHA_SOUL,
RHT_BONGO_BONGO_SOUL,
RHT_TWINROVA_SOUL,
RHT_GANON_SOUL,
RHT_EPONA, RHT_EPONA,
// Entrances // Entrances
RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO, RHT_DESERT_COLOSSUS_TO_COLOSSUS_GROTTO,