supernova-ws / SuperNova

includes/includes/ube_attack_calculate.php

Spacing +3 added lines, -4 removed lines

@@ -165,8 +165,7 @@ 
     $planet_info[PLANET_SYSTEM],
     $planet_info[PLANET_PLANET],
     htmlentities($planet_info[PLANET_NAME], ENT_COMPAT, 'UTF-8'),
-    $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')]
+    $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')]
   );
 
   $text_defender = '';
@@ -251,7 +250,7 @@ 
       // Просматриваем результаты изменения флотов
       foreach ($fleet_info[UBE_COUNT] as $unit_id => $unit_count) {
         // Перебираем аутком на случай восстановления юнитов
-        $units_lost = (float)$fleets_outcome[$fleet_id][UBE_UNITS_LOST][$unit_id];
+        $units_lost = (float) $fleets_outcome[$fleet_id][UBE_UNITS_LOST][$unit_id];
 
         $units_left = $unit_count - $units_lost;
         if ($fleet_id) {
@@ -275,7 +274,7 @@ 
     // Если во флоте остались юниты или это планета - генерируем изменение ресурсов
     if ($new_fleet_count || !$fleet_id) {
       foreach (sn_get_groups('resources_loot') as $resource_id) {
-        $resource_change = (float)$fleets_outcome[$fleet_id][UBE_RESOURCES_LOOTED][$resource_id] + (float)$fleets_outcome[$fleet_id][UBE_CARGO_DROPPED][$resource_id];
+        $resource_change = (float) $fleets_outcome[$fleet_id][UBE_RESOURCES_LOOTED][$resource_id] + (float) $fleets_outcome[$fleet_id][UBE_CARGO_DROPPED][$resource_id];
         if ($resource_change) {
           $resource_db_name = ($fleet_id ? 'fleet_resource_' : '') . pname_resource_name($resource_id);
           $fleet_delta[$resource_db_name] = -($resource_change);

Braces +6 added lines, -2 removed lines

@@ -290,10 +290,12 @@ 
       }
     }
 
-    if ($fleet_id) // Не планета
+    if ($fleet_id) {
+      // Не планета
     {
       if ($fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS && $outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_DIED) {
         $new_fleet_count = 0;
+    }
       }
 
       if ($new_fleet_count) {
@@ -316,10 +318,12 @@ 
         }
         DBStaticPlanet::db_planet_set_by_id($planet_id, implode(',', $temp));
       }
-      if (!empty($db_changeset)) // Сохраняем изменения юнитов на планете - если они есть
+      if (!empty($db_changeset)) {
+        // Сохраняем изменения юнитов на планете - если они есть
       {
         OldDbChangeSet::db_changeset_apply($db_changeset);
       }
+      }
     }
   }
 

classes/Ube/Ube4_1/Ube4_1Calc.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
         // Для не-симулятора - рандомизируем каждый раунд значения атаки и щитов
         $fleet_data[UBE_ATTACK_BASE][$unit_id] = floor($fleet_info[UBE_ATTACK][$unit_id] * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
         $fleet_data[UBE_SHIELD_BASE][$unit_id] = floor($fleet_info[UBE_SHIELD][$unit_id] * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
-        $fleet_data[UBE_ARMOR_BASE][$unit_id] = floor($fleet_info[UBE_ARMOR][$unit_id]);// * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
+        $fleet_data[UBE_ARMOR_BASE][$unit_id] = floor($fleet_info[UBE_ARMOR][$unit_id]); // * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
 
         $fleet_data[UBE_ATTACK][$unit_id] = $fleet_data[UBE_ATTACK_BASE][$unit_id] * $unit_count;
         $fleet_data[UBE_SHIELD][$unit_id] = $fleet_data[UBE_SHIELD_BASE][$unit_id] * $unit_count;

Braces +6 added lines, -2 removed lines

@@ -300,10 +300,12 @@ 
 // ------------------------------------------------------------------------------------------------
   protected function sn_ube_combat_analyze_moon(&$outcome, $is_simulator) {
     $outcome[UBE_DEBRIS_TOTAL] = 0;
-    foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
+    foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+      // TODO via array
     {
       $outcome[UBE_DEBRIS_TOTAL] += $outcome[UBE_DEBRIS][$resource_id];
     }
+    }
 
     if ($outcome[UBE_DEBRIS_TOTAL]) {
       // TODO uni_calculate_moon_chance
@@ -323,9 +325,11 @@ 
             $moon_debris_left_percent = ($outcome[UBE_DEBRIS_TOTAL] - $moon_debris_spent) / $outcome[UBE_DEBRIS_TOTAL];
 
             $outcome[UBE_DEBRIS_TOTAL] = 0;
-            foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
+            foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+              // TODO via array
             {
               $outcome[UBE_DEBRIS][$resource_id] = floor($outcome[UBE_DEBRIS][$resource_id] * $moon_debris_left_percent);
+            }
               $outcome[UBE_DEBRIS_TOTAL] += $outcome[UBE_DEBRIS][$resource_id];
             }
           }