Fix next shape generation

hakuzumon · Jul 2, 2024 · 6436910 · 6436910
1 parent 3f142ff
commit 6436910
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/components/Tetris.tsx b/src/components/Tetris.tsx
@@ -124,6 +124,10 @@ class Shape {
     getKey() {
         return this.key;
     }
+
+    clone() {
+        return Shape.newInstance(this.key, this.color);
+    }
 }
 
 const shapes: {[key: string]: number[][]} = {
@@ -240,6 +244,7 @@ export interface TetrisProps {
 export default function(props: TetrisProps) {
     const [score, setScore] = createSignal(0);
 
+    let next = Shape.newInstance(randomItem(Object.keys(shapes), 'O'), Color.RED);
     let gameObject: Shape | null = null;
     let gameArea: Array2d<Color>;
     let canvas: HTMLCanvasElement;
@@ -406,9 +411,12 @@ export default function(props: TetrisProps) {
         moveX = initialLoc.x;
         moveY = initialLoc.y;
 
-        const targetColor = randomItem(visibleColors, gameObject?.getColor());
-        const targetShape = randomItem(Object.keys(shapes), gameObject?.getKey());
-        gameObject = Shape.newInstance(targetShape, targetColor);
+        gameObject = next.clone();
+
+        const nextColor = randomItem(visibleColors, next.getColor());
+        const nextShape = randomItem(Object.keys(shapes), next.getKey());
+        next = Shape.newInstance(nextShape, nextColor);
+
         moveGameObjectInsideBounds(gameObject.getPoints());
         actionStack = [];
     }