implement t-spins #2

+1 -1

README.md

reviewed

··· 26 26 - [x] Make Column/Row count configurable, this allows for way bigger playing fields 27 27 - [x] Add modern multiplayer, where you have to clear the game together 28 28 - [x] Config persistence 29 29 - - [ ] Toggle T-Spins 29 29 + - [x] T-Spins 30 30 - [ ] Points for perfect clears 31 31 - [ ] Scoreboard/Leaderboard 32 32 - [ ] Add classic Tetris multiplayer (deleted rows will be a penalty for the opponent)

+18 -11

block.go

reviewed

··· 7 7 type I_Block interface { 8 8 Init(playerId ff.Peer) I_Block 9 9 GetId() int 10 10 + GetOffset() (int, int) 11 11 + GetRotationState() int 10 12 Draw(offsetX, offsetY int) 11 13 DrawPreview(offsetX, offsetY int) 12 14 Move(rows, columns int) 13 15 GetCellPositions() []Position 14 14 - TryRotateWithKicks(grid *Grid, clockwise bool) bool 16 16 + TryRotateWithKicks(grid *Grid, clockwise bool) (bool, int) 15 17 FitsInGrid(grid *Grid) bool 16 18 } 17 19 ··· 26 28 cellPosCache [4]Position 27 29 } 28 30 31 31 + func (b *Block) GetOffset() (int, int) { 32 32 + return b.RowOffset, b.ColOffset 33 33 + } 34 34 + 35 35 + func (b *Block) GetRotationState() int { 36 36 + return b.RotationState 37 37 + } 38 38 + 29 39 func (b *Block) GetId() int { 30 40 return b.Id 31 41 } ··· 87 97 return true 88 98 } 89 99 90 90 - // Returns true if rotation was successful, false otherwise 91 91 - // Adhering to the rules of the SRS system 92 92 - func (b *Block) TryRotateWithKicks(grid *Grid, clockwise bool) bool { 100 100 + // TryRotateWithKicks attempts to rotate the block using SRS wall kicks. 101 101 + // Returns (true, kickIndex) on success, (false, -1) on failure. 102 102 + func (b *Block) TryRotateWithKicks(grid *Grid, clockwise bool) (bool, int) { 93 103 oldState := b.RotationState 94 104 95 105 if clockwise { ··· 101 111 102 112 kickTests := GetKickTests(b.Id, oldState, newState) 103 113 104 104 - // Try each kick test in order 105 105 - for _, offset := range kickTests { 114 114 + for i, offset := range kickTests { 106 115 b.Move(offset.Row, offset.Column) 107 116 108 117 if b.FitsInGrid(grid) { 109 109 - // block is rotated and positioned correctly 110 110 - return true 118 118 + return true, i 111 119 } 112 120 113 113 - // kick invalid, undo the offset 114 121 b.Move(-offset.Row, -offset.Column) 115 122 } 116 123 117 117 - // kicks invalid, undo rotation 124 124 + // All kicks failed — undo rotation 118 125 if clockwise { 119 126 b.rotateCounterClockwise() 120 127 } else { 121 128 b.rotateClockwise() 122 129 } 123 123 - return false 130 130 + return false, -1 124 131 } 125 132 126 133 func (b *Block) rotateClockwise() {

+124 -5

game.go

reviewed

