diff --git a/code/entities/player.lua b/code/entities/player.lua index 0100b6e..c09c9e3 100644 --- a/code/entities/player.lua +++ b/code/entities/player.lua @@ -113,10 +113,11 @@ function Player:Smart() if self.dashCooldownTimer == 0 and not self.isDashing and self.dashCount > 0 then + self:Unhook() -- state player - self.dashCount = self.dashCount - 1 self.isDashing = true + self.dashCount = self.dashCount - 1 -- get dash direction local vertical = 0 @@ -142,7 +143,7 @@ function Player:Smart() if Keybind:CheckPressed(Keybind.move.hook) then if self.isHooked then - self.isHooked = false + self:Unhook() else local anchor = self:CheckNearest("decoration",self.hookDistance) if anchor then @@ -207,6 +208,8 @@ 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) end + if Keybind:CheckDown(Keybind.move.left) then hook_angle = hook_angle + math.rad(0.05) end local pos_x = self.hookAnchor.x + self.hookedDistance * math.cos(hook_angle) local pos_y = self.hookAnchor.y + self.hookedDistance * math.sin(hook_angle) self.vel.x = self.vel.x + pos_x - self.pos.x @@ -292,3 +295,8 @@ function Player:HandleAnimation() end self.move_x = 0 end + +function Player:Unhook() + self.isHooked = false + self.hookAnchor = nil +end diff --git a/data/levels/level1.lua b/data/levels/level1.lua index 5b09d4a..0c1778b 100644 --- a/data/levels/level1.lua +++ b/data/levels/level1.lua @@ -3,26 +3,30 @@ return { tileset = tileset.library, properties = { darkness = false - }, + }, tiles = { - { 1, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 1}, - { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, - { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, - { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, - { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, - { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, - { 1, 13, 13, 13, 13, 13, 13, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 13, 13, 13, 13, 13, 13, 1}, - { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, - { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, - { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, - { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, - { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, - { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, - { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, - { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, - { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, - { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, + { 1, 4, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, + { 1, 4, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, + { 1, 4, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, + { 1, 4, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, + { 1, 4, 0, 0, 0, 2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 1}, + { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, + { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, + { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, + { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, + { 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, + { 1, 13, 13, 13, 13, 13, 13, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 13, 13, 13, 13, 13, 13, 1}, + { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, + { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, + { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, + { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, + { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, + { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, + { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, + { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, + { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, + { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1}, { 1, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1} }, objects = {} -} \ No newline at end of file +} diff --git a/to_do.txt b/to_do.txt deleted file mode 100644 index f0bf280..0000000 --- a/to_do.txt +++ /dev/null @@ -1,68 +0,0 @@ -(*) Ideas - ( ) DO FLIES - ( ) DO UI - ( ) DO DAMAGE TO PLAYER - -( ) Visual design - (~) Multicolor palette depending on area, with 3 main colors - (X) Library: Gold #fed100 - ( ) - ( ) Dialog - ( ) Fonts - ( ) Characters - ( ) Level design - ( ) Enemy design - -( ) Gameplay design - ( ) Level design - ( ) Mechanic design - ( ) Entity design - (~) FAIRY - (X) basic movement - (X) Fairy particles~~ - ( ) more intelligent movement - ( ) avoid getting stuck to walls - ( ) Playtest tools - -( ) Technical design - (?) Input - (X) ADDED KEYBINDS - ( ) - (?) Draw - (X) REHANDLE ANIMATIONS - (X) MAKE LIGHTING SYSTEM - (X) Pixel perfect entity drawing - ( ) Pixel perfect lights - (?) Player - (X) MASKS FUNCTIONALITY - ( ) - (?) Physics - (X) MAKE PHYSICS CONSISTENT - (X) MAKE HITBOXES - (X) PHYSICS BY FRAME - (X) DEACTIVATE ARROWS WHEN STUCK - ( ) - (~) Dialog - (X) Object and Basics - ( ) Fix font and align problems - ( ) Implement portrait - (X) Translating framework - ( ) Debug tools - ( ) Audio and BGM - (~) REMAKE LEVEL EDITOR - (~) ADD WAY TO EDIT A LEVEL (EDITOR MODE) - (X) SHOW PALETTE - (X) PICK UP TILE FROM PALETTE - (X) PLACE PICKED UP TILE - ( ) WAY TO INSERT ENTITIES IN THE LEVEL - (X) ADD WAY TO SAVE A LEVEL - -( ) Narrative design - ( ) Dialog - ( ) Characters - ( ) Area design - ( ) Translations - ( ) SPA "es_ES" - ( ) ENG "en_UK" - ( ) CAT "ca_ES" - ( ) HEON "Myrheonian"