diff --git "a/L\303\251o/Game.py" "b/L\303\251o/Game.py"
index 4ebfe349910a7865cacb64e2774c94a4c745e3da..61f25f25ea8d81022c6b7a93308a8992e15ecd64 100755
--- "a/L\303\251o/Game.py"
+++ "b/L\303\251o/Game.py"
@@ -12,7 +12,16 @@ class Game:
self.money = 10000
self.displayMoney = 10000
self.month = "janvier"
- self.champs = [Houblon((0,0)), Houblon((-200,0)), Houblon((0,-200)), Buisson((400,0)), Buisson((0,400)), Houblon((1000,1000))]#Houblon((100,100)), Houblon((400,100)), Houblon((700,100)), Houblon((100,300)), Houblon((400,300)), Houblon((700,300)), Houblon((100,500)), Houblon((400,500)), Buisson((700,500))]
+ #self.champs = [Houblon((-600,0)), Houblon((-300,0)), Houblon((100,0)), Houblon((300,0))
+ #Houblon((-800,-200)), Houblon((-500,-200)), Buisson((-200,-200)), Buisson((100,-200)), Buisson((400,-200)),
+ self.champs=[]
+ for i in range(12):
+ if i in (8,9,10):
+ self.champs.append(Houblon(((i%4)*300-550,(i//4)*200-300)))
+ else:
+ self.champs.append(Buisson(((i%4)*300-550,(i//4)*200-300)))
+
+ #Houblon((100,100)), Houblon((400,100)), Houblon((700,100)), Houblon((100,300)), Houblon((400,300)), Houblon((700,300)), Houblon((100,500)), Houblon((400,500)), Buisson((700,500))]
self.clock = pygame.time.Clock()
self.selectedChamp = None
self.imageMoney = pygame.image.load("../assets/money.png")
@@ -23,6 +32,12 @@ class Game:
self.background = pygame.transform.scale(self.background, (self.screen.get_width(), self.screen.get_height()))
self.pluie = pygame.image.load('../assets/pluie.png')
self.pluie = pygame.transform.scale(self.pluie, (200,200))
+ self.flecheChangementscene = pygame.image.load("../assets/flecheScene.png")
+ self.flecheChangementscene = pygame.transform.scale(self.flecheChangementscene, (100,100))
+ self.coordonnee_image = self.screenSize[0]-self.flecheChangementscene.get_width() - 10 ,self.screenSize[1]/2
+ self.rectangle_button_fleche = pygame.rect.Rect(*self.coordonnee_image,100,100)
+ self.grange = pygame.image.load('../assets/grange.webp')
+ self.grange = pygame.transform.scale(self.grange, (self.screen.get_width(), self.screen.get_height()))
self.frame = 0
self.buyFrame = -1000
@@ -31,8 +46,10 @@ class Game:
self.screen.blit(self.background, (0,0))
# Météo
- pygame.draw.rect(self.screen, (127, 127, 127), (0, self.screen.get_height()*0.80, 200, 200))
- self.screen.blit(self.pluie, (0, self.screen.get_height()*0.80))
+ self.carre_meteo = pygame.draw.rect(self.screen, (127, 127, 127), (0, self.screen.get_height() - 200 , 200, 200))
+ self.screen.blit(self.pluie, (0, self.screen.get_height()-200))
+
+
isChamp = False
# Affichage des champs
@@ -57,9 +74,14 @@ class Game:
print(self.clock.get_time())
print(self.clock.get_rawtime())
+
+ self.screen.blit(self.flecheChangementscene, self.coordonnee_image)
+
for event in pygame.event.get():
if event.type == pygame.QUIT or event.type == pygame.KEYDOWN and event.key == pygame.K_ESCAPE:
exit()
+ elif event.type == pygame.MOUSEBUTTONDOWN and (*event.pos,0,0) in self.rectangle_button_fleche:
+ self.gameLoopSecondScreen()
elif event.type == pygame.MOUSEMOTION:
if event.buttons[2] == 1: #maintenir enfoncé clic droit
self.camera.setPosition(np.array(event.rel))
@@ -93,12 +115,19 @@ class Game:
self.moneyError()
+
+
if self.frame < self.buyFrame + 100:
self.screen.blit(self.moneyChange, (210, self.screen.get_height()-textMoney.get_height()*4-(self.frame-self.buyFrame)*1.25))
if self.selectedChamp:
self.selectedChamp.showInfo(self.screen, self.camera)
+ if self.carre_meteo.collidepoint(pygame.mouse.get_pos()):
+
+ self.showInfoWeatherInterface()
+
+
pygame.display.update()
self.clock.tick(50)
self.frame += 1
@@ -115,6 +144,32 @@ class Game:
pygame.display.update()
self.clock.tick(50)
+
+ def showInfoWeatherInterface(self):
+ estFini = self.carre_meteo.collidepoint(pygame.mouse.get_pos())
+ popUp = pygame.draw.rect(self.screen, (20,125,125,0.5), (self.screenSize/3, self.screenSize/3))
+ while True:
+
+ for event in pygame.event.get(pygame.MOUSEMOTION):
+ if (*event.pos,0,0) not in popUp:
+ return
+
+
+ pygame.display.update()
+ self.clock.tick(50)
+
+ def gameLoopSecondScreen (self):
+ while True:
+ self.screen.blit(self.grange, (0,0))
+
+ for event in pygame.event.get():
+ if event.type == pygame.QUIT or event.type == pygame.KEYDOWN and event.key == pygame.K_ESCAPE:
+ exit()
+ elif event.type == pygame.KEYDOWN and event.key == pygame.K_LEFT:
+ return
+
+ pygame.display.update()
+ self.clock.tick(50)
class Camera:
diff --git "a/L\303\251o/__pycache__/Champs.cpython-39.pyc" "b/L\303\251o/__pycache__/Champs.cpython-39.pyc"
old mode 100755
new mode 100644
index 2d425dc2d01b653d7a0a64c31ecc95258016dc30..1049ff2e9b1d3232f2601190b367b9930d597e11
Binary files "a/L\303\251o/__pycache__/Champs.cpython-39.pyc" and "b/L\303\251o/__pycache__/Champs.cpython-39.pyc" differ
diff --git "a/L\303\251o/__pycache__/Game.cpython-39.pyc" "b/L\303\251o/__pycache__/Game.cpython-39.pyc"
old mode 100755
new mode 100644
index 5d72a2bda6a362bc7848f567038bbe6c27299824..4c51cea609429270c4381cc9eaa48b56aa8c0a58
Binary files "a/L\303\251o/__pycache__/Game.cpython-39.pyc" and "b/L\303\251o/__pycache__/Game.cpython-39.pyc" differ
diff --git a/assets/buissonCadenas.png b/assets/buissonCadenas.png
old mode 100755
new mode 100644
index 133a33d7577f7da6d72aa265487358234ea9d038..e029c36ddf2e24db3e68d3da6f2e08879c18dc9f
Binary files a/assets/buissonCadenas.png and b/assets/buissonCadenas.png differ
diff --git a/assets/flecheScene.png b/assets/flecheScene.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6e42392a26f21697f8379c3c2bf66bd56c200a4
Binary files /dev/null and b/assets/flecheScene.png differ
diff --git a/assets/neige.png b/assets/neige.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e79644f934bea7246a1922f6f001d97afbe9bfd
Binary files /dev/null and b/assets/neige.png differ
diff --git a/assets/orage.png b/assets/orage.png
new file mode 100644
index 0000000000000000000000000000000000000000..452467884468382e5c4355e3a9a56a13da977568
Binary files /dev/null and b/assets/orage.png differ
diff --git a/assets/pluie.png b/assets/pluie.png
old mode 100755
new mode 100644
index af969c3c090ad26c3a7a78d48508d8f79f4d4446..d9cfa07795ccb137f4f79f29b571fcb1d46346f2
Binary files a/assets/pluie.png and b/assets/pluie.png differ
diff --git a/assets/vent.png b/assets/vent.png
new file mode 100644
index 0000000000000000000000000000000000000000..4387d11c5529bd8c9d3021da2207d04bb0b00a96
Binary files /dev/null and b/assets/vent.png differ