Skip to content
This repository was archived by the owner on Aug 11, 2021. It is now read-only.

Commit 7ae76d2

Browse files
committed
Add Arboretum Puzzle Skip
1 parent d7d9ed2 commit 7ae76d2

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

src/common/data/settingsDetails.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@ export const details: SettingsDetails = {
143143
You can go out of bounds in Root Cave near the Arbor Chamber door, or in Gully.`,
144144
difficulty: Difficulty.NORMAL
145145
},
146+
arboretumPuzzleSkip: {
147+
name: 'Arboretum Puzzle Skip',
148+
description: 'You can double bomb jump over the gate at the top of Arboretum to access Sunchamber without completing the scan puzzle.',
149+
difficulty: Difficulty.EASY
150+
},
146151
boostThroughBombTunnels: {
147152
name: 'Traverse Morph Ball Bomb tunnels with Boost Ball',
148153
description: `In morph tunnels that normally require single bomb jumps to traverse or access them, a properly-timed boost can be used instead.
@@ -274,7 +279,7 @@ export const details: SettingsDetails = {
274279
},
275280
greatTreeHallBarsSkip: {
276281
name: 'Great Tree Hall - Bars Skip',
277-
description: 'You can double bomb jump over the bars from both directions in Great Tree Hall.',
282+
description: 'You can double bomb jump over the bars from either side (the logic also expects this) in Great Tree Hall.',
278283
difficulty: Difficulty.NORMAL
279284
},
280285
hallOfTheEldersBombSlotsWithoutSpider: {

src/electron/models/prime/regions/chozoRuins.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,10 @@ export function chozoRuins(): RegionObject[] {
222222
name: 'Arboretum',
223223
exits: {
224224
'Gathering Hall': (items: PrimeItemCollection) => items.hasMissiles(),
225-
'Sunchamber': (items: PrimeItemCollection) => items.hasMissiles() && items.canLayBombs() && items.has(PrimeItem.SCAN_VISOR),
225+
'Sunchamber': (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => {
226+
const scanReqs = items.has(PrimeItem.SCAN_VISOR) || settings.tricks.arboretumPuzzleSkip;
227+
return scanReqs && items.hasMissiles() && items.canLayBombs();
228+
},
226229
'Ruined Fountain': (items: PrimeItemCollection) => items.hasMissiles()
227230
}
228231
},

src/electron/models/prime/tricks.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { getPaddedBitStringFromSettingsString } from '../../utilities';
44
export class Tricks extends SettingsFlags {
55
alcoveNoItems = false;
66
arborChamberWithoutPlasma = false;
7+
arboretumPuzzleSkip = false;
78
boostThroughBombTunnels = false;
89
chozoIceTempleItemWithIS = false;
910
climbFrigateCrashSite = false;

0 commit comments

Comments
 (0)