Passed
Push — trunk ( 338765...433e05 )
by SuperNova.WS
04:23
created
classes/Pages/Deprecated/PageAdminModules.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@
 block discarded – undo
13 13
   const SORT_BY_ACTIVITY = 1;
14 14
 
15 15
   private static $sorting = [
16
-    self::SORT_BY_PACKAGE  => ['PACKAGE', 'NAME', '!ACTIVE', '!INSTALLED',],
17
-    self::SORT_BY_ACTIVITY => ['!ACTIVE', '!INSTALLED', 'PACKAGE', 'NAME',],
16
+    self::SORT_BY_PACKAGE  => ['PACKAGE', 'NAME', '!ACTIVE', '!INSTALLED', ],
17
+    self::SORT_BY_ACTIVITY => ['!ACTIVE', '!INSTALLED', 'PACKAGE', 'NAME', ],
18 18
   ];
19 19
 
20 20
   private static $sortFields = [];
Please login to merge, or discard this patch.
classes/Fleet/FleetStatic.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
    * @return DbMysqliResultIterator|EmptyCountableIterator
19 19
    */
20 20
   public static function dbFleetsOnHoldOnPlanetsByIds($planetIds, $time = SN_TIME_NOW) {
21
-    if(empty($planetIds) || !is_array($planetIds)) {
21
+    if (empty($planetIds) || !is_array($planetIds)) {
22 22
       return new EmptyCountableIterator();
23 23
     }
24 24
 
Please login to merge, or discard this patch.
admin/admin_locale.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 block discarded – undo
7 7
  *
8 8
  */
9 9
 
10
-define('INSIDE'  , true);
11
-define('INSTALL' , false);
12
-define('IN_ADMIN'  , true);
10
+define('INSIDE', true);
11
+define('INSTALL', false);
12
+define('IN_ADMIN', true);
13 13
 
14 14
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
15 15
 
@@ -20,12 +20,12 @@  discard block
 block discarded – undo
20 20
 function adm_lng_assign_string($lang_id, $locale_string_name, $value) {
21 21
   global $locale_string_template, $languages_info, $languages, $domain;
22 22
 
23
-  if(is_array($value)) {
24
-    foreach($value as $sub_key => $sub_value) {
23
+  if (is_array($value)) {
24
+    foreach ($value as $sub_key => $sub_value) {
25 25
       adm_lng_assign_string($lang_id, "{$locale_string_name}[{$sub_key}]", $sub_value);
26 26
     }
27
-  } elseif($value) {
28
-    if(!isset($locale_string_template[$locale_string_name])) {
27
+  } elseif ($value) {
28
+    if (!isset($locale_string_template[$locale_string_name])) {
29 29
       $locale_string_template[$locale_string_name] = array();
30 30
     }
31 31
     $locale_string_template[$locale_string_name] = array_merge($locale_string_template[$locale_string_name], array("[{$lang_id}]" => htmlentities($value, ENT_COMPAT, 'utf-8')));
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
   global $domain, $lang_id;
47 47
 
48 48
   $return = "{$ident}'{$string_name}' => ";
49
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
49
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
50 50
     $return .= "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',";
51 51
   } else {
52 52
     $return .= "array(\r\n";
53
-    foreach($string_value as $arr_name => $arr_data) {
53
+    foreach ($string_value as $arr_name => $arr_data) {
54 54
       $return .= adm_lng_parse_string($arr_name, $arr_data, $ident . '  ');
55 55
     }
56 56
     $return .= "{$ident}),\r\n";
@@ -103,12 +103,12 @@  discard block
 block discarded – undo
103 103
 
104 104
   $string_name_new = false;
105 105
 
106
-  if(isset($honor_constants[$domain][$string_name_prefix])) {
106
+  if (isset($honor_constants[$domain][$string_name_prefix])) {
107 107
     $found_constants = array_keys($constants, $string_name);
108
-    foreach($found_constants as $constant_name) {
108
+    foreach ($found_constants as $constant_name) {
109 109
       $honor_prefix_list = is_array($honor_constants[$domain][$string_name_prefix]) ? $honor_constants[$domain][$string_name_prefix] : array($honor_constants[$domain][$string_name_prefix]);
110
-      foreach($honor_prefix_list as $honor_prefix) {
111
-        if(strpos($constant_name, $honor_prefix) === 0) {
110
+      foreach ($honor_prefix_list as $honor_prefix) {
111
+        if (strpos($constant_name, $honor_prefix) === 0) {
112 112
           $string_name_new = $constant_name;
113 113
           break;
114 114
         }
@@ -118,13 +118,13 @@  discard block
 block discarded – undo
118 118
 
119 119
   $string_name_new = $string_name_new ? $string_name_new : "'{$string_name}'";
120 120
   fwrite($file_handler, "{$ident}{$string_name_new} => ");
121
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
121
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
122 122
     fwrite($file_handler, "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',");
123 123
 //    fwrite($file_handler, "'" . addslashes($string_value[$lang_id]) . "',");
124 124
   } else {
125 125
     $string_name_prefix = $string_name_prefix . "[{$string_name}]";
126 126
     fwrite($file_handler, "array(\r\n");
127
-    foreach($string_value as $arr_name => $arr_data) {
127
+    foreach ($string_value as $arr_name => $arr_data) {
128 128
       adm_lng_write_string($arr_name, $arr_data, $ident . '  ', $string_name_prefix);
129 129
     }
130 130
     fwrite($file_handler, "{$ident}),\r\n");
@@ -144,13 +144,13 @@  discard block
 block discarded – undo
144 144
 $languages_info = lng_get_list();
145 145
 $domain = sys_get_param_str('domain');
146 146
 
147
-if($domain) {
147
+if ($domain) {
148 148
   $lang_new = sys_get_param('lang_new');
149
-  if(!empty($lang_new) && is_array($lang_new)) {
149
+  if (!empty($lang_new) && is_array($lang_new)) {
150 150
     $constants = get_defined_constants(true);
151 151
     $constants = $constants['user'];
152 152
     ksort($constants);
153
-    foreach($languages_info as $lang_id => $land_data) {
153
+    foreach ($languages_info as $lang_id => $land_data) {
154 154
       $file_handler = fopen(SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php.new", 'w');
155 155
       fwrite($file_handler, "<?php\r\n\r\n/*\r\n#############################################################################
156 156
 #  Filename: {$domain}.mo.php
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 #  Website: http://www.supernova.ws
159 159
 #  Description: Massive Multiplayer Online Browser Space Strategy Game\r\n#\r\n");
160 160
 
161
-      foreach($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
161
+      foreach ($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
162 162
         $lang_copyright = str_replace(array('&copy;', '&quot;', '&lt;', '&gt;'), array('©', '"', '<', '>'), $lang_copyright);
163 163
         fwrite($file_handler, "#  {$lang_copyright}\r\n");
164 164
       }
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 /**\r\n*\r\n* @package language\r\n* @system [{$land_data['LANG_NAME_ENGLISH']}]\r\n* @version " . SN_VERSION . "\r\n*\r\n*/\r\n
167 167
 /**\r\n* DO NOT CHANGE\r\n*/\r\n\r\nif (!defined('INSIDE')) die();\r\n
168 168
 \$a_lang_array = array(\r\n");
169
-      foreach($lang_new as $string_name => $string_value) {
169
+      foreach ($lang_new as $string_name => $string_value) {
170 170
         adm_lng_write_string($string_name, $string_value);
171 171
       }
172 172
       fwrite($file_handler, ");\r\n");
@@ -176,21 +176,21 @@  discard block
 block discarded – undo
176 176
     sys_redirect("admin_locale.php?domain={$domain}");
177 177
   }
178 178
 
179
-  foreach($languages_info as $lang_id => $lang_data) {
179
+  foreach ($languages_info as $lang_id => $lang_data) {
180 180
     $template->assign_block_vars('language', $lang_data);
181 181
     $full_filename = SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php";
182 182
     $languages[$lang_id] = adm_lng_load($full_filename . (file_exists($full_filename . '.new') ? '.new' : ''));
183
-    foreach($languages[$lang_id] as $locale_string_name => $cork) {
183
+    foreach ($languages[$lang_id] as $locale_string_name => $cork) {
184 184
       adm_lng_assign_string($lang_id, "[{$locale_string_name}]", $languages[$lang_id][$locale_string_name]);
185 185
     }
186 186
   }
187 187
 
188
-  foreach($locale_string_template as $locale_string_name => $locale_string_list) {
188
+  foreach ($locale_string_template as $locale_string_name => $locale_string_list) {
189 189
     $template->assign_block_vars('string', array(
190 190
       'NAME' => $locale_string_name,
191 191
     ));
192 192
 
193
-    foreach($languages_info as $lang_id => $cork2) {
193
+    foreach ($languages_info as $lang_id => $cork2) {
194 194
       $template->assign_block_vars('string.locale', array(
195 195
         'LANG' => $lang_id,
196 196
         'VALUE' => $locale_string_list["[{$lang_id}]"],
@@ -206,17 +206,17 @@  discard block
 block discarded – undo
206 206
   $dir = dir($path);
207 207
   while (false !== ($lang_id = $dir->read())) {
208 208
     $full_path = $path . $lang_id;
209
-    if($lang_id[0] != "." && is_dir($full_path)) {
209
+    if ($lang_id[0] != "." && is_dir($full_path)) {
210 210
       $lang_file_list = dir($full_path);
211 211
       while (false !== ($filename = $lang_file_list->read())) {
212 212
         $lang_domain = strtolower(substr($filename, 0, strpos($filename, '.')));
213
-        if(!$lang_domain) {
213
+        if (!$lang_domain) {
214 214
           continue;
215 215
         }
216 216
 
217 217
         $file_ext = strtolower(substr($filename, strpos($filename, '.')));
218
-        if($lang_domain != 'language') {
219
-          if($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
218
+        if ($lang_domain != 'language') {
219
+          if ($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
220 220
             $language_domains[$lang_domain] = $lang_domain;
221 221
             $languages[$lang_id][$lang_domain] = $lang_domain;
222 222
           }
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
   }
227 227
   $dir->close();
228 228
 
229
-  foreach($language_domains as $lang_domain) {
229
+  foreach ($language_domains as $lang_domain) {
230 230
     $template->assign_block_vars('domain', array(
231 231
       'NAME' => $lang_domain,
232 232
     ));
Please login to merge, or discard this patch.
classes/classConfig.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
165 165
 
166 166
     // Alliance bonus calculations
167
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
167
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
168 168
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
169
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
169
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
170 170
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
171 171
     'ali_bonus_members'            => 10, // Minimum alliance size to start using bonus
172 172
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
     'eco_scale_storage'            => 1,
210 210
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
211
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
211
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
212 212
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
213 213
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
214 214
 
@@ -219,11 +219,11 @@  discard block
 block discarded – undo
219 219
     'energy_basic_income'          => 0,
220 220
 
221 221
     // Bashing protection settings
222
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
223
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
224
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
225
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
226
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
222
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
223
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
224
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
225
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
226
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
227 227
 
228 228
     'Fleet_Cdr'   => 30,
229 229
     'fleet_speed' => 1,
@@ -231,8 +231,8 @@  discard block
 block discarded – undo
231 231
     'fleet_update_interval' => 4,
232 232
     'fleet_update_lock'     => '', // SQL time when lock was acquired
233 233
 
234
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
235
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
234
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
235
+    'game_counter'          => 0, // Does built-in page hit counter is on?
236 236
     // Defaults
237 237
     'game_default_language' => 'ru',
238 238
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -246,14 +246,14 @@  discard block
 block discarded – undo
246 246
     'game_maxSystem'      => 199,
247 247
     'game_maxPlanet'      => 15,
248 248
     // Game global settings
249
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
249
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
250 250
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
251 251
 
252 252
     'game_news_actual'        => PERIOD_DAY_3, // How long announcement would be marked as "New". In seconds. Default - 3 days
253
-    'game_news_overview'      => 3,    // How much last news to show in Overview page
254
-    'game_news_overview_show' => PERIOD_WEEK_2,    // How long news will be shown in Overview page in seconds. Default - 2 weeks
253
+    'game_news_overview'      => 3, // How much last news to show in Overview page
254
+    'game_news_overview_show' => PERIOD_WEEK_2, // How long news will be shown in Overview page in seconds. Default - 2 weeks
255 255
     // Noob protection
256
-    'game_noob_factor'        => 5,    // Multiplier to divide "stronger" and "weaker" users
256
+    'game_noob_factor'        => 5, // Multiplier to divide "stronger" and "weaker" users
257 257
     'game_noob_points'        => 5000, // Below this point user threated as noob. 0 to disable
258 258
 
259 259
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -307,12 +307,12 @@  discard block
 block discarded – undo
307 307
     'payment_currency_exchange_wmu' => 30,
308 308
     'payment_currency_exchange_wmz' => 1,
309 309
 
310
-    'payment_lot_price' => 1,     // Lot price in default currency
311
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
310
+    'payment_lot_price' => 1, // Lot price in default currency
311
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
312 312
 
313 313
     'planet_capital_cost'          => 25000, // Cost in DM to move Capital to current planet
314
-    'planet_capital_mining_rate'   => 2.0,   // Capital Mining rates
315
-    'planet_capital_building_rate' => 2.0,   // Capital Building rates
314
+    'planet_capital_mining_rate'   => 2.0, // Capital Mining rates
315
+    'planet_capital_building_rate' => 2.0, // Capital Building rates
316 316
     'planet_teleport_cost'         => 50000, // Cost of planet teleportation
317 317
     'planet_teleport_timeout'      => 86400, // Timeout for next teleportation
318 318
 
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
     'resource_multiplier'     => 1,
335 335
 
336 336
     //Roleplay system
337
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
337
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
338 338
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
339 339
 
340 340
     // Black Market - General
Please login to merge, or discard this patch.
includes/functions/sys_user.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 function sys_user_vacation($user) {
13 13
   global $config;
14 14
 
15
-  if(sys_get_param_str('vacation') == 'leave') {
15
+  if (sys_get_param_str('vacation') == 'leave') {
16 16
     if ($user['vacation'] < SN_TIME_NOW) {
17 17
       $user['vacation'] = 0;
18 18
       $user['vacation_next'] = SN_TIME_NOW + $config->player_vacation_timeout;
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
     }
21 21
   }
22 22
 
23
-  if($user['vacation']) {
23
+  if ($user['vacation']) {
24 24
     // sn_sys_logout(false, true);
25 25
     // core_auth::logout(false, true);
26 26
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
   \DBAL\DbQuery::build()->setTable('users')->setValues($field_set)->doInsert();
164 164
   $user_new = db_user_by_id(db_insert_id());
165 165
 
166
-  if(!($options['galaxy'] && $options['system'] && $options['planet'])) {
166
+  if (!($options['galaxy'] && $options['system'] && $options['planet'])) {
167 167
     $options['galaxy'] = SN::$config->LastSettedGalaxyPos;
168 168
     $options['system'] = SN::$config->LastSettedSystemPos;
169 169
     $segment_size = floor(SN::$config->game_maxPlanet / 3);
@@ -171,19 +171,19 @@  discard block
 block discarded – undo
171 171
     $segment++;
172 172
     $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size);
173 173
 
174
-    while(true) {
175
-      if($options['planet'] > SN::$config->game_maxPlanet) {
174
+    while (true) {
175
+      if ($options['planet'] > SN::$config->game_maxPlanet) {
176 176
         $options['planet'] = mt_rand(0, $segment_size - 1) + 1;
177 177
         $options['system']++;
178 178
       }
179
-      if($options['system'] > SN::$config->game_maxSystem) {
179
+      if ($options['system'] > SN::$config->game_maxSystem) {
180 180
         $options['system'] = 1;
181 181
         $options['galaxy']++;
182 182
       }
183 183
       $options['galaxy'] > SN::$config->game_maxGalaxy ? $options['galaxy'] = 1 : false;
184 184
 
185 185
       $galaxy_row = DBStaticPlanet::db_planet_by_gspt($options['galaxy'], $options['system'], $options['planet'], PT_PLANET, true, 'id');
186
-      if(!$galaxy_row['id']) {
186
+      if (!$galaxy_row['id']) {
187 187
         SN::$config->db_saveItem(array(
188 188
           'LastSettedGalaxyPos' => $options['galaxy'],
189 189
           'LastSettedSystemPos' => $options['system'],
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
   $username_safe = db_escape($username_unsafe);
207 207
   doquery("REPLACE INTO {{player_name_history}} SET `player_id` = {$user_new['id']}, `player_name` = '{$username_safe}'");
208 208
 
209
-  if(!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
209
+  if (!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
210 210
     doquery("INSERT INTO {{referrals}} SET `id` = {$user_new['id']}, `id_partner` = {$options['partner_id']}");
211 211
   }
212 212
 
Please login to merge, or discard this patch.
includes/vars.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1175,12 +1175,12 @@
 block discarded – undo
1175 1175
     ],
1176 1176
     // Defensive building list
1177 1177
     'defense'            => [UNIT_DEF_TURRET_MISSILE   => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
1178
-                             UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,
1179
-                             UNIT_DEF_TURRET_ION       => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA,
1178
+                              UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,
1179
+                              UNIT_DEF_TURRET_ION       => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA,
1180 1180
 
1181
-                             UNIT_DEF_SHIELD_SMALL => UNIT_DEF_SHIELD_SMALL, UNIT_DEF_SHIELD_BIG => UNIT_DEF_SHIELD_BIG, UNIT_DEF_SHIELD_PLANET => UNIT_DEF_SHIELD_PLANET,
1181
+                              UNIT_DEF_SHIELD_SMALL => UNIT_DEF_SHIELD_SMALL, UNIT_DEF_SHIELD_BIG => UNIT_DEF_SHIELD_BIG, UNIT_DEF_SHIELD_PLANET => UNIT_DEF_SHIELD_PLANET,
1182 1182
 
1183
-                             UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,
1183
+                              UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,
1184 1184
     ],
1185 1185
 
1186 1186
     // Missiles list
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -595,29 +595,29 @@  discard block
 block discarded – undo
595 595
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_FLEET,
596 596
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
597 597
         P_CHANCE                               => 200,
598
-        'percent'                              => [0 => 0.1, 1 => 0.02, 2 => 0.01,],
598
+        'percent'                              => [0 => 0.1, 1 => 0.02, 2 => 0.01, ],
599 599
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
600
-          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,],
601
-          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,],
602
-          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,],
600
+          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ],
601
+          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ],
602
+          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ],
603 603
         ],
604 604
       ],
605 605
       FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES => [
606 606
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES,
607 607
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
608 608
         P_CHANCE                               => 300,
609
-        'percent'                              => [0 => 0.1, 1 => 0.050, 2 => 0.025,],
609
+        'percent'                              => [0 => 0.1, 1 => 0.050, 2 => 0.025, ],
610 610
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
611
-          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,],
612
-          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,],
613
-          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,],
611
+          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ],
612
+          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ],
613
+          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ],
614 614
         ],
615 615
       ],
616 616
       FLT_EXPEDITION_OUTCOME_FOUND_DM        => [
617 617
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_DM,
618 618
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
619 619
         P_CHANCE                               => 100,
620
-        'percent'                              => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010,],
620
+        'percent'                              => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010, ],
621 621
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
622 622
           [P_CHANCE => 90, P_MULTIPLIER => 0.0010, /*P_MESSAGE_ID => 2,*/],
623 623
           [P_CHANCE => 9, P_MULTIPLIER => 0.0040, /*P_MESSAGE_ID => 1,*/],
@@ -652,14 +652,14 @@  discard block
 block discarded – undo
652 652
     ],
653 653
 
654 654
     'planet_generator' => [
655
-      0  => [ // HomeWorld
655
+      0  => [// HomeWorld
656 656
         't_max_min'     => 40, // Tmax 40
657 657
         't_max_max'     => 40,
658 658
         't_delta_min'   => 40, // Tmin 0
659 659
         't_delta_max'   => 40,
660 660
         'size_min'      => $config->initial_fields,
661 661
         'size_max'      => $config->initial_fields,
662
-        'core_types'    => [PLANET_DENSITY_STANDARD,],
662
+        'core_types'    => [PLANET_DENSITY_STANDARD, ],
663 663
         'planet_images' => ['normaltemp'],
664 664
       ],
665 665
       1  => [
@@ -889,7 +889,7 @@  discard block
 block discarded – undo
889 889
         ],
890 890
         'planet_images' => ['eis'],
891 891
       ],
892
-      16 => [ // Random planet - stranger; -35 avg
892
+      16 => [// Random planet - stranger; -35 avg
893 893
         't_max_min'     => -90,
894 894
         't_max_max'     => +40,
895 895
         't_delta_min'   => 2,
@@ -909,7 +909,7 @@  discard block
 block discarded – undo
909 909
           PLANET_DENSITY_METAL_PERIDOT,
910 910
           PLANET_DENSITY_METAL_RAW,
911 911
         ],
912
-        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis',],
912
+        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis', ],
913 913
       ],
914 914
     ],
915 915
 
@@ -932,7 +932,7 @@  discard block
 block discarded – undo
932 932
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_HYDROGEN,
933 933
         UNIT_PLANET_DENSITY_RARITY        => 30, // 1, // 40.00, // * 1/121 0,82645
934 934
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
935
-        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10,],
935
+        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10, ],
936 936
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
937 937
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
938 938
       ],
@@ -941,7 +941,7 @@  discard block
 block discarded – undo
941 941
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_METHANE,
942 942
         UNIT_PLANET_DENSITY_RARITY        => 130, // 6, // 6.67, // * 6,0	4,95868
943 943
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
944
-        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60,],
944
+        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60, ],
945 945
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
946 946
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
947 947
       ],
@@ -950,7 +950,7 @@  discard block
 block discarded – undo
950 950
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_WATER,
951 951
         UNIT_PLANET_DENSITY_RARITY        => 450, //20, // 2.00, // * 20,0	16,52893
952 952
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
953
-        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20,],
953
+        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20, ],
954 954
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
955 955
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
956 956
       ],
@@ -960,7 +960,7 @@  discard block
 block discarded – undo
960 960
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_RAW,
961 961
         UNIT_PLANET_DENSITY_RARITY        => 20, // 1, // 40.00, // *1,0	0,82645
962 962
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
963
-        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50,],
963
+        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50, ],
964 964
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
965 965
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
966 966
       ],
@@ -969,7 +969,7 @@  discard block
 block discarded – undo
969 969
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_SILICATE,
970 970
         UNIT_PLANET_DENSITY_RARITY        => 140, // 5.71, // * 7,0	5,78512
971 971
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
972
-        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85,],
972
+        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85, ],
973 973
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
974 974
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
975 975
       ],
@@ -978,7 +978,7 @@  discard block
 block discarded – undo
978 978
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_STONE,
979 979
         UNIT_PLANET_DENSITY_RARITY        => 500, // 1.90, // * 21,0	17,35537
980 980
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
981
-        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95,],
981
+        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95, ],
982 982
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
983 983
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
984 984
       ],
@@ -988,7 +988,7 @@  discard block
 block discarded – undo
988 988
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_STANDARD,
989 989
         UNIT_PLANET_DENSITY_RARITY        => 1000, // 1.0, // * 40,0	33,05785
990 990
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_NORMAL,
991
-        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00,],
991
+        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00, ],
992 992
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
993 993
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
994 994
       ],
@@ -998,7 +998,7 @@  discard block
 block discarded – undo
998 998
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_ORE,
999 999
         UNIT_PLANET_DENSITY_RARITY        => 550, // 2.11, // * 19,0	15,70248
1000 1000
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
1001
-        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80,],
1001
+        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80, ],
1002 1002
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
1003 1003
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
1004 1004
       ],
@@ -1007,7 +1007,7 @@  discard block
 block discarded – undo
1007 1007
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_PERIDOT,
1008 1008
         UNIT_PLANET_DENSITY_RARITY        => 120, // 8.00, // * 5,0	4,13223
1009 1009
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
1010
-        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55,],
1010
+        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55, ],
1011 1011
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
1012 1012
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
1013 1013
       ],
@@ -1016,7 +1016,7 @@  discard block
 block discarded – undo
1016 1016
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_RAW,
1017 1017
         UNIT_PLANET_DENSITY_RARITY        => 25, // 40.00, // * 1,0	0,82645
1018 1018
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
1019
-        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25,],
1019
+        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25, ],
1020 1020
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
1021 1021
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
1022 1022
       ],
@@ -1193,7 +1193,7 @@  discard block
 block discarded – undo
1193 1193
     ],
1194 1194
 
1195 1195
     // Missiles list
1196
-    'missile'            => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,],
1196
+    'missile'            => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, ],
1197 1197
 
1198 1198
     // Combat units list
1199 1199
     'combat'             => [
@@ -1242,7 +1242,7 @@  discard block
 block discarded – undo
1242 1242
     // Resource list
1243 1243
     'resources'          => [0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'],
1244 1244
     // Resources all
1245
-    '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,],
1245
+    '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, ],
1246 1246
     // Resources can be produced on planet
1247 1247
     'resources_planet'   => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY],
1248 1248
     // Resources can be looted from planet
@@ -1261,13 +1261,13 @@  discard block
 block discarded – undo
1261 1261
     ],
1262 1262
 
1263 1263
     // Resources that can be tradeable in market trader AND be a quest_rewards
1264
-    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER,],
1264
+    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER, ],
1265 1265
 
1266 1266
 //      // Ques list
1267 1267
 //      'ques' => array(QUE_STRUCTURES, QUE_HANGAR, QUE_RESEARCH),
1268 1268
 
1269
-    '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,],
1270
-    '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,],
1269
+    '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, ],
1270
+    '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, ],
1271 1271
 
1272 1272
     GROUP_GROUP_ID_TO_NAMES => [
1273 1273
       UNIT_STRUCTURES   => 'structures',
@@ -1281,7 +1281,7 @@  discard block
 block discarded – undo
1281 1281
       UNIT_PLANS        => 'plans',
1282 1282
     ],
1283 1283
 
1284
-    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet',],
1284
+    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet', ],
1285 1285
 
1286 1286
     GROUP_UNIT_COMBAT_SORT_ORDER => [
1287 1287
       SHIP_SPY,
Please login to merge, or discard this patch.
includes/pages/imperator.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 //    $same_user = false;
48 48
 //  }
49 49
 
50
-  if(!$user_data) {
50
+  if (!$user_data) {
51 51
     messageBox($lang['imp_imperator_none'], $lang['sys_error'], 'index.php', 10);
52 52
     die();
53 53
   }
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
   $stat_array = array();
59 59
   $query = doquery("SELECT * FROM {{statpoints}} WHERE `stat_type` = 1 AND `id_owner` = {$user_id} ORDER BY `stat_code` DESC;");
60 60
   $stat_count = SN::$db->db_affected_rows();
61
-  while($row = db_fetch($query)) {
62
-    foreach($stat_fields as $field_db_name => $field_template_name) {
61
+  while ($row = db_fetch($query)) {
62
+    foreach ($stat_fields as $field_db_name => $field_template_name) {
63 63
       // $stat_count - $row['stat_code'] - для реверсирования ID статы в JS
64 64
       $stat_array[$field_template_name]['DATA'][$stat_count - $row['stat_code']] = $row[$field_db_name];
65 65
     }
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
   $stat_array_date = $stat_array['STAT_DATE'];
69 69
   empty($stat_array_date['DATA']) ? $stat_array_date['DATA'] = array() : false;
70
-  foreach($stat_array_date['DATA'] as $key => $value) {
70
+  foreach ($stat_array_date['DATA'] as $key => $value) {
71 71
     $template->assign_block_vars('stat_date', array(
72 72
       'ID' => $key,
73 73
       'VALUE' => $value,
@@ -77,21 +77,21 @@  discard block
 block discarded – undo
77 77
 
78 78
   unset($stat_array['STAT_DATE']);
79 79
   $template_data = array();
80
-  foreach($stat_array as $stat_type => &$stat_type_data) {
80
+  foreach ($stat_array as $stat_type => &$stat_type_data) {
81 81
     $reverse_min_max = strpos($stat_type, '_RANK') !== false;
82 82
     $stat_type_data['MIN'] = $reverse_min_max ? max($stat_type_data['DATA']) : min($stat_type_data['DATA']);
83 83
     $stat_type_data['MAX'] = $reverse_min_max ? min($stat_type_data['DATA']) : max($stat_type_data['DATA']);
84 84
     $stat_type_data['AVG'] = avg($stat_type_data['DATA']);
85
-    foreach($stat_type_data['DATA'] as $key => $value) {
85
+    foreach ($stat_type_data['DATA'] as $key => $value) {
86 86
       $stat_type_data['PERCENT'][$key] = ($stat_type_data['MAX'] - $value ? ($value - $stat_type_data['MIN']) / ($stat_type_data['MAX'] - $stat_type_data['MIN']) : 1) * 100;
87 87
       $template_data[$stat_type][$key]['ID'] = $key;
88 88
       $template_data[$stat_type][$key]['VALUE'] = $value;
89
-      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN']  - $value : $value - $stat_type_data['MAX']);
89
+      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN'] - $value : $value - $stat_type_data['MAX']);
90 90
       $template_data[$stat_type][$key]['PERCENT'] = $stat_type_data['PERCENT'][$key];
91 91
     }
92 92
   }
93 93
 
94
-  foreach($template_data as $stat_type => $stat_type_data) {
94
+  foreach ($template_data as $stat_type => $stat_type_data) {
95 95
     $template->assign_block_vars('stat', array(
96 96
       'TYPE' => $stat_type,
97 97
       'TEXT' => $lang['imp_stat_types'][$stat_type],
@@ -99,13 +99,13 @@  discard block
 block discarded – undo
99 99
       'MAX' => $stat_array[$stat_type]['MAX'],
100 100
       'AVG' => $stat_array[$stat_type]['AVG'],
101 101
     ));
102
-    foreach($stat_type_data as $stat_entry) {
102
+    foreach ($stat_type_data as $stat_entry) {
103 103
       $template->assign_block_vars('stat.entry', $stat_entry);
104 104
     }
105 105
   }
106 106
 
107 107
 
108
-  if($same_user) {
108
+  if ($same_user) {
109 109
     rpg_level_up($user, RPG_STRUCTURE);
110 110
     rpg_level_up($user, RPG_RAID);
111 111
     rpg_level_up($user, RPG_TECH);
@@ -142,29 +142,29 @@  discard block
 block discarded – undo
142 142
     'builder_xp'           => HelperString::numberFloorAndFormat($user_data['xpminier']),
143 143
     'builder_lvl'          => HelperString::numberFloorAndFormat($user_data['lvl_minier']),
144 144
     'builder_lvl_st'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier'])),
145
-    'builder_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier']+1)),
145
+    'builder_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier'] + 1)),
146 146
     'raid_xp'              => HelperString::numberFloorAndFormat($user_data['xpraid']),
147 147
     'raid_lvl'             => HelperString::numberFloorAndFormat($user_data['lvl_raid']),
148
-    'raid_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_raider_xp($user_data['lvl_raid']+1)),
148
+    'raid_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_raider_xp($user_data['lvl_raid'] + 1)),
149 149
     'raids'                => HelperString::numberFloorAndFormat($user_data['raids']),
150 150
     'raidswin'             => HelperString::numberFloorAndFormat($user_data['raidswin']),
151 151
     'raidsloose'           => HelperString::numberFloorAndFormat($user_data['raidsloose']),
152 152
     'tech_xp'              => HelperString::numberFloorAndFormat($user_data['player_rpg_tech_xp']),
153 153
     'tech_lvl'             => HelperString::numberFloorAndFormat($user_data['player_rpg_tech_level']),
154 154
     'tech_lvl_st'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level'])),
155
-    'tech_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level']+1)),
155
+    'tech_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level'] + 1)),
156 156
 
157 157
     'explore_xp'           => HelperString::numberFloorAndFormat($user_data['player_rpg_explore_xp']),
158 158
     'explore_lvl'          => HelperString::numberFloorAndFormat($user_data['player_rpg_explore_level']),
159 159
     'explore_lvl_st'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level'])),
160
-    'explore_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level']+1)),
161
-
162
-    'build_points'         => HelperString::numberFloorAndFormat( $StatRecord['build_points'] ),
163
-    'tech_points'          => HelperString::numberFloorAndFormat( $StatRecord['tech_points'] ),
164
-    'fleet_points'         => HelperString::numberFloorAndFormat( $StatRecord['fleet_points'] ),
165
-    'defs_points'          => HelperString::numberFloorAndFormat( $StatRecord['defs_points'] ),
166
-    'res_points'           => HelperString::numberFloorAndFormat( $StatRecord['res_points'] ),
167
-    'total_points'         => HelperString::numberFloorAndFormat( $StatRecord['total_points'] ),
160
+    'explore_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level'] + 1)),
161
+
162
+    'build_points'         => HelperString::numberFloorAndFormat($StatRecord['build_points']),
163
+    'tech_points'          => HelperString::numberFloorAndFormat($StatRecord['tech_points']),
164
+    'fleet_points'         => HelperString::numberFloorAndFormat($StatRecord['fleet_points']),
165
+    'defs_points'          => HelperString::numberFloorAndFormat($StatRecord['defs_points']),
166
+    'res_points'           => HelperString::numberFloorAndFormat($StatRecord['res_points']),
167
+    'total_points'         => HelperString::numberFloorAndFormat($StatRecord['total_points']),
168 168
     'user_rank'            => $StatRecord['total_rank'],
169 169
     'RANK_DIFF'            => $StatRecord['total_old_rank'] - $StatRecord['total_rank'],
170 170
 
Please login to merge, or discard this patch.
includes/constants/constants.php 1 patch
Spacing   +235 added lines, -235 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(defined('__SN_CONSTANTS_DEFINED') && __SN_CONSTANTS_DEFINED === true) {
3
+if (defined('__SN_CONSTANTS_DEFINED') && __SN_CONSTANTS_DEFINED === true) {
4 4
   return;
5 5
 }
6 6
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 define('SN_ROOT_VIRTUAL', 'http' . (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_server_http_host . SN_ROOT_RELATIVE);
43 43
 
44 44
 $_server_server_name = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
45
-if(strpos(strtolower($_server_server_name), 'google.') !== false) {
45
+if (strpos(strtolower($_server_server_name), 'google.') !== false) {
46 46
   define('SN_GOOGLE', true);
47 47
 }
48 48
 define('SN_ROOT_VIRTUAL_PARENT', str_replace('//google.', '//', SN_ROOT_VIRTUAL));
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 
70 70
 // Game type constants starts with GAME_
71 71
 define('GAME_SUPERNOVA', 0);
72
-define('GAME_OGAME'    , 1);
73
-define('GAME_BLITZ'    , 2);
72
+define('GAME_OGAME', 1);
73
+define('GAME_BLITZ', 2);
74 74
 
75 75
 // Date & time range constants
76 76
 define('DATE_FOREVER', 2000000000);
@@ -83,16 +83,16 @@  discard block
 block discarded – undo
83 83
 define('PERIOD_YEAR', PERIOD_DAY * 365);
84 84
 define('PERIOD_FOREVER', PERIOD_YEAR * 100);
85 85
 
86
-define('PERIOD_MINUTE_2' , PERIOD_MINUTE * 2);
87
-define('PERIOD_MINUTE_3' , PERIOD_MINUTE * 3);
88
-define('PERIOD_MINUTE_5' , PERIOD_MINUTE * 5);
86
+define('PERIOD_MINUTE_2', PERIOD_MINUTE * 2);
87
+define('PERIOD_MINUTE_3', PERIOD_MINUTE * 3);
88
+define('PERIOD_MINUTE_5', PERIOD_MINUTE * 5);
89 89
 define('PERIOD_MINUTE_10', PERIOD_MINUTE * 10);
90 90
 define('PERIOD_MINUTE_15', PERIOD_MINUTE * 15);
91
-define('PERIOD_DAY_3'    , PERIOD_DAY * 3);
92
-define('PERIOD_WEEK_2'   , PERIOD_WEEK * 2);
93
-define('PERIOD_WEEK_4'   , PERIOD_WEEK * 4);
94
-define('PERIOD_MONTH_2'  , PERIOD_MONTH * 2);
95
-define('PERIOD_MONTH_3'  , PERIOD_MONTH * 3);
91
+define('PERIOD_DAY_3', PERIOD_DAY * 3);
92
+define('PERIOD_WEEK_2', PERIOD_WEEK * 2);
93
+define('PERIOD_WEEK_4', PERIOD_WEEK * 4);
94
+define('PERIOD_MONTH_2', PERIOD_MONTH * 2);
95
+define('PERIOD_MONTH_3', PERIOD_MONTH * 3);
96 96
 
97 97
 define('FONT_SIZE_PERCENT_MIN', 56.25);
98 98
 define('FONT_SIZE_PERCENT_DEFAULT', 68.75);
@@ -110,11 +110,11 @@  discard block
 block discarded – undo
110 110
 define('DEFAULT_PICTURE_EXTENSION_DOTTED', '.jpg');
111 111
 
112 112
 // Operation error status HARDCODE!
113
-define('ERR_NONE'               , 0); // No error
114
-define('ERR_WARNING'            , 1); // There is warning - something altering normal operation process
115
-define('ERR_ERROR'              , 2); // There is error - something permits operation from process
116
-define('ERR_HACK'               , 4); // Operation is qualified as hack attempt
117
-define('ERR_NOTICE'             , 8); // There is notice - nothing really critical but operator should know
113
+define('ERR_NONE', 0); // No error
114
+define('ERR_WARNING', 1); // There is warning - something altering normal operation process
115
+define('ERR_ERROR', 2); // There is error - something permits operation from process
116
+define('ERR_HACK', 4); // Operation is qualified as hack attempt
117
+define('ERR_NOTICE', 8); // There is notice - nothing really critical but operator should know
118 118
 // New GLOBAL operation results
119 119
 //define('RESULT_DEFAULT' , 0); // Default result - all went OK or result really doesn't matter
120 120
 //define('RESULT_WARNING' , 1);
@@ -161,38 +161,38 @@  discard block
 block discarded – undo
161 161
 
162 162
 // Mot qui sont interdit a la saisie !
163 163
 global $ListCensure;
164
-$ListCensure = array ( '/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
164
+$ListCensure = array('/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
165 165
 
166 166
 // Confirmation record types
167
-define('CONFIRM_REGISTRATION'  , 1);
167
+define('CONFIRM_REGISTRATION', 1);
168 168
 define('CONFIRM_PASSWORD_RESET', 2);
169
-define('CONFIRM_DELETE'        , 3);
169
+define('CONFIRM_DELETE', 3);
170 170
 
171 171
 define('AFFILIATE_MM_TO_REFERRAL_DM', 2);
172 172
 
173 173
 // Ally diplomacy statuses
174
-define('ALLY_DIPLOMACY_SELF'         , 'self');
175
-define('ALLY_DIPLOMACY_NEUTRAL'      , 'neutral');
176
-define('ALLY_DIPLOMACY_WAR'          , 'war');
177
-define('ALLY_DIPLOMACY_PEACE'        , 'peace');
174
+define('ALLY_DIPLOMACY_SELF', 'self');
175
+define('ALLY_DIPLOMACY_NEUTRAL', 'neutral');
176
+define('ALLY_DIPLOMACY_WAR', 'war');
177
+define('ALLY_DIPLOMACY_PEACE', 'peace');
178 178
 define('ALLY_DIPLOMACY_CONFEDERATION', 'confederation');
179
-define('ALLY_DIPLOMACY_FEDERATION'   , 'federation');
180
-define('ALLY_DIPLOMACY_UNION'        , 'union');
181
-define('ALLY_DIPLOMACY_MASTER'       , 'master');
182
-define('ALLY_DIPLOMACY_SLAVE'        , 'slave');
179
+define('ALLY_DIPLOMACY_FEDERATION', 'federation');
180
+define('ALLY_DIPLOMACY_UNION', 'union');
181
+define('ALLY_DIPLOMACY_MASTER', 'master');
182
+define('ALLY_DIPLOMACY_SLAVE', 'slave');
183 183
 
184 184
 define('ALLY_PROPOSE_SEND', 0);
185 185
 
186 186
 // Quest types
187
-define('QUEST_TYPE_BUILD'   , 1);
187
+define('QUEST_TYPE_BUILD', 1);
188 188
 define('QUEST_TYPE_RESEARCH', 2);
189
-define('QUEST_TYPE_COMBAT'  , 3);
189
+define('QUEST_TYPE_COMBAT', 3);
190 190
 
191
-define('QUEST_STATUS_EXCEPT_COMPLETE' , -2);
192
-define('QUEST_STATUS_ALL' , -1);
193
-define('QUEST_STATUS_NOT_STARTED' , 0);
194
-define('QUEST_STATUS_STARTED'     , 1);
195
-define('QUEST_STATUS_COMPLETE'    , 2);
191
+define('QUEST_STATUS_EXCEPT_COMPLETE', -2);
192
+define('QUEST_STATUS_ALL', -1);
193
+define('QUEST_STATUS_NOT_STARTED', 0);
194
+define('QUEST_STATUS_STARTED', 1);
195
+define('QUEST_STATUS_COMPLETE', 2);
196 196
 
197 197
 define('TYPE_EMPTY', '');
198 198
 define('TYPE_INTEGER', 'integer');
@@ -205,69 +205,69 @@  discard block
 block discarded – undo
205 205
 
206 206
 // *** Combat-related constants
207 207
 // *** Mission Type constants starts with MT_
208
-define('MT_NONE'     ,  0);
209
-define('MT_ATTACK'   ,  1);
210
-define('MT_AKS'      ,  2);
211
-define('MT_TRANSPORT',  3);
212
-define('MT_RELOCATE' ,  4);
213
-define('MT_HOLD'     ,  5);
214
-define('MT_SPY'      ,  6);
215
-define('MT_COLONIZE' ,  7);
216
-define('MT_RECYCLE'  ,  8);
217
-define('MT_DESTROY'  ,  9);
218
-define('MT_MISSILE'  , 10);
219
-define('MT_EXPLORE'  , 15);
208
+define('MT_NONE', 0);
209
+define('MT_ATTACK', 1);
210
+define('MT_AKS', 2);
211
+define('MT_TRANSPORT', 3);
212
+define('MT_RELOCATE', 4);
213
+define('MT_HOLD', 5);
214
+define('MT_SPY', 6);
215
+define('MT_COLONIZE', 7);
216
+define('MT_RECYCLE', 8);
217
+define('MT_DESTROY', 9);
218
+define('MT_MISSILE', 10);
219
+define('MT_EXPLORE', 15);
220 220
 
221 221
 // *** Planet Target constants starts with PT_
222 222
 define('PT_NONE', 0);
223 223
 define('PT_ALL', 0);
224 224
 define('PT_PLANET', 1);
225 225
 define('PT_DEBRIS', 2);
226
-define('PT_MOON'  , 3);
226
+define('PT_MOON', 3);
227 227
 
228 228
 // *** Unit locations - shows db table where unit belong
229 229
 // Also cache indexes
230 230
 define('LOC_AUTODETECT', -2);
231
-define('LOC_NONE',    -1); // Deprecated
231
+define('LOC_NONE', -1); // Deprecated
232 232
 define('LOC_UNIVERSE', 0);
233
-define('LOC_PLANET',   1);
234
-define('LOC_DEBRIS',   2); // Translates to `planets` table planet_type = 1, `debris_*` fields
235
-define('LOC_MOON',     3); // Translates to `planets` table planet_type = 3
236
-define('LOC_PLAYER',   4);
237
-define('LOC_USER',     LOC_PLAYER); // Deprecated alias for LOC_PLAYER
238
-define('LOC_FLEET',    5);
239
-define('LOC_ALLY',     6);
240
-define('LOC_SERVER',   7); // Located on server
233
+define('LOC_PLANET', 1);
234
+define('LOC_DEBRIS', 2); // Translates to `planets` table planet_type = 1, `debris_*` fields
235
+define('LOC_MOON', 3); // Translates to `planets` table planet_type = 3
236
+define('LOC_PLAYER', 4);
237
+define('LOC_USER', LOC_PLAYER); // Deprecated alias for LOC_PLAYER
238
+define('LOC_FLEET', 5);
239
+define('LOC_ALLY', 6);
240
+define('LOC_SERVER', 7); // Located on server
241 241
 
242 242
 // ТОЛЬКО ВНУТРЕНЕЕ!!!
243
-define('LOC_UNIT',    'LOC_UNIT');
244
-define('LOC_QUE',     'LOC_QUE');
245
-define('LOC_LOCATION','LOC_LOCATION');
246
-define('LOC_LOCKS','LOC_LOCKS');
243
+define('LOC_UNIT', 'LOC_UNIT');
244
+define('LOC_QUE', 'LOC_QUE');
245
+define('LOC_LOCATION', 'LOC_LOCATION');
246
+define('LOC_LOCKS', 'LOC_LOCKS');
247 247
 
248 248
 // *** Caching masks
249
-define('CACHE_NOTHING'    ,  0);
250
-define('CACHE_FLEET'      ,  1);
251
-define('CACHE_PLANET'     ,  2);
252
-define('CACHE_USER'       ,  4);
253
-define('CACHE_SOURCE'     ,  8);
249
+define('CACHE_NOTHING', 0);
250
+define('CACHE_FLEET', 1);
251
+define('CACHE_PLANET', 2);
252
+define('CACHE_USER', 4);
253
+define('CACHE_SOURCE', 8);
254 254
 define('CACHE_DESTINATION', 16);
255
-define('CACHE_EVENT'      , 32);
255
+define('CACHE_EVENT', 32);
256 256
 
257
-define('CACHE_USER_SRC'  , CACHE_USER | CACHE_SOURCE);
258
-define('CACHE_USER_DST'  , CACHE_USER | CACHE_DESTINATION);
257
+define('CACHE_USER_SRC', CACHE_USER | CACHE_SOURCE);
258
+define('CACHE_USER_DST', CACHE_USER | CACHE_DESTINATION);
259 259
 define('CACHE_PLANET_SRC', CACHE_PLANET | CACHE_SOURCE);
260 260
 define('CACHE_PLANET_DST', CACHE_PLANET | CACHE_DESTINATION);
261
-define('CACHE_COMBAT'    , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
261
+define('CACHE_COMBAT', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
262 262
 
263
-define('CACHE_ALL'       , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
263
+define('CACHE_ALL', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
264 264
 
265
-define('CACHE_NONE'      , CACHE_NOTHING); // Alias for me
265
+define('CACHE_NONE', CACHE_NOTHING); // Alias for me
266 266
 
267 267
 // *** Event types
268 268
 define('EVENT_FLEET_NONE', 0);
269 269
 define('EVENT_FLEET_ARRIVE', 1);
270
-define('EVENT_FLEET_STAY'  , 2);
270
+define('EVENT_FLEET_STAY', 2);
271 271
 define('EVENT_FLEET_RETURN', 3);
272 272
 
273 273
 
@@ -439,16 +439,16 @@  discard block
 block discarded – undo
439 439
 //define('F_DEVICE_ID',     'F_DEVICE_ID');
440 440
 //define('F_DEVICE_CYPHER', 'F_DEVICE_CYPHER');
441 441
 
442
-define('F_PROVIDER_ID',   'F_PROVIDER_ID');
442
+define('F_PROVIDER_ID', 'F_PROVIDER_ID');
443 443
 // define('F_PROVIDER_LIST', 'F_PROVIDER_LIST');
444 444
 
445 445
 define('F_IMPERSONATE_STATUS', 'F_IMPERSONATE_STATUS');
446 446
 define('F_IMPERSONATE_OPERATOR', 'F_IMPERSONATE_OPERATOR');
447 447
 
448
-define('F_LOGIN_STATUS',  'F_LOGIN_STATUS');
448
+define('F_LOGIN_STATUS', 'F_LOGIN_STATUS');
449 449
 define('F_LOGIN_MESSAGE', 'F_LOGIN_MESSAGE');
450 450
 
451
-define('F_PLAYER_REGISTER_STATUS',  'F_PLAYER_REGISTER_STATUS');
451
+define('F_PLAYER_REGISTER_STATUS', 'F_PLAYER_REGISTER_STATUS');
452 452
 define('F_PLAYER_REGISTER_MESSAGE', 'F_PLAYER_REGISTER_MESSAGE');
453 453
 
454 454
 define('F_USER_ID', 'F_USER_ID');
@@ -492,78 +492,78 @@  discard block
 block discarded – undo
492 492
 
493 493
 
494 494
 // Option groups
495
-define('OPT_ALL',      0);
496
-define('OPT_MESSAGE',  1);
495
+define('OPT_ALL', 0);
496
+define('OPT_MESSAGE', 1);
497 497
 define('OPT_UNIVERSE', 2);
498 498
 define('OPT_INTERFACE', 3);
499 499
 
500 500
 // Message classes
501
-define('MSG_TYPE_OUTBOX'   ,  -1);
502
-define('MSG_TYPE_SPY'      ,   0);
503
-define('MSG_TYPE_PLAYER'   ,   1);
504
-define('MSG_TYPE_ALLIANCE' ,   2);
505
-define('MSG_TYPE_COMBAT'   ,   3);
506
-define('MSG_TYPE_RECYCLE'  ,   4);
507
-define('MSG_TYPE_TRANSPORT',   5);
508
-define('MSG_TYPE_ADMIN'    ,   6);
509
-define('MSG_TYPE_EXPLORE'  ,  15);
510
-define('MSG_TYPE_QUE'      ,  99);
511
-define('MSG_TYPE_NEW'      , 100);
501
+define('MSG_TYPE_OUTBOX', -1);
502
+define('MSG_TYPE_SPY', 0);
503
+define('MSG_TYPE_PLAYER', 1);
504
+define('MSG_TYPE_ALLIANCE', 2);
505
+define('MSG_TYPE_COMBAT', 3);
506
+define('MSG_TYPE_RECYCLE', 4);
507
+define('MSG_TYPE_TRANSPORT', 5);
508
+define('MSG_TYPE_ADMIN', 6);
509
+define('MSG_TYPE_EXPLORE', 15);
510
+define('MSG_TYPE_QUE', 99);
511
+define('MSG_TYPE_NEW', 100);
512 512
 
513 513
 // Attack verification statuses
514
-define('ATTACK_ALLOWED'           ,  0);
515
-define('ATTACK_NO_TARGET'         ,  1);
516
-define('ATTACK_OWN'               ,  2);
517
-define('ATTACK_WRONG_MISSION'     ,  3);
518
-define('ATTACK_NO_ALLY_DEPOSIT'   ,  4);
519
-define('ATTACK_NO_DEBRIS'         ,  5);
520
-define('ATTACK_VACATION'          ,  6);
521
-define('ATTACK_SAME_IP'           ,  7);
522
-define('ATTACK_BUFFING'           ,  8);
523
-define('ATTACK_ADMIN'             ,  9);
524
-define('ATTACK_NOOB'              , 10);
525
-define('ATTACK_OWN_VACATION'      , 11);
526
-define('ATTACK_NO_SILO'           , 12);
527
-define('ATTACK_NO_MISSILE'        , 13);
528
-define('ATTACK_NO_FLEET'          , 14);
529
-define('ATTACK_NO_SLOTS'          , 15);
530
-define('ATTACK_NO_SHIPS'          , 16);
531
-define('ATTACK_NO_RECYCLERS'      , 17);
532
-define('ATTACK_NO_SPIES'          , 18);
533
-define('ATTACK_NO_COLONIZER'      , 19);
534
-define('ATTACK_MISSILE_TOO_FAR'   , 20);
535
-define('ATTACK_WRONG_STRUCTURE'   , 21);
536
-define('ATTACK_NO_FUEL'           , 22);
537
-define('ATTACK_NO_RESOURCES'      , 23);
538
-define('ATTACK_NO_ACS'            , 24);
539
-define('ATTACK_ACS_MISSTARGET'    , 25);
540
-define('ATTACK_WRONG_SPEED'       , 26);
541
-define('ATTACK_ACS_TOO_LATE'      , 27);
542
-define('ATTACK_BASHING'           , 28);
543
-define('ATTACK_BASHING_WAR_DELAY' , 29);
544
-define('ATTACK_ACS_WRONG_TARGET'  , 30);
545
-define('ATTACK_SAME'              , 31);
514
+define('ATTACK_ALLOWED', 0);
515
+define('ATTACK_NO_TARGET', 1);
516
+define('ATTACK_OWN', 2);
517
+define('ATTACK_WRONG_MISSION', 3);
518
+define('ATTACK_NO_ALLY_DEPOSIT', 4);
519
+define('ATTACK_NO_DEBRIS', 5);
520
+define('ATTACK_VACATION', 6);
521
+define('ATTACK_SAME_IP', 7);
522
+define('ATTACK_BUFFING', 8);
523
+define('ATTACK_ADMIN', 9);
524
+define('ATTACK_NOOB', 10);
525
+define('ATTACK_OWN_VACATION', 11);
526
+define('ATTACK_NO_SILO', 12);
527
+define('ATTACK_NO_MISSILE', 13);
528
+define('ATTACK_NO_FLEET', 14);
529
+define('ATTACK_NO_SLOTS', 15);
530
+define('ATTACK_NO_SHIPS', 16);
531
+define('ATTACK_NO_RECYCLERS', 17);
532
+define('ATTACK_NO_SPIES', 18);
533
+define('ATTACK_NO_COLONIZER', 19);
534
+define('ATTACK_MISSILE_TOO_FAR', 20);
535
+define('ATTACK_WRONG_STRUCTURE', 21);
536
+define('ATTACK_NO_FUEL', 22);
537
+define('ATTACK_NO_RESOURCES', 23);
538
+define('ATTACK_NO_ACS', 24);
539
+define('ATTACK_ACS_MISSTARGET', 25);
540
+define('ATTACK_WRONG_SPEED', 26);
541
+define('ATTACK_ACS_TOO_LATE', 27);
542
+define('ATTACK_BASHING', 28);
543
+define('ATTACK_BASHING_WAR_DELAY', 29);
544
+define('ATTACK_ACS_WRONG_TARGET', 30);
545
+define('ATTACK_SAME', 31);
546 546
 define('ATTACK_RESOURCE_FORBIDDEN', 32);
547
-define('ATTACK_TRANSPORT_EMPTY'   , 33);
548
-define('ATTACK_SPIES_LONLY'       , 34);
549
-define('ATTACK_TOO_FAR'           , 35);
550
-define('ATTACK_OVERLOADED'        , 36);
551
-define('ATTACK_MISSION_ABSENT'    , 37);
552
-define('ATTACK_WRONG_UNIT'        , 38);
553
-define('ATTACK_ZERO_SPEED'        , 39);
554
-define('ATTACK_SHIP_COUNT_WRONG'  , 40);
547
+define('ATTACK_TRANSPORT_EMPTY', 33);
548
+define('ATTACK_SPIES_LONLY', 34);
549
+define('ATTACK_TOO_FAR', 35);
550
+define('ATTACK_OVERLOADED', 36);
551
+define('ATTACK_MISSION_ABSENT', 37);
552
+define('ATTACK_WRONG_UNIT', 38);
553
+define('ATTACK_ZERO_SPEED', 39);
554
+define('ATTACK_SHIP_COUNT_WRONG', 40);
555 555
 define('ATTACK_RESOURCE_COUNT_WRONG', 41);
556 556
 define('ATTACK_MORATORIUM', 42);
557 557
 define('ATTACK_CHILD_PROTECTION', 43);
558 558
 
559 559
 
560 560
 // *** Races - Homeworlds
561
-define('RACE_NONE'    , 0);
562
-define('RACE_EARTH'   , 1);
563
-define('RACE_MOON'    , 2);
564
-define('RACE_MERCURY' , 3);
565
-define('RACE_VENUS'   , 4);
566
-define('RACE_MARS'    , 5);
561
+define('RACE_NONE', 0);
562
+define('RACE_EARTH', 1);
563
+define('RACE_MOON', 2);
564
+define('RACE_MERCURY', 3);
565
+define('RACE_VENUS', 4);
566
+define('RACE_MARS', 5);
567 567
 define('RACE_ASTEROID', 6);
568 568
 // define('MARKET_INFO'         , 7);
569 569
 
@@ -571,116 +571,116 @@  discard block
 block discarded – undo
571 571
 
572 572
 // *** Market variables
573 573
 // === Market blocks
574
-define('MARKET_ENTRY'        , 0);
575
-define('MARKET_RESOURCES'    , 1);
576
-define('MARKET_SCRAPPER'     , 2);
577
-define('MARKET_STOCKMAN'     , 3);
578
-define('MARKET_EXCHANGE'     , 4);
579
-define('MARKET_BANKER'       , 5);
580
-define('MARKET_PAWNSHOP'     , 6);
581
-define('MARKET_INFO'         , 7);
574
+define('MARKET_ENTRY', 0);
575
+define('MARKET_RESOURCES', 1);
576
+define('MARKET_SCRAPPER', 2);
577
+define('MARKET_STOCKMAN', 3);
578
+define('MARKET_EXCHANGE', 4);
579
+define('MARKET_BANKER', 5);
580
+define('MARKET_PAWNSHOP', 6);
581
+define('MARKET_INFO', 7);
582 582
 
583 583
 // === Market error statuses
584
-define('MARKET_NOTHING'              ,  0);
585
-define('MARKET_DEAL'                 ,  1);
586
-define('MARKET_DEAL_TRADE'           ,  2);
587
-define('MARKET_NO_DM'                ,  3);
588
-define('MARKET_NO_RESOURCES'         ,  4);
589
-define('MARKET_ZERO_DEAL'            ,  5);
590
-define('MARKET_NO_SHIPS'             ,  6);
591
-define('MARKET_NOT_A_SHIP'           ,  7);
592
-define('MARKET_NO_STOCK'             ,  8);
593
-define('MARKET_ZERO_RES_STOCK'       ,  9);
594
-define('MARKET_NEGATIVE_SHIPS'       , 10);
595
-
596
-define('MARKET_INFO_PLAYER'          , 12);
597
-define('MARKET_INFO_WRONG'           , 11);
584
+define('MARKET_NOTHING', 0);
585
+define('MARKET_DEAL', 1);
586
+define('MARKET_DEAL_TRADE', 2);
587
+define('MARKET_NO_DM', 3);
588
+define('MARKET_NO_RESOURCES', 4);
589
+define('MARKET_ZERO_DEAL', 5);
590
+define('MARKET_NO_SHIPS', 6);
591
+define('MARKET_NOT_A_SHIP', 7);
592
+define('MARKET_NO_STOCK', 8);
593
+define('MARKET_ZERO_RES_STOCK', 9);
594
+define('MARKET_NEGATIVE_SHIPS', 10);
595
+
596
+define('MARKET_INFO_PLAYER', 12);
597
+define('MARKET_INFO_WRONG', 11);
598 598
 define('MARKET_INFO_PLAYER_NOT_FOUND', 13);
599
-define('MARKET_INFO_PLAYER_WRONG'    , 14);
600
-define('MARKET_INFO_PLAYER_SAME'     , 15);
599
+define('MARKET_INFO_PLAYER_WRONG', 14);
600
+define('MARKET_INFO_PLAYER_SAME', 15);
601 601
 
602 602
 
603 603
 
604 604
 
605 605
 // *** Mercenary/talent bonus types
606
-define('BONUS_NONE'    ,            0);  // No bonus
607
-define('BONUS_PERCENT' ,            1);  // Percent on base value
608
-define('BONUS_ADD'     ,            2);  // Add
609
-define('BONUS_ABILITY' ,            3);  // Some ability
610
-define('BONUS_MULTIPLY',            4);  // Multiply by value
606
+define('BONUS_NONE', 0); // No bonus
607
+define('BONUS_PERCENT', 1); // Percent on base value
608
+define('BONUS_ADD', 2); // Add
609
+define('BONUS_ABILITY', 3); // Some ability
610
+define('BONUS_MULTIPLY', 4); // Multiply by value
611 611
 //define('BONUS_PERCENT_CUMULATIVE' , 5);  // Cumulative percent on base value
612 612
 //define('BONUS_PERCENT_DEGRADED' ,   6);  // Bonus amount degraded with increase as pow(bonus, level) (?)
613 613
 //define('BONUS_SPEED',               7);  // Speed bonus
614 614
 
615 615
 // *** Action constant (build should be replaced with ACTION)
616
-define('BUILD_CREATE' ,  1);
616
+define('BUILD_CREATE', 1);
617 617
 define('BUILD_DESTROY', -1);
618 618
 define('BUILD_AUTOCONVERT', 2);
619 619
 
620
-define('ACTION_SELL'       , -1);
621
-define('ACTION_NOTHING'    ,  0);
622
-define('ACTION_BUY'        ,  1);
623
-define('ACTION_USE'        ,  2);
624
-define('ACTION_DELETE'     ,  3);
620
+define('ACTION_SELL', -1);
621
+define('ACTION_NOTHING', 0);
622
+define('ACTION_BUY', 1);
623
+define('ACTION_USE', 2);
624
+define('ACTION_DELETE', 3);
625 625
 
626 626
 // *** Check unit availability codes
627
-define('BUILD_ALLOWED'         , 0); // HARDCODED! DO NOT CHANGE!
627
+define('BUILD_ALLOWED', 0); // HARDCODED! DO NOT CHANGE!
628 628
 define('BUILD_REQUIRE_NOT_MEET', 1);
629
-define('BUILD_AMOUNT_WRONG'    , 2);
630
-define('BUILD_QUE_WRONG'       , 3);
631
-define('BUILD_QUE_UNIT_WRONG'  , 4);
632
-define('BUILD_INDESTRUCTABLE'  , 5);
633
-define('BUILD_NO_RESOURCES'    , 6);
634
-define('BUILD_NO_UNITS'        , 7);
635
-define('BUILD_UNIT_BUSY'       , 8);
636
-define('BUILD_QUE_FULL'        , 9);
637
-define('BUILD_SILO_FULL'       ,10);
638
-define('BUILD_MAX_REACHED'     ,11);
639
-define('BUILD_SECTORS_NONE'    ,12);
629
+define('BUILD_AMOUNT_WRONG', 2);
630
+define('BUILD_QUE_WRONG', 3);
631
+define('BUILD_QUE_UNIT_WRONG', 4);
632
+define('BUILD_INDESTRUCTABLE', 5);
633
+define('BUILD_NO_RESOURCES', 6);
634
+define('BUILD_NO_UNITS', 7);
635
+define('BUILD_UNIT_BUSY', 8);
636
+define('BUILD_QUE_FULL', 9);
637
+define('BUILD_SILO_FULL', 10);
638
+define('BUILD_MAX_REACHED', 11);
639
+define('BUILD_SECTORS_NONE', 12);
640 640
 define('BUILD_AUTOCONVERT_AVAILABLE', 13);
641 641
 define('BUILD_HIGHSPOT_NOT_ACTIVE', 14);
642 642
 
643 643
 
644 644
 // *** Que types
645 645
 define('QUE_STRUCTURES', 1);
646
-define('QUE_HANGAR'    , 4);
647
-define('QUE_RESEARCH'  , 7);
648
-define('QUE_MERCENARY' , 600); // UNIT_MERCENARIES
646
+define('QUE_HANGAR', 4);
647
+define('QUE_RESEARCH', 7);
648
+define('QUE_MERCENARY', 600); // UNIT_MERCENARIES
649 649
 // *** Subque types
650
-define('SUBQUE_PLANET'  , 1);
651
-define('SUBQUE_MOON'    , 3);
652
-define('SUBQUE_FLEET'   , 4);
653
-define('SUBQUE_DEFENSE' , 6);
650
+define('SUBQUE_PLANET', 1);
651
+define('SUBQUE_MOON', 3);
652
+define('SUBQUE_FLEET', 4);
653
+define('SUBQUE_DEFENSE', 6);
654 654
 define('SUBQUE_RESEARCH', 7);
655 655
 
656 656
 // *** Que items
657
-define('QI_UNIT_ID'   , 0);
658
-define('QI_AMOUNT'    , 1);
659
-define('QI_TIME'      , 2);
660
-define('QI_MODE'      , 3);
661
-define('QI_QUE_ID'    , 4);
662
-define('QI_QUE_TYPE'  , 4);
663
-define('QI_PLANET_ID' , 5);
657
+define('QI_UNIT_ID', 0);
658
+define('QI_AMOUNT', 1);
659
+define('QI_TIME', 2);
660
+define('QI_MODE', 3);
661
+define('QI_QUE_ID', 4);
662
+define('QI_QUE_TYPE', 4);
663
+define('QI_PLANET_ID', 5);
664 664
 
665 665
 
666 666
 // *** Units
667 667
 
668 668
 // *** Sort options
669
-define('SORT_ASCENDING' , 0);
669
+define('SORT_ASCENDING', 0);
670 670
 define('SORT_DESCENDING', 1);
671 671
 
672
-define('SORT_ID'             , 0);
673
-define('SORT_LOCATION'       , 1);
674
-define('SORT_NAME'           , 2);
675
-define('SORT_SIZE'           , 3);
676
-define('SORT_EMAIL'          , 4);
677
-define('SORT_IP'             , 5);
672
+define('SORT_ID', 0);
673
+define('SORT_LOCATION', 1);
674
+define('SORT_NAME', 2);
675
+define('SORT_SIZE', 3);
676
+define('SORT_EMAIL', 4);
677
+define('SORT_IP', 5);
678 678
 define('SORT_TIME_REGISTERED', 6);
679 679
 define('SORT_TIME_LAST_VISIT', 7);
680
-define('SORT_TIME_BAN_UNTIL' , 8);
681
-define('SORT_REFERRAL_COUNT' , 9);
682
-define('SORT_REFERRAL_DM'    , 10);
683
-define('SORT_VACATION'       , 11);
680
+define('SORT_TIME_BAN_UNTIL', 8);
681
+define('SORT_REFERRAL_COUNT', 9);
682
+define('SORT_REFERRAL_DM', 10);
683
+define('SORT_VACATION', 11);
684 684
 
685 685
 
686 686
 define('HULL_SIZE_TINY', 1);
@@ -797,35 +797,35 @@  discard block
 block discarded – undo
797 797
 
798 798
 
799 799
 // define('NICK_ID',               -1);
800
-define('NICK_HTML',              0);
801
-
802
-define('NICK_FIRST',             1);
803
-define('NICK_RACE',           1000);
804
-define('NICK_GENDER',         2000);
805
-define('NICK_AWARD',          3000);
806
-define('NICK_VACATION',       3500);
807
-define('NICK_BIRTHDAY',       4000);
808
-define('NICK_RANK',           4500);
809
-define('NICK_RANK_NO_TEXT',   4750);
810
-define('NICK_PREMIUM',        5000);
811
-define('NICK_AUTH_LEVEL',     6000);
812
-
813
-define('NICK_HIGHLIGHT',      6300);
814
-define('NICK_CLASS',          6450);
815
-
816
-define('NICK_NICK_CLASS',     6600);
817
-define('NICK_NICK',           7000);
800
+define('NICK_HTML', 0);
801
+
802
+define('NICK_FIRST', 1);
803
+define('NICK_RACE', 1000);
804
+define('NICK_GENDER', 2000);
805
+define('NICK_AWARD', 3000);
806
+define('NICK_VACATION', 3500);
807
+define('NICK_BIRTHDAY', 4000);
808
+define('NICK_RANK', 4500);
809
+define('NICK_RANK_NO_TEXT', 4750);
810
+define('NICK_PREMIUM', 5000);
811
+define('NICK_AUTH_LEVEL', 6000);
812
+
813
+define('NICK_HIGHLIGHT', 6300);
814
+define('NICK_CLASS', 6450);
815
+
816
+define('NICK_NICK_CLASS', 6600);
817
+define('NICK_NICK', 7000);
818 818
 define('NICK_NICK_CLASS_END', 7300);
819 819
 
820
-define('NICK_ALLY_CLASS',     7600);
821
-define('NICK_ALLY',           8000);
820
+define('NICK_ALLY_CLASS', 7600);
821
+define('NICK_ALLY', 8000);
822 822
 define('NICK_ALLY_CLASS_END', 8300);
823 823
 
824
-define('NICK_CLASS_END',      8450);
825
-define('NICK_HIGHLIGHT_END',  8600);
824
+define('NICK_CLASS_END', 8450);
825
+define('NICK_HIGHLIGHT_END', 8600);
826 826
 
827
-define('NICK_LAST',           9999);
828
-define('NICK_SORT',          10000);
827
+define('NICK_LAST', 9999);
828
+define('NICK_SORT', 10000);
829 829
 
830 830
 // Настройки игрока
831 831
 define('PLAYER_OPTION_MENU_SORT', 1);
@@ -930,8 +930,8 @@  discard block
 block discarded – undo
930 930
 define('LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10', 1);
931 931
 
932 932
 define('BLITZ_REGISTER_DISABLED', 0);
933
-define('BLITZ_REGISTER_OPEN'    , 1);
934
-define('BLITZ_REGISTER_CLOSED'  , 2);
933
+define('BLITZ_REGISTER_OPEN', 1);
934
+define('BLITZ_REGISTER_CLOSED', 2);
935 935
 define('BLITZ_REGISTER_SHOW_LOGIN', 3);
936 936
 define('BLITZ_REGISTER_DISCLOSURE_NAMES', 4);
937 937
 
@@ -1064,8 +1064,8 @@  discard block
 block discarded – undo
1064 1064
 const MODULE_LOAD_ORDER_AUTH_VKONTAKTE        = 3;
1065 1065
 const MODULE_LOAD_ORDER_PAYMENT_SECONDARY     = 90000;
1066 1066
 const MODULE_LOAD_ORDER_UNIT_RES_METAMATTER   = 99999;
1067
-const MODULE_LOAD_ORDER_DEFAULT               = 100000;     // HARDCODE
1068
-const MODULE_LOAD_ORDER_CORE_SHIP_CONSTRUCTOR = 999999;     // RESERVED
1067
+const MODULE_LOAD_ORDER_DEFAULT               = 100000; // HARDCODE
1068
+const MODULE_LOAD_ORDER_CORE_SHIP_CONSTRUCTOR = 999999; // RESERVED
1069 1069
 const MODULE_LOAD_ORDER_MENU_CUSTOMIZE        = 200000000;
1070 1070
 const MODULE_LOAD_ORDER_LATEST                = 2000000000; // HARDCODE
1071 1071
 const MODULE_LOAD_ORDER_GAME_SKIRMISH         = 2000100000;
Please login to merge, or discard this patch.
includes/constants/constants_units.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -154,10 +154,10 @@  discard block
 block discarded – undo
154 154
 
155 155
 // === Artifacts
156 156
 define('UNIT_ARTIFACTS', 1000);
157
-define('ART_LHC', 1001);      // Additional moon chance
158
-define('ART_RCD_SMALL', 1002);   // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
159
-define('ART_RCD_MEDIUM', 1003);  // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
160
-define('ART_RCD_LARGE', 1004);   // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
157
+define('ART_LHC', 1001); // Additional moon chance
158
+define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
159
+define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
160
+define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
161 161
 define('ART_HEURISTIC_CHIP', 1005); // Speed up research
162 162
 define('ART_NANO_BUILDER', 1006); // Speed up building
163 163
 define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions
@@ -231,25 +231,25 @@  discard block
 block discarded – undo
231 231
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место
232 232
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место
233 233
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место
234
-define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
235
-define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
236
-define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206);  // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
234
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
235
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
236
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206); // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
237 237
 define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_AMOUNT', 2207); // Медаль Лучшему Кавалеру за максимум потраченной ММ Женщине от Мужчины во время ивента 8 марта 2017 года
238 238
 define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_COUNT', 2208); // Медаль Лучшему Кавалеру за максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
239 239
 define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_AMOUNT', 2209); // Медаль Королевы Весны за максимум полученной ММ от Мужчины во время ивента 8 марта 2017 года
240 240
 define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_COUNT', 2210); // Медаль Королевы Весны за максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
241 241
 
242 242
 define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд
243
-define('UNIT_AWARD_MEMORY_IMMORTAL', 2301);  // Бессмертный
244
-define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
243
+define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный
244
+define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
245 245
 define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда
246 246
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН
247 247
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН
248 248
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН
249 249
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН
250 250
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН
251
-define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
252
-define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
251
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
252
+define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
253 253
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SIMPLE', 2311); // День Рождения СН - 2017
254 254
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_BRONZE', 2312); // День Рождения СН - 2017
255 255
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SILVER', 2313); // День Рождения СН - 2017
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_SIMPLE', 2326); // СуперНовый Год - 2018
272 272
 define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_BRONZE', 2327); // СуперНовый Год - 2018
273 273
 define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_SILVER', 2328); // СуперНовый Год - 2018
274
-define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_GOLD',   2329); // СуперНовый Год - 2018
274
+define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_GOLD', 2329); // СуперНовый Год - 2018
275 275
 define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_PLATINUM', 2330); // СуперНовый Год - 2018
276 276
 define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_DIAMOND', 2331); // СуперНовый Год - 2018
277 277
 
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 const GROUP_UNIT_OBJECTS_IN_SPACE = 790002;
325 325
 
326 326
 
327
-define('GROUP_PART',         800000); // Зарезервировано для запчастей: 800.001 - 899.999
327
+define('GROUP_PART', 800000); // Зарезервировано для запчастей: 800.001 - 899.999
328 328
 // define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
329 329
 // define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
330 330
 // define('GROUP_PART_SHIELD',  803000); // Щиты - 1000 штук
@@ -332,10 +332,10 @@  discard block
 block discarded – undo
332 332
 
333 333
 
334 334
 define('UNIT_GROUP', 'groups'); // 900.000 // Зарезервировано для груп юнитов: 900.001 - 999.999
335
-define('GROUP_UNIT_USER', 1000000);// Зарезервировано для пользовательских юнитов: 1.000.001 - 1.999.999
336
-define('GROUP_ID_RESERVED', 2000000);// Зарезервировано для прочих нужд: 2.000.000 - 1.999.999.999
337
-define('GROUP_PARAMS', 1000000000);// Зарезервировано для параметров: 1.000.000.001 - 1.999.999.999
338
-define('GROUP_DEVELOPERS', 2000000000);// Пространство для разработчиков: 2.000.000.001 - 2.147.483.647
335
+define('GROUP_UNIT_USER', 1000000); // Зарезервировано для пользовательских юнитов: 1.000.001 - 1.999.999
336
+define('GROUP_ID_RESERVED', 2000000); // Зарезервировано для прочих нужд: 2.000.000 - 1.999.999.999
337
+define('GROUP_PARAMS', 1000000000); // Зарезервировано для параметров: 1.000.000.001 - 1.999.999.999
338
+define('GROUP_DEVELOPERS', 2000000000); // Пространство для разработчиков: 2.000.000.001 - 2.147.483.647
339 339
 
340 340
 define('UNIT_PLAYER_COLONIES_CURRENT', 'COLONIES_CURRENT');
341 341
 define('UNIT_PLAYER_COLONIES_MAX', 'COLONIES_MAX');
Please login to merge, or discard this patch.