Add more tricks

Author: BashPrime

src/common/data/settingsDetails.ts

@@ -140,14 +140,14 @@ export const details: SettingsDetails = {
   antechamberWithPowerBombs: {
     name: 'Antechamber with Power Bombs',
     description: `You can retrieve the item and leave Antechamber without Ice Beam by using a power bomb to open the door, moving to the very back of the room, and then back to the door.
-    
+
     WARNING: If you fail the trick, you will softlock. It is strongly recommended to save at the nearby save station before attempting.`,
     difficulty: Difficulty.NORMAL
   },
   arborChamberWithoutPlasma: {
     name: 'Arbor Chamber without Plasma Beam',
     description: `Arbor Chamber can be entered through the ceiling from out of bounds.
-    
+
     You can go out of bounds in Root Cave near the Arbor Chamber door, or in Gully.`,
     difficulty: Difficulty.OOB
   },
@@ -164,13 +164,20 @@ export const details: SettingsDetails = {
     difficulty: Difficulty.INSANE
   },
   chapelOfTheEldersWithPowerBombs: {
-    name: 'Chapel of the Elders without Power Bombs',
+    name: 'Chapel of the Elders with Power Bombs',
     description: `Similar to Antechamber without Power Bombs, but you open the door, lay a power bomb in the middle of the door frame, and `
       + `then immediately roll into Chapel of the Elders.
-      
+
       WARNING: You will softlock if you fail this trick. You are recommended to save first before attempting.`,
     difficulty: Difficulty.NORMAL
   },
+  chozoIceTempleWithoutSpaceJump: {
+    name: 'Chozo Ice Temple without Space Jump',
+    description: `Removes Space Jump from being considered for Chozo Ice Temple, Chapel of the Elders, and Phendrana Shorelines (Spider Track).
+
+    You can reach these locations by doing a hyper bomb jump in Phendrana Shorelines to reach the temple, and double bomb jumping to climb the temple itself.`,
+    difficulty: Difficulty.NORMAL
+  },
   chozoIceTempleItemWithIS: {
     name: 'Chozo Ice Temple Item with Infinite Speed',
     description: `Also called Early Sun IS, you can get this item by performing the infinite speed glitch in Chapel of the Elders inbounds.`,
@@ -273,6 +280,13 @@ export const details: SettingsDetails = {
     description: `Elite Research can be entered from the Research Access door with an Infinite Boost clip.`,
     difficulty: Difficulty.NORMAL
   },
+  exitPhendranaCanyonNoItems: {
+    name: 'Exit Phendrana Canyon with No Items',
+    description: `Normally, the logic expects you to be able to boost or Space Jump to exit Phendrana Canyon as a means of softlock protection. This trick removes those checks.
+
+    You can leave Phendrana Canyon without any items by jumping on the crates. However, if you destroy the crates and don't have Boost Ball or Space Jump, you will softlock.`,
+    difficulty: Difficulty.TRIVIAL
+  },
   exitQuarantineCaveRuinedCourtyardSlopeJump: {
     name: 'Exit Quarantine Cave to Ruined Courtyard without Spider Ball',
     description: `You can exit Quarantine Cave to Ruined Courtyard by slope jumping next to the Spider Ball track.`,
@@ -348,7 +362,7 @@ export const details: SettingsDetails = {
   lifeGroveSpinnerWithoutBoostBall: {
     name: 'Life Grove Spinner without Boost Ball',
     description: `With a specific camera angle and control stick angle setup, you can open up the spinner item without Boost Ball.
-    
+
     Requires 'Life Grove Tunnel - Half Pipe Bomb Jump' to also be activated for this trick to be considered in logic.`,
     difficulty: Difficulty.NORMAL
   },
@@ -483,7 +497,7 @@ export const details: SettingsDetails = {
     name: 'Sun Tower - Infinite Bomb Jump',
     description: `After defeating Flaahgra, you can jump into the left groove, have the Oculus carry you, and then infinite bomb jump `
     + `back to the top door to trigger the Sunchamber Chozo Ghost room layer without needing Spider Ball and Super Missles.
-    
+
     WARNING: If progession is on Sunchamber (Ghosts), you will softlock if you fail this trick. You are advised to save before attempting.`,
     difficulty: Difficulty.NORMAL
   },
@@ -514,6 +528,11 @@ export const details: SettingsDetails = {
     description: `It's possible to return to Elite Control by performing a half pipe bomb jump to reach the Elite Control door.`,
     difficulty: Difficulty.HARD
   },
+  warriorShrineMinimumReqs: {
+    name: 'Warrior Shrine - Minimum Requirements',
+    description: `You can climb the central structure in Monitor Station without Space Jump or Morph Ball Bombs, then dash across to the Warrior Shrine door.`,
+    difficulty: Difficulty.NORMAL
+  },
   warriorShrineWithoutBoost: {
     name: 'Warrior Shrine without Boost Ball',
     description: `You can space jump to the upper ledge in Monitor Station via R jump or dash.`,

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

@@ -41,8 +41,12 @@ export function magmoorCaverns(): RegionObject[] {
       exits: {
         'Shore Tunnel': () => true,
         'Warrior Shrine': (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => {
-          const wsReqs = settings.tricks.warriorShrineWithoutBoost || items.canBoost();
-          return wsReqs && items.has(PrimeItem.SPACE_JUMP_BOOTS);
+          if (settings.tricks.warriorShrineMinimumReqs) {
+            return true;
+          }
+
+          const boostReqs = settings.tricks.warriorShrineWithoutBoost || items.canBoost();
+          return boostReqs && items.has(PrimeItem.SPACE_JUMP_BOOTS);
         },
         [Elevator.MAGMOOR_WEST]: (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => {
           const canBoost = settings.tricks.boostThroughBombTunnels && items.canBoost();

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

@@ -14,10 +14,16 @@ export function phendranaDrifts(): RegionObject[] {
       name: 'Phendrana Shorelines',
       locations: {
         [PrimeLocation.PHENDRANA_SHORELINES_BEHIND_ICE]: (items: PrimeItemCollection) => items.has(PrimeItem.PLASMA_BEAM),
-        [PrimeLocation.PHENDRANA_SHORELINES_SPIDER_TRACK]: (items: PrimeItemCollection) => items.canFireSuperMissiles() && items.canSpider() && items.has(PrimeItem.SPACE_JUMP_BOOTS) && items.has(PrimeItem.SCAN_VISOR),
+        [PrimeLocation.PHENDRANA_SHORELINES_SPIDER_TRACK]: (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => {
+          const sjReqs = items.has(PrimeItem.SPACE_JUMP_BOOTS) || (settings.tricks.chozoIceTempleWithoutSpaceJump && items.canLayBombs());
+          return sjReqs && items.canFireSuperMissiles() && items.canSpider() && items.has(PrimeItem.SCAN_VISOR);
+        },
       },
       exits: {
-        'Chozo Ice Temple': (items: PrimeItemCollection) => canBreakIce(items) && items.has(PrimeItem.SPACE_JUMP_BOOTS),
+        'Chozo Ice Temple': (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => {
+          const sjReqs = items.has(PrimeItem.SPACE_JUMP_BOOTS) || (settings.tricks.chozoIceTempleWithoutSpaceJump && items.canLayBombs());
+          return sjReqs && canBreakIce(items);
+        },
         'Ice Ruins East': (items: PrimeItemCollection) => ((items.hasMissiles() && canBreakIce(items)) || items.has(PrimeItem.SPACE_JUMP_BOOTS)) && items.has(PrimeItem.SCAN_VISOR),
         'Ice Ruins West': (items: PrimeItemCollection) => items.has(PrimeItem.SPACE_JUMP_BOOTS),
         [Elevator.PHENDRANA_NORTH]: (items: PrimeItemCollection) => items.hasMissiles() || items.has(PrimeItem.CHARGE_BEAM)
@@ -27,13 +33,17 @@ export function phendranaDrifts(): RegionObject[] {
       name: 'Chozo Ice Temple',
       locations: {
         [PrimeLocation.CHOZO_ICE_TEMPLE]: (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => {
+          const sjReqs = items.has(PrimeItem.SPACE_JUMP_BOOTS) || (settings.tricks.chozoIceTempleWithoutSpaceJump && items.canLayBombs());
           const infiniteSpeedReqs = (settings.tricks.chozoIceTempleItemWithIS && items.canInfiniteSpeed() && items.has(PrimeItem.WAVE_BEAM))
             || (settings.tricks.waveSunOobWallcrawlWithIS && items.hasMissiles() && items.canWallcrawl(settings) && items.canInfiniteSpeed());
-          return (items.has(PrimeItem.PLASMA_BEAM) && items.has(PrimeItem.MORPH_BALL) && items.has(PrimeItem.SPACE_JUMP_BOOTS)) || infiniteSpeedReqs;
+          return sjReqs && ((items.has(PrimeItem.PLASMA_BEAM) && items.has(PrimeItem.MORPH_BALL)) || infiniteSpeedReqs);
         }
       },
       exits: {
-        'Chapel of the Elders': (items: PrimeItemCollection) => items.hasMissiles() && items.canLayBombs() && items.has(PrimeItem.SPACE_JUMP_BOOTS),
+        'Chapel of the Elders': (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => {
+          const sjReqs = items.has(PrimeItem.SPACE_JUMP_BOOTS) || settings.tricks.chozoIceTempleWithoutSpaceJump;
+          return sjReqs && items.hasMissiles() && items.canLayBombs();
+        },
         'Phendrana Shorelines': (items: PrimeItemCollection) => canBreakIce(items)
       }
     },
@@ -54,15 +64,16 @@ export function phendranaDrifts(): RegionObject[] {
       exits: {
         'Chozo Ice Temple': (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => {
           const waveReqs = items.has(PrimeItem.WAVE_BEAM) || (settings.tricks.chapelOfTheEldersWithPowerBombs && items.canLayPowerBombs());
-          return waveReqs && items.canLayBombs() && items.has(PrimeItem.SPACE_JUMP_BOOTS);
+          const sjReqs = items.has(PrimeItem.SPACE_JUMP_BOOTS) || settings.tricks.chozoIceTempleWithoutSpaceJump;
+          return waveReqs && sjReqs && items.canLayBombs();
         }
       }
     },
     {
       name: 'Ice Ruins East',
       locations: {
         [PrimeLocation.ICE_RUINS_EAST_BEHIND_ICE]: (items: PrimeItemCollection) => items.has(PrimeItem.PLASMA_BEAM),
-        [PrimeLocation.ICE_RUINS_EAST_SPIDER_TRACK]: (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => 
+        [PrimeLocation.ICE_RUINS_EAST_SPIDER_TRACK]: (items: PrimeItemCollection, settings: PrimeRandomizerSettings) =>
           items.canSpider() || (settings.tricks.iceRuinsEastSpiderItemWithoutSpider && items.canLayBombs())
       },
       exits: {
@@ -89,7 +100,10 @@ export function phendranaDrifts(): RegionObject[] {
       },
       exits: {
         // You'll softlock if you destroy the boxes, and don't have space jump or boost
-        'Ice Ruins West': (items: PrimeItemCollection) => items.canBoost() || items.has(PrimeItem.SPACE_JUMP_BOOTS)
+        'Ice Ruins West': (items: PrimeItemCollection, settings: PrimeRandomizerSettings) => {
+          const baseReqs = items.canBoost() || items.has(PrimeItem.SPACE_JUMP_BOOTS);
+          return baseReqs || settings.tricks.exitPhendranaCanyonNoItems;
+        }
       }
     },
     {

src/electron/models/prime/tricks.ts

@@ -9,6 +9,7 @@ export class Tricks extends SettingsFlags {
   boostThroughBombTunnels = false;
   chapelOfTheEldersWithPowerBombs = false;
   chozoIceTempleItemWithIS = false;
+  chozoIceTempleWithoutSpaceJump = false;
   climbFrigateCrashSite = false;
   climbFrozenPikeWithoutBombs = false;
   climbObservatoryWithoutBoost = false;
@@ -26,6 +27,7 @@ export class Tricks extends SettingsFlags {
   crosswayItemFewerReqs = false;
   destroyBombCoversWithPowerBombs = false;
   eliteResearchInfiniteBoostClip = false;
+  exitPhendranaCanyonNoItems = false;
   exitQuarantineCaveRuinedCourtyardSlopeJump = false;
   fieryShoresAccessWithoutMorphGrapple = false;
   frigateCrashSiteItemWithoutGravitySuit = false;
@@ -70,6 +72,7 @@ export class Tricks extends SettingsFlags {
   trainingChamberAndAccessOobWallcrawl = false;
   upperRuinedShrineTowerOfLightFewerAccessReqs = false;
   ventShaftHpbj = false;
+  warriorShrineMinimumReqs = false;
   warriorShrineWithoutBoost = false;
   wateryHallUnderwaterFlaahgraSkip = false;
   wateryHallUnderwaterSlopeJump = false;