Compare commits

..

3 commits

Author SHA1 Message Date
Kazhnuz
ffd58ea1cb fix(hitbox3D): adapt dz to oz checking collision 2022-01-23 18:55:48 +01:00
Kazhnuz
0b77dc8857 fix: comment out unused attacks 2022-01-07 13:11:41 +01:00
Kazhnuz Klappsthul
dc61322c16 Merge pull request 'Refonte pour utiliser le systeme de GUI' (#112) from feat/gui into master
Reviewed-on: sonic/sonic-radiance#112
2022-01-06 19:15:13 +01:00
2 changed files with 9 additions and 9 deletions

View file

@ -134,7 +134,7 @@ end
function Hitbox3D:checkCollisionAtPoint(dx, dy, dz, filter) function Hitbox3D:checkCollisionAtPoint(dx, dy, dz, filter)
self:updatePosition() self:updatePosition()
local dx, dy = self.ox + dx, self.oy + dy, self.oz + dz local dx, dy, dz = self.ox + dx, self.oy + dy, self.oz + dz
local x, y, z, cols, colNumber = self.world:checkCollisionAtPoint(self, dx, dy, dz, filter) local x, y, z, cols, colNumber = self.world:checkCollisionAtPoint(self, dx, dy, dz, filter)
local newx, newy, newz = self:getNewOwnerPosition(x, y, z) local newx, newy, newz = self:getNewOwnerPosition(x, y, z)

View file

@ -5,12 +5,12 @@ return {
{"homming", 5}, {"homming", 5},
{"tornado", 9}, {"tornado", 9},
{"sonicwind", 9}, {"sonicwind", 9},
{"spinattack", 15}, -- {"spinattack", 15},
{"sonicflare", 18}, -- {"sonicflare", 18},
{"spindash", 26}, -- {"spindash", 26},
{"soniccracker", 30}, -- {"soniccracker", 30},
{"hommingattack", 35}, -- {"hommingattack", 35},
{"bluetornado", 40}, -- {"bluetornado", 40},
{"boost", 62}, -- {"boost", 62},
{"lightspeedattack", 70}, -- {"lightspeedattack", 70},
} }