Passed
Push — master ( 7c57b8...164b78 )
by Anthony
02:45
created
modules/bataille/app/controller/CentreRecherche.php 1 patch
Braces   +7 added lines, -9 removed lines patch added patch discarded remove patch
@@ -19,7 +19,9 @@  discard block
 block discarded – undo
19 19
 			$query = $dbc1->select("coef_centre_recherche")->from("configuration")->where("ID_configuration", "=", 1)->get();
20 20
 
21 21
 			if ((is_array($query)) && (count($query) == 1)) {
22
-				foreach ($query as $obj) $this->coef_centre = $obj->coef_centre_recherche;
22
+				foreach ($query as $obj) {
23
+					$this->coef_centre = $obj->coef_centre_recherche;
24
+				}
23 25
 			}
24 26
 		}
25 27
 		//-------------------------- END BUILDER ----------------------------------------------------------------------------//
@@ -133,8 +135,7 @@  discard block
 block discarded – undo
133 135
 						if ($niveau > 0) {
134 136
 							$cout = $this->getCoutRecherche($cout, $niveau);
135 137
 							$temps_recherche = $this->getTempsRecherche($temps_recherche, $niveau);
136
-						}
137
-						else {
138
+						} else {
138 139
 							$niveau_recherche = 1;
139 140
 						}
140 141
 
@@ -175,8 +176,7 @@  discard block
 block discarded – undo
175 176
 						$this->setTerminerRecherche($obj->ID_recherche);
176 177
 
177 178
 						return false;
