From 017ae1a49cc32e6b8ef7e002418d588a0aac087b Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sun, 16 Jun 2019 18:10:39 +0200 Subject: [PATCH] chore(levels): rename Actor.level to Actor.scene --- CHANGELOG.md | 3 +++ .../scenes/levels/entities/block.lua | 16 ++++++++-------- .../scenes/levels/entities/debris.lua | 2 +- .../scenes/levels/entities/ennemies/parent.lua | 6 +++--- .../scenes/levels/entities/gfx/gfx.lua | 2 +- .../scenes/levels/entities/gfx/numbers.lua | 2 +- .../scenes/levels/entities/loot/coin.lua | 8 ++++---- .../scenes/levels/entities/loot/parent.lua | 10 +++++----- .../scenes/levels/entities/parent.lua | 2 +- .../scenes/levels/entities/player.lua | 14 +++++++------- .../scenes/levels/entities/weapon.lua | 2 +- 11 files changed, 35 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5405cb8..d37f520 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - **levels:** World is now a gamecore World2D derivative +- **levels:** Actors use now gamecore naming scheme + + ### Removed - **main:** All functions already provided by gamecore have been removed. diff --git a/imperium-porcorum.love/scenes/levels/entities/block.lua b/imperium-porcorum.love/scenes/levels/entities/block.lua index 1066c23..73e120e 100644 --- a/imperium-porcorum.love/scenes/levels/entities/block.lua +++ b/imperium-porcorum.love/scenes/levels/entities/block.lua @@ -8,20 +8,20 @@ function Block:new(level, x , y, item) end function Block:draw(dt) - self.level.assets.tileset["block"]:drawTile(1, self.x, self.y) + self.scene.assets.tileset["block"]:drawTile(1, self.x, self.y) end function Block:breakBlock() local x, y = self:getCenter() local spd = 250 local dist = 0 - self.obj.Debris(self.level, x+dist, y-dist, spd, 270+45) - self.obj.Debris(self.level, x+dist, y+dist, spd, 45) - self.obj.Debris(self.level, x-dist, y+dist, spd, 180+45) - self.obj.Debris(self.level, x-dist, y-dist, spd, 180-45) - self.obj.GFX(self.level, self.x+8, self.y+8, "poof", 1) - self.level.assets:playSFX("break") - self.level.playermanager.score = self.level.playermanager.score + 10 + self.obj.Debris(self.scene, x+dist, y-dist, spd, 270+45) + self.obj.Debris(self.scene, x+dist, y+dist, spd, 45) + self.obj.Debris(self.scene, x-dist, y+dist, spd, 180+45) + self.obj.Debris(self.scene, x-dist, y-dist, spd, 180-45) + self.obj.GFX(self.scene, self.x+8, self.y+8, "poof", 1) + self.scene.assets:playSFX("break") + self.scene.playermanager.score = self.scene.playermanager.score + 10 self:destroy() end diff --git a/imperium-porcorum.love/scenes/levels/entities/debris.lua b/imperium-porcorum.love/scenes/levels/entities/debris.lua index 4af3ed2..3f6844e 100644 --- a/imperium-porcorum.love/scenes/levels/entities/debris.lua +++ b/imperium-porcorum.love/scenes/levels/entities/debris.lua @@ -49,7 +49,7 @@ end function Debris:draw(dt) local rotation = math.floor(self.rotation/45)*45 drawx, drawy = self:getCenter() - self.level.assets.images["debris"]:draw(drawx, drawy, rotation, 1, 1, 4, 4) + self.scene.assets.images["debris"]:draw(drawx, drawy, rotation, 1, 1, 4, 4) end return Debris diff --git a/imperium-porcorum.love/scenes/levels/entities/ennemies/parent.lua b/imperium-porcorum.love/scenes/levels/entities/ennemies/parent.lua index 70cf42f..17c7305 100644 --- a/imperium-porcorum.love/scenes/levels/entities/ennemies/parent.lua +++ b/imperium-porcorum.love/scenes/levels/entities/ennemies/parent.lua @@ -30,11 +30,11 @@ end function Ennemy:getDamage(base_damage) local damage = math.max(base_damage - self.armor, 1) self.hp = math.max(0, self.hp - damage) - self.obj.Numbers(self.level, self.x+8, self.y+8, damage, {1,0,0}) + self.obj.Numbers(self.scene, self.x+8, self.y+8, damage, {1,0,0}) if (self.hp == 0) then self:destroy() - self.obj.GFX(self.level, self.x+8, self.y+8, "poof", 1) - self.level.playermanager.score = self.level.playermanager.score + 100 + self.obj.GFX(self.scene, self.x+8, self.y+8, "poof", 1) + self.scene.playermanager.score = self.scene.playermanager.score + 100 end end diff --git a/imperium-porcorum.love/scenes/levels/entities/gfx/gfx.lua b/imperium-porcorum.love/scenes/levels/entities/gfx/gfx.lua index 1c50c6b..4009e6f 100644 --- a/imperium-porcorum.love/scenes/levels/entities/gfx/gfx.lua +++ b/imperium-porcorum.love/scenes/levels/entities/gfx/gfx.lua @@ -10,7 +10,7 @@ function GFX:new(level, x, y, spritename, animID) width = 16 height = 16 GFX.super.new(self, level, "gfx", x - (width/2), y - (height/2), width, height) - self.animation = self.level.assets.sprites[spritename]:clone() + self.animation = self.scene.assets.sprites[spritename]:clone() self.duration = self.animation:getAnimationDuration() self.timer = 0 end diff --git a/imperium-porcorum.love/scenes/levels/entities/gfx/numbers.lua b/imperium-porcorum.love/scenes/levels/entities/gfx/numbers.lua index 96c511c..5c0cfe9 100644 --- a/imperium-porcorum.love/scenes/levels/entities/gfx/numbers.lua +++ b/imperium-porcorum.love/scenes/levels/entities/gfx/numbers.lua @@ -20,7 +20,7 @@ end function NumberGFX:draw() love.graphics.setColor(self.color) - self.level.assets.fonts["medium"]:set() + self.scene.assets.fonts["medium"]:set() love.graphics.printf(self.number, self.x+8-40, self.y+8, 80, "center") utils.graphics.resetColor() end diff --git a/imperium-porcorum.love/scenes/levels/entities/loot/coin.lua b/imperium-porcorum.love/scenes/levels/entities/loot/coin.lua index 03fe5b4..c28da8c 100644 --- a/imperium-porcorum.love/scenes/levels/entities/loot/coin.lua +++ b/imperium-porcorum.love/scenes/levels/entities/loot/coin.lua @@ -9,11 +9,11 @@ function Coin:new(level, x, y, anim, value) end function Coin:takeLoot() - self.obj.GFX(self.level, self.x+8, self.y+8, "sparkle", 1) + self.obj.GFX(self.scene, self.x+8, self.y+8, "sparkle", 1) self:destroy() - self.level.playermanager.gold = self.level.playermanager.gold + self.value - self.level.playermanager.score = self.level.playermanager.score + 10 - self.level.assets:playSFX("collectcoin") + self.scene.playermanager.gold = self.scene.playermanager.gold + self.value + self.scene.playermanager.score = self.scene.playermanager.score + 10 + self.scene.assets:playSFX("collectcoin") end return Coin diff --git a/imperium-porcorum.love/scenes/levels/entities/loot/parent.lua b/imperium-porcorum.love/scenes/levels/entities/loot/parent.lua index d0e0f70..e3f4378 100644 --- a/imperium-porcorum.love/scenes/levels/entities/loot/parent.lua +++ b/imperium-porcorum.love/scenes/levels/entities/loot/parent.lua @@ -9,11 +9,11 @@ function Loot:new(level, x, y, name) end function Loot:takeLoot() - self.obj.GFX(self.level, self.x+8, self.y+8, "sparkle", 1) + self.obj.GFX(self.scene, self.x+8, self.y+8, "sparkle", 1) self:destroy() - self.level.playermanager.gold = self.level.playermanager.gold + 1 - self.level.playermanager.score = self.level.playermanager.score + 10 - self.level.assets:playSFX("collectcoin") + self.scene.playermanager.gold = self.scene.playermanager.gold + 1 + self.scene.playermanager.score = self.scene.playermanager.score + 10 + self.scene.assets:playSFX("collectcoin") end function Loot:update(dt) @@ -21,7 +21,7 @@ function Loot:update(dt) end function Loot:draw() - self.level.assets.sprites[self.sprite]:drawAnimation(self.x, self.y) + self.scene.assets.sprites[self.sprite]:drawAnimation(self.x, self.y) end return Loot diff --git a/imperium-porcorum.love/scenes/levels/entities/parent.lua b/imperium-porcorum.love/scenes/levels/entities/parent.lua index 95f3578..51fe61a 100644 --- a/imperium-porcorum.love/scenes/levels/entities/parent.lua +++ b/imperium-porcorum.love/scenes/levels/entities/parent.lua @@ -8,7 +8,7 @@ function Entity:new(level, collType, x, y, w, h) -- On enregistre une nouvelle e end function Entity:initPhysics(level, collType, x, y, w, h) - self.level = level + self.scene = level self.world = level.world self.camera = level.camera self.obj = self.world.obj diff --git a/imperium-porcorum.love/scenes/levels/entities/player.lua b/imperium-porcorum.love/scenes/levels/entities/player.lua index 0ccb605..0988196 100644 --- a/imperium-porcorum.love/scenes/levels/entities/player.lua +++ b/imperium-porcorum.love/scenes/levels/entities/player.lua @@ -65,8 +65,8 @@ end -- Physics and function called every game update function Player:update(dt) - self.keys = self.level.sources[1].keys - self.level.assets.sprites[self.stats.race]:setCustomSpeed(math.abs(self.xsp / 60)) + self.keys = self.scene.sources[1].keys + self.scene.assets.sprites[self.stats.race]:setCustomSpeed(math.abs(self.xsp / 60)) self:actionMove(dt) self:shoot(dt) @@ -174,7 +174,7 @@ function Player:actionMove(dt) if ((self.onGround == true) or multijump) and self.keys["A"].isPressed then self.ysp = self.jmp self.isJumping = true - self.level.assets:playSFX("jump") + self.scene.assets:playSFX("jump") end if (self.isJumping == true) and (self.ysp < (-4 * 60)) and (not (self.keys["A"].isDown)) then @@ -185,7 +185,7 @@ function Player:actionMove(dt) end function Player:launchWeapon() - self.obj.Weapon(self.level, self.center.x, self.center.y, self.weapon, 350 * utils.math.sign(self.direction)) + self.obj.Weapon(self.scene, self.center.x, self.center.y, self.weapon, 350 * utils.math.sign(self.direction)) end function Player:changeWeapon(id) @@ -222,11 +222,11 @@ local animation = "idle" end end - if not (self.level.assets.sprites[self.stats.race]:animationExist(animation)) then + if not (self.scene.assets.sprites[self.stats.race]:animationExist(animation)) then animation = "idle" end - self.level.assets.sprites[self.stats.race]:changeAnimation(animation, false) + self.scene.assets.sprites[self.stats.race]:changeAnimation(animation, false) return animation end @@ -234,7 +234,7 @@ end function Player:draw(dt) local drawx, drawy = utils.math.floorCoord(self.center.x, self.center.y) local animation = self:getAnimation() - self.level.assets.sprites[self.stats.race]:drawAnimation(drawx, drawy, 0, self.direction, 1, 16, 36) + self.scene.assets.sprites[self.stats.race]:drawAnimation(drawx, drawy, 0, self.direction, 1, 16, 36) end -- DEATH and HIT functions diff --git a/imperium-porcorum.love/scenes/levels/entities/weapon.lua b/imperium-porcorum.love/scenes/levels/entities/weapon.lua index 117ebd1..e464d4c 100644 --- a/imperium-porcorum.love/scenes/levels/entities/weapon.lua +++ b/imperium-porcorum.love/scenes/levels/entities/weapon.lua @@ -59,7 +59,7 @@ end function Weapon:draw(dt) local rotation = math.floor(self.rotation/45)*45 drawx, drawy = self:getCenter() - self.level.assets.tileset["weapon"]:drawTile(self.weaponid, drawx, drawy, + self.scene.assets.tileset["weapon"]:drawTile(self.weaponid, drawx, drawy, rotation, self.direction, 1, 8, 8) end