Linting, and pitcherIsReady() timing tweak
This commit is contained in:
parent
699dab8c7d
commit
56a5e197cd
|
@ -18,10 +18,9 @@ function throwMeter:draw(x, y)
|
||||||
-- Or maybe dither if it's too soft - bend if it's too hard
|
-- Or maybe dither if it's too soft - bend if it's too hard
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function throwMeter:drawNearFielder(fielder)
|
function throwMeter:drawNearFielder(fielder)
|
||||||
if not fielder then
|
if not fielder then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
throwMeter:draw(fielder.x - 25, fielder.y - 10)
|
throwMeter:draw(fielder.x - 25, fielder.y - 10)
|
||||||
end
|
end
|
||||||
|
|
20
src/main.lua
20
src/main.lua
|
@ -565,12 +565,12 @@ function Game:updateGameState()
|
||||||
-- Give the player a moment to enjoy their home run.
|
-- Give the player a moment to enjoy their home run.
|
||||||
playdate.timer.new(1500, function()
|
playdate.timer.new(1500, function()
|
||||||
self:returnToPitcher()
|
self:returnToPitcher()
|
||||||
end)
|
actionQueue:upsert("waitForPitcherToHaveBall", 10000, function()
|
||||||
actionQueue:upsert("waitForPitcherToHaveBall", 10000, function()
|
while not self:pitcherIsReady() do
|
||||||
while not self:pitcherIsReady() do
|
coroutine.yield()
|
||||||
coroutine.yield()
|
end
|
||||||
end
|
self.state.offenseState = C.Offense.batting
|
||||||
self.state.offenseState = C.Offense.batting
|
end)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -604,12 +604,8 @@ function Game:update()
|
||||||
local ballHeldBy
|
local ballHeldBy
|
||||||
for _, fielder in pairs(self.fielding.fielders) do
|
for _, fielder in pairs(self.fielding.fielders) do
|
||||||
addDraw(fielder.y + danceOffset, function()
|
addDraw(fielder.y + danceOffset, function()
|
||||||
local ballHeldByThisFielder = drawFielder(
|
local ballHeldByThisFielder =
|
||||||
self.state.fieldingTeamSprites,
|
drawFielder(self.state.fieldingTeamSprites, self.state.ball, fielder.x, fielder.y + danceOffset)
|
||||||
self.state.ball,
|
|
||||||
fielder.x,
|
|
||||||
fielder.y + danceOffset
|
|
||||||
)
|
|
||||||
if ballHeldByThisFielder then
|
if ballHeldByThisFielder then
|
||||||
ballHeldBy = fielder
|
ballHeldBy = fielder
|
||||||
end
|
end
|
||||||
|
|
|
@ -66,7 +66,7 @@ end
|
||||||
function pitchTracker:recordIfPassed(ball)
|
function pitchTracker:recordIfPassed(ball)
|
||||||
if ball.y < C.StrikeZoneStartY then
|
if ball.y < C.StrikeZoneStartY then
|
||||||
self.recordedPitchX = nil
|
self.recordedPitchX = nil
|
||||||
elseif not pitchTracker.recordedPitchX then
|
elseif not self.recordedPitchX then
|
||||||
self.recordedPitchX = ball.x
|
self.recordedPitchX = ball.x
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -158,4 +158,4 @@ function throwMeter:applyCharge(chargeAmount)
|
||||||
else
|
else
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue