Piou-piou / Ruined-World

modules/bataille/app/controller/Unite.php

Spacing +24 added lines, -24 removed lines

@@ -50,29 +50,29 @@ 
 					$temps_recrutement = DateHeure::Secondeenheure($obj->temps_recrutement);
 				}
 
-				$coef = $this->coef_unite*$niveau;
-				$coef_ameliorer = $this->coef_unite*($niveau+1);
+				$coef = $this->coef_unite * $niveau;
+				$coef_ameliorer = $this->coef_unite * ($niveau + 1);
 
 				if ($niveau == 1) $coef = 1;
 
 				return [
 					"caracteristique" => [
-						"attaque" => round($base_carac["attaque"]*$coef),
-						"defense" => round($base_carac["defense"]*$coef),
-						"resistance" => round($base_carac["resistance"]*$coef),
+						"attaque" => round($base_carac["attaque"] * $coef),
+						"defense" => round($base_carac["defense"] * $coef),
+						"resistance" => round($base_carac["resistance"] * $coef),
 						"vitesse" => $base_carac["vitesse"]
 					],
 					"cout_recruter" => [
-						"eau" => $ressource["eau"]*$coef,
-						"electricite" => $ressource["electricite"]*$coef,
-						"fer" => $ressource["fer"]*$coef,
-						"fuel" => $ressource["fuel"]*$coef,
+						"eau" => $ressource["eau"] * $coef,
+						"electricite" => $ressource["electricite"] * $coef,
+						"fer" => $ressource["fer"] * $coef,
+						"fuel" => $ressource["fuel"] * $coef,
 					],
 					"cout_ameliorer" => [
-						"eau" => $ressource["eau"]*$coef_ameliorer,
-						"electricite" => $ressource["electricite"]*$coef_ameliorer,
-						"fer" => $ressource["fer"]*$coef_ameliorer,
-						"fuel" => $ressource["fuel"]*$coef_ameliorer,
+						"eau" => $ressource["eau"] * $coef_ameliorer,
+						"electricite" => $ressource["electricite"] * $coef_ameliorer,
+						"fer" => $ressource["fer"] * $coef_ameliorer,
+						"fuel" => $ressource["fuel"] * $coef_ameliorer,
 					],
 					"temps_recrutement" => $temps_recrutement
 				];
@@ -106,7 +106,7 @@ 
 			$unites = Bataille::getCentreRecherche()->getAllRechercheType($type);
 
 			//recupérer les caractéristiques de l'unité en question
