Passed
Push — master ( 6bbf8c...5c0550 )
by Anthony
02:27
created
modules/bataille/app/controller/Unite.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -47,32 +47,32 @@  discard block
 block discarded – undo
47 47
 				foreach ($query as $obj) {
48 48
 					$base_carac = unserialize($obj->caracteristique);
49 49
 					$ressource = unserialize($obj->pour_recruter);
50
-					$temps_recrutement = DateHeure::Secondeenheure($obj->temps_recrutement-($obj->temps_recrutement*Bataille::getBatiment()->getNiveauBatiment("caserne")/100));
50
+					$temps_recrutement = DateHeure::Secondeenheure($obj->temps_recrutement - ($obj->temps_recrutement * Bataille::getBatiment()->getNiveauBatiment("caserne") / 100));
51 51
 				}
52 52
 
53
-				$coef = $this->coef_unite*$niveau;
54
-				$coef_ameliorer = $this->coef_unite*($niveau+1);
53
+				$coef = $this->coef_unite * $niveau;
54
+				$coef_ameliorer = $this->coef_unite * ($niveau + 1);
55 55
 
56 56
 				if ($niveau == 1) $coef = 1;
57 57
 
58 58
 				return [
59 59
 					"caracteristique" => [
60
-						"attaque" => round($base_carac["attaque"]*$coef),
61
-						"defense" => round($base_carac["defense"]*$coef),
62
-						"resistance" => round($base_carac["resistance"]*$coef),
60
+						"attaque" => round($base_carac["attaque"] * $coef),
61
+						"defense" => round($base_carac["defense"] * $coef),
62
+						"resistance" => round($base_carac["resistance"] * $coef),
63 63
 						"vitesse" => $base_carac["vitesse"]
64 64
 					],
65 65
 					"cout_recruter" => [
66
-						"eau" => $ressource["eau"]*$coef,
67
-						"electricite" => $ressource["electricite"]*$coef,
68
-						"fer" => $ressource["fer"]*$coef,
69
-						"fuel" => $ressource["fuel"]*$coef,
66
+						"eau" => $ressource["eau"] * $coef,
67
+						"electricite" => $ressource["electricite"] * $coef,
68
+						"fer" => $ressource["fer"] * $coef,
69
+						"fuel" => $ressource["fuel"] * $coef,
70 70
 					],
71 71
 					"cout_ameliorer" => [
72
-						"eau" => $ressource["eau"]*$coef_ameliorer,
73
-						"electricite" => $ressource["electricite"]*$coef_ameliorer,
74
-						"fer" => $ressource["fer"]*$coef_ameliorer,
75
-						"fuel" => $ressource["fuel"]*$coef_ameliorer,
72
+						"eau" => $ressource["eau"] * $coef_ameliorer,
73
+						"electricite" => $ressource["electricite"] * $coef_ameliorer,
74
+						"fer" => $ressource["fer"] * $coef_ameliorer,
75
+						"fuel" => $ressource["fuel"] * $coef_ameliorer,
76 76
 					],
77 77
 					"temps_recrutement" => $temps_recrutement
78 78
 				];
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 			$unites = Bataille::getCentreRecherche()->getAllRechercheType($type);
107 107
 
108 108
 			//recupérer les caractéristiques de l'unité en question