··· 211 211 } 212 212 213 213 func (g *Game) HandleLocking(player *Player) { 214 214 + tSpin := detectTSpin(&g.Grid, player) // must be before LockBlockToGrid replaces CurrentBlock 214 215 dist, success := player.LockBlockToGrid(&g.Grid) 215 216 if !success { 216 217 g.GameOver = true 217 218 g.Screen.SetScreen(ScreenResult) 218 219 return 219 220 } 220 220 - g.handleScoring(dist) 221 221 + g.handleScoring(dist, tSpin) 221 222 } 222 223 223 223 - func (g *Game) handleScoring(hardDropDistance int) { 224 224 - // Add hard drop points if enabled 224 224 + func (g *Game) handleScoring(hardDropDistance int, tSpin TSpinType) { 225 225 if CONFIG.HardDropPointsEnabled && hardDropDistance > 0 { 226 226 g.Score += hardDropDistance * 2 227 227 } 228 228 229 229 - // Clear rows and update score (shared for all players) 230 229 rowsCleared := g.Grid.ClearFullRows() 231 231 - if rowsCleared > 0 { 230 230 + if tSpin != TSpinNone { 231 231 + g.scoreTSpin(tSpin, rowsCleared) 232 232 + if rowsCleared > 0 { 233 233 + g.Lines += rowsCleared 234 234 + if CONFIG.Level != 0 { 235 235 + g.UpdateLevel() 236 236 + } 237 237 + } 238 238 + } else if rowsCleared > 0 { 232 239 g.Lines += rowsCleared 233 240 g.UpdateScore(rowsCleared, 0) 234 241 if CONFIG.Level != 0 { ··· 237 244 } 238 245 } 239 246 247 247 + // TSpinType distinguishes no T-Spin, Mini T-Spin, and full T-Spin. 248 248 + type TSpinType int 249 249 + 250 250 + const ( 251 251 + TSpinNone TSpinType = iota 252 252 + TSpinMini 253 253 + TSpinFull 254 254 + ) 255 255 + 256 256 + // detectTSpin checks whether the player's current block qualifies as a T-Spin 257 257 + // at the moment of locking. Must be called before LockBlockToGrid. 258 258 + // 259 259 + // Detection rules (Tetris Guideline): 260 260 + // 1. Piece must be a T-block (id 6) 261 261 + // 2. Last player action must have been a rotation 262 262 + // 3. At least 3 of the 4 diagonal corners around the T's centre are occupied 263 263 + // 264 264 + // Mini vs Full: 265 265 + // - If the last kick used was index 4 (the ±2-row SRS kick) → Full T-Spin 266 266 + // - Otherwise: both "front" corners filled → Full; only one → Mini 267 267 + func detectTSpin(grid *Grid, player *Player) TSpinType { 268 268 + if !CONFIG.TSpinsEnabled { 269 269 + return TSpinNone 270 270 + } 271 271 + if player.CurrentBlock.GetId() != 6 { 272 272 + return TSpinNone 273 273 + } 274 274 + if player.lastKickIndex == -1 { 275 275 + return TSpinNone 276 276 + } 277 277 + 278 278 + row, col := player.CurrentBlock.GetOffset() 279 279 + centerRow, centerCol := row+1, col+1 280 280 + 281 281 + // Count filled diagonal corners (wall/floor counts as filled) 282 282 + corners := [4][2]int{ 283 283 + {centerRow - 1, centerCol - 1}, 284 284 + {centerRow - 1, centerCol + 1}, 285 285 + {centerRow + 1, centerCol - 1}, 286 286 + {centerRow + 1, centerCol + 1}, 287 287 + } 288 288 + filled := 0 289 289 + for _, c := range corners { 290 290 + if grid.IsCellOutside(c[0], c[1]) || !grid.IsCellEmpty(c[0], c[1]) { 291 291 + filled++ 292 292 + } 293 293 + } 294 294 + if filled < 3 { 295 295 + return TSpinNone 296 296 + } 297 297 + 298 298 + // SRS kick index 4 always upgrades to a full T-Spin 299 299 + if player.lastKickIndex == 4 { 300 300 + return TSpinFull 301 301 + } 302 302 + 303 303 + // Front corners by rotation state (the side the T's prong faces) 304 304 + rotState := player.CurrentBlock.GetRotationState() 305 305 + var frontCorners [2][2]int 306 306 + switch rotState { 307 307 + case 0: // prong up 308 308 + frontCorners = [2][2]int{{centerRow - 1, centerCol - 1}, {centerRow - 1, centerCol + 1}} 309 309 + case 1: // prong right 310 310 + frontCorners = [2][2]int{{centerRow - 1, centerCol + 1}, {centerRow + 1, centerCol + 1}} 311 311 + case 2: // prong down 312 312 + frontCorners = [2][2]int{{centerRow + 1, centerCol - 1}, {centerRow + 1, centerCol + 1}} 313 313 + case 3: // prong left 314 314 + frontCorners = [2][2]int{{centerRow - 1, centerCol - 1}, {centerRow + 1, centerCol - 1}} 315 315 + } 316 316 + 317 317 + filledFront := 0 318 318 + for _, c := range frontCorners { 319 319 + if grid.IsCellOutside(c[0], c[1]) || !grid.IsCellEmpty(c[0], c[1]) { 320 320 + filledFront++ 321 321 + } 322 322 + } 323 323 + 324 324 + if filledFront == 2 { 325 325 + return TSpinFull 326 326 + } 327 327 + return TSpinMini 328 328 + } 329 329 + 330 330 + // scoreTSpin awards points for a T-Spin according to the Tetris Guideline. 331 331 + // Base scores: Mini(0)=100, Mini Single=200, Full(0)=400, 332 332 + // Full Single=800, Full Double=1200, Full Triple=1600. All × (level+1). 333 333 + func (g *Game) scoreTSpin(tSpin TSpinType, lines int) { 334 334 + var base int 335 335 + if tSpin == TSpinMini { 336 336 + switch lines { 337 337 + case 0: 338 338 + base = 100 339 339 + case 1: 340 340 + base = 200 341 341 + case 2: 342 342 + base = 400 343 343 + } 344 344 + } else { // TSpinFull 345 345 + switch lines { 346 346 + case 0: 347 347 + base = 400 348 348 + case 1: 349 349 + base = 800 350 350 + case 2: 351 351 + base = 1200 352 352 + case 3: 353 353 + base = 1600 354 354 + } 355 355 + } 356 356 + g.Score += base * (g.Level + 1) 357 357 + } 358 358 + 240 359 func (g *Game) UpdateScore(linesCleared, movedDownPoints int) { 241 360 switch linesCleared { 242 361 case 1:

+17 -3

player.go

reviewed

··· 29 29 hardDropDistance int // Cells moved by hard drop (for scoring) 30 30 softDropCells int // Cells moved by soft drop this frame 31 31 32 32 + // T-Spin detection: kick index of last successful rotation, -1 if last action was not a rotation 33 33 + lastKickIndex int 34 34 + 32 35 gravityAccum float32 33 36 34 37 // blogBag contains available blocks ··· 38 41 39 42 func newPlayer(peer ff.Peer) *Player { 40 43 return &Player{ 41 41 - ID: peer, 42 42 - canHold: true, 44 44 + ID: peer, 45 45 + canHold: true, 46 46 + lastKickIndex: -1, 43 47 } 44 48 } 45 49 ··· 57 61 distance := p.computeDropDistance(grid) 58 62 if distance > 0 { 59 63 p.CurrentBlock.Move(distance, 0) 64 64 + p.justHardDropped = true // Signal immediate locking 65 65 + p.hardDropDistance = distance 66 66 + p.lastKickIndex = -1 60 67 } 61 68 p.justHardDropped = true // Signal immediate locking (even if already at bottom) 62 69 p.hardDropDistance = distance ··· 252 259 p.justHardDropped = true 253 260 } else { 254 261 p.softDropCells++ 262 262 + p.lastKickIndex = -1 255 263 } 256 264 return 257 265 } ··· 274 282 p.justHardDropped = true 275 283 } else { 276 284 p.softDropCells++ 285 285 + p.lastKickIndex = -1 277 286 } 278 287 p.softDropARRCounter = 0 279 288 } ··· 284 293 p.CurrentBlock.Move(0, dir) 285 294 if !p.CurrentBlock.FitsInGrid(grid) { 286 295 p.CurrentBlock.Move(0, -dir) 296 296 + } else { 297 297 + p.lastKickIndex = -1 287 298 } 288 299 } 289 300 ··· 344 355 345 356 // rotate attempts to rotate the block 346 357 func (p *Player) rotate(grid *Grid, clockwise bool) { 347 347 - p.CurrentBlock.TryRotateWithKicks(grid, clockwise) 358 358 + if ok, kickIdx := p.CurrentBlock.TryRotateWithKicks(grid, clockwise); ok { 359 359 + p.lastKickIndex = kickIdx 360 360 + } 348 361 } 349 362 350 363 // holdBlock swaps current block with held block ··· 406 419 p.NextBlocks[len(p.NextBlocks)-1] = p.GetNewBlock() 407 420 p.canHold = canHold 408 421 p.gravityAccum = 0 422 422 + p.lastKickIndex = -1 409 423 } 410 424 411 425 // Draw renders the player's current block