supernova-ws / SuperNova

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;

classes/Universe.php

Spacing +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
   const MOON_MIN_SIZE = 1100;
   const MOON_MAX_SIZE = 8999;
 
-  const MOON_DEBRIS_MIN = 1000000;    // Minimum amount of debris to span a moon
-  const MOON_CHANCE_MIN_PERCENT = 1;  // Minimum chance to span a moon
+  const MOON_DEBRIS_MIN = 1000000; // Minimum amount of debris to span a moon
+  const MOON_CHANCE_MIN_PERCENT = 1; // Minimum chance to span a moon
   const MOON_CHANCE_MAX_PERCENT = 30; // Maximum chance to span a moon
 
   /**

classes/Fleet/RecordFleet.php

Spacing +9 added lines, -9 removed lines

@@ -76,8 +76,8 @@ 
   public function __construct(GlobalContainer $services = null) {
     parent::__construct($services);
 
-    if(empty(static::$shipInfo)) {
-      foreach(sn_get_groups('fleet') as $unit_id) {
+    if (empty(static::$shipInfo)) {
+      foreach (sn_get_groups('fleet') as $unit_id) {
         static::$shipInfo[$unit_id] = get_unit_param($unit_id);
         static::$shipInfo[$unit_id][P_COST_METAL] = get_unit_cost_in(static::$shipInfo[$unit_id][P_COST]);
       }
@@ -103,7 +103,7 @@ 
    * @inheritdoc
    */
   public function update() {
-    if($this->getShipCount() < 1) {
+    if ($this->getShipCount() < 1) {
       return $this->delete();
     }
 
@@ -127,7 +127,7 @@ 
    */
   public function getCostInMetal() {
     $result = 0;
-    foreach($this->shipList as $shipId => $amount) {
+    foreach ($this->shipList as $shipId => $amount) {
       $result += $amount * $this->getShipCostInMetal($shipId);
     }
 
@@ -148,7 +148,7 @@ 
    */
   public function getCapacity() {
     $result = 0;
-    foreach($this->shipList as $shipId => $amount) {
+    foreach ($this->shipList as $shipId => $amount) {
       $result += $amount * $this->getShipCapacity($shipId);
     }
 
@@ -165,12 +165,12 @@ 
    */
   public function changeShipCount($shipSnId, $shipCount) {
     !isset($this->shipList[$shipSnId]) ? $this->shipList[$shipSnId] = 0 : false;
-    if($this->shipList[$shipSnId] + $shipCount < 0) {
+    if ($this->shipList[$shipSnId] + $shipCount < 0) {
       throw new \Exception("Trying to deduct more ships [{$shipSnId}] '{$shipCount}' then fleet has {$this->shipList[$shipSnId]}");
     }
 
     $this->shipList[$shipSnId] += $shipCount;
-    if($this->shipList[$shipSnId] <= 0) {
+    if ($this->shipList[$shipSnId] <= 0) {
       unset($this->shipList[$shipSnId]);
     }
 
@@ -185,11 +185,11 @@ 
    * @throws \Exception
    */
   public function changeResource($resourceId, $resourceCount) {
-    if(!array_key_exists($resourceId, $this->resources) || empty($resourceCount)) {
+    if (!array_key_exists($resourceId, $this->resources) || empty($resourceCount)) {
       return;
     }
 
-    if($this->resources[$resourceId] + $resourceCount < 0) {
+    if ($this->resources[$resourceId] + $resourceCount < 0) {
       throw new \Exception("Trying to deduct more resources [{$resourceId}] '{$resourceCount}' then fleet has {$this->resources[$resourceId]}");
     }
 

classes/Fleet/MissionExplore.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
    *
    * @var int[] $shipsToRemove
    */
-  protected $shipsToRemove = [SHIP_COLONIZER, SHIP_SPY,];
+  protected $shipsToRemove = [SHIP_COLONIZER, SHIP_SPY, ];
 
   // -------------------------------------------------------------------------------------------------------------------
   /**

includes/update.php

Spacing +1 added lines, -1 removed lines

@@ -359,7 +359,7 @@
       );
     }
 
-    updPatchApply(1, function () {
+    updPatchApply(1, function() {
       $q = upd_do_query("SELECT `messageid`, `user` FROM `{{chat}}`", true);
       while ($row = db_fetch($q)) {
         if (strpos($row['user'], 'a:') !== 0) {

admin/userlist.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 
   $template->assign_block_vars('user', array(
       'ID'              => $user_row['id'],
-      'NAME'            => $renderedNick = player_nick_render_to_html($user_row, ['player_rank' => true, 'vacancy' => true, 'birthday' => true, 'award' => true, NICK_RANK_NO_TEXT => true,]),
+      'NAME'            => $renderedNick = player_nick_render_to_html($user_row, ['player_rank' => true, 'vacancy' => true, 'birthday' => true, 'award' => true, NICK_RANK_NO_TEXT => true, ]),
       'NAME_HTML'       => htmlentities($user_row['username'], ENT_QUOTES, 'UTF-8'),
       'IP'              => $user_row['user_lastip'],
       'IP_MULTI'        => intval($multi_ip[$user_row['user_lastip']]),

includes/vars.php

Spacing +7 added lines, -7 removed lines

@@ -564,9 +564,9 @@ 
           2 => 0.01,
         ),
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
-          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,],
-          [P_CHANCE =>  9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,],
-          [P_CHANCE =>  1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,],
+          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ],
+          [P_CHANCE =>  9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ],
+          [P_CHANCE =>  1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ],
         ],
       ),
       FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES => array(
@@ -578,9 +578,9 @@ 
           2 => 0.025,
         ),
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
-          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,],
-          [P_CHANCE =>  9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,],
-          [P_CHANCE =>  1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,],
+          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ],
+          [P_CHANCE =>  9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ],
+          [P_CHANCE =>  1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ],
         ],
       ),
       FLT_EXPEDITION_OUTCOME_FOUND_DM        => array(
@@ -1236,7 +1236,7 @@ 
       UNIT_PLANS        => 'plans',
     ],
 
-    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense','fleet',],
+    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet', ],
 
   ),
 );

includes/functions/eco_get_build_data.php

Braces +6 added lines, -12 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function eco_lab_sort_effectivness($a, $b)
-{
+function eco_lab_sort_effectivness($a, $b) {
   return $a['laboratory_effective_level'] > $b['laboratory_effective_level'] ? -1 : ($a['laboratory_effective_level'] < $b['laboratory_effective_level'] ? 1 : 0);
 }
 
@@ -11,8 +10,7 @@ 
  * 1.0 - copyright (c) 2010 by Gorlum for http://supernova.ws
  * @version 1.0
  */
-function eco_get_lab_max_effective_level(&$user, $lab_require)
-{
+function eco_get_lab_max_effective_level(&$user, $lab_require) {
   if(!$user['user_as_ally'] && !isset($user['laboratories_active']))
   {
     $user['laboratories_active'] = array();
@@ -38,8 +36,7 @@ 
     if($user['user_as_ally'])
     {
       $lab_level = doquery("SELECT ally_members AS effective_level FROM {{alliance}} WHERE id = {$user['user_as_ally']} LIMIT 1", true);
-    }
-    else
+    } else
     {
       $tech_intergalactic = mrc_get_level($user, false, TECH_RESEARCH) + 1;
       $lab_level['effective_level'] = 0;
@@ -217,8 +214,7 @@ 
   return $result;
 }
 
-function eco_is_builds_in_que($planet_que, $unit_list)
-{
+function eco_is_builds_in_que($planet_que, $unit_list) {
   $eco_is_builds_in_que = false;
 
   $unit_list = is_array($unit_list) ? $unit_list : array($unit_list => $unit_list);
@@ -240,8 +236,7 @@ 
 }
 
 function eco_unit_busy(&$user, &$planet, $unit_id){$result = null;return sn_function_call('eco_unit_busy', [&$user, &$planet, $unit_id, &$result]);}
-function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result)
-{
+function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result) {
   global $config;
 
   $result = isset($result) ? $result : false;
@@ -262,8 +257,7 @@ 
       //{
       //  $result = true;
       //}
-    }
-    elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
+    } elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
     {
       $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO));
     }

Spacing +37 added lines, -37 removed lines

@@ -13,13 +13,13 @@ 
  */
 function eco_get_lab_max_effective_level(&$user, $lab_require)
 {
-  if(!$user['user_as_ally'] && !isset($user['laboratories_active']))
+  if (!$user['user_as_ally'] && !isset($user['laboratories_active']))
   {
     $user['laboratories_active'] = array();
     $query = DBStaticUnit::db_unit_list_laboratories($user['id']);
-    while($row = db_fetch($query))
+    while ($row = db_fetch($query))
     {
-      if(!eco_unit_busy($user, $row, UNIT_TECHNOLOGIES))
+      if (!eco_unit_busy($user, $row, UNIT_TECHNOLOGIES))
       {
         $row += array(
           STRUC_LABORATORY => $level_lab = mrc_get_level($user, $row, STRUC_LABORATORY),
@@ -33,9 +33,9 @@ 
     uasort($user['laboratories_active'], 'eco_lab_sort_effectivness');
   }
 
-  if(!isset($user['research_effective_level'][$lab_require]))
+  if (!isset($user['research_effective_level'][$lab_require]))
   {
-    if($user['user_as_ally'])
+    if ($user['user_as_ally'])
     {
       $lab_level = doquery("SELECT ally_members AS effective_level FROM {{alliance}} WHERE id = {$user['user_as_ally']} LIMIT 1", true);
     }
@@ -44,13 +44,13 @@ 
       $tech_intergalactic = mrc_get_level($user, false, TECH_RESEARCH) + 1;
       $lab_level['effective_level'] = 0;
 
-      foreach($user['laboratories_active'] as $data)
+      foreach ($user['laboratories_active'] as $data)
       {
-        if($tech_intergalactic <= 0)
+        if ($tech_intergalactic <= 0)
         {
           break;
         }
-        if($data[STRUC_LABORATORY] >= $lab_require)
+        if ($data[STRUC_LABORATORY] >= $lab_require)
         {
           $lab_level['effective_level'] += $data['laboratory_effective_level'];
           $tech_intergalactic--;
@@ -90,8 +90,8 @@ 
   $cost[P_OPTIONS][P_TIME_RAW] = 0;
   $only_dark_matter = 0;
   $cost_in_metal = 0;
-  foreach($unit_data[P_COST] as $resource_id => $resource_amount) {
-    if($resource_id === P_FACTOR || !($resource_cost = $resource_amount * $price_increase)) {
+  foreach ($unit_data[P_COST] as $resource_id => $resource_amount) {
+    if ($resource_id === P_FACTOR || !($resource_cost = $resource_amount * $price_increase)) {
       continue;
     }
 
@@ -102,12 +102,12 @@ 
 
     $cost_in_metal += $cost[BUILD_CREATE][$resource_id] * $currentResourceExchange;
 
-    if(in_array($resource_id, $resources_loot)) {
+    if (in_array($resource_id, $resources_loot)) {
       $cost[P_OPTIONS][P_TIME_RAW] += $resource_cost * $currentResourceExchange / $rpg_exchange_deuterium;
       $resource_got = mrc_get_level($user, $planet, $resource_id);
-    } elseif($resource_id == RES_DARK_MATTER) {
+    } elseif ($resource_id == RES_DARK_MATTER) {
       $resource_got = mrc_get_level($user, null, $resource_id);
-    } elseif($resource_id == RES_ENERGY) {
+    } elseif ($resource_id == RES_ENERGY) {
       $resource_got = max(0, $planet['energy_max'] - $planet['energy_used']);
     } else {
       $resource_got = 0;
@@ -119,7 +119,7 @@ 
   }
 
   $resources_normalized = 0;
-  foreach($resources_loot as $resource_id) {
+  foreach ($resources_loot as $resource_id) {
     $resources_normalized += floor(mrc_get_level($user, $planet, $resource_id)) * $config->__get('rpg_exchange_' . pname_resource_name($resource_id));
   }
 
@@ -135,7 +135,7 @@ 
   $cost[P_OPTIONS][P_TIME_RAW] = $cost[P_OPTIONS][P_TIME_RAW] * 60 * 60 / get_game_speed() / 2500;
 
   // TODO - Вынести в отдельную процедуру расчёт стоимости
-  if($only_cost) {
+  if ($only_cost) {
     return $cost;
   }
 
@@ -147,7 +147,7 @@ 
   $cost['RESULT'][BUILD_DESTROY] = BUILD_INDESTRUCTABLE;
 
   $mercenary = 0;
-  if(in_array($unit_id, sn_get_groups('structures'))) {
+  if (in_array($unit_id, sn_get_groups('structures'))) {
     $cost[RES_TIME][BUILD_CREATE] *= pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_ROBOT) + 1);
     $cost['RESULT'][BUILD_DESTROY] =
       mrc_get_level($user, $planet, $unit_id, false, true)
@@ -157,19 +157,19 @@ 
           )
         : BUILD_NO_UNITS;
     $mercenary = MRC_ENGINEER;
-  } elseif(in_array($unit_id, sn_get_groups('tech'))) {
+  } elseif (in_array($unit_id, sn_get_groups('tech'))) {
     $lab_level = eco_get_lab_max_effective_level($user, intval($unit_data[P_REQUIRE][STRUC_LABORATORY]));
     $cost[RES_TIME][BUILD_CREATE] /= $lab_level;
     $mercenary = MRC_ACADEMIC;
-  } elseif(in_array($unit_id, sn_get_groups('defense'))) {
-    $cost[RES_TIME][BUILD_CREATE] *= pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1) ;
+  } elseif (in_array($unit_id, sn_get_groups('defense'))) {
+    $cost[RES_TIME][BUILD_CREATE] *= pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1);
     $mercenary = MRC_FORTIFIER;
-  } elseif(in_array($unit_id, sn_get_groups('fleet'))) {
+  } elseif (in_array($unit_id, sn_get_groups('fleet'))) {
     $cost[RES_TIME][BUILD_CREATE] *= pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1);
     $mercenary = MRC_ENGINEER;
   }
 
-  if(
+  if (
     // If planet is capital
     $user['id_planet'] == $planet['id']
     &&
@@ -180,11 +180,11 @@ 
     $cost[RES_TIME][BUILD_CREATE] = $cost[RES_TIME][BUILD_CREATE] / SN::$gc->config->planet_capital_building_rate;
   }
 
-  if($mercenary) {
+  if ($mercenary) {
     $cost[RES_TIME][BUILD_CREATE] = $cost[RES_TIME][BUILD_CREATE] / mrc_modify_value($user, $planet, $mercenary, 1);
   }
 
-  if(in_array($unit_id, sn_get_groups('governors')) || $only_dark_matter) {
+  if (in_array($unit_id, sn_get_groups('governors')) || $only_dark_matter) {
     $cost[RES_TIME][BUILD_CREATE] = $cost[RES_TIME][BUILD_DESTROY] = 0;
   } else {
     $cost[RES_TIME][BUILD_CREATE]  = $cost[RES_TIME][BUILD_CREATE] > 1 ? round($cost[RES_TIME][BUILD_CREATE]) : 1;
@@ -194,7 +194,7 @@ 
   return $cost;
 }
 
-function eco_can_build_unit($user, $planet, $unit_id){$result = null;return sn_function_call('eco_can_build_unit', array($user, $planet, $unit_id, &$result));}
+function eco_can_build_unit($user, $planet, $unit_id) {$result = null; return sn_function_call('eco_can_build_unit', array($user, $planet, $unit_id, &$result)); }
 function sn_eco_can_build_unit($user, $planet, $unit_id, &$result) {
   global $config;
 
@@ -202,11 +202,11 @@ 
   $result = $result == BUILD_ALLOWED && eco_unit_busy($user, $planet, $unit_id) ? BUILD_UNIT_BUSY : $result;
 
   $unit_param = get_unit_param($unit_id);
-  if($unit_param[P_UNIT_TYPE] != UNIT_MERCENARIES || !$config->empire_mercenary_temporary) {
+  if ($unit_param[P_UNIT_TYPE] != UNIT_MERCENARIES || !$config->empire_mercenary_temporary) {
     $requirement = &$unit_param[P_REQUIRE];
-    if($result == BUILD_ALLOWED && $requirement) {
-      foreach($requirement as $require_id => $require_level) {
-        if(mrc_get_level($user, $planet, $require_id) < $require_level) {
+    if ($result == BUILD_ALLOWED && $requirement) {
+      foreach ($requirement as $require_id => $require_level) {
+        if (mrc_get_level($user, $planet, $require_id) < $require_level) {
           $result = BUILD_REQUIRE_NOT_MEET;
           break;
         }
@@ -223,12 +223,12 @@ 
 
   $unit_list = is_array($unit_list) ? $unit_list : array($unit_list => $unit_list);
   $planet_que = explode(';', $planet_que);
-  foreach($planet_que as $planet_que_item)
+  foreach ($planet_que as $planet_que_item)
   {
-    if($planet_que_item)
+    if ($planet_que_item)
     {
       list($planet_que_item) = explode(',', $planet_que_item);
-      if(in_array($planet_que_item, $unit_list))
+      if (in_array($planet_que_item, $unit_list))
       {
         $eco_is_builds_in_que = true;
         break;
@@ -239,21 +239,21 @@ 
   return $eco_is_builds_in_que;
 }
 
-function eco_unit_busy(&$user, &$planet, $unit_id){$result = null;return sn_function_call('eco_unit_busy', [&$user, &$planet, $unit_id, &$result]);}
+function eco_unit_busy(&$user, &$planet, $unit_id) {$result = null; return sn_function_call('eco_unit_busy', [&$user, &$planet, $unit_id, &$result]); }
 function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result)
 {
   global $config;
 
   $result = isset($result) ? $result : false;
-  if(!$result)
+  if (!$result)
   {
-    if(($unit_id == STRUC_LABORATORY || $unit_id == STRUC_LABORATORY_NANO) && !$config->BuildLabWhileRun)
+    if (($unit_id == STRUC_LABORATORY || $unit_id == STRUC_LABORATORY_NANO) && !$config->BuildLabWhileRun)
     {
       $global_que = que_get($user['id'], $planet['id'], QUE_RESEARCH, false);
-      if(is_array($global_que['ques'][QUE_RESEARCH][$user['id']]))
+      if (is_array($global_que['ques'][QUE_RESEARCH][$user['id']]))
       {
         $first_element = reset($global_que['ques'][QUE_RESEARCH][$user['id']]);
-        if(is_array($first_element))
+        if (is_array($first_element))
         {
           $result = true;
         }
@@ -263,7 +263,7 @@ 
       //  $result = true;
       //}
     }
-    elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
+    elseif (($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
     {
       $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO));
     }

galaxy.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
     ||
     (!empty($uni_galaxyRowPlanet['destruyed']) && CheckAbandonPlanetState($uni_galaxyRowPlanet))
   ) {
-    $template->assign_block_vars('galaxyrow', ['PLANET_NUM' => $Planet,]);
+    $template->assign_block_vars('galaxyrow', ['PLANET_NUM' => $Planet, ]);
     continue;
   }
 
@@ -242,7 +242,7 @@ 
     'IS_CAPITAL'      => $uni_galaxyRowUser['id_planet'] == $uni_galaxyRowPlanet['id'],
 
     'USER_ID'         => $uni_galaxyRowUser['id'],
-    'USER_NAME'       => $renderedNick = player_nick_render_to_html($uni_galaxyRowUser, ['icons' => true,]),
+    'USER_NAME'       => $renderedNick = player_nick_render_to_html($uni_galaxyRowUser, ['icons' => true, ]),
     'USER_NAME_JS'    => js_safe_string($renderedNick),
     'USER_RANK'       => in_array($uni_galaxyRowUser['id'], $user_skip_list) ? '-' : $uni_galaxyRowUser['total_rank'],
     'USER_BANNED'     => $uni_galaxyRowUser['banaday'],