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 @@
Prototype Intercepteur Longsword
- Prototype Bombardier Longsword
- Corvette de classe Mako
- Prototype de Frégate
+ Prototype Séraphin
+ Prototype de chasseur lourd Tarasque
+ Prototype de bombardier Gigas
Récupération
Prototype de Destroyer
- Prototype de Croiseur de classe Halcyon
- Prototype de Croiseur de classe Marathon
- Prototype de Porte-vaisseaux
- Prototype de Super Porte-Vaisseaux
- Prototype de Vaisseau d'exfiltration de classe Black Cat
- Prototype de Super canon à accélération magnétique
- Bunker souterrain
- Bunker souterrain
- Bunker souterrain
+ Prototype de Destroyer de classe CVP
+ Prototype de Croiseur de classe CCS
+ Prototype de Croiseur de classe Révérence
+ Prototype de Cuirassé
+ Prototype de Super croiseur
+ Prototype de Porte-vaisseau
+ Prototype de Porte-vaisseau lourd
+ Prototype de station orbitale
+ Prototype de ...
Expansion