diff --git a/.drone.yml b/.drone.yml index b05c253..af479b3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -64,7 +64,6 @@ steps: trigger: event: - - cron - push - tag diff --git a/htdocs/ajax_flotte.php b/htdocs/ajax_flotte.php index af900cb..3ab42e3 100644 --- a/htdocs/ajax_flotte.php +++ b/htdocs/ajax_flotte.php @@ -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->values['idPlan'])) { +if (isset($SESS) && isset($SESS->values['connected']) && $SESS->values['connected'] && !empty($SESS->values['id']) && !empty($SESS->level) && !empty($SESS->values['idPlan'])) { $idPrep = gpc("cds_temp", "post"); $json = new Services_JSON(); $nbtrajet = 2; - if (empty($VAR['flottes']) && $SESS->level <= 1) { + if (empty($config['flottes']) && $SESS->level <= 1) { $datas = array( 'root' => array( 'destination' => '::', @@ -107,8 +107,7 @@ if (isset($SESS) && isset($SESS->values['connected']) && $SESS->values['connecte $places -= ($met+$cri+$hyd); } $tactique = ''; - // si la mission est une mission d'attaque - if ($_POST['mission'] == '3') { + if ($_POST['mission'] == '1') { $tactique = ' - - {/foreach} - -{include file='game/footer.tpl'} +{include file='game/footer.tpl'} \ No newline at end of file diff --git a/onyx2/tpl/game/accueil.tpl b/onyx2/tpl/game/accueil.tpl index 8b888ab..a17d21b 100644 --- a/onyx2/tpl/game/accueil.tpl +++ b/onyx2/tpl/game/accueil.tpl @@ -27,7 +27,7 @@

Infos

{if $smarty.const.SURFACE == "planete"}

{php}dDonnees::nameVilles($this->_tpl_vars['planete']->batiments[17]){/php}

-

Diamètre: {$diametre|separerNombres} km ({$planete->casesRest} case{if $planete->casesRest > 1}s{/if} disponible{if $planete->casesRest > 1}s{/if} sur {$planete->cases})

+

Diamètre: {$diametre|separerNombres} km ({$planete->casesRest} case{if $planete->casesRest > 1}s{/if} disponible{if $planete->casesRest > 1}s{/if} sur {php}dDonnees::capaciteVilles($this->_tpl_vars['planete']){/php})

{/if}

Race : {$planete->race}

position: {$planete->galaxie}.{$planete->ss}.{$planete->position}

@@ -111,4 +111,4 @@

Infos de l'alliance

{$planete->details.texte_interne} {/if} -{include file='game/footer.tpl'} +{include file='game/footer.tpl'} \ No newline at end of file diff --git a/onyx2/tpl/game/flotte1.tpl b/onyx2/tpl/game/flotte1.tpl index b161ca0..c1b685c 100644 --- a/onyx2/tpl/game/flotte1.tpl +++ b/onyx2/tpl/game/flotte1.tpl @@ -8,7 +8,7 @@ {if $flottesEC} {foreach from=$flottesEC item=flotteEC} - {$flotteEC->nom|escape} + {$flotteEC->nom|escape} {$flotteEC->txtMission($flotteEC->mission)} {$flotteEC->nb_vais} {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} @@ -69,4 +69,4 @@ -{include file='game/footer.tpl'} +{include file='game/footer.tpl'} \ No newline at end of file diff --git a/onyx2/tpl/game/menu_joueurs.tpl b/onyx2/tpl/game/menu_joueurs.tpl index a7e0d8f..578040d 100644 --- a/onyx2/tpl/game/menu_joueurs.tpl +++ b/onyx2/tpl/game/menu_joueurs.tpl @@ -27,7 +27,6 @@
  • Armement
  • Défenses
  • Projets expérimentaux
    • -
  • Expansion
    • {/if}
  • @@ -68,4 +67,4 @@
  • Rapports de bug
  • F.A.Q.
  • Déconnexion
    • - + \ No newline at end of file diff --git a/schema.sql b/schema.sql index 096c278..5c7c4c7 100644 --- a/schema.sql +++ b/schema.sql @@ -608,7 +608,7 @@ CREATE TABLE IF NOT EXISTS `planete` ( `isolement` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0', `nom_planete` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', `moral` float NOT NULL DEFAULT 0.5, - `image` tinyint unsigned NOT NULL DEFAULT 0, + `image` tinyint(4) NOT NULL DEFAULT 0, `cases` int(11) NOT NULL DEFAULT 0, `debris_met` bigint(20) NOT NULL DEFAULT 0, `debris_cri` bigint(20) NOT NULL DEFAULT 0,