Passed
Push — trunk ( 338765...433e05 )
by SuperNova.WS
04:23
created
classes/Fleet/RecordFleet.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
    * @inheritdoc
90 90
    */
91 91
   public function update() {
92
-    if($this->getShipCount() < 1) {
92
+    if ($this->getShipCount() < 1) {
93 93
       return $this->delete();
94 94
     } else {
95 95
       return parent::update();
@@ -153,12 +153,12 @@  discard block
 block discarded – undo
153 153
 
154 154
     $shipCount = floor($shipCount);
155 155
 
156
-    if($this->shipList[$shipSnId] + $shipCount < 0) {
156
+    if ($this->shipList[$shipSnId] + $shipCount < 0) {
157 157
       throw new \Exception("Trying to deduct more ships [{$shipSnId}] '{$shipCount}' when fleet [{$this->id}] has only {$this->shipList[$shipSnId]}");
158 158
     }
159 159
 
160 160
     $this->shipList[$shipSnId] += $shipCount;
161
-    if($this->shipList[$shipSnId] < 1) {
161
+    if ($this->shipList[$shipSnId] < 1) {
162 162
       unset($this->shipList[$shipSnId]);
163 163
     }
164 164
 
@@ -173,13 +173,13 @@  discard block
 block discarded – undo
173 173
    * @throws \Exception
174 174
    */
175 175
   public function changeResource($resourceId, $resourceCount) {
176
-    if(!array_key_exists($resourceId, $this->resources) || empty($resourceCount)) {
176
+    if (!array_key_exists($resourceId, $this->resources) || empty($resourceCount)) {
177 177
       return;
178 178
     }
179 179
 
180 180
     $resourceCount = ceil($resourceCount);
181 181
 
182
-    if($this->resources[$resourceId] + $resourceCount < 0) {
182
+    if ($this->resources[$resourceId] + $resourceCount < 0) {
183 183
       throw new \Exception("Trying to deduct more resources [{$resourceId}] '{$resourceCount}' when fleet [{$this->id}] has only {$this->resources[$resourceId]}");
184 184
     }
185 185
 
Please login to merge, or discard this patch.
classes/Core/SnBootstrap.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 class SnBootstrap {
13 13
 
14 14
   public static function install_benchmark() {
15
-    register_shutdown_function(function () {
15
+    register_shutdown_function(function() {
16 16
       if (defined('IN_AJAX')) {
17 17
         return;
18 18
       }
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         ];
62 62
         file_put_contents($fName, implode("\n", $output), FILE_APPEND | LOCK_EX);
63 63
 
64
-        if(!empty($error['file']) && strpos($error['file'], 'classCache.php') !== false) {
64
+        if (!empty($error['file']) && strpos($error['file'], 'classCache.php') !== false) {
65 65
           print('<span style="color: red">Looks like cache clearing takes too long... Try to restart your web-server and/or cache engine</span>');
66 66
         }
67 67
       }
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(
175
+      foreach ($ship_data as $ship_id => $ship_info) {
176
+        if (
177 177
           $ship_info['metal_cost'] < $max_metal_cost
178 178
           // and not race ship
179 179
           && empty(get_unit_param($ship_id, 'player_race'))
@@ -188,13 +188,13 @@  discard block
 block discarded – undo
188 188
       unset($can_be_found[SHIP_SPY]);
189 189
 
190 190
       $fleet_found = array();
191
-      while(count($can_be_found) && $found_in_metal >= max($can_be_found)) {
191
+      while (count($can_be_found) && $found_in_metal >= max($can_be_found)) {
192 192
         $found_index = mt_rand(1, count($can_be_found)) - 1;
193 193
         $found_ship = array_slice($can_be_found, $found_index, 1, true);
194 194
         $found_ship_cost = reset($found_ship);
195 195
         $found_ship_id = key($found_ship);
196 196
 
197
-        if($found_ship_cost > $found_in_metal) {
197
+        if ($found_ship_cost > $found_in_metal) {
198 198
           unset($can_be_found[$found_ship_id]);
199 199
         } else {
200 200
           $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost));
@@ -203,10 +203,10 @@  discard block
 block discarded – undo
203 203
         }
204 204
       }
205 205
 
206
-      if(empty($fleet_found)) {
206
+      if (empty($fleet_found)) {
207 207
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
208 208
       } else {
209
-        foreach($fleet_found as $unit_id => $unit_amount) {
209
+        foreach ($fleet_found as $unit_id => $unit_amount) {
210 210
           $fleet[$unit_id] += $unit_amount;
211 211
         }
212 212
       }
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
       $fleet_row['fleet_resource_crystal'] += $resources_found[RES_CRYSTAL];
233 233
       $fleet_row['fleet_resource_deuterium'] += $resources_found[RES_DEUTERIUM];
234 234
 
235
-      if(array_sum($resources_found) == 0) {
235
+      if (array_sum($resources_found) == 0) {
236 236
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
237 237
       }
238 238
     break;
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
       // Рассчитываем количество найденной ТМ
244 244
       $found_dark_matter = floor(min($outcome_percent * $fleet_metal_points / $rates[RES_DARK_MATTER], 10000) * mt_rand(750000, 1000000) / 1000000);
245 245
 
246
-      if(!$found_dark_matter) {
246
+      if (!$found_dark_matter) {
247 247
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
248 248
       }
249 249
     break;
@@ -257,31 +257,31 @@  discard block
 block discarded – undo
257 257
 
258 258
   flt_mission_explore_addon($result);
259 259
 
260
-  if($found_dark_matter) {
260
+  if ($found_dark_matter) {
261 261
     rpg_points_change($fleet_row['fleet_owner'], RPG_EXPEDITION, $found_dark_matter, 'Expedition Bonus');
262 262
     $msg_text_addon = sprintf($lang['flt_mission_expedition']['found_dark_matter'], $found_dark_matter);
263 263
   }
264 264
 
265
-  if(!empty($fleet_lost)) {
265
+  if (!empty($fleet_lost)) {
266 266
     $msg_text_addon = $lang['flt_mission_expedition']['lost_fleet'];
267
-    foreach($fleet_lost as $ship_id => $ship_amount) {
267
+    foreach ($fleet_lost as $ship_id => $ship_amount) {
268 268
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
269 269
     }
270 270
   }
271 271
 
272 272
   $fleet_row['fleet_amount'] = array_sum($fleet);
273
-  if(!empty($fleet) && $fleet_row['fleet_amount']) {
274
-    if(!empty($fleet_found)) {
273
+  if (!empty($fleet) && $fleet_row['fleet_amount']) {
274
+    if (!empty($fleet_found)) {
275 275
       $msg_text_addon = $lang['flt_mission_expedition']['found_fleet'];
276
-      foreach($fleet_found as $ship_id => $ship_amount) {
276
+      foreach ($fleet_found as $ship_id => $ship_amount) {
277 277
         $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
278 278
       }
279 279
     }
280 280
 
281 281
     $query_delta = array();
282
-    if(!empty($resources_found) && array_sum($resources_found) > 0) {
282
+    if (!empty($resources_found) && array_sum($resources_found) > 0) {
283 283
       $msg_text_addon = $lang['flt_mission_expedition']['found_resources'];
284
-      foreach($resources_found as $ship_id => $ship_amount) {
284
+      foreach ($resources_found as $ship_id => $ship_amount) {
285 285
         $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
286 286
       }
287 287
 
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
     }
295 295
 
296 296
     $query_data = array();
297
-    if(!empty($fleet_lost) || !empty($fleet_found)) {
297
+    if (!empty($fleet_lost) || !empty($fleet_found)) {
298 298
       $fleet_row['fleet_array'] = sys_unit_arr2str($fleet);
299 299
 
300 300
 //      $query_data[] = "`fleet_amount` = {$fleet_row['fleet_amount']}";
@@ -322,17 +322,16 @@  discard block
 block discarded – undo
322 322
 
323 323
   db_user_set_by_id($fleet_row['fleet_owner'], "`player_rpg_explore_xp` = `player_rpg_explore_xp` + 1");
324 324
 
325
-  if(!$msg_text) {
325
+  if (!$msg_text) {
326 326
     $messages = &$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['messages'];
327
-    if($outcome_mission_sub >= 0 && is_array($messages)) {
327
+    if ($outcome_mission_sub >= 0 && is_array($messages)) {
328 328
       $messages = &$messages[$outcome_mission_sub];
329 329
     }
330 330
 
331
-    $msg_text = is_string($messages) ? $messages :
332
-      (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
331
+    $msg_text = is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
333 332
   }
334 333
   $msg_text = sprintf($msg_text, $fleet_row['fleet_id'], uni_render_coordinates($fleet_row, 'fleet_end_')) .
335
-    ($msg_text_addon ? "\r\n" . $msg_text_addon: '');
334
+    ($msg_text_addon ? "\r\n" . $msg_text_addon : '');
336 335
 
337 336
   msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_end_stay'], MSG_TYPE_EXPLORE, $msg_sender, $msg_title, $msg_text);
338 337
 
Please login to merge, or discard this patch.