intermediate commit

1 files changed, 16 insertions, 8 deletions

diff --git a/go/ui/mapView.go b/go/ui/mapView.go
index c966f1a8..8c83bd41 100644
--- a/go/ui/mapView.go
+++ b/go/ui/mapView.go
@@ -35,7 +35,7 @@ func NewMapView(g *game.State) *MapView {
 	return &vw
 }
 
-func (mv *MapView) GetHeight() int {
+func (mv *MapView) Height() int {
 	return len(mv.gameState.Map.Tiles) * TILE_HEIGHT
 }
 
@@ -133,9 +133,9 @@ func (vw *MapView) drawMapLayer(screen *ebiten.Image) {
 }
 
 func getPermanentSymbol(p game.Permanent, i int) *ebiten.Image {
-	permanentSymbol := assets.GetSymbol(strings.ToLower(p.GetCard().Name))
+	permanentSymbol := assets.GetSymbol(strings.ToLower(p.Card().Name))
 	if permanentSymbol == nil {
-		symbol := fmt.Sprintf("%c%d", unicode.ToUpper(rune(p.GetCard().Type.String()[0])), i)
+		symbol := fmt.Sprintf("%c%d", unicode.ToUpper(rune(p.Card().Type.String()[0])), i)
 		permanentSymbol = assets.GetGenericSymbol(symbol)
 		if permanentSymbol == nil {
 			log.Fatalf("Failed to generate generic symbol %s", symbol)
@@ -151,13 +151,13 @@ func (vw *MapView) drawPermanentsLayer(screen *ebiten.Image) {
 
 		for i, p := range vw.gameState.Permanents {
 			permanentSymbol := getPermanentSymbol(p, i)
-			t := p.GetTile()
+			t := p.Tile()
 			x_px := t.Position.X*TILE_WIDTH + (TILE_WIDTH-PERMANENT_WIDTH)/2
 			y_px := t.Position.Y*TILE_HEIGHT + (TILE_HEIGHT-PERMANENT_HEIGHT)/2
 
 			op := &ebiten.DrawImageOptions{}
 			op.GeoM.Translate(float64(x_px), float64(y_px))
-			op.ColorM.ScaleWithColor(p.GetController().Color)
+			op.ColorM.ScaleWithColor(p.Controller().Color)
 
 			for _, h := range vw.permanentsHighlights {
 				if p == h {
@@ -206,7 +206,7 @@ func (vw *MapView) FindObjectAt(screenX, screenY int) interface{} {
 		relativeY >= yMargin && relativeY <= TILE_HEIGHT-yMargin {
 
 		for _, p := range vw.gameState.Permanents {
-			pos := p.GetTile().Position
+			pos := p.Tile().Position
 			if pos.X == x && pos.Y == y {
 				if isSymbolTransparentAt(p, relativeX, relativeY) {
 					break
@@ -225,8 +225,12 @@ func (vw *MapView) FindObjectAt(screenX, screenY int) interface{} {
 }
 
 func (vw *MapView) HighlightPositions(pos []game.Position) {
-	vw.ForceRedraw()
 	vw.tileHighlights = pos
+	vw.ForceRedraw()
+}
+
+func (vw *MapView) AddHighlightPosition(pos game.Position) {
+	vw.HighlightPositions(append(vw.tileHighlights, pos))
 }
 
 func (vw *MapView) HighlightTiles(tiles []*game.Tile) {
@@ -241,13 +245,17 @@ func (vw *MapView) HighlightTile(t *game.Tile) {
 	vw.HighlightTiles([]*game.Tile{t})
 }
 
+func (vw *MapView) AddHighlightTile(t *game.Tile) {
+	vw.AddHighlightPosition(t.Position)
+}
+
 func (vw *MapView) ClearTileHighlights() {
 	vw.HighlightTiles([]*game.Tile{})
 }
 
 func (vw *MapView) HighlightPermanents(permanents []game.Permanent) {
-	vw.ForceRedraw()
 	vw.permanentsHighlights = permanents
+	vw.ForceRedraw()
 }
 
 func (vw *MapView) HighlightPermanent(p game.Permanent) {