From 99991197353ff6f607344c3b45ca5d1a0640ef78 Mon Sep 17 00:00:00 2001
From: DamienK <damien.kalck@etu.unistra.fr>
Date: Fri, 16 Dec 2022 11:33:15 +0100
Subject: [PATCH] =?UTF-8?q?=C3=A9quilibrage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Champs.py | 26 +++++++++++++-------------
src/Game.py | 4 ++--
src/Infrastructure.py | 16 ++++++++--------
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/Champs.py b/src/Champs.py
index 0feef62..0f343a4 100644
--- a/src/Champs.py
+++ b/src/Champs.py
@@ -39,7 +39,7 @@ class Champs:
}
self.setInformation("Occupe" , "Champ non occupé")
self.setInformation("Nom","Champ Vide ")
- self.setInformation("coutEntretien","90€ coût d'entretien mensuel")
+ self.setInformation("coutEntretien","15€ coût d'entretien mensuel")
self.setInformation("fane", "Pourcentage que la plante fanne : ")
self.setInformation(hash('fane'), str(self.pourcentagePlanteFane)+' %')
self.setInformation("status", self.image,True)
@@ -124,7 +124,7 @@ class Champs:
class Buisson (Champs):
- def __init__ (self, pos, prix = 10000):
+ def __init__ (self, pos, prix = 9000):
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))
@@ -149,8 +149,8 @@ class Houblon (Champs):
iconStatic = transformImage(pygame.image.load('../assets/Plantation/houblon.png'), *iconStaticSize)
textStatic = police.render('Houblon',False, (255,255,255))
textDescriptionStatic = police.render("Houblon ça marche bien",False,(0,0,0))
- montantAchat = 250
- montantVente = 600
+ montantAchat = 300
+ montantVente = 1200
def __init__ (self, pos):
super().__init__(0, 0, 0, pos,'../assets/Plantation/champ.png')
self.text = self.police.render("Température : " + str(self.temperature), False, (0,0,0))
@@ -163,8 +163,8 @@ class Ble (Champs):
iconStatic = transformImage(pygame.image.load('../assets/Plantation/wheat.png'), *iconStaticSize)
textStatic = police.render('Ble',False, (255,255,255))
textDescriptionStatic = police.render("Ble ça marche bien",False,(0,0,0))
- montantAchat = 250
- montantVente = 800
+ montantAchat = 300
+ montantVente = 1200
def __init__ (self,pos):
super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
@@ -174,8 +174,8 @@ class Malt (Champs):
iconStatic = transformImage(pygame.image.load('../assets/Plantation/malt.png'), *iconStaticSize)
textStatic = police.render('Malt',False, (255,255,255))
textDescriptionStatic = police.render("Malt ça marche bien",False,(0,0,0))
- montantAchat = 300
- montantVente = 800
+ montantAchat = 400
+ montantVente = 1600
def __init__ (self,pos):
super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
self.imageChamp = transformImage(pygame.image.load('../assets/Plantation/crop1phase.png'), 120, 120)
@@ -186,7 +186,7 @@ class Chanvre(Champs):
textStatic = police.render("Chanvre",False, (255,255,255))
textDescriptionStatic = police.render("Pour des spaces bières",False,(0,0,0))
montantAchat = 1000
- montantVente = 5000
+ montantVente = 4000
def __init__ (self,pos):
super().__init__(0,0,0,pos,'../assets//Plantation/champ.png')
self.imageChamp = transformImage(pygame.image.load('../assets/Plantation/crop1phase.png'), 120, 120)
@@ -196,8 +196,8 @@ class OrgeHiver(Champs):
iconStatic = transformImage(pygame.image.load('../assets/Plantation/orge.png'), *iconStaticSize)
textStatic = police.render("Orge hiver",False, (255,255,255))
textDescriptionStatic = police.render("Orge hiver ça marche bien",False,(0,0,0))
- montantAchat = 300
- montantVente = 800
+ montantAchat = 400
+ montantVente = 1600
def __init__ (self,pos):
super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
self.imageChamp = transformImage(pygame.image.load('../assets/Plantation/crop1phase.png'), 120, 120)
@@ -208,7 +208,7 @@ class OrgePrintemps(Champs):
textStatic = police.render("Orge printemps",False, (255,255,255))
textDescriptionStatic = police.render("Orge printemps ça marche bien",False,(0,0,0))
montantAchat = 500
- montantVente = 1000
+ montantVente = 2000
def __init__ (self,pos):
super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
@@ -220,7 +220,7 @@ class Seigle(Champs):
textStatic = police.render("Seigle",False, (255,255,255))
textDescriptionStatic = police.render("Seigle ça marche bien",False,(0,0,0))
montantAchat = 200
- montantVente = 600
+ montantVente = 800
def __init__ (self,pos):
super().__init__(0,0,0,pos,'../assets/Plantation/champ.png')
self.imageChamp = transformImage(pygame.image.load('../assets/Plantation/crop1phase.png'), 120, 120)
diff --git a/src/Game.py b/src/Game.py
index aeb6704..f2e591c 100644
--- a/src/Game.py
+++ b/src/Game.py
@@ -439,10 +439,10 @@ class Game:
cout = 0
# Entretien des batiments pendant 3 mois
if self.nombreBatiments > 0:
- cout += (-117 * self.nombreBatiments) * 3
+ cout += (-30 * self.nombreBatiments) * 3
# Entretien des champs pendant 3 mois
if self.nombreChamps > 0:
- cout += (-90 * self.nombreChamps) * 3
+ cout += (-15 * self.nombreChamps) * 3
self.moneyDefile(cout)
diff --git a/src/Infrastructure.py b/src/Infrastructure.py
index 68e00f6..4ab3f19 100644
--- a/src/Infrastructure.py
+++ b/src/Infrastructure.py
@@ -20,7 +20,7 @@ class Infrastructure:
}
self.setInformation("Occupe", "Espace non occupé")
self.setInformation("Nom","Emplacement vide")
- self.setInformation("coutEntretien","117€ d'entretien mensuel")
+ self.setInformation("coutEntretien","30€ d'entretien mensuel")
self.setInformation("status", self.iconStatic,True)
@@ -64,7 +64,7 @@ class Infrastructure:
def verifDureeVie(self):
self.indiceDureeVie +=1
- if(self.indiceDureeVie == 8):
+ if(self.indiceDureeVie == 20):
return True
else:
return False
@@ -81,7 +81,7 @@ class Puit (Infrastructure):
iconStatic = pygame.transform.scale(pygame.image.load('../assets/Batiment/puit.png'),(150,150))
textStatic = police.render('Puits',False, (255,255,255))
textDescriptionStatic = police.render("Moins efficace qu'un reservoir d'eau",False,(0,0,0))
- montantAchat = 2000
+ montantAchat = 1000
def __init__ (self,pos):
super().__init__(pos,'../assets/Plantation/champ.png')
self.imagebat = pygame.transform.scale(pygame.image.load('../assets/Batiment/puit.png'),(120,120))
@@ -91,7 +91,7 @@ class ReservoirEau (Infrastructure):
iconStatic = pygame.transform.scale(pygame.image.load('../assets/Batiment/storagetank.png'),(150,150))
textStatic = police.render('Capteur eau de pluie',False, (255,255,255))
textDescriptionStatic = police.render("Permet de capturer l'eau de pluit",False,(0,0,0))
- montantAchat = 3000
+ montantAchat = 2000
def __init__ (self,pos):
super().__init__(pos,'../assets/Plantation/champ.png')
self.imagebat = pygame.transform.scale(pygame.image.load('../assets/Batiment/storagetank.png'),(120,120))
@@ -101,7 +101,7 @@ class Irrigation (Infrastructure):
iconStatic = pygame.transform.scale(pygame.image.load('../assets/Batiment/irrigation.png'),(150,150))
textStatic = police.render('Arrosoir automatique ',False, (255,255,255))
textDescriptionStatic = police.render("Permet d'arroser les plantes",False,(0,0,0))
- montantAchat = 5000
+ montantAchat = 3000
def __init__ (self,pos):
super().__init__(pos,'../assets/Plantation/champ.png')
self.imagebat = pygame.transform.scale(pygame.image.load('../assets/Batiment/irrigation.png'),(90,90))
@@ -142,7 +142,7 @@ class IrrigationGoutte (Infrastructure):
iconStatic = pygame.transform.scale(pygame.image.load('../assets/Batiment/irrigationGoutte.png'),(150,150))
textStatic = police.render('Système goutte à goutte',False, (255,255,255))
textDescriptionStatic = police.render("Permet d'arroser les plantes en économisant l'eau",False,(0,0,0))
- montantAchat = 10000
+ montantAchat = 6000
def __init__ (self,pos):
super().__init__(pos,'../assets/Plantation/champ.png')
self.imagebat = pygame.transform.scale(pygame.image.load('../assets/Batiment/irrigationGoutte.png'),(90,90))
@@ -177,7 +177,7 @@ class Serre (Infrastructure):
iconStatic = pygame.transform.scale(iconoriginal,(150,150))
textStatic = police.render('Serre',False, (255,255,255))
textDescriptionStatic = police.render("Permet de proteger les cultures du froid et de la chaleur",False,(0,0,0))
- montantAchat = 1500
+ montantAchat = 1000
iconStaticCopie = pygame.transform.scale(iconoriginal.copy(), (250,200))
@@ -214,7 +214,7 @@ class Torche (Infrastructure):
iconStaticCopie.fill((255, 255, 255, 70), None, pygame.BLEND_RGBA_MULT)
- montantAchat = 1000
+ montantAchat = 750
def __init__ (self,pos):
super().__init__(pos,'../assets/Plantation/champ.png')
self.zoneafecte = None
--
GitLab