halo-battle/game
1
0
Fork 1
Code Issues Pull Requests Projects Releases Activity

Grosse passe sur les recherches #22

Merged
nemunaire merged 9 commits from task/20210228/add_techno_implementation into master 2021-02-28 17:10:22 +00:00
Conversation 0 Commits 9 Files Changed 8 +23 -3
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f69d4bf376 - Show all commits

22
onyx2/include/Class/planete.php
View File

@ -671,7 +671,27 @@ class Planete extends Surface
$prod_hy -= $conso_h; $prod_hy -= $conso_h;
if ($retarray) { 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 { } else {
return array($prod_met, $prod_cri, $prod_hy); return array($prod_met, $prod_cri, $prod_hy);
} }

4
onyx2/tpl/game/accueil.tpl
View File

@ -27,7 +27,7 @@
<h2>Infos</h2> <h2>Infos</h2>
{if $smarty.const.SURFACE == "planete"} {if $smarty.const.SURFACE == "planete"}
<h4>{php}dDonnees::nameVilles($this->_tpl_vars['planete']->batiments[17]){/php}</h4> <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} {/if}
<h4>Race : {$planete->race}</h4> <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> <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> <h2>Infos de l'alliance</h2>
{$planete->details.texte_interne} {$planete->details.texte_interne}
{/if} {/if}
{include file='game/footer.tpl'} {include file='game/footer.tpl'}