Piou-piou / Ruined-World

modules/bataille/app/controller/Points.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 		//-------------------------- SETTER ----------------------------------------------------------------------------//
 		/**
 		 * @param $id_base
-		 * @param $type
+		 * @param string $type
 		 * fonction qui ajoute des points à la base en fonction du type
 		 * le type peut etre : batiment, attaque, defense, troupe
 		 */

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 			
 			$query = $dbc->select("points_batiment")->from("configuration")->where("ID_configuration", "=", 1)->get();
 			
-			foreach ($query as $obj) return $obj->points_batiment;
+			foreach ($query as $obj) {
+				return $obj->points_batiment;
+			}
 		}
 		//-------------------------- END GETTER ----------------------------------------------------------------------------//
 		

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 			$dbc = App::getDb();
 			
 			if ($type == "batiment") {
-				$points = self::getPointsBase($id_base)+self::getPointAjoutBatiment();
+				$points = self::getPointsBase($id_base) + self::getPointAjoutBatiment();
 				
 			}
 			

modules/bataille/app/controller/Marche.php

Doc Comments +1 added lines

@@ -119,6 +119,7 @@
 
 		/**
 		 * fonction qui place le trajet en retour
+		 * @param double $date_retour
 		 */
 		private function setTrajetRetour($date_retour) {
 			$dbc = App::getDb();

Braces +5 added lines, -10 removed lines

@@ -88,25 +88,21 @@ 
 				//on calcul la date d'arrivée du retour
 				if ($this->id_base_dest == Bataille::getIdBase()) {
 					$date_retour = Bataille::getDureeTrajet($this->id_base)+$this->date_arrivee;
-				}
-				else {
+				} else {
 					$date_retour = Bataille::getDureeTrajet($this->id_base_dest)+$this->date_arrivee;
 				}
 
 				//si le retour du trajet est également arrivé on finit le transport sinon on le place sur le retour
 				if ($date_retour < $today) {
 					$this->setTerminerTransport();
-				}
-				else {
+				} else {
 					$this->setTrajetRetour($date_retour);
 					$this->duree_restante_trajet = $date_retour-$today;
 					$set_array = true;
 				}
-			}
-			else if (($this->aller == 0) && (($this->date_arrivee-$today) <= 0)) {
+			} else if (($this->aller == 0) && (($this->date_arrivee-$today) <= 0)) {
 				$this->setTerminerTransport();
-			}
-			else {
+			} else {
 				$this->duree_restante_trajet = $this->date_arrivee-$today;
 				$set_array = true;
 			}
@@ -119,8 +115,7 @@ 
 						"nom_base_dest" => $this->nom_base,
 						"aller" => $this->aller
 					];
