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

Corrige le chantier terrestre
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nigel Sheldon 2021-02-17 20:39:55 +01:00 committed by Gitea
parent cfa44975d3
commit 28b0ceeee8
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -743,7 +743,11 @@ class Planete extends Surface
global ${$calc.'VAR'}; global ${$calc.'VAR'};
} }
$outNomChamps[] = ${$calc.'VAR'}[$modif[1]]; if ($calc == "terrestre") {
$outNomChamps[] = ${$calc.'VAR'}[$this->race][$modif[1]];
} else {
$outNomChamps[] = ${$calc.'VAR'}[$modif[1]];
}
$outValeurs[] = $this->{$modif[0]}[$modif[1]]; $outValeurs[] = $this->{$modif[0]}[$modif[1]];
} elseif ($modif == "force") { } elseif ($modif == "force") {
continue; continue;
@ -769,6 +773,11 @@ class Planete extends Surface
} }
foreach ($this->{$modif} as $j => $value) { foreach ($this->{$modif} as $j => $value) {
if ($calc == "terrestre") {
$outNomChamps[] = ${$calc.'VAR'}[$this->race][$j];
} else {
$outNomChamps[] = ${$calc.'VAR'}[$j];
}
$outNomChamps[] = ${$calc.'VAR'}[$j]; $outNomChamps[] = ${$calc.'VAR'}[$j];
$outValeurs[] = $value; $outValeurs[] = $value;
} }
@ -795,7 +804,11 @@ class Planete extends Surface
trigger_error('Impossible de trouver les données pour '.$modif[0], E_USER_ERROR); trigger_error('Impossible de trouver les données pour '.$modif[0], E_USER_ERROR);
} }
$out[] = ${$calc.'VAR'}[$modif[1]]." = ".$this->{$modif[0]}[$modif[1]]; if ($calc == "terrestre") {
$out[] = ${$calc.'VAR'}[$this->race][$modif[1]]." = ".$this->{$modif[0]}[$modif[1]];
} else {
$out[] = ${$calc.'VAR'}[$modif[1]]." = ".$this->{$modif[0]}[$modif[1]];
}
} elseif ($modif == "force") { } elseif ($modif == "force") {
$out[] = "timestamp = timestamp"; $out[] = "timestamp = timestamp";
} elseif (!is_array($this->{$modif}) && !is_object($this->{$modif})) { } elseif (!is_array($this->{$modif}) && !is_object($this->{$modif})) {
@ -818,7 +831,11 @@ class Planete extends Surface
} }
foreach ($this->{$modif} as $j => $value) { foreach ($this->{$modif} as $j => $value) {
$out[] = ${$calc.'VAR'}[$j]." = ".$value; if ($calc == "terrestre") {
$out[] = ${$calc.'VAR'}[$this->race][$j]." = ".$value;
} else {
$out[] = ${$calc.'VAR'}[$j]." = ".$value;
}
} }
} }
} }