enhance(piranhas): fish hovering and human move click-lock

Author: xeruf

src/main/kotlin/sc/gui/view/GameView.kt

@@ -105,15 +105,19 @@ abstract class GameBoard<GameState: IGameState>: View(), ChangeListener<IGameSta
         }
     }
 
+    /** For keyboard based controls - accessibility! */
     protected abstract fun handleKeyPress(state: GameState, keyEvent: KeyEvent): Boolean
 
+    /** Show human controls if it is a human move. */
     protected fun checkHumanControls() {
         if(awaitingHumanMove.value)
             renderHumanControls(gameState ?: return)
     }
 
+    /** Called when a human player needs to make a move to render needed UI elements. */
     protected abstract fun renderHumanControls(state: GameState)
 
+    /** Send move if it is humans turn. */
     protected fun sendHumanMove(move: IMove): Boolean {
         if(awaitingHumanMove.value) {
             fire(HumanMoveAction(move.also {

src/main/kotlin/sc/gui/view/game/PiranhasBoard.kt

@@ -1,8 +1,10 @@
 package sc.gui.view.game
 
+import javafx.application.Platform
 import javafx.geometry.Pos
 import javafx.scene.Node
 import javafx.scene.effect.ColorAdjust
+import javafx.scene.effect.Glow
 import javafx.scene.input.KeyEvent
 import javafx.scene.layout.GridPane
 import sc.api.plugins.Coordinates
@@ -29,11 +31,14 @@ class PiranhasBoard: GameBoard<GameState>() {
         }
     }
 
-    var selected: Coordinates? = null
+    var selected: Node? = null
     val hovers = ArrayList<Node>()
 
     override fun onNewState(oldState: GameState?, state: GameState?) {
+        logger.debug { "New State: $state" }
         grid.children.clear()
+        hovers.clear()
+        selected = null
 
         (0 until PiranhaConstants.BOARD_LENGTH).forEach { y ->
             grid.add(PieceImage(gridSize, "squid").apply { opacity = 0.0 }, 0, y)
@@ -42,33 +47,43 @@ class PiranhasBoard: GameBoard<GameState>() {
 
         state?.let { state ->
             state.board.forEach { (pos: Coordinates, field: FieldState) ->
-                val piece = PieceImage(gridSize,
+                val piece = PieceImage(
+                    gridSize,
                     field.team?.let { team -> "${team}_${field.size}" } ?: field.name.lowercase())
                 grid.add(piece, pos.x, pos.y)
                 if(field.team == null)
                     return@forEach
                 piece.onHover {
                     if(selected == null) {
-                        grid.children.removeAll(hovers)
-                        hovers.clear()
-                        addHovers(state, pos, field)
+                        Platform.runLater {
+                            addHovers(state, pos, field)
+                        }
                     }
                 }
                 piece.onLeftClick {
-                    grid.children.removeAll(hovers)
-                    hovers.clear()
-                    if(selected == pos) {
-                        selected = null
-                        return@onLeftClick
+                    if(field.team == state.currentTeam && awaitingHumanMove.value) {
+                        logger.debug { "Clicked own fish on $pos" }
+                        selected?.effect = null
+                        if(selected == piece) {
+                            grid.children.removeAll(hovers)
+                            hovers.clear()
+                            selected = null
+                            return@onLeftClick
+                        }
+                        selected = piece
+                        piece.effect = Glow(0.6)
+                        addHovers(state, pos, field)
                     }
-                    selected = pos
-                    addHovers(state, pos, field)
                 }
             }
         }
     }
 
     fun addHovers(state: GameState, pos: Coordinates, field: FieldState) {
+        logger.trace { "Clearing hovers and adding for $pos in turn ${state.turn}" }
+        grid.children.removeAll(hovers)
+        hovers.clear()
+        
         val board = state.board
         GameRuleLogic.possibleMovesFor(board, pos).forEach { move ->
             val target = GameRuleLogic.targetField(board, move)
@@ -91,7 +106,7 @@ class PiranhasBoard: GameBoard<GameState>() {
     }
 
     override fun renderHumanControls(state: GameState) {
-        // TODO "Not yet implemented"
+        // not needed for piranhas, handled abovene
     }
 
 }