Skip to content

Commit

Permalink
Run automatic format script as code does not match clang format rules.
Browse files Browse the repository at this point in the history 
Developers please rebase to avoid merge conflicts!
  • Loading branch information
@gymnast86 @github-actions
gymnast86 authored and github-actions[bot] committed Nov 26, 2022
1 parent f8e36a7 commit 5bf50e0
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 63 deletions.
30 changes: 16 additions & 14 deletions source/location_access/locacc_castle_town.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,19 +413,21 @@ void AreaTable_Init_CastleTown() {
Entrance(MARKET_BACK_ALLEY, { [] { return true; } }),
});

areaTable[MARKET_DOG_LADY_HOUSE] = Area("Market Dog Lady House", "Market Dog Lady House", NONE, NO_DAY_NIGHT_CYCLE, {},
{
// Locations
LocationAccess(MARKET_LOST_DOG, { [] { return IsChild && AtNight; } }),
},
{
// Exits
Entrance(MARKET_BACK_ALLEY, { [] { return true; } }),
});
areaTable[MARKET_DOG_LADY_HOUSE] =
Area("Market Dog Lady House", "Market Dog Lady House", NONE, NO_DAY_NIGHT_CYCLE, {},
{
// Locations
LocationAccess(MARKET_LOST_DOG, { [] { return IsChild && AtNight; } }),
},
{
// Exits
Entrance(MARKET_BACK_ALLEY, { [] { return true; } }),
});

areaTable[MARKET_MAN_IN_GREEN_HOUSE] = Area("Market Man in Green House", "Market Man in Green House", NONE, NO_DAY_NIGHT_CYCLE, {}, {},
{
// Exits
Entrance(MARKET_BACK_ALLEY, { [] { return true; } }),
});
areaTable[MARKET_MAN_IN_GREEN_HOUSE] =
Area("Market Man in Green House", "Market Man in Green House", NONE, NO_DAY_NIGHT_CYCLE, {}, {},
{
// Exits
Entrance(MARKET_BACK_ALLEY, { [] { return true; } }),
});
}
21 changes: 11 additions & 10 deletions source/location_access/locacc_death_mountain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,17 @@ void AreaTable_Init_DeathMountain() {

});

areaTable[DMT_STORMS_GROTTO] = Area("DMT Storms Grotto", "DMT Storms Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents,
{
// Locations
LocationAccess(DMT_STORMS_GROTTO_CHEST, { [] { return true; } }),
LocationAccess(DMT_STORMS_GROTTO_GOSSIP_STONE, { [] { return true; } }),
},
{
// Exits
Entrance(DEATH_MOUNTAIN_TRAIL, { [] { return true; } }),
});
areaTable[DMT_STORMS_GROTTO] =
Area("DMT Storms Grotto", "DMT Storms Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents,
{
// Locations
LocationAccess(DMT_STORMS_GROTTO_CHEST, { [] { return true; } }),
LocationAccess(DMT_STORMS_GROTTO_GOSSIP_STONE, { [] { return true; } }),
},
{
// Exits
Entrance(DEATH_MOUNTAIN_TRAIL, { [] { return true; } }),
});

areaTable[DMT_GREAT_FAIRY_FOUNTAIN] =
Area("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", NONE, NO_DAY_NIGHT_CYCLE, {},
Expand Down
40 changes: 21 additions & 19 deletions source/location_access/locacc_hyrule_field.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,17 @@ void AreaTable_Init_HyruleField() {
[] { return Sticks && IsChild && CanDoGlitch(GlitchType::QPA, GlitchDifficulty::ADVANCED); } }),
});

areaTable[HF_SOUTHEAST_GROTTO] = Area("HF Southeast Grotto", "HF Southeast Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents,
{
// Locations
LocationAccess(HF_SOUTHEAST_GROTTO_CHEST, { [] { return true; } }),
LocationAccess(HF_SOUTHEAST_GROTTO_GOSSIP_STONE, { [] { return true; } }),
},
{
// Exits
Entrance(HYRULE_FIELD, { [] { return true; } }),
});
areaTable[HF_SOUTHEAST_GROTTO] =
Area("HF Southeast Grotto", "HF Southeast Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents,
{
// Locations
LocationAccess(HF_SOUTHEAST_GROTTO_CHEST, { [] { return true; } }),
LocationAccess(HF_SOUTHEAST_GROTTO_GOSSIP_STONE, { [] { return true; } }),
},
{
// Exits
Entrance(HYRULE_FIELD, { [] { return true; } }),
});

