Skip to content

Hide Goddess Cubes if the corresponding chest is nonprogress #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YourAverageLink wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Hide Goddess Cubes if the corresponding chest is nonprogress #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a348d5c
Hide cubes if the corresponding chest is nonprogress
YourAverageLink Sep 16, 2023
de0584a
Merge branch 'main' into rework-cubes
YourAverageLink Oct 13, 2023
1f60359
implement lepe's refactor
YourAverageLink Nov 17, 2023
5f95933
remove potentialBannedLocations
YourAverageLink Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 27 additions & 54 deletions src/data/goddessCubes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,163 +2,136 @@
"Goddess Cube on West Great Tree near Exit": {
"displayName": "Goddess Cube on West Great Tree near Exit",
"area": "Faron Woods",
"needs": "Can Access Most of Faron Woods & (Clawshots | (Gust Bellows & Water Dragon's Scale)) & Goddess Sword",
"type": "skyloft, goddess, faron goddess"
"correspondingChest": "Central Skyloft - West Cliff Goddess Chest"
},
"Goddess Cube on East Great Tree with Rope": {
"displayName": "Goddess Cube on East Great Tree with Rope",
"area": "Faron Woods",
"needs": "Can Access Most of Faron Woods & (Clawshots | (Gust Bellows & Water Dragon's Scale)) & Goddess Sword",
"type": "skyloft, goddess, faron goddess"
"correspondingChest": "Thunderhead - East Island Goddess Chest"
},
"Goddess Cube on East Great Tree with Clawshots Target": {
"displayName": "Goddess Cube on East Great Tree with Clawshots Target",
"area": "Faron Woods",
"needs": "Can Access Most of Faron Woods & (Clawshots | (Gust Bellows & Water Dragon's Scale)) & Goddess Sword",
"type": "thunderhead, goddess, faron goddess"
"correspondingChest": "Sky - Goddess Chest inside Volcanic Island"
},
"Initial Goddess Cube": {
"displayName": "Initial Goddess Cube",
"area": "Faron Woods",
"needs": "Can Access Deep Woods & Goddess Sword",
"type": "sky, goddess, faron goddess"
"correspondingChest": "Sky - Lumpy Pumpkin - Outside Goddess Chest"
},
"Goddess Cube in Deep Woods": {
"displayName": "Goddess Cube in Deep Woods",
"area": "Faron Woods",
"needs": "Can Access Deep Woods & Goddess Sword",
"type": "sky, goddess, faron goddess"
"correspondingChest": "Sky - Goddess Chest on Island Closest to Faron Pillar"
},
"Goddess Cube on top of Skyview": {
"displayName": "Goddess Cube on top of Skyview",
"area": "Faron Woods",
"needs": "Can Access Deep Woods & Clawshots & Goddess Sword",
"type": "sky, goddess, faron goddess"
"correspondingChest": "Sky - Beedle's Island Cage Goddess Chest"
},
"Goddess Cube in Skyview Spring": {
"displayName": "Goddess Cube in Skyview Spring",
"area": "Skyview",
"needs": "Can Beat Skyview & Goddess Sword",
"type": "sky, goddess, faron goddess, dungeon"
"correspondingChest": "Sky - Lumpy Pumpkin - Goddess Chest on the Roof"
},
"Goddess Cube in Lake Floria": {
"displayName": "Goddess Cube in Lake Floria",
"area": "Lake Floria",
"needs": "Can Access Lake Floria & Goddess Sword",
"type": "skyloft, goddess, floria goddess"
"correspondingChest": "Central Skyloft - Floating Island Goddess Chest"
},
"Goddess Cube in Floria Waterfall": {
"displayName": "Goddess Cube in Floria Waterfall",
"area": "Lake Floria",
"needs": "Can Access Lake Floria & Clawshots & Goddess Sword",
"type": "sky, goddess, floria goddess"
"correspondingChest": "Sky - Goddess Chest under Fun Fun Island"
},
"Goddess Cube at Eldin Entrance": {
"displayName": "Goddess Cube at Eldin Entrance",
"area": "Eldin Volcano",
"needs": "Can Access Eldin & Goddess Sword",
"type": "sky, goddess, eldin goddess"
"correspondingChest": "Sky - Southwest Triple Island Upper Goddess Chest"
},
"Goddess Cube near Mogma Turf Entrance": {
"displayName": "Goddess Cube near Mogma Turf Entrance",
"area": "Eldin Volcano",
"needs": "Can Access Eldin & Goddess Sword",
"type": "sky, goddess, eldin goddess"
"correspondingChest": "Sky - Goddess Chest on Island next to Bamboo Island"
},
"Goddess Cube in Mogma Turf": {
"displayName": "Goddess Cube in Mogma Turf",
"area": "Mogma Turf",
"needs": "Can Access Eldin & Goddess Sword",
"type": "thunderhead, goddess, eldin goddess"
"correspondingChest": "Thunderhead - Goddess Chest outside Isle of Songs"
},
"Goddess Cube West of Earth Temple Entrance": {
"displayName": "Goddess Cube West of Earth Temple Entrance",
"area": "Eldin Volcano",
"needs": "Can Access Second Part of Eldin & Digging Mitts & Goddess Sword",
"type": "sky, goddess, eldin goddess, bombable"
"correspondingChest": "Sky - Bamboo Island Goddess Chest"
},
"Goddess Cube East of Earth Temple Entrance": {
"displayName": "Goddess Cube East of Earth Temple Entrance",
"area": "Eldin Volcano",
"needs": "Can Access Second Part of Eldin & Goddess Sword",
"type": "sky, goddess, eldin goddess"
"correspondingChest": "Sky - Northeast Island Cage Goddess Chest"
},
"Goddess Cube on Sand Slide": {
"displayName": "Goddess Cube on Sand Slide",
"area": "Eldin Volcano",
"needs": "Can Access Second Part of Eldin & Goddess Sword",
"type": "skyloft, goddess, eldin goddess"
"correspondingChest": "Central Skyloft - Shed Goddess Chest"
},
"Goddess Cube inside Volcano Summit": {
"displayName": "Goddess Cube inside Volcano Summit",
"area": "Volcano Summit",
"needs": "Can Access Volcano Summit & ((Goddess Sword & Option \"hero-mode\" Enabled) | True Master Sword)",
"type": "thunderhead, goddess, summit goddess"
"correspondingChest": "Thunderhead - First Goddess Chest on Mogma Mitts Island"
},
"Goddess Cube in Summit Waterfall": {
"displayName": "Goddess Cube in Summit Waterfall",
"area": "Volcano Summit",
"needs": "Can Access Volcano Summit & Goddess Sword",
"type": "thunderhead, goddess, summit goddess"
"correspondingChest": "Thunderhead - Bug Heaven Goddess Chest"
},
"Goddess Cube near Fire Sanctuary Entrance": {
"displayName": "Goddess Cube near Fire Sanctuary Entrance",
"area": "Volcano Summit",
"needs": "Can Access Volcano Summit & Bottle & Clawshots & Goddess Sword",
"type": "thunderhead, goddess, summit goddess"
"correspondingChest": "Thunderhead - Goddess Chest on top of Isle of Songs"
},
"Goddess Cube at Lanayru Mine Entrance": {
"displayName": "Goddess Cube at Lanayru Mine Entrance",
"area": "Lanayru Mine",
"needs": "Can Access Lanayru & Goddess Sword",
"type": "sky, goddess, lanayru goddess"
"correspondingChest": "Sky - Northeast Island Goddess Chest behind Bombable Rocks"
},
"Goddess Cube in Sand Oasis": {
"displayName": "Goddess Cube in Sand Oasis",
"area": "Lanayru Desert",
"needs": "Can Access Second Part of Lanayru & Goddess Sword",
"type": "sky, goddess, lanayru goddess"
"correspondingChest": "Sky - Goddess Chest outside Volcanic Island"
},
"Goddess Cube at Ride near Temple of Time": {
"displayName": "Goddess Cube at Ride near Temple of Time",
"area": "Lanayru Desert",
"needs": "Can Access Second Part of Lanayru & Hook Beetle & Goddess Sword",
"type": "sky, goddess, lanayru goddess, combat"
"correspondingChest": "Sky - Beedle's Island Goddess Chest"
},
"Goddess Cube in Secret Passageway": {
"displayName": "Goddess Cube in Secret Passageway",
"area": "Lanayru Desert",
"needs": "Can Access Second Part of Lanayru & Bomb Bag & Clawshots & Goddess Sword",
"type": "sky, goddess, lanayru goddess, bombable"
"correspondingChest": "Sky - Goddess Chest in Cave on Island next to Bamboo Island"
},
"Goddess Cube near Caged Robot": {
"displayName": "Goddess Cube near Caged Robot",
"area": "Lanayru Desert",
"needs": "Can Access Lanayru & (Clawshots | Bomb Bag | Hook Beetle) & ((Goddess Sword & (Option \"hero-mode\" Enabled | Clawshots)) | True Master Sword)",
"type": "sky, goddess, lanayru goddess"
"correspondingChest": "Sky - Southwest Triple Island Lower Goddess Chest"
},
"Goddess Cube in Ancient Harbour": {
"displayName": "Goddess Cube in Ancient Harbor",
"area": "Lanayru Sand Sea",
"needs": "Can Access Sand Sea & Goddess Sword",
"type": "sky, goddess, sand sea goddess"
"correspondingChest": "Central Skyloft - Bazaar Goddess Chest"
},
"Goddess Cube in Skipper's Retreat": {
"displayName": "Goddess Cube in Skipper's Retreat",
"area": "Lanayru Sand Sea",
"needs": "Can Access Sand Sea & (Bomb Bag | Hook Beetle | Whip) & Goddess Sword",
"type": "sky, goddess, sand sea goddess"
"correspondingChest": "Sky - Southwest Triple Island Cage Goddess Chest"
},
"Goddess Cube in Pirate Stronghold": {
"displayName": "Goddess Cube in Pirate Stronghold",
"area": "Lanayru Sand Sea",
"needs": "Can Access Sand Sea & Can Defeat Armos & Can Defeat Beamos & Goddess Sword",
"type": "sky, goddess, sand sea goddess, mini dungeon"
"correspondingChest": "Central Skyloft - Waterfall Goddess Chest"
},
"Goddess Cube in Lanayru Gorge": {
"displayName": "Goddess Cube in Lanayru Gorge",
"area": "Lanayru Gorge",
"needs": "Can Access Lanayru Gorge & Goddess Sword",
"type": "thunderhead, goddess, sand sea goddess"
"correspondingChest": "Thunderhead - Second Goddess Chest on Mogma Mitts Island"
}
}
7 changes: 0 additions & 7 deletions src/data/potentialBannedLocations.json
View file
Open in desktop

