feat: Reformat code

SSHCity-Game · May 27, 2020 · 395f6b1 · 395f6b1
1 parent 9d3bd62
commit 395f6b1
Show file tree

Hide file tree

Showing 64 changed files with 2,620 additions and 2,406 deletions.
diff --git a/Game/Buildings/Building.cs b/Game/Buildings/Building.cs
@@ -20,7 +20,7 @@ private Building(BuildingType type, Vector2 position, int theLvl)
             Activated = true;
             Characteristics.Lvl = theLvl;
             Characteristics.Lvl = theLvl;
-            
+
             PlanInitial.MAX_CAR += Characteristics.NbCar;
             ListBuildings.Add(this);
         }
@@ -29,7 +29,7 @@ private Building(BuildingType type, Vector2 position, int theLvl)
         /// La position du building sur la map
         /// </summary>
         public Vector2 Position { get; }
-        
+
         /// <summary>
         /// Si le batiment est activé
         /// </summary>
@@ -75,17 +75,18 @@ public static Building Create(BuildingType type, Vector2 position, int theLvl =
 
         public static void verify(BuildingType type)
         {
-
         }
+
         public void energyAndWater(Building type)
         {
-            (int energy, int water) = (Characteristics.energy[Characteristics.Lvl],Characteristics.water[Characteristics.Lvl]);
-            if (energy<0)
+            (int energy, int water) = (Characteristics.energy[Characteristics.Lvl],
+                Characteristics.water[Characteristics.Lvl]);
+            if (energy < 0)
             {
                 Ref_donnees.energy -= energy;
                 Interface.Water -= water;
             }
-            else if(water < 0)
+            else if (water < 0)
             {
                 Ref_donnees.water -= water;
                 Interface.Energy -= energy;
@@ -148,7 +149,7 @@ private void Upgrade()
             Interface.Xp += Characteristics.GainXp[Characteristics.Lvl];
             Characteristics.Lvl += 1;
         }
-        
+
         public static Building GetFromTile(Vector2 tile)
         {
             var i = 0;
@@ -160,6 +161,7 @@ public static Building GetFromTile(Vector2 tile)
                     return batiment;
                 i++;
             }
+
             return null;
         }
     }

diff --git a/Game/Buildings/BuildingCharacteristics.cs b/Game/Buildings/BuildingCharacteristics.cs
@@ -16,7 +16,7 @@ public interface IBuildingCharacteristics
         int Lvl { get; set; }
         int[] GainXp { get; }
         int[] energy { get; }
-        int[] water { get; } 
+        int[] water { get; }
         string[] Image { get; }
         int NbrAmeliorations { get; }
         int NbCar { get; }

diff --git a/Game/Buildings/Characteristics/Cafe.cs b/Game/Buildings/Characteristics/Cafe.cs
@@ -17,7 +17,7 @@ public Cafe()
             Image = new[] {"res://assets/ImageSized/isometric magasin6.png"};
             NbrAmeliorations = 0;
             NbCar = 0;
