supernova-ws / SuperNova

classes/Alliance/AllianceTitleList.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
         continue;
       }
 
-      $result[] = (string)$title;
+      $result[] = (string) $title;
     }
 
     return implode(';', $result);
@@ -67,7 +67,7 @@ 
    * Updates title names and access rights with current ones
    */
   public function updateTitles() {
-    $this->alliance->titleList = (string)$this;
+    $this->alliance->titleList = (string) $this;
   }
 
   protected function extractTitles() {

classes/Bonus/BonusAtom.php

Spacing +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
    * @return int
    */
   public static function calcBonusPower($unitInfo) {
-    return isset($unitInfo[P_BONUS_VALUE]) ? $unitInfo[P_BONUS_VALUE] :
-      (static::calcBonusType($unitInfo) == BONUS_ABILITY ? 1 : 0);
+    return isset($unitInfo[P_BONUS_VALUE]) ? $unitInfo[P_BONUS_VALUE] : (static::calcBonusType($unitInfo) == BONUS_ABILITY ? 1 : 0);
   }
 
   /**

classes/Bonus/BonusListAtom.php

Spacing +2 added lines, -2 removed lines

@@ -58,8 +58,8 @@
   protected function bonusSort(BonusAtom $a, BonusAtom $b) {
     static $bonusOrder = [BonusAtom::class, BonusAtomAbility::class, BonusAtomAdd::class, BonusAtomPercent::class, BonusAtomMultiply::class];
 
-    $indexA = (int)array_search(get_class($a), $bonusOrder);
-    $indexB = (int)array_search(get_class($b), $bonusOrder);
+    $indexA = (int) array_search(get_class($a), $bonusOrder);
+    $indexB = (int) array_search(get_class($b), $bonusOrder);
 
     return $indexA == $indexB ? 0 : ($indexA > $indexB ? +1 : -1);
   }

classes/Bonus/ValueStorage.php

Spacing +7 added lines, -7 removed lines

@@ -48,20 +48,20 @@ 
   }
 
   protected function initValues() {
-    $this[UNIT_SERVER_SPEED_BUILDING] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_SPEED_BUILDING] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_SPEED_BUILDING, floatval($vs->getGlobalContainer()->config->game_speed));
     };
-    $this[UNIT_SERVER_SPEED_MINING] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_SPEED_MINING] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_SPEED_MINING, floatval($vs->getGlobalContainer()->config->resource_multiplier));
     };
-    $this[UNIT_SERVER_SPEED_FLEET] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_SPEED_FLEET] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_SPEED_FLEET, floatval($vs->getGlobalContainer()->config->fleet_speed));
     };
-    $this[UNIT_SERVER_SPEED_EXPEDITION] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_SPEED_EXPEDITION] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_SPEED_EXPEDITION, floatval(1));
     };
 
-    $this[UNIT_SERVER_FLEET_NOOB_POINTS] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_FLEET_NOOB_POINTS] = function(ValueStorage $vs) {
       $config = $vs->getGlobalContainer()->config;
 
       return new ValueBonused(
@@ -69,11 +69,11 @@ 
         floatval($config->game_noob_points * $vs->getBase(UNIT_SERVER_SPEED_MINING))
       );
     };
-    $this[UNIT_SERVER_FLEET_NOOB_FACTOR] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_FLEET_NOOB_FACTOR] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_FLEET_NOOB_FACTOR, floatval($vs->getGlobalContainer()->config->game_noob_factor));
     };
 
-    $this[UNIT_SERVER_PAYMENT_MM_PER_CURRENCY] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_PAYMENT_MM_PER_CURRENCY] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_PAYMENT_MM_PER_CURRENCY, floatval($vs->getGlobalContainer()->config->payment_currency_exchange_mm_));
     };
   }

classes/Unit/Governor.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
    * @return int
    */
   public function getMaxLevel() {
-    $snId =  $this->getSnId();
+    $snId = $this->getSnId();
     return !empty($snId) ? get_unit_param($snId, P_MAX_STACK) : 0;
   }
 

includes/includes/ube_attack_calculate.php

Spacing +3 added lines, -4 removed lines

@@ -165,8 +165,7 @@ 
     $planet_info[PLANET_SYSTEM],
     $planet_info[PLANET_PLANET],
     htmlentities($planet_info[PLANET_NAME], ENT_COMPAT, 'UTF-8'),
-    $lang[$outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' :
-      ($outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
+    $lang[$outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' : ($outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
   );
 
   $text_defender = '';
@@ -251,7 +250,7 @@ 
       // Просматриваем результаты изменения флотов
       foreach ($fleet_info[UBE_COUNT] as $unit_id => $unit_count) {
         // Перебираем аутком на случай восстановления юнитов
-        $units_lost = (float)$fleets_outcome[$fleet_id][UBE_UNITS_LOST][$unit_id];
+        $units_lost = (float) $fleets_outcome[$fleet_id][UBE_UNITS_LOST][$unit_id];
 
         $units_left = $unit_count - $units_lost;
         if ($fleet_id) {
@@ -275,7 +274,7 @@ 
     // Если во флоте остались юниты или это планета - генерируем изменение ресурсов
     if ($new_fleet_count || !$fleet_id) {
       foreach (sn_get_groups('resources_loot') as $resource_id) {
-        $resource_change = (float)$fleets_outcome[$fleet_id][UBE_RESOURCES_LOOTED][$resource_id] + (float)$fleets_outcome[$fleet_id][UBE_CARGO_DROPPED][$resource_id];
+        $resource_change = (float) $fleets_outcome[$fleet_id][UBE_RESOURCES_LOOTED][$resource_id] + (float) $fleets_outcome[$fleet_id][UBE_CARGO_DROPPED][$resource_id];
         if ($resource_change) {
           $resource_db_name = ($fleet_id ? 'fleet_resource_' : '') . pname_resource_name($resource_id);
           $fleet_delta[$resource_db_name] = -($resource_change);

Braces +6 added lines, -2 removed lines

@@ -290,10 +290,12 @@ 
       }
     }
 
-    if ($fleet_id) // Не планета
+    if ($fleet_id) {
+      // Не планета
     {
       if ($fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS && $outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_DIED) {
         $new_fleet_count = 0;
+    }
       }
 
       if ($new_fleet_count) {
@@ -316,10 +318,12 @@ 
         }
         DBStaticPlanet::db_planet_set_by_id($planet_id, implode(',', $temp));
       }
-      if (!empty($db_changeset)) // Сохраняем изменения юнитов на планете - если они есть
+      if (!empty($db_changeset)) {
+        // Сохраняем изменения юнитов на планете - если они есть
       {
         OldDbChangeSet::db_changeset_apply($db_changeset);
       }
+      }
     }
   }
 

includes/functions/uni_functions.php

Braces +3 added lines, -1 removed lines

@@ -236,9 +236,11 @@
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  if (!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
+  if (!isset($planet_row['id'])) {
+    // || $planet_row['id'] != $user['current_planet']
   {
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
+  }
     // Если текущей планеты не существует - выставляем Столицу
     if (!isset($planet_row['id'])) {
       $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');

Spacing +1 added lines, -2 removed lines

@@ -102,8 +102,7 @@
 
   $core_info = uni_create_planet_get_density($position_data, $user_row, $planet_sectors);
 
-  $planet_name_unsafe = !empty($options['force_name']) ? $options['force_name'] :
-    ($user_row['username'] . ' ' . (
+  $planet_name_unsafe = !empty($options['force_name']) ? $options['force_name'] : ($user_row['username'] . ' ' . (
       $HomeWorld
         ? SN::$lang['sys_capital']
         : ($planet_name_unsafe ?: SN::$lang['sys_colo_default_name'])

includes/includes/art_artifact.php

Spacing +15 added lines, -15 removed lines

@@ -4,7 +4,7 @@ 
 {
   global $lang;
 
-  if(!in_array($unit_id, sn_get_groups('artifacts')))
+  if (!in_array($unit_id, sn_get_groups('artifacts')))
   {
     return;
   }
@@ -13,17 +13,17 @@ 
   $user = db_user_by_id($user['id'], true);
 
   $unit_level = $artifact_level_old = mrc_get_level($user, array(), $unit_id, true);
-  if($unit_level > 0)
+  if ($unit_level > 0)
   {
     $db_changeset = array();
-    switch($unit_id)
+    switch ($unit_id)
     {
       case ART_LHC:
       case ART_HOOK_SMALL:
       case ART_HOOK_MEDIUM:
       case ART_HOOK_LARGE:
         $has_moon = DBStaticPlanet::db_planet_by_parent($planetrow['id'], true, '`id`');
-        if($planetrow['planet_type'] == PT_PLANET && !$has_moon['id'])
+        if ($planetrow['planet_type'] == PT_PLANET && !$has_moon['id'])
         {
           $unit_level--;
           $updateDebris = false;
@@ -44,7 +44,7 @@ 
             break;
           }
 
-          if($moonSize)
+          if ($moonSize)
           {
             $new_moon_row = uni_create_moon($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], $user['id'], $moonSize, $updateDebris);
             $message = sprintf($lang['art_moon_create'][$unit_id], $new_moon_row['name'], uni_render_coordinates($planetrow), HelperString::numberFloorAndFormat($moonSize));
@@ -65,14 +65,14 @@ 
       case ART_RCD_MEDIUM:
       case ART_RCD_LARGE:
         $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
-        if($planetrow['planet_type'] != PT_PLANET)
+        if ($planetrow['planet_type'] != PT_PLANET)
         {
           $message = $lang['art_rcd_err_moon'];
           break;
         }
 
         $que = que_get($user['id'], $planetrow['id'], QUE_STRUCTURES, false);
-        if(!empty($que['items']))
+        if (!empty($que['items']))
         {
           $message = $lang['art_rcd_err_que'];
           break;
@@ -81,15 +81,15 @@ 
         $artifact_deploy = get_unit_param($unit_id, P_DEPLOY);
 
         $sectors_used = 0;
-        foreach($artifact_deploy as $deploy_unit_id => $deploy_unit_level)
+        foreach ($artifact_deploy as $deploy_unit_id => $deploy_unit_level)
         {
-          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true))))
+          if (!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true))))
             continue;
           $sectors_used += $levels_deployed;
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($deploy_unit_id, $levels_deployed, $user, $planetrow['id']);
         }
 
-        if($sectors_used == 0)
+        if ($sectors_used == 0)
         {
           $message = $lang['art_rcd_err_no_sense'];
           break;
@@ -104,13 +104,13 @@ 
         $que_item = null;
         $que = que_get($user['id'], $planetrow['id'], QUE_RESEARCH, true);
         $current_que = &$que['ques'][QUE_RESEARCH][$user['id']][0];
-        if(!empty($current_que))
+        if (!empty($current_que))
         {
           reset($current_que);
           $que_item = &$que['ques'][QUE_RESEARCH][$user['id']][0][key($current_que)];
         }
 
-        if(!empty($que_item) && $que_item['que_time_left'] > 60)
+        if (!empty($que_item) && $que_item['que_time_left'] > 60)
         {
           $unit_level--;
           $old_time = $que_item['que_time_left'];
@@ -131,13 +131,13 @@ 
         $que = que_get($user['id'], $planetrow['id'], QUE_STRUCTURES, true);
         $current_que = &$que['ques'][QUE_STRUCTURES][$user['id']][$planetrow['id']];
         // $que_item = &$que['que'][QUE_STRUCTURES][0];
-        if(!empty($current_que))
+        if (!empty($current_que))
         {
           reset($current_que);
           $que_item = &$que['ques'][QUE_STRUCTURES][$user['id']][$planetrow['id']][key($current_que)];
         }
 
-        if(isset($que_item) && $que_item['que_time_left'] > 60)
+        if (isset($que_item) && $que_item['que_time_left'] > 60)
         {
           $unit_level--;
           $old_time = $que_item['que_time_left'];
@@ -155,7 +155,7 @@ 
       break;
 
     }
-    if($unit_level != $artifact_level_old)
+    if ($unit_level != $artifact_level_old)
     {
       $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_level - $artifact_level_old, $user);
       OldDbChangeSet::db_changeset_apply($db_changeset);

Braces +9 added lines, -14 removed lines

@@ -5,8 +5,7 @@ 
 use Que\DBStaticQue;
 use Universe\Universe;
 
-function art_use(&$user, &$planetrow, $unit_id)
-{
+function art_use(&$user, &$planetrow, $unit_id) {
   global $lang;
 
   if(!in_array($unit_id, sn_get_groups('artifacts')))
@@ -53,14 +52,12 @@ 
           {
             $new_moon_row = uni_create_moon($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], $user['id'], $moonSize, $updateDebris);
             $message = sprintf($lang['art_moon_create'][$unit_id], $new_moon_row['name'], uni_render_coordinates($planetrow), HelperString::numberFloorAndFormat($moonSize));
-          }
-          else
+          } else
           {
             $message = $lang['art_lhc_moon_fail'];
           }
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_ADMIN, $lang['art_lhc_from'], $lang['art_lhc_subj'], $message);
-        }
-        else
+        } else
         {
           $message = $lang['art_moon_exists'];
         }
@@ -88,8 +85,9 @@ 
         $sectors_used = 0;
         foreach($artifact_deploy as $deploy_unit_id => $deploy_unit_level)
         {
-          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true))))
-            continue;
+          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true)))) {
+                      continue;
+          }
           $sectors_used += $levels_deployed;
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($deploy_unit_id, $levels_deployed, $user, $planetrow['id']);
         }
