Merge branch 'main' of git.unistra.fr:l.duchmann/climate-simulator-global-organization

src/Champs.py

@@ -242,4 +242,6 @@ class Pesticide(Champs):
 
 #TODO : class Bussion,
 
-typePlantation = [Houblon,Ble,Malt,Chanvre,OrgeHiver,OrgePrintemps,Seigle,Pesticide]
+typePlantation = [Houblon,Ble,Malt,Chanvre,OrgeHiver,OrgePrintemps,Seigle,Pesticide]
\ No newline at end of file
+    
+        
\ No newline at end of file

src/Game.py

@@ -307,4 +307,3 @@ class Game:
     def AideEtat(self):
         self.moneyDefile(5000)
 
-

src/Infrastructure.py

@@ -145,4 +145,4 @@ class Torche (Infrastructure):
         self.zoneafecte = None
         #self.imagebat = pygame.transform.scale(pygame.image.load('../assets/torche.png'),(120,120))
 
-typeBatiment = [Puit,ReservoirEau,Irrigation,IrrigationGoutte,Serre,Torche]
+typeBatiment = [Puit,ReservoirEau,Irrigation,IrrigationGoutte,Serre,Torche]
\ No newline at end of file