scenes/level: rename [actor].level to [actor].scene

It will facilitate the port to gamecore actor system
This commit is contained in:
Kazhnuz 2019-05-30 20:05:09 +02:00
parent cb831e117f
commit 2e70067303
10 changed files with 24 additions and 24 deletions

View File

@ -8,7 +8,7 @@ function Block:new(world, 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()
@ -20,8 +20,8 @@ function Block:breakBlock()
self.obj.Debris(self.world, x-dist, y+dist, spd, 180+45)
self.obj.Debris(self.world, x-dist, y-dist, spd, 180-45)
self.obj.GFX(self.world, self.x+8, self.y+8, "poof", 1)
self.level.assets:playSFX("break")
self.level.playermanager.score = self.level.playermanager.score + 10
self.scene.assets:playSFX("break")
self.scene.playermanager.score = self.scene.playermanager.score + 10
self:destroy()
end

View File

@ -49,7 +49,7 @@ end
function Debris:draw(dt)
local rotation = math.floor(self.rotation/45)*45
local 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

View File

@ -34,7 +34,7 @@ function Ennemy:getDamage(base_damage)
if (self.hp == 0) then
self:destroy()
self.obj.GFX(self.world, self.x+8, self.y+8, "poof", 1)
self.level.playermanager.score = self.level.playermanager.score + 100
self.scene.playermanager.score = self.scene.playermanager.score + 100
end
end

View File

@ -10,7 +10,7 @@ function GFX:new(world, x, y, spritename, animID)
width = 16
height = 16
GFX.super.new(self, world, "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

View File

@ -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

View File

@ -11,9 +11,9 @@ end
function Coin:takeLoot()
self.obj.GFX(self.world, 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

View File

@ -11,9 +11,9 @@ end
function Loot:takeLoot()
self.obj.GFX(self.world, 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

View File

@ -8,9 +8,9 @@ function Entity:new(world, collType, x, y, w, h) -- On enregistre une nouvelle e
end
function Entity:initPhysics(world, collType, x, y, w, h)
self.level = world.scene
self.scene = world.scene
self.world = world
self.camera = self.level.camera
self.camera = self.scene.camera
self.obj = self.world.obj
self.collType = collType

View File

@ -13,7 +13,7 @@ function Player:new(world, x, y, playerID)
self.startx, self.starty = x, y
Player.super.new(self, world, "player", x - (w / 2), y - (h / 2), w, h)
self.manager = self.level.playermanager
self.manager = self.scene.playermanager
self.center = {
x = self.x,
@ -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
@ -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

View File

@ -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