greg bridge in logic (#2460)

* greg bridge in logic

---------

Co-authored-by: briaguya <briaguya@alice>
This commit is contained in:
briaguya
2023-02-16 21:53:08 -05:00
committed by GitHub
parent 3d8752b3aa
commit 68c8f50a71
11 changed files with 37 additions and 6 deletions

View File

@@ -120,6 +120,9 @@ namespace Logic {
bool ShadowTrialClear = false;
bool LightTrialClear = false;
//Greg
bool Greg = false;
//Progressive Items
uint8_t ProgressiveBulletBag = 0;
uint8_t ProgressiveBombBag = 0;
@@ -781,7 +784,8 @@ namespace Logic {
(Bridge.Is(RAINBOWBRIDGE_MEDALLIONS) && MedallionCount >= BridgeMedallionCount.Value<uint8_t>()) ||
(Bridge.Is(RAINBOWBRIDGE_REWARDS) && StoneCount + MedallionCount >= BridgeRewardCount.Value<uint8_t>()) ||
(Bridge.Is(RAINBOWBRIDGE_DUNGEONS) && DungeonCount >= BridgeDungeonCount.Value<uint8_t>()) ||
(Bridge.Is(RAINBOWBRIDGE_TOKENS) && GoldSkulltulaTokens >= BridgeTokenCount.Value<uint8_t>());
(Bridge.Is(RAINBOWBRIDGE_TOKENS) && GoldSkulltulaTokens >= BridgeTokenCount.Value<uint8_t>()) ||
(Bridge.Is(RAINBOWBRIDGE_GREG) && Greg);
CanTriggerLACS = (LACSCondition == LACSCONDITION_VANILLA && ShadowMedallion && SpiritMedallion) ||
(LACSCondition == LACSCONDITION_STONES && StoneCount >= LACSStoneCount.Value<uint8_t>()) ||
@@ -998,6 +1002,9 @@ namespace Logic {
ShadowTrialClear = false;
LightTrialClear = false;
//Greg
Greg = false;
//Progressive Items
ProgressiveBulletBag = 0;
ProgressiveBombBag = 0;