Weapons bounding box follows

src/nodes/weapon.lua

@@ -131,7 +131,9 @@ function Weapon:collide(node, dt, mtv_x, mtv_y)
 
     if node.hurt then
         node:hurt(self.damage)
-        self.collider:setGhost(self.bb)
+        if self.player then
+            self.collider:setGhost(self.bb)
+        end
     end
 
     if self.hitAudioClip and node.hurt then
@@ -145,8 +147,8 @@ function Weapon:collide(node, dt, mtv_x, mtv_y)
 end
 
 function Weapon:initializeBoundingBox(collider)
-    self.boxTopLeft = {x = self.position.x + self.bbox_offset_x,
-                        y = self.position.y + self.bbox_offset_y}
+    self.boxTopLeft = {x = self.position.x + self.bbox_offset_x[1],
+                        y = self.position.y + self.bbox_offset_y[1]}
     self.boxWidth = self.bbox_width
     self.boxHeight = self.bbox_height
 
@@ -206,18 +208,19 @@ function Weapon:update(dt)
 
         if not self.position or not self.position.x or not player.position or not player.position.x then return end
 
+        local framePos = (player.wielding) and self.animation.position or 1
         if player.character.direction == "right" then
             self.position.x = math.floor(player.position.x) + (plyrOffset-self.hand_x) +player.offset_hand_left[1]
             self.position.y = math.floor(player.position.y) + (-self.hand_y) + player.offset_hand_left[2] 
 
-            self.bb:moveTo(self.position.x + self.bbox_offset_x + self.bbox_width/2,
-                           self.position.y + self.bbox_offset_y + self.bbox_height/2)
+            self.bb:moveTo(self.position.x + self.bbox_offset_x[framePos] + self.bbox_width/2,
+                           self.position.y + self.bbox_offset_y[framePos] + self.bbox_height/2)
         else
             self.position.x = math.floor(player.position.x) + (plyrOffset+self.hand_x) +player.offset_hand_right[1]
             self.position.y = math.floor(player.position.y) + (-self.hand_y) + player.offset_hand_right[2] 
 
-            self.bb:moveTo(self.position.x - self.bbox_offset_x - self.bbox_width/2,
-                           self.position.y + self.bbox_offset_y + self.bbox_height/2)
+            self.bb:moveTo(self.position.x - self.bbox_offset_x[framePos] - self.bbox_width/2,
+                           self.position.y + self.bbox_offset_y[framePos] + self.bbox_height/2)
         end
 
         if player.offset_hand_right[1] == 0 or player.offset_hand_left[1] == 0 then
@@ -226,7 +229,6 @@ function Weapon:update(dt)
 
         if player.wielding and self.animation and self.animation.status == "finished" then
             self.collider:setGhost(self.bb)
-            self.wielding = false
             player.wielding = false
             self.animation = self.defaultAnimation
         end
@@ -257,7 +259,6 @@ end
 
 --handles a weapon being activated
 function Weapon:wield()
-    if self.wielding then return end
     self.collider:setSolid(self.bb)
 
     self.player.wielding = true

src/nodes/weapons/mace.lua

@@ -16,8 +16,8 @@ return {
     damage = 4,
     bbox_width = 25,
     bbox_height = 25,
-    bbox_offset_x = 25,
-    bbox_offset_y = 25,
+    bbox_offset_x = {0,3,25},
+    bbox_offset_y = {0,1,25},
     hitAudioClip = 'mace_hit',
     animations = {
         default = {'once', {'1,1'}, 1},

src/nodes/weapons/mallet.lua

@@ -13,11 +13,11 @@ return{
     frameAmt = 3,
     width = 30,
     height = 40,
-    damage = 4,
+    damage = 10,
     bbox_width = 16,
-    bbox_height = 16,
-    bbox_offset_x = 6,
-    bbox_offset_y = 16,
+    bbox_height = 28,
+    bbox_offset_x = {0,4,6,4},
+    bbox_offset_y = {0,0,16,0},
     hitAudioClip = 'mallet_hit',
     animations = {
         default = {'once', {'1,1'}, 1},

src/nodes/weapons/sword.lua

@@ -15,10 +15,10 @@ return{
     height = 40,
     damage = 4,
     dead = false,
-    bbox_width = 28,
+    bbox_width = 40,
     bbox_height = 7,
-    bbox_offset_x = 21,
-    bbox_offset_y = 28,
+    bbox_offset_x = {21,21,21},
+    bbox_offset_y = {28,28,28},
     unuseAudioClip = 'sword_sheathed',
     hitAudioClip = 'sword_hit',
     swingAudioClip = 'sword_air',

src/nodes/weapons/torch.lua

@@ -14,10 +14,10 @@ return{
     width = 48,
     height = 48,
     damage = 4,
-    bbox_width = 20,
+    bbox_width = 30,
     bbox_height = 33,
-    bbox_offset_x = 6 ,
-    bbox_offset_y = 17,    
+    bbox_offset_x = {6,12,12,12} ,
+    bbox_offset_y = {17,17,17,17},
     swingAudioClip = 'fire_thrown',
     isFlammable = true,
     animations = {