feat: player now can click right to punch mobs

1 files changed, 56 insertions, 8 deletions

diff --git a/objects/Player.lua b/objects/Player.lua
index a91be76..c23fb14 100644
--- a/objects/Player.lua
+++ b/objects/Player.lua
@@ -12,7 +12,7 @@ function Player.new()
         objectType = "player",
         x = love.graphics.getWidth() / 2,
         y = love.graphics.getHeight() / 2,
-        r = config.playerSize,
+        r = config.player.size,
         zoom = 1/16,
         speed = config.defaultPlayerSpeed,
         shieldedTill = 0,
@@ -40,6 +40,7 @@ function Player:setY(y)
 end
 
 function Player:move(v)
+    if self.dashing and self.dashing >= G.time then return end
     self.moving = (v.x ~= 0 or v.y ~= 0)
     self.physicsBody:setLinearVelocity(v.x, v.y)
 end
@@ -73,16 +74,16 @@ function Player:shoot(target)
     if currentBullet == "redheart" or #hearts == 1 then
         -- set a charging time to warn the player that this is a deadly move
         -- if no charging time is set, then set it and shoot no bullet
-        if not G.player.chargingStarted then
-            G.player.chargingStarted = G.time
+        if not self.chargingStarted then
+            self.chargingStarted = G.time
             return
         end
         -- if charging time is set, then check if it's over 1 second
         -- if not, shoot no bullet
-        if G.time - G.player.chargingStarted <= 1 then return
+        if G.time - self.chargingStarted <= 1 then return
         -- if time's up, reset timer and continue shooting
         else
-            G.player.chargingStarted = nil
+            self.chargingStarted = nil
         end
     end
 
@@ -90,14 +91,61 @@ function Player:shoot(target)
     bullets.fire(currentBullet, target, self)
     table.remove(self.hearts)
 
-    G.player.shootCooldown = G.time + config.playerShootCooldown
+    self.shootCooldown = G.time + config.playerShootCooldown
+end
+
+function Player:punchCoolingDown()
+    return self.punchCooldown and self.punchCooldown > G.time
+end
+
+function Player:punch(target)
+    -- cool down after one punch
+    if self:punchCoolingDown() then return end
+    self.punchCooldown = G.time + config.player.punch.cooldown
+
+    -- arguments
+    local attack_radius = config.player.punch.radius
+    local attack_angle = config.player.punch.angle
+    local knockback_force = config.player.punch.force
+
+    -- calculate attack direction
+    local dx = target.x - self.x
+    local dy = target.y - self.y
+    local attack_angle_rad = utils.atan2(dy, dx)
+    local length = math.sqrt(dx * dx + dy * dy)
+    if length == 0 then return end
+    local normX, normY = dx / length, dy / length
+
+    -- find enemies in range
+    for _, enemy in ipairs(G.currentRoom.objects.enemies) do
+        local ex, ey = enemy.x, enemy.y
+        local edx, edy = ex - self.x, ey - self.y
+        local distance = math.sqrt(edx * edx + edy * edy)
+        local enemy_angle_rad = utils.atan2(edy, edx)
+        local angle_diff = math.abs((enemy_angle_rad - attack_angle_rad + math.pi) % (2 * math.pi) - math.pi) -- 计算夹角
+
+        -- check if enemy is in range
+        if distance <= attack_radius + enemy.r + self.r and angle_diff <= math.rad(attack_angle / 2) then
+            enemy:takeDamage(config.player.punch.damage)
+            -- knock back enemy
+            local normEdx, normEdy = edx / distance, edy / distance
+            local knockbackX, knockbackY = normEdx * knockback_force, normEdy * knockback_force
+            enemy.physicsBody:applyLinearImpulse(knockbackX, knockbackY)
+        end
+    end
+
+    audio.play("punch")
 end
 
 function Player:onContact(other, contact)
     -- detect contact with enemies
-    -- if collision occurs, take it as an attack
     if other.objectType == "enemy" then
-        if not (other.stunned or self:isShielded()) then
+        -- if player's dashing, deal damage to enemies
+        if self.dashing and self.dashing >= G.time then
+            other:takeDamage(config.player.dash.damage)
+        -- if player's not shielded nor the enemy's stunned
+        -- take the damage
+        elseif not (other.stunned or self:isShielded()) then
             audio.play("getsHit")
             table.remove(self.hearts)
             -- shield this player