This file was deleted.

28 changes: 12 additions & 16 deletions src/logic/Logic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import LogicTweaks from './LogicTweaks';
import goddessCubes from '../data/goddessCubes.json';
import ItemLocation from './ItemLocation';
import crystalLocations from '../data/crystals.json';
import potentialBannedLocations from '../data/potentialBannedLocations.json';
import logicFileNames from '../data/logicModeFiles.json';

class Logic {
Expand Down Expand Up @@ -124,7 +123,8 @@ class Logic {
this.crystalList = {};

_.forEach(goddessCubes, (cube, cubeRequirementName) => {
const nonprogress = false;
const { area, location } = Locations.splitLocationName(cube.correspondingChest);
const { nonprogress } = this.getLocation(area, location);
const extraLocation = ItemLocation.emptyLocation();
extraLocation.name = cube.displayName;
extraLocation.logicSentence = this.getRequirement(`Can Reach ${cubeRequirementName}`);
Expand Down Expand Up @@ -576,20 +576,6 @@ class Logic {
}

updateRaceModeBannedLocations() {
_.forEach(potentialBannedLocations, (locations, area) => {
_.forEach(locations, (location, check) => {
const itemLocation = this.getLocation(area, check);
if (itemLocation.settingsNonprogress) {
return;
}
if (this.isDungeonRequired(location.requiredDungeon)) {
itemLocation.nonprogress = false;
} else {
// dungeon is not required
itemLocation.nonprogress = true;
}
});
});
_.forEach(this.requiredDungeons, (required, dungeon) => {
_.forEach(this.locationsForArea(dungeon), (location) => {
if (required) {
Expand All @@ -599,6 +585,16 @@ class Logic {
}
});
});
const skyviewCubeLocations = [
this.cubeList['Goddess Cube in Skyview Spring'],
this.getLocation('Sky', 'Lumpy Pumpkin - Goddess Chest on the Roof'),
];
skyviewCubeLocations.forEach((loc) => {
if (loc.settingsNonprogress) {
return;
}
loc.nonprogress = !this.isDungeonRequired('Skyview');
});
this.updateAllCounters();
}

Expand Down