diff --git a/view/FormJeu.Designer.cs b/view/FormJeu.Designer.cs
index 8a3dcae74345fcfd2aa69e3545789651f908b9f5..7fb13de0841f97e016a6e6528e96828867d52910 100644
--- a/view/FormJeu.Designer.cs
+++ b/view/FormJeu.Designer.cs
@@ -32,8 +32,12 @@ namespace Wanderer.view
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormJeu));
this.pbAide = new System.Windows.Forms.PictureBox();
this.panel1 = new System.Windows.Forms.Panel();
- this.lblMarcheur = new System.Windows.Forms.Label();
- this.lblArgent = new System.Windows.Forms.Label();
+ this.lblMarcheurBleu = new System.Windows.Forms.Label();
+ this.lblArgentBleu = new System.Windows.Forms.Label();
+ this.lblMarcheursUp = new System.Windows.Forms.Label();
+ this.lblArgentUp = new System.Windows.Forms.Label();
+ this.lblMarcheurRouge = new System.Windows.Forms.Label();
+ this.lblArgentRouge = new System.Windows.Forms.Label();
this.lblTour = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.pbPersonnes = new System.Windows.Forms.PictureBox();
@@ -42,8 +46,6 @@ namespace Wanderer.view
this.btnRefuge = new System.Windows.Forms.Button();
this.btnChemin = new System.Windows.Forms.Button();
this.btnClub = new System.Windows.Forms.Button();
- this.lblArgentUp = new System.Windows.Forms.Label();
- this.lblMarcheursUp = new System.Windows.Forms.Label();
this.mapView1 = new Wanderer.view.Controls.MapView();
((System.ComponentModel.ISupportInitialize)(this.pbAide)).BeginInit();
this.panel1.SuspendLayout();
@@ -65,10 +67,12 @@ namespace Wanderer.view
//
// panel1
//
+ this.panel1.Controls.Add(this.lblMarcheurBleu);
+ this.panel1.Controls.Add(this.lblArgentBleu);
this.panel1.Controls.Add(this.lblMarcheursUp);
this.panel1.Controls.Add(this.lblArgentUp);
- this.panel1.Controls.Add(this.lblMarcheur);
- this.panel1.Controls.Add(this.lblArgent);
+ this.panel1.Controls.Add(this.lblMarcheurRouge);
+ this.panel1.Controls.Add(this.lblArgentRouge);
this.panel1.Controls.Add(this.lblTour);
this.panel1.Controls.Add(this.pictureBox1);
this.panel1.Controls.Add(this.pbAide);
@@ -79,31 +83,73 @@ namespace Wanderer.view
this.panel1.Size = new System.Drawing.Size(1218, 65);
this.panel1.TabIndex = 1;
//
- // lblMarcheur
+ // lblMarcheurBleu
+ //
+ this.lblMarcheurBleu.AutoSize = true;
+ this.lblMarcheurBleu.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
+ this.lblMarcheurBleu.ForeColor = System.Drawing.Color.Blue;
+ this.lblMarcheurBleu.Location = new System.Drawing.Point(1062, 24);
+ this.lblMarcheurBleu.Name = "lblMarcheurBleu";
+ this.lblMarcheurBleu.Size = new System.Drawing.Size(105, 25);
+ this.lblMarcheurBleu.TabIndex = 18;
+ this.lblMarcheurBleu.Text = "Marcheurs";
+ //
+ // lblArgentBleu
+ //
+ this.lblArgentBleu.AutoSize = true;
+ this.lblArgentBleu.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
+ this.lblArgentBleu.ForeColor = System.Drawing.Color.Blue;
+ this.lblArgentBleu.Location = new System.Drawing.Point(703, 24);
+ this.lblArgentBleu.Name = "lblArgentBleu";
+ this.lblArgentBleu.Size = new System.Drawing.Size(70, 25);
+ this.lblArgentBleu.TabIndex = 17;
+ this.lblArgentBleu.Text = "Argent";
+ //
+ // lblMarcheursUp
+ //
+ this.lblMarcheursUp.AutoSize = true;
+ this.lblMarcheursUp.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
+ this.lblMarcheursUp.Location = new System.Drawing.Point(1108, 24);
+ this.lblMarcheursUp.Name = "lblMarcheursUp";
+ this.lblMarcheursUp.Size = new System.Drawing.Size(0, 25);
+ this.lblMarcheursUp.TabIndex = 16;
+ //
+ // lblArgentUp
+ //
+ this.lblArgentUp.AutoSize = true;
+ this.lblArgentUp.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
+ this.lblArgentUp.Location = new System.Drawing.Point(889, 27);
+ this.lblArgentUp.Name = "lblArgentUp";
+ this.lblArgentUp.Size = new System.Drawing.Size(0, 25);
+ this.lblArgentUp.TabIndex = 15;
+ //
+ // lblMarcheurRouge
//
- this.lblMarcheur.AutoSize = true;
- this.lblMarcheur.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
- 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;
- this.lblMarcheur.Text = "Marcheurs";
+ this.lblMarcheurRouge.AutoSize = true;
+ this.lblMarcheurRouge.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
+ this.lblMarcheurRouge.ForeColor = System.Drawing.Color.Red;
+ this.lblMarcheurRouge.Location = new System.Drawing.Point(919, 24);
+ this.lblMarcheurRouge.Name = "lblMarcheurRouge";
+ this.lblMarcheurRouge.Size = new System.Drawing.Size(105, 25);
+ this.lblMarcheurRouge.TabIndex = 14;
+ this.lblMarcheurRouge.Text = "Marcheurs";
//
- // lblArgent
+ // lblArgentRouge
//
- this.lblArgent.AutoSize = true;
- this.lblArgent.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
- 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;
- this.lblArgent.Text = "Argent";
+ this.lblArgentRouge.AutoSize = true;
+ this.lblArgentRouge.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
+ this.lblArgentRouge.ForeColor = System.Drawing.Color.Red;
+ this.lblArgentRouge.Location = new System.Drawing.Point(593, 24);
+ this.lblArgentRouge.Name = "lblArgentRouge";
+ this.lblArgentRouge.Size = new System.Drawing.Size(70, 25);
+ this.lblArgentRouge.TabIndex = 13;
+ this.lblArgentRouge.Text = "Argent";
//
// lblTour
//
this.lblTour.AutoSize = true;
this.lblTour.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F);
- this.lblTour.Location = new System.Drawing.Point(286, 10);
+ this.lblTour.Location = new System.Drawing.Point(85, 9);
this.lblTour.Name = "lblTour";
this.lblTour.Size = new System.Drawing.Size(354, 46);
this.lblTour.TabIndex = 12;
@@ -113,7 +159,7 @@ namespace Wanderer.view
// pictureBox1
//
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(776, 19);
+ this.pictureBox1.Location = new System.Drawing.Point(544, 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);
@@ -124,7 +170,7 @@ namespace Wanderer.view
// pbPersonnes
//
this.pbPersonnes.Image = ((System.Drawing.Image)(resources.GetObject("pbPersonnes.Image")));
- this.pbPersonnes.Location = new System.Drawing.Point(993, 19);
+ this.pbPersonnes.Location = new System.Drawing.Point(870, 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);
@@ -232,24 +278,6 @@ namespace Wanderer.view
this.btnClub.UseVisualStyleBackColor = false;
this.btnClub.Click += new System.EventHandler(this.btn_Click);
//
- // lblArgentUp
- //
- this.lblArgentUp.AutoSize = true;
- this.lblArgentUp.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
- this.lblArgentUp.Location = new System.Drawing.Point(889, 27);
- this.lblArgentUp.Name = "lblArgentUp";
- this.lblArgentUp.Size = new System.Drawing.Size(0, 25);
- this.lblArgentUp.TabIndex = 15;
- //
- // lblMarcheursUp
- //
- this.lblMarcheursUp.AutoSize = true;
- this.lblMarcheursUp.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
- this.lblMarcheursUp.Location = new System.Drawing.Point(1108, 24);
- this.lblMarcheursUp.Name = "lblMarcheursUp";
- this.lblMarcheursUp.Size = new System.Drawing.Size(0, 25);
- this.lblMarcheursUp.TabIndex = 16;
- //
// mapView1
//
this.mapView1.AutoScroll = true;
@@ -312,9 +340,11 @@ namespace Wanderer.view
private Controls.MapView mapView1;
private System.Windows.Forms.Label lblTour;
private System.Windows.Forms.PictureBox pictureBox1;
- private System.Windows.Forms.Label lblMarcheur;
- private System.Windows.Forms.Label lblArgent;
+ private System.Windows.Forms.Label lblMarcheurRouge;
+ private System.Windows.Forms.Label lblArgentRouge;
private System.Windows.Forms.Label lblMarcheursUp;
private System.Windows.Forms.Label lblArgentUp;
+ private System.Windows.Forms.Label lblMarcheurBleu;
+ private System.Windows.Forms.Label lblArgentBleu;
}
}
\ No newline at end of file
diff --git a/view/FormJeu.cs b/view/FormJeu.cs
index b1c82aeed5cc64952002259942a4279a7e7f18b0..26de94047676caac5cea272d48f6ff4775a47884 100644
--- a/view/FormJeu.cs
+++ b/view/FormJeu.cs
@@ -121,8 +121,8 @@ namespace Wanderer.view
Game.Instance.currentPlayerIndex = (Game.Instance.currentPlayerIndex + 1) % Game.Instance.Players.Count;
Player currentPlayer = Game.Instance.Players[Game.Instance.currentPlayerIndex];
- lblArgent.Text = "Argent :" + currentPlayer.marks;
- lblMarcheur.Text = "Marcheurs : " + currentPlayer.randonneurs;
+ lblArgentRouge.Text = "Argent :" + currentPlayer.marks;
+ lblMarcheurRouge.Text = "Marcheurs : " + currentPlayer.randonneurs;
lblTour.Text = "Nombre d'action : " + nombreTour++;
if (MapView.SelectedTile != null && MapView.SelectedTile.model.HasChanged)
{
@@ -220,7 +220,5 @@ namespace Wanderer.view
}
-
-
}
}
diff --git a/view/FormMainMenu.Designer.cs b/view/FormMainMenu.Designer.cs
index d53624f4c6e1990df4b68fcc4e6d0ce0940af21b..7c107e5ee76e3ba7cd694706852a93914501614c 100644
--- a/view/FormMainMenu.Designer.cs
+++ b/view/FormMainMenu.Designer.cs
@@ -44,10 +44,10 @@
this.btnPlay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPlay.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnPlay.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.btnPlay.Location = new System.Drawing.Point(478, 173);
- this.btnPlay.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
+ this.btnPlay.Location = new System.Drawing.Point(637, 213);
+ this.btnPlay.Margin = new System.Windows.Forms.Padding(1);
this.btnPlay.Name = "btnPlay";
- this.btnPlay.Size = new System.Drawing.Size(298, 128);
+ this.btnPlay.Size = new System.Drawing.Size(397, 158);
this.btnPlay.TabIndex = 0;
this.btnPlay.Text = "Jouer";
this.btnPlay.UseVisualStyleBackColor = false;
@@ -61,10 +61,10 @@
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.button1.Location = new System.Drawing.Point(478, 483);
- this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.button1.Location = new System.Drawing.Point(637, 594);
+ this.button1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(298, 128);
+ this.button1.Size = new System.Drawing.Size(397, 158);
this.button1.TabIndex = 1;
this.button1.Text = "Quitter";
this.button1.UseVisualStyleBackColor = false;
@@ -78,10 +78,10 @@
this.btnAide.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAide.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnAide.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.btnAide.Location = new System.Drawing.Point(478, 325);
- this.btnAide.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnAide.Location = new System.Drawing.Point(637, 400);
+ this.btnAide.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnAide.Name = "btnAide";
- this.btnAide.Size = new System.Drawing.Size(298, 128);
+ this.btnAide.Size = new System.Drawing.Size(397, 158);
this.btnAide.TabIndex = 2;
this.btnAide.Text = "Aide";
this.btnAide.UseVisualStyleBackColor = false;
@@ -91,27 +91,28 @@
//
this.lbltitre.AutoSize = true;
this.lbltitre.BackColor = System.Drawing.Color.Transparent;
- this.lbltitre.Font = new System.Drawing.Font("OCR A Extended", 70F);
+ this.lbltitre.Font = new System.Drawing.Font("Microsoft Sans Serif", 70F);
this.lbltitre.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbltitre.Location = new System.Drawing.Point(383, 36);
+ this.lbltitre.Location = new System.Drawing.Point(511, 44);
+ this.lbltitre.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbltitre.Name = "lbltitre";
- this.lbltitre.Size = new System.Drawing.Size(498, 97);
+ this.lbltitre.Size = new System.Drawing.Size(568, 132);
this.lbltitre.TabIndex = 3;
this.lbltitre.Text = "Wanderer";
//
// FormMainMenu
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.ClientSize = new System.Drawing.Size(1280, 700);
+ this.ClientSize = new System.Drawing.Size(1707, 862);
this.Controls.Add(this.lbltitre);
this.Controls.Add(this.btnAide);
this.Controls.Add(this.button1);
this.Controls.Add(this.btnPlay);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
+ this.Margin = new System.Windows.Forms.Padding(1);
this.Name = "FormMainMenu";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "s";