intermediate commit

1 files changed, 16 insertions, 5 deletions

diff --git a/go/ui/textBox.go b/go/ui/textBox.go
index cc813a4e..2635535c 100644
--- a/go/ui/textBox.go
+++ b/go/ui/textBox.go
@@ -64,7 +64,7 @@ func (tb *TextBox) Centering(centering bool) *TextBox {
 
 func NewUnitInfo(x, y int, u *game.Unit) *TextBox {
 	info := fmt.Sprintf("%s\nDamage: %d\nHealth: %d\nUpkeep: %d",
-		u.String(), u.Damage(), u.Health, u.Upkeep)
+		u.String(), u.Damage(), u.Health, u.UpkeepCost())
 
 	if u.Movement != game.INVALID_MOVEMENT() {
 		info = fmt.Sprintf("%s\nMovement: %s", info, u.Movement.String())
@@ -153,15 +153,26 @@ func (w *PocList) setText() {
 	w.Y = w.bottomY - b.Dy() - w.YMargin
 }
 
-func (w *PocList) FindObjectAt(x, y int) interface{} {
+func (w *PocList) FindObjectAt(_x, _y int) interface{} {
+	if !w.Contains(_x, _y) {
+		return nil
+	}
+
 	cards := w.poc.Cards()
 	if len(cards) == 0 {
 		return nil
 	}
 
-	// b := text.BoundString(font.Font, w.Text)
-	// i := b.Dy() / w.poc.Size()
-	return cards[0]
+	y := _y - w.Y
+
+	b := text.BoundString(font.Font24, w.text)
+	i := y / (b.Dy() / w.poc.Size())
+
+	if i >= len(cards) {
+		return nil
+	}
+
+	return cards[i]
 }
 
 type TextInput struct {