Remove first stage

0xneged · Aug 7, 2024 · f8377d5 · f8377d5
1 parent f551c58
commit f8377d5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/src/components/TowerGame/SkeletonLoader.tsx b/src/components/TowerGame/SkeletonLoader.tsx
@@ -1,11 +1,10 @@
 import GridWrapper from 'components/TowerGame/GridWrapper'
-import towerHeight from 'components/TowerGame/towerHeight'
-import { TowerType, TypeToGuessMax } from 'types/TowerGame'
+import { towerHeight, TowerType, TypeToGuessMax } from 'types/TowerGame'
 
 export default function ({ towerType }: { towerType: TowerType }) {
   const cardsInRow = TypeToGuessMax[towerType] + 1
 
-  const components = [...Array(cardsInRow * towerHeight)].map(() => (
+  const components = [...Array(cardsInRow * towerHeight(towerType))].map(() => (
     <div className="rounded-2xl w-full h-20 bg-pale-purple animate-pulse" />
   ))
   return <GridWrapper maxInRow={cardsInRow}>{components}</GridWrapper>

diff --git a/src/components/TowerGame/index.tsx b/src/components/TowerGame/index.tsx
@@ -1,7 +1,6 @@
 import HatIcon from 'components/icons/HatIcon'
 import GridWrapper from 'components/TowerGame/GridWrapper'
 import TowerCard from 'components/TowerGame/TowerCard'
-import towerHeight from 'components/TowerGame/towerHeight'
 import { guess } from 'helpers/api/towerGame'
 import roundNumber from 'helpers/numbers/roundNumber'
 import queryClient from 'helpers/queryClient'
@@ -12,6 +11,7 @@ import {
   TowerCardStatus,
   TowerGame,
   TowerGameStatus,
+  towerHeight,
   TowerType,
   TypeToGuessMax,
   TypeToMultipliers,
@@ -112,7 +112,7 @@ export default function ({
 
   return (
     <GridWrapper maxInRow={maxInRow}>
-      {[...Array(towerHeight)].map((_, index) => (
+      {[...Array(towerHeight(towerType))].map((_, index) => (
         <CardRow
           rowLength={maxInRow}
           onClick={onClick}

diff --git a/src/components/TowerGame/towerHeight.tsx b/src/components/TowerGame/towerHeight.tsx
diff --git a/src/helpers/tower/getHiddenCardStatuses.ts b/src/helpers/tower/getHiddenCardStatuses.ts
@@ -1,9 +1,13 @@
-import towerHeight from 'components/TowerGame/towerHeight'
-import { TowerCardStatus, TowerType, TypeToGuessMax } from 'types/TowerGame'
+import {
+  TowerCardStatus,
+  towerHeight,
+  TowerType,
+  TypeToGuessMax,
+} from 'types/TowerGame'
 
 export default function (towerType: TowerType) {
   const rowLength = TypeToGuessMax[towerType] + 1
 
   const singleRow = Array(rowLength).fill(TowerCardStatus.hidden)
-  return Array(towerHeight).fill(singleRow)
+  return Array(towerHeight(towerType)).fill(singleRow)
 }
diff --git a/src/types/TowerGame.ts b/src/types/TowerGame.ts
@@ -9,10 +9,13 @@ export const TypeToGuessMax = {
 }
 
 export const TypeToMultipliers = {
-  [TowerType.easy]: [1, 1.4, 2.1, 3, 4.4, 6.5, 9.4, 13.8, 20, 29.2],
-  [TowerType.hard]: [1, 3, 7, 14, 27, 53, 103, 200, 389, 755],
+  [TowerType.easy]: [1.4, 2.1, 3, 4.4, 6.5, 9.4, 13.8, 20, 29.2],
+  [TowerType.hard]: [3, 7, 14, 27, 53, 103, 200, 389, 755],
 }
 
+export const towerHeight = (towerType: TowerType) =>
+  TypeToMultipliers[towerType].length
+
 export enum TowerGameStatus {
   ongoing,
   finished,