From bc5f2970283048f466fc78cb30277c491f2be076 Mon Sep 17 00:00:00 2001
From: Emir Sinanovic <esinanovic@unistra.fr>
Date: Wed, 14 Dec 2022 10:27:11 +0100
Subject: [PATCH] Suppression des images
---
src/Game.py | 6 +++---
src/Image.py | 6 +++---
src/T3.py | 2 +-
src/Temps.py | 1 +
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/Game.py b/src/Game.py
index 3013f07..d8836e2 100755
--- a/src/Game.py
+++ b/src/Game.py
@@ -13,9 +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')
+ imagestaticplantation = pygame.image.load('../assets/Interface/imagePlantation.jpeg')
+ imagestaticbatiment = pygame.image.load('../assets/Interface/imageBatiment.jpeg')
+ imagestaticinfor = pygame.image.load('../assets/Interface/imageinfo.jpg')
def __init__ (self):
self.screen = pygame.display.set_mode((0,0), pygame.FULLSCREEN)
self.image = Image(self.screen)
diff --git a/src/Image.py b/src/Image.py
index bae4d96..4b2b492 100644
--- a/src/Image.py
+++ b/src/Image.py
@@ -6,9 +6,9 @@ class Image:
self.screen = screen
# Chargement des images
- self.moneyImage = pygame.image.load("../assets/money.png")
- self.backgroundImage = pygame.image.load("../assets/terre.png")
- self.rainImage = pygame.image.load("../assets/pluie.png")
+ self.moneyImage = pygame.image.load("../assets/Interface/money.png")
+ self.backgroundImage = pygame.image.load("../assets/Interface/terre.png")
+ self.rainImage = pygame.image.load("../assets/Temps/pluie.png")
self.barnImage = pygame.image.load("../assets/grange.webp")
self.arrowImage1 = pygame.image.load("../assets/flecheScene.png")
self.arrowImage2 = pygame.image.load("../assets/flecheScene2.png")
diff --git a/src/T3.py b/src/T3.py
index d8d0da5..e017830 100755
--- a/src/T3.py
+++ b/src/T3.py
@@ -20,7 +20,7 @@ background = pygame.image.load('../assets/Interface/intro.webp')
background = pygame.transform.scale(background, (screen.get_width(), screen.get_height()))
#bouton
-play_button = pygame.image.load('../assets//Interface/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 - play_button.get_width()/2
diff --git a/src/Temps.py b/src/Temps.py
index 323544d..36a1e5f 100755
--- a/src/Temps.py
+++ b/src/Temps.py
@@ -101,6 +101,7 @@ class Temps:
for key,value in self.climats.items():
self.climats.get(key)['image'] = transformImage(pygame.image.load("../assets/"+key+".png"),400,300)
+ self.ListTemps = []
def NextTurn(self):
#Le next qui devien current
--
GitLab