From f69d4bf376e8a248fe44aa016fd217ad8e02594d Mon Sep 17 00:00:00 2001
From: Nigel Sheldon <nigelsheldon@live.fr>
Date: Sun, 28 Feb 2021 12:10:53 +0100
Subject: [PATCH] =?UTF-8?q?Affiche=20le=20nombre=20de=20case=20qu'a=20la?=
 =?UTF-8?q?=20plan=C3=A8te=20+=20rend=20une=20ligne=20de=20la=20Class=20Pl?=
 =?UTF-8?q?anete=20plus=20lisible?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 onyx2/include/Class/planete.php | 22 +++++++++++++++++++++-
 onyx2/tpl/game/accueil.tpl      |  4 ++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/onyx2/include/Class/planete.php b/onyx2/include/Class/planete.php
index af8dc25..5925a64 100644
--- a/onyx2/include/Class/planete.php
+++ b/onyx2/include/Class/planete.php
@@ -671,7 +671,27 @@ class Planete extends Surface
         $prod_hy -= $conso_h;
 
         if ($retarray) {
-            return array(array(ceil($this->coeff_bat[0]*100), ceil($this->coeff_bat[1]*100), ceil($this->coeff_bat[2]*100), ceil($this->coeff_bat[3]*100), ceil($this->coeff_bat[4]*100)), array($prod_met, $prod_cri, $prod_hy + $conso_h, $energie_s*$this->coeff_bat[3], $energie_f*$this->coeff_bat[4]), array($energie_m*$this->coeff_bat[0], $energie_c*$this->coeff_bat[1], $energie_h*$this->coeff_bat[2], $conso_h, ($energie_s*$this->coeff_bat[3] + $energie_f*$this->coeff_bat[4])-($energie_m*$this->coeff_bat[0] + $energie_c*$this->coeff_bat[1] + $energie_h*$this->coeff_bat[2])));
+            return array(
+                array(
+                    ceil($this->coeff_bat[0]*100),
+                    ceil($this->coeff_bat[1]*100),
+                    ceil($this->coeff_bat[2]*100),
+                    ceil($this->coeff_bat[3]*100),
+                    ceil($this->coeff_bat[4]*100)),
+                    array(
+                        $prod_met,
+                        $prod_cri,
+                        $prod_hy + $conso_h,
+                        $energie_s*$this->coeff_bat[3],
+                        $energie_f*$this->coeff_bat[4]),
+                    array(
+                        $energie_m*$this->coeff_bat[0],
+                        $energie_c*$this->coeff_bat[1],
+                        $energie_h*$this->coeff_bat[2],
+                        $conso_h,
+                        ($energie_s*$this->coeff_bat[3] + $energie_f*$this->coeff_bat[4])-($energie_m*$this->coeff_bat[0] + $energie_c*$this->coeff_bat[1] + $energie_h*$this->coeff_bat[2])
+                    )
+                );
         } else {
             return array($prod_met, $prod_cri, $prod_hy);
         }
diff --git a/onyx2/tpl/game/accueil.tpl b/onyx2/tpl/game/accueil.tpl
index a17d21b..8b888ab 100644
--- a/onyx2/tpl/game/accueil.tpl
+++ b/onyx2/tpl/game/accueil.tpl
@@ -27,7 +27,7 @@
 			<h2>Infos</h2>
 		{if $smarty.const.SURFACE == "planete"}
 			<h4>{php}dDonnees::nameVilles($this->_tpl_vars['planete']->batiments[17]){/php}</h4>
-			<h4>Diamètre: {$diametre|separerNombres} km <ins>({$planete->casesRest} case{if $planete->casesRest > 1}s{/if} disponible{if $planete->casesRest > 1}s{/if} sur {php}dDonnees::capaciteVilles($this->_tpl_vars['planete']){/php})</ins></h4>
+			<h4>Diamètre: {$diametre|separerNombres} km <ins>({$planete->casesRest} case{if $planete->casesRest > 1}s{/if} disponible{if $planete->casesRest > 1}s{/if} sur {$planete->cases})</ins></h4>
 		{/if}
 			<h4>Race : {$planete->race}</h4>
 			<h4>position: <a href="?p=carte&amp;galaxie={$planete->galaxie}&amp;ss={$planete->ss}">{$planete->galaxie}.{$planete->ss}.{$planete->position}</a></h4>
@@ -111,4 +111,4 @@
 			<h2>Infos de l'alliance</h2>
 			{$planete->details.texte_interne}
 		{/if}
-{include file='game/footer.tpl'}
\ No newline at end of file
+{include file='game/footer.tpl'}