-				}
-				else {
+				} else {
 					$marche = [
 						"id_marche_transport" => $this->id_marche_transport,
 						"date_arrivee" => $this->duree_restante_trajet,

Spacing +10 added lines, -10 removed lines

@@ -82,15 +82,15 @@ 
 			$today = Bataille::getToday();
 
 			//on test si déja arrivé à destination
-			if (($this->aller == 1) && (($this->date_arrivee-$today) <= 0)) {
+			if (($this->aller == 1) && (($this->date_arrivee - $today) <= 0)) {
 				$this->setLivrerRessource();
 
 				//on calcul la date d'arrivée du retour
 				if ($this->id_base_dest == Bataille::getIdBase()) {
-					$date_retour = Bataille::getDureeTrajet($this->id_base, Bataille::getParam("vitesse_marchand"))+$this->date_arrivee;
+					$date_retour = Bataille::getDureeTrajet($this->id_base, Bataille::getParam("vitesse_marchand")) + $this->date_arrivee;
 				}
 				else {
-					$date_retour = Bataille::getDureeTrajet($this->id_base_dest, Bataille::getParam("vitesse_marchand"))+$this->date_arrivee;
+					$date_retour = Bataille::getDureeTrajet($this->id_base_dest, Bataille::getParam("vitesse_marchand")) + $this->date_arrivee;
 				}
 
 				//si le retour du trajet est également arrivé on finit le transport sinon on le place sur le retour
@@ -99,15 +99,15 @@ 
 				}
 				else {
 					$this->setTrajetRetour($date_retour);
-					$this->duree_restante_trajet = $date_retour-$today;
+					$this->duree_restante_trajet = $date_retour - $today;
 					$set_array = true;
 				}
 			}
-			else if (($this->aller == 0) && (($this->date_arrivee-$today) <= 0)) {
+			else if (($this->aller == 0) && (($this->date_arrivee - $today) <= 0)) {
 				$this->setTerminerTransport();
 			}
 			else {
-				$this->duree_restante_trajet = $this->date_arrivee-$today;
+				$this->duree_restante_trajet = $this->date_arrivee - $today;
 				$set_array = true;
 			}
 
@@ -159,11 +159,11 @@ 
 			}
 
 			//on a le nombre de marchand dispo dans la base
-			$nombre_marchand_dispo = $nombre_max_marchand-$marchand_transport;
+			$nombre_marchand_dispo = $nombre_max_marchand - $marchand_transport;
 
 			//on calcul savoir si on en a assez pour transport toutes les ressoures
 			//il faut 1 marchand pour 1000 ressource
-			$nombre_marchand_trajet = ceil($all_ressource/1000);
+			$nombre_marchand_trajet = ceil($all_ressource / 1000);
 
 			//si on a assez de marchand on revoi true sinon false
 			if ($nombre_marchand_dispo >= $nombre_marchand_trajet) {
@@ -244,7 +244,7 @@ 
 				}
 
 				//on check si assez marchand dans la base, si pas assez on return false
-				$nb_marchand = $this->getAssezMarchand($eau+$electricite+$fer+$fuel+$nourriture);
+				$nb_marchand = $this->getAssezMarchand($eau + $electricite + $fer + $fuel + $nourriture);
 
 				if ($nb_marchand === false) {
 					FlashMessage::setFlash("Vous n'avez pas assez de marchans disponibles pour effectuer ce trajet");
@@ -253,7 +253,7 @@ 
 
 				//sinon initialise le transport
 				//on recup la date d'arrivee dans la base de destintation
-				$date_arrivee = Bataille::getDureeTrajet($id_base_dest, Bataille::getParam("vitesse_marchand"))+Bataille::getToday();
+				$date_arrivee = Bataille::getDureeTrajet($id_base_dest, Bataille::getParam("vitesse_marchand")) + Bataille::getToday();
 
 				$ressource = [
 					"eau" => $eau,

modules/bataille/app/controller/Ressource.php

Braces +17 added lines, -9 removed lines

@@ -17,8 +17,7 @@ 
 
 			if ($id_base === null) {
 				$this->id_base = Bataille::getIdBase();
-			}
-			else {
+			} else {
 				$this->id_base = $id_base;
 			}
 
@@ -154,8 +153,7 @@ 
 				$fer = $this->getFer()-$fer;
 				$fuel = $this->getFuel()-$fuel;
 				$nourriture = $this->getNourriture()-$nourriture;
-			}
-			else {
+			} else {
 				$eau = $this->getEau()+$eau;
 				$electricite = $this->getElectricite()+$electricite;
 				$fer = $this->getFer()+$fer;
@@ -164,11 +162,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;
+				}
 			}
 
 

Spacing +12 added lines, -12 removed lines

@@ -97,7 +97,7 @@ 
 			$last_co = new \DateTime($last_co);
 			$last_co = $last_co->getTimestamp();
 
-			$diff_temps = $today-$last_co;
+			$diff_temps = $today - $last_co;
 
 			//si la derniere actualisation ou connexion est supérieur à 30 sec
 			if ($diff_temps > 180) {
@@ -117,7 +117,7 @@ 
 		private function setAddRessource($nom_ressource, $ressrouce, $diff_temps) {
 			$dbc = App::getDb();
 
-			$ressource = $ressrouce+(round((Bataille::getBatiment()->getProduction($nom_ressource, $this->id_base)/3600)*$diff_temps));
+			$ressource = $ressrouce + (round((Bataille::getBatiment()->getProduction($nom_ressource, $this->id_base) / 3600) * $diff_temps));
 			$stockage_max = Bataille::getBatiment()->getStockageEntrepot($this->id_base);
 
 			if ($ressource > $stockage_max) {
@@ -148,18 +148,18 @@ 
 
 			//soit on enelve ou on ajoute
 			if ($signe == "-") {
-				$eau = $this->getEau()-$eau;
-				$electricite = $this->getElectricite()-$electricite;
-				$fer = $this->getFer()-$fer;
-				$fuel = $this->getFuel()-$fuel;
-				$nourriture = $this->getNourriture()-$nourriture;
+				$eau = $this->getEau() - $eau;
+				$electricite = $this->getElectricite() - $electricite;
+				$fer = $this->getFer() - $fer;
+				$fuel = $this->getFuel() - $fuel;
+				$nourriture = $this->getNourriture() - $nourriture;
 			}
 			else {
-				$eau = $this->getEau()+$eau;
-				$electricite = $this->getElectricite()+$electricite;
-				$fer = $this->getFer()+$fer;
-				$fuel = $this->getFuel()+$fuel;
-				$nourriture = $this->getNourriture()+$nourriture;
+				$eau = $this->getEau() + $eau;
+				$electricite = $this->getElectricite() + $electricite;
+				$fer = $this->getFer() + $fer;
+				$fuel = $this->getFuel() + $fuel;
+				$nourriture = $this->getNourriture() + $nourriture;
 
 				$stockage_max = Bataille::getBatiment()->getStockageEntrepot();
 

modules/bataille/app/controller/marche/envoyer_ressources.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-	$marche =  new \modules\bataille\app\controller\Marche();
+	$marche = new \modules\bataille\app\controller\Marche();
 
 	$marche->setCommencerTransport($_POST['eau'], $_POST['electricite'], $_POST['fer'], $_POST['fuel'], $_POST['nourriture'], $_POST['posx'], $_POST['posy']);
 

modules/bataille/app/controller/Map.php

Braces +3 added lines, -6 removed lines

@@ -38,8 +38,7 @@ 
 					->from("_bataille_base")
 					->where("_bataille_base.ID_identite", "=", "identite.ID_identite", "", true)
 					->get();
-			}
-			else {
+			} else {
 				$query = $dbc->select("_bataille_base.nom_base")
 					->select("_bataille_base.points")
 					->select("_bataille_base.posx")
@@ -114,8 +113,7 @@ 
 			if (Bataille::getNombreJoueur() <= 150) {
 				$posx = rand(0, 79);
 				$posy = rand(0, 75);
-			}
-			else {
+			} else {
 				$posx = rand(0, $this->largeur);
 				$posy = rand(0, $this->hauteur);
 			}
@@ -123,8 +121,7 @@ 
 			//on test si il y a une base sur ces positions
 			if (Bataille::getBaseExistPosition($posx, $posy)) {
 				$this->getPositionNewBase();
-			}
-			else {
+			} else {
 				//on a une position de base inexistante donc on la return
 				return ["posx" => $posx, "posy" => $posy];
 			}

modules/bataille/app/controller/initialise/test_connexion.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

modules/bataille/app/controller/unites/recruter.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

modules/bataille/app/controller/Unite.php

Braces +15 added lines, -10 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);
+				}
 			}
 		}
 
@@ -128,8 +133,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,
@@ -150,7 +154,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);
@@ -240,8 +246,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, "-");
 

Spacing +21 added lines, -21 removed lines

@@ -47,25 +47,25 @@ 
 				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 = $this->coef_unite * $niveau;
 
 				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,
 					],
 					"temps_recrutement" => $temps_recrutement
 				];
@@ -99,7 +99,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];
 			}
@@ -119,7 +119,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 {
@@ -127,7 +127,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
 						];
 					}
@@ -149,7 +149,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);
@@ -215,23 +215,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;
 			}
@@ -239,7 +239,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)
@@ -270,7 +270,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