supernova-ws / SuperNova

includes/general/general_math.php

Braces +18 added lines, -15 removed lines

@@ -4,16 +4,14 @@ 
   return $q != 1 ? ($b1 * (pow($q, $n) - 1)/($q - 1)) : ($n * $b1);
 }
 
-function sn_floor($value)
-{
+function sn_floor($value) {
   return $value >= 0 ? floor($value) : ceil($value);
 }
 
 // Эта функция выдает нормально распределенное случайное число с матожиднием $mu и стандартным отклонением $sigma
 // $strict - количество $sigma, по которым идет округление функции. Т.е. $strict = 3 означает, что диапазон значений обрезается по +-3 * $sigma
 // Используется http://ru.wikipedia.org/wiki/Преобразование_Бокса_—_Мюллера
-function sn_rand_gauss($mu = 0, $sigma = 1, $strict = false)
-{
+function sn_rand_gauss($mu = 0, $sigma = 1, $strict = false) {
   // http://ru.wikipedia.org/wiki/Среднеквадратическое_отклонение
   // При $mu = 0 (график симметричный, цифры только для половины графика)
   // От 0 до $sigma ~ 34.1%
@@ -43,7 +41,7 @@ 
  *
  * @return float|int
  */
-function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
+function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false) {
   if($cut_extreme) {
     $range_start--;
     $range_end++;
@@ -98,12 +96,10 @@ 
  *
  * @return float
  */
-function avg($array)
-{
+function avg($array) {
   return is_array($array) && count($array) ? array_sum($array) / count($array) : 0;
 }
-function linear_calc(&$linear, $from = 0, $debug = false)
-{
+function linear_calc(&$linear, $from = 0, $debug = false) {
   for($i = $from; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
@@ -112,7 +108,9 @@ 
       $eq[$j] /= $eq[$from];
     }
   }
-  if($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if($debug) {
+    pdump($linear, 'Нормализовано по х' . $from);
+  }
 
   for($i = $from + 1; $i < count($linear); $i++)
   {
@@ -122,7 +120,9 @@ 
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($debug) pdump($linear, 'Подставили х' . $from);
+  if($debug) {
+    pdump($linear, 'Подставили х' . $from);
+  }
 
   if($from < count($linear) - 1)
   {
@@ -139,11 +139,14 @@ 
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($debug) pdump($linear, 'Подставили обратно х' . $from);
-  }
-  else
+    if($debug) {
+      pdump($linear, 'Подставили обратно х' . $from);
+    }
+  } else
   {
-    if($debug) pdump($linear, 'Результат' . $from);
+    if($debug) {
+      pdump($linear, 'Результат' . $from);
+    }
     foreach($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);

includes/general/general_pname.php

Braces +2 added lines, -4 removed lines

@@ -2,12 +2,10 @@
 
 // Эти функции будут переписаны по добавлению инфы в БД
 
-function pname_factory_production_field_name($factory_unit_id)
-{
+function pname_factory_production_field_name($factory_unit_id) {
   return get_unit_param($factory_unit_id, P_NAME) . '_porcent';
 }
 
-function pname_resource_name($resource_id)
-{
+function pname_resource_name($resource_id) {
   return get_unit_param($resource_id, P_NAME);
 }
\ No newline at end of file

includes/includes/flt_mission_hold.php

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 use Fleet\DbFleetStatic;
 
-function flt_mission_hold(&$mission_data)
-{
+function flt_mission_hold(&$mission_data) {
   if($mission_data['fleet']['fleet_end_stay'] < SN_TIME_NOW)
   {
     DbFleetStatic::fleet_send_back($mission_data['fleet']);

classes/Timer.php

Braces +8 added lines, -16 removed lines

@@ -3,8 +3,7 @@ 
  * Created by Gorlum 05.08.2018 8:05
  */
 
-class Timer
-{
+class Timer {
     /**
      * @var array[] $times [
      *                        'time' => (float)microtime(true),
@@ -14,8 +13,7 @@ 
      */
     private static $times = [];
 
-    public static function init()
-    {
+    public static function init() {
         if (empty(static::$times)) {
             static::$times[] = ['time' => microtime(true)];
         }
@@ -24,8 +22,7 @@ 
     /**
      * @param string $message Message to attach to timestamp
      */
-    public static function mark($message = '')
-    {
+    public static function mark($message = '') {
         static::init();
 
         foreach (debug_backtrace() as $trace) {
@@ -51,8 +48,7 @@ 
      *
      * @return string
      */
-    public static function elapsed($message = '', $fromStart = false)
-    {
+    public static function elapsed($message = '', $fromStart = false) {
         $prevTime = $fromStart ? static::first()['time'] : static::last()['time'];
 
         static::mark($message);
@@ -62,8 +58,7 @@ 
         return number_format(static::last()['time'] - $prevTime, 6) . 's';
     }
 
-    public static function msg($message, $fromStart = false)
-    {
+    public static function msg($message, $fromStart = false) {
         print
             $message .
             ($fromStart ? ' FROM START ' : ' in ') .
@@ -75,21 +70,18 @@ 
     /**
      * @return mixed
      */
-    public static function last()
-    {
+    public static function last() {
         return end(static::$times);
     }
 
     /**
      * @return mixed
      */
-    public static function first()
-    {
+    public static function first() {
         return reset(static::$times);
     }
 
-    public static function getLog()
-    {
+    public static function getLog() {
         return static::$times;
     }
 

includes/includes/flt_page3.inc

Braces +41 added lines, -30 removed lines

@@ -23,18 +23,24 @@ 
 
   // Test de coherance de la destination (voir si elle se trouve dans les limites de l'univers connu
   $errorlist = '';
-  if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1)
-    $errorlist .= $lang['fl_limit_galaxy'];
-  if (!$system || $system > $config->game_maxSystem || $system < 1)
-    $errorlist .= $lang['fl_limit_system'];
-  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE ))
-    $errorlist .= $lang['fl_limit_planet'];
-  if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type)
-    $errorlist .= $lang['fl_ownpl_err'];
-  if (!$planet_type)
-    $errorlist .= $lang['fl_no_planettype'];
-  if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON)
-    $errorlist .= $lang['fl_fleet_err_pl'];
+  if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1) {
+      $errorlist .= $lang['fl_limit_galaxy'];
+  }
+  if (!$system || $system > $config->game_maxSystem || $system < 1) {
+      $errorlist .= $lang['fl_limit_system'];
+  }
+  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE )) {
+      $errorlist .= $lang['fl_limit_planet'];
+  }
+  if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type) {
+      $errorlist .= $lang['fl_ownpl_err'];
+  }
+  if (!$planet_type) {
+      $errorlist .= $lang['fl_no_planettype'];
+  }
+  if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON) {
+      $errorlist .= $lang['fl_fleet_err_pl'];
+  }
   if (empty($missiontype[$target_mission])) {
     $errorlist .= $lang['fl_bad_mission'];
   }
@@ -61,29 +67,35 @@ 
     }
   } else {
     if ($TargetPlanet['id_owner']){
-      if ($target_mission == MT_COLONIZE)
-        $errorlist .= $lang['fl_colonized'];
+      if ($target_mission == MT_COLONIZE) {
+              $errorlist .= $lang['fl_colonized'];
+      }
 
       if ($TargetPlanet['id_owner'] == $planetrow['id_owner']){
-        if ($target_mission == MT_ATTACK)
-          $errorlist .= $lang['fl_no_self_attack'];
-
-        if ($target_mission == MT_SPY)
-          $errorlist .= $lang['fl_no_self_spy'];
-      }else{
-        if ($target_mission == MT_RELOCATE)
-          $errorlist .= $lang['fl_only_stay_at_home'];
+        if ($target_mission == MT_ATTACK) {
+                  $errorlist .= $lang['fl_no_self_attack'];
+        }
+
+        if ($target_mission == MT_SPY) {
+                  $errorlist .= $lang['fl_no_self_spy'];
+        }
+      } else{
+        if ($target_mission == MT_RELOCATE) {
+                  $errorlist .= $lang['fl_only_stay_at_home'];
+        }
       }
-    }else{
+    } else{
       if ($target_mission < MT_COLONIZE){
         $errorlist .= $lang['fl_unknow_target'];
-      }else{
-        if ($target_mission == MT_DESTROY)
-          $errorlist .= $lang['fl_nomoon'];
+      } else{
+        if ($target_mission == MT_DESTROY) {
+                  $errorlist .= $lang['fl_nomoon'];
+        }
 
         if ($target_mission == MT_RECYCLE){
-          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
-            $errorlist .= $lang['fl_nodebris'];
+          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0) {
+                      $errorlist .= $lang['fl_nodebris'];
+          }
         }
       }
     }
@@ -131,8 +143,7 @@ 
       $aks = DbFleetStatic::dbAcsGetById($fleet_group);
       if (!$aks) {
         $fleet_group = 0;
-      }
-      else
+      } else
       {
         $galaxy = $aks['galaxy'];
         $system = $aks['system'];