@@ -54,16 +54,16 @@ |
||
54 | 54 | |
55 | 55 | $count = count($all_recherche); |
56 | 56 | |
57 | - for ($i=0 ; $i<$count ; $i++) { |
|
57 | + for ($i = 0; $i < $count; $i++) { |
|
58 | 58 | if ((in_array($all_recherche[$i]["recherche"], $recherche_base[$i]))) { |
59 | 59 | $niveau = $recherche_base[$i]["niveau"]; |
60 | 60 | if ($niveau == 1) $this->coef_centre = 1; |
61 | 61 | |
62 | 62 | $all_recherche[$i]["cout"] = [ |
63 | - "eau" => $all_recherche[$i]["cout"]["eau"]*($this->coef_centre*$niveau), |
|
64 | - "electricite" => $all_recherche[$i]["cout"]["electricite"]*($this->coef_centre*$niveau), |
|
65 | - "fer" => $all_recherche[$i]["cout"]["fer"]*($this->coef_centre*$niveau), |
|
66 | - "fuel" => $all_recherche[$i]["cout"]["fuel"]*($this->coef_centre*$niveau) |
|
63 | + "eau" => $all_recherche[$i]["cout"]["eau"] * ($this->coef_centre * $niveau), |
|
64 | + "electricite" => $all_recherche[$i]["cout"]["electricite"] * ($this->coef_centre * $niveau), |
|
65 | + "fer" => $all_recherche[$i]["cout"]["fer"] * ($this->coef_centre * $niveau), |
|
66 | + "fuel" => $all_recherche[$i]["cout"]["fuel"] * ($this->coef_centre * $niveau) |
|
67 | 67 | ]; |
68 | 68 | $ameliorer = true; |
69 | 69 | } |
@@ -23,7 +23,9 @@ discard block |
||
23 | 23 | $query = $dbc1->select("coef_centre_recherche")->from("configuration")->where("ID_configuration", "=", 1)->get(); |
24 | 24 | |
25 | 25 | if ((is_array($query)) && (count($query) == 1)) { |
26 | - foreach ($query as $obj) $this->coef_centre = $obj->coef_centre_recherche; |
|
26 | + foreach ($query as $obj) { |
|
27 | + $this->coef_centre = $obj->coef_centre_recherche; |
|
28 | + } |
|
27 | 29 | } |
28 | 30 | |
29 | 31 | $query = $dbc->select()->from("_bataille_centre_recherche")->where("ID_base", "=", Bataille::getIdBase())->get(); |
@@ -57,7 +59,9 @@ discard block |
||
57 | 59 | for ($i=0 ; $i<$count ; $i++) { |
58 | 60 | if ((in_array($all_recherche[$i]["recherche"], $recherche_base[$i]))) { |
59 | 61 | $niveau = $recherche_base[$i]["niveau"]; |
60 | - if ($niveau == 1) $this->coef_centre = 1; |
|
62 | + if ($niveau == 1) { |
|
63 | + $this->coef_centre = 1; |
|
64 | + } |
|
61 | 65 | |
62 | 66 | $all_recherche[$i]["cout"] = [ |
63 | 67 | "eau" => $all_recherche[$i]["cout"]["eau"]*($this->coef_centre*$niveau), |
@@ -66,8 +70,7 @@ discard block |
||
66 | 70 | "fuel" => $all_recherche[$i]["cout"]["fuel"]*($this->coef_centre*$niveau) |
67 | 71 | ]; |
68 | 72 | $ameliorer = true; |
69 | - } |
|
70 | - else { |
|
73 | + } else { |
|
71 | 74 | $ameliorer = false; |
72 | 75 | } |
73 | 76 |