-            Population =new[] {0};
+            Population = new[] {0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/CentraleElectrique.cs b/Game/Buildings/Characteristics/CentraleElectrique.cs
@@ -14,10 +14,11 @@ public CentraleElectrique()
             GainXp = new[] {10, 15};
             energy = new[] {-30, -70};
             water = new[] {3, 6};
-            Image = new[] {"res://assets/ImageSized/isometric centrale1.png", "res://assets/ImageSized/isometric centrale2.png"};
+            Image = new[]
+                {"res://assets/ImageSized/isometric centrale1.png", "res://assets/ImageSized/isometric centrale2.png"};
             NbrAmeliorations = 1;
             NbCar = 0;
-            Population = new [] {0, 0};
+            Population = new[] {0, 0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/Eglise.cs b/Game/Buildings/Characteristics/Eglise.cs
@@ -14,10 +14,14 @@ public Eglise()
             GainXp = new[] {10, 15, 30};
             energy = new[] {2, 4, 6};
             water = new[] {1, 3, 9};
-            Image = new[] {"res://assets/ImageSized/isometric eglise1.png", "res://assets/ImageSized/isometric eglise5.png", "res://assets/ImageSized/isometric eglise4.png"};
+            Image = new[]
+            {
+                "res://assets/ImageSized/isometric eglise1.png", "res://assets/ImageSized/isometric eglise5.png",
+                "res://assets/ImageSized/isometric eglise4.png"
+            };
             NbrAmeliorations = 2;
             NbCar = 0;
-            Population = new []{0, 0, 0};
+            Population = new[] {0, 0, 0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/Eolienne.cs b/Game/Buildings/Characteristics/Eolienne.cs
@@ -17,7 +17,7 @@ public Eolienne()
             Image = new[] {"res://assets/ImageSized/isometric par eoliennes.png"};
             NbrAmeliorations = 0;
             NbCar = 0;
-            Population = new []{0};
+            Population = new[] {0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/Epuration.cs b/Game/Buildings/Characteristics/Epuration.cs
@@ -8,7 +8,7 @@ public Epuration()
         {
             Bloc = new[] {Ref_donnees.stationEpuration};
             Cost = new[] {3000};
-            Earn = new[] {2,5,8};
+            Earn = new[] {2, 5, 8};
             Titre = new[] {"Epuration"};
             Lvl = 0;
             GainXp = new[] {10, 100, 500};
@@ -17,7 +17,7 @@ public Epuration()
             Image = new[] {"res://assets/ImageSized/station epuration2.png"};
             NbrAmeliorations = 0;
             NbCar = 3;
-            Population = new []{0};
+            Population = new[] {0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/Essence.cs b/Game/Buildings/Characteristics/Essence.cs
@@ -17,7 +17,7 @@ public Essence()
             Image = new[] {"res://assets/ImageSized/isometric station service1.png"};
             NbrAmeliorations = 0;
             NbCar = 2;
-            Population = new []{0};
+            Population = new[] {0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/Ferme.cs b/Game/Buildings/Characteristics/Ferme.cs
@@ -8,16 +8,17 @@ public Ferme()
         {
             Bloc = new[] {Ref_donnees.ferme, Ref_donnees.ferme_ecolo};
             Cost = new[] {3000, 4000};
-            Earn = new[] {2,5};
+            Earn = new[] {2, 5};
             Titre = new[] {"Ferme", "Ferme Ecolo"};
             Lvl = 0;
             GainXp = new[] {10, 15};
             energy = new[] {1, 0};
             water = new[] {3, 0};
-            Image = new[] {"res://assets/ImageSized/isometric ferme2.png", "res://assets/ImageSized/I ferme ecolobis.png"};
+            Image = new[]
+                {"res://assets/ImageSized/isometric ferme2.png", "res://assets/ImageSized/I ferme ecolobis.png"};
             NbrAmeliorations = 1;
             NbCar = 3;
-            Population = new []{0, 0};
+            Population = new[] {0, 0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/FermeGrande.cs b/Game/Buildings/Characteristics/FermeGrande.cs
@@ -14,10 +14,11 @@ public FermeGrande()
             GainXp = new[] {10, 15};
             energy = new[] {10, 20};
             water = new[] {11, 22};
-            Image = new[] {"res://assets/ImageSized/isometric ferme3.png", "res://assets/ImageSized/isometric ferme4.png"};
+            Image = new[]
+                {"res://assets/ImageSized/isometric ferme3.png", "res://assets/ImageSized/isometric ferme4.png"};
             NbrAmeliorations = 1;
             NbCar = 2;
-            Population = new []{0, 0};
+            Population = new[] {0, 0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/FeteForraine.cs b/Game/Buildings/Characteristics/FeteForraine.cs
@@ -17,7 +17,7 @@ public FeteForraine()
             Image = new[] {"res://assets/ImageSized/isometric fete foraine1.png"};
             NbrAmeliorations = 0;
             NbCar = 2;
-            Population = new []{0};
+            Population = new[] {0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/Foot.cs b/Game/Buildings/Characteristics/Foot.cs
@@ -8,16 +8,21 @@ public Foot()
         {
             Bloc = new[] {Ref_donnees.foot, Ref_donnees.footlv2, Ref_donnees.footlv3};
             Cost = new[] {3000, 10000, 20000};
-            Earn = new[] {2,50, 100};
+            Earn = new[] {2, 50, 100};
             Titre = new[] {"Terrain Foot", "Stadium", "Stade"};
             Lvl = 0;
             GainXp = new[] {10, 15, 30};
             energy = new[] {1, 5, 10};
             water = new[] {1, 5, 10};
-            Image = new[] {"res://assets/ImageSized/isometric terrain foot1.png", "res://assets/ImageSized/isometric terrain foot2.png", "res://assets/ImageSized/isometric terrain foot3.png"};
+            Image = new[]
+            {
+                "res://assets/ImageSized/isometric terrain foot1.png",
+                "res://assets/ImageSized/isometric terrain foot2.png",
+                "res://assets/ImageSized/isometric terrain foot3.png"
+            };
             NbrAmeliorations = 2;
             NbCar = 1;
-            Population = new []{0, 0, 0};
+            Population = new[] {0, 0, 0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/Hospital.cs b/Game/Buildings/Characteristics/Hospital.cs
@@ -14,10 +14,14 @@ public Hospital()
             GainXp = new[] {10, 15, 30};
             energy = new[] {2, 5, 10};
             water = new[] {2, 5, 10};
-            Image = new[] {"res://assets/ImageSized/hopital.png", "res://assets/ImageSized/hopital3.png", "res://assets/ImageSized/hopital4.png"};
+            Image = new[]
+            {
+                "res://assets/ImageSized/hopital.png", "res://assets/ImageSized/hopital3.png",
+                "res://assets/ImageSized/hopital4.png"
+            };
             NbrAmeliorations = 2;
             NbCar = 5;
-            Population = new []{0, 0, 0};
+            Population = new[] {0, 0, 0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/Hotel.cs b/Game/Buildings/Characteristics/Hotel.cs
@@ -1,4 +1,3 @@
-using System;
 using SshCity.Game.Plan;
 
 namespace SshCity.Game.Buildings.Characteristics
@@ -9,13 +8,17 @@ public Hotel()
         {
             Bloc = new[] {Ref_donnees.hotel1, Ref_donnees.hotel, Ref_donnees.hotel2};
             Cost = new[] {2000, 10000, 15000};
-            Earn = new[] {2,15,50};
+            Earn = new[] {2, 15, 50};
             Titre = new[] {"Môtel", "Hotel", "Palace"};
             Lvl = 0;
             GainXp = new[] {10, 15, 30};
             energy = new[] {2, 10, 25};
             water = new[] {2, 10, 25};
-            Image = new[] {"res://assets/ImageSized/I hotel.png", "res://assets/ImageSized/hotel.png", "res://assets/ImageSized/isometric hotel1.png"};
+            Image = new[]
+            {
+                "res://assets/ImageSized/I hotel.png", "res://assets/ImageSized/hotel.png",
+                "res://assets/ImageSized/isometric hotel1.png"
+            };
             NbrAmeliorations = 2;
             NbCar = 3;
             Population = new[] {5, 20, 30};

diff --git a/Game/Buildings/Characteristics/Maison.cs b/Game/Buildings/Characteristics/Maison.cs
@@ -8,13 +8,17 @@ public Maison()
         {
             Bloc = new[] {Ref_donnees.maison1, Ref_donnees.immeuble_vert, Ref_donnees.immeubleVert};
             Cost = new[] {1000, 3000, 10000};
-            Earn = new[] {1,2,5};
+            Earn = new[] {1, 2, 5};
             Titre = new[] {"Maison", "Immeuble", "Tour"};
             Lvl = 0;
             GainXp = new[] {10, 15, 30};
-            energy = new[] {1,3,6};
-            water = new[] {1,3,3};
-            Image = new[] {"res://assets/ImageSized/maison1.png", "res://assets/ImageSized/immeuble.png", "res://assets/ImageSized/isometric hotel.png"};
+            energy = new[] {1, 3, 6};
+            water = new[] {1, 3, 3};
+            Image = new[]
+            {
+                "res://assets/ImageSized/maison1.png", "res://assets/ImageSized/immeuble.png",
+                "res://assets/ImageSized/isometric hotel.png"
+            };
             NbrAmeliorations = 2;
             NbCar = 2;
             Population = new[] {5, 15, 30};

diff --git a/Game/Buildings/Characteristics/Maison3.cs b/Game/Buildings/Characteristics/Maison3.cs
@@ -12,8 +12,8 @@ public Maison3()
             Titre = new[] {"Maison", "Tour"};
             Lvl = 0;
             GainXp = new[] {10, 15};
-            energy = new[] {1,3};
-            water = new[] {1,3};
+            energy = new[] {1, 3};
+            water = new[] {1, 3};
             Image = new[] {"res://assets/ImageSized/maison3.png", "res://assets/ImageSized/maison2.png"};
             NbrAmeliorations = 1;
             NbCar = 2;

diff --git a/Game/Buildings/Characteristics/Maison4.cs b/Game/Buildings/Characteristics/Maison4.cs
@@ -12,8 +12,8 @@ public Maison4()
             Titre = new[] {"Maison", "Tour"};
             Lvl = 0;
             GainXp = new[] {10, 15};
-            energy = new[] {1,3};
-            water = new[] {1,3};
+            energy = new[] {1, 3};
+            water = new[] {1, 3};
             Image = new[] {"res://assets/ImageSized/maison4.png", "res://assets/ImageSized/isometric immeuble.png"};
             NbrAmeliorations = 1;
             NbCar = 2;

diff --git a/Game/Buildings/Characteristics/Maison5.cs b/Game/Buildings/Characteristics/Maison5.cs
@@ -12,7 +12,7 @@ public Maison5()
             Titre = new[] {"Maison", "Maison Ecolo"};
             Lvl = 0;
             GainXp = new[] {10, 15};
-            energy = new[] {2,0};
+            energy = new[] {2, 0};
             water = new[] {2, 0};
             Image = new[] {"res://assets/ImageSized/maison5.png", "res://assets/ImageSized/isometric maison ecolo.png"};
             NbrAmeliorations = 1;

diff --git a/Game/Buildings/Characteristics/Mosque.cs b/Game/Buildings/Characteristics/Mosque.cs
@@ -14,10 +14,14 @@ public Mosque()
             GainXp = new[] {10, 15, 30};
             energy = new[] {1, 3, 6};
             water = new[] {2, 3, 5};
-            Image = new[] {"res://assets/ImageSized/isometric mosquee2.png", "res://assets/ImageSized/isometric mosquee1.png", "res://assets/ImageSized/isometric mosquee3.png"};
+            Image = new[]
+            {
+                "res://assets/ImageSized/isometric mosquee2.png", "res://assets/ImageSized/isometric mosquee1.png",
+                "res://assets/ImageSized/isometric mosquee3.png"
+            };
             NbrAmeliorations = 2;
             NbCar = 0;
-            Population =new[] {0, 0, 0};
+            Population = new[] {0, 0, 0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/Parc.cs b/Game/Buildings/Characteristics/Parc.cs
@@ -8,13 +8,17 @@ public Parc()
         {
             Bloc = new[] {Ref_donnees.parc_enfant, Ref_donnees.parc2, Ref_donnees.parc3};
             Cost = new[] {100, 1000, 5000};
-            Earn = new[] {1, 3,6};
+            Earn = new[] {1, 3, 6};
             Titre = new[] {"Parc", "Parc", "Parc"};
             Lvl = 0;
             GainXp = new[] {10, 15, 30};
             energy = new[] {0, 0, 0};
             water = new[] {0, 0, 0};
-            Image = new[] {"res://assets/ImageSized/iso parc enfant4.png", "res://assets/ImageSized/I parc enfant.png", "res://assets/ImageSized/I parc enfant2.png"};
+            Image = new[]
+            {
+                "res://assets/ImageSized/iso parc enfant4.png", "res://assets/ImageSized/I parc enfant.png",
+                "res://assets/ImageSized/I parc enfant2.png"
+            };
             NbrAmeliorations = 2;
             NbCar = 0;
             Population = new[] {0, 0, 0};

diff --git a/Game/Buildings/Characteristics/Piscine.cs b/Game/Buildings/Characteristics/Piscine.cs
@@ -8,7 +8,7 @@ public Piscine()
         {
             Bloc = new[] {Ref_donnees.piscine};
             Cost = new[] {10000};
-            Earn = new[] {20,30,50};
+            Earn = new[] {20, 30, 50};
             Titre = new[] {"Piscine"};
             Lvl = 0;
             GainXp = new[] {10, 100, 500};

diff --git a/Game/Buildings/Characteristics/Restaurant.cs b/Game/Buildings/Characteristics/Restaurant.cs
@@ -14,7 +14,8 @@ public Restaurant()
             GainXp = new[] {10, 15};
             energy = new[] {1, 3};
             water = new[] {2, 3};
-            Image = new[] {"res://assets/ImageSized/isometric boutique5.png", "res://assets/ImageSized/isometric boutique9.png"};
+            Image = new[]
+                {"res://assets/ImageSized/isometric boutique5.png", "res://assets/ImageSized/isometric boutique9.png"};
             NbrAmeliorations = 1;
             NbCar = 0;
             Population = new[] {0, 0};

diff --git a/Game/Buildings/Characteristics/Solaire.cs b/Game/Buildings/Characteristics/Solaire.cs
@@ -17,7 +17,7 @@ public Solaire()
             Image = new[] {"res://assets/ImageSized/isometric parc panneaux solaires.png"};
             NbrAmeliorations = 0;
             NbCar = 0;
-            Population =new[] {0};
+            Population = new[] {0};
         }
 
         public int[] Bloc { get; }

diff --git a/Game/Buildings/Characteristics/Usine.cs b/Game/Buildings/Characteristics/Usine.cs
@@ -12,9 +12,13 @@ public Usine()
             Titre = new[] {"Usine", "Usine", "Usine", "Usine"};
             Lvl = 0;
             GainXp = new[] {10, 15, 30, 60};
-            energy = new[] {5,10, 20, 30};
-            water = new[] {2,4, 9, 15};
-            Image = new[] {"res://assets/ImageSized/isometric usine1.png", "res://assets/ImageSized/isometric usine2.png", "res://assets/ImageSized/isometric usine3.png", "res://assets/ImageSized/isometric usine4.png"};
+            energy = new[] {5, 10, 20, 30};
+            water = new[] {2, 4, 9, 15};
+            Image = new[]
+            {
+                "res://assets/ImageSized/isometric usine1.png", "res://assets/ImageSized/isometric usine2.png",
+                "res://assets/ImageSized/isometric usine3.png", "res://assets/ImageSized/isometric usine4.png"
+            };
             NbrAmeliorations = 3;
             NbCar = 2;
             Population = new[] {0, 0, 0, 0};