From 7667cf3baeae34ef6c7801a168c78e523a145762 Mon Sep 17 00:00:00 2001
From: Nigel Sheldon <nigelsheldon@live.fr>
Date: Mon, 30 Nov 2020 09:03:18 +0100
Subject: [PATCH 1/3] La techno expension n'a besoin que du niveau 1 de cette
 recherche, pas le niveau 3

---
 onyx2/include/Class/Donnees/technologies.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/onyx2/include/Class/Donnees/technologies.php b/onyx2/include/Class/Donnees/technologies.php
index 344500a..ad7d602 100644
--- a/onyx2/include/Class/Donnees/technologies.php
+++ b/onyx2/include/Class/Donnees/technologies.php
@@ -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(

From 8bb4fdf3987092a123e045f70134265b2172a3aa Mon Sep 17 00:00:00 2001
From: Nigel Sheldon <nigelsheldon@live.fr>
Date: Mon, 30 Nov 2020 09:03:40 +0100
Subject: [PATCH 2/3] =?UTF-8?q?Corrige=20le=20calcul=20des=20niveaux=20d?=
 =?UTF-8?q?=C3=A9j=C3=A0=20construit=20pour=20chaque=20recherche?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 onyx2/include/Class/Donnees/technologies.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/onyx2/include/Class/Donnees/technologies.php b/onyx2/include/Class/Donnees/technologies.php
index ad7d602..b83d177 100644
--- a/onyx2/include/Class/Donnees/technologies.php
+++ b/onyx2/include/Class/Donnees/technologies.php
@@ -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;

From 504c55992e9b6ee08a8fe4dcfab2fbdf9ccfb1a2 Mon Sep 17 00:00:00 2001
From: Nigel Sheldon <nigelsheldon@live.fr>
Date: Mon, 30 Nov 2020 19:11:14 +0100
Subject: [PATCH 3/3] Fix les constructions du chantier terrestre

---
 onyx2/include/Class/File/terrestre.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/onyx2/include/Class/File/terrestre.php b/onyx2/include/Class/File/terrestre.php
index 43a2059..ccb6e74 100644
--- a/onyx2/include/Class/File/terrestre.php
+++ b/onyx2/include/Class/File/terrestre.php
@@ -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;
             }