From 541a0e009c206fcbb2352e9a298f336bc0f2f664 Mon Sep 17 00:00:00 2001
From: Nigel Sheldon <nigelsheldon@live.fr>
Date: Fri, 29 Jan 2021 12:17:08 +0100
Subject: [PATCH] Revert a commit because we want to be able to limit flotte to
 modo

---
 htdocs/ajax_flotte.php                  | 29 ++++++++++++-------------
 onyx2/include/Class/Donnees/spatial.php |  1 -
 onyx2/include/Class/flotte.php          | 20 +++++++++++++++++
 onyx2/include/game/flottes/restaure.php |  3 ++-
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/htdocs/ajax_flotte.php b/htdocs/ajax_flotte.php
index ebbb0e4..af900cb 100644
--- a/htdocs/ajax_flotte.php
+++ b/htdocs/ajax_flotte.php
@@ -14,21 +14,20 @@ if (isset($SESS) && isset($SESS->values['connected']) && $SESS->values['connecte
     $json = new Services_JSON();
     $nbtrajet = 2;
 
-    // Décommenter pour bloquer l'envoi de flotte a toute personne non admin
-    // if (empty($config['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').'" />',
-    //             'temps' => '-',
-    //             'deblok' => '<span style="color: #FF0000;"><b>Les flottes sont désactivés pour le moment.</b></span>',
-    //             'conso' => '-',
-    //             'tactique' => '',
-    //             'places' => ''
-    //         )
-    //     );
-    //     header("X-JSON: ".$json->encode($datas));
-    //     exit;
-    // }
+    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').'" />',
+                'temps' => '-',
+                'deblok' => '<span style="color: #FF0000;"><b>Les flottes sont désactivés pour le moment.</b></span>',
+                'conso' => '-',
+                'tactique' => '',
+                'places' => ''
+            )
+        );
+        header("X-JSON: ".$json->encode($datas));
+        exit;
+    }
 
     $destin = gpc('fav_dest', 'post');
 
diff --git a/onyx2/include/Class/Donnees/spatial.php b/onyx2/include/Class/Donnees/spatial.php
index 668845d..f7c32da 100644
--- a/onyx2/include/Class/Donnees/spatial.php
+++ b/onyx2/include/Class/Donnees/spatial.php
@@ -1528,5 +1528,4 @@ class dSpatial implements Donnees
         //On tient compte des bonus
         return $armature;
     }
-
 }
diff --git a/onyx2/include/Class/flotte.php b/onyx2/include/Class/flotte.php
index ed6457d..2753972 100644
--- a/onyx2/include/Class/flotte.php
+++ b/onyx2/include/Class/flotte.php
@@ -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
diff --git a/onyx2/include/game/flottes/restaure.php b/onyx2/include/game/flottes/restaure.php
index bc4d865..f28d72d 100644
--- a/onyx2/include/game/flottes/restaure.php
+++ b/onyx2/include/game/flottes/restaure.php
@@ -23,7 +23,8 @@ 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]) {