From 12df5f701152e3844f77f97e2ef4bea8cc03f4c6 Mon Sep 17 00:00:00 2001
From: Elias Leinenweber <elias.leinenweber@etu.unistra.fr>
Date: Tue, 30 Mar 2021 21:37:03 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20bugs=20-Changement=20d'infra.=20sur=20les?=
=?UTF-8?q?=20cases=20-Incr=C3=A9mente=20plus=20les=20tours=20si=20on=20a?=
=?UTF-8?q?=20pas=20construit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
model/Improvement.cs | 4 ++--
view/FormJeu.cs | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/model/Improvement.cs b/model/Improvement.cs
index e98d7fa..90a0b26 100644
--- a/model/Improvement.cs
+++ b/model/Improvement.cs
@@ -2,10 +2,10 @@
{
public enum Improvement
{
- TrainStation,
- Path,
Refuge,
+ Path,
Club,
+ TrainStation,
Factory
}
}
\ No newline at end of file
diff --git a/view/FormJeu.cs b/view/FormJeu.cs
index b9b391f..387af4c 100644
--- a/view/FormJeu.cs
+++ b/view/FormJeu.cs
@@ -85,9 +85,11 @@ namespace Wanderer.view
int cout = tbCouts[i];
//Calcul des marks et randonneurs, ajout d'image sur la map
- if (marks >= cout)
+ if (marks >= cout && MapView.SelectedTile.model.Improvement == 0)
{
- MapView.SelectedTile.Image = b.Image;
+ MapView.SelectedTile.model.Improvement = (Improvement) i;
+ if (!MapView.SelectedTile.model.HasChanged) return;
+
tbConstruct[i]++;
if (tbConstruct[1] % 5 ==0 && tbConstruct[1]!=0)
--
GitLab