diff --git a/assets/irrigation.png b/assets/Batiment/irrigation.png
similarity index 100%
rename from assets/irrigation.png
rename to assets/Batiment/irrigation.png
diff --git a/assets/irrigationGoutte.png b/assets/Batiment/irrigationGoutte.png
similarity index 100%
rename from assets/irrigationGoutte.png
rename to assets/Batiment/irrigationGoutte.png
diff --git a/assets/puit.png b/assets/Batiment/puit.png
similarity index 100%
rename from assets/puit.png
rename to assets/Batiment/puit.png
diff --git a/assets/serre.png b/assets/Batiment/serre.png
similarity index 100%
rename from assets/serre.png
rename to assets/Batiment/serre.png
diff --git a/assets/storagetank.png b/assets/Batiment/storagetank.png
similarity index 100%
rename from assets/storagetank.png
rename to assets/Batiment/storagetank.png
diff --git a/assets/torche.png b/assets/Batiment/torche.png
similarity index 100%
rename from assets/torche.png
rename to assets/Batiment/torche.png
diff --git a/assets/buissonCadenas.png b/assets/Interface/buissonCadenas.png
similarity index 100%
rename from assets/buissonCadenas.png
rename to assets/Interface/buissonCadenas.png
diff --git a/assets/button.png b/assets/Interface/button.png
old mode 100755
new mode 100644
similarity index 100%
rename from assets/button.png
rename to assets/Interface/button.png
diff --git a/assets/champp.png.svg b/assets/Interface/champp.png.svg
similarity index 100%
rename from assets/champp.png.svg
rename to assets/Interface/champp.png.svg
diff --git a/assets/imageBatiment.jpeg b/assets/Interface/imageBatiment.jpeg
similarity index 100%
rename from assets/imageBatiment.jpeg
rename to assets/Interface/imageBatiment.jpeg
diff --git a/assets/imagePlantation.jpeg b/assets/Interface/imagePlantation.jpeg
similarity index 100%
rename from assets/imagePlantation.jpeg
rename to assets/Interface/imagePlantation.jpeg
diff --git a/assets/imageinfo.jpg b/assets/Interface/imageinfo.jpg
similarity index 100%
rename from assets/imageinfo.jpg
rename to assets/Interface/imageinfo.jpg
diff --git a/assets/intro.webp b/assets/Interface/intro.webp
similarity index 100%
rename from assets/intro.webp
rename to assets/Interface/intro.webp
diff --git a/assets/money.png b/assets/Interface/money.png
old mode 100755
new mode 100644
similarity index 100%
rename from assets/money.png
rename to assets/Interface/money.png
diff --git a/assets/suite.png b/assets/Interface/suite.png
similarity index 100%
rename from assets/suite.png
rename to assets/Interface/suite.png
diff --git a/assets/terre.png b/assets/Interface/terre.png
old mode 100755
new mode 100644
similarity index 100%
rename from assets/terre.png
rename to assets/Interface/terre.png
diff --git a/assets/barleySpring.png b/assets/Plantation/OrgePrintemps.png
similarity index 100%
rename from assets/barleySpring.png
rename to assets/Plantation/OrgePrintemps.png
diff --git a/assets/champ.png b/assets/Plantation/champ.png
old mode 100755
new mode 100644
similarity index 100%
rename from assets/champ.png
rename to assets/Plantation/champ.png
diff --git a/assets/crop1phase.png b/assets/Plantation/crop1phase.png
similarity index 100%
rename from assets/crop1phase.png
rename to assets/Plantation/crop1phase.png
diff --git a/assets/crop2phase.png b/assets/Plantation/crop2phase.png
similarity index 100%
rename from assets/crop2phase.png
rename to assets/Plantation/crop2phase.png
diff --git a/assets/crop3phase.png b/assets/Plantation/crop3phase.png
similarity index 100%
rename from assets/crop3phase.png
rename to assets/Plantation/crop3phase.png
diff --git a/assets/crop4phase.png b/assets/Plantation/crop4phase.png
similarity index 100%
rename from assets/crop4phase.png
rename to assets/Plantation/crop4phase.png
diff --git a/assets/Plantation/crophoublon4phase.png b/assets/Plantation/crophoublon4phase.png
new file mode 100644
index 0000000000000000000000000000000000000000..24c34c04ebb879eb0f6b57f8ea1d8b766f406939
Binary files /dev/null and b/assets/Plantation/crophoublon4phase.png differ
diff --git a/assets/Plantation/cropseigle4phase.png b/assets/Plantation/cropseigle4phase.png
new file mode 100644
index 0000000000000000000000000000000000000000..14a6b5dd2182df04778933d210bd744462de94e8
Binary files /dev/null and b/assets/Plantation/cropseigle4phase.png differ
diff --git a/assets/damage.png b/assets/Plantation/damage.png
similarity index 100%
rename from assets/damage.png
rename to assets/Plantation/damage.png
diff --git a/assets/fanne.png b/assets/Plantation/fanne.png
similarity index 100%
rename from assets/fanne.png
rename to assets/Plantation/fanne.png
diff --git a/assets/houblon.png b/assets/Plantation/houblon.png
similarity index 100%
rename from assets/houblon.png
rename to assets/Plantation/houblon.png
diff --git a/assets/leech.png b/assets/Plantation/leech.png
similarity index 100%
rename from assets/leech.png
rename to assets/Plantation/leech.png
diff --git a/assets/Plantation/malt.png b/assets/Plantation/malt.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd64e14686e414d83097887cbd731428fd517a00
Binary files /dev/null and b/assets/Plantation/malt.png differ
diff --git a/assets/orge.png b/assets/Plantation/orge.png
similarity index 100%
rename from assets/orge.png
rename to assets/Plantation/orge.png
diff --git a/assets/pesticide.png b/assets/Plantation/pesticide.png
similarity index 100%
rename from assets/pesticide.png
rename to assets/Plantation/pesticide.png
diff --git a/assets/Plantation/seigle.png b/assets/Plantation/seigle.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8174bb26639bcc449b23cc4ab9d5a3a112f050f
Binary files /dev/null and b/assets/Plantation/seigle.png differ
diff --git a/assets/weed.png b/assets/Plantation/weed.png
similarity index 100%
rename from assets/weed.png
rename to assets/Plantation/weed.png
diff --git a/assets/wheat.png b/assets/Plantation/wheat.png
similarity index 100%
rename from assets/wheat.png
rename to assets/Plantation/wheat.png
diff --git a/assets/Automne.png b/assets/Saison/Automne.png
similarity index 100%
rename from assets/Automne.png
rename to assets/Saison/Automne.png
diff --git a/assets/Hiver.png b/assets/Saison/Hiver.png
similarity index 100%
rename from assets/Hiver.png
rename to assets/Saison/Hiver.png
diff --git a/assets/Printemps.png b/assets/Saison/Printemps.png
similarity index 100%
rename from assets/Printemps.png
rename to assets/Saison/Printemps.png
diff --git "a/assets/\303\251t\303\251.png" "b/assets/Saison/\303\251t\303\251.png"
similarity index 100%
rename from "assets/\303\251t\303\251.png"
rename to "assets/Saison/\303\251t\303\251.png"
diff --git a/assets/canicule.png b/assets/Temps/canicule.png
similarity index 100%
rename from assets/canicule.png
rename to assets/Temps/canicule.png
diff --git a/assets/chaud.png b/assets/Temps/chaud.png
similarity index 100%
rename from assets/chaud.png
rename to assets/Temps/chaud.png
diff --git a/assets/froid.png b/assets/Temps/froid.png
similarity index 100%
rename from assets/froid.png
rename to assets/Temps/froid.png
diff --git a/assets/neige.png b/assets/Temps/neige.png
similarity index 100%
rename from assets/neige.png
rename to assets/Temps/neige.png
diff --git a/assets/nice_weather.png b/assets/Temps/nice_weather.png
similarity index 100%
rename from assets/nice_weather.png
rename to assets/Temps/nice_weather.png
diff --git a/assets/orage.png b/assets/Temps/orage.png
similarity index 100%
rename from assets/orage.png
rename to assets/Temps/orage.png
diff --git a/assets/pluie.png b/assets/Temps/pluie.png
similarity index 100%
rename from assets/pluie.png
rename to assets/Temps/pluie.png
diff --git a/assets/secheresse.png b/assets/Temps/secheresse.png
similarity index 100%
rename from assets/secheresse.png
rename to assets/Temps/secheresse.png
diff --git a/assets/vent.png b/assets/Temps/vent.png
similarity index 100%
rename from assets/vent.png
rename to assets/Temps/vent.png
diff --git a/assets/accueil.jpg b/assets/accueil.jpg
deleted file mode 100755
index 3802663715ed1cbda3c04a49567de469391bd9b3..0000000000000000000000000000000000000000
Binary files a/assets/accueil.jpg and /dev/null differ
diff --git a/assets/banner.png b/assets/banner.png
deleted file mode 100755
index 0eadb8f42efecaf2f56f1de5a0d4e8eec694fc5a..0000000000000000000000000000000000000000
Binary files a/assets/banner.png and /dev/null differ
diff --git a/assets/buisson.png b/assets/buisson.png
deleted file mode 100755
index 324682bc1c46886b9378ae3fb8d08bf768b23261..0000000000000000000000000000000000000000
Binary files a/assets/buisson.png and /dev/null differ
diff --git a/assets/cadenas.png b/assets/cadenas.png
deleted file mode 100755
index c9ffe73510f57116985cd078f6dcb4cc3dc4e3a7..0000000000000000000000000000000000000000
Binary files a/assets/cadenas.png and /dev/null differ
diff --git a/assets/flecheScene.png b/assets/flecheScene.png
deleted file mode 100644
index b6e42392a26f21697f8379c3c2bf66bd56c200a4..0000000000000000000000000000000000000000
Binary files a/assets/flecheScene.png and /dev/null differ
diff --git a/assets/flecheScene2.png b/assets/flecheScene2.png
deleted file mode 100755
index e96134871a74dbd78a90fff88e2427c5b54e1892..0000000000000000000000000000000000000000
Binary files a/assets/flecheScene2.png and /dev/null differ
diff --git a/assets/grange.webp b/assets/grange.webp
deleted file mode 100755
index 918970971e8bea459ca6fd5270da2a40985acc8d..0000000000000000000000000000000000000000
Binary files a/assets/grange.webp and /dev/null differ
diff --git a/assets/intro2.jpg b/assets/intro2.jpg
deleted file mode 100644
index 9fee9d020986469a2f32aa5b383e5580c573b015..0000000000000000000000000000000000000000
Binary files a/assets/intro2.jpg and /dev/null differ
diff --git a/assets/malt.png b/assets/malt.png
deleted file mode 100644
index af0b10143e581be99f1fff9586486c432a340cdb..0000000000000000000000000000000000000000
Binary files a/assets/malt.png and /dev/null differ
diff --git a/assets/pluie.gif b/assets/pluie.gif
deleted file mode 100755
index 15328b93933821d7c8d146fd052cadaf7c28a6ba..0000000000000000000000000000000000000000
Binary files a/assets/pluie.gif and /dev/null differ
diff --git a/assets/seigle.png b/assets/seigle.png
deleted file mode 100644
index ba322daeac9f57c104633b8daaf6f041a52b2abe..0000000000000000000000000000000000000000
Binary files a/assets/seigle.png and /dev/null differ
diff --git a/src/Champs.py b/src/Champs.py
index aa0eb6cdf1818e1a30add74c00ed78a7f7436536..ff64b97dbb4b6051029c2d2cb7bb697c9472ac6c 100644
--- a/src/Champs.py
+++ b/src/Champs.py
@@ -3,14 +3,14 @@ import numpy as np
from Temps import *
from Image import transformImage
-listeImage = [pygame.transform.scale(pygame.image.load('../assets/crop'+str(i)+'phase.png'),(120,120)) for i in range(1,5)]
+listeImage = [pygame.transform.scale(pygame.image.load('../assets/Plantation/crop'+str(i)+'phase.png'),(120,120)) for i in range(1,5)]
#TODO : mettre une proba que les plantes meurent si il fait trop froid/chaud, et baisser cette proba de mourir avec une serre ou des torche pour l'hiver
-#TODO : mettre des insecte/bacterie qui pourrai venir
+
class Champs:
- iconInsecteStatic = pygame.transform.scale(pygame.image.load("../assets/leech.png"),(90,90))
+ iconInsecteStatic = pygame.transform.scale(pygame.image.load("../assets/Plantation/leech.png"),(90,90))
def __init__ (self, temperature, humidite, tempsAvantMaturation, pos, image):
self.temperature = temperature
self.humidite = humidite
@@ -44,7 +44,6 @@ class Champs:
-
def plantationGrandit(self):
self.indiceImage +=1
if self.indiceImage <4:
@@ -52,10 +51,10 @@ class Champs:
self.imageChamp = listeImage[self.indiceImage]
else:
if(self.indiceImage == 4):
- self.imageChamp =pygame.transform.scale(pygame.image.load('../assets/damage.png'),(120,120))
+ self.imageChamp =pygame.transform.scale(pygame.image.load('../assets/Plantation/damage.png'),(120,120))
elif(self.indiceImage == 5):
self.isInfeste = False
- self.imageChamp =pygame.transform.scale(pygame.image.load('../assets/fanne.png'),(120,120))
+ self.imageChamp =pygame.transform.scale(pygame.image.load('../assets/Plantation/fanne.png'),(120,120))
@@ -132,7 +131,7 @@ class Champs:
class Buisson (Champs):
def __init__ (self, pos, prix = 10000):
- super().__init__(0, 0, 0, pos, '../assets/buissonCadenas.png')
+ super().__init__(0, 0, 0, pos, '../assets/Interface/buissonCadenas.png')
self.prix = prix
self.text = self.police.render("Champ disponible à l'achat : " + str(self.prix), False, (0,0,0))
self.zoomText = self.text
@@ -146,103 +145,101 @@ class Buisson (Champs):
class TerrainVide(Champs):
def __init__ (self, pos):
- super().__init__(0, 0, 0, pos,'../assets/champ.png')
+ super().__init__(0, 0, 0, pos,'../assets/Plantation/champ.png')
self.text = self.police.render("Température : " + str(self.temperature), False, (0,0,0))
self.zoomText = self.text
class Houblon (Champs):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/houblon.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Plantation/houblon.png'),(150,150))
textStatic = police.render('Houblon',False, (0,0,0))
textDescriptionStatic = police.render("Houblon sa marche bien",False,(0,0,0))
montantAchat = 250
montantVente = 600
def __init__ (self, pos):
- super().__init__(0, 0, 0, pos,'../assets/champ.png')
+ super().__init__(0, 0, 0, pos,'../assets/Plantation/champ.png')
self.text = self.police.render("Température : " + str(self.temperature), False, (0,0,0))
self.zoomText = self.text
- self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/crop1phase.png'),(120,120))
+ self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/Plantation/crop1phase.png'),(120,120))
class Ble (Champs):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/wheat.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Plantation/wheat.png'),(150,150))
textStatic = police.render('Ble',False, (0,0,0))
textDescriptionStatic = police.render("Ble sa marche bien",False,(0,0,0))
montantAchat = 250
montantVente = 800
def __init__ (self,pos):
- super().__init__(0,0,0,pos,'../assets/champ.png')
+ super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
- self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/crop1phase.png'),(120,120))
+ self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/Plantation/crop1phase.png'),(120,120))
class Malt (Champs):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/malt.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Plantation/malt.png'),(150,150))
textStatic = police.render('Malt',False, (0,0,0))
textDescriptionStatic = police.render("Malt sa marche bien",False,(0,0,0))
montantAchat = 300
montantVente = 800
def __init__ (self,pos):
- super().__init__(0,0,0,pos,'../assets/champ.png')
- self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/crop1phase.png'),(120,120))
+ super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
+ self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/Plantation/crop1phase.png'),(120,120))
class Chanvre(Champs):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/weed.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Plantation/weed.png'),(150,150))
textStatic = police.render("Chanvre",False, (0,0,0))
textDescriptionStatic = police.render("Pour des spaces bières",False,(0,0,0))
montantAchat = 1000
montantVente = 5000
def __init__ (self,pos):
- super().__init__(0,0,0,pos,'../assets/champ.png')
- self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/crop1phase.png'),(120,120))
+ super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
+ self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/Plantation/crop1phase.png'),(120,120))
class OrgeHiver(Champs):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/orge.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Plantation/orge.png'),(150,150))
textStatic = police.render("Orge hiver",False, (0,0,0))
textDescriptionStatic = police.render("Orge hiver sa marche bien",False,(0,0,0))
montantAchat = 300
montantVente = 800
def __init__ (self,pos):
- super().__init__(0,0,0,pos,'../assets/champ.png')
- self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/crop1phase.png'),(120,120))
+ super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
+ self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/Plantation/crop1phase.png'),(120,120))
class OrgePrintemps(Champs):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/barleySpring.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Plantation/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
montantVente = 1000
def __init__ (self,pos):
- super().__init__(0,0,0,pos,'../assets/champ.png')
+ super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
- self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/crop1phase.png'),(120,120))
+ self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/Plantation/crop1phase.png'),(120,120))
class Seigle(Champs):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/seigle.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Plantation/seigle.png'),(150,150))
textStatic = police.render("Seigle",False, (0,0,0))
textDescriptionStatic = police.render("Seigle sa marche bien",False,(0,0,0))
montantAchat = 200
montantVente = 600
def __init__ (self,pos):
- super().__init__(0,0,0,pos,'../assets/champ.png')
- self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/crop1phase.png'),(120,120))
+ super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
+ self.imageChamp = pygame.transform.scale(pygame.image.load('../assets/Plantation/crop1phase.png'),(120,120))
class Pesticide(Champs):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/pesticide.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Plantation/pesticide.png'),(150,150))
textStatic = police.render("Pesticide",False, (0,0,0))
textDescriptionStatic = police.render("Pour tuer les insectes",False,(0,0,0))
montantAchat = 200
def __init__ (self,pos):
- super().__init__(0,0,0,pos,'../assets/pesticide.png')
+ super().__init__(0,0,0,pos,'../assets/Plantation/pesticide.png')
#TODO : class Bussion,
-typePlantation = [Houblon,Ble,Malt,Chanvre,OrgeHiver,OrgePrintemps,Seigle,Pesticide]
-
-
\ No newline at end of file
+typePlantation = [Houblon,Ble,Malt,Chanvre,OrgeHiver,OrgePrintemps,Seigle,Pesticide]
\ No newline at end of file
diff --git a/src/Game.py b/src/Game.py
index 3bc4c461f591c0d7fda32570f53455a2124210c0..3b0a52464cfc4ad21f2c1072a961fadf60959239 100644
--- 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/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)
@@ -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
@@ -297,3 +307,4 @@ class Game:
def AideEtat(self):
self.moneyDefile(5000)
+
diff --git a/src/Image.py b/src/Image.py
index bae4d96ce539cf65112094e935554f35a3ad9672..3c78181e146abde7e04118056a31fddb9d3f84f1 100644
--- a/src/Image.py
+++ b/src/Image.py
@@ -6,17 +6,13 @@ 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.barnImage = pygame.image.load("../assets/grange.webp")
- self.arrowImage1 = pygame.image.load("../assets/flecheScene.png")
- self.arrowImage2 = pygame.image.load("../assets/flecheScene2.png")
- self.arrowNextImage = pygame.image.load("../assets/suite.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.arrowNextImage = pygame.image.load("../assets/Interface/suite.png")
# Modification de l'échelle des images
self.backgroundImage = self.setFullScreen(self.backgroundImage)
- self.barnImage = self.setFullScreen(self.barnImage)
def setFullScreen(self, image):
image = pygame.transform.scale(image, (self.screen.get_width(), self.screen.get_height()))
diff --git a/src/Infrastructure.py b/src/Infrastructure.py
index 6b790a913a957d9ccbf049a598b3482e7844d70b..2463062c8297a20235537ea80db5c8717ce528e2 100644
--- a/src/Infrastructure.py
+++ b/src/Infrastructure.py
@@ -68,43 +68,43 @@ class Infrastructure:
class Puit (Infrastructure):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/puit.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Batiment/puit.png'),(150,150))
textStatic = police.render('Puits',False, (0,0,0))
textDescriptionStatic = police.render("C'est un puit",False,(0,0,0))
montantAchat = 2000
def __init__ (self,pos):
- super().__init__(pos,'../assets/champ.png')
- self.imagebat = pygame.transform.scale(pygame.image.load('../assets/puit.png'),(120,120))
+ super().__init__(pos,'../assets/Plantation/champ.png')
+ self.imagebat = pygame.transform.scale(pygame.image.load('../assets/Batiment/puit.png'),(120,120))
class ReservoirEau (Infrastructure):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/storagetank.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Batiment/storagetank.png'),(150,150))
textStatic = police.render('Capteur eau de pluie',False, (0,0,0))
textDescriptionStatic = police.render("Permet de capturer l'eau de pluit",False,(0,0,0))
montantAchat = 3000
def __init__ (self,pos):
- super().__init__(pos,'../assets/champ.png')
- self.imagebat = pygame.transform.scale(pygame.image.load('../assets/storagetank.png'),(120,120))
+ super().__init__(pos,'../assets/Plantation/champ.png')
+ self.imagebat = pygame.transform.scale(pygame.image.load('../assets/Batiment/storagetank.png'),(120,120))
class Irrigation (Infrastructure):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/irrigation.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Batiment/irrigation.png'),(150,150))
textStatic = police.render('Arrosoir automatique ',False, (0,0,0))
textDescriptionStatic = police.render("Permet d'arroser les plantes",False,(0,0,0))
montantAchat = 5000
def __init__ (self,pos):
- super().__init__(pos,'../assets/champ.png')
- self.imagebat = pygame.transform.scale(pygame.image.load('../assets/irrigation.png'),(120,120))
+ super().__init__(pos,'../assets/Plantation/champ.png')
+ self.imagebat = pygame.transform.scale(pygame.image.load('../assets/Batiment/irrigation.png'),(120,120))
class IrrigationGoutte (Infrastructure):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/irrigationGoutte.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Batiment/irrigationGoutte.png'),(150,150))
textStatic = police.render('Système goutte à goutte',False, (0,0,0))
textDescriptionStatic = police.render("Permet d'arroser les plantes en économisant l'eau",False,(0,0,0))
montantAchat = 10000
def __init__ (self,pos):
- super().__init__(pos,'../assets/champ.png')
- self.imagebat = pygame.transform.scale(pygame.image.load('../assets/irrigationGoutte.png'),(120,120))
+ super().__init__(pos,'../assets/Plantation/champ.png')
+ self.imagebat = pygame.transform.scale(pygame.image.load('../assets/Batiment/irrigationGoutte.png'),(120,120))
class Serre (Infrastructure):
- iconoriginal = pygame.image.load('../assets/serre.png')
+ iconoriginal = pygame.image.load('../assets/Batiment/serre.png')
iconStatic = pygame.transform.scale(iconoriginal,(150,150))
textStatic = police.render('Serre',False, (0,0,0))
textDescriptionStatic = police.render("Permet de proteger les cultures du froid et de la chaleur",False,(0,0,0))
@@ -115,7 +115,7 @@ class Serre (Infrastructure):
iconStaticCopie.fill((255, 255, 255, 70), None, pygame.BLEND_RGBA_MULT)
def __init__ (self,pos):
- super().__init__(pos,'../assets/champ.png')
+ super().__init__(pos,'../assets/Plantation/champ.png')
self.champsAfecte = None
#self.imagebat = pygame.transform.scale(pygame.image.load('../assets/serre.png'),(120,120))
@@ -133,35 +133,16 @@ class Serre (Infrastructure):
varlongueur = camera.convertLocation(self.pos)
screen.blit(self.imgZoom, (varlongueur[0]+ (self.champRect.w - self.rectScale.w)/2,varlongueur[1]+ (self.champRect.h - self.rectScale.h)/2))
-
-
- """
- if hasattr(self,'imagebat'):
- scaleBat = camera.scaleImage(self.imagebat)
- if scaleBat:
- self.BatZoom = scaleBat
- varlongueur = camera.convertLocation(self.pos)
- self.rectbatScal = pygame.rect.Rect(camera.convertLocation(self.pos), self.BatZoom.get_size())
- screen.blit(
- self.BatZoom,
- (
- varlongueur[0] +
- (self.rectScale.w-self.rectbatScal.w)
- /2,
- varlongueur[1] +
- (self.rectScale.h-self.rectbatScal.h)
- /2)
- )
- """
+
class Torche (Infrastructure):
- iconStatic = pygame.transform.scale(pygame.image.load('../assets/torche.png'),(150,150))
+ iconStatic = pygame.transform.scale(pygame.image.load('../assets/Batiment/torche.png'),(150,150))
textStatic = police.render('Torche',False, (0,0,0))
textDescriptionStatic = police.render("Permet de proteger les cultures du froid ",False,(0,0,0))
montantAchat = 1000
def __init__ (self,pos):
- super().__init__(pos,'../assets/champ.png')
+ super().__init__(pos,'../assets/Plantation/champ.png')
self.zoneafecte = None
#self.imagebat = pygame.transform.scale(pygame.image.load('../assets/torche.png'),(120,120))
-typeBatiment = [Puit,ReservoirEau,Irrigation,IrrigationGoutte,Serre,Torche]
\ No newline at end of file
+typeBatiment = [Puit,ReservoirEau,Irrigation,IrrigationGoutte,Serre,Torche]
diff --git a/src/T3.py b/src/T3.py
index 1b0f1922a92fe5e56848239bec8c0b5e65b85e54..f9137f112dcb6998cd0ce44bc0085ed0e53f1c9a 100644
--- 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)
diff --git a/src/Temps.py b/src/Temps.py
index 0a55de4a3c158d079bd14cdafc2f6bfdd848fb26..cdcc5214b4f5e3080fb69a8a4860bbf75a90df9e 100644
--- a/src/Temps.py
+++ b/src/Temps.py
@@ -99,8 +99,9 @@ class Temps:
self.tempsaisonImageDeuxPosiiton = police2.render(self.nextSaison +" : "+ str(round(self.nextglobalTemps,1))+" °C",True,(0,0,0))
for key,value in self.climats.items():
- self.climats.get(key)['image'] = transformImage(pygame.image.load("../assets/"+key+".png"),400,300)
+ self.climats.get(key)['image'] = transformImage(pygame.image.load("../assets/Saison/"+key+".png"),400,300)
+ self.ListTemps = []
def NextTurn(self):
#Le next qui devien current
@@ -146,24 +147,25 @@ class Temps:
def tempAAfficher(self,temperature:float,humidite)-> str:
#Determination du temps a afficher
if( temperature < 0 and humidite >80):
- return "../assets/neige.png"
+ return "../assets/Temps/neige.png"
elif (temperature < 10):
- return "../assets/froid.png"
+ return "../assets/Temps/froid.png"
elif (temperature < 30):
if(humidite > 80):
- return "../assets/pluie.png"
+ return "../assets/Temps/pluie.png"
else:
- return "../assets/nice_weather.png"
+ return "../assets/Temps/nice_weather.png"
elif (temperature < 35):
- return "../assets/chaud.png"
- elif (temperature >= 30):
+ return "../assets/Temps/chaud.png"
+ elif (temperature > 34):
+
if(humidite > 85):
- return "../assets/orage.png"
+ return "../assets/Temps/orage.png"
if(humidite < 40):
- return "../assets/secheresse.png"
+ return "../assets/Temps/secheresse.png"
else:
- return "../assets/canicule.png"
+ return "../assets/Temps/canicule.png"
else:
pass
@@ -180,4 +182,3 @@ class Temps:
return self.climats.get(self.currentSeason).get('image')
-
\ No newline at end of file