@@ -123,8 +121,7 @@ 
           DBStaticQue::db_que_set_time_left_by_id($que_item['que_id'], $que_item['que_time_left']);
           $message = sprintf($lang['art_heurestic_chip_ok'], $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], sys_time_human($old_time - $que_item['que_time_left']));
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_heurestic_chip_subj'], $lang['art_heurestic_chip_subj'], $message);
-        }
-        else
+        } else
         {
           $message = $lang['art_heurestic_chip_no_research'];
         }
@@ -152,8 +149,7 @@ 
             $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], $planetrow['name'], uni_render_coordinates($planetrow), sys_time_human($old_time - $que_item['que_time_left'])
           );
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_nano_builder_subj'], $lang['art_nano_builder_subj'], $message);
-        }
-        else
+        } else
         {
           $message = $lang['art_nano_builder_no_que'];
         }
@@ -165,8 +161,7 @@ 
       $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_level - $artifact_level_old, $user);
       OldDbChangeSet::db_changeset_apply($db_changeset);
     }
-  }
-  else
+  } else
   {
     $message = $lang['art_err_no_artifact'];
   }

classes/Ube/Ube4_1/Ube4_1Calc.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         // Для не-симулятора - рандомизируем каждый раунд значения атаки и щитов
         $fleet_data[UBE_ATTACK_BASE][$unit_id] = floor($fleet_info[UBE_ATTACK][$unit_id] * ($isSimulatorStatic ? 1 : mt_rand(80, 120) / 100));
         $fleet_data[UBE_SHIELD_BASE][$unit_id] = floor($fleet_info[UBE_SHIELD][$unit_id] * ($isSimulatorStatic ? 1 : mt_rand(80, 120) / 100));
-        $fleet_data[UBE_ARMOR_BASE][$unit_id] = floor($fleet_info[UBE_ARMOR][$unit_id]);// * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
+        $fleet_data[UBE_ARMOR_BASE][$unit_id] = floor($fleet_info[UBE_ARMOR][$unit_id]); // * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
 
         $fleet_data[UBE_ATTACK][$unit_id] = $fleet_data[UBE_ATTACK_BASE][$unit_id] * $unit_count;
         $fleet_data[UBE_SHIELD][$unit_id] = $fleet_data[UBE_SHIELD_BASE][$unit_id] * $unit_count;