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

Rework boss soul helper

Browse source
This commit is contained in:
Ralphie Morell 2023-10-27 00:48:36 -04:00
commit 2e50fbb0d2
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -478,16 +478,28 @@ namespace Logic {
if (ShuffleBossSouls.Is(BOSSSOULS_OFF)) { if (ShuffleBossSouls.Is(BOSSSOULS_OFF)) {
return true; return true;
} }
return (itemName == RG_GOHMA_SOUL && CanSummonGohma) || switch(itemName) {
(itemName == RG_KING_DODONGO_SOUL && CanSummonKingDodongo) || case RG_GOHMA_SOUL:
(itemName == RG_BARINADE_SOUL && CanSummonBarinade) || return CanSummonGohma; break;
(itemName == RG_PHANTOM_GANON_SOUL && CanSummonPhantomGanon) || case RG_KING_DODONGO_SOUL:
(itemName == RG_VOLVAGIA_SOUL && CanSummonVolvagia) || return CanSummonKingDodongo; break;
(itemName == RG_MORPHA_SOUL && CanSummonMorpha) || case RG_BARINADE_SOUL:
(itemName == RG_MORPHA_SOUL && CanSummonBongoBongo) || return CanSummonBarinade; break;
(itemName == RG_TWINROVA_SOUL && CanSummonTwinrova) || case RG_PHANTOM_GANON_SOUL:
(itemName == RG_GANON_SOUL && CanSummonGanon); return CanSummonPhantomGanon; break;
case RG_VOLVAGIA_SOUL:
return CanSummonVolvagia; break;
case RG_MORPHA_SOUL:
return CanSummonMorpha; break;
case RG_BONGO_BONGO_SOUL:
return CanSummonBongoBongo; break;
case RG_TWINROVA_SOUL:
return CanSummonTwinrova; break;
case RG_GANON_SOUL:
return ShuffleBossSouls.Is(BOSSSOULS_ON_PLUS_GANON) ? CanSummonGanon : true;
break;
default: break;
}
} }
uint8_t GetDifficultyValueFromString(Option& glitchOption) { uint8_t GetDifficultyValueFromString(Option& glitchOption) {