|
|
@ -15,7 +15,7 @@ function Player:new(p, x, y, health, image, speed) |
|
|
|
|
|
|
|
|
|
|
|
-- Collision Stuff |
|
|
|
-- Collision Stuff |
|
|
|
--self.collider = World:newRectangleCollider(x, y, 50, 62) |
|
|
|
--self.collider = World:newRectangleCollider(x, y, 50, 62) |
|
|
|
self.collider = World:newCircleCollider(x, y, 24) |
|
|
|
self.collider = World:newCircleCollider(x, y, 24 * X_SCALE) |
|
|
|
self.collider:setFixedRotation(true) |
|
|
|
self.collider:setFixedRotation(true) |
|
|
|
|
|
|
|
|
|
|
|
if self.p == 1 then |
|
|
|
if self.p == 1 then |
|
|
@ -27,6 +27,8 @@ function Player:new(p, x, y, health, image, speed) |
|
|
|
-- Rotation Stuff |
|
|
|
-- Rotation Stuff |
|
|
|
self.rotation = math.rad(90) |
|
|
|
self.rotation = math.rad(90) |
|
|
|
self.rotSpeed = 2 |
|
|
|
self.rotSpeed = 2 |
|
|
|
|
|
|
|
--self.scaleX = 1 * _G.X_SCALE |
|
|
|
|
|
|
|
--self.scaleY = 1 * _G.Y_SCALE |
|
|
|
self.scaleX = 1 |
|
|
|
self.scaleX = 1 |
|
|
|
self.scaleY = 1 |
|
|
|
self.scaleY = 1 |
|
|
|
self.originX = self.width / 2 |
|
|
|
self.originX = self.width / 2 |
|
|
|