client: make key bindings dynamic

1 files changed, 12 insertions, 32 deletions

diff --git a/go/client/game.go b/go/client/game.go
index 9c95deb2..58e4c63c 100644
--- a/go/client/game.go
+++ b/go/client/game.go
@@ -35,6 +35,8 @@ const (
 type Game struct {
 	app *app
 
+	keyBindings keyBindings
+
 	selectedObject interface{}
 
 	handLayer         *ui.HandView
@@ -61,13 +63,19 @@ type Game struct {
 
 func newGame(app *app) *Game {
 	g := &Game{
-		app: app,
+		app:         app,
+		keyBindings: make(keyBindings),
 		Collection: ui.Collection{
 			Width:  app.windowWidth,
 			Height: app.windowHeight,
 		},
 	}
 
+	// default key bindings
+	g.keyBindings[ebiten.MouseButtonLeft] = selection
+	g.keyBindings[ebiten.KeySpace] = pass
+	g.keyBindings[ebiten.KeyEscape] = reset
+
 	g.gameState = game.NewState()
 
 	g.passButton = ui.NewSimpleButton(g.Width-PASS_BUTTON_WIDTH,
@@ -520,38 +528,10 @@ func (g *Game) updateHighlight() {
 
 func (g *Game) Update() error {
 	g.handlePlayerNotifications()
-	if inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonLeft) {
-		x, y := ebiten.CursorPosition()
-		obj := g.findObjectAt(x, y)
-
-		if g.prompt != nil {
-			if err := g.prompt.Add(obj); err != nil {
-				log.Println("Not added", obj, "to active prompt:", err)
-				g.handleSelection(obj, x, y)
-			} else {
-				g.updateHighlight()
-			}
-		} else {
-			g.handleSelection(obj, x, y)
-		}
-	} else if inpututil.IsKeyJustPressed(ebiten.KeySpace) {
-		g.passButton.Click(0, 0)
-	} else if inpututil.IsKeyJustPressed(ebiten.KeyQ) {
+	g.handleKeyBindings(g.keyBindings)
+
+	if inpututil.IsKeyJustPressed(ebiten.KeyQ) {
 		return ebiten.Termination
-	} else if inpututil.IsKeyJustPressed(ebiten.KeyEscape) {
-		g.removeChoice()
-		g.selectedObject = nil
-		g.ResetHover()
-		g.clearHighlights()
-		g.hideStore()
-		g.RemoveWidget(g.discardPileView)
-		if g.prompt != nil {
-			if g.prompt.Action().Targets().NoSelections() {
-				g.removePrompt()
-			} else {
-				g.prompt.ClearSelections()
-			}
-		}
 	}
 
 	if err := g.Collection.Update(); err != nil {