From decd1f7080c5ed39d2e7551db6d7541b8e8a92a9 Mon Sep 17 00:00:00 2001
From: Sage Vaillancourt <sage@sagev.space>
Date: Sat, 1 Mar 2025 09:54:05 -0500
Subject: [PATCH] Fix inverted dance animation

Switch XyPair and Point3d to @class, over @alias
Seems to work better with autocomplete
---
 src/baserunning.lua     |  2 +-
 src/batting.lua         |  1 +
 src/draw/characters.lua |  2 +-
 src/utils.lua           | 16 +++++++---------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/baserunning.lua b/src/baserunning.lua
index 23524dd..fa904fc 100644
--- a/src/baserunning.lua
+++ b/src/baserunning.lua
@@ -201,7 +201,7 @@ function Baserunning:updateRunner(runner, runnerIndex, appliedSpeed, isAutoRun,
     if
         nearestBaseDistance < 5
         and runnerIndex ~= nil
-        and runner ~= self.batter --runner.prevBase
+        and runner ~= self.batter
         and runner.nextBase == C.Bases[C.Home]
         and nearestBase == C.Bases[C.Home]
     then
diff --git a/src/batting.lua b/src/batting.lua
index b8d50ad..77a2875 100644
--- a/src/batting.lua
+++ b/src/batting.lua
@@ -31,6 +31,7 @@ end
 -- and letting the user find a crank position and direction that works for them
 
 --- Assumes the bat is being held by self.baserunning.batter
+--- Mutates self.state for later rendering.
 ---@param batDeg number
 ---@param batSpeed number
 ---@param ball Point3d
diff --git a/src/draw/characters.lua b/src/draw/characters.lua
index 395e6df..4579eb2 100644
--- a/src/draw/characters.lua
+++ b/src/draw/characters.lua
@@ -46,7 +46,7 @@ function drawFielder(fieldingTeamSprites, fielder, ball, flip)
     local danceOffset = FielderDanceAnimator:currentValue()
 
     local x = fielder.x
-    local y = fielder.y + danceOffset
+    local y = fielder.y - danceOffset
     fieldingTeamSprites[fielder.spriteIndex].smiling:draw(fielder.x, y - 20, flip)
     return drawFielderGlove(ball, x, y)
 end
diff --git a/src/utils.lua b/src/utils.lua
index 8da3ac7..64f0692 100644
--- a/src/utils.lua
+++ b/src/utils.lua
@@ -1,16 +1,14 @@
 -- luacheck no new globals
 utils = {}
 
---- @alias XyPair {
----   x: number,
----   y: number,
---- }
+---@class XyPair
+---@field x: number,
+---@field y: number,
 
---- @alias Point3d {
----   x: number,
----   y: number,
----   z: number,
---- }
+---@class Point3d
+---@field x number,
+---@field y number,
+---@field z number,
 
 local sqrt <const> = math.sqrt