mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-08-13 17:03:47 -04:00
Fix: MQ logic for Ganons Castle main area (#3275)
* fix mq logic for ganons castle main area * update logic to use logic helpers * add hammer check * grouping
This commit is contained in:
parent
02afac704e
commit
6d8dfe7933
@ -1542,6 +1542,7 @@ typedef enum {
|
|||||||
GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT,
|
GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT,
|
||||||
|
|
||||||
GANONS_CASTLE_LOBBY,
|
GANONS_CASTLE_LOBBY,
|
||||||
|
GANONS_CASTLE_MAIN,
|
||||||
GANONS_CASTLE_DEKU_SCRUBS,
|
GANONS_CASTLE_DEKU_SCRUBS,
|
||||||
GANONS_CASTLE_FOREST_TRIAL,
|
GANONS_CASTLE_FOREST_TRIAL,
|
||||||
GANONS_CASTLE_FIRE_TRIAL,
|
GANONS_CASTLE_FIRE_TRIAL,
|
||||||
@ -1552,6 +1553,7 @@ typedef enum {
|
|||||||
GANONS_CASTLE_TOWER,
|
GANONS_CASTLE_TOWER,
|
||||||
|
|
||||||
GANONS_CASTLE_MQ_LOBBY,
|
GANONS_CASTLE_MQ_LOBBY,
|
||||||
|
GANONS_CASTLE_MQ_MAIN,
|
||||||
GANONS_CASTLE_MQ_DEKU_SCRUBS,
|
GANONS_CASTLE_MQ_DEKU_SCRUBS,
|
||||||
GANONS_CASTLE_MQ_FOREST_TRIAL,
|
GANONS_CASTLE_MQ_FOREST_TRIAL,
|
||||||
GANONS_CASTLE_MQ_FIRE_TRIAL,
|
GANONS_CASTLE_MQ_FIRE_TRIAL,
|
||||||
|
@ -25,6 +25,12 @@ void AreaTable_Init_GanonsCastle() {
|
|||||||
areaTable[GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
|
areaTable[GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
|
||||||
//Exits
|
//Exits
|
||||||
Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return true;}}),
|
Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return true;}}),
|
||||||
|
Entrance(GANONS_CASTLE_MAIN, {[]{return true;}}),
|
||||||
|
});
|
||||||
|
|
||||||
|
areaTable[GANONS_CASTLE_MAIN] = Area("Ganon's Castle Main", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
|
||||||
|
//Exits
|
||||||
|
Entrance(GANONS_CASTLE_LOBBY, {[]{return true;}}),
|
||||||
Entrance(GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}),
|
Entrance(GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}),
|
||||||
Entrance(GANONS_CASTLE_FIRE_TRIAL, {[]{return true;}}),
|
Entrance(GANONS_CASTLE_FIRE_TRIAL, {[]{return true;}}),
|
||||||
Entrance(GANONS_CASTLE_WATER_TRIAL, {[]{return true;}}),
|
Entrance(GANONS_CASTLE_WATER_TRIAL, {[]{return true;}}),
|
||||||
@ -123,7 +129,13 @@ void AreaTable_Init_GanonsCastle() {
|
|||||||
if (Dungeon::GanonsCastle.IsMQ()) {
|
if (Dungeon::GanonsCastle.IsMQ()) {
|
||||||
areaTable[GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
|
areaTable[GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
|
||||||
//Exits
|
//Exits
|
||||||
Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return (CanUse(MASTER_SWORD) || (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword))));}}),
|
Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return true;}}),
|
||||||
|
Entrance(GANONS_CASTLE_MQ_MAIN, {[]{return (CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER)) || ((HasExplosives || Nuts || CanUse(BOOMERANG)) && CanJumpslash);}}),
|
||||||
|
});
|
||||||
|
|
||||||
|
areaTable[GANONS_CASTLE_MQ_MAIN] = Area("Ganon's Castle MQ Main", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
|
||||||
|
//Exits
|
||||||
|
Entrance(GANONS_CASTLE_MQ_LOBBY, {[]{return true;}}),
|
||||||
Entrance(GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),
|
Entrance(GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),
|
||||||
Entrance(GANONS_CASTLE_MQ_FIRE_TRIAL, {[]{return true;}}),
|
Entrance(GANONS_CASTLE_MQ_FIRE_TRIAL, {[]{return true;}}),
|
||||||
Entrance(GANONS_CASTLE_MQ_WATER_TRIAL, {[]{return true;}}),
|
Entrance(GANONS_CASTLE_MQ_WATER_TRIAL, {[]{return true;}}),
|
||||||
|
Loading…
Reference in New Issue
Block a user