From 00e9e161539278cab2a06c5daa823a8c492de00a Mon Sep 17 00:00:00 2001
From: "cesar.schaal" <cesar.schaal@etu.unistra.fr>
Date: Tue, 30 Mar 2021 17:12:21 +0200
Subject: [PATCH] Equilibrage du jeu
---
view/FormJeu.Designer.cs | 18 +++++----
view/FormJeu.cs | 83 +++++++++++++++++++++++++++++++++++-----
view/FormJeu.resx | 23 +++++++++++
3 files changed, 107 insertions(+), 17 deletions(-)
diff --git a/view/FormJeu.Designer.cs b/view/FormJeu.Designer.cs
index 028f5fd..1c10981 100644
--- a/view/FormJeu.Designer.cs
+++ b/view/FormJeu.Designer.cs
@@ -79,7 +79,7 @@ namespace Wanderer.view
//
this.lblMarcheur.AutoSize = true;
this.lblMarcheur.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
- this.lblMarcheur.Location = new System.Drawing.Point(1085, 24);
+ this.lblMarcheur.Location = new System.Drawing.Point(1030, 24);
this.lblMarcheur.Name = "lblMarcheur";
this.lblMarcheur.Size = new System.Drawing.Size(105, 25);
this.lblMarcheur.TabIndex = 14;
@@ -89,7 +89,7 @@ namespace Wanderer.view
//
this.lblArgent.AutoSize = true;
this.lblArgent.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
- this.lblArgent.Location = new System.Drawing.Point(868, 24);
+ this.lblArgent.Location = new System.Drawing.Point(813, 24);
this.lblArgent.Name = "lblArgent";
this.lblArgent.Size = new System.Drawing.Size(70, 25);
this.lblArgent.TabIndex = 13;
@@ -99,17 +99,17 @@ namespace Wanderer.view
//
this.lblTour.AutoSize = true;
this.lblTour.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F);
- this.lblTour.Location = new System.Drawing.Point(328, 10);
+ this.lblTour.Location = new System.Drawing.Point(286, 10);
this.lblTour.Name = "lblTour";
- this.lblTour.Size = new System.Drawing.Size(334, 46);
+ this.lblTour.Size = new System.Drawing.Size(354, 46);
this.lblTour.TabIndex = 12;
- this.lblTour.Text = "Nombre d\'action :";
+ this.lblTour.Text = "Nombre d\'actions :";
this.lblTour.Click += new System.EventHandler(this.label1_Click);
//
// pictureBox1
//
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(831, 19);
+ this.pictureBox1.Location = new System.Drawing.Point(776, 19);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(32, 33);
@@ -120,7 +120,7 @@ namespace Wanderer.view
// pbPersonnes
//
this.pbPersonnes.Image = ((System.Drawing.Image)(resources.GetObject("pbPersonnes.Image")));
- this.pbPersonnes.Location = new System.Drawing.Point(1048, 19);
+ this.pbPersonnes.Location = new System.Drawing.Point(993, 19);
this.pbPersonnes.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.pbPersonnes.Name = "pbPersonnes";
this.pbPersonnes.Size = new System.Drawing.Size(32, 33);
@@ -164,7 +164,7 @@ namespace Wanderer.view
this.btnTrain.Text = "Train";
this.btnTrain.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.btnTrain.UseVisualStyleBackColor = false;
- this.btnTrain.Click += new System.EventHandler(this.button1_Click);
+ this.btnTrain.Click += new System.EventHandler(this.btnTrain_Click);
//
// btnRefuge
//
@@ -202,6 +202,7 @@ namespace Wanderer.view
this.btnChemin.Text = "Chemins";
this.btnChemin.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.btnChemin.UseVisualStyleBackColor = false;
+ this.btnChemin.Click += new System.EventHandler(this.btnChemin_Click);
//
// btnClub
//
@@ -220,6 +221,7 @@ namespace Wanderer.view
this.btnClub.Text = "Club";
this.btnClub.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.btnClub.UseVisualStyleBackColor = false;
+ this.btnClub.Click += new System.EventHandler(this.btnClub_Click);
//
// mapView1
//
diff --git a/view/FormJeu.cs b/view/FormJeu.cs
index 304f1e3..78fb30c 100644
--- a/view/FormJeu.cs
+++ b/view/FormJeu.cs
@@ -13,7 +13,7 @@ namespace Wanderer.view
{
public partial class FormJeu : Form
{
-
+ bool gareCreated = true;
int nombreMarks;
int nombreRandonneurs;
int tailleTerritoire;
@@ -22,15 +22,20 @@ namespace Wanderer.view
int nombreRefuge;
int nombreChemin;
int nombreClub;
+ int bonus = 0;
+
+
+ const int limiteRandonneur = 100;
+ const int limiteTerritoire = 200;
public void updateNombreMarks(int nombreUsine, int nombreRefuge)
{
- nombreMarks = nombreUsine * 10 + nombreRefuge * 5 + 10;
+ nombreMarks = nombreUsine * 5 + nombreRefuge * 5 + 10 + nombreMarks;
}
public void updateNombreRandonneurs(int nombreClub, int nombreChemins, int nombreRefuges)
{
- nombreRandonneurs = nombreClub * 6 + nombreChemins * 4 + nombreRefuges * 3;
+ nombreRandonneurs = nombreClub * 6 + nombreChemins * 2 + nombreRefuges * 3 - 10 * nombreUsine + bonus;
}
public void updateTailleTerritoire(int nombreClub, int nombreChemins, int nombreRefuges)
@@ -38,20 +43,27 @@ namespace Wanderer.view
tailleTerritoire = nombreChemins * 5 + nombreRefuges * 10;
}
+ public void disable()
+ {
+ this.Enabled = false;
+ }
+
public void updateLabels()
{
- updateNombreMarks(nombreUsine, nombreRefuge);
+ if(nombreTour > 0)
+ {
+ updateNombreMarks(nombreUsine, nombreRefuge);
+ }
updateNombreRandonneurs(nombreClub, nombreChemin, nombreRefuge);
updateTailleTerritoire(nombreClub, nombreChemin, nombreRefuge);
lblArgent.Text = "Argent :" + nombreMarks;
lblMarcheur.Text = "Marcheurs : " + nombreRandonneurs;
- lblTour.Text = "Nombre d'action : " + nombreTour;
+ lblTour.Text = "Nombre d'action : " + nombreTour++;
}
-
public FormJeu()
{
InitializeComponent();
@@ -65,17 +77,66 @@ namespace Wanderer.view
private void btnUsine_Click(object sender, EventArgs e)
{
+ if(nombreMarks >= 60)
+ {
+ MapView.SelectedTile.Image = btnUsine.Image;
+ nombreUsine++;
+ nombreMarks -= 40;
+ updateLabels();
+ }
+ }
+ private void btnTrain_Click(object sender, EventArgs e)
+ {
+ if(nombreMarks >= 10 && gareCreated)
+ {
+ MapView.SelectedTile.Image = btnTrain.Image;
+ gareCreated = false;
+ nombreMarks -= 10;
+ updateLabels();
+ }
}
- private void button1_Click(object sender, EventArgs e)
+ private void btnRefuge_Click(object sender, EventArgs e)
{
+ if (nombreRefuge % 5 == 0 && nombreRefuge != 0)
+ {
+ bonus += 5;
+ }
+ if (nombreMarks >= 30)
+ {
+ MapView.SelectedTile.Image = btnRefuge.Image;
+ nombreRefuge++;
+ nombreMarks -= 30;
+ updateLabels();
+ }
+ }
+
+ private void btnChemin_Click(object sender, EventArgs e)
+ {
+ if (nombreChemin % 5 == 0 && nombreRefuge != 0)
+ {
+ bonus += 2;
+ }
+ if (nombreMarks >= 10)
+ {
+ MapView.SelectedTile.Image = btnChemin.Image;
+ nombreChemin++;
+ nombreMarks -= 10;
+ updateLabels();
+ }
}
- private void btnRefuge_Click(object sender, EventArgs e)
+ private void btnClub_Click(object sender, EventArgs e)
{
- MapView.SelectedTile.Image = btnRefuge.Image;
+ if(nombreMarks >= 15)
+ {
+ MapView.SelectedTile.Image = btnClub.Image;
+ nombreClub++;
+ nombreMarks -= 10;
+ updateLabels();
+ }
}
private void mapView1_Paint(object sender, PaintEventArgs e)
@@ -95,11 +156,15 @@ namespace Wanderer.view
private void FormJeu_Load(object sender, EventArgs e)
{
mapView1.Model = new Map(20,10);
+ nombreMarks = 40;
+ updateLabels();
}
private void FormJeu_FormClosed(object sender, FormClosedEventArgs e)
{
Application.Exit();
}
+
+
}
}
diff --git a/view/FormJeu.resx b/view/FormJeu.resx
index 34cf0cd..66eed63 100644
--- a/view/FormJeu.resx
+++ b/view/FormJeu.resx
@@ -958,6 +958,29 @@
/D/tWr5t2zZn2fncuXPlo48+cvbz6l7vZ5991tnfe++99zpdpUeNGuUsYb7sssvkkksucfaB62RU9wLr
kWK6J/ynGjRo4OwV/qmEhIQjJrca++Wf0//3l3+f/hv6b+m/qf+2HmWmP4v+TPqz6c+oP6v+zPqz6++g
v4v+Tl999ZXzO+rvqr+z9VkAAIDDMn73f7R2IWCvq4HWAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAA
+ 3QAAAN0BcFOiBwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAPGSURBVFhHxZdb
+ yE5ZGMdfp3BDThM3YtS4IKcLE3KKJEpyuDBlxA25kJIbNc2UQ1GUIqeIC0KSqEnK6UKMZiaKwo1QDjk0
+ LqRx+vx+q7W25W19h9fFZ9Vvf89+Dv9nv2uvvfb+ak1NTd+VorM9KToTjB4wALqW4i1hTaztUYonvhi1
+ Wl9YCkfhIfwPBhKv4SZshRnQMavtGH3GzDE3r1VLTbXt0TerDcUr4b/IFdgLq2AaDIf58Dsch9vwHv6C
+ ERFtfcbMMdcaa9VQS021Ux972rv2GzyDxdAhXVlLMJytHWBT0a5+VUswOoC97GnvYKwoJbcG45qUYq1h
+ T7B3uEd/w5BSYnMwFsC7yIJSTnMwhoA9w4mHR+BCOQ0b4Rfw3obVz+gDk8H7thP+BRs/jWjrM2aOuX1i
+ rU+DWmqqbQ972bO6gCkwGw7Bk+iTD/AiO/8E/8Am+BEORrT1GTMn5VurRjpX2x72sqe+cFicTY+LRMFx
+ MAcWgY/YaAi/Kss9L3U+Z8tca6xVQy01q0XOcCEGw8O3PgWeyLc+BcHh4Qy8gUb2gbtwI6LdyD5gL3tW
+ F+D96AeN7ISdIK0B7UZ2Qnt9tQbWNTNd1bsA3LVGgdO3Bc5C2tW09Rkzx9wW3wWMdVBdwEfYD2OgWyF5
+ GFwFTx7DRdgDayLa+oyZY+6wgk43sIe97BmcHtbD9WgbuAcnQf9mcApPQP960XrMibnWWKuGWmqmpvbS
+ X13A1FjcEyaBi+YAeD8NNLxVWxNr1VBLTbV7xvhUCIaHI9C5IDIoxjfUx1rDmlg7qBDrDPYMJx6cmjuw
+ GlydvWJiugB3t0uwHMZD+BV1os6eMXPMTTtiuABGL1DbHvb6ag0sBFex+3l6/B7AhWhPBLfa5/FcfKz+
+ jGgnvznmWuO5Gmppq20Pe9lTX+0tzMp+SRfw5fEruLp1jowxV/HPYLGrf3tEW5+x8BQxRoKGGmqp2SXr
+ MwvsXdsHxdcxI92CWxBuS1swN9Z4UloD6XVs77AruX06PafgD5gLgyFdwEtw+/RxWgK9C6K9Y8wcc60J
+ FwBqqam2Pex1DPrlAtNhG3jPXoFOhfz7E8yEXeBmcx9cyfMi2vqM7QZzrck11FTbHtOrvsmohzEQFPdj
+ Y0Lm9232Q7T91WE29EH+up0A1qoxMPnrKTpzGIfBt13YrNqCubHmcCmeU3TmMLpDevf7RXMOnMZlMDai
+ rc9Y+qKypntJM6foLMEYCmvhMvgdmH9qaeszZs7QkkaJorMtMHzl+mUk1X9JjVJ0tidFZ/vRVPsM7D6m
+ 7cJQgWkAAAAASUVORK5CYII=
</value>
</data>
<data name="pbPersonnes.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--
GitLab