supernova-ws / SuperNova

includes/vars_structures.php

Spacing +12 added lines, -12 removed lines

@@ -16,8 +16,8 @@ 
       'factor'      => 1.5,
     ),
     P_UNIT_PRODUCTION   => array(
-      RES_METAL  => function ($level, $production_factor, $user, $planet_row) { return 40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
-      RES_ENERGY => function ($level, $production_factor, $user, $planet_row) { return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_METAL  => function($level, $production_factor, $user, $planet_row) { return 40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY => function($level, $production_factor, $user, $planet_row) { return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -34,8 +34,8 @@ 
       'factor'      => 1.6,
     ),
     P_UNIT_PRODUCTION   => array(
-      RES_CRYSTAL => function ($level, $production_factor, $user, $planet_row) { return 32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
-      RES_ENERGY  => function ($level, $production_factor, $user, $planet_row) { return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_CRYSTAL => function($level, $production_factor, $user, $planet_row) { return 32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY  => function($level, $production_factor, $user, $planet_row) { return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -52,8 +52,8 @@ 
       'factor'      => 1.5,
     ),
     P_UNIT_PRODUCTION   => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) { return 10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) { return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) { return 10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) { return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -70,7 +70,7 @@ 
       'factor'      => 1.5,
     ),
     P_UNIT_PRODUCTION   => array(
-      RES_ENERGY => function ($level, $production_factor, $user, $planet_row) { return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY => function($level, $production_factor, $user, $planet_row) { return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -88,8 +88,8 @@ 
       'factor'      => 1.8,
     ),
     P_UNIT_PRODUCTION   => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) { return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) { return 30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, "", TECH_ENERGY), $level) * (0.1 * $production_factor); },
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) { return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) { return 30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, "", TECH_ENERGY), $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -106,7 +106,7 @@ 
       'factor'      => 2,
     ),
     'storage'  => array(
-      RES_METAL => function ($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
+      RES_METAL => function($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -122,7 +122,7 @@ 
       'factor'      => 2,
     ),
     'storage'  => array(
-      RES_CRYSTAL => function ($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
+      RES_CRYSTAL => function($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -138,7 +138,7 @@ 
       'factor'      => 2,
     ),
     'storage'  => array(
-      RES_DEUTERIUM => function ($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
+      RES_DEUTERIUM => function($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 

includes/db/db_queries_users.php

Spacing +3 added lines, -3 removed lines

@@ -180,7 +180,7 @@ 
     "SELECT `id` AS `ID`, `username` AS `NAME`, `ally_name` AS `ALLY`, `total_points` AS `STAT_POINTS`,
       `onlinetime` AS `ACTIVITY`
     FROM `{{users}}`
-    WHERE `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) ." ORDER BY user_as_ally, `". $TypeSort ."` ASC;");
+    WHERE `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) . " ORDER BY user_as_ally, `" . $TypeSort . "` ASC;");
 }
 
 
@@ -195,7 +195,7 @@ 
   return doquery("SELECT u.*, COUNT(r.id) AS referral_count, SUM(r.dark_matter) AS referral_dm FROM {{users}} as u
     LEFT JOIN {{referrals}} as r on r.id_partner = u.id
     WHERE" .
-    ($online ? " `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) : ' user_as_ally IS NULL') .
+    ($online ? " `onlinetime` >= " . (SN_TIME_NOW - $config->game_users_online_timeout) : ' user_as_ally IS NULL') .
     " GROUP BY u.id
     ORDER BY user_as_ally, {$sort} ASC");
 }
@@ -211,7 +211,7 @@ 
   !is_array($user_id_list) ? $user_id_list = array($user_id_list) : false;
 
   $user_list = array();
-  foreach($user_id_list as $user_id_unsafe) {
+  foreach ($user_id_list as $user_id_unsafe) {
     $user = db_user_by_id($user_id_unsafe);
     !empty($user) ? $user_list[$user_id_unsafe] = $user : false;
   }

classes/Alliance/AllianceMember.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
    * @return bool
    */
   public function changeTitle(AllianceTitle $title) {
-    if(!$title instanceof AllianceTitle) {
+    if (!$title instanceof AllianceTitle) {
       return false;
     }
 

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);