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

Revert a commit because we want to be able to limit flotte to modo
All checks were successful
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nigel Sheldon 2021-01-29 12:17:08 +01:00
parent 9e9a4344f2
commit 541a0e009c
4 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/ajax_flotte.php
View File

@ -14,21 +14,20 @@ if (isset($SESS) && isset($SESS->values['connected']) && $SESS->values['connecte
$json = new Services_JSON(); $json = new Services_JSON();
$nbtrajet = 2; $nbtrajet = 2;
// Décommenter pour bloquer l'envoi de flotte a toute personne non admin if (empty($VAR['flottes']) && $SESS->level <= 1) {
// if (empty($config['flottes']) && $SESS->level <= 1) { $datas = array(
// $datas = array( 'root' => 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').'" />',
// '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').'" />', 'temps' => '-',
// 'temps' => '-', 'deblok' => '<span style="color: #FF0000;"><b>Les flottes sont désactivés pour le moment.</b></span>',
// 'deblok' => '<span style="color: #FF0000;"><b>Les flottes sont désactivés pour le moment.</b></span>', 'conso' => '-',
// 'conso' => '-', 'tactique' => '',
// 'tactique' => '', 'places' => ''
// 'places' => '' )
// ) );
// ); header("X-JSON: ".$json->encode($datas));
// header("X-JSON: ".$json->encode($datas)); exit;
// exit; }
// }
$destin = gpc('fav_dest', 'post'); $destin = gpc('fav_dest', 'post');

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

@ -1528,5 +1528,4 @@ class dSpatial implements Donnees
//On tient compte des bonus //On tient compte des bonus
return $armature; return $armature;
} }
} }

20
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() public function espionner()
{ {
//Si la planète d'arrivé n'est pas chargée, on charge les planètes //Si la planète d'arrivé n'est pas chargée, on charge les planètes

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

@ -23,7 +23,8 @@ if ($SESS->values["prepFlottes"][$idPrep]['type'] == 1) {
if ($SESS->values["prepFlottes"][$idPrep]['vaisseaux'][2]) { if ($SESS->values["prepFlottes"][$idPrep]['vaisseaux'][2]) {
$missions[2] = "Coloniser"; $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"; $missions[3] = "Attaquer";
} }
if ($SESS->values["prepFlottes"][$idPrep]['type'] == 1 && $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][3]) { if ($SESS->values["prepFlottes"][$idPrep]['type'] == 1 && $SESS->values["prepFlottes"][$idPrep]['vaisseaux'][3]) {