diff --git a/code/darkness.lua b/code/darkness.lua index 67233d7..d40f580 100644 --- a/code/darkness.lua +++ b/code/darkness.lua @@ -18,7 +18,7 @@ end function Darkness.Reset() love.graphics.setCanvas(Canvas.Darkness) love.graphics.setBlendMode("replace") - love.graphics.setColor(0.1,0.1,0.1,1) + love.graphics.setColor(0,0,0,0.95) love.graphics.rectangle( "fill", 0, diff --git a/code/entities/hook_anchor.lua b/code/entities/hook_anchor.lua index 04ee938..aef91e5 100644 --- a/code/entities/hook_anchor.lua +++ b/code/entities/hook_anchor.lua @@ -28,9 +28,9 @@ end function HookAnchor:DrawBackground() Entity.DrawBackground(self) - love.graphics.setColor(1,1,1,1) + love.graphics.setColor(1,1,1,0) love.graphics.circle( - "line", + "fill", -Camera.pos.x + self.pos.x, -Camera.pos.y + self.pos.y, self.hookDistance diff --git a/code/entities/player.lua b/code/entities/player.lua index 737dd61..b1202eb 100644 --- a/code/entities/player.lua +++ b/code/entities/player.lua @@ -199,6 +199,16 @@ function Player:DoPhysics() if self.isHooked then local hook = Vector(self.pos.x, self.pos.y, self.hookAnchor.x, self.hookAnchor.y) if GetVectorValue(hook) > self.hookDistance then + local hook_angle = GetAngleFromVector(hook[1],hook[2])-math.rad(180) + if Keybind:CheckDown(Keybind.move.right) then + hook_angle = hook_angle - math.rad(0.05) + self.move_x = 0 + end + if Keybind:CheckDown(Keybind.move.left) then + hook_angle = hook_angle + math.rad(0.05) + self.move_x = 0 + end + local particle_data = { animation = self.body, sprite_tint = HEX2RGB("#fed100"), @@ -209,15 +219,7 @@ function Player:DoPhysics() } } Particle:New(self.pos.x,self.pos.y,particle_data) - local hook_angle = GetAngleFromVector(hook[1],hook[2])-math.rad(180) - if Keybind:CheckDown(Keybind.move.right) then - hook_angle = hook_angle - math.rad(0.05) - self.move_x = 0 - end - if Keybind:CheckDown(Keybind.move.left) then - hook_angle = hook_angle + math.rad(0.05) - self.move_x = 0 - end + local pos_x = self.hookAnchor.x + self.hookDistance * math.cos(hook_angle) local pos_y = self.hookAnchor.y + self.hookDistance * math.sin(hook_angle) self.vel.x = self.vel.x + pos_x - self.pos.x diff --git a/code/gameworld.lua b/code/gameworld.lua index 232f249..9714114 100644 --- a/code/gameworld.lua +++ b/code/gameworld.lua @@ -36,7 +36,7 @@ end function GameworldDrawParticles() love.graphics.setColor(0.7,0.7,0.7) - for _, particle in pairs(LoadedParticles) do + for _, particle in pairs(LoadedObjects.Particles) do particle:HandleAnimation() end end diff --git a/data/shaders.lua b/data/shaders.lua index 06e71c4..17d4888 100644 --- a/data/shaders.lua +++ b/data/shaders.lua @@ -13,7 +13,7 @@ Shader.RadiusGradient = love.graphics.newShader[[ float distance_y = pos_y - screen_coords.y / scale; float distance = sqrt( pow(distance_x,2) + pow(distance_y,2) ) ; if (distance < range){ - float alpha = 1-(2*distance/range); + float alpha = 1-(5*distance/range); if (pixel.a > alpha){ pixel.a = alpha; }