Piou-piou / Ruined-World

modules/bataille/app/controller/Ressource.php

Braces +32 added lines, -14 removed lines

@@ -17,8 +17,7 @@ 
 
 			if ($id_base === null) {
 				$this->id_base = Bataille::getIdBase();
-			}
-			else {
+			} else {
 				$this->id_base = $id_base;
 			}
 
@@ -154,13 +153,22 @@ 
 				$fuel = $this->getFuel()-$fuel;
 				$nourriture = $this->getNourriture()-$nourriture;
 				
-				if ($eau < 0) $eau = 0;
-				if ($electricite < 0) $electricite = 0;
-				if ($fer < 0) $fer = 0;
-				if ($fuel < 0) $fuel = 0;
-				if ($nourriture < 0) $nourriture = 0;
-			}
-			else {
+				if ($eau < 0) {
+					$eau = 0;
+				}
+				if ($electricite < 0) {
+					$electricite = 0;
+				}
+				if ($fer < 0) {
+					$fer = 0;
+				}
+				if ($fuel < 0) {
+					$fuel = 0;
+				}
+				if ($nourriture < 0) {
+					$nourriture = 0;
+				}
+			} else {
 				$eau = $this->getEau()+$eau;
 				$electricite = $this->getElectricite()+$electricite;
 				$fer = $this->getFer()+$fer;
@@ -169,11 +177,21 @@ 
 
 				$stockage_max = Bataille::getBatiment()->getStockageEntrepot();
 
-				if ($eau > $stockage_max) $eau = $stockage_max;
-				if ($electricite > $stockage_max) $electricite = $stockage_max;
-				if ($fer > $stockage_max) $fer = $stockage_max;
-				if ($fuel > $stockage_max) $fuel = $stockage_max;
-				if ($nourriture > $stockage_max) $nourriture = $stockage_max;
+				if ($eau > $stockage_max) {
+					$eau = $stockage_max;
+				}
+				if ($electricite > $stockage_max) {
+					$electricite = $stockage_max;
+				}
+				if ($fer > $stockage_max) {
+					$fer = $stockage_max;
+				}
+				if ($fuel > $stockage_max) {
+					$fuel = $stockage_max;
+				}
+				if ($nourriture > $stockage_max) {
+					$nourriture = $stockage_max;
+				}
 			}