From 56a5e197cd173a8bef12b3cad3d956dff37ad014 Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Wed, 19 Feb 2025 23:38:51 -0500 Subject: [PATCH] Linting, and pitcherIsReady() timing tweak --- src/draw/throw-meter.lua | 3 +-- src/main.lua | 20 ++++++++------------ src/pitching.lua | 4 ++-- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/draw/throw-meter.lua b/src/draw/throw-meter.lua index f00535b..7f9da4b 100644 --- a/src/draw/throw-meter.lua +++ b/src/draw/throw-meter.lua @@ -18,10 +18,9 @@ function throwMeter:draw(x, y) -- Or maybe dither if it's too soft - bend if it's too hard end - function throwMeter:drawNearFielder(fielder) if not fielder then return end throwMeter:draw(fielder.x - 25, fielder.y - 10) -end \ No newline at end of file +end diff --git a/src/main.lua b/src/main.lua index dbfa2d1..4c8a14f 100644 --- a/src/main.lua +++ b/src/main.lua @@ -565,12 +565,12 @@ function Game:updateGameState() -- Give the player a moment to enjoy their home run. playdate.timer.new(1500, function() self:returnToPitcher() - end) - actionQueue:upsert("waitForPitcherToHaveBall", 10000, function() - while not self:pitcherIsReady() do - coroutine.yield() - end - self.state.offenseState = C.Offense.batting + actionQueue:upsert("waitForPitcherToHaveBall", 10000, function() + while not self:pitcherIsReady() do + coroutine.yield() + end + self.state.offenseState = C.Offense.batting + end) end) end end @@ -604,12 +604,8 @@ function Game:update() local ballHeldBy for _, fielder in pairs(self.fielding.fielders) do addDraw(fielder.y + danceOffset, function() - local ballHeldByThisFielder = drawFielder( - self.state.fieldingTeamSprites, - self.state.ball, - fielder.x, - fielder.y + danceOffset - ) + local ballHeldByThisFielder = + drawFielder(self.state.fieldingTeamSprites, self.state.ball, fielder.x, fielder.y + danceOffset) if ballHeldByThisFielder then ballHeldBy = fielder end diff --git a/src/pitching.lua b/src/pitching.lua index 7db3d08..449aaf2 100644 --- a/src/pitching.lua +++ b/src/pitching.lua @@ -66,7 +66,7 @@ end function pitchTracker:recordIfPassed(ball) if ball.y < C.StrikeZoneStartY then self.recordedPitchX = nil - elseif not pitchTracker.recordedPitchX then + elseif not self.recordedPitchX then self.recordedPitchX = ball.x end end @@ -158,4 +158,4 @@ function throwMeter:applyCharge(chargeAmount) else return nil end -end \ No newline at end of file +end