supernova-ws / SuperNova

metamatter.php

Spacing +2 added lines, -2 removed lines

@@ -160,7 +160,7 @@ 
     }
 
     if (is_array($pay_link) && in_array($pay_link['PAY_LINK_METHOD'], array('POST', 'GET', 'LINK', 'STEP', 'REDIRECT'))) {
-      if($pay_link['PAY_LINK_METHOD'] == 'REDIRECT') {
+      if ($pay_link['PAY_LINK_METHOD'] == 'REDIRECT') {
         sys_redirect($pay_link['PAY_LINK_URL']);
       }
 
@@ -234,7 +234,7 @@ 
   'PLAYER_CURRENCY'              => $player_currency,
   'PLAYER_CURRENCY_PRICE_PER_MM' => sn_module_payment::currency_convert(1, $player_currency, 'MM_', 10),
 
-  'UNIT_AMOUNT'                 => (float)$request['metamatter'],
+  'UNIT_AMOUNT'                 => (float) $request['metamatter'],
   'UNIT_AMOUNT_TEXT'            => HelperString::numberFloorAndFormat($request['metamatter']),
   'UNIT_AMOUNT_BONUS_PERCENT'   => $bonus_percent,
   'UNIT_AMOUNT_TEXT_DISCOUNTED' => $income_metamatter_text,

classes/Payment/PaymentsMethodsActive.php

Spacing +2 added lines, -2 removed lines

@@ -160,10 +160,10 @@
         $paymentMethodId = 0;
       }
 
-      if(!$paymentMethodId) {
+      if (!$paymentMethodId) {
         $module = $this->modulesInstalled[$moduleName];
         $methodsOnModule = $module->getMethodList();
-        if(count($methodsOnModule) == 1) {
+        if (count($methodsOnModule) == 1) {
           $paymentMethodId = HelperArray::array_key_first($methodsOnModule);
         }
       }

classes/Fleet/FleetDispatcher.php

Spacing +5 added lines, -9 removed lines

@@ -170,7 +170,7 @@ 
 //      $this->log_file('Dispatch stopped: lock ' . $runLock->isLocked() .'s' );
       return self::TASK_ALREADY_LOCKED;
     }
-    register_shutdown_function(function () use ($runLock) {
+    register_shutdown_function(function() use ($runLock) {
 //      $this->log_file('Shutting down');
       $timeLock = $runLock->isLocked();
       if ($timeLock > 0 || $timeLock === 0) {
@@ -552,15 +552,11 @@ 
   protected function flt_flyingFleetsSort($a, $b) {
     return
       // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-      $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-        // Если время - одинаковое, сравниваем события флотов
+      $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
         // Если события - одинаковые, то флоты равны
-        ($a['fleet_event'] == $b['fleet_event'] ? 0 :
-          // Если события разные - первыми считаем прибывающие флоты
-          ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
-            // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-            ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
-              // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+        ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
+          ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+            ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
               // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
               (
               0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий

classes/Fleet/TaskDispatchFleets.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     $url = HttpUrl::spawn($this->gc)
       ->parseUrl(SN_ROOT_VIRTUAL)
       ->addPath('index.php')
-      ->addParams(['page' => 'worker', 'mode' => 'dispatchFleets',]);
+      ->addParams(['page' => 'worker', 'mode' => 'dispatchFleets', ]);
 
     sn_get_url_contents($url->urlSigned());
 

classes/AjaxController.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 
     define('IN_AJAX', true);
 
-    if(!is_object($template)) {
+    if (!is_object($template)) {
       $template = SnTemplate::gettemplate('_ajax', true);
     }
 
@@ -51,11 +51,11 @@ 
        * @var IPage $page
        */
       $page = new $className();
-      if(method_exists($page, 'loadParams')) {
+      if (method_exists($page, 'loadParams')) {
         $page->loadParams();
       }
 
-      if(method_exists($page, $action = sys_get_param_str('action')) && $page->checkAction($action)) {
+      if (method_exists($page, $action = sys_get_param_str('action')) && $page->checkAction($action)) {
         $result = $page->$action();
         is_array($result) ? HelperArray::merge($template_result['AJAX'], $result) : false;
       }

classes/classConfig.php

Spacing +25 added lines, -25 removed lines

@@ -201,9 +201,9 @@ 
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
 
     // Alliance bonus calculations
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
     'ali_bonus_members'            => 10, // Minimum alliance size to start using bonus
 
@@ -245,7 +245,7 @@ 
 
     'eco_scale_storage'            => 1,
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
 
@@ -256,21 +256,21 @@ 
     'energy_basic_income'          => 0,
 
     // Bashing protection settings
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
 
     'Fleet_Cdr'   => 30,
     'fleet_speed' => 1,
 
-    self::FLEET_UPDATE_MAX_RUN_TIME => 30,     // Maximum length in seconds for single fleet dispatch run
+    self::FLEET_UPDATE_MAX_RUN_TIME => 30, // Maximum length in seconds for single fleet dispatch run
     'fleet_update_interval'         => 4,
     'fleet_update_lock'             => '', // SQL time when lock was acquired
 
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
+    'game_counter'          => 0, // Does built-in page hit counter is on?
     // Defaults
     'game_default_language' => 'ru',
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -284,14 +284,14 @@ 
     'game_maxSystem'      => 199,
     'game_maxPlanet'      => 15,
     // Game global settings
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
 
     'game_news_actual'        => PERIOD_DAY_3, // How long announcement would be marked as "New". In seconds. Default - 3 days
-    'game_news_overview'      => 3,    // How much last news to show in Overview page
-    'game_news_overview_show' => PERIOD_WEEK_2,    // How long news will be shown in Overview page in seconds. Default - 2 weeks
+    'game_news_overview'      => 3, // How much last news to show in Overview page
+    'game_news_overview_show' => PERIOD_WEEK_2, // How long news will be shown in Overview page in seconds. Default - 2 weeks
     // Noob protection
-    'game_noob_factor'        => 5,    // Multiplier to divide "stronger" and "weaker" users
+    'game_noob_factor'        => 5, // Multiplier to divide "stronger" and "weaker" users
     'game_noob_points'        => 5000, // Below this point user treated as noob. 0 to disable
 
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -346,12 +346,12 @@ 
     'payment_currency_exchange_wmz' => 1,
     'payment_currency_exchange_pln' => 3.86,
 
-    'payment_lot_price' => 1,     // Lot price in default currency
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
+    'payment_lot_price' => 1, // Lot price in default currency
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
 
     'planet_capital_cost'          => 25000, // Cost in DM to move Capital to current planet
-    'planet_capital_mining_rate'   => 2.0,   // Capital Mining rates
-    'planet_capital_building_rate' => 2.0,   // Capital Building rates
+    'planet_capital_mining_rate'   => 2.0, // Capital Mining rates
+    'planet_capital_building_rate' => 2.0, // Capital Building rates
     'planet_teleport_cost'         => 50000, // Cost of planet teleportation
     'planet_teleport_timeout'      => 86400, // Timeout for next teleportation
 
@@ -373,7 +373,7 @@ 
     'resource_multiplier'     => 1,
 
     //Roleplay system
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
 
     // Black Market - General
@@ -438,12 +438,12 @@ 
     'url_purchase_metamatter' => '',
     'url_rules'               => '',
 
-    'users_amount'              => 1,                // Total users count
+    'users_amount'              => 1, // Total users count
     'game_users_online_timeout' => PERIOD_MINUTE_15, // Seconds, How long user should considered ONLINE for online counter
-    'game_users_update_online'  => 30,               // How often user online should be refreshed (seconds)
-    'var_online_user_time'      => 0,                // When last time user online was refreshed
-    'var_online_user_count'     => 0,                // Last calculated online user count
-    'server_log_online'         => 0,                // Log online user count
+    'game_users_update_online'  => 30, // How often user online should be refreshed (seconds)
+    'var_online_user_time'      => 0, // When last time user online was refreshed
+    'var_online_user_count'     => 0, // Last calculated online user count
+    'server_log_online'         => 0, // Log online user count
 
     'user_birthday_celebrate' => 0, // When last time celebrations (i.e. giftgiving) was made
     'user_birthday_gift'      => 0, // User birthday gift

classes/Core/Scheduler/TaskConditional.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
     }
 
     // Checking task lock
-    if (is_object($this->lock) && !$this->lock->attemptLock(function () {
+    if (is_object($this->lock) && !$this->lock->attemptLock(function() {
         return $this->proceedLockExpiration();
       }, SN_TIME_NOW)) {
 
@@ -152,7 +152,7 @@ 
    */
   protected function updateTaskLastRunTime($time) {
     $this->db->transactionWrap(
-      function () use ($time) {
+      function() use ($time) {
         $this->config->dateWrite($this->configName, $time, classConfig::DATE_TYPE_SQL_STRING);
       }
     );

classes/Core/GlobalContainer.php

Spacing +27 added lines, -27 removed lines

@@ -110,123 +110,123 @@
 
     // Services --------------------------------------------------------------------------------------------------------
     // Default db
-    $gc->request = function (GlobalContainer $c) {
+    $gc->request = function(GlobalContainer $c) {
       $httpRequest = new HttpRequest($c);
       $httpRequest->fillCurrent();
 
       return $httpRequest;
     };
 
-    $gc->db = function (GlobalContainer $c) {
+    $gc->db = function(GlobalContainer $c) {
       SN::$db = new db_mysql($c);
 
       return SN::$db;
     };
 
-    $gc->debug = function (/** @noinspection PhpUnusedParameterInspection */
+    $gc->debug = function(/** @noinspection PhpUnusedParameterInspection */
       GlobalContainer $c) {
       return new debug();
     };
 
-    $gc->cache = function (GlobalContainer $gc) {
+    $gc->cache = function(GlobalContainer $gc) {
       return new classCache($gc->cachePrefix);
     };
 
-    $gc->config = function (GlobalContainer $gc) {
+    $gc->config = function(GlobalContainer $gc) {
       return new classConfig($gc->cachePrefix);
     };
 
-    $gc->crypto = function (GlobalContainer $gc) {
+    $gc->crypto = function(GlobalContainer $gc) {
       return new Crypto($gc);
     };
 
-    $gc->worker = function (GlobalContainer $gc) {
+    $gc->worker = function(GlobalContainer $gc) {
       return new Worker($gc);
     };
 
-    $gc->repository = function (GlobalContainer $gc) {
+    $gc->repository = function(GlobalContainer $gc) {
       /** @noinspection PhpDeprecationInspection */
       return new Repository($gc);
     };
 
-    $gc->storage = function (GlobalContainer $gc) {
+    $gc->storage = function(GlobalContainer $gc) {
       /** @noinspection PhpDeprecationInspection */
       return new Storage($gc);
     };
 
-    $gc->repoV2 = function (GlobalContainer $gc) {
+    $gc->repoV2 = function(GlobalContainer $gc) {
       return new RepoV2($gc);
     };
 
-    $gc->storageV2 = function (GlobalContainer $gc) {
+    $gc->storageV2 = function(GlobalContainer $gc) {
       return new StorageV2($gc);
     };
 
-    $gc->storageSqlV2 = function (GlobalContainer $gc) {
+    $gc->storageSqlV2 = function(GlobalContainer $gc) {
       return new StorageSqlV2($gc);
     };
 
-    $gc->design = function (GlobalContainer $gc) {
+    $gc->design = function(GlobalContainer $gc) {
       return new Design($gc);
     };
 
-    $gc->bbCodeParser = function (GlobalContainer $gc) {
+    $gc->bbCodeParser = function(GlobalContainer $gc) {
       return new BBCodeParser($gc);
     };
 
-    $gc->fleetDispatcher = function (GlobalContainer $gc) {
+    $gc->fleetDispatcher = function(GlobalContainer $gc) {
       return new FleetDispatcher($gc);
     };
 
-    $gc->watchdog = function (GlobalContainer $gc) {
+    $gc->watchdog = function(GlobalContainer $gc) {
       return new Watchdog($gc);
     };
 
-    $gc->valueStorage = function (/** @noinspection PhpUnusedParameterInspection */ GlobalContainer $gc) {
+    $gc->valueStorage = function(/** @noinspection PhpUnusedParameterInspection */ GlobalContainer $gc) {
       return new ValueStorage([]);
     };
 
-    $gc->bonusCatalog = function (GlobalContainer $gc) {
+    $gc->bonusCatalog = function(GlobalContainer $gc) {
       return new BonusCatalog($gc);
     };
 
-    $gc->general = function (GlobalContainer $gc) {
+    $gc->general = function(GlobalContainer $gc) {
       return new General($gc);
     };
 
-    $gc->economicHelper = function (GlobalContainer $gc) {
+    $gc->economicHelper = function(GlobalContainer $gc) {
       return new EconomicHelper($gc);
     };
 
-    $gc->playerLevelHelper = function (GlobalContainer $gc) {
+    $gc->playerLevelHelper = function(GlobalContainer $gc) {
       return new PlayerLevelHelper($gc);
     };
 
-    $gc->pimp = function (GlobalContainer $gc) {
+    $gc->pimp = function(GlobalContainer $gc) {
       return new SnPimp($gc);
     };
 
-    $gc->modules = function (GlobalContainer $gc) {
+    $gc->modules = function(GlobalContainer $gc) {
       return new ModulesManager($gc);
     };
 
     // Dummy objects ---------------------------------------------------------------------------------------------------
-    $gc->theUser = function (GlobalContainer $gc) {
+    $gc->theUser = function(GlobalContainer $gc) {
       return new TheUser($gc);
     };
 
 
     // Models ----------------------------------------------------------------------------------------------------------
     $gc->skinEntityClass = SkinV2::class;
-    $gc->skinModel       = function (GlobalContainer $gc) {
+    $gc->skinModel       = function(GlobalContainer $gc) {
       return new SkinModel($gc);
     };
 
-    $gc->textModel = function (GlobalContainer $gc) {
+    $gc->textModel = function(GlobalContainer $gc) {
       return new TextModel($gc);
     };
 
-    $gc->ignores = function (GlobalContainer $gc) {
+    $gc->ignores = function(GlobalContainer $gc) {
       return new PlayerIgnore($gc);
     };
 

includes/vars.php

Spacing +34 added lines, -34 removed lines

@@ -33,8 +33,8 @@ 
 
 //    'chat'     => ['sn_chat_model'],
 //    'chat_add' => ['sn_chat_add_model'],
-    'chat'     => [Chat::class  . '::' . 'chatModel'],
-    'chat_add' => [Chat::class  . '::' . 'chatAddModel'],
+    'chat'     => [Chat::class . '::' . 'chatModel'],
+    'chat_add' => [Chat::class . '::' . 'chatAddModel'],
 
     'imperium' => [PageImperium::class . '::' . 'modelStatic'],
 
@@ -48,9 +48,9 @@ 
 
 //    'chat'          => ['sn_chat_view'],
 //    'chat_msg'      => ['sn_chat_msg_view'],
-    'chat'          => [Chat::class  . '::' . 'chatView'],
-    'chat_msg'      => [Chat::class  . '::' . 'chatMsgView'],
-    'chat_frame'      => [Chat::class  . '::' . 'chatFrameView'],
+    'chat'          => [Chat::class . '::' . 'chatView'],
+    'chat_msg'      => [Chat::class . '::' . 'chatMsgView'],
+    'chat_frame'      => [Chat::class . '::' . 'chatFrameView'],
 
     'battle_report' => ['sn_battle_report_view'],
     'contact'       => ['sn_contact_view'],
@@ -646,29 +646,29 @@ 
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_FLEET,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 200,
-        'percent'                              => [0 => 0.1, 1 => 0.02, 2 => 0.01,],
+        'percent'                              => [0 => 0.1, 1 => 0.02, 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 => [
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 300,
-        'percent'                              => [0 => 0.1, 1 => 0.050, 2 => 0.025,],
+        'percent'                              => [0 => 0.1, 1 => 0.050, 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        => [
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_DM,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 100,
-        'percent'                              => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010,],
+        'percent'                              => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010, ],
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
           [P_CHANCE => 90, P_MULTIPLIER => 0.0010, /*P_MESSAGE_ID => 2,*/],
           [P_CHANCE => 9, P_MULTIPLIER => 0.0040, /*P_MESSAGE_ID => 1,*/],
@@ -703,14 +703,14 @@ 
     ],
 
     'planet_generator' => [
-      0  => [ // HomeWorld
+      0  => [// HomeWorld
         't_max_min'     => 40, // Tmax 40
         't_max_max'     => 40,
         't_delta_min'   => 40, // Tmin 0
         't_delta_max'   => 40,
         'size_min'      => $config->initial_fields,
         'size_max'      => $config->initial_fields,
-        'core_types'    => [PLANET_DENSITY_STANDARD,],
+        'core_types'    => [PLANET_DENSITY_STANDARD, ],
         'planet_images' => ['normaltemp'],
       ],
       1  => [
@@ -940,7 +940,7 @@ 
         ],
         'planet_images' => ['eis'],
       ],
-      16 => [ // Random planet - stranger; -35 avg
+      16 => [// Random planet - stranger; -35 avg
         't_max_min'     => -90,
         't_max_max'     => +40,
         't_delta_min'   => 2,
@@ -960,7 +960,7 @@ 
           PLANET_DENSITY_METAL_PERIDOT,
           PLANET_DENSITY_METAL_RAW,
         ],
-        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis',],
+        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis', ],
       ],
     ],
 
@@ -983,7 +983,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_HYDROGEN,
         UNIT_PLANET_DENSITY_RARITY        => 30, // 1, // 40.00, // * 1/121 0,82645
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -992,7 +992,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_METHANE,
         UNIT_PLANET_DENSITY_RARITY        => 130, // 6, // 6.67, // * 6,0	4,95868
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -1001,7 +1001,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_WATER,
         UNIT_PLANET_DENSITY_RARITY        => 450, //20, // 2.00, // * 20,0	16,52893
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1011,7 +1011,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_RAW,
         UNIT_PLANET_DENSITY_RARITY        => 20, // 1, // 40.00, // *1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -1020,7 +1020,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_SILICATE,
         UNIT_PLANET_DENSITY_RARITY        => 140, // 5.71, // * 7,0	5,78512
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -1029,7 +1029,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_STONE,
         UNIT_PLANET_DENSITY_RARITY        => 500, // 1.90, // * 21,0	17,35537
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1039,7 +1039,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_STANDARD,
         UNIT_PLANET_DENSITY_RARITY        => 1000, // 1.0, // * 40,0	33,05785
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_NORMAL,
-        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00,],
+        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1049,7 +1049,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_ORE,
         UNIT_PLANET_DENSITY_RARITY        => 550, // 2.11, // * 19,0	15,70248
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80,],
+        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1058,7 +1058,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_PERIDOT,
         UNIT_PLANET_DENSITY_RARITY        => 120, // 8.00, // * 5,0	4,13223
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55,],
+        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -1067,7 +1067,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_RAW,
         UNIT_PLANET_DENSITY_RARITY        => 25, // 40.00, // * 1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25,],
+        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -1244,7 +1244,7 @@ 
     ],
 
     // Missiles list
-    UNIT_DEF_MISSILES_STR => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,],
+    UNIT_DEF_MISSILES_STR => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, ],
 
     // Combat units list
     'combat'             => [
@@ -1293,7 +1293,7 @@ 
     // Resource list
     UNIT_RESOURCES_STR      => [0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'],
     // Resources all
-    'resources_all'         => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER,],
+    'resources_all'         => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER, ],
     // Resources can be produced on planet
     'resources_planet'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY],
     // Resources can be looted from planet
@@ -1312,13 +1312,13 @@ 
     ],
 
     // Resources that can be tradeable in market trader AND be a quest_rewards
-    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER,],
+    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER, ],
 
 //      // Ques list
 //      'ques' => array(QUE_STRUCTURES, QUE_HANGAR, QUE_RESEARCH),
 
-    'STAT_COMMON' => [STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE,],
-    'STAT_PLAYER' => [STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID,],
+    'STAT_COMMON' => [STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE, ],
+    'STAT_PLAYER' => [STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID, ],
 
     GROUP_GROUP_ID_TO_NAMES => [
       UNIT_STRUCTURES   => 'structures',
@@ -1332,7 +1332,7 @@ 
       UNIT_PLANS        => 'plans',
     ],
 
-    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet',],
+    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet', ],
 
     GROUP_UNIT_COMBAT_SORT_ORDER => [
       SHIP_SPY,