109
-			for ($i=0 ; $i<count($unites) ; $i++) {
109
+			for ($i = 0; $i < count($unites); $i++) {
110 110
 				$unites[$i] += $this->getCaracteristiqueUnite($unites[$i]["recherche"], $unites[$i]["niveau"], $type);
111 111
 				$unites[$i] += ["type" => $type];
112 112
 			}
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 				$today = Bataille::getToday();
127 127
 
128 128
 				foreach ($query as $obj) {
129
-					if ($obj->date_fin-$today <= 0) {
129
+					if ($obj->date_fin - $today <= 0) {
130 130
 						$this->setTerminerRecrutement($obj->ID_recrutement);
131 131
 					}
132 132
 					else {
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 							"nom" => $obj->nom,
135 135
 							"type" => $obj->type,
136 136
 							"nombre" => $obj->nombre,
137
-							"date_fin_recrutement" => $obj->date_fin-$today,
137
+							"date_fin_recrutement" => $obj->date_fin - $today,
138 138
 							"id_recrutement" => $obj->ID_recrutement
139 139
 						];
140 140
 					}
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 			$count_type = count($types);
157 157
 			$unites = [];
158 158
 
159
-			for ($i=0 ; $i<$count_type ; $i++) {
159
+			for ($i = 0; $i < $count_type; $i++) {
160 160
 				$type_unite = $this->getAllUniteType($types[$i], $id_base);
161 161
 
162 162
 				$unites = array_merge($unites, $type_unite);
@@ -221,23 +221,23 @@  discard block
 block discarded – undo
221 221
 			if ((is_array($query)) && (count($query) == 1)) {
222 222
 				foreach ($query as $obj) {
223 223
 					$pour_recruter = unserialize($obj->pour_recruter);
224
-					$temps_recrutement = $obj->temps_recrutement-($obj->temps_recrutement*Bataille::getBatiment()->getNiveauBatiment("caserne")/100);
224
+					$temps_recrutement = $obj->temps_recrutement - ($obj->temps_recrutement * Bataille::getBatiment()->getNiveauBatiment("caserne") / 100);
225 225
 				}
226 226
 			}
227 227
 
228 228
 			//on test si on a assez de ressource pour recruter les unites
229 229
 			//on test si assez de ressources dans la base
230
-			$retirer_eau = $pour_recruter["eau"]*$nombre;
231
-			$retirer_electricite = $pour_recruter["electricite"]*$nombre;
232
-			$retirer_fer = $pour_recruter["fer"]*$nombre;
233
-			$retirer_fuel = $pour_recruter["fuel"]*$nombre;
230
+			$retirer_eau = $pour_recruter["eau"] * $nombre;
231
+			$retirer_electricite = $pour_recruter["electricite"] * $nombre;
232
+			$retirer_fer = $pour_recruter["fer"] * $nombre;
233
+			$retirer_fuel = $pour_recruter["fuel"] * $nombre;
234 234
 			$eau = Bataille::getTestAssezRessourceBase("eau", $retirer_eau);
235 235
 			$electricite = Bataille::getTestAssezRessourceBase("electricite", $retirer_electricite);
236 236
 			$fer = Bataille::getTestAssezRessourceBase("fer", $retirer_fer);
237 237
 			$fuel = Bataille::getTestAssezRessourceBase("fuel", $retirer_fuel);
238 238
 
239 239
 
240
-			if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge" ) {
240
+			if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge") {
241 241
 				FlashMessage::setFlash("Pas assez de ressources pour recruter autant d'unités");
242 242
 				return false;
243 243
 			}
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 				//on retire les ressources
246 246
 				Bataille::getRessource()->setUpdateRessource($retirer_eau, $retirer_electricite, $retirer_fer, $retirer_fuel, 0, "-");
247 247
 
248
-				$date_fin = Bataille::getToday()+($temps_recrutement*$nombre);
248
+				$date_fin = Bataille::getToday() + ($temps_recrutement * $nombre);
249 249
 
250 250
 				$dbc->insert("nom", $nom)
251 251
 					->insert("type", $type)
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 					$type = $obj->type;
277 277
 				}
278 278
 
279
-				for ($i=0 ; $i<$nombre ; $i++) {
279
+				for ($i = 0; $i < $nombre; $i++) {
280 280
 					$dbc->insert("nom", $type)
281 281
 						->insert("type", $nom)
282 282
 						->insert("ID_base", Bataille::getIdBase())
Please login to merge, or discard this patch.