Completed
Push — trunk ( 8dcff2...338765 )
by SuperNova.WS
04:11
created
classes/Bonus/BonusAtom.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,7 @@
 block discarded – undo
58 58
    * @return int
59 59
    */
60 60
   public static function calcBonusPower($unitInfo) {
61
-    return isset($unitInfo[P_BONUS_VALUE]) ? $unitInfo[P_BONUS_VALUE] :
62
-      (static::calcBonusType($unitInfo) == BONUS_ABILITY ? 1 : 0);
61
+    return isset($unitInfo[P_BONUS_VALUE]) ? $unitInfo[P_BONUS_VALUE] : (static::calcBonusType($unitInfo) == BONUS_ABILITY ? 1 : 0);
63 62
   }
64 63
 
65 64
   /**
Please login to merge, or discard this patch.
includes/template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
     renderFooter();
289 289
   }
290 290
 
291
-  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
291
+  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
292 292
 
293 293
   sn_db_disconnect();
294 294
 
@@ -670,7 +670,7 @@  discard block
 block discarded – undo
670 670
     'QUE_ID'   => QUE_RESEARCH,
671 671
     'QUE_HTML' => 'topnav',
672 672
 
673
-    'RESEARCH_ONGOING' => (boolean)$user['que'],
673
+    'RESEARCH_ONGOING' => (boolean) $user['que'],
674 674
 
675 675
     'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
676 676
       $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
     'LANG'     => $language ? $language : '',
964 964
     'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
965 965
 
966
-    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
966
+    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
967 967
     'FILENAME'       => basename($_SERVER['PHP_SELF']),
968 968
   ));
969 969
 
Please login to merge, or discard this patch.
classes/Bonus/BonusListAtom.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,8 @@
 block discarded – undo
58 58
   protected function bonusSort(BonusAtom $a, BonusAtom $b) {
59 59
     static $bonusOrder = [BonusAtom::class, BonusAtomAbility::class, BonusAtomAdd::class, BonusAtomPercent::class, BonusAtomMultiply::class];
60 60
 
61
-    $indexA = (int)array_search(get_class($a), $bonusOrder);
62
-    $indexB = (int)array_search(get_class($b), $bonusOrder);
61
+    $indexA = (int) array_search(get_class($a), $bonusOrder);
62
+    $indexB = (int) array_search(get_class($b), $bonusOrder);
63 63
 
64 64
     return $indexA == $indexB ? 0 : ($indexA > $indexB ? +1 : -1);
65 65
   }
Please login to merge, or discard this patch.
includes/includes/flt_mission_explore.php 1 patch
Spacing   +37 added lines, -38 removed lines patch added patch discarded remove patch
@@ -14,11 +14,11 @@  discard block
 block discarded – undo
14 14
 
15 15
   $fleet_left = 1 - mt_rand(1, 3) * mt_rand(200000, 300000) / 1000000;
16 16
   $fleet_lost = array();
17
-  foreach($fleet as $unit_id => &$unit_amount) {
17
+  foreach ($fleet as $unit_id => &$unit_amount) {
18 18
     $ships_left = floor($unit_amount * $fleet_left);
19 19
     $fleet_lost[$unit_id] = $unit_amount - $ships_left;
20 20
     $unit_amount = $ships_left;
21
-    if(!$unit_amount) {
21
+    if (!$unit_amount) {
22 22
       unset($fleet[$unit_id]);
23 23
     }
24 24
   }
@@ -31,14 +31,14 @@  discard block
 block discarded – undo
31 31
 //  $fleet = array();
32 32
 }
33 33
 
34
-function flt_mission_explore_addon(&$result){return sn_function_call('flt_mission_explore_addon', array(&$result));}
34
+function flt_mission_explore_addon(&$result) {return sn_function_call('flt_mission_explore_addon', array(&$result)); }
35 35
 function sn_flt_mission_explore_addon(&$result) {
36 36
   return $result;
37 37
 }
38 38
 
39 39
 
40 40
 function flt_mission_explore(&$mission_data) {
41
-  if(!isset($mission_data['fleet_event']) || $mission_data['fleet_event'] != EVENT_FLT_ACOMPLISH) {
41
+  if (!isset($mission_data['fleet_event']) || $mission_data['fleet_event'] != EVENT_FLT_ACOMPLISH) {
42 42
     return CACHE_NONE;
43 43
   }
44 44
 
@@ -71,10 +71,10 @@  discard block
 block discarded – undo
71 71
   $outcome_list = &$result['$outcome_list'];
72 72
   $fleet_metal_points = &$result['$fleet_metal_points'];
73 73
 
74
-  if(!$ship_data) {
75
-    foreach(sn_get_groups('fleet') as $unit_id) {
74
+  if (!$ship_data) {
75
+    foreach (sn_get_groups('fleet') as $unit_id) {
76 76
       $unit_info = get_unit_param($unit_id);
77
-      if($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
77
+      if ($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
78 78
         continue;
79 79
       }
80 80
       $ship_data[$unit_id][P_COST_METAL] = get_unit_cost_in($unit_info[P_COST]);
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
   $fleet = sys_unit_str2arr($fleet_row['fleet_array']);
87 87
   $fleet_capacity = 0;
88 88
   $fleet_metal_points = 0;
89
-  foreach($fleet as $ship_id => $ship_amount) {
89
+  foreach ($fleet as $ship_id => $ship_amount) {
90 90
     $unit_info = get_unit_param($ship_id);
91 91
     $fleet_capacity += $ship_amount * $unit_info[P_CAPACITY];
92 92
     $fleet_metal_points += $ship_amount * $ship_data[$ship_id][P_COST_METAL];
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
   $flt_stay_hours = ($fleet_row['fleet_end_stay'] - $fleet_row['fleet_start_time']) / 3600 * ($config->game_speed_expedition ? $config->game_speed_expedition : 1);
97 97
 
98 98
   $outcome_list = sn_get_groups(GROUP_MISSION_EXPLORE_OUTCOMES);
99
-  $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1/1.7));
99
+  $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1 / 1.7));
100 100
 
101 101
   $chance_max = 0;
102
-  foreach($outcome_list as $key => &$value) {
103
-    if(!$value['chance']) {
102
+  foreach ($outcome_list as $key => &$value) {
103
+    if (!$value['chance']) {
104 104
       unset($outcome_list[$key]);
105 105
       continue;
106 106
     }
@@ -109,13 +109,13 @@  discard block
 block discarded – undo
109 109
   $outcome_value = mt_rand(0, $chance_max);
110 110
 // $outcome_value = 409;
111 111
   $outcome_description = &$outcome_list[$mission_outcome = FLT_EXPEDITION_OUTCOME_NONE];
112
-  foreach($outcome_list as $key => &$value) {
113
-    if(!$value['chance']) {
112
+  foreach ($outcome_list as $key => &$value) {
113
+    if (!$value['chance']) {
114 114
       continue;
115 115
     }
116 116
     $mission_outcome = $key;
117 117
     $outcome_description = $value;
118
-    if($outcome_value <= $outcome_description['value']) {
118
+    if ($outcome_value <= $outcome_description['value']) {
119 119
       break;
120 120
     }
121 121
   }
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
   $found_dark_matter = 0;
132 132
 //  $outcome_mission_sub = -1;
133 133
 
134
-  switch($mission_outcome) {
134
+  switch ($mission_outcome) {
135 135
 //  switch(FLT_EXPEDITION_OUTCOME_LOST_FLEET) { // TODO DEBUG!
136 136
     case FLT_EXPEDITION_OUTCOME_LOST_FLEET:
137 137
       flt_mission_explore_outcome_lost_fleet($result);
@@ -166,14 +166,14 @@  discard block
 block discarded – undo
166 166
 
167 167
       // Рассчитываем стоимость самого дорого корабля в металле
168 168
       $max_metal_cost = 0;
169
-      foreach($fleet as $ship_id => $ship_amount) {
169
+      foreach ($fleet as $ship_id => $ship_amount) {
170 170
         $max_metal_cost = max($max_metal_cost, $ship_data[$ship_id]['metal_cost']);
171 171
       }
172 172
 
173 173
       // Ограничиваем корабли только теми, чья стоимость в металле меньше или равно стоимости самого дорогого корабля
174 174
       $can_be_found = array();
175
-      foreach($ship_data as $ship_id => $ship_info) {
176
-        if($ship_info['metal_cost'] < $max_metal_cost) {
175
+      foreach ($ship_data as $ship_id => $ship_info) {
176
+        if ($ship_info['metal_cost'] < $max_metal_cost) {
177 177
           $can_be_found[$ship_id] = $ship_info['metal_cost'];
178 178
         }
179 179
       }
@@ -182,13 +182,13 @@  discard block
 block discarded – undo
182 182
       unset($can_be_found[SHIP_SPY]);
183 183
 
184 184
       $fleet_found = array();
185
-      while(count($can_be_found) && $found_in_metal >= max($can_be_found)) {
185
+      while (count($can_be_found) && $found_in_metal >= max($can_be_found)) {
186 186
         $found_index = mt_rand(1, count($can_be_found)) - 1;
187 187
         $found_ship = array_slice($can_be_found, $found_index, 1, true);
188 188
         $found_ship_cost = reset($found_ship);
189 189
         $found_ship_id = key($found_ship);
190 190
 
191
-        if($found_ship_cost > $found_in_metal) {
191
+        if ($found_ship_cost > $found_in_metal) {
192 192
           unset($can_be_found[$found_ship_id]);
193 193
         } else {
194 194
           $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost));
@@ -197,10 +197,10 @@  discard block
 block discarded – undo
197 197
         }
198 198
       }
199 199
 
200
-      if(empty($fleet_found)) {
200
+      if (empty($fleet_found)) {
201 201
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
202 202
       } else {
203
-        foreach($fleet_found as $unit_id => $unit_amount) {
203
+        foreach ($fleet_found as $unit_id => $unit_amount) {
204 204
           $fleet[$unit_id] += $unit_amount;
205 205
         }
206 206
       }
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
       $fleet_row['fleet_resource_crystal'] += $resources_found[RES_CRYSTAL];
227 227
       $fleet_row['fleet_resource_deuterium'] += $resources_found[RES_DEUTERIUM];
228 228
 
229
-      if(array_sum($resources_found) == 0) {
229
+      if (array_sum($resources_found) == 0) {
230 230
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
231 231
       }
232 232
     break;
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
       // Рассчитываем количество найденной ТМ
238 238
       $found_dark_matter = floor(min($outcome_percent * $fleet_metal_points / $rates[RES_DARK_MATTER], 10000) * mt_rand(750000, 1000000) / 1000000);
239 239
 
240
-      if(!$found_dark_matter) {
240
+      if (!$found_dark_matter) {
241 241
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
242 242
       }
243 243
     break;
@@ -251,31 +251,31 @@  discard block
 block discarded – undo
251 251
 
252 252
   flt_mission_explore_addon($result);
253 253
 
254
-  if($found_dark_matter) {
254
+  if ($found_dark_matter) {
255 255
     rpg_points_change($fleet_row['fleet_owner'], RPG_EXPEDITION, $found_dark_matter, 'Expedition Bonus');
256 256
     $msg_text_addon = sprintf($lang['flt_mission_expedition']['found_dark_matter'], $found_dark_matter);
257 257
   }
258 258
 
259
-  if(!empty($fleet_lost)) {
259
+  if (!empty($fleet_lost)) {
260 260
     $msg_text_addon = $lang['flt_mission_expedition']['lost_fleet'];
261
-    foreach($fleet_lost as $ship_id => $ship_amount) {
261
+    foreach ($fleet_lost as $ship_id => $ship_amount) {
262 262
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
263 263
     }
264 264
   }
265 265
 
266 266
   $fleet_row['fleet_amount'] = array_sum($fleet);
267
-  if(!empty($fleet) && $fleet_row['fleet_amount']) {
268
-    if(!empty($fleet_found)) {
267
+  if (!empty($fleet) && $fleet_row['fleet_amount']) {
268
+    if (!empty($fleet_found)) {
269 269
       $msg_text_addon = $lang['flt_mission_expedition']['found_fleet'];
270
-      foreach($fleet_found as $ship_id => $ship_amount) {
270
+      foreach ($fleet_found as $ship_id => $ship_amount) {
271 271
         $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
272 272
       }
273 273
     }
274 274
 
275 275
     $query_delta = array();
276
-    if(!empty($resources_found) && array_sum($resources_found) > 0) {
276
+    if (!empty($resources_found) && array_sum($resources_found) > 0) {
277 277
       $msg_text_addon = $lang['flt_mission_expedition']['found_resources'];
278
-      foreach($resources_found as $ship_id => $ship_amount) {
278
+      foreach ($resources_found as $ship_id => $ship_amount) {
279 279
         $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
280 280
       }
281 281
 
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
     }
289 289
 
290 290
     $query_data = array();
291
-    if(!empty($fleet_lost) || !empty($fleet_found)) {
291
+    if (!empty($fleet_lost) || !empty($fleet_found)) {
292 292
       $fleet_row['fleet_array'] = sys_unit_arr2str($fleet);
293 293
 
294 294
 //      $query_data[] = "`fleet_amount` = {$fleet_row['fleet_amount']}";
@@ -316,17 +316,16 @@  discard block
 block discarded – undo
316 316
 
317 317
   db_user_set_by_id($fleet_row['fleet_owner'], "`player_rpg_explore_xp` = `player_rpg_explore_xp` + 1");
318 318
 
319
-  if(!$msg_text) {
319
+  if (!$msg_text) {
320 320
     $messages = &$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['messages'];
321
-    if($outcome_mission_sub >= 0 && is_array($messages)) {
321
+    if ($outcome_mission_sub >= 0 && is_array($messages)) {
322 322
       $messages = &$messages[$outcome_mission_sub];
323 323
     }
324 324
 
325
-    $msg_text = is_string($messages) ? $messages :
326
-      (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
325
+    $msg_text = is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
327 326
   }
328 327
   $msg_text = sprintf($msg_text, $fleet_row['fleet_id'], uni_render_coordinates($fleet_row, 'fleet_end_')) .
329
-    ($msg_text_addon ? "\r\n" . $msg_text_addon: '');
328
+    ($msg_text_addon ? "\r\n" . $msg_text_addon : '');
330 329
 
331 330
   msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_end_stay'], MSG_TYPE_EXPLORE, $msg_sender, $msg_title, $msg_text);
332 331
 
Please login to merge, or discard this patch.
classes/Bonus/ValueStorage.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -48,20 +48,20 @@  discard block
 block discarded – undo
48 48
   }
49 49
 
50 50
   protected function initValues() {
51
-    $this[UNIT_SERVER_SPEED_BUILDING] = function (ValueStorage $vs) {
51
+    $this[UNIT_SERVER_SPEED_BUILDING] = function(ValueStorage $vs) {
52 52
       return new ValueBonused(UNIT_SERVER_SPEED_BUILDING, floatval($vs->getGlobalContainer()->config->game_speed));
53 53
     };
54
-    $this[UNIT_SERVER_SPEED_MINING] = function (ValueStorage $vs) {
54
+    $this[UNIT_SERVER_SPEED_MINING] = function(ValueStorage $vs) {
55 55
       return new ValueBonused(UNIT_SERVER_SPEED_MINING, floatval($vs->getGlobalContainer()->config->resource_multiplier));
56 56
     };
57
-    $this[UNIT_SERVER_SPEED_FLEET] = function (ValueStorage $vs) {
57
+    $this[UNIT_SERVER_SPEED_FLEET] = function(ValueStorage $vs) {
58 58
       return new ValueBonused(UNIT_SERVER_SPEED_FLEET, floatval($vs->getGlobalContainer()->config->fleet_speed));
59 59
     };
60
-    $this[UNIT_SERVER_SPEED_EXPEDITION] = function (ValueStorage $vs) {
60
+    $this[UNIT_SERVER_SPEED_EXPEDITION] = function(ValueStorage $vs) {
61 61
       return new ValueBonused(UNIT_SERVER_SPEED_EXPEDITION, floatval(1));
62 62
     };
63 63
 
64
-    $this[UNIT_SERVER_FLEET_NOOB_POINTS] = function (ValueStorage $vs) {
64
+    $this[UNIT_SERVER_FLEET_NOOB_POINTS] = function(ValueStorage $vs) {
65 65
       $config = $vs->getGlobalContainer()->config;
66 66
 
67 67
       return new ValueBonused(
@@ -69,11 +69,11 @@  discard block
 block discarded – undo
69 69
         floatval($config->game_noob_points * $vs->getBase(UNIT_SERVER_SPEED_MINING))
70 70
       );
71 71
     };
72
-    $this[UNIT_SERVER_FLEET_NOOB_FACTOR] = function (ValueStorage $vs) {
72
+    $this[UNIT_SERVER_FLEET_NOOB_FACTOR] = function(ValueStorage $vs) {
73 73
       return new ValueBonused(UNIT_SERVER_FLEET_NOOB_FACTOR, floatval($vs->getGlobalContainer()->config->game_noob_factor));
74 74
     };
75 75
 
76
-    $this[UNIT_SERVER_PAYMENT_MM_PER_CURRENCY] = function (ValueStorage $vs) {
76
+    $this[UNIT_SERVER_PAYMENT_MM_PER_CURRENCY] = function(ValueStorage $vs) {
77 77
       return new ValueBonused(UNIT_SERVER_PAYMENT_MM_PER_CURRENCY, floatval($vs->getGlobalContainer()->config->payment_currency_exchange_mm_));
78 78
     };
79 79
   }
Please login to merge, or discard this patch.
classes/Unit/Governor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
    * @return int
106 106
    */
