diff --git a/src/Champs.py b/src/Champs.py index 6a543d52fb77fc12ba5e09d3db4fbdce75fdc7ad..4f7bcf9674c48805ca1ba74a4ea1a77d8eb5aa4b 100755 --- a/src/Champs.py +++ b/src/Champs.py @@ -44,7 +44,6 @@ class Champs: - def plantationGrandit(self): self.indiceImage +=1 if self.indiceImage <4: @@ -211,7 +210,7 @@ class OrgeHiver(Champs): class OrgePrintemps(Champs): - iconStatic = pygame.transform.scale(pygame.image.load('../assets/barleySpring.png'),(150,150)) + iconStatic = pygame.transform.scale(pygame.image.load('../assets/OrgePrintemps.png'),(150,150)) textStatic = police.render("Orge printemps",False, (0,0,0)) textDescriptionStatic = police.render("Orge printemps sa marche bien",False,(0,0,0)) montantAchat = 500 diff --git a/src/Game.py b/src/Game.py index c00ae4e261eb6c4da088d944f58279edad024497..3013f0712d2505bbe2d5b4a8ed1c9d7e00b22737 100755 --- a/src/Game.py +++ b/src/Game.py @@ -13,6 +13,9 @@ MOIS = ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août police = pygame.font.SysFont("roboto", 30) class Game: + imagestaticplantation = pygame.image.load('../assets/Plantation/imagePlantation.jpeg') + imagestaticbatiment = pygame.image.load('../assets/imageBatiment.jpeg') + imagestaticinfor = pygame.image.load('../assets/imageinfo.jpg') def __init__ (self): self.screen = pygame.display.set_mode((0,0), pygame.FULLSCREEN) self.image = Image(self.screen) @@ -47,6 +50,11 @@ class Game: self.recInformation = pygame.rect.Rect(self.coordonne_info) self.rectPlantation = pygame.rect.Rect(0,0,self.temps.getImageSaison().get_width(),self.screen.get_height() - self.temps.getImageSaison().get_height()) self.recBatiment = pygame.rect.Rect(self.temps.getImageSaison().get_width(), self.screen.get_height() - self.temps.getImageSaison().get_height(), self.screen.get_width() * 0.65, self.temps.getImageSaison().get_height()) + + self.rectPlantationimage = pygame.transform.scale(Game.imagestaticplantation,(self.rectPlantation.w,self.rectPlantation.h)) + self.rectBatimentimage = pygame.transform.scale(Game.imagestaticbatiment,(self.recBatiment.w,self.recBatiment.h)) + self.rectinfoimage = pygame.transform.scale(Game.imagestaticinfor,(self.recInformation.w,self.recInformation.h)) + self.recTourSuivant = pygame.rect.Rect( self.recBatiment.x + self.recBatiment.w ,self.screen.get_height() - self.temps.getImageSaison().get_height(), self.screen.get_width() - self.temps.getImageSaison().get_width() - self.recBatiment.w,self.temps.getImageSaison().get_height()) @@ -73,7 +81,8 @@ class Game: #DEBUT BOUCLE INTERFACE------------------------ #Onglet Information - pygame.draw.rect(self.screen, (0, 127, 0), self.recInformation) + #pygame.draw.rect(self.screen, (0, 127, 0), self.recInformation) + self.screen.blit(Game.imagestaticinfor,(self.coordonne_info.x,self.coordonne_info.y)) # Météo self.screen.blit(self.temps.getImageSaison(), (0, self.screen.get_height() - 300)) @@ -84,10 +93,11 @@ class Game: self.screen.blit(self.temps.tempsaisonImageDeuxPosiiton,(self.temps.getImageSaison().get_width() - self.temps.nexticonSaison.get_width(),self.screen.get_height() - self.temps.getImageSaison().get_height())) - + print(self.rectPlantation.w) + print(self.rectPlantation.h) #Onglet plantation - pygame.draw.rect(self.screen, (0, 127, 127), self.rectPlantation) + self.screen.blit(self.rectPlantationimage,(0,0)) #Onglet tour suivant pygame.draw.rect(self.screen,(0, 127, 0),(self.recTourSuivant)) self.screen.blit(self.tourSuivantModif, (self.recTourSuivant.x+ (self.recTourSuivant.w - self.tourSuivantModif.get_width())/2, @@ -108,7 +118,7 @@ class Game: #Onglet batiment - pygame.draw.rect(self.screen, (127, 127, 127), (self.recBatiment)) + self.screen.blit(self.rectBatimentimage,(self.temps.getImageSaison().get_width(),self.screen.get_height() - self.temps.getImageSaison().get_height())) for i,c in enumerate(typeBatiment): x = self.recBatiment.x + i* (c.iconStatic.get_width() + 30) +50 y = self.recBatiment.y + 50 diff --git a/src/T3.py b/src/T3.py index 1420c38357a4fc11fbc0d9c4df8a41a214405151..d8d0da54748db6bfc17151e900afff9a3be0272c 100755 --- a/src/T3.py +++ b/src/T3.py @@ -16,27 +16,21 @@ class month: current_month = month(date.today().strftime("%b")) #background (2è scène) -background = pygame.image.load('../assets/intro.webp') +background = pygame.image.load('../assets/Interface/intro.webp') background = pygame.transform.scale(background, (screen.get_width(), screen.get_height())) -#bannière -banner = pygame.image.load('../assets/banner.png') -banner = pygame.transform.scale(banner, (500,500)) -banner_rect = banner.get_rect() -banner_rect.x = screen.get_width() / 4 - #bouton -play_button = pygame.image.load('../assets/button.png') +play_button = pygame.image.load('../assets//Interface/button.png') play_button = pygame.transform.scale(play_button,(400,150)) play_button_rect = play_button.get_rect() -play_button_rect.x = screen.get_width() / 2.8 -play_button_rect.y = screen.get_height() / 2.4 +play_button_rect.x = screen.get_width() / 2 - play_button.get_width()/2 +play_button_rect.y = screen.get_height() / 2 - play_button.get_height()/2 #buisson -bush = pygame.image.load('../assets/buisson.png') +#bush = pygame.image.load('../assets/buisson.png') #cadenas -lock = pygame.image.load('../assets/cadenas.png') +#lock = pygame.image.load('../assets/cadenas.png') screen.blit(background, (0,0)) screen.blit(play_button, play_button_rect)