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 +622 -148
15 changed files with 622 additions and 148 deletions
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'];

6
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;
$race = $planete->race;
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 =