107 107
   public function getMaxLevel() {
108
-    $snId =  $this->getSnId();
108
+    $snId = $this->getSnId();
109 109
     return !empty($snId) ? get_unit_param($snId, P_MAX_STACK) : 0;
110 110
   }
111 111
 
Please login to merge, or discard this patch.
includes/includes/ube_attack_calculate.php 2 patches
Spacing   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -165,8 +165,7 @@  discard block
 block discarded – undo
165 165
     $planet_info[PLANET_SYSTEM],
166 166
     $planet_info[PLANET_PLANET],
167 167
     htmlentities($planet_info[PLANET_NAME], ENT_COMPAT, 'UTF-8'),
168
-    $lang[$outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' :
169
-      ($outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
168
+    $lang[$outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' : ($outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
170 169
   );
171 170
 
172 171
   $text_defender = '';
@@ -251,7 +250,7 @@  discard block
 block discarded – undo
251 250
       // Просматриваем результаты изменения флотов
252 251
       foreach ($fleet_info[UBE_COUNT] as $unit_id => $unit_count) {
253 252
         // Перебираем аутком на случай восстановления юнитов
254
-        $units_lost = (float)$fleets_outcome[$fleet_id][UBE_UNITS_LOST][$unit_id];
253
+        $units_lost = (float) $fleets_outcome[$fleet_id][UBE_UNITS_LOST][$unit_id];
255 254
 
256 255
         $units_left = $unit_count - $units_lost;
257 256
         if ($fleet_id) {
@@ -275,7 +274,7 @@  discard block
 block discarded – undo
275 274
     // Если во флоте остались юниты или это планета - генерируем изменение ресурсов
276 275
     if ($new_fleet_count || !$fleet_id) {
277 276
       foreach (sn_get_groups('resources_loot') as $resource_id) {
278
-        $resource_change = (float)$fleets_outcome[$fleet_id][UBE_RESOURCES_LOOTED][$resource_id] + (float)$fleets_outcome[$fleet_id][UBE_CARGO_DROPPED][$resource_id];
277
+        $resource_change = (float) $fleets_outcome[$fleet_id][UBE_RESOURCES_LOOTED][$resource_id] + (float) $fleets_outcome[$fleet_id][UBE_CARGO_DROPPED][$resource_id];
279 278
         if ($resource_change) {
280 279
           $resource_db_name = ($fleet_id ? 'fleet_resource_' : '') . pname_resource_name($resource_id);
281 280
           $fleet_delta[$resource_db_name] = -($resource_change);
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -290,10 +290,12 @@  discard block
 block discarded – undo
290 290
       }
291 291
     }
292 292
 
293
-    if ($fleet_id) // Не планета
293
+    if ($fleet_id) {
294
+      // Не планета
294 295
     {
295 296
       if ($fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS && $outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_DIED) {
296 297
         $new_fleet_count = 0;
298
+    }
297 299
       }
298 300
 
299 301
       if ($new_fleet_count) {
@@ -316,10 +318,12 @@  discard block
 block discarded – undo
316 318
         }
317 319
         DBStaticPlanet::db_planet_set_by_id($planet_id, implode(',', $temp));
318 320
       }
319
-      if (!empty($db_changeset)) // Сохраняем изменения юнитов на планете - если они есть
321
+      if (!empty($db_changeset)) {
322
+        // Сохраняем изменения юнитов на планете - если они есть
320 323
       {
321 324
         OldDbChangeSet::db_changeset_apply($db_changeset);
322 325
       }
326
+      }
323 327
     }
324 328
   }
325 329
 
Please login to merge, or discard this patch.
includes/functions/uni_functions.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -236,9 +236,11 @@
 block discarded – undo
236 236
   }
237 237
 
238 238
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
239
-  if (!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
239
+  if (!isset($planet_row['id'])) {
240
+    // || $planet_row['id'] != $user['current_planet']
240 241
   {
241 242
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
243
+  }
242 244
     // Если текущей планеты не существует - выставляем Столицу
243 245
     if (!isset($planet_row['id'])) {
244 246
       $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');
Please login to merge, or discard this patch.
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,8 +96,7 @@
 block discarded – undo
96 96
 
97 97
   $core_info = uni_create_planet_get_density($position_data, $user_row, $planet_sectors);
98 98
 
99
-  $planet_name_unsafe = !empty($options['force_name']) ? $options['force_name'] :
100
-    ($user_row['username'] . ' ' . (
99
+  $planet_name_unsafe = !empty($options['force_name']) ? $options['force_name'] : ($user_row['username'] . ' ' . (
101 100
       $HomeWorld
102 101
         ? SN::$lang['sys_capital']
103 102
         : ($planet_name_unsafe ? $planet_name_unsafe : SN::$lang['sys_colo_defaultname'])
Please login to merge, or discard this patch.
includes/includes/art_artifact.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 {
5 5
   global $lang;
6 6
 
7
-  if(!in_array($unit_id, sn_get_groups('artifacts')))
7
+  if (!in_array($unit_id, sn_get_groups('artifacts')))
8 8
   {
9 9
     return;
10 10
   }
@@ -13,17 +13,17 @@  discard block
 block discarded – undo
13 13
   $user = db_user_by_id($user['id'], true);
14 14
 
15 15
   $unit_level = $artifact_level_old = mrc_get_level($user, array(), $unit_id, true);
16
-  if($unit_level > 0)
16
+  if ($unit_level > 0)
17 17
   {
18 18
     $db_changeset = array();
19
-    switch($unit_id)
19
+    switch ($unit_id)
20 20
     {
21 21
       case ART_LHC:
22 22
       case ART_HOOK_SMALL:
23 23
       case ART_HOOK_MEDIUM:
24 24
       case ART_HOOK_LARGE:
25 25
         $has_moon = DBStaticPlanet::db_planet_by_parent($planetrow['id'], true, '`id`');
26
-        if($planetrow['planet_type'] == PT_PLANET && !$has_moon['id'])
26
+        if ($planetrow['planet_type'] == PT_PLANET && !$has_moon['id'])
27 27
         {
28 28
           $unit_level--;
29 29
           $updateDebris = false;
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
             break;
45 45
           }
46 46
 
47
-          if($moonSize)
47
+          if ($moonSize)
48 48
           {
49 49
             $new_moon_row = uni_create_moon($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], $user['id'], $moonSize, $updateDebris);
50 50
             $message = sprintf($lang['art_moon_create'][$unit_id], $new_moon_row['name'], uni_render_coordinates($planetrow), HelperString::numberFloorAndFormat($moonSize));
@@ -65,14 +65,14 @@  discard block
 block discarded – undo
65 65
       case ART_RCD_MEDIUM:
66 66
       case ART_RCD_LARGE:
67 67
         $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
68
-        if($planetrow['planet_type'] != PT_PLANET)
68
+        if ($planetrow['planet_type'] != PT_PLANET)
69 69
         {
70 70
           $message = $lang['art_rcd_err_moon'];
71 71
           break;
72 72
         }
73 73
 
74 74
         $que = que_get($user['id'], $planetrow['id'], QUE_STRUCTURES, false);
75
-        if(!empty($que['items']))
75
+        if (!empty($que['items']))
76 76
         {
77 77
           $message = $lang['art_rcd_err_que'];
78 78
           break;
@@ -81,15 +81,15 @@  discard block
 block discarded – undo
81 81
         $artifact_deploy = get_unit_param($unit_id, P_DEPLOY);
82 82
 
83 83
         $sectors_used = 0;
84
-        foreach($artifact_deploy as $deploy_unit_id => $deploy_unit_level)
84
+        foreach ($artifact_deploy as $deploy_unit_id => $deploy_unit_level)
85 85
         {
86
-          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true))))
86
+          if (!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true))))
87 87
             continue;
88 88
           $sectors_used += $levels_deployed;
89 89
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($deploy_unit_id, $levels_deployed, $user, $planetrow['id']);
90 90
         }
91 91
 
92
-        if($sectors_used == 0)
92
+        if ($sectors_used == 0)
93 93
         {
94 94
           $message = $lang['art_rcd_err_no_sense'];
95 95
           break;
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
         $que_item = null;
105 105
         $que = que_get($user['id'], $planetrow['id'], QUE_RESEARCH, true);
106 106
         $current_que = &$que['ques'][QUE_RESEARCH][$user['id']][0];
107
-        if(!empty($current_que))
107
+        if (!empty($current_que))
108 108
         {
109 109
           reset($current_que);
110 110
           $que_item = &$que['ques'][QUE_RESEARCH][$user['id']][0][key($current_que)];
111 111
         }
112 112
 
113
-        if(!empty($que_item) && $que_item['que_time_left'] > 60)
113
+        if (!empty($que_item) && $que_item['que_time_left'] > 60)
114 114
         {
115 115
           $unit_level--;
116 116
           $old_time = $que_item['que_time_left'];
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
131 131
         $que = que_get($user['id'], $planetrow['id'], QUE_STRUCTURES, true);
132 132
         $current_que = &$que['ques'][QUE_STRUCTURES][$user['id']][$planetrow['id']];
133 133
         // $que_item = &$que['que'][QUE_STRUCTURES][0];
134
-        if(!empty($current_que))
134
+        if (!empty($current_que))
135 135
         {
136 136
           reset($current_que);
137 137
           $que_item = &$que['ques'][QUE_STRUCTURES][$user['id']][$planetrow['id']][key($current_que)];
138 138
         }
139 139
 
140
-        if(isset($que_item) && $que_item['que_time_left'] > 60)
140
+        if (isset($que_item) && $que_item['que_time_left'] > 60)
141 141
         {
142 142
           $unit_level--;
143 143
           $old_time = $que_item['que_time_left'];
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
       break;
156 156
 
157 157
     }
158
-    if($unit_level != $artifact_level_old)
158
+    if ($unit_level != $artifact_level_old)
159 159
     {
160 160
       $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_level - $artifact_level_old, $user);
161 161
       OldDbChangeSet::db_changeset_apply($db_changeset);
Please login to merge, or discard this patch.
Braces   +9 added lines, -14 removed lines patch added patch discarded remove patch
@@ -5,8 +5,7 @@  discard block
 block discarded – undo
5 5
 use Que\DBStaticQue;
6 6
 use Universe\Universe;
7 7
 
8
-function art_use(&$user, &$planetrow, $unit_id)
9
-{
8
+function art_use(&$user, &$planetrow, $unit_id) {
10 9
   global $lang;
11 10
 
12 11
   if(!in_array($unit_id, sn_get_groups('artifacts')))
@@ -53,14 +52,12 @@  discard block
 block discarded – undo
53 52
           {
54 53
             $new_moon_row = uni_create_moon($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], $user['id'], $moonSize, $updateDebris);
55 54
             $message = sprintf($lang['art_moon_create'][$unit_id], $new_moon_row['name'], uni_render_coordinates($planetrow), HelperString::numberFloorAndFormat($moonSize));
56
-          }
57
-          else
55
+          } else
58 56
           {
59 57
             $message = $lang['art_lhc_moon_fail'];
60 58
           }
61 59
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_ADMIN, $lang['art_lhc_from'], $lang['art_lhc_subj'], $message);
62
-        }
63
-        else
60
+        } else
64 61
         {
65 62
           $message = $lang['art_moon_exists'];
66 63
         }
@@ -88,8 +85,9 @@  discard block
 block discarded – undo
88 85
         $sectors_used = 0;
89 86
         foreach($artifact_deploy as $deploy_unit_id => $deploy_unit_level)
90 87
         {
91
-          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true))))
92
-            continue;
88
+          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true)))) {
89
+                      continue;
90
+          }
93 91
           $sectors_used += $levels_deployed;
