From 6638a48677b74322c730afa19e91bfb8c7b673bc Mon Sep 17 00:00:00 2001 From: lars Date: Wed, 23 Oct 2024 17:41:05 +0200 Subject: [PATCH] added combos --- .../game/stateless/types/tetris/game/TetrisGame.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/TetrisGame.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/TetrisGame.java index e829501..29ea167 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/TetrisGame.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/game/TetrisGame.java @@ -17,6 +17,7 @@ public class TetrisGame { private int level = 1; private int lines = 0; private int score = 0; + private int combo = 0; private int attackingLines = 0; public boolean lost = false; public boolean paused = true; @@ -279,7 +280,9 @@ public class TetrisGame { int removedLines = this.playfield.removeFullLines(); int combatLines = 0; + this.combo += 1; switch (removedLines) { + case 0 -> this.combo = 0; case 1 -> { this.lines += 1; this.score += 40 * this.level; @@ -301,6 +304,11 @@ public class TetrisGame { } } + this.score += 50 * this.combo * this.level; + if(this.combo >= 2) { + combatLines += (int) Math.floor((double) this.combo /2); + } + if(this.hasCombat && this.attackingLines > 0) { if(combatLines > 0 && this.attackingLines >= combatLines) { this.attackingLines -= combatLines;