-			for ($i=0 ; $i<count($unites) ; $i++) {
+			for ($i = 0; $i < count($unites); $i++) {
 				$unites[$i] += $this->getCaracteristiqueUnite($unites[$i]["recherche"], $unites[$i]["niveau"], $type);
 				$unites[$i] += ["type" => $type];
 			}
@@ -127,7 +127,7 @@ 
 				$today = Bataille::getToday();
 
 				foreach ($query as $obj) {
-					if ($obj->date_fin-$today <= 0) {
+					if ($obj->date_fin - $today <= 0) {
 						$this->setTerminerRecrutement($obj->ID_recrutement);
 					}
 					else {
@@ -135,7 +135,7 @@ 
 							"nom" => $obj->nom,
 							"type" => $obj->type,
 							"nombre" => $obj->nombre,
-							"date_fin_recrutement" => $obj->date_fin-$today,
+							"date_fin_recrutement" => $obj->date_fin - $today,
 							"id_recrutement" => $obj->ID_recrutement
 						];
 					}
@@ -157,7 +157,7 @@ 
 			$count_type = count($types);
 			$unites = [];
 
-			for ($i=0 ; $i<$count_type ; $i++) {
+			for ($i = 0; $i < $count_type; $i++) {
 				$type_unite = $this->getAllUniteType($types[$i], $id_base);
 				//$unite_vehicule = $this->getAllUniteType("véhicule", $id_base);
 
@@ -229,17 +229,17 @@ 
 
 			//on test si on a assez de ressource pour recruter les unites
 			//on test si assez de ressources dans la base
-			$retirer_eau = $pour_recruter["eau"]*$nombre;
-			$retirer_electricite = $pour_recruter["electricite"]*$nombre;
-			$retirer_fer = $pour_recruter["fer"]*$nombre;
-			$retirer_fuel = $pour_recruter["fuel"]*$nombre;
+			$retirer_eau = $pour_recruter["eau"] * $nombre;
+			$retirer_electricite = $pour_recruter["electricite"] * $nombre;
+			$retirer_fer = $pour_recruter["fer"] * $nombre;
+			$retirer_fuel = $pour_recruter["fuel"] * $nombre;
 			$eau = Bataille::getTestAssezRessourceBase("eau", $retirer_eau);
 			$electricite = Bataille::getTestAssezRessourceBase("electricite", $retirer_electricite);
 			$fer = Bataille::getTestAssezRessourceBase("fer", $retirer_fer);
 			$fuel = Bataille::getTestAssezRessourceBase("fuel", $retirer_fuel);
 
 
-			if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge" ) {
+			if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge") {
 				FlashMessage::setFlash("Pas assez de ressources pour recruter autant d'unités");
 				return false;
 			}
@@ -247,7 +247,7 @@ 
 				//on retire les ressources
 				Bataille::getRessource()->setUpdateRessource($retirer_eau, $retirer_electricite, $retirer_fer, $retirer_fuel, 0, "-");
 
-				$date_fin = Bataille::getToday()+($temps_recrutement*$nombre);
+				$date_fin = Bataille::getToday() + ($temps_recrutement * $nombre);
 
 				$dbc->insert("nom", $nom)
 					->insert("type", $type)
@@ -280,7 +280,7 @@ 
 
 				if ($type == "unité infanterie") $table = "_bataille_unite";
 
-				for ($i=0 ; $i<$nombre ; $i++) {
+				for ($i = 0; $i < $nombre; $i++) {
 					$dbc->insert("nom", $type)
 						->insert("type", $nom)
 						->insert("ID_base", Bataille::getIdBase())

Braces +18 added lines, -11 removed lines

@@ -19,7 +19,9 @@ 
 			$query = $dbc1->select("coef_niveau_unite")->from("configuration")->where("ID_configuration", "=", 1)->get();
 
 			if ((is_array($query)) && (count($query) == 1)) {
-				foreach ($query as $obj) $this->coef_unite = $obj->coef_niveau_unite;
+				foreach ($query as $obj) {
+					$this->coef_unite = $obj->coef_niveau_unite;
+				}
 			}
 		}
 		//-------------------------- END BUILDER ----------------------------------------------------------------------------//
@@ -53,7 +55,9 @@ 
 				$coef = $this->coef_unite*$niveau;
 				$coef_ameliorer = $this->coef_unite*($niveau+1);
 
-				if ($niveau == 1) $coef = 1;
+				if ($niveau == 1) {
+					$coef = 1;
+				}
 
 				return [
 					"caracteristique" => [
@@ -76,8 +80,7 @@ 
 					],
 					"temps_recrutement" => $temps_recrutement
 				];
-			}
-			else {
+			} else {
 				return [];
 			}
 		}
@@ -92,7 +95,9 @@ 
 			$query = $dbc1->select("type_unite")->from("configuration")->where("ID_configuration", "=", 1)->get();
 
 			if ((is_array($query)) && (count($query) == 1)) {
-				foreach ($query as $obj) return explode(",", $obj->type_unite);
+				foreach ($query as $obj) {
+					return explode(",", $obj->type_unite);
+				}
 			}
 		}
 
@@ -129,8 +134,7 @@ 
 				foreach ($query as $obj) {
 					if ($obj->date_fin-$today <= 0) {
 						$this->setTerminerRecrutement($obj->ID_recrutement);
-					}
-					else {
+					} else {
 						$recrutement[] = [
 							"nom" => $obj->nom,
 							"type" => $obj->type,
@@ -151,7 +155,9 @@ 
 		 */
 		public function getAllUnites($id_base = null) {
 
-			if ($id_base == null) $id_base = Bataille::getIdBase();
+			if ($id_base == null) {
+				$id_base = Bataille::getIdBase();
+			}
 
 			$types = $this->getAllType();
 			$count_type = count($types);
@@ -242,8 +248,7 @@ 
 			if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge" ) {
 				FlashMessage::setFlash("Pas assez de ressources pour recruter autant d'unités");
 				return false;
-			}
-			else {
+			} else {
 				//on retire les ressources
 				Bataille::getRessource()->setUpdateRessource($retirer_eau, $retirer_electricite, $retirer_fer, $retirer_fuel, 0, "-");
 
@@ -278,7 +283,9 @@ 
 					$type = $obj->type;
 				}
 
-				if ($type == "unité infanterie") $table = "_bataille_unite";
+				if ($type == "unité infanterie") {
+					$table = "_bataille_unite";
+				}
 
 				for ($i=0 ; $i<$nombre ; $i++) {
 					$dbc->insert("nom", $type)