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

Réactive l'envois de flotte #18

Merged
nemunaire merged 15 commits from task/fix_envoi_flotte into master 2021-01-30 17:36:33 +00:00
Conversation 4 Commits 15 Files Changed 15 +23 -21
6 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2269a56ce5 - Show all commits

4
onyx2/include/Class/Donnees/interface.php
View File

@ -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;
if ($race == null) {
$race = $planete->race;
}
if (!is_array($tableau)) {
return 'Débloqué';
} else {

2
onyx2/include/Class/Donnees/spatial.php
View File

@ -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);
}

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

@ -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);
}

2
onyx2/include/Class/Donnees/terrestre.php
View File

@ -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);
}

8
onyx2/include/game/arbre.php
View File

@ -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);

24
onyx2/lang/fr.xml
View File

@ -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>