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

Commit d7d9ed2

Browse files
committed
Add GTH bars skip to tricks
1 parent 2ea6409 commit d7d9ed2

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

src/common/data/settingsDetails.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,9 @@ export const details: SettingsDetails = {
138138
},
139139
arborChamberWithoutPlasma: {
140140
name: 'Arbor Chamber without Plasma Beam',
141-
description: `Arbor Chamber can be entered through the ceiling by going out of bounds.`,
141+
description: `Arbor Chamber can be entered through the ceiling from out of bounds.
142+
143+
You can go out of bounds in Root Cave near the Arbor Chamber door, or in Gully.`,
142144
difficulty: Difficulty.NORMAL
143145
},
144146
boostThroughBombTunnels: {
@@ -270,6 +272,11 @@ export const details: SettingsDetails = {
270272
description: `You can R jump to reach the ledge without Grapple and Plasma Beam.`,
271273
difficulty: Difficulty.NORMAL
272274
},
275+
greatTreeHallBarsSkip: {
276+
name: 'Great Tree Hall - Bars Skip',
277+
description: 'You can double bomb jump over the bars from both directions in Great Tree Hall.',
278+
difficulty: Difficulty.NORMAL
279+
},
273280
hallOfTheEldersBombSlotsWithoutSpider: {
274281
name: 'Hall of the Elders Bomb Slots without Spider Ball',
275282
description: `You can activate the bomb slots by space jumping onto a peg sticking out of the wall, and then to the upper bomb slot, without needing Spider Ball.`,

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ export function tallonOverworld(): RegionObject[] {
155155
},
156156
exits: {
157157
'Life Grove Tunnel': (items: PrimeItemCollection) => items.canSpider() && items.has(PrimeItem.ICE_BEAM) && items.has(PrimeItem.SPACE_JUMP_BOOTS),
158-
[Elevator.TALLON_SOUTH_CHOZO]: (items: PrimeItemCollection) => items.has(PrimeItem.ICE_BEAM)
158+
[Elevator.TALLON_SOUTH_CHOZO]: (items: PrimeItemCollection) => items.has(PrimeItem.ICE_BEAM),
159+
// Only with bars skip
160+
'Great Tree Hall (Lower)': (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => settings.tricks.greatTreeHallBarsSkip && items.canLayBombs()
159161
}
160162
},
161163
{
@@ -170,7 +172,10 @@ export function tallonOverworld(): RegionObject[] {
170172

171173
return items.has(PrimeItem.THERMAL_VISOR) && baseReqs;
172174
},
173-
'Great Tree Hall (Upper)': (items: PrimeItemCollection) => items.canBoost() && items.has(PrimeItem.SPACE_JUMP_BOOTS),
175+
'Great Tree Hall (Upper)': (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => {
176+
const boostReqs = items.canBoost() || (settings.tricks.greatTreeHallBarsSkip && items.canLayBombs());
177+
return boostReqs && items.has(PrimeItem.SPACE_JUMP_BOOTS);
178+
},
174179
[Elevator.TALLON_SOUTH_MINES]: (items: PrimeItemCollection) => items.has(PrimeItem.ICE_BEAM) && items.has(PrimeItem.SPACE_JUMP_BOOTS)
175180
}
176181
},

src/electron/models/prime/tricks.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export class Tricks extends SettingsFlags {
2727
furnaceSpiderTrackItemHBJ = false;
2828
furnaceSpiderTrackItemSpaceJumpBombs = false;
2929
gravityChamberLedgeItemWithoutGrapplePlasma = false;
30+
greatTreeHallBarsSkip = false;
3031
hallOfTheEldersBombSlotsWithoutSpider = false;
3132
hallOfTheEldersItemsWithIS = false;
3233
iceBeamBeforeFlaahgraOobWallcrawl = false;

0 commit comments

Comments
 (0)