From 2269a56ce5f9a3e87c669c082cca8e22ab9e142d Mon Sep 17 00:00:00 2001
From: Nigel Sheldon <nigelsheldon@live.fr>
Date: Wed, 27 Jan 2021 18:40:32 +0100
Subject: [PATCH] =?UTF-8?q?M=C3=A0J=20des=20descriptions=20des=20tech=20co?=
 =?UTF-8?q?vies=20pour=20les=20vaisseaux=20et=20affichage=20des=20bons=20n?=
 =?UTF-8?q?oms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 onyx2/include/Class/Donnees/interface.php    |  6 +++--
 onyx2/include/Class/Donnees/spatial.php      |  2 +-
 onyx2/include/Class/Donnees/technologies.php |  2 +-
 onyx2/include/Class/Donnees/terrestre.php    |  2 +-
 onyx2/include/game/arbre.php                 |  8 +++----
 onyx2/lang/fr.xml                            | 24 ++++++++++----------
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/onyx2/include/Class/Donnees/interface.php b/onyx2/include/Class/Donnees/interface.php
index adf1587..55d5975 100644
--- a/onyx2/include/Class/Donnees/interface.php
+++ b/onyx2/include/Class/Donnees/interface.php
@@ -87,10 +87,12 @@ class dDonnees
         }
     }
 
-    public static function print_neededCheck($tableau, surface $planete)
+    public static function print_neededCheck($tableau, surface $planete, $race = null)
     {
         global $LANG;
-        $race = $planete->race;
+        if ($race == null) {
+            $race = $planete->race;
+        }
         if (!is_array($tableau)) {
             return 'Débloqué';
         } else {
diff --git a/onyx2/include/Class/Donnees/spatial.php b/onyx2/include/Class/Donnees/spatial.php
index c700bb5..9707678 100644
--- a/onyx2/include/Class/Donnees/spatial.php
+++ b/onyx2/include/Class/Donnees/spatial.php
@@ -727,7 +727,7 @@ class dSpatial implements Donnees
         }
 
         if ($print) {
-            return dDonnees::print_neededCheck($neededSpatial[$id], $planete);
+            return dDonnees::print_neededCheck($neededSpatial[$id], $planete, $race);
         } else {
             return dDonnees::neededCheck($neededSpatial[$id], $planete);
         }
diff --git a/onyx2/include/Class/Donnees/technologies.php b/onyx2/include/Class/Donnees/technologies.php
index 851b1c3..1864ca9 100644
--- a/onyx2/include/Class/Donnees/technologies.php
+++ b/onyx2/include/Class/Donnees/technologies.php
@@ -1678,7 +1678,7 @@ class dTechnologies implements Donnees
         }
 
         if ($print) {
-            return dDonnees::print_neededCheck($tableau[$object[1]], $planete);
+            return dDonnees::print_neededCheck($tableau[$object[1]], $planete, $race);
         } else {
             return dDonnees::neededCheck($tableau[$object[1]], $planete);
         }
diff --git a/onyx2/include/Class/Donnees/terrestre.php b/onyx2/include/Class/Donnees/terrestre.php
index 005413e..316e079 100644
--- a/onyx2/include/Class/Donnees/terrestre.php
+++ b/onyx2/include/Class/Donnees/terrestre.php
@@ -738,7 +738,7 @@ class dTerrestre implements Donnees
         }
 
         if ($print) {
-            return dDonnees::print_neededCheck($neededTerrestre[$id], $planete);
+            return dDonnees::print_neededCheck($neededTerrestre[$id], $planete, $race);
         } else {
             return dDonnees::neededCheck($neededTerrestre[$id], $planete);
         }
diff --git a/onyx2/include/game/arbre.php b/onyx2/include/game/arbre.php
index 76f47be..0229eb3 100644
--- a/onyx2/include/game/arbre.php
+++ b/onyx2/include/game/arbre.php
@@ -44,13 +44,13 @@ if (SURFACE == "asteroide") {
 }
 
 
-function traiterBrancheTechnologie($TEMP_liste, $branche, $i)
+function traiterBrancheTechnologie($TEMP_liste, $branche, $i, $race)
 {
     global $LANG, $planete;
 
     foreach ($i as $key => $id) {
         if (is_array($id)) {
-            $TEMP_liste = traiterBrancheTechnologie($TEMP_liste, $branche, $id);
+            $TEMP_liste = traiterBrancheTechnologie($TEMP_liste, $branche, $id, $race);
         } else {
             $niveau = dTechnologies::niveau_du_joueur($branche, $id, $planete);
             $niveau_max = dTechnologies::niveau_max($branche, $id, $planete, $LANG);
@@ -61,7 +61,7 @@ function traiterBrancheTechnologie($TEMP_liste, $branche, $i)
             'branche' => $branche,
             'niveau' => $niveau,
             'niveau_max' => $niveau_max,
-            'etat' => dTechnologies::needed($object, $planete, true)
+            'etat' => dTechnologies::needed($object, $planete, true, $race)
         );
         }
     }
@@ -72,7 +72,7 @@ $TEMP_liste = array();
 $branche = 0;
 while ($branche < 9) {
     $TEMP_liste[$branche] = array();
-    $TEMP_liste = traiterBrancheTechnologie($TEMP_liste, $branche, dTechnologies::type($branche, $planete->race));
+    $TEMP_liste = traiterBrancheTechnologie($TEMP_liste, $branche, dTechnologies::type($branche, $planete->race), $race);
     $branche++;
 }
 $template->assign('technologies', $TEMP_liste);
diff --git a/onyx2/lang/fr.xml b/onyx2/lang/fr.xml
index 49b9b97..e3f3126 100644
--- a/onyx2/lang/fr.xml
+++ b/onyx2/lang/fr.xml
@@ -870,20 +870,20 @@
                 </var>
                 <var name="7">
                     <var name="0">Prototype Intercepteur Longsword</var>
-                    <var name="1">Prototype Bombardier Longsword</var>
-                    <var name="2">Corvette de classe Mako</var>
-                    <var name="3">Prototype de Frégate</var>
+                    <var name="1">Prototype Séraphin</var>
+                    <var name="2">Prototype de chasseur lourd Tarasque</var>
+                    <var name="3">Prototype de bombardier Gigas</var>
                     <var name="4">Récupération</var>
                     <var name="5">Prototype de Destroyer</var>
-                    <var name="6">Prototype de Croiseur de classe Halcyon</var>
-                    <var name="7">Prototype de Croiseur de classe Marathon</var>
-                    <var name="8">Prototype de Porte-vaisseaux</var>
-                    <var name="9">Prototype de Super Porte-Vaisseaux</var>
-                    <var name="10">Prototype de Vaisseau d'exfiltration de classe Black Cat</var>
-                    <var name="11">Prototype de Super canon à accélération magnétique</var>
-                    <var name="12">Bunker souterrain</var>
-                    <var name="13">Bunker souterrain</var>
-                    <var name="14">Bunker souterrain</var>
+                    <var name="6">Prototype de Destroyer de classe CVP</var>
+                    <var name="7">Prototype de Croiseur de classe CCS</var>
+                    <var name="8">Prototype de Croiseur de classe Révérence</var>
+                    <var name="9">Prototype de Cuirassé</var>
+                    <var name="10">Prototype de Super croiseur</var>
+                    <var name="11">Prototype de Porte-vaisseau</var>
+                    <var name="12">Prototype de Porte-vaisseau lourd</var>
+                    <var name="13">Prototype de station orbitale</var>
+                    <var name="14">Prototype de ...</var>
                 </var>
                 <var name="8">
                     <var name="0">Expansion</var>