areaTable[HF_OPEN_GROTTO] = Area("HF Open Grotto", "HF Open Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents,
{
Expand All @@ -100,15 +101,16 @@ void AreaTable_Init_HyruleField() {
Entrance(HYRULE_FIELD, { [] { return true; } }),
});

areaTable[HF_INSIDE_FENCE_GROTTO] = Area("HF Inside Fence Grotto", "HF Inside Fence Grotto", NONE, NO_DAY_NIGHT_CYCLE, {},
{
// Locations
LocationAccess(HF_DEKU_SCRUB_GROTTO, { [] { return CanStunDeku; } }),
},
{
// Exits
Entrance(HYRULE_FIELD, { [] { return true; } }),
});
areaTable[HF_INSIDE_FENCE_GROTTO] =
Area("HF Inside Fence Grotto", "HF Inside Fence Grotto", NONE, NO_DAY_NIGHT_CYCLE, {},
{
// Locations
LocationAccess(HF_DEKU_SCRUB_GROTTO, { [] { return CanStunDeku; } }),
},
{
// Exits
Entrance(HYRULE_FIELD, { [] { return true; } }),
});

areaTable[HF_COW_GROTTO] = Area(
"HF Cow Grotto", "HF Cow Grotto", NONE, NO_DAY_NIGHT_CYCLE, grottoEvents,
Expand Down
32 changes: 17 additions & 15 deletions source/location_access/locacc_kakariko.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,16 +427,17 @@ void AreaTable_Init_Kakariko() {
} }),
});

areaTable[GRAVEYARD_SHIELD_GRAVE] = Area("Graveyard Shield Grave", "Graveyard Shield Grave", NONE, NO_DAY_NIGHT_CYCLE, {},
{
// Locations
LocationAccess(GRAVEYARD_SHIELD_GRAVE_CHEST, { [] { return true; } }),
// Free Fairies
},
{
// Exits
Entrance(THE_GRAVEYARD, { [] { return true; } }),
});
areaTable[GRAVEYARD_SHIELD_GRAVE] =
Area("Graveyard Shield Grave", "Graveyard Shield Grave", NONE, NO_DAY_NIGHT_CYCLE, {},
{
// Locations
LocationAccess(GRAVEYARD_SHIELD_GRAVE_CHEST, { [] { return true; } }),
// Free Fairies
},
{
// Exits
Entrance(THE_GRAVEYARD, { [] { return true; } }),
});

areaTable[GRAVEYARD_HEART_PIECE_GRAVE] =
Area("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", NONE, NO_DAY_NIGHT_CYCLE, {},
Expand Down Expand Up @@ -516,11 +517,12 @@ void AreaTable_Init_Kakariko() {
} }),
});

areaTable[GRAVEYARD_DAMPES_HOUSE] = Area("Graveyard Dampes House", "Graveyard Dampes House", NONE, NO_DAY_NIGHT_CYCLE, {}, {},
{
// Exits
Entrance(THE_GRAVEYARD, { [] { return true; } }),
});
areaTable[GRAVEYARD_DAMPES_HOUSE] =
Area("Graveyard Dampes House", "Graveyard Dampes House", NONE, NO_DAY_NIGHT_CYCLE, {}, {},
{
// Exits
Entrance(THE_GRAVEYARD, { [] { return true; } }),
});

areaTable[GRAVEYARD_WARP_PAD_REGION] = Area(
"Graveyard Warp Pad Region", "Graveyard", THE_GRAVEYARD, NO_DAY_NIGHT_CYCLE,
Expand Down
11 changes: 6 additions & 5 deletions source/location_access/locacc_lost_woods.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,12 @@ void AreaTable_Init_LostWoods() {
Entrance(KOKIRI_FOREST, { [] { return true; } }),
});

areaTable[KF_KNOW_IT_ALL_HOUSE] = Area("KF Know It All House", "KF Know It All House", NONE, NO_DAY_NIGHT_CYCLE, {}, {},
{
// Exits
Entrance(KOKIRI_FOREST, { [] { return true; } }),
});
areaTable[KF_KNOW_IT_ALL_HOUSE] =
Area("KF Know It All House", "KF Know It All House", NONE, NO_DAY_NIGHT_CYCLE, {}, {},
{
// Exits
Entrance(KOKIRI_FOREST, { [] { return true; } }),
});

areaTable[KF_KOKIRI_SHOP] = Area("KF Kokiri Shop", "KF Kokiri Shop", NONE, NO_DAY_NIGHT_CYCLE, {},
{
Expand Down

0 comments on commit 5bf50e0

Please sign in to comment.