178
-					}
179
-					else {
179
+					} else {
180 180
 						$recherche = [
181 181
 							"recherche" => $obj->recherche,
182 182
 							"type" => $obj->type,
@@ -242,8 +242,7 @@  discard block
 block discarded – undo
242 242
 			if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge" ) {
243 243
 				FlashMessage::setFlash("Pas assez de ressources pour effectuer cette recherche");
244 244
 				return false;
245
-			}
246
-			else {
245
+			} else {
247 246
 				//on retire les ressources
248 247
 				Bataille::getRessource()->setUpdateRessource($cout["eau"], $cout["electricite"], $cout["fer"], $cout["fuel"], 0, "-");
249 248
 
@@ -271,8 +270,7 @@  discard block
 block discarded – undo
271 270
 					->insert("ID_base", Bataille::getIdBase())
272 271
 					->into("_bataille_centre_recherche")
273 272
 					->set();
274
-			}
275
-			else {
273
+			} else {
276 274
 				$dbc->update("niveau", $niveau_recherche+1)
277 275
 					->from("_bataille_centre_recherche")
278 276
 					->where("recherche", "=", $this->recherche, "AND")
Please login to merge, or discard this patch.
modules/bataille/app/controller/Unite.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -47,25 +47,25 @@  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(round($obj->temps_recrutement-($obj->temps_recrutement*Bataille::getBatiment()->getNiveauBatiment("caserne")/100)));
50
+					$temps_recrutement = DateHeure::Secondeenheure(round($obj->temps_recrutement - ($obj->temps_recrutement * Bataille::getBatiment()->getNiveauBatiment("caserne") / 100)));
51 51
 				}
52 52
 
53
-				$coef = $this->coef_unite*$niveau;
53
+				$coef = $this->coef_unite * $niveau;
54 54
 
55 55
 				if ($niveau == 1) $coef = 1;
56 56
 
57 57
 				return [
58 58
 					"caracteristique" => [
59
-						"attaque" => round($base_carac["attaque"]*$coef),
60
-						"defense" => round($base_carac["defense"]*$coef),
61
-						"resistance" => round($base_carac["resistance"]*$coef),
59
+						"attaque" => round($base_carac["attaque"] * $coef),
60
+						"defense" => round($base_carac["defense"] * $coef),
61
+						"resistance" => round($base_carac["resistance"] * $coef),
62 62
 						"vitesse" => $base_carac["vitesse"]
63 63
 					],
64 64
 					"cout_recruter" => [
65
-						"eau" => $ressource["eau"]*$coef,
66
-						"electricite" => $ressource["electricite"]*$coef,
67
-						"fer" => $ressource["fer"]*$coef,
68
-						"fuel" => $ressource["fuel"]*$coef,
65
+						"eau" => $ressource["eau"] * $coef,
66
+						"electricite" => $ressource["electricite"] * $coef,
67
+						"fer" => $ressource["fer"] * $coef,
68
+						"fuel" => $ressource["fuel"] * $coef,
69 69
 					],
70 70
 					"temps_recrutement" => $temps_recrutement
71 71
 				];
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 			$unites = Bataille::getCentreRecherche()->getAllRechercheType($type);
100 100
 
101 101
 			//recupérer les caractéristiques de l'unité en question
102
-			for ($i=0 ; $i<count($unites) ; $i++) {
102
+			for ($i = 0; $i < count($unites); $i++) {
103 103
 				$unites[$i] += $this->getCaracteristiqueUnite($unites[$i]["recherche"], $unites[$i]["niveau"], $type);
104 104
 				$unites[$i] += ["type" => $type];
105 105
 			}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 				$today = Bataille::getToday();
120 120
 
121 121
 				foreach ($query as $obj) {
122
-					if ($obj->date_fin-$today <= 0) {
122
+					if ($obj->date_fin - $today <= 0) {
123 123
 						$this->setTerminerRecrutement($obj->ID_recrutement);
124 124
 					}
125 125
 					else {
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 							"nom" => $obj->nom,
128 128
 							"type" => $obj->type,
129 129
 							"nombre" => $obj->nombre,
130
-							"date_fin_recrutement" => $obj->date_fin-$today,
130
+							"date_fin_recrutement" => $obj->date_fin - $today,
131 131
 							"id_recrutement" => $obj->ID_recrutement
132 132
 						];
133 133
 					}
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 			$count_type = count($types);
150 150
 			$unites = [];
151 151
 
152
-			for ($i=0 ; $i<$count_type ; $i++) {
152
+			for ($i = 0; $i < $count_type; $i++) {
153 153
 				$type_unite = $this->getAllUniteType($types[$i], $id_base);
154 154
 
155 155
 				$unites = array_merge($unites, $type_unite);
@@ -215,23 +215,23 @@  discard block
 block discarded – undo
215 215
 			if ((is_array($query)) && (count($query) == 1)) {
216 216
 				foreach ($query as $obj) {
217 217
 					$pour_recruter = unserialize($obj->pour_recruter);
218
-					$temps_recrutement = round($obj->temps_recrutement-($obj->temps_recrutement*Bataille::getBatiment()->getNiveauBatiment("caserne")/100));
218
+					$temps_recrutement = round($obj->temps_recrutement - ($obj->temps_recrutement * Bataille::getBatiment()->getNiveauBatiment("caserne") / 100));
219 219
 				}
220 220
 			}
221 221
 
222 222
 			//on test si on a assez de ressource pour recruter les unites
223 223
 			//on test si assez de ressources dans la base
224
-			$retirer_eau = $pour_recruter["eau"]*$nombre;
225
-			$retirer_electricite = $pour_recruter["electricite"]*$nombre;
226
-			$retirer_fer = $pour_recruter["fer"]*$nombre;
227
-			$retirer_fuel = $pour_recruter["fuel"]*$nombre;
224
+			$retirer_eau = $pour_recruter["eau"] * $nombre;
225
+			$retirer_electricite = $pour_recruter["electricite"] * $nombre;
226
+			$retirer_fer = $pour_recruter["fer"] * $nombre;
227
+			$retirer_fuel = $pour_recruter["fuel"] * $nombre;
228 228
 			$eau = Bataille::getTestAssezRessourceBase("eau", $retirer_eau);
229 229
 			$electricite = Bataille::getTestAssezRessourceBase("electricite", $retirer_electricite);
230 230
 			$fer = Bataille::getTestAssezRessourceBase("fer", $retirer_fer);
231 231
 			$fuel = Bataille::getTestAssezRessourceBase("fuel", $retirer_fuel);
232 232
 
233 233
 
234
-			if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge" ) {
234
+			if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge") {
235 235
 				FlashMessage::setFlash("Pas assez de ressources pour recruter autant d'unités");
236 236
 				return false;
237 237
 			}
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 				//on retire les ressources
240 240
 				Bataille::getRessource()->setUpdateRessource($retirer_eau, $retirer_electricite, $retirer_fer, $retirer_fuel, 0, "-");
241 241
 
242
-				$date_fin = Bataille::getToday()+($temps_recrutement*$nombre);
242
+				$date_fin = Bataille::getToday() + ($temps_recrutement * $nombre);
243 243
 
244 244
 				$dbc->insert("nom", $nom)
245 245
 					->insert("type", $type)
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 					$type = $obj->type;
271 271
 				}
272 272
 
273
-				for ($i=0 ; $i<$nombre ; $i++) {
273
+				for ($i = 0; $i < $nombre; $i++) {
274 274
 					$dbc->insert("nom", $nom)
275 275
 						->insert("type", $type)
276 276
 						->insert("ID_base", Bataille::getIdBase())
Please login to merge, or discard this patch.