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

Merge branch 'master' into task/module_residentiels_moral
Some checks reported errors
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build was killed
Details

Browse Source
This commit is contained in:
nemunaire 2020-11-30 19:13:19 +00:00
commit e5e7d655c0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
onyx2/include/Class/Donnees/technologies.php
View File

@ -1550,7 +1550,7 @@ class dTechnologies implements Donnees
case 8:
$tableau = array(
array(
array("technologies", 1, 2),
array("technologies", 1, 0),
array('batiments', 6, 2)
),
array(
@ -1624,8 +1624,8 @@ class dTechnologies implements Donnees
{
$niveau = 0;
// Si jamais cette techno a été recherchée au niveau 2 ou 3, aditionne les niveaux des trois technos
if (($niv = self::niveau($branche, $id)) > 0 && (self::idToBit($id) & $planete->technologies[$branche])) {
if ((self::idToBit($id+1) & $planete->technologies[$branche])) {
if (($niv = self::niveau($branche, $id)) > 0 && (self::idToBit($id+1) & $planete->technologies[$branche])) {
if ((self::idToBit($id+2) & $planete->technologies[$branche])) {
$niveau += $niv;
}
$niveau += $niv;

4
onyx2/include/Class/File/terrestre.php
View File

@ -288,7 +288,7 @@ class FileTerrestre extends FileCommun implements File
} else {
$temps_moins = 0;
}
$out[$keyF][$keyE] = array($element[0], $element[1], $element[2], ceil($temps * $element[1] - $temps_moins), ceil($temps - $temps_moins), $prems, dTerrestre::type($element[0]));
$out[$keyF][$keyE] = array($element[0], $element[1], $element[2], ceil($temps * $element[1] - $temps_moins), ceil($temps - $temps_moins), $prems, dTerrestre::type($element[0], $planete));
} else {
$temps = dTerrestre::temps($element[0], 1, $planete);
if ($prems) {
@ -296,7 +296,7 @@ class FileTerrestre extends FileCommun implements File
} else {
$temps_moins = 0;
}
$out[$keyF][$keyE] = array($element[0], $element[1], $element[2], ceil($temps * $element[1] - $temps_moins), ceil($temps - $temps_moins), $prems, dTerrestre::type($element[0]));
$out[$keyF][$keyE] = array($element[0], $element[1], $element[2], ceil($temps * $element[1] - $temps_moins), ceil($temps - $temps_moins), $prems, dTerrestre::type($element[0], $planete));
}
$prems = false;
}