diff --git a/gamedata/game.py b/gamedata/game.py index fc67714..e6c44b6 100644 --- a/gamedata/game.py +++ b/gamedata/game.py @@ -61,7 +61,7 @@ class Game(): self.pasttime = time.time() # Je charge la scene de base - scenes.ingame(self) + scenes.main(self) def set_camera(self,posx,posy): self.globals["camerax"], self.globals["cameray"] = posx,posy diff --git a/gamedata/objects/bg/menubackground.py b/gamedata/objects/bg/menubackground.py index fa2259d..c7322d2 100644 --- a/gamedata/objects/bg/menubackground.py +++ b/gamedata/objects/bg/menubackground.py @@ -1,17 +1,23 @@ -from gamedata.objects.bg.backgrounddrawer import BackgroundDrawer +from gamedata.objects.base import BaseObject -class MenuBackground(BackgroundDrawer): +class MenuBackground(BaseObject): def __init__(self,game): - super().__init__(0,0,game,game.DISPLAY_WIDTH,game.DISPLAY_HEIGHT,game.sprite_lib["grid.png"],0.025) + super().__init__(0,0,game,game.DISPLAY_WIDTH,game.DISPLAY_HEIGHT) - # Initialise son sprite + # Islands + self.sprite = game.sprite_lib["ingame.png"] + # Shadow sprite shadow = game.sprite_lib["shadow.png"] self.shadow = game.pygame.transform.scale(shadow,(1500,1500)) # J'augmente la taille de l'ombre + + self.depth = 0 + + self.cameraratio = 0.1 + def step(self): game = self.game - super().step() destx = (game.inputs["mouse"]["pos"][0]-game.DISPLAY_WIDTH/2) desty = (game.inputs["mouse"]["pos"][1]-game.DISPLAY_HEIGHT/2) game.globals["camerax"] += (destx-game.globals["camerax"])/6 @@ -19,5 +25,5 @@ class MenuBackground(BackgroundDrawer): def draw(self): game = self.game - super().draw() + game.window.blit(self.sprite,[-game.globals["camerax"]*self.cameraratio,-game.globals["cameray"]*self.cameraratio]) game.lib.drawcenter(game,self.shadow,game.DISPLAY_WIDTH/2,game.DISPLAY_HEIGHT*3/5) diff --git a/gamedata/objects/ingame/clouds.py b/gamedata/objects/ingame/clouds.py index f4eb8d7..2ebfb9e 100644 --- a/gamedata/objects/ingame/clouds.py +++ b/gamedata/objects/ingame/clouds.py @@ -8,7 +8,7 @@ class Clouds(BaseObject): self.speed = speed self.minwidth = minwidth self.cameraratio = cameraratio - depth = -1 + self.depth = -2 self.horoffset = 0 def step(self): @@ -18,4 +18,4 @@ class Clouds(BaseObject): offset = (self.horoffset-self.game.globals["camerax"]*self.cameraratio)%self.sprite.get_width() nbsprites = round((self.minwidth+offset)//self.sprite.get_width()+2) for i in range(nbsprites): - self.game.window.blit(self.sprite,[(i-1)*self.sprite.get_width()+offset,0]) + self.game.window.blit(self.sprite,[(i-1)*self.sprite.get_width()+offset,-self.game.globals["cameray"]*self.cameraratio]) diff --git a/gamedata/objects/ingame/skies.py b/gamedata/objects/ingame/skies.py index 8fe7077..cb6a69a 100644 --- a/gamedata/objects/ingame/skies.py +++ b/gamedata/objects/ingame/skies.py @@ -17,7 +17,7 @@ class Skies(BaseObject): self.speed = 0.02 self.timeelapsed = 0 - self.depth = -2 + self.depth = -3 self.blackrectalpha = 0.5 diff --git a/gamedata/scenes.py b/gamedata/scenes.py index d9ef1f3..c00242b 100644 --- a/gamedata/scenes.py +++ b/gamedata/scenes.py @@ -7,12 +7,21 @@ from gamedata.objects.sliders.sfxslider import SFXSlider from gamedata.objects.ingame.lemmings import Lemming from gamedata.objects.ingame.manager import Manager from gamedata.objects.gameover import GameOver +from gamedata.objects.ingame.skies import Skies +from gamedata.objects.ingame.clouds import Clouds def main(game): game.scaleCamera() game.gameloop.reinit() bg = MenuBackground(game) + skies = Skies(game) + # Clouds in the background + clouds = Clouds(game,game.DISPLAY_WIDTH,speed=30,cameraratio=0.05) + cloudsdark = Clouds(game,game.DISPLAY_WIDTH,speed=10,cameraratio=0.02,spritename="cloudsdark.png") + game.gameloop.summon(cloudsdark) + game.gameloop.summon(clouds) menu = MainMenu(game.DISPLAY_WIDTH/4,round(game.DISPLAY_HEIGHT*3/8),game,game.DISPLAY_WIDTH//2,game.DISPLAY_HEIGHT//2) + game.gameloop.summon(skies) game.gameloop.summon(bg) game.gameloop.summon(menu)