94 92
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($deploy_unit_id, $levels_deployed, $user, $planetrow['id']);
95 93
         }
@@ -123,8 +121,7 @@  discard block
 block discarded – undo
123 121
           DBStaticQue::db_que_set_time_left_by_id($que_item['que_id'], $que_item['que_time_left']);
124 122
           $message = sprintf($lang['art_heurestic_chip_ok'], $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], sys_time_human($old_time - $que_item['que_time_left']));
125 123
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_heurestic_chip_subj'], $lang['art_heurestic_chip_subj'], $message);
126
-        }
127
-        else
124
+        } else
128 125
         {
129 126
           $message = $lang['art_heurestic_chip_no_research'];
130 127
         }
@@ -152,8 +149,7 @@  discard block
 block discarded – undo
152 149
             $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], $planetrow['name'], uni_render_coordinates($planetrow), sys_time_human($old_time - $que_item['que_time_left'])
153 150
           );
154 151
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_nano_builder_subj'], $lang['art_nano_builder_subj'], $message);
155
-        }
156
-        else
152
+        } else
157 153
         {
158 154
           $message = $lang['art_nano_builder_no_que'];
159 155
         }
@@ -165,8 +161,7 @@  discard block
 block discarded – undo
165 161
       $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_level - $artifact_level_old, $user);
166 162
       OldDbChangeSet::db_changeset_apply($db_changeset);
167 163
     }
168
-  }
169
-  else
164
+  } else
170 165
   {
171 166
     $message = $lang['art_err_no_artifact'];
172 167
   }
Please login to merge, or discard this patch.