Free Trade Agreement prepped. (#33)

The option is not selectable yet, but it's prepped for it.
wolfman2000 · Apr 14, 2024 · c0f91b0 · c0f91b0
1 parent 98fff33
commit c0f91b0
Show file tree

Hide file tree

Showing 21 changed files with 396 additions and 94 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lanky-tracker",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "An DK 64 Rando Tracker Electron application with React and TypeScript",
   "main": "./out/main/index.js",
   "author": "wolfman2000",

diff --git a/src/renderer/src/components/levels/1-japes/Kasplats.tsx b/src/renderer/src/components/levels/1-japes/Kasplats.tsx
@@ -1,36 +1,42 @@
 import KasplatPool from '@renderer/components/pools/Kasplats'
-import { useArena, useChunkyUndergroundGb, useGateKasplat } from '@renderer/hooks/japes'
+import {
+  useArena,
+  useChunkyUndergroundGb,
+  useDiddyKasplat,
+  useDkKasplat,
+  useLankyKasplat,
+  useTinyKasplat
+} from '@renderer/hooks/japes'
 import { useShuffleKasplats } from '@renderer/hooks/settings'
 import JapesCheck from './JapesCheck'
 
 const Vanilla: React.FC = () => {
-  const kasplat = useGateKasplat()
   const under = useChunkyUndergroundGb()
   return (
     <>
       <JapesCheck
         id={1050}
         name="Japes Kasplat: Hive Tunnel Lower"
         region="Hive Tunnel Area"
-        canGetLogic={kasplat}
+        canGetLogic={useDkKasplat()}
       />
       <JapesCheck
         id={1051}
         name="Japes Kasplat: Near Painting Room"
         region="Stormy Tunnel Area"
-        canGetLogic={kasplat}
+        canGetLogic={useDiddyKasplat()}
       />
       <JapesCheck
         id={1052}
         name="Japes Kasplat: By Lanky Slope Bonus"
         region="Stormy Tunnel Area"
-        canGetLogic={kasplat}
+        canGetLogic={useLankyKasplat()}
       />
       <JapesCheck
         id={1053}
         name="Japes Kasplat: Hive Tunnel Upper"
         region="Hive Tunnel Area"
-        canGetLogic={kasplat}
+        canGetLogic={useTinyKasplat()}
       />
       <JapesCheck
         id={1054}

diff --git a/src/renderer/src/components/levels/2-aztec/Kasplats.tsx b/src/renderer/src/components/levels/2-aztec/Kasplats.tsx
@@ -1,22 +1,21 @@
 import KasplatPool from '@renderer/components/pools/Kasplats'
 import {
-  useAztecBack,
-  useAztecLlamaLava,
   useChunky5DoorGb,
   useCoconutKasplat,
   useGeneralThing,
-  useOasisKasplat
+  useLlamaLavaKasplat,
+  useOasisKasplat,
+  useTunnelKasplat
 } from '@renderer/hooks/aztec'
 import { useShuffleKasplats } from '@renderer/hooks/settings'
-import { logicBreak } from '@renderer/hooks/world'
 import AztecCheck from './AztecCheck'
 
 const Vanilla: React.FC = () => {
-  const aztecBack = useAztecBack()
-  const lava = useAztecLlamaLava()
+  const lava = useLlamaLavaKasplat()
   const coconut = useCoconutKasplat()
   const chunky = useChunky5DoorGb()
   const oasis = useOasisKasplat()
+  const tunnel = useTunnelKasplat()
   return (
     <>
       <AztecCheck
@@ -38,14 +37,14 @@ const Vanilla: React.FC = () => {
         name="Aztec Kasplat: Llama Temple Lava"
         region="Llama Temple"
         canGetLogic={lava.in}
-        canGetBreak={logicBreak(lava)}
+        canGetBreak={lava.out}
       />
       <AztecCheck
         id={2053}
         name="Aztec Kasplat: Hunky Chunky Barrel"
         region="Various Aztec Tunnels"
-        canGetLogic={aztecBack.in}
-        canGetBreak={aztecBack.out}
+        canGetLogic={tunnel.in}
+        canGetBreak={tunnel.out}
       />
       <AztecCheck
         id={2054}

diff --git a/src/renderer/src/components/levels/3-factory/Kasplats.tsx b/src/renderer/src/components/levels/3-factory/Kasplats.tsx
@@ -1,5 +1,12 @@
 import KasplatPool from '@renderer/components/pools/Kasplats'
-import { useGeneralTest, useGeneralThing, useProductionKasplat } from '@renderer/hooks/factory'
+import {
+  useBlockKasplat,
+  useGeneralThing,
+  useProductionBaseKasplat,
+  useProductionTopKasplat,
+  useResearchKasplat,
+  useStorageKasplat
+} from '@renderer/hooks/factory'
 import { useShuffleKasplats } from '@renderer/hooks/settings'
 import FactoryCheck from './FactoryCheck'
 
@@ -10,31 +17,31 @@ const Vanilla: React.FC = () => {
         id={3050}
         name="Factory Kasplat: Upper Production Pipe"
         region="Production Room"
-        canGetLogic={useProductionKasplat()}
+        canGetLogic={useProductionTopKasplat()}
       />
       <FactoryCheck
         id={3051}
         name="Factory Kasplat: Base of Production"
         region="Production Room"
-        canGetLogic={useGeneralThing()}
+        canGetLogic={useProductionBaseKasplat()}
       />
       <FactoryCheck
         id={3052}
         name="Factory Kasplat: Research and Development"
         region="R&D Area"
-        canGetLogic={useGeneralTest()}
+        canGetLogic={useResearchKasplat()}
       />
       <FactoryCheck
         id={3053}
         name="Factory Kasplat: Pole to Arcade"
         region="Storage And Arcade"
-        canGetLogic={useGeneralThing()}
+        canGetLogic={useStorageKasplat()}
       />
       <FactoryCheck
         id={3054}
         name="Factory Kasplat: Block Tower"
         region="Testing Area"
-        canGetLogic={useGeneralTest()}
+        canGetLogic={useBlockKasplat()}
       />
     </>
   )

diff --git a/src/renderer/src/components/levels/4-galleon/Kasplats.tsx b/src/renderer/src/components/levels/4-galleon/Kasplats.tsx
@@ -1,19 +1,17 @@
 import KasplatPool from '@renderer/components/pools/Kasplats'
 import {
+  useCactusKasplat,
   useCannonKasplat,
-  useGalleonCavernTop,
-  useGalleonLighthouseArea,
-  useGalleonOutskirts,
   useGeneralThing,
-  useTreasureKasplat
+  useLighthouseKasplat,
+  useTreasureKasplat,
+  useVineKasplat
 } from '@renderer/hooks/galleon'
 import { useShuffleKasplats } from '@renderer/hooks/settings'
-import { logicBreak } from '@renderer/hooks/world'
 import GalleonCheck from './GalleonCheck'
 
 const Vanilla: React.FC = () => {
-  const galleonTop = useGalleonCavernTop()
-  const outskirts = useGalleonOutskirts()
+  const galleonTop = useVineKasplat()
   const cannon = useCannonKasplat()
   const treasure = useTreasureKasplat()
 
@@ -30,7 +28,7 @@ const Vanilla: React.FC = () => {
         id={4051}
         name="Galleon Kasplat: Lighthouse Alcove"
         region="Lighthouse Area"
-        canGetLogic={useGalleonLighthouseArea()}
+        canGetLogic={useLighthouseKasplat()}
       />
       <GalleonCheck
         id={4052}
@@ -44,13 +42,13 @@ const Vanilla: React.FC = () => {
         name="Galleon Kasplat: Past Vines"
         region="Galleon Caverns"
         canGetLogic={galleonTop.in}
-        canGetBreak={logicBreak(galleonTop)}
+        canGetBreak={galleonTop.out}
       />
       <GalleonCheck
         id={4054}
         name="Galleon Kasplat: Musical Cactus"
         region="Shipyard Outskirts"
-        canGetLogic={outskirts}
+        canGetLogic={useCactusKasplat()}
       />
     </>
   )

diff --git a/src/renderer/src/components/levels/5-forest/Kasplats.tsx b/src/renderer/src/components/levels/5-forest/Kasplats.tsx
@@ -2,6 +2,8 @@ import KasplatPool from '@renderer/components/pools/Kasplats'
 import {
   useBarnKasplat,
   useGeneralThing,
+  useMushExteriorKasplat,
+  useMushInteriorKasplat,
   useNightKasplat,
   useOwlKasplat
 } from '@renderer/hooks/forest'
@@ -23,7 +25,7 @@ const Vanilla: React.FC = () => {
         id={5051}
         name="Forest Kasplat: Inside Giant Mushroom"
         region="Giant Mushroom Insides"
-        canGetLogic={useGeneralThing()}
+        canGetLogic={useMushInteriorKasplat()}
       />
       <ForestCheck
         id={5052}
@@ -35,7 +37,7 @@ const Vanilla: React.FC = () => {
         id={5053}
         name="Forest Kasplat: Low Mushroom Exterior"
         region="Giant Mushroom Exterior"
-        canGetLogic={useGeneralThing()}
+        canGetLogic={useMushExteriorKasplat()}
       />
       <ForestCheck
         id={5054}

diff --git a/src/renderer/src/components/levels/6-caves/Kasplats.tsx b/src/renderer/src/components/levels/6-caves/Kasplats.tsx
@@ -1,27 +1,32 @@
 import KasplatPool from '@renderer/components/pools/Kasplats'
-import { useCavesMiniFunky, useCavesPillar, useGeneralThing } from '@renderer/hooks/caves'
+import {
+  useCabinKasplat,
+  useFunkyKasplat,
+  useGeneralThing,
+  useIceCastleKasplat,
+  useIglooKasplat,
+  usePillarKasplat
+} from '@renderer/hooks/caves'
 import { useShuffleKasplats } from '@renderer/hooks/settings'
-import { logicBreak } from '@renderer/hooks/world'
 import CavesCheck from './CavesCheck'
 
 const Vanilla: React.FC = () => {
-  const pillar = useCavesPillar()
-  const miniFunky = useCavesMiniFunky()
-  const thing = useGeneralThing()
+  const pillar = usePillarKasplat()
+  const miniFunky = useFunkyKasplat()
   return (
     <>
       <CavesCheck
         id={6050}
         name="Caves Kasplat: Near Ice Castle"
         region="Main Caves Area"
-        canGetLogic={thing}
+        canGetLogic={useIceCastleKasplat()}
       />
       <CavesCheck
         id={6051}
         name="Caves Kasplat: Mini Room by Funky"
         region="Main Caves Area"
         canGetLogic={miniFunky.in}
-        canGetBreak={logicBreak(miniFunky)}
+        canGetBreak={miniFunky.out}
       />
       <CavesCheck
         id={6052}
@@ -34,13 +39,13 @@ const Vanilla: React.FC = () => {
         id={6053}
         name="Caves Kasplat: By the Far Warp 2 (Cabins)"
         region="Cabins Area"
-        canGetLogic={thing}
+        canGetLogic={useCabinKasplat()}
       />
       <CavesCheck
         id={6054}
         name="Caves Kasplat On 5-Door Igloo"
         region="Igloo Area"
-        canGetLogic={thing}
+        canGetLogic={useIglooKasplat()}
       />
     </>
   )

diff --git a/src/renderer/src/components/levels/7-castle/Kasplats.tsx b/src/renderer/src/components/levels/7-castle/Kasplats.tsx
@@ -1,10 +1,16 @@
 import KasplatPool from '@renderer/components/pools/Kasplats'
-import { useGeneralThing, useTreeKasplat } from '@renderer/hooks/castle'
+import {
+  useDungeonKasplat,
+  useGeneralThing,
+  useLonelyKasplat,
+  useMausoleumKasplat,
+  usePathKasplat,
+  useTreeKasplat
+} from '@renderer/hooks/castle'
 import { useShuffleKasplats } from '@renderer/hooks/settings'
 import CastleCheck from './CastleCheck'
 
 const Vanilla: React.FC = () => {
-  const kasplat = useGeneralThing()
   return (
     <>
       <CastleCheck
@@ -17,25 +23,25 @@ const Vanilla: React.FC = () => {
         id={7051}
         name="Castle Kasplat: Lower Cave Center"
         region="Castle Underground"
-        canGetLogic={kasplat}
+        canGetLogic={useMausoleumKasplat()}
       />
       <CastleCheck
         id={7052}
         name="Castle Kasplat: Near Upper Warp 2"
         region="Castle Surroundings"
-        canGetLogic={kasplat}
+        canGetLogic={usePathKasplat()}
       />
       <CastleCheck
         id={7053}
         name="Castle Kasplat: On a lone platform"
         region="Castle Surroundings"
-        canGetLogic={kasplat}
+        canGetLogic={useLonelyKasplat()}
       />
       <CastleCheck
         id={7054}
         name="Castle Kasplat: Near Candy's"
         region="Castle Underground"
-        canGetLogic={kasplat}
+        canGetLogic={useDungeonKasplat()}
       />
     </>
   )