From 5d1c36ea2fd83367d12cd09aabec0e5ea03ae7cb Mon Sep 17 00:00:00 2001
From: annabunches <annabunches@gmail.com>
Date: Fri, 29 Sep 2023 22:07:02 -0400
Subject: [PATCH] Improve firing code.

---
 src/bullet.lua      |   2 +-
 src/images/kani.png | Bin 659 -> 4601 bytes
 src/kani.lua        |  33 ++++++++++++++++++++++-----------
 src/main.lua        |   1 +
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/bullet.lua b/src/bullet.lua
index 3fcd6a1..88184fb 100644
--- a/src/bullet.lua
+++ b/src/bullet.lua
@@ -10,7 +10,7 @@ class("Bullet").extends(gfx.sprite)
 function Bullet:init(size, friendly)
    local img = gfx.image.new(size, size)
    gfx.pushContext(img)
-     gfx.drawCircleInRect(0, 0, size, size)
+     gfx.fillCircleInRect(0, 0, size, size)
    gfx.popContext()
 
    Bullet.super.init(self, img)
diff --git a/src/images/kani.png b/src/images/kani.png
index ede83a67e45bd58583c30cf3285b8a398f9d4a84..fb3ce138f93e403d1509df9ea23170dcd3ca6ec6 100644
GIT binary patch
literal 4601
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
ZPtjyP)pzkz$P|KDGZ$Ij`Dsb@e*u#5d_VvI

delta 591
zcmV-V0<iu0Ba;PxiBL{Q4GJ0x0000DNk~Le0000W0000W2m}BC0NHc0e*gdhBWXiJ
zP)S2WAaHVTW@&6?001bFosd0C!%!54pH}e;ozxDZkipT8W^(Y028TjzBN(01B*kJ9
zLy}Vb2mTZNF&zZKzu>Om?0chwgIT<AcpnbuyzjjinpPZtB*pw8Bx#vD{Uh(vyRsJF
zSZ0S!_GtM*k#z?hm)i6BO2g<&+j!N_{dpF`s0gGpRT^Y@35^4>JuNfCDmHH2{)zZO
zY=uc0il4;0VG<fPyZt1d1V5hUHmgy3F))4AHV$WW>0vQs!kCznwlr1e6q|jiLypfq
z1%WgsQg5nKnUWh(At#4pkt@<|YVx+Kyq;2q@)*m@B;1k6)8t|P_j~Q*yxMHEW|^P+
zRclVw9F5@p5!O6de}<LonyjVYZ>yQHtC@ek@e5)VP@%_qu$+^r5H1KE76>egTvdRR
z-w-H&&`Cr=R7l62RY?-VFbG3T{{Ln5(3!@7+3F)PAc5pS=7%C80vp6KeU!uFa*VmJ
zI_{qI)pa^%1vu%R6@b8$h@}||&<$t29XQAc6l}RKp@Wtluyf!Z8*->DvC?3{ZHO2s
zvDpI3iP84IU1u|L3Qj6mq+c7VY!3eOLV0#(1=trrOTl>o^NkxR(Mx%@hj)EHMd(V(
zZTNK=Q`b5QPh#i14G%#F|Kq}!A#QFye@eO(63d6wJt*4F95o&tT8J4r9lMY#dCY&V
dSbNcBd;nvbKr>p?;xPaK002ovPDHLkV1lJn3K9SS

diff --git a/src/kani.lua b/src/kani.lua
index 208c9fc..b1b1917 100644
--- a/src/kani.lua
+++ b/src/kani.lua
@@ -2,10 +2,16 @@
 import "CoreLibs/object"
 import "CoreLibs/graphics"
 import "CoreLibs/sprites"
+import "CoreLibs/timer"
 import "bullet"
 
 local gfx <const> = playdate.graphics
 
+-- the amount of charge needed to increase the shot size by 1
+local SHOT_INCREMENT <const> = 10
+-- maximum value the reserve charge can reach
+local MAX_CHARGE <const> = 100
+
 class("Kani").extends(gfx.sprite)
 
 function Kani:init()
@@ -17,8 +23,9 @@ function Kani:init()
    self:setGroupMask(0x2)
    self:setCollidesWithGroupsMask(0x19)
 
-   self.reserveCharge = 0
+   self.reserveCharge = 100
    self.shotCharge = 0
+   self.firingMode = false
 
    -- input handlers
    self.inputHandlers = {
@@ -31,31 +38,35 @@ function Kani:init()
       leftButtonUp =    function() self.vector.x = 0 end,
       rightButtonUp =   function() self.vector.x = 0 end,
       cranked = function(change, accelChange) self:chargeReserve(change) end,
-      AButtonDown = function() self:chargeShot(1) end,
+      AButtonDown = function()
+         self.firingTimer = playdate.timer.keyRepeatTimerWithDelay(0, 500, self.chargeShot, self)
+      end,
       AButtonUp = function() self:fire() end,
    }
 end
 
 function Kani:chargeReserve(change)
-   self.reserveCharge += change / 10
+   self.reserveCharge = math.min(self.reserveCharge + change / 15, 100)
+   print("Reserve charge at " .. self.reserveCharge)
 end
 
-function Kani:chargeShot(amount)
-   if self.reserveCharge > amount then
-      self.shotCharge += amount
-      self.reserveCharge -= amount
-   elseif self.reserveCharge > 0 then
-      self.shotCharge += self.reserveCharge
-      self.reserveCharge = 0
+function Kani:chargeShot()
+   if self.reserveCharge > SHOT_INCREMENT then
+      self.shotCharge += 1
+      self.reserveCharge -= SHOT_INCREMENT
+      print("Shot charged to size " .. self.shotCharge)
    end
 end
 
 function Kani:fire()
+   self.firingTimer:remove()
+
    if self.shotCharge <= 0 then
       return
    end
 
-   local bullet = Bullet(self.shotCharge)
+   print("Creating bullet of size " .. self.shotCharge)
+   local bullet = Bullet(self.shotCharge * 2)
    bullet:moveTo(self.x+16, self.y)
    bullet:add()
    self.shotCharge = 0
diff --git a/src/main.lua b/src/main.lua
index 4fd47ea..d83f738 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -49,6 +49,7 @@ end
 
 function playdate.update()
    gfx.sprite.update()
+   playdate.timer.updateTimers()
 end
 
 setup()