scenes/levels: fuse asset loading function in main file

This commit is contained in:
Kazhnuz 2019-03-03 17:11:38 +01:00
parent 1eb7fd9c91
commit e08e65cb65
3 changed files with 63 additions and 65 deletions

View File

@ -1,7 +1,3 @@
-- On charge les fichiers contenant les script gérant le gameplay
require "scenes.levels.sounds"
require "scenes.levels.sprites"
-- On charge le module de scene et créer l'objet de scene des niveaux
local Scene = require "core.modules.scenes"
local Level = Scene:extend()
@ -19,8 +15,8 @@ local leveldatas = require "datas.levels"
function Level:new(levelID, missionID)
self:reset()
Level.super.new(self)
level_loadSounds()
loadSprites()
self:loadSounds()
self:loadSprites()
previousMenu = previous
self:loadMission(levelID, missionID)
@ -62,6 +58,67 @@ function Level:loadMission(levelID, missionID)
self:launchMission()
end
function Level:loadSounds()
assets:clearSFX()
assets:newSFX("jump")
assets:newSFX("break")
assets:newSFX("collectcoin")
end
function Level:loadCochonSprites(name)
assets:addSprite(name, 32, 48, "pigs/")
assets.sprites[name]:newAnimation(2, 1, 0.2)
assets.sprites[name]:newAnimation('1-4', 1, 0.1)
assets.sprites[name]:newAnimation(5, 1, 0.2)
assets.sprites[name]:newAnimation('7-8', 1, 0.03, 'pauseAtEnd')
assets.sprites[name]:newAnimation(7, 1, 0.2)
end
function Level:loadSprites()
assets:clearSprites()
assets:addSprite("coin", 16, 16)
assets.sprites["coin"]:newAnimation(1, '1-4', 0.2)
assets.sprites["coin"]:newAnimation(2, '1-4', 0.2)
assets.sprites["coin"]:newAnimation(3, '1-4', 0.2)
assets:addSprite("weapon", 16, 16)
assets.sprites["weapon"]:newAnimation(1, 2, 0.1)
assets.sprites["weapon"]:newAnimation(2, 2, 0.1)
assets:addSprite("sparkle", 16, 16)
assets.sprites["sparkle"]:newAnimation('1-5', 1, 0.08, 'pauseAtEnd')
self:loadCochonSprites("cochon")
self:loadCochonSprites("bling-bling")
assets:addSprite("block", 16, 16)
assets.sprites["block"]:newAnimation(1, 1, 0.08)
assets.sprites["block"]:newAnimation(2, 1, 0.08)
assets.sprites["block"]:newAnimation(3, 1, 0.08)
assets.sprites["block"]:newAnimation(4, 1, 0.08)
assets.sprites["block"]:newAnimation(5, 1, 0.08)
assets:addSprite("debris", 8, 8)
assets.sprites["debris"]:newAnimation(1, 1, 0.08)
assets:addSprite("poof", 16, 16)
assets.sprites["poof"]:newAnimation('1-6', 1, 0.08, 'pauseAtEnd')
assets:addSprite("lifeicons", 16, 16, "pigs/")
assets.sprites["lifeicons"]:newAnimation(1, 1, 0.08)
assets.sprites["lifeicons"]:newAnimation(2, 1, 0.08)
assets.sprites["lifeicons"]:newAnimation(3, 1, 0.08)
assets:clearFonts()
assets:addFont("medium", "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|} ", 1)
assets:addFont("small", "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ", 1)
assets:addTextBox("yellowbox")
assets:addProgressBar("greenbar", "medium", "small")
assets:addProgressBar("bluebar", "medium", "small")
end
function Level:launchMission()
self.playermanager = PlayerManager(self)
--self:resetSpawnAndEntities()

View File

@ -1,6 +0,0 @@
function level_loadSounds()
assets:clearSFX()
assets:newSFX("jump")
assets:newSFX("break")
assets:newSFX("collectcoin")
end

View File

@ -1,53 +0,0 @@
function loadSprites()
assets:clearSprites()
assets:addSprite("coin", 16, 16)
assets.sprites["coin"]:newAnimation(1, '1-4', 0.2)
assets.sprites["coin"]:newAnimation(2, '1-4', 0.2)
assets.sprites["coin"]:newAnimation(3, '1-4', 0.2)
assets:addSprite("weapon", 16, 16)
assets.sprites["weapon"]:newAnimation(1, 2, 0.1)
assets.sprites["weapon"]:newAnimation(2, 2, 0.1)
assets:addSprite("sparkle", 16, 16)
assets.sprites["sparkle"]:newAnimation('1-5', 1, 0.08, 'pauseAtEnd')
loadCochonSprites("cochon")
loadCochonSprites("bling-bling")
assets:addSprite("block", 16, 16)
assets.sprites["block"]:newAnimation(1, 1, 0.08)
assets.sprites["block"]:newAnimation(2, 1, 0.08)
assets.sprites["block"]:newAnimation(3, 1, 0.08)
assets.sprites["block"]:newAnimation(4, 1, 0.08)
assets.sprites["block"]:newAnimation(5, 1, 0.08)
assets:addSprite("debris", 8, 8)
assets.sprites["debris"]:newAnimation(1, 1, 0.08)
assets:addSprite("poof", 16, 16)
assets.sprites["poof"]:newAnimation('1-6', 1, 0.08, 'pauseAtEnd')
assets:addSprite("lifeicons", 16, 16, "pigs/")
assets.sprites["lifeicons"]:newAnimation(1, 1, 0.08)
assets.sprites["lifeicons"]:newAnimation(2, 1, 0.08)
assets.sprites["lifeicons"]:newAnimation(3, 1, 0.08)
assets:clearFonts()
assets:addFont("medium", "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|} ", 1)
assets:addFont("small", "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ", 1)
assets:addTextBox("yellowbox")
assets:addProgressBar("greenbar", "medium", "small")
assets:addProgressBar("bluebar", "medium", "small")
end
function loadCochonSprites(name)
assets:addSprite(name, 32, 48, "pigs/")
assets.sprites[name]:newAnimation(2, 1, 0.2)
assets.sprites[name]:newAnimation('1-4', 1, 0.1)
assets.sprites[name]:newAnimation(5, 1, 0.2)
assets.sprites[name]:newAnimation('7-8', 1, 0.03, 'pauseAtEnd')
assets.sprites[name]:newAnimation(7, 1, 0.2)
end