Piou-piou /
Ruined-World
@@ -50,29 +50,29 @@ discard block |
||
| 50 | 50 | $temps_recrutement = DateHeure::Secondeenheure($obj->temps_recrutement); |
| 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 | ]; |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $unites = Bataille::getCentreRecherche()->getAllRechercheType($type); |
| 93 | 93 | |
| 94 | 94 | //recupérer les caractéristiques de l'unité en question |
| 95 | - for ($i=0 ; $i<count($unites) ; $i++) { |
|
| 95 | + for ($i = 0; $i < count($unites); $i++) { |
|
| 96 | 96 | $unites[$i] += $this->getCaracteristiqueUnite($unites[$i]["recherche"], $unites[$i]["niveau"], $type); |
| 97 | 97 | $unites[$i] += ["type" => $type]; |
| 98 | 98 | } |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | $today = Bataille::getToday(); |
| 114 | 114 | |
| 115 | 115 | foreach ($query as $obj) { |
| 116 | - if ($obj->date_fin-$today <= 0) { |
|
| 116 | + if ($obj->date_fin - $today <= 0) { |
|
| 117 | 117 | $this->setTerminerRecrutement($obj->ID_recrutement); |
| 118 | 118 | } |
| 119 | 119 | else { |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | "nom" => $obj->nom, |
| 122 | 122 | "type" => $obj->type, |
| 123 | 123 | "nombre" => $obj->nombre, |
| 124 | - "date_fin_recrutement" => $obj->date_fin-$today, |
|
| 124 | + "date_fin_recrutement" => $obj->date_fin - $today, |
|
| 125 | 125 | "id_recrutement" => $obj->ID_recrutement |
| 126 | 126 | ]; |
| 127 | 127 | } |
@@ -162,17 +162,17 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | //on test si on a assez de ressource pour recruter les unites |
| 164 | 164 | //on test si assez de ressources dans la base |
| 165 | - $retirer_eau = $pour_recruter["eau"]*$nombre; |
|
| 166 | - $retirer_electricite = $pour_recruter["electricite"]*$nombre; |
|
| 167 | - $retirer_fer = $pour_recruter["fer"]*$nombre; |
|
| 168 | - $retirer_fuel = $pour_recruter["fuel"]*$nombre; |
|
| 165 | + $retirer_eau = $pour_recruter["eau"] * $nombre; |
|
| 166 | + $retirer_electricite = $pour_recruter["electricite"] * $nombre; |
|
| 167 | + $retirer_fer = $pour_recruter["fer"] * $nombre; |
|
| 168 | + $retirer_fuel = $pour_recruter["fuel"] * $nombre; |
|
| 169 | 169 | $eau = Bataille::getTestAssezRessourceBase("eau", $retirer_eau); |
| 170 | 170 | $electricite = Bataille::getTestAssezRessourceBase("electricite", $retirer_electricite); |
| 171 | 171 | $fer = Bataille::getTestAssezRessourceBase("fer", $retirer_fer); |
| 172 | 172 | $fuel = Bataille::getTestAssezRessourceBase("fuel", $retirer_fuel); |
| 173 | 173 | |
| 174 | 174 | |
| 175 | - if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge" ) { |
|
| 175 | + if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge") { |
|
| 176 | 176 | FlashMessage::setFlash("Pas assez de ressources pour recruter autant d'unités"); |
| 177 | 177 | return false; |
| 178 | 178 | } |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | //on retire les ressources |
| 181 | 181 | Bataille::getRessource()->setUpdateRessource($retirer_eau, $retirer_electricite, $retirer_fer, $retirer_fuel, 0, "-"); |
| 182 | 182 | |
| 183 | - $date_fin = Bataille::getToday()+($temps_recrutement*$nombre); |
|
| 183 | + $date_fin = Bataille::getToday() + ($temps_recrutement * $nombre); |
|
| 184 | 184 | |
| 185 | 185 | $dbc->insert("nom", $nom) |
| 186 | 186 | ->insert("type", $type) |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | |
| 214 | 214 | if ($type == "unité infanterie") $table = "_bataille_unite"; |
| 215 | 215 | |
| 216 | - for ($i=0 ; $i<$nombre ; $i++) { |
|
| 216 | + for ($i = 0; $i < $nombre; $i++) { |
|
| 217 | 217 | $dbc->insert("nom_unite", $nom) |
| 218 | 218 | ->insert("ID_base", Bataille::getIdBase()) |
| 219 | 219 | ->into($table) |
@@ -19,7 +19,9 @@ discard block |
||
| 19 | 19 | $query = $dbc1->select("coef_niveau_unite")->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_unite = $obj->coef_niveau_unite; |
|
| 22 | + foreach ($query as $obj) { |
|
| 23 | + $this->coef_unite = $obj->coef_niveau_unite; |
|
| 24 | + } |
|
| 23 | 25 | } |
| 24 | 26 | } |
| 25 | 27 | //-------------------------- END BUILDER ----------------------------------------------------------------------------// |
@@ -53,7 +55,9 @@ discard block |
||
| 53 | 55 | $coef = $this->coef_unite*$niveau; |
| 54 | 56 | $coef_ameliorer = $this->coef_unite*($niveau+1); |
| 55 | 57 | |
| 56 | - if ($niveau == 1) $coef = 1; |
|
| 58 | + if ($niveau == 1) { |
|
| 59 | + $coef = 1; |
|
| 60 | + } |
|
| 57 | 61 | |
| 58 | 62 | return [ |
| 59 | 63 | "caracteristique" => [ |
@@ -76,8 +80,7 @@ discard block |
||
| 76 | 80 | ], |
| 77 | 81 | "temps_recrutement" => $temps_recrutement |
| 78 | 82 | ]; |
| 79 | - } |
|
| 80 | - else { |
|
| 83 | + } else { |
|
| 81 | 84 | return []; |
| 82 | 85 | } |
| 83 | 86 | } |
@@ -115,8 +118,7 @@ discard block |
||
| 115 | 118 | foreach ($query as $obj) { |
| 116 | 119 | if ($obj->date_fin-$today <= 0) { |
| 117 | 120 | $this->setTerminerRecrutement($obj->ID_recrutement); |
| 118 | - } |
|
| 119 | - else { |
|
| 121 | + } else { |
|
| 120 | 122 | $recrutement[] = [ |
| 121 | 123 | "nom" => $obj->nom, |
| 122 | 124 | "type" => $obj->type, |
@@ -175,8 +177,7 @@ discard block |
||
| 175 | 177 | if (($eau["class"] || $electricite["class"] || $fer["class"] || $fuel["class"]) == "rouge" ) { |
| 176 | 178 | FlashMessage::setFlash("Pas assez de ressources pour recruter autant d'unités"); |
| 177 | 179 | return false; |
| 178 | - } |
|
| 179 | - else { |
|
| 180 | + } else { |
|
| 180 | 181 | //on retire les ressources |
| 181 | 182 | Bataille::getRessource()->setUpdateRessource($retirer_eau, $retirer_electricite, $retirer_fer, $retirer_fuel, 0, "-"); |
| 182 | 183 | |
@@ -211,7 +212,9 @@ discard block |
||
| 211 | 212 | $type = $obj->type; |
| 212 | 213 | } |
| 213 | 214 | |
| 214 | - if ($type == "unité infanterie") $table = "_bataille_unite"; |
|
| 215 | + if ($type == "unité infanterie") { |
|
| 216 | + $table = "_bataille_unite"; |
|
| 217 | + } |
|
| 215 | 218 | |
| 216 | 219 | for ($i=0 ; $i<$nombre ; $i++) { |
| 217 | 220 | $dbc->insert("nom_unite", $nom) |
