@@ -165,8 +165,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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); |
@@ -118,7 +118,7 @@ |
||
| 118 | 118 | // Для не-симулятора - рандомизируем каждый раунд значения атаки и щитов |
| 119 | 119 | $fleet_data[UBE_ATTACK_BASE][$unit_id] = floor($fleet_info[UBE_ATTACK][$unit_id] * ($is_simulator ? 1 : mt_rand(80, 120) / 100)); |
| 120 | 120 | $fleet_data[UBE_SHIELD_BASE][$unit_id] = floor($fleet_info[UBE_SHIELD][$unit_id] * ($is_simulator ? 1 : mt_rand(80, 120) / 100)); |
| 121 | - $fleet_data[UBE_ARMOR_BASE][$unit_id] = floor($fleet_info[UBE_ARMOR][$unit_id]);// * ($is_simulator ? 1 : mt_rand(80, 120) / 100)); |
|
| 121 | + $fleet_data[UBE_ARMOR_BASE][$unit_id] = floor($fleet_info[UBE_ARMOR][$unit_id]); // * ($is_simulator ? 1 : mt_rand(80, 120) / 100)); |
|
| 122 | 122 | |
| 123 | 123 | $fleet_data[UBE_ATTACK][$unit_id] = $fleet_data[UBE_ATTACK_BASE][$unit_id] * $unit_count; |
| 124 | 124 | $fleet_data[UBE_SHIELD][$unit_id] = $fleet_data[UBE_SHIELD_BASE][$unit_id] * $unit_count; |