@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | * Преобразовывает данные симулятора в данные для расчета боя |
465 | 465 | * |
466 | 466 | * @param $side_info |
467 | - * @param $attacker |
|
467 | + * @param boolean $attacker |
|
468 | 468 | * @param int $player_id |
469 | 469 | * |
470 | 470 | * @version 41a6.22 |
@@ -572,7 +572,7 @@ discard block |
||
572 | 572 | } |
573 | 573 | |
574 | 574 | /** |
575 | - * @param $template |
|
575 | + * @param null|template $template |
|
576 | 576 | * |
577 | 577 | * @return template |
578 | 578 | */ |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $this->players->db_load_player_by_id($player_id, UBE_PLAYER_IS_DEFENDER); |
148 | 148 | |
149 | 149 | $player_db_row = $this->players[$player_id]->getDbRow(); |
150 | - if($fortifier_level = mrc_get_level($player_db_row, $this->combatMission->dst_planet, MRC_FORTIFIER)) { |
|
150 | + if ($fortifier_level = mrc_get_level($player_db_row, $this->combatMission->dst_planet, MRC_FORTIFIER)) { |
|
151 | 151 | $this->planet_bonus->add_unit_by_snid(MRC_FORTIFIER, $fortifier_level); |
152 | 152 | } |
153 | 153 | |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $this->rounds[0] = new UBERound(0); |
180 | 180 | $this->rounds[0]->make_snapshot($this->fleet_list); |
181 | 181 | |
182 | - for($round = 1; $round <= 10; $round++) { |
|
182 | + for ($round = 1; $round <= 10; $round++) { |
|
183 | 183 | // Проводим раунд |
184 | 184 | defined('DEBUG_UBE') ? print("Round {$round}<br>") : false; |
185 | 185 | |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | // Анализируем итоги текущего раунда и готовим данные для следующего |
194 | 194 | $this->combat_result = $this->fleet_list->ubeAnalyzeFleetOutcome($round); |
195 | - if($this->combat_result != UBE_COMBAT_RESULT_DRAW) { |
|
195 | + if ($this->combat_result != UBE_COMBAT_RESULT_DRAW) { |
|
196 | 196 | break; |
197 | 197 | } |
198 | 198 | |
@@ -221,11 +221,11 @@ discard block |
||
221 | 221 | // Генерируем результат боя |
222 | 222 | $this->fleet_list->ube_analyze_fleets($this->is_simulator, $this->debris, $this->resource_exchange_rates); |
223 | 223 | |
224 | - if(!$this->is_ube_loaded) { |
|
224 | + if (!$this->is_ube_loaded) { |
|
225 | 225 | $this->moon_calculator->calculate_moon($this); |
226 | 226 | |
227 | 227 | // Лутаем ресурсы - если аттакер выиграл |
228 | - if($this->combat_result == UBE_COMBAT_RESULT_WIN) { |
|
228 | + if ($this->combat_result == UBE_COMBAT_RESULT_WIN) { |
|
229 | 229 | $this->sn_ube_combat_analyze_loot(); |
230 | 230 | } |
231 | 231 | } |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | RES_DEUTERIUM => 0, |
246 | 246 | ); |
247 | 247 | |
248 | - if( |
|
248 | + if ( |
|
249 | 249 | (($planet_resource_total = $this->fleet_list[0]->get_resources_amount()) > 0) |
250 | 250 | && |
251 | 251 | (($total_capacity = $this->fleet_list->ube_get_capacity_attackers()) > 0) |
@@ -257,9 +257,9 @@ discard block |
||
257 | 257 | $planet_lootable_percent = $planet_lootable / $planet_resource_total; |
258 | 258 | |
259 | 259 | // Вычисляем сколько ресурсов вывезено |
260 | - foreach($this->fleet_list->_container as $fleet_id => $fleet) { |
|
260 | + foreach ($this->fleet_list->_container as $fleet_id => $fleet) { |
|
261 | 261 | $looted_in_metal = 0; |
262 | - foreach($this->fleet_list[0]->resource_list as $resource_id => $resource_amount) { |
|
262 | + foreach ($this->fleet_list[0]->resource_list as $resource_id => $resource_amount) { |
|
263 | 263 | // Вычисляем какой процент общей емкости трюмов атакующих будет задействован |
264 | 264 | $fleet_lootable_percent = $fleet->fleet_capacity / $total_capacity; |
265 | 265 | $looted = floor($resource_amount * $planet_lootable_percent * $fleet_lootable_percent); |
@@ -325,16 +325,16 @@ discard block |
||
325 | 325 | $destination_user_id = $this->fleet_list[0]->owner_id; |
326 | 326 | |
327 | 327 | // Обновляем поле обломков на планете |
328 | - if(!$this->is_admin_in_combat && $this->debris->debris_total() > 0) { |
|
328 | + if (!$this->is_admin_in_combat && $this->debris->debris_total() > 0) { |
|
329 | 329 | db_planet_set_by_gspt($this->ube_planet_info[PLANET_GALAXY], $this->ube_planet_info[PLANET_SYSTEM], $this->ube_planet_info[PLANET_PLANET], PT_PLANET, |
330 | - "`debris_metal` = `debris_metal` + " . $this->debris->debris_get_resource(RES_METAL) . ", `debris_crystal` = `debris_crystal` + " . $this->debris->debris_get_resource(RES_CRYSTAL) |
|
330 | + "`debris_metal` = `debris_metal` + ".$this->debris->debris_get_resource(RES_METAL).", `debris_crystal` = `debris_crystal` + ".$this->debris->debris_get_resource(RES_CRYSTAL) |
|
331 | 331 | ); |
332 | 332 | } |
333 | 333 | |
334 | - foreach($this->fleet_list->_container as $fleet_id => $UBEFleet) { |
|
334 | + foreach ($this->fleet_list->_container as $fleet_id => $UBEFleet) { |
|
335 | 335 | $ship_count_lost = $UBEFleet->unit_list->unitCountLost(); |
336 | 336 | |
337 | - if($fleet_id) { |
|
337 | + if ($fleet_id) { |
|
338 | 338 | // Флот |
339 | 339 | $UBEFleet->db_save_combat_result_fleet($this->is_small_fleet_recce, $this->moon_calculator->get_reapers_status()); |
340 | 340 | } else { |
@@ -342,19 +342,19 @@ discard block |
||
342 | 342 | |
343 | 343 | // Сохраняем изменения ресурсов - если они есть |
344 | 344 | $resource_delta = $UBEFleet->ube_combat_result_calculate_resources(); |
345 | - if(!empty($resource_delta)) { |
|
345 | + if (!empty($resource_delta)) { |
|
346 | 346 | $temp = array(); |
347 | - foreach($resource_delta as $resource_id => $resource_amount) { |
|
347 | + foreach ($resource_delta as $resource_id => $resource_amount) { |
|
348 | 348 | $resource_db_name = pname_resource_name($resource_id); |
349 | 349 | $temp[] = "`{$resource_db_name}` = `{$resource_db_name}` + ({$resource_amount})"; |
350 | 350 | } |
351 | 351 | db_planet_set_by_id($this->ube_planet_info[PLANET_ID], implode(',', $temp)); |
352 | 352 | } |
353 | 353 | |
354 | - if($ship_count_lost) { |
|
354 | + if ($ship_count_lost) { |
|
355 | 355 | $db_changeset = array(); |
356 | 356 | $planet_row_cache = $this->players[$destination_user_id]->getDbRow(); |
357 | - foreach($UBEFleet->unit_list->_container as $UBEUnit) { |
|
357 | + foreach ($UBEFleet->unit_list->_container as $UBEUnit) { |
|
358 | 358 | $db_changeset['unit'][] = sn_db_unit_changeset_prepare($UBEUnit->unitId, -$UBEUnit->units_lost, $planet_row_cache, $this->ube_planet_info[PLANET_ID]); |
359 | 359 | } |
360 | 360 | db_changeset_apply($db_changeset); |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | // TODO: Связать сабы с флотами констраинтами ON DELETE SET NULL |
366 | 366 | // Для САБов |
367 | 367 | $fleet_group_id_list = $this->fleet_list->ube_get_groups(); |
368 | - if(!empty($fleet_group_id_list)) { |
|
368 | + if (!empty($fleet_group_id_list)) { |
|
369 | 369 | $fleet_group_id_list = implode(',', $fleet_group_id_list); |
370 | 370 | db_acs_delete_by_list($fleet_group_id_list); |
371 | 371 | } |
@@ -374,19 +374,19 @@ discard block |
||
374 | 374 | |
375 | 375 | $bashing_list = array(); |
376 | 376 | $players_sides = $this->players->get_player_sides(); |
377 | - foreach($players_sides as $player_id => $player_side) { |
|
378 | - if($player_side != UBE_PLAYER_IS_ATTACKER) { |
|
377 | + foreach ($players_sides as $player_id => $player_side) { |
|
378 | + if ($player_side != UBE_PLAYER_IS_ATTACKER) { |
|
379 | 379 | continue; |
380 | 380 | } |
381 | - if($this->moon_calculator->get_status() != UBE_MOON_DESTROY_SUCCESS) { |
|
381 | + if ($this->moon_calculator->get_status() != UBE_MOON_DESTROY_SUCCESS) { |
|
382 | 382 | $bashing_list[] = "({$player_id}, {$this->ube_planet_info[PLANET_ID]}, {$this->combat_timestamp})"; |
383 | 383 | } |
384 | - if($this->mission_type_id == MT_ATTACK && $this->is_defender_active_player) { |
|
384 | + if ($this->mission_type_id == MT_ATTACK && $this->is_defender_active_player) { |
|
385 | 385 | $str_loose_or_win = $this->combat_result == UBE_COMBAT_RESULT_WIN ? 'raidswin' : 'raidsloose'; |
386 | 386 | db_user_set_by_id($player_id, "`xpraid` = `xpraid` + 1, `raids` = `raids` + 1, `{$str_loose_or_win}` = `{$str_loose_or_win}` + 1"); |
387 | 387 | } |
388 | 388 | } |
389 | - if(!empty($bashing_list)) { |
|
389 | + if (!empty($bashing_list)) { |
|
390 | 390 | $bashing_list = implode(',', $bashing_list); |
391 | 391 | db_bashing_insert($bashing_list); |
392 | 392 | } |
@@ -413,20 +413,19 @@ discard block |
||
413 | 413 | $planet_info[PLANET_SYSTEM], |
414 | 414 | $planet_info[PLANET_PLANET], |
415 | 415 | htmlentities($planet_info[PLANET_NAME], ENT_COMPAT, 'UTF-8'), |
416 | - classLocale::$lang[$this->combat_result == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' : |
|
417 | - ($this->combat_result == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')] |
|
416 | + classLocale::$lang[$this->combat_result == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' : ($this->combat_result == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')] |
|
418 | 417 | ); |
419 | 418 | |
420 | 419 | $text_defender = ''; |
421 | 420 | $debris = $this->debris->get_debris(); |
422 | - foreach($debris as $resource_id => $resource_amount) { |
|
423 | - if($resource_id == RES_DEUTERIUM) { |
|
421 | + foreach ($debris as $resource_id => $resource_amount) { |
|
422 | + if ($resource_id == RES_DEUTERIUM) { |
|
424 | 423 | continue; |
425 | 424 | } |
426 | 425 | |
427 | - $text_defender .= "{$classLocale['tech'][$resource_id]}: " . pretty_number($resource_amount) . '<br />'; |
|
426 | + $text_defender .= "{$classLocale['tech'][$resource_id]}: ".pretty_number($resource_amount).'<br />'; |
|
428 | 427 | } |
429 | - if($text_defender) { |
|
428 | + if ($text_defender) { |
|
430 | 429 | $text_defender = "{$classLocale['ube_report_msg_body_debris']}{$text_defender}<br />"; |
431 | 430 | } |
432 | 431 | |
@@ -436,8 +435,8 @@ discard block |
||
436 | 435 | |
437 | 436 | // TODO: Оптимизировать отсылку сообщений - отсылать пакетами |
438 | 437 | $player_sides = $this->players->get_player_sides(); |
439 | - foreach($player_sides as $player_id => $player_side) { |
|
440 | - $message = $text_common . ($this->is_small_fleet_recce && ($player_side == UBE_PLAYER_IS_ATTACKER) ? classLocale::$lang['ube_report_msg_body_sfr'] : $text_defender); |
|
438 | + foreach ($player_sides as $player_id => $player_side) { |
|
439 | + $message = $text_common.($this->is_small_fleet_recce && ($player_side == UBE_PLAYER_IS_ATTACKER) ? classLocale::$lang['ube_report_msg_body_sfr'] : $text_defender); |
|
441 | 440 | msg_send_simple_message($player_id, '', $this->combat_timestamp, MSG_TYPE_COMBAT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_attack_report'], $message); |
442 | 441 | } |
443 | 442 | |
@@ -473,11 +472,11 @@ discard block |
||
473 | 472 | $player_id = $player_id == -1 ? $this->players->count() : $player_id; |
474 | 473 | $fleet_id = $player_id; // FOR SIMULATOR! |
475 | 474 | |
476 | - if(empty($this->players[$player_id])) { |
|
475 | + if (empty($this->players[$player_id])) { |
|
477 | 476 | $this->players[$player_id] = new UBEPlayer(); |
478 | 477 | } |
479 | 478 | |
480 | - foreach($side_info as $fleet_data) { |
|
479 | + foreach ($side_info as $fleet_data) { |
|
481 | 480 | $this->players[$player_id]->name = $player_id; |
482 | 481 | $this->players[$player_id]->setSide($attacker); |
483 | 482 | |
@@ -485,32 +484,32 @@ discard block |
||
485 | 484 | $this->fleet_list[$fleet_id] = $objFleet; |
486 | 485 | |
487 | 486 | $this->fleet_list[$fleet_id]->owner_id = $player_id; |
488 | - foreach($fleet_data as $unit_id => $unit_count) { |
|
489 | - if(!$unit_count) { |
|
487 | + foreach ($fleet_data as $unit_id => $unit_count) { |
|
488 | + if (!$unit_count) { |
|
490 | 489 | continue; |
491 | 490 | } |
492 | 491 | |
493 | 492 | $unit_type = get_unit_param($unit_id, P_UNIT_TYPE); |
494 | 493 | |
495 | - if($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) { |
|
494 | + if ($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) { |
|
496 | 495 | $this->fleet_list[$fleet_id]->unit_list->unitAdjustCount($unit_id, $unit_count); |
497 | - } elseif($unit_type == UNIT_RESOURCES) { |
|
496 | + } elseif ($unit_type == UNIT_RESOURCES) { |
|
498 | 497 | $this->fleet_list[$fleet_id]->resource_list[$unit_id] = $unit_count; |
499 | - } elseif($unit_type == UNIT_TECHNOLOGIES) { |
|
500 | - if($unit_id == TECH_WEAPON) { |
|
498 | + } elseif ($unit_type == UNIT_TECHNOLOGIES) { |
|
499 | + if ($unit_id == TECH_WEAPON) { |
|
501 | 500 | $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_WEAPON, $unit_count); |
502 | - } elseif($unit_id == TECH_SHIELD) { |
|
501 | + } elseif ($unit_id == TECH_SHIELD) { |
|
503 | 502 | $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_SHIELD, $unit_count); |
504 | - } elseif($unit_id == TECH_ARMOR) { |
|
503 | + } elseif ($unit_id == TECH_ARMOR) { |
|
505 | 504 | $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_ARMOR, $unit_count); |
506 | 505 | } |
507 | - } elseif($unit_type == UNIT_GOVERNORS) { |
|
508 | - if($unit_id == MRC_FORTIFIER) { |
|
506 | + } elseif ($unit_type == UNIT_GOVERNORS) { |
|
507 | + if ($unit_id == MRC_FORTIFIER) { |
|
509 | 508 | // Фортифаер даёт бонус ко всему |
510 | 509 | $this->planet_bonus->add_unit_by_snid(MRC_FORTIFIER, $unit_count); |
511 | 510 | } |
512 | - } elseif($unit_type == UNIT_MERCENARIES) { |
|
513 | - if($unit_id == MRC_ADMIRAL) { |
|
511 | + } elseif ($unit_type == UNIT_MERCENARIES) { |
|
512 | + if ($unit_id == MRC_ADMIRAL) { |
|
514 | 513 | $this->players[$player_id]->player_bonus->add_unit_by_snid(MRC_ADMIRAL, $unit_count); |
515 | 514 | } |
516 | 515 | } |
@@ -565,7 +564,7 @@ discard block |
||
565 | 564 | |
566 | 565 | $ube->sn_ube_message_send(); |
567 | 566 | |
568 | - defined('DEBUG_UBE') ? die('DIE at ' . __FILE__ . ' ' . __LINE__) : false; |
|
567 | + defined('DEBUG_UBE') ? die('DIE at '.__FILE__.' '.__LINE__) : false; |
|
569 | 568 | |
570 | 569 | return false; |
571 | 570 | } |
@@ -580,7 +579,7 @@ discard block |
||
580 | 579 | |
581 | 580 | $ube_report = new UBEReport(); |
582 | 581 | $ube = $ube_report->sn_ube_report_load(sys_get_param_str('cypher')); |
583 | - if($ube != UBE_REPORT_NOT_FOUND) { |
|
582 | + if ($ube != UBE_REPORT_NOT_FOUND) { |
|
584 | 583 | $ube_report->sn_ube_report_generate($ube, $template_result); |
585 | 584 | |
586 | 585 | $template = gettemplate('ube_combat_report', $template); |
@@ -608,9 +607,9 @@ discard block |
||
608 | 607 | $ube->sn_ube_combat(); |
609 | 608 | $ube_report = new UBEReport(); |
610 | 609 | |
611 | - if(sys_get_param_str('reload')) { |
|
610 | + if (sys_get_param_str('reload')) { |
|
612 | 611 | $ube_new = $ube_report->sn_ube_report_load($ube->get_cypher()); // $combat_data = sn_ube_report_load($combat_data[UBE_REPORT_CYPHER]); |
613 | - if($ube_new != UBE_REPORT_NOT_FOUND && is_object($ube_new)) { |
|
612 | + if ($ube_new != UBE_REPORT_NOT_FOUND && is_object($ube_new)) { |
|
614 | 613 | $ube = $ube_new; |
615 | 614 | } |
616 | 615 | } |
@@ -658,7 +657,7 @@ discard block |
||
658 | 657 | $this->debris->load_from_report_row($report_row); |
659 | 658 | |
660 | 659 | $query = doquery("SELECT * FROM {{ube_report_player}} WHERE `ube_report_id` = {$report_row['ube_report_id']}"); |
661 | - while($player_row = db_fetch($query)) { |
|
660 | + while ($player_row = db_fetch($query)) { |
|
662 | 661 | $this->players->init_player_from_report_info($player_row); |
663 | 662 | } |
664 | 663 |
@@ -278,6 +278,9 @@ |
||
278 | 278 | return count($this->ube_side_present_at_round_start); |
279 | 279 | } |
280 | 280 | |
281 | + /** |
|
282 | + * @param integer $round |
|
283 | + */ |
|
281 | 284 | public function ubeAnalyzeFleetOutcome($round) { |
282 | 285 | $this->ube_actualize_sides(); |
283 | 286 |
@@ -82,13 +82,13 @@ discard block |
||
82 | 82 | */ |
83 | 83 | public function ube_db_load_fleets_outcome($report_row) { |
84 | 84 | $query = doquery("SELECT * FROM {{ube_report_outcome_fleet}} WHERE `ube_report_id` = {$report_row['ube_report_id']}"); |
85 | - while($row = db_fetch($query)) { |
|
85 | + while ($row = db_fetch($query)) { |
|
86 | 86 | $fleet_id = $row['ube_report_outcome_fleet_fleet_id']; |
87 | 87 | $this[$fleet_id]->load_outcome_from_report_row($row); |
88 | 88 | } |
89 | 89 | |
90 | 90 | $query = doquery("SELECT * FROM {{ube_report_outcome_unit}} WHERE `ube_report_id` = {$report_row['ube_report_id']} ORDER BY `ube_report_outcome_unit_sort_order`"); |
91 | - while($row = db_fetch($query)) { |
|
91 | + while ($row = db_fetch($query)) { |
|
92 | 92 | $fleet_id = $row['ube_report_outcome_unit_fleet_id']; |
93 | 93 | $this[$fleet_id]->load_unit_outcome_from_row($row); |
94 | 94 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | UBE_PLAYER_IS_DEFENDER => array(), |
109 | 109 | ); |
110 | 110 | |
111 | - foreach($this->_container as $fleet_id => $UBEFleet) { |
|
111 | + foreach ($this->_container as $fleet_id => $UBEFleet) { |
|
112 | 112 | $result[$UBEFleet->is_attacker][] = array( |
113 | 113 | 'ID' => $fleet_id, |
114 | 114 | 'NAME' => $ube->players[$UBEFleet->owner_id]->name, |
@@ -131,11 +131,11 @@ discard block |
||
131 | 131 | */ |
132 | 132 | public function ube_analyze_fleets($is_simulator, UBEDebris $debris, array $resource_exchange_rates) { |
133 | 133 | // Генерируем результат боя |
134 | - foreach($this->_container as $fleet_id => $UBEFleet) { |
|
134 | + foreach ($this->_container as $fleet_id => $UBEFleet) { |
|
135 | 135 | // Инициализируем массив результатов для флота |
136 | 136 | // $this->init_fleet_outcome_and_link_to_side($UBEFleet); |
137 | 137 | |
138 | - foreach($UBEFleet->unit_list->_container as $UBEUnit) { |
|
138 | + foreach ($UBEFleet->unit_list->_container as $UBEUnit) { |
|
139 | 139 | $UBEUnit->ube_analyze_unit($is_simulator); |
140 | 140 | } |
141 | 141 | |
@@ -152,10 +152,10 @@ discard block |
||
152 | 152 | $this->resources_lost_in_metal = array( |
153 | 153 | RES_METAL => 0, |
154 | 154 | ); |
155 | - foreach($UBEFleet->resources_lost_on_units as $resource_id => $resource_amount) { |
|
155 | + foreach ($UBEFleet->resources_lost_on_units as $resource_id => $resource_amount) { |
|
156 | 156 | $UBEFleet->resources_lost_in_metal[RES_METAL] += $resource_amount * $resource_exchange_rates[$resource_id]; |
157 | 157 | } |
158 | - foreach($UBEFleet->cargo_dropped as $resource_id => $resource_amount) { |
|
158 | + foreach ($UBEFleet->cargo_dropped as $resource_id => $resource_amount) { |
|
159 | 159 | $UBEFleet->resources_lost_in_metal[RES_METAL] += $resource_amount * $resource_exchange_rates[$resource_id]; |
160 | 160 | } |
161 | 161 | } |
@@ -166,8 +166,8 @@ discard block |
||
166 | 166 | */ |
167 | 167 | public function ube_get_groups() { |
168 | 168 | $result = array(); |
169 | - foreach($this->_container as $UBEFleet) { |
|
170 | - if($UBEFleet->group_id) { |
|
169 | + foreach ($this->_container as $UBEFleet) { |
|
170 | + if ($UBEFleet->group_id) { |
|
171 | 171 | $result[$UBEFleet->group_id] = $UBEFleet->group_id; |
172 | 172 | } |
173 | 173 | } |
@@ -180,8 +180,8 @@ discard block |
||
180 | 180 | */ |
181 | 181 | public function ube_get_capacity_attackers() { |
182 | 182 | $result = 0; |
183 | - foreach($this->_container as $UBEFleet) { |
|
184 | - if($UBEFleet->is_attacker) { |
|
183 | + foreach ($this->_container as $UBEFleet) { |
|
184 | + if ($UBEFleet->is_attacker) { |
|
185 | 185 | $result += $UBEFleet->fleet_capacity; |
186 | 186 | } |
187 | 187 | } |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | */ |
196 | 196 | public function ube_db_load_from_report_row(array $report_row, UBE $ube) { |
197 | 197 | $query = doquery("SELECT * FROM {{ube_report_fleet}} WHERE `ube_report_id` = {$report_row['ube_report_id']}"); |
198 | - while($fleet_row = db_fetch($query)) { |
|
198 | + while ($fleet_row = db_fetch($query)) { |
|
199 | 199 | $objFleet = new UBEFleet(); |
200 | 200 | $objFleet->load_from_report($fleet_row, $ube); |
201 | 201 | $this[$objFleet->db_id] = $objFleet; |
@@ -209,20 +209,20 @@ discard block |
||
209 | 209 | * @version 2016-02-25 23:42:45 41a4.68 |
210 | 210 | */ |
211 | 211 | public function ube_prepare_for_next_round($is_simulator) { |
212 | - foreach($this->_container as $fleet_id => $UBEFleet) { |
|
212 | + foreach ($this->_container as $fleet_id => $UBEFleet) { |
|
213 | 213 | $UBEFleet->prepare_for_next_round($is_simulator); |
214 | 214 | } |
215 | 215 | |
216 | 216 | // Суммируем данные по атакующим и защитникам |
217 | 217 | $this->ube_total[UBE_PLAYER_IS_ATTACKER]->_reset(); |
218 | 218 | $this->ube_total[UBE_PLAYER_IS_DEFENDER]->_reset(); |
219 | - foreach($this->_container as $fleet_id => $UBEFleet) { |
|
219 | + foreach ($this->_container as $fleet_id => $UBEFleet) { |
|
220 | 220 | $this->ube_total[$UBEFleet->is_attacker]->add_unit_stats_array($UBEFleet->total_stats); |
221 | 221 | } |
222 | 222 | //pvar_dump($this->ube_total); |
223 | 223 | |
224 | 224 | // Высчитываем долю атаки, приходящейся на юнит равную отношению брони юнита к общей броне - крупные цели атакуют чаще |
225 | - foreach($this->_container as $fleet_id => $UBEFleet) { |
|
225 | + foreach ($this->_container as $fleet_id => $UBEFleet) { |
|
226 | 226 | $UBEFleet->calculate_unit_partial_data($this->ube_total[$UBEFleet->is_attacker]); |
227 | 227 | } |
228 | 228 | } |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | */ |
237 | 237 | public function ube_calculate_attack_results(UBE $ube) { |
238 | 238 | // Каждый флот атакует все |
239 | - foreach($this->_container as $attack_fleet_data) { |
|
239 | + foreach ($this->_container as $attack_fleet_data) { |
|
240 | 240 | defined('DEBUG_UBE') ? print("Fleet {$attack_fleet_data->db_id} attacks<br /><div style='margin-left: 30px;'>") : false; |
241 | 241 | |
242 | 242 | $attack_fleet_data->attack_fleets($this, $ube->is_simulator); |
@@ -251,8 +251,8 @@ discard block |
||
251 | 251 | * @version 2016-02-25 23:42:45 41a4.68 |
252 | 252 | */ |
253 | 253 | public function ube_actualize_sides() { |
254 | - foreach($this->_container as $UBEFleet) { |
|
255 | - if($UBEFleet->get_unit_count() > 0) { |
|
254 | + foreach ($this->_container as $UBEFleet) { |
|
255 | + if ($UBEFleet->get_unit_count() > 0) { |
|
256 | 256 | $this->ube_side_present_at_round_start[$UBEFleet->is_attacker] = 1; |
257 | 257 | } |
258 | 258 | } |
@@ -265,8 +265,8 @@ discard block |
||
265 | 265 | */ |
266 | 266 | public function ube_calculate_attack_reapers() { |
267 | 267 | $reapers = 0; |
268 | - foreach($this->_container as $fleet_id => $UBERoundFleetCombat) { |
|
269 | - if($UBERoundFleetCombat->is_attacker == UBE_PLAYER_IS_ATTACKER) { |
|
268 | + foreach ($this->_container as $fleet_id => $UBERoundFleetCombat) { |
|
269 | + if ($UBERoundFleetCombat->is_attacker == UBE_PLAYER_IS_ATTACKER) { |
|
270 | 270 | $reapers += $UBERoundFleetCombat->unit_list->unitCountReapers(); |
271 | 271 | } |
272 | 272 | } |
@@ -283,10 +283,10 @@ discard block |
||
283 | 283 | |
284 | 284 | $result = UBE_COMBAT_RESULT_DRAW; |
285 | 285 | // Проверяем результат боя |
286 | - if($this->ube_get_sides_count() == 0 || $round >= 10) { |
|
286 | + if ($this->ube_get_sides_count() == 0 || $round >= 10) { |
|
287 | 287 | // Если кого-то не осталось или не осталось обоих - заканчиваем цикл |
288 | 288 | $result = UBE_COMBAT_RESULT_DRAW_END; |
289 | - } elseif($this->ube_get_sides_count() == 1) { |
|
289 | + } elseif ($this->ube_get_sides_count() == 1) { |
|
290 | 290 | // Если осталась одна сторона - она и выиграла |
291 | 291 | $result = isset($this->ube_side_present_at_round_start[UBE_PLAYER_IS_ATTACKER]) ? UBE_COMBAT_RESULT_WIN : UBE_COMBAT_RESULT_LOSS; |
292 | 292 | } |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | * @version 41a6.16 |
304 | 304 | */ |
305 | 305 | public function ubeInitGetAttackers(Fleet $objFleet, UBEPlayerList $players) { |
306 | - if($objFleet->group_id) { |
|
306 | + if ($objFleet->group_id) { |
|
307 | 307 | $fleets_added = $this->dbLoadWhere("`fleet_group` = {$objFleet->group_id}"); |
308 | 308 | } else { |
309 | 309 | $this->ube_insert_from_Fleet($objFleet); |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | /** |
8 | 8 | * @param UBE $ube |
9 | 9 | * |
10 | - * @return bool|string |
|
10 | + * @return false|string |
|
11 | 11 | * |
12 | 12 | * @version 2016-02-25 23:42:45 41a4.68 |
13 | 13 | */ |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | // ------------------------------------------------------------------------------------------------ |
187 | 187 | // Читает боевой отчет из БД |
188 | 188 | /** |
189 | - * @param $report_cypher |
|
189 | + * @param string $report_cypher |
|
190 | 190 | * |
191 | 191 | * @return string|UBE |
192 | 192 | */ |
@@ -13,14 +13,14 @@ discard block |
||
13 | 13 | */ |
14 | 14 | function sn_ube_report_save($ube) { |
15 | 15 | // Если уже есть ИД репорта - значит репорт был взят из таблицы. С таким мы не работаем |
16 | - if($ube->get_cypher()) { |
|
16 | + if ($ube->get_cypher()) { |
|
17 | 17 | return false; |
18 | 18 | } |
19 | 19 | |
20 | 20 | // Генерируем уникальный секретный ключ и проверяем наличие в базе |
21 | 21 | do { |
22 | 22 | $ube->report_cypher = sys_random_string(32); |
23 | - } while(doquery("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE", true)); |
|
23 | + } while (doquery("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE", true)); |
|
24 | 24 | |
25 | 25 | // Инициализация таблицы для пакетной вставки информации |
26 | 26 | $sql_perform = array( |
@@ -108,24 +108,24 @@ discard block |
||
108 | 108 | $sql_str = "INSERT INTO `{{ube_report}}` |
109 | 109 | SET |
110 | 110 | `ube_report_cypher` = '{$ube->report_cypher}', |
111 | - `ube_report_time_combat` = '" . date(FMT_DATE_TIME_SQL, $ube->combat_timestamp) . "', |
|
111 | + `ube_report_time_combat` = '".date(FMT_DATE_TIME_SQL, $ube->combat_timestamp)."', |
|
112 | 112 | `ube_report_time_spent` = {$ube->time_spent}, |
113 | 113 | |
114 | - `ube_report_combat_admin` = " . (int)$ube->is_admin_in_combat . ", |
|
114 | + `ube_report_combat_admin` = ".(int) $ube->is_admin_in_combat.", |
|
115 | 115 | `ube_report_mission_type` = {$ube->mission_type_id}, |
116 | 116 | |
117 | 117 | `ube_report_combat_result` = {$ube->combat_result}, |
118 | - `ube_report_combat_sfr` = " . (int)$ube->is_small_fleet_recce . ", |
|
118 | + `ube_report_combat_sfr` = ".(int) $ube->is_small_fleet_recce.", |
|
119 | 119 | |
120 | - `ube_report_planet_id` = " . (int)$ube->ube_planet_info[PLANET_ID] . ", |
|
121 | - `ube_report_planet_name` = '" . db_escape($ube->ube_planet_info[PLANET_NAME]) . "', |
|
122 | - `ube_report_planet_size` = " . (int)$ube->ube_planet_info[PLANET_SIZE] . ", |
|
123 | - `ube_report_planet_galaxy` = " . (int)$ube->ube_planet_info[PLANET_GALAXY] . ", |
|
124 | - `ube_report_planet_system` = " . (int)$ube->ube_planet_info[PLANET_SYSTEM] . ", |
|
125 | - `ube_report_planet_planet` = " . (int)$ube->ube_planet_info[PLANET_PLANET] . ", |
|
126 | - `ube_report_planet_planet_type` = " . (int)$ube->ube_planet_info[PLANET_TYPE] . ", |
|
120 | + `ube_report_planet_id` = " . (int) $ube->ube_planet_info[PLANET_ID].", |
|
121 | + `ube_report_planet_name` = '" . db_escape($ube->ube_planet_info[PLANET_NAME])."', |
|
122 | + `ube_report_planet_size` = " . (int) $ube->ube_planet_info[PLANET_SIZE].", |
|
123 | + `ube_report_planet_galaxy` = " . (int) $ube->ube_planet_info[PLANET_GALAXY].", |
|
124 | + `ube_report_planet_system` = " . (int) $ube->ube_planet_info[PLANET_SYSTEM].", |
|
125 | + `ube_report_planet_planet` = " . (int) $ube->ube_planet_info[PLANET_PLANET].", |
|
126 | + `ube_report_planet_planet_type` = " . (int) $ube->ube_planet_info[PLANET_TYPE].", |
|
127 | 127 | |
128 | - `ube_report_capture_result` = " . (int)$ube->capture_result . ", " |
|
128 | + `ube_report_capture_result` = " . (int) $ube->capture_result.", " |
|
129 | 129 | . $ube->debris->report_generate_sql() |
130 | 130 | . $ube->moon_calculator->report_generate_sql(); |
131 | 131 | |
@@ -134,22 +134,22 @@ discard block |
||
134 | 134 | |
135 | 135 | // Сохраняем общую информацию по игрокам |
136 | 136 | $player_sides = $ube->players->get_player_sides(); |
137 | - foreach($player_sides as $player_id => $player_side) { |
|
137 | + foreach ($player_sides as $player_id => $player_side) { |
|
138 | 138 | $sql_perform['ube_report_player'][] = array( |
139 | 139 | $ube_report_id, |
140 | 140 | $player_id, |
141 | 141 | |
142 | - "'" . db_escape($ube->players[$player_id]->name) . "'", |
|
142 | + "'".db_escape($ube->players[$player_id]->name)."'", |
|
143 | 143 | $ube->players[$player_id]->getSide() == UBE_PLAYER_IS_ATTACKER ? 1 : 0, |
144 | 144 | |
145 | - (float)$ube->players[$player_id]->player_bonus->calcBonus(P_ATTACK), |
|
146 | - (float)$ube->players[$player_id]->player_bonus->calcBonus(P_SHIELD), |
|
147 | - (float)$ube->players[$player_id]->player_bonus->calcBonus(P_ARMOR), |
|
145 | + (float) $ube->players[$player_id]->player_bonus->calcBonus(P_ATTACK), |
|
146 | + (float) $ube->players[$player_id]->player_bonus->calcBonus(P_SHIELD), |
|
147 | + (float) $ube->players[$player_id]->player_bonus->calcBonus(P_ARMOR), |
|
148 | 148 | ); |
149 | 149 | } |
150 | 150 | |
151 | 151 | // Всякая информация по флотам |
152 | - foreach($ube->fleet_list->_container as $fleet_id => $UBEFleet) { |
|
152 | + foreach ($ube->fleet_list->_container as $fleet_id => $UBEFleet) { |
|
153 | 153 | // Сохраняем общую информацию по флотам |
154 | 154 | $sql_perform['ube_report_fleet'][] = $UBEFleet->sql_generate_array($ube_report_id); |
155 | 155 | |
@@ -165,16 +165,16 @@ discard block |
||
165 | 165 | $ube->rounds->sql_generate_unit_array($sql_perform['ube_report_unit'], $ube_report_id, $ube->fleet_list); |
166 | 166 | |
167 | 167 | // Пакетная вставка данных |
168 | - foreach($sql_perform as $table_name => $table_data) { |
|
169 | - if(count($table_data) < 2) { |
|
168 | + foreach ($sql_perform as $table_name => $table_data) { |
|
169 | + if (count($table_data) < 2) { |
|
170 | 170 | continue; |
171 | 171 | } |
172 | - foreach($table_data as &$record_data) { |
|
173 | - $record_data = '(' . implode(',', $record_data) . ')'; |
|
172 | + foreach ($table_data as &$record_data) { |
|
173 | + $record_data = '('.implode(',', $record_data).')'; |
|
174 | 174 | } |
175 | 175 | $fields = $table_data[0]; |
176 | 176 | unset($table_data[0]); |
177 | - doquery("INSERT INTO {{{$table_name}}} {$fields} VALUES " . implode(',', $table_data)); |
|
177 | + doquery("INSERT INTO {{{$table_name}}} {$fields} VALUES ".implode(',', $table_data)); |
|
178 | 178 | } |
179 | 179 | |
180 | 180 | return $ube->report_cypher; |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | $report_cypher = db_escape($report_cypher); |
193 | 193 | |
194 | 194 | $report_row = doquery("SELECT * FROM {{ube_report}} WHERE ube_report_cypher = '{$report_cypher}' LIMIT 1", true); |
195 | - if(!$report_row) { |
|
195 | + if (!$report_row) { |
|
196 | 196 | return UBE_REPORT_NOT_FOUND; |
197 | 197 | } |
198 | 198 | |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | * @param $template_result |
209 | 209 | */ |
210 | 210 | function sn_ube_report_generate(UBE $ube, &$template_result) { |
211 | - if(!is_object($ube)) { |
|
211 | + if (!is_object($ube)) { |
|
212 | 212 | return; |
213 | 213 | } |
214 | 214 | |
@@ -223,15 +223,15 @@ discard block |
||
223 | 223 | |
224 | 224 | // Координаты, тип и название планеты - если есть |
225 | 225 | //R $planet_owner_id = $combat_data[UBE_FLEETS][0][UBE_OWNER]; |
226 | - if(isset($ube->ube_planet_info)) { |
|
226 | + if (isset($ube->ube_planet_info)) { |
|
227 | 227 | $template_result += $ube->ube_planet_info; |
228 | 228 | $template_result[PLANET_NAME] = str_replace(' ', ' ', htmlentities($template_result[PLANET_NAME], ENT_COMPAT, 'UTF-8')); |
229 | 229 | } |
230 | 230 | |
231 | 231 | // Обломки |
232 | 232 | $debris = array(); |
233 | - foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) { |
|
234 | - if($resource_amount = $ube->debris->debris_get_resource($resource_id)) { |
|
233 | + foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id) { |
|
234 | + if ($resource_amount = $ube->debris->debris_get_resource($resource_id)) { |
|
235 | 235 | $debris[] = array( |
236 | 236 | 'NAME' => classLocale::$lang['tech'][$resource_id], |
237 | 237 | 'AMOUNT' => pretty_number($resource_amount), |
@@ -293,7 +293,7 @@ |
||
293 | 293 | } |
294 | 294 | |
295 | 295 | /** |
296 | - * @param $ranklist |
|
296 | + * @param string $ranklist |
|
297 | 297 | * @param $user |
298 | 298 | */ |
299 | 299 | function db_ally_update_ranklist($ranklist, $user) { |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | `ally_name` = '{$ally_name}', |
65 | 65 | `ally_tag` = '{$ally_tag}', |
66 | 66 | `ally_owner` = '{$user['id']}', |
67 | - `ally_owner_range` = '" . classLocale::$lang['ali_leaderRank'] . "', |
|
67 | + `ally_owner_range` = '".classLocale::$lang['ali_leaderRank']."', |
|
68 | 68 | `ally_members` = 1, |
69 | - `ranklist` = '" . classLocale::$lang['ali_defaultRankName'] . ",0,0,0,0,0', |
|
69 | + `ranklist` = '" . classLocale::$lang['ali_defaultRankName'].",0,0,0,0,0', |
|
70 | 70 | `ally_register_time`= " . SN_TIME_NOW |
71 | 71 | ); |
72 | 72 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @param $POST_text |
86 | 86 | */ |
87 | 87 | function db_ally_request_insert($user, $id_ally, $POST_text) { |
88 | - doquery("INSERT INTO {{alliance_requests}} SET `id_user` = {$user['id']}, `id_ally`='{$id_ally}', request_text ='{$POST_text}', request_time=" . SN_TIME_NOW . ";"); |
|
88 | + doquery("INSERT INTO {{alliance_requests}} SET `id_user` = {$user['id']}, `id_ally`='{$id_ally}', request_text ='{$POST_text}', request_time=".SN_TIME_NOW.";"); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * @param $ally |
136 | 136 | */ |
137 | 137 | function db_ally_update_by_changeset($ally_changeset, $ally) { |
138 | - doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;"); |
|
138 | + doquery("UPDATE {{alliance}} SET ".implode(',', $ally_changeset)." WHERE `id`='{$ally['id']}' LIMIT 1;"); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | /** |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | * @param $d |
247 | 247 | */ |
248 | 248 | function db_ally_request_deny($d) { |
249 | - doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '" . classLocale::$lang['ali_req_deny_reason'] . "' WHERE `id_user`= {$d} LIMIT 1;"); |
|
249 | + doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '".classLocale::$lang['ali_req_deny_reason']."' WHERE `id_user`= {$d} LIMIT 1;"); |
|
250 | 250 | } |
251 | 251 | |
252 | 252 | /** |
@@ -17,9 +17,9 @@ discard block |
||
17 | 17 | |
18 | 18 | /** |
19 | 19 | * @param $user_id |
20 | - * @param $nick |
|
20 | + * @param string $nick |
|
21 | 21 | * @param $ally_id |
22 | - * @param $message |
|
22 | + * @param string $message |
|
23 | 23 | * @param $chat_message_sender_name |
24 | 24 | * @param $chat_message_recipient_id |
25 | 25 | * @param $chat_message_recipient_name |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * @param $alliance |
56 | 56 | * @param $where_add |
57 | 57 | * @param $start_row |
58 | - * @param $page_limit |
|
58 | + * @param integer $page_limit |
|
59 | 59 | * |
60 | 60 | * @return array|bool|mysqli_result|null |
61 | 61 | */ |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | JOIN {{users}} AS u ON u.id = cp.chat_player_player_id |
11 | 11 | WHERE |
12 | 12 | `chat_player_refresh_last` >= '{$sql_date}' |
13 | - AND (`banaday` IS NULL OR `banaday` <= " . SN_TIME_NOW . ") |
|
13 | + AND (`banaday` IS NULL OR `banaday` <= ".SN_TIME_NOW.") |
|
14 | 14 | {$ally_add} |
15 | 15 | ORDER BY authlevel DESC, `username`"); |
16 | 16 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | `user` = '{$nick}', |
34 | 34 | `ally_id` = '{$ally_id}', |
35 | 35 | `message` = '{$message}', |
36 | - `timestamp` = " . SN_TIME_NOW . ", |
|
36 | + `timestamp` = ".SN_TIME_NOW.", |
|
37 | 37 | `chat_message_sender_name` = '{$chat_message_sender_name}', |
38 | 38 | `chat_message_recipient_id` = {$chat_message_recipient_id}, |
39 | 39 | `chat_message_recipient_name` = '{$chat_message_recipient_name}'" |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | * @param $user |
140 | 140 | */ |
141 | 141 | function db_chat_player_update($user) { |
142 | - doquery("UPDATE {{chat_player}} SET `chat_player_refresh_last` = " . SN_TIME_NOW . " WHERE `chat_player_player_id` = {$user['id']} LIMIT 1;"); |
|
142 | + doquery("UPDATE {{chat_player}} SET `chat_player_refresh_last` = ".SN_TIME_NOW." WHERE `chat_player_player_id` = {$user['id']} LIMIT 1;"); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | |
@@ -211,5 +211,5 @@ discard block |
||
211 | 211 | * @param $user |
212 | 212 | */ |
213 | 213 | function db_chat_player_update_activity($user) { |
214 | - doquery("UPDATE {{chat_player}} SET `chat_player_activity` = '" . classSupernova::$db->db_escape(SN_TIME_SQL) . "' WHERE `chat_player_player_id` = {$user['id']} LIMIT 1"); |
|
214 | + doquery("UPDATE {{chat_player}} SET `chat_player_activity` = '".classSupernova::$db->db_escape(SN_TIME_SQL)."' WHERE `chat_player_player_id` = {$user['id']} LIMIT 1"); |
|
215 | 215 | } |
@@ -79,9 +79,9 @@ discard block |
||
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
82 | - * @param $template |
|
83 | - * @param $query_where |
|
84 | - * @param $query_limit |
|
82 | + * @param template $template |
|
83 | + * @param string $query_where |
|
84 | + * @param integer $query_limit |
|
85 | 85 | * |
86 | 86 | * @return array|bool|mysqli_result|null |
87 | 87 | */ |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | * @param $user |
106 | 106 | * @param $survey_id |
107 | 107 | * @param $survey_vote_id |
108 | - * @param $user_name_safe |
|
108 | + * @param string $user_name_safe |
|
109 | 109 | */ |
110 | 110 | function db_survey_vote_insert(&$user, $survey_id, $survey_vote_id, $user_name_safe) { |
111 | 111 | doquery("INSERT INTO {{survey_votes}} SET `survey_parent_id` = {$survey_id}, `survey_parent_answer_id` = {$survey_vote_id}, `survey_vote_user_id` = {$user['id']}, `survey_vote_user_name` = '{$user_name_safe}';"); |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | function db_news_insert_set($announce_time, $text, $detail_url, $user) { |
13 | 13 | doquery("INSERT INTO {{announce}} |
14 | 14 | SET `tsTimeStamp` = FROM_UNIXTIME({$announce_time}), `strAnnounce`='{$text}', detail_url = '{$detail_url}', |
15 | - `user_id` = {$user['id']}, `user_name` = '" . db_escape($user['username']) . "'"); |
|
15 | + `user_id` = {$user['id']}, `user_name` = '".db_escape($user['username'])."'"); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | function db_survey_insert($announce_id, $survey_question, $survey_until) { |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | LEFT JOIN {{survey}} AS s ON s.survey_announce_id = a.idAnnounce |
94 | 94 | LEFT JOIN {{users}} AS u ON u.id = a.user_id |
95 | 95 | {$query_where} |
96 | - ORDER BY `tsTimeStamp` DESC, idAnnounce" . |
|
96 | + ORDER BY `tsTimeStamp` DESC, idAnnounce". |
|
97 | 97 | ($query_limit ? " LIMIT {$query_limit}" : '')); |
98 | 98 | |
99 | 99 | $template->assign_var('NEWS_COUNT', db_num_rows($announce_list)); |
@@ -69,8 +69,8 @@ |
||
69 | 69 | |
70 | 70 | /** |
71 | 71 | * @param Fleet $objFleet |
72 | - * @param $ov_label |
|
73 | - * @param $planet_end_type |
|
72 | + * @param integer $ov_label |
|
73 | + * @param integer $planet_end_type |
|
74 | 74 | * |
75 | 75 | * @return mixed |
76 | 76 | */ |
@@ -6,26 +6,26 @@ discard block |
||
6 | 6 | $fleet_events = array(); |
7 | 7 | $fleet_number = 0; |
8 | 8 | |
9 | - if($objFleetList->count() <= 0) { |
|
9 | + if ($objFleetList->count() <= 0) { |
|
10 | 10 | return; |
11 | 11 | } |
12 | 12 | |
13 | - foreach($objFleetList->_container as $objFleet) { |
|
13 | + foreach ($objFleetList->_container as $objFleet) { |
|
14 | 14 | $planet_start_type = $objFleet->fleet_start_type == PT_MOON ? PT_MOON : PT_PLANET; |
15 | 15 | $planet_start = db_planet_by_gspt($objFleet->fleet_start_galaxy, $objFleet->fleet_start_system, $objFleet->fleet_start_planet, $planet_start_type, false, 'name'); |
16 | 16 | $objFleet->fleet_start_name = $planet_start['name']; |
17 | 17 | |
18 | 18 | $planet_end_type = $objFleet->fleet_end_type == PT_MOON ? PT_MOON : PT_PLANET; |
19 | - if($objFleet->fleet_end_planet > Vector::$knownPlanets) { |
|
19 | + if ($objFleet->fleet_end_planet > Vector::$knownPlanets) { |
|
20 | 20 | $objFleet->fleet_end_name = classLocale::$lang['ov_fleet_exploration']; |
21 | - } elseif($objFleet->mission_type == MT_COLONIZE) { |
|
21 | + } elseif ($objFleet->mission_type == MT_COLONIZE) { |
|
22 | 22 | $objFleet->fleet_end_name = classLocale::$lang['ov_fleet_colonization']; |
23 | 23 | } else { |
24 | 24 | $planet_end = db_planet_by_gspt($objFleet->fleet_end_galaxy, $objFleet->fleet_end_system, $objFleet->fleet_end_planet, $planet_end_type, false, 'name'); |
25 | 25 | $objFleet->fleet_end_name = $planet_end['name']; |
26 | 26 | } |
27 | 27 | |
28 | - if($objFleet->time_arrive_to_target > SN_TIME_NOW && !$objFleet->isReturning() && $objFleet->mission_type != MT_MISSILE && |
|
28 | + if ($objFleet->time_arrive_to_target > SN_TIME_NOW && !$objFleet->isReturning() && $objFleet->mission_type != MT_MISSILE && |
|
29 | 29 | ($planet_scanned === false |
30 | 30 | || |
31 | 31 | ( |
@@ -39,11 +39,11 @@ discard block |
||
39 | 39 | $fleet_events[] = flt_register_event_objFleet($objFleet, 0, $planet_end_type); |
40 | 40 | } |
41 | 41 | |
42 | - if($objFleet->time_mission_job_complete > SN_TIME_NOW && !$objFleet->isReturning() && $planet_scanned === false && $objFleet->mission_type != MT_MISSILE) { |
|
42 | + if ($objFleet->time_mission_job_complete > SN_TIME_NOW && !$objFleet->isReturning() && $planet_scanned === false && $objFleet->mission_type != MT_MISSILE) { |
|
43 | 43 | $fleet_events[] = flt_register_event_objFleet($objFleet, 1, $planet_end_type); |
44 | 44 | } |
45 | 45 | |
46 | - if( |
|
46 | + if ( |
|
47 | 47 | $objFleet->time_return_to_source > SN_TIME_NOW && $objFleet->mission_type != MT_MISSILE && ($objFleet->isReturning() || ($objFleet->mission_type != MT_RELOCATE && $objFleet->mission_type != MT_COLONIZE)) && |
48 | 48 | ( |
49 | 49 | ($planet_scanned === false && $objFleet->playerOwnerId == $user['id']) |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $fleet_events[] = flt_register_event_objFleet($objFleet, 2, $planet_end_type); |
60 | 60 | } |
61 | 61 | |
62 | - if($objFleet->mission_type == MT_MISSILE) { |
|
62 | + if ($objFleet->mission_type == MT_MISSILE) { |
|
63 | 63 | $fleet_events[] = flt_register_event_objFleet($objFleet, 3, $planet_end_type); |
64 | 64 | } |
65 | 65 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | |
80 | 80 | $is_this_planet = false; |
81 | 81 | |
82 | - switch($objFleet->ov_label = $ov_label) { |
|
82 | + switch ($objFleet->ov_label = $ov_label) { |
|
83 | 83 | case 0: |
84 | 84 | $objFleet->event_time = $objFleet->time_arrive_to_target; |
85 | 85 | $is_this_planet = ( |
@@ -110,9 +110,9 @@ discard block |
||
110 | 110 | |
111 | 111 | } |
112 | 112 | |
113 | - $objFleet->ov_this_planet = $is_this_planet;// || $planet_scanned != false; |
|
113 | + $objFleet->ov_this_planet = $is_this_planet; // || $planet_scanned != false; |
|
114 | 114 | |
115 | - if($objFleet->playerOwnerId == $user['id']) { |
|
115 | + if ($objFleet->playerOwnerId == $user['id']) { |
|
116 | 116 | $user_data = $user; |
117 | 117 | } else { |
118 | 118 | $user_data = db_user_by_id($objFleet->playerOwnerId); |
@@ -185,6 +185,9 @@ |
||
185 | 185 | return $result; |
186 | 186 | } |
187 | 187 | |
188 | +/** |
|
189 | + * @param integer $que_id |
|
190 | + */ |
|
188 | 191 | function tpl_parse_planet_que($que, $planet, $que_id) { |
189 | 192 | $hangar_que = array(); |
190 | 193 | $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']]; |
@@ -2,8 +2,8 @@ discard block |
||
2 | 2 | |
3 | 3 | // Compare function to sort fleet in time order |
4 | 4 | function tpl_assign_fleet_compare($a, $b) { |
5 | - if($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) { |
|
6 | - if($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) { |
|
5 | + if ($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) { |
|
6 | + if ($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) { |
|
7 | 7 | return 0; |
8 | 8 | } |
9 | 9 | |
@@ -19,17 +19,17 @@ discard block |
||
19 | 19 | * @param string $js_name |
20 | 20 | */ |
21 | 21 | function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets') { |
22 | - if(!$fleets) { |
|
22 | + if (!$fleets) { |
|
23 | 23 | return; |
24 | 24 | } |
25 | 25 | |
26 | 26 | usort($fleets, 'tpl_assign_fleet_compare'); |
27 | 27 | |
28 | - foreach($fleets as $fleet_data) { |
|
28 | + foreach ($fleets as $fleet_data) { |
|
29 | 29 | $template->assign_block_vars($js_name, $fleet_data['fleet']); |
30 | 30 | |
31 | - if($fleet_data['ships']) { |
|
32 | - foreach($fleet_data['ships'] as $ship_data) { |
|
31 | + if ($fleet_data['ships']) { |
|
32 | + foreach ($fleet_data['ships'] as $ship_data) { |
|
33 | 33 | $template->assign_block_vars("{$js_name}.ships", $ship_data); |
34 | 34 | } |
35 | 35 | } |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | 'DEUTERIUM' => $fleet[RES_DEUTERIUM], |
51 | 51 | ); |
52 | 52 | |
53 | - foreach($fleet as $ship_id => $ship_amount) { |
|
54 | - if(in_array($ship_id, sn_get_groups('fleet'))) { |
|
53 | + foreach ($fleet as $ship_id => $ship_amount) { |
|
54 | + if (in_array($ship_id, sn_get_groups('fleet'))) { |
|
55 | 55 | $single_ship_data = get_ship_data($ship_id, $user_data); |
56 | 56 | $return['ships'][$ship_id] = array( |
57 | 57 | 'ID' => $ship_id, |
@@ -90,11 +90,11 @@ discard block |
||
90 | 90 | |
91 | 91 | $result = array(); |
92 | 92 | |
93 | - if(!$user_data) { |
|
93 | + if (!$user_data) { |
|
94 | 94 | $user_data = $user; |
95 | 95 | } |
96 | 96 | |
97 | - if(!$objFleet->isReturning() && $objFleet->mission_type == MT_ACS) { |
|
97 | + if (!$objFleet->isReturning() && $objFleet->mission_type == MT_ACS) { |
|
98 | 98 | $aks = db_acs_get_by_group_id($objFleet->group_id); |
99 | 99 | } |
100 | 100 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | 'MISSION' => $objFleet->mission_type, |
114 | 114 | 'MISSION_NAME' => classLocale::$lang['type_mission'][$objFleet->mission_type], |
115 | 115 | 'ACS' => !empty($aks['name']) ? $aks['name'] : (!empty($objFleet->group_id) ? $objFleet->group_id : ''), |
116 | - 'AMOUNT' => $spy_level >= 4 ? (pretty_number($objFleet->shipsGetTotal()) . (array_sum($fleet_resources) ? '+' : '')) : '?', |
|
116 | + 'AMOUNT' => $spy_level >= 4 ? (pretty_number($objFleet->shipsGetTotal()).(array_sum($fleet_resources) ? '+' : '')) : '?', |
|
117 | 117 | |
118 | 118 | 'METAL' => $spy_level >= 8 ? $fleet_resources[RES_METAL] : 0, |
119 | 119 | 'CRYSTAL' => $spy_level >= 8 ? $fleet_resources[RES_CRYSTAL] : 0, |
@@ -135,14 +135,14 @@ discard block |
||
135 | 135 | 'STAY_LEFT' => floor($objFleet->time_mission_job_complete + 1 - SN_TIME_NOW), |
136 | 136 | ); |
137 | 137 | |
138 | - if(property_exists($objFleet, 'fleet_start_name')) { |
|
138 | + if (property_exists($objFleet, 'fleet_start_name')) { |
|
139 | 139 | $result['START_NAME'] = $objFleet->fleet_start_name; |
140 | 140 | } |
141 | - if(property_exists($objFleet, 'fleet_end_name')) { |
|
141 | + if (property_exists($objFleet, 'fleet_end_name')) { |
|
142 | 142 | $result['END_NAME'] = $objFleet->fleet_end_name; |
143 | 143 | } |
144 | 144 | |
145 | - if(property_exists($objFleet, 'event_time')) { |
|
145 | + if (property_exists($objFleet, 'event_time')) { |
|
146 | 146 | $result['fleet'] = array_merge($result['fleet'], array( |
147 | 147 | 'OV_LABEL' => $objFleet->ov_label, |
148 | 148 | 'EVENT_TIME_TEXT' => property_exists($objFleet, 'event_time') ? date(FMT_DATE_TIME, $objFleet->event_time + SN_CLIENT_TIME_DIFF) : '', |
@@ -155,9 +155,9 @@ discard block |
||
155 | 155 | |
156 | 156 | $ship_id = 0; |
157 | 157 | $result['ships'] = array(); |
158 | - if($spy_level >= 6) { |
|
159 | - foreach($ship_list_fully_parsed as $ship_sn_id => $ship_amount) { |
|
160 | - if($spy_level >= 10) { |
|
158 | + if ($spy_level >= 6) { |
|
159 | + foreach ($ship_list_fully_parsed as $ship_sn_id => $ship_amount) { |
|
160 | + if ($spy_level >= 10) { |
|
161 | 161 | $single_ship_data = get_ship_data($ship_sn_id, $user_data); |
162 | 162 | $result['ships'][$ship_sn_id] = array( |
163 | 163 | 'ID' => $ship_sn_id, |
@@ -190,8 +190,8 @@ discard block |
||
190 | 190 | function tpl_parse_planet_que($que, $planet, $que_id) { |
191 | 191 | $hangar_que = array(); |
192 | 192 | $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']]; |
193 | - if(!empty($que_hangar)) { |
|
194 | - foreach($que_hangar as $que_item) { |
|
193 | + if (!empty($que_hangar)) { |
|
194 | + foreach ($que_hangar as $que_item) { |
|
195 | 195 | $hangar_que['que'][] = array('id' => $que_item['que_unit_id'], 'count' => $que_item['que_unit_amount']); |
196 | 196 | $hangar_que[$que_item['que_unit_id']] += $que_item['que_unit_amount']; |
197 | 197 | } |
@@ -251,10 +251,10 @@ discard block |
||
251 | 251 | 'PLANET_GOVERNOR_LEVEL_MAX' => get_unit_param($planet['PLANET_GOVERNOR_ID'], P_MAX_STACK), |
252 | 252 | ); |
253 | 253 | |
254 | - if(!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) { |
|
254 | + if (!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) { |
|
255 | 255 | $result['building_que'] = array(); |
256 | 256 | $building_que = &$que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']]; |
257 | - foreach($building_que as $que_element) { |
|
257 | + foreach ($building_que as $que_element) { |
|
258 | 258 | $result['building_que'][] = que_tpl_parse_element($que_element); |
259 | 259 | } |
260 | 260 | } |
@@ -270,19 +270,19 @@ discard block |
||
270 | 270 | function flt_get_fleets_to_planet_by_array_of_Fleet($array_of_Fleet) { |
271 | 271 | global $user; |
272 | 272 | |
273 | - if(empty($array_of_Fleet)) { |
|
273 | + if (empty($array_of_Fleet)) { |
|
274 | 274 | return false; |
275 | 275 | } |
276 | 276 | |
277 | 277 | $fleet_list = array(); |
278 | - foreach($array_of_Fleet as $fleet) { |
|
279 | - if($fleet->playerOwnerId == $user['id']) { |
|
280 | - if($fleet->mission_type == MT_MISSILE) { |
|
278 | + foreach ($array_of_Fleet as $fleet) { |
|
279 | + if ($fleet->playerOwnerId == $user['id']) { |
|
280 | + if ($fleet->mission_type == MT_MISSILE) { |
|
281 | 281 | continue; |
282 | 282 | } |
283 | 283 | $fleet_ownage = 'own'; |
284 | 284 | } else { |
285 | - switch($fleet->mission_type) { |
|
285 | + switch ($fleet->mission_type) { |
|
286 | 286 | case MT_ATTACK: |
287 | 287 | case MT_ACS: |
288 | 288 | case MT_DESTROY: |
@@ -299,10 +299,10 @@ discard block |
||
299 | 299 | |
300 | 300 | $fleet_list[$fleet_ownage]['fleets'][$fleet->dbId] = $fleet; |
301 | 301 | |
302 | - if($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) { |
|
302 | + if ($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) { |
|
303 | 303 | $fleet_sn = $fleet->shipsGetArray(); |
304 | - foreach($fleet_sn as $ship_id => $ship_amount) { |
|
305 | - if(in_array($ship_id, sn_get_groups('fleet'))) { |
|
304 | + foreach ($fleet_sn as $ship_id => $ship_amount) { |
|
305 | + if (in_array($ship_id, sn_get_groups('fleet'))) { |
|
306 | 306 | $fleet_list[$fleet_ownage]['total'][$ship_id] += $ship_amount; |
307 | 307 | } |
308 | 308 | } |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | return $fleet_list; |
320 | 320 | } |
321 | 321 | |
322 | -function tpl_set_resource_info(template &$template, $planet_row, $fleets_to_planet = array(), $round = 0) { |
|
322 | +function tpl_set_resource_info(template & $template, $planet_row, $fleets_to_planet = array(), $round = 0) { |
|
323 | 323 | $template->assign_vars(array( |
324 | 324 | 'RESOURCE_ROUNDING' => $round, |
325 | 325 |
@@ -1,5 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | +/** |
|
4 | + * @param string $type |
|
5 | + */ |
|
3 | 6 | function sn_ube_simulator_encode_replay($combat, $type) |
4 | 7 | { |
5 | 8 | $strPacked = "{$type}!"; |
@@ -4,9 +4,9 @@ discard block |
||
4 | 4 | { |
5 | 5 | $strPacked = "{$type}!"; |
6 | 6 | |
7 | - foreach($combat as $fleetID => $fleetCompress) |
|
7 | + foreach ($combat as $fleetID => $fleetCompress) |
|
8 | 8 | { |
9 | - foreach($fleetCompress as $key => $value) |
|
9 | + foreach ($fleetCompress as $key => $value) |
|
10 | 10 | { |
11 | 11 | $value = intval($value); |
12 | 12 | $strPacked .= "{$key},{$value};"; |
@@ -22,29 +22,29 @@ discard block |
||
22 | 22 | $fleet_id = 0; |
23 | 23 | |
24 | 24 | $arr_data_unpacked = explode('!', $str_data); |
25 | - foreach($arr_data_unpacked as $data_piece) |
|
25 | + foreach ($arr_data_unpacked as $data_piece) |
|
26 | 26 | { |
27 | - if(!$data_piece) |
|
27 | + if (!$data_piece) |
|
28 | 28 | { |
29 | 29 | continue; |
30 | 30 | } |
31 | 31 | |
32 | - if($data_piece == 'A' || $data_piece == 'D') |
|
32 | + if ($data_piece == 'A' || $data_piece == 'D') |
|
33 | 33 | { |
34 | 34 | $fleet_type = $data_piece; |
35 | 35 | continue; |
36 | 36 | } |
37 | 37 | |
38 | 38 | $arr_unit_strings = explode(';', $data_piece); |
39 | - foreach($arr_unit_strings as $str_unit_string) |
|
39 | + foreach ($arr_unit_strings as $str_unit_string) |
|
40 | 40 | { |
41 | - if(!$str_unit_string) |
|
41 | + if (!$str_unit_string) |
|
42 | 42 | { |
43 | 43 | continue; |
44 | 44 | } |
45 | 45 | |
46 | 46 | $arr_unit_data = explode(',', $str_unit_string); |
47 | - if($arr_unit_data[1]) |
|
47 | + if ($arr_unit_data[1]) |
|
48 | 48 | { |
49 | 49 | $unpacked[$fleet_type][$fleet_id][$arr_unit_data[0]] = intval($arr_unit_data[1]); |
50 | 50 | } |