Piou-piou / Ruined-World

modules/bataille/app/controller/CentreRecherche.php

Spacing +4 added lines, -4 removed lines

@@ -91,13 +91,13 @@ 
 		}
 
 		private function getTempsRecherche($temps, $niveau = 0) {
-			$pourcent = ($temps*Bataille::getBatiment()->getNiveauBatiment("centre_recherche")/100);
+			$pourcent = ($temps * Bataille::getBatiment()->getNiveauBatiment("centre_recherche") / 100);
 
 			if ($niveau == 0) {
-				return round($temps-$pourcent);;
+				return round($temps - $pourcent); ;
 			}
 
-			return round(($temps * ($this->coef_centre * $niveau))-$pourcent);
+			return round(($temps * ($this->coef_centre * $niveau)) - $pourcent);
 		}
 		//-------------------------- END BUILDER ----------------------------------------------------------------------------//
 		
@@ -170,7 +170,7 @@ 
 				$temps_recherche = $this->getTempsRecherche($temps_recherche, $niveau_recherche);
 			}
 
-			$date_fin = Bataille::getToday()+$temps_recherche;
+			$date_fin = Bataille::getToday() + $temps_recherche;
 
 			$dbc->insert("recherche", $recherche)
 				->insert("type", $type)

Braces +7 added lines, -4 removed lines

@@ -16,7 +16,9 @@ 
 			$query = $dbc1->select("coef_centre_recherche")->from("configuration")->where("ID_configuration", "=", 1)->get();
 
 			if ((is_array($query)) && (count($query) == 1)) {
-				foreach ($query as $obj) $this->coef_centre = $obj->coef_centre_recherche;
+				foreach ($query as $obj) {
+					$this->coef_centre = $obj->coef_centre_recherche;
+				}
 			}
 
 			$query = $dbc1->select()->from("recherche")
@@ -35,8 +37,7 @@ 
 					if ($niveau > 0) {
 						$cout = $this->getCoutRecherche($cout, $niveau);
 						$temps_recherche = $this->getTempsRecherche($temps_recherche, $niveau);
-					}
-					else {
+					} else {
 						$niveau_recherche = 1;
 					}
 
@@ -146,7 +147,9 @@ 
 				->get();
 
 			if ((is_array($query)) && (count($query) == 1)) {
-				foreach ($query as $obj) $niveau_recherche = $obj->niveau;
+				foreach ($query as $obj) {
+					$niveau_recherche = $obj->niveau;
+				}
 			}
 
 			//récupération du cout initial plus temps de recherche initial pour calculer les bon en fonction

modules/bataille/app/controller/Unite.php

Spacing +26 added lines, -26 removed lines

@@ -47,32 +47,32 @@ 
 				foreach ($query as $obj) {
 					$base_carac = unserialize($obj->caracteristique);
 					$ressource = unserialize($obj->pour_recruter);
-					$temps_recrutement = DateHeure::Secondeenheure(round($obj->temps_recrutement-($obj->temps_recrutement*Bataille::getBatiment()->getNiveauBatiment("caserne")/100)));
+					$temps_recrutement = DateHeure::Secondeenheure(round($obj->temps_recrutement - ($obj->temps_recrutement * Bataille::getBatiment()->getNiveauBatiment("caserne") / 100)));
 				}
 
-				$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];
 			}
@@ -126,7 +126,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 {
@@ -134,7 +134,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
 						];
 					}
@@ -156,7 +156,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);
 
 				$unites = array_merge($unites, $type_unite);
@@ -222,23 +222,23 @@ 
 			if ((is_array($query)) && (count($query) == 1)) {
 				foreach ($query as $obj) {
 					$pour_recruter = unserialize($obj->pour_recruter);
-					$temps_recrutement = round($obj->temps_recrutement-($obj->temps_recrutement*Bataille::getBatiment()->getNiveauBatiment("caserne")/100));
+					$temps_recrutement = round($obj->temps_recrutement - ($obj->temps_recrutement * Bataille::getBatiment()->getNiveauBatiment("caserne") / 100));
 				}
 			}
 
 			//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;
 			}
@@ -246,7 +246,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)
@@ -277,7 +277,7 @@ 
 					$type = $obj->type;
 				}
 
-				for ($i=0 ; $i<$nombre ; $i++) {
+				for ($i = 0; $i < $nombre; $i++) {
 					$dbc->insert("nom", $nom)
 						->insert("type", $type)
 						->insert("ID_base", Bataille::getIdBase())

modules/bataille/app/controller/centre_recherche/rechercher.php

Braces +1 added lines, -2 removed lines

@@ -4,7 +4,6 @@
 
 	if (isset($_POST['admin'])) {
 		\core\auth\Connexion::setLogin($pseudo, $mdp, WEBROOT."administrator/login", WEBROOT."administrator", 0);
-	}
-	else {
+	} else {
 		\core\auth\Connexion::setLogin($pseudo, $mdp, WEBROOT."login", WEBROOT."index.php", 0);
 	}
\ No newline at end of file