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 +623 -149
15 changed files with 623 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/ajax_flotte.php
View File

@ -9,12 +9,12 @@ require_once("Class/JSON.php");
require_once("Class/flotte.php");
require_once("Class/planete.php");
if (isset($SESS) && isset($SESS->values['connected']) && $SESS->values['connected'] && !empty($SESS->values['id']) && !empty($SESS->level) && !empty($SESS->values['idPlan'])) {
if (isset($SESS) && isset($SESS->values['connected']) && $SESS->values['connected'] && !empty($SESS->values['id']) && !empty($SESS->values['idPlan'])) {
$idPrep = gpc("cds_temp", "post");
$json = new Services_JSON();
$nbtrajet = 2;
if (empty($config['flottes']) && $SESS->level <= 1) {
if (empty($VAR['flottes']) && $SESS->level <= 1) {
$datas = array(
'root' => array(
'destination' => '<input class="dest" type="text" id="amas" name="amas" maxlength="2" value="'.gpc('galaxie', 'post').'" />:<input class="dest" type="text" id="ss" name="ss" maxlength="2" value="'.gpc('ss', 'post').'" />:<input class="dest" type="text" id="plan" name="pos" maxlength="2" value="'.gpc('pos', 'post').'" />',
@ -107,7 +107,8 @@ if (isset($SESS) && isset($SESS->values['connected']) && $SESS->values['connecte
$places -= ($met+$cri+$hyd);
}
$tactique = '';
if ($_POST['mission'] == '1') {
// si la mission est une mission d'attaque
if ($_POST['mission'] == '3') {
$tactique = '<label for="selecttactique">Tactique d\'attaque :</label><select id="selecttactique" name="tactique">';
//On récupère le niveau actuel de la technologie Commandement militaire
$id_user = $SESS->values['id'];

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 {

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

@ -3,9 +3,12 @@ require_once("Class/Donnees/interface.php");
class dSpatial implements Donnees
{
public static function metal($id, $nombre, surface $planete)
public static function metal($id, $nombre, surface $planete, $race = null)
{
if ($planete->race == "humain") {
if ($race == null) {
$race = $planete->race;
}
if ($race == "humain") {
switch ($id) {
case 0:
$metal = 1000;
@ -118,9 +121,12 @@ class dSpatial implements Donnees
return $metal * $nombre;
}
public static function cristal($id, $nombre, surface $planete)
public static function cristal($id, $nombre, surface $planete, $race = null)
{
if ($planete->race == "humain") {
if ($race == null) {
$race = $planete->race;
}
if ($race == "humain") {
switch ($id) {
case 0:
$cristal = 800;
@ -233,9 +239,12 @@ class dSpatial implements Donnees
return $cristal * $nombre;
}
public static function hydrogene($id, $nombre, surface $planete)
public static function hydrogene($id, $nombre, surface $planete, $race = null)
{
if ($planete->race == "humain") {
if ($race == null) {
$race = $planete->race;
}
if ($race == "humain") {
switch ($id) {
case 0:
$hydrogene = 180;
@ -348,14 +357,17 @@ class dSpatial implements Donnees
return $hydrogene * $nombre;
}
public static function credits($id, $nombre, surface $planete)
public static function credits($id, $nombre, surface $planete, $race = null)
{
return 0;
}
public static function temps($id, $nombre, surface $planete)
public static function temps($id, $nombre, surface $planete, $race = null)
{
if ($planete->race == "humain") {
if ($race == null) {
$race = $planete->race;
}
if ($race == "humain") {
switch ($id) {
case 0:
$temps = 733;
@ -502,10 +514,12 @@ class dSpatial implements Donnees
}
}
public static function image($id, surface $planete)
public static function image($id, surface $planete, $race = null)
{
if ($planete->race == "humain") {
if ($race == null) {
$race = $planete->race;
}
if ($race == "humain") {
switch ($id) {
case 0:
return "csnucargoparabola2mc9.jpg";
@ -542,7 +556,7 @@ class dSpatial implements Donnees
break;
}
return Donnees::image_humain_default;
} elseif ($planete->race == "covenant") {
} else {
switch ($id) {
case 0:
return "cargo2pb6.jpg";
@ -553,39 +567,32 @@ class dSpatial implements Donnees
case 2:
return "colocopiers4.jpg";
break;
case 3:
return "sonde_despionnage1.jpg";
break;
case 4:
case 6:
return "chasseurlourd7id.jpg";
break;
case 5:
return "contactharvestbynameleszk3.jpg";
break;
case 6:
return "vaisseauuu0.jpg";
break;
case 7:
return "vaisseaudebataille9na.jpg";
return "sonde_despionnage1.jpg";
break;
case 8:
return "pv.jpg";
return "contactharvestbynameleszk3.jpg";
break;
case 9:
return "stationorbitalezt7.jpg";
return "vaisseauuu0.jpg";
break;
case 10:
return "vaisseaudebataille9na.jpg";
break;
case 14:
return "pv.jpg";
break;
case 16:
return "citecovenant.jpg";
break;
}
return Donnees::image_covenant_default;
} else {
trigger_error("Impossible de trouver la race pour ".$planete->race, E_USER_ERROR);
}
}
public static function needed($id, surface $planete, $print = false, $race = null)
{
if ($race == null) {
@ -648,8 +655,8 @@ class dSpatial implements Donnees
array('technologies', 7,9)
),
array(
array('batiments', 8, 10),
array('technologies', 7,10)
array('batiments', 8, 3),
array('technologies', 7, 4)
)
);
} else {
@ -727,16 +734,18 @@ 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);
}
}
public static function tailleCales($id, surface $planete)
public static function tailleCales($id, surface $planete, $race = null)
{
if ($planete->race == "humain") {
if ($race == null) {
$race = $planete->race;
}
if ($race == "humain") {
switch ($id) {
case 0:
$vitesse = 10000;
@ -845,7 +854,6 @@ class dSpatial implements Donnees
return $vitesse;
}
public static function vitesseP($id, surface $planete)
{
if ($planete->race == "humain") {
@ -1178,4 +1186,346 @@ class dSpatial implements Donnees
//On tient compte des bonus
return $vitesse;
}
public static function attaque($id, surface $planete, $race = null)
{
if ($race == null) {
$race = $planete->race;
}
if ($race == "humain") {
switch ($id) {
case 0:
$attaque = 10;
break;
case 1:
$attaque = 20;
break;
case 2:
$attaque = 20;
break;
case 3:
$attaque = 20;
break;
case 4:
$attaque = 50;
break;
case 5:
$attaque = 250;
break;
case 6:
$attaque = 720;
break;
case 7:
$attaque = 1240;
break;
case 8:
$attaque = 1990;
break;
case 9:
$attaque = 3250;
break;
case 10:
$attaque = 4250;
break;
case 11:
$attaque = 8500;
break;
case 12:
$attaque = 16000;
break;
case 13:
$attaque = 20;
break;
default:
trigger_error("Vaisseau ".$id." introuvable dans les données", E_USER_ERROR);
}
} else {
switch ($id) {
case 0:
$attaque = 0;
break;
case 1:
$attaque = 25;
break;
case 2:
$attaque = 25;
break;
case 3:
$attaque = 25;
break;
case 4:
$attaque = 50;
break;
case 5:
$attaque = 100;
break;
case 6:
$attaque = 250;
break;
case 7:
$attaque = 740;
break;
case 8:
$attaque = 1300;
break;
case 9:
$attaque = 2000;
break;
case 10:
$attaque = 3400;
break;
case 11:
$attaque = 4400;
break;
case 12:
$attaque = 9300;
break;
case 13:
$attaque = 8400;
break;
case 14:
$attaque = 8300;
break;
case 15:
$attaque = 11500;
break;
case 16:
$attaque = 0;
break;
default:
trigger_error("Vaisseau ".$id." introuvable dans les données", E_USER_ERROR);
}
}
//On tient compte des bonus
return $attaque;
}
public static function bouclier($id, surface $planete, $race = null)
{
if ($race == null) {
$race = $planete->race;
}
if ($race == "humain") {
switch ($id) {
case 0:
$bouclier = 500;
break;
case 1:
$bouclier = 2000;
break;
case 2:
$bouclier = 2000;
break;
case 3:
$bouclier = 1500;
break;
case 4:
$bouclier = 250;
break;
case 5:
$bouclier = 1000;
break;
case 6:
$bouclier = 1750;
break;
case 7:
$bouclier = 3000;
break;
case 8:
$bouclier = 5000;
break;
case 9:
$bouclier = 9000;
break;
case 10:
$bouclier = 10000;
break;
case 11:
$bouclier = 10250;
break;
case 12:
$bouclier = 12750;
break;
case 13:
$bouclier = 750;
break;
default:
trigger_error("Vaisseau ".$id." introuvable dans les données", E_USER_ERROR);
}
} else {
switch ($id) {
case 0:
$bouclier = 400;
break;
case 1:
$bouclier = 1800;
break;
case 2:
$bouclier = 2000;
break;
case 3:
$bouclier = 400;
break;
case 4:
$bouclier = 200;
break;
case 5:
$bouclier = 300;
break;
case 6:
$bouclier = 900;
break;
case 7:
$bouclier = 1500;
break;
case 8:
$bouclier = 3000;
break;
case 9:
$bouclier = 4600;
break;
case 10:
$bouclier = 8000;
break;
case 11:
$bouclier = 9000;
break;
case 12:
$bouclier = 15000;
break;
case 13:
$bouclier = 10400;
break;
case 14:
$bouclier = 9700;
break;
case 15:
$bouclier = 11500;
break;
case 16:
$bouclier = 50000;
break;
default:
trigger_error("Vaisseau ".$id." introuvable dans les données", E_USER_ERROR);
}
}
//On tient compte des bonus
return $bouclier;
}
public static function armature($id, surface $planete, $race = null)
{
if ($race == null) {
$race = $planete->race;
}
if ($race == "humain") {
switch ($id) {
case 0:
$armature = 100;
break;
case 1:
$armature = 400;
break;
case 2:
$armature = 400;
break;
case 3:
$armature = 300;
break;
case 4:
$armature = 50;
break;
case 5:
$armature = 200;
break;
case 6:
$armature = 350;
break;
case 7:
$armature = 600;
break;
case 8:
$armature = 1000;
break;
case 9:
$armature = 1800;
break;
case 10:
$armature = 2000;
break;
case 11:
$armature = 2050;
break;
case 12:
$armature = 2550;
break;
case 13:
$armature = 150;
break;
default:
trigger_error("Vaisseau ".$id." introuvable dans les données", E_USER_ERROR);
}
} else {
switch ($id) {
case 0:
$armature = 200;
break;
case 1:
$armature = 600;
break;
case 2:
$armature = 800;
break;
case 3:
$armature = 120;
break;
case 4:
$armature = 100;
break;
case 5:
$armature = 150;
break;
case 6:
$armature = 300;
break;
case 7:
$armature = 600;
break;
case 8:
$armature = 600;
break;
case 9:
$armature = 1400;
break;
case 10:
$armature = 2800;
break;
case 11:
$armature = 3000;
break;
case 12:
$armature = 3000;
break;
case 13:
$armature = 3600;
break;
case 14:
$armature = 3600;
break;
case 15:
$armature = 3500;
break;
case 16:
$armature = 30000;
break;
default:
trigger_error("Vaisseau ".$id." introuvable dans les données", E_USER_ERROR);
}
}
//On tient compte des bonus
return $armature;
}
}

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

@ -1046,8 +1046,11 @@ class dTechnologies implements Donnees
}
public static function needed($object, surface $planete, $print = false)
public static function needed($object, surface $planete, $print = false, $race = null)
{
if ($race == null) {
$race = $planete->race;
}
switch ($object[0]) {
case 0:
$tableau = array(
@ -1488,6 +1491,66 @@ class dTechnologies implements Donnees
);
break;
case 7:
if ($race == "humain") {
$tableau = array(
array(
array('batiments', 6, 1)
),
array(
array("technologies", 7, 0),
array('batiments', 6, 2)
),
array(
array("technologies", 7, 1),
array('batiments', 6, 3)
),
array(
array("technologies", 7, 2),
array('batiments', 6, 5)
),
array(
array("technologies", 7, 1),
array('batiments', 6, 3)
),
array(
array("technologies", 7, 3),
array('batiments', 6, 8)
),
array(
array("technologies", 7, 5),
array('batiments', 6, 10)
),
array(
array("technologies", 7, 6),
array('batiments', 6, 15)
),
array(
array("technologies", 7, 7),
array('batiments', 6, 20)
),
array(
array("technologies", 7, 8),
array('batiments', 6, 30)
),
array(
array("technologies", 7, 5),
array('batiments', 6, 10)
),
array(
array("technologies", 7, 4),
array('batiments', 6, 3)
),
array(
array('batiments', 6, 5)
),
array(
array("technologies", 7, 12)
),
array(
array("technologies", 7, 13)
),
);
} else {
$tableau = array(
array(
array('batiments', 6, 1)
@ -1546,6 +1609,7 @@ class dTechnologies implements Donnees
array("technologies", 7, 13)
),
);
}
break;
case 8:
$tableau = array(
@ -1614,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);
}

46
onyx2/include/Class/flotte.php
View File

@ -562,6 +562,26 @@ class Flotte
}
public function attaquer()
{
//Si la planète d'arrivé n'est pas chargée, on charge les planètes
if (is_numeric($this->end_planete)) {
$this->load_planete();
}
//On charge la classe des combats
//On réalise le combat
//On envoit le résultat
//On update la flotte avec les pertes et gains
//On dis à la flotte de rentrer
$this->statut = 1;
$this->addModifFlotte("statut");
}
public function espionner()
{
//Si la planète d'arrivé n'est pas chargée, on charge les planètes
@ -573,17 +593,17 @@ class Flotte
if (($this->start_planete->technologies[1]& 67108864) == 67108864) {
$espionnage_A = 3;
} elseif (($this->start_planete->technologies[1]& 33554432) == 33554432) {
$espionnage_A = 3;
$espionnage_A = 2;
} elseif (($this->start_planete->technologies[1]& 16777216) == 16777216) {
$espionnage_A = 3;
$espionnage_A = 1;
} else {
$espionnage_A = 0;
}
if (($this->start_planete->technologies[1]& 536870912) == 536870912) {
if (($this->end_planete->technologies[1]& 536870912) == 536870912) {
$contreespionnage_B = 3;
} elseif (($this->start_planete->technologies[1]& 268435456) == 268435456) {
} elseif (($this->end_planete->technologies[1]& 268435456) == 268435456) {
$contreespionnage_B = 2;
} elseif (($this->start_planete->technologies[1]& 134217728) == 134217728) {
} elseif (($this->end_planete->technologies[1]& 134217728) == 134217728) {
$contreespionnage_B = 1;
} else {
$contreespionnage_B = 0;
@ -592,8 +612,20 @@ class Flotte
//Création du rapport
$rapport = new Rapport(5, $this->start_planete, $this->end_planete, $this->start_time + $this->end_time);
$rapport->addInfo($this->end_planete, 0);
$rapport->addInfo($contreespionnage_B/$espionnage_A/10, 1);
$rapport->addInfo($espionnage_A+2-$contreespionnage_B+1, 2);
//Rend aléatoire le niveau affiché des bâtiments
$diff_esp = $espionnage_A - $contreespionnage_B;
//Il y a au moins 2 niveaux d'erreur (soit 1 positif et 1 négatif)
if ($diff_esp == 0) {
$diff_esp = 1;
}
$rapport->addInfo($diff_esp, 1);
//Où x est le résultat de cette formule, si x >= y, ça donne accès a plus d'informations
// si y >= 1 : ressources
// si y >= 2 : batiment
// si y >= 3 : défenses
// si y >= 4 : flottes
$rapport->addInfo($espionnage_A + 2 - $contreespionnage_B + 1, 2);
//Si le joueur a au moins le niveau 1 du contre-espionnage, on le prévient qu'il a été espionné, sinon il n'en sait rien
$rapport->addInfo($contreespionnage_B, 3);
$rapport->send();

2
onyx2/include/Class/planete.php
View File

@ -128,7 +128,7 @@ class Planete extends Surface
$this->file_cas = new FileCaserne();
}
foreach ($terrestreVAR as $ter) {
foreach ($terrestreVAR[$this->race] as $ter) {
$this->terrestres[] = $plan[$ter];
}
if (!empty($plan["file_ter"])) {

35
onyx2/include/Class/rapport.php
View File

@ -91,36 +91,42 @@ class Rapport
if ($this->var[2] > 2) {
$this->rapportA .= "<table style=\"margin: auto;\"><tr><th>Niveau</th><th>B&acirc;timent</th></tr>";
foreach ($this->var[0]->batiments as $key => $batiment) {
$this->rapportA .= "<tr><td>".rand($batiment * (1 - $this->var[1]), $batiment * (1 + $this->var[1]))."</td><td>".$LANG[$this->var[0]->race]["batiments"]["noms_sing"][$key]."</td></tr>";
$this->rapportA .= "<tr><td>".rand(($batiment - $this->var[1]), ($batiment + $this->var[1]))."</td><td>".$LANG[$this->var[0]->race]["batiments"]["noms_sing"][$key]."</td></tr>";
}
$this->rapportA .= "</table><br />";
}
//Flottes en orbite
if ($this->var[2] > 3) {
}
//Flottes au sol
if ($this->var[2] > 5) {
if ($this->var[2] > 4) {
$this->rapportA .= "<table style=\"margin: auto;\"><tr><th>Nombre</th><th>Vaisseaux</th></tr>";
foreach ($this->var[0]->vaisseaux as $key => $vaisseau) {
$this->rapportA .= "<tr><td>".rand($vaisseau * (1 - $this->var[1]), $vaisseau * (1 + $this->var[1]))."</td><td>".$LANG[$this->var[0]->race]["vaisseaux"]["noms_sing"][$key]."</td></tr>";
$this->rapportA .= "<tr><td>".rand(($vaisseau - $this->var[1]), ($vaisseau + $this->var[1]))."</td><td>".$LANG[$this->var[0]->race]["vaisseaux"]["noms_sing"][$key]."</td></tr>";
}
$this->rapportA .= "</table><br />";
}
//Défenses
if ($this->var[2] > 4) {
if ($this->var[2] > 3) {
$this->rapportA .= "<table style=\"margin: auto;\"><tr><th>Nombre</th><th>Défenses</th></tr>";
foreach ($this->var[0]->terrestres as $key => $unite) {
if (!dTerrestre::type($key)) {
$this->rapportA .= "<tr><td>".rand($unite * (1 - $this->var[1]), $unite * (1 + $this->var[1]))."</td><td>".$LANG[$this->var[0]->race]["terrestre"]["noms_sing"][$key]."</td></tr>";
if (!dTerrestre::type($key, $this->var[0])) {
$this->rapportA .= "<tr><td>".rand($unite * floor(1 - $this->var[1]), $unite * ceil(1 + $this->var[1]))."</td><td>".$LANG[$this->var[0]->race]["terrestre"]["noms_sing"][$key]."</td></tr>";
}
}
$this->rapportA .= "</table><br />";
}
}
//On envoit le rapport d'espionnage
$temps = $this->timestamp;
$db = new BDD();
$db->escape($this->titreA);
$db->escape($this->rapportA);
$db->query("INSERT INTO ".$this->table." (destinataire, sujet, contenu, temps) VALUES(".$this->utilA->id_user.", '$this->titreA', '$this->rapportA', '$temps');");
$db->deconnexion();
//On envoit le rapport de cdontre-espionnage
if ($this->var[3] >= 1) {
$this->titreB = "Rapport de contre-espionnage";
if (!isset($this->var[0]->nom_planete)) {
@ -128,8 +134,15 @@ class Rapport
} else {
$this->rapportB = "Nous venons d'apprendre que notre planète : ".$this->var[0]->nom_planete."[".$this->var[0]->galaxie.":".$this->var[0]->ss.":".$this->var[0]->position."] a été la cible d'un espionnage de la part de ".$this->utilA->pseudo;
}
$temps = $this->timestamp;
$db = new BDD();
$db->escape($this->titreB);
$db->escape($this->rapportB);
$db->query("INSERT INTO ".$this->table." (destinataire, sujet, contenu, temps) VALUES(".$this->utilB->id_user.", '$this->titreB', '$this->rapportB', '$temps');");
$db->deconnexion();
}
$this->rapportA = $this->rapportA;
}
public function sendTransport()

4
onyx2/include/donnees.php
View File

@ -29,5 +29,7 @@ $technologiesVAR = array("techno_indu", "techno_inge", "techno_inge2", "techno_p
$batimentsVAR = array("mine_m", "mine_c", "mine_h", "centrale_s", "centrale_f", "radar", "labo", "chantier_terrestre", "chantier_spatial", "caserne", "silo", "centre_info", "habitation", "arcologies", "bunker", "stations", "commercial", "loisir", "administration");
$caserneVAR = array("soldat1", "soldat2", "soldat3", "soldat4", "sniper", "spartan", "medecin", "ingenieur", "soldat_lourd");
$spatialVAR = array("vaisseau_1", "vaisseau_2", "vaisseau_3", "vaisseau_4", "vaisseau_5", "vaisseau_6", "vaisseau_7", "vaisseau_8", "vaisseau_9", "vaisseau_10", "vaisseau_11", "vaisseau_12", "vaisseau_13", "vaisseau_14", "vaisseau_15", "vaisseau_16", "vaisseau_17");
$terrestreVAR = array("vais_0", "vais_1", "vais_2", "vais_3", "vcl_1", "vcl_2", "vcl_3", "vcl_4", "def_1", "def_2", "def_3", "def_4", "def_5", "def_6", "def_7", "def_8");
$terrestreVAR = array();
$terrestreVAR["humain"] = array("vais_0", "vais_1", "vais_2", "vais_3", "vcl_1", "vcl_2", "vcl_3", "vcl_4", "def_1", "def_2", "def_3", "def_4", "def_5", "def_6", "def_7", "def_8");
$terrestreVAR["covenant"] = array("vais_0", "vais_1", "vais_2", "vais_3", "vcl_1", "vcl_2", "vcl_3", "vcl_4", "def_1", "def_2", "def_3", "def_4", "def_5");
$coeffVAR = array("coeff_mine_m", "coeff_mine_c", "coeff_mine_h", "coeff_centrale_s", "coeff_centrale_f");

12
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);
@ -89,7 +89,7 @@ foreach ($planete->casernes as $id => $unite) {
$template->assign('caserne', $TEMP_liste);
$TEMP_liste = array();
$id = 1;
$id = 0;
$max_unite = count($LANG[$race]["terrestre"]["noms_sing"]);
while ($id <= $max_unite) {
if (!empty($LANG[$race]["terrestre"]["noms_sing"][$id])) {
@ -103,7 +103,7 @@ while ($id <= $max_unite) {
$template->assign('unites', $TEMP_liste);
$TEMP_liste = array();
$id = 1;
$id = 0;
$max_unite = count($LANG[$race]["vaisseaux"]["noms_sing"]);
while ($id <= $max_unite) {
if (!empty($LANG[$race]["vaisseaux"]["noms_sing"][$id])) {

6
onyx2/include/game/description.php
View File

@ -110,12 +110,12 @@ if (isset($_GET['t']) && is_numeric($_GET['t']) && !empty($LANG[$race]["technolo
$template->assign('type', 'vaisseaux');
$t = intval(gpc('v'));
$template->assign('id', $t);
$template->assign('image', dSpatial::image($t, $planete));
$template->assign('image', dSpatial::image($t, $planete, $race));
$template->assign('ressourcesNext', array(dSpatial::metal($t, 1, $planete), dSpatial::cristal($t, 1, $planete), dSpatial::hydrogene($t, 1, $planete), dSpatial::temps($t, 1, $planete)));
$template->assign('ressourcesNext', array(dSpatial::metal($t, 1, $planete, $race), dSpatial::cristal($t, 1, $planete, $race), dSpatial::hydrogene($t, 1, $planete, $race), dSpatial::temps($t, 1, $planete, $race)));
$template->assign('etat', dSpatial::needed($t, $planete, $race));
$template->assign('caract', array($nomvais_at[$t], $nomvais_bc[$t], $nomvais_pv[$t], $nomvais_rs[$t]));
$template->assign('caract', array(dSpatial::attaque($t, $planete, $race), dSpatial::bouclier($t, $planete, $race), dSpatial::armature($t, $planete, $race), dSpatial::tailleCales($t, $planete, $race)));
} elseif (isset($_GET['d']) && is_numeric($_GET['d']) && !empty($LANG[$race]["terrestre"]["noms_sing"][$_GET['d']])) {
$template->assign('type', 'terrestre');
$t = gpc('d');

11
onyx2/include/game/flottes/envoyer.php
View File

@ -70,7 +70,7 @@ if ($mission == 4 && $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][3] <= 0)
}
//On vérifie la mission, si elle est d'espionner, il faut qu'il y ait des sondes
if ($mission == 5 && $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][6] <= 0 && $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][13] <= 0) {
if ($mission == 5 && (($planete->race == "humain" && $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][13] <= 0) || ($planete->race == "covenant" && $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][7] <= 0))) {
erreur('Vous ne pouvez pas espionner sans sonde d\'espionnage !', "red", '?p=flotte');
}
@ -156,9 +156,18 @@ elseif ($mission == 5) {
erreur('La planète sur laquelle vous désirez stationner ne vous appartient pas.', "red", '?p=flotte', 3000);
} elseif ($mission == 7 && !$resultat) {
erreur('La planète sur laquelle vous désirez donner vos vaisseaux n\'existe pas.', "red", '?p=flotte', 3000);
} elseif ($mission == 7) {
$bdd->reconnexion();
$resultatu = $bdd->unique_query("SELECT race FROM $table_user WHERE id = ".$resultat['id_user'].";");
$bdd->deconnexion();
if ($resultatu['race'] != $planete->race) {
erreur("Vous ne pouvez pas donner vos vaisseaux a une autre race que la votre", "red");
}
}
//Création de la flotte
$flotte = new flotte();
$flotte->creer($planete, $SESS->values["prepFlottes"][$idPrep], $resultat);

5
onyx2/include/game/flottes/restaure.php
View File

@ -23,13 +23,14 @@ if ($SESS->values["prepFlottes"][$idPrep]['type'] == 1) {
if ($SESS->values["prepFlottes"][$idPrep]['vaisseaux'][2]) {
$missions[2] = "Coloniser";
}
if ($planete->technologies[7]& 16 && $VAR["attaques"]) {
//Stratégie millitaire est nécessaire
if ($planete->technologies[3]& 4096 && $VAR["attaques"]) {
$missions[3] = "Attaquer";
}
if ($SESS->values["prepFlottes"][$idPrep]['type'] == 1 && $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][3]) {
$missions[4] = "Recycler";
}
if ($SESS->values["prepFlottes"][$idPrep]['type'] == 1 && ($SESS->values["prepFlottes"][$idPrep]['vaisseaux'][6] || $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][13])) {
if ($SESS->values["prepFlottes"][$idPrep]['type'] == 1 && (($planete->race == "humain" && $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][13]) || ($planete->race == "covenant" && $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][7]))) {
$missions[5] = "Espionner";
}

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>

2
onyx2/tpl/game/flotte1.tpl
View File

@ -8,7 +8,7 @@
{if $flottesEC}
{foreach from=$flottesEC item=flotteEC}
<tr>
<td><a href="{$menu.flotte}&amp;n={$flotteEC->id}">{$flotteEC->nom|escape}</a></td>
<td><a href="{$menu.flotte}&amp;n={$flotteEC->id_flotte}">{$flotteEC->nom|escape}</a></td>
<td>{$flotteEC->txtMission($flotteEC->mission)}</td>
<td>{$flotteEC->nb_vais}</td>
<td>{if $flotteEC->end_type == "2"}{$flotteEC->end_planete->nom_alliance} [{$flotteEC->end_planete->galaxie}:{$flotteEC->end_planete->ss}:A]{elseif $flotteEC->end_type == "1"}[{$flotteEC->end_planete}]{elseif $flotteEC->end_type == "3"}[{$flotteEC->end_planete}:A]{else}{$flotteEC->end_planete->nom_planete} [{$flotteEC->end_planete->galaxie}:{$flotteEC->end_planete->ss}:{$flotteEC->end_planete->position}]{/if}</td>