Completed
Push — work-fleets ( 9522d3...bdccb3 )
by SuperNova.WS
05:13
created
flotenajax.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
   $target_mission = sys_get_param_int('mission');
40 40
   $sn_group_missions = sn_get_groups('missions');
41
-  if(empty($sn_group_missions[$target_mission]['AJAX'])) {
41
+  if (empty($sn_group_missions[$target_mission]['AJAX'])) {
42 42
     die(classLocale::$lang['gs_c00']);
43 43
   }
44 44
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
   );
54 54
   // fleet_ajax now can send fleets only to existing planets/moons
55 55
   // TODO - sending colonization and expeditions in 1 click
56
-  if(!uni_coordinates_valid($target_coord)) {
56
+  if (!uni_coordinates_valid($target_coord)) {
57 57
     die(classLocale::$lang['gs_c02']);
58 58
   }
59 59
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
   // TODO - DEADLOCK CAN BE HERE!!!! We should lock SOURCE and TARGET owners in one query
66 66
   $target_row = db_planet_by_vector($target_coord);
67
-  if(empty($target_row)) {
67
+  if (empty($target_row)) {
68 68
     $target_row = $target_coord;
69 69
     $target_row['id_owner'] = 0;
70 70
     // If fleet destination is PT_DEBRIS - then it's actually destination is PT_PLANET // TODO - REMOVE! Debris should be valid DESTINATION planet_type!
@@ -75,15 +75,15 @@  discard block
 block discarded – undo
75 75
   }
76 76
 
77 77
   $fleet_array = array();
78
-  switch($target_mission) {
78
+  switch ($target_mission) {
79 79
     case MT_SPY:
80 80
       $fleet_array[SHIP_SPY] = min(mrc_get_level($user, $planetrow, SHIP_SPY), abs(classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT]));
81 81
       $unit_group = 'flt_spies';
82 82
     break;
83 83
 
84 84
     case MT_RECYCLE:
85
-      foreach(sn_get_groups('flt_recyclers') as $unit_id) {
86
-        if($unit_count = mrc_get_level($user, $planetrow, $unit_id)) {
85
+      foreach (sn_get_groups('flt_recyclers') as $unit_id) {
86
+        if ($unit_count = mrc_get_level($user, $planetrow, $unit_id)) {
87 87
           $fleet_array[$unit_id] = $unit_count;
88 88
         }
89 89
       }
@@ -108,16 +108,16 @@  discard block
 block discarded – undo
108 108
       'target_structure' => $target_structure = sys_get_param_int('structures'),
109 109
     )
110 110
   );
111
-  if($isAttackAllowed != FLIGHT_ALLOWED) {
111
+  if ($isAttackAllowed != FLIGHT_ALLOWED) {
112 112
     die(classLocale::$lang['fl_attack_error'][$isAttackAllowed]);
113 113
   }
114 114
 
115 115
   $db_changeset = array();
116
-  foreach($fleet_array as $unit_id => $unit_count) {
116
+  foreach ($fleet_array as $unit_id => $unit_count) {
117 117
     $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$unit_count, $user, $planetrow);
118 118
   }
119 119
 
120
-  if($target_mission == MT_MISSILE) {
120
+  if ($target_mission == MT_MISSILE) {
121 121
     $distance = abs($target_coord['system'] - $planetrow['system']);
122 122
     $duration = round((30 + (60 * $distance)) / flt_server_flight_speed_multiplier());
123 123
     $arrival = SN_TIME_NOW + $duration;
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
   } else {
128 128
     $travel_data = flt_travel_data($user, $planetrow, $target_coord, $fleet_array, 10);
129 129
 
130
-    if($planetrow['deuterium'] < $travel_data['consumption']) {
130
+    if ($planetrow['deuterium'] < $travel_data['consumption']) {
131 131
       die(classLocale::$lang['gs_c13']);
132 132
     }
133 133
 
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 
149 149
   $ships_sent = array();
150 150
   $ships_sent_js = 0;
151
-  foreach($fleet_array as $unit_id => $unit_count) {
151
+  foreach ($fleet_array as $unit_id => $unit_count) {
152 152
     $ships_sent[] = "{$unit_count} {$classLocale['tech'][$unit_id]}";
153 153
     $ships_sent_js += mrc_get_level($user, $planetrow, $unit_id, false, true);
154 154
   }
Please login to merge, or discard this patch.
includes/classes/Fleet.php 2 patches
Doc Comments   +9 added lines, -4 removed lines patch added patch discarded remove patch
@@ -819,6 +819,9 @@  discard block
 block discarded – undo
819 819
     return max(0, $this->shipsGetCapacity() - $this->resourcesGetTotal());
820 820
   }
821 821
 
822
+  /**
823
+   * @param integer $ship_id
824
+   */
822 825
   public function shipsGetTotalById($ship_id) {
823 826
     return $this->unitList->unitsCountById($ship_id);
824 827
   }
@@ -933,7 +936,7 @@  discard block
 block discarded – undo
933 936
   /**
934 937
    * Set current resource list from array of units
935 938
    *
936
-   * @param array $resource_list
939
+   * @param integer[] $resource_list
937 940
    */
938 941
   public function resourcesSet($resource_list) {
939 942
     if(!empty($this->propertiesAdjusted['resource_list'])) {
@@ -978,7 +981,7 @@  discard block
 block discarded – undo
978 981
   }
979 982
 
980 983
   /**
981
-   * @param array $rate
984
+   * @param integer[] $rate
982 985
    *
983 986
    * @return float
984 987
    */
@@ -1009,7 +1012,6 @@  discard block
 block discarded – undo
1009 1012
    * Restores fleet or resources to planet
1010 1013
    *
1011 1014
    * @param bool $start
1012
-   * @param bool $only_resources
1013 1015
    * @param int  $result
1014 1016
    *
1015 1017
    * @return int
@@ -1060,7 +1062,7 @@  discard block
 block discarded – undo
1060 1062
   /**
1061 1063
    * @param int $speed_percent
1062 1064
    *
1063
-   * @return array
1065
+   * @return integer
1064 1066
    */
1065 1067
   protected function flt_travel_data($speed_percent = 10) {
1066 1068
     $distance = $this->targetVector->distanceFromCoordinates($this->dbSourcePlanetRow);
@@ -1161,6 +1163,9 @@  discard block
 block discarded – undo
1161 1163
     }
1162 1164
   }
1163 1165
 
1166
+  /**
1167
+   * @param integer $errorCode
1168
+   */
1164 1169
   public function restrictToTypePlanet($errorCode) {
1165 1170
     if($this->targetVector->type != PT_PLANET) {
1166 1171
       throw new Exception($errorCode, $errorCode);
Please login to merge, or discard this patch.
Spacing   +75 added lines, -76 removed lines patch added patch discarded remove patch
@@ -314,9 +314,9 @@  discard block
 block discarded – undo
314 314
   public function renderAvailableShips(&$template_result, $playerRow, $planetRow) {
315 315
     $record_index = 0;
316 316
     $ship_list = array();
317
-    foreach(sn_get_groups('fleet') as $n => $unit_id) {
317
+    foreach (sn_get_groups('fleet') as $n => $unit_id) {
318 318
       $unit_level = mrc_get_level($playerRow, $planetRow, $unit_id, false, true);
319
-      if($unit_level <= 0) {
319
+      if ($unit_level <= 0) {
320 320
         continue;
321 321
       }
322 322
       $ship_data = get_ship_data($unit_id, $playerRow);
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 
338 338
     sortUnitRenderedList($ship_list, classSupernova::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT], classSupernova::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE]);
339 339
 
340
-    foreach($ship_list as $ship_data) {
340
+    foreach ($ship_list as $ship_data) {
341 341
       $template_result['.']['ships'][] = $ship_data;
342 342
     }
343 343
   }
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
   public function dbInsert() {
357 357
     // WARNING! MISSION TIMES MUST BE SET WITH set_times() method!
358 358
     // TODO - more checks!
359
-    if(empty($this->_time_launch)) {
359
+    if (empty($this->_time_launch)) {
360 360
       die('Fleet time not set!');
361 361
     }
362 362
 
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
     // Записываем изменения в БД
566 566
     $this->dbSave();
567 567
 
568
-    if($this->_group_id) {
568
+    if ($this->_group_id) {
569 569
       // TODO: Make here to delete only one AKS - by adding aks_fleet_count to AKS table
570 570
       db_fleet_aks_purge();
571 571
     }
@@ -632,18 +632,18 @@  discard block
 block discarded – undo
632 632
    */
633 633
   // TODO - separate shipList and unitList
634 634
   public function unitsSetFromArray($unit_array) {
635
-    if(empty($unit_array) || !is_array($unit_array)) {
635
+    if (empty($unit_array) || !is_array($unit_array)) {
636 636
       return;
637 637
     }
638
-    foreach($unit_array as $unit_id => $unit_count) {
638
+    foreach ($unit_array as $unit_id => $unit_count) {
639 639
       $unit_count = floatval($unit_count);
640
-      if(!$unit_count) {
640
+      if (!$unit_count) {
641 641
         continue;
642 642
       }
643 643
 
644
-      if($this->isShip($unit_id)) {
644
+      if ($this->isShip($unit_id)) {
645 645
         $this->unitList->unitSetCount($unit_id, $unit_count);
646
-      } elseif($this->isResource($unit_id)) {
646
+      } elseif ($this->isResource($unit_id)) {
647 647
         $this->resource_list[$unit_id] = $unit_count;
648 648
       } else {
649 649
         throw new Exception('Trying to pass to fleet non-resource and non-ship ' . var_export($unit_array, true), ERR_ERROR);
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
   public function parse_missile_db_row($missile_db_row) {
673 673
 //    $this->_reset();
674 674
 
675
-    if(empty($missile_db_row) || !is_array($missile_db_row)) {
675
+    if (empty($missile_db_row) || !is_array($missile_db_row)) {
676 676
       return;
677 677
     }
678 678
 
@@ -835,7 +835,7 @@  discard block
 block discarded – undo
835 835
   public function shipsGetCapacityRecyclers(array $recycler_info) {
836 836
     $recyclers_incoming_capacity = 0;
837 837
     $fleet_data = $this->shipsGetArray();
838
-    foreach($recycler_info as $recycler_id => $recycler_data) {
838
+    foreach ($recycler_info as $recycler_id => $recycler_data) {
839 839
       $recyclers_incoming_capacity += $fleet_data[$recycler_id] * $recycler_data['capacity'];
840 840
     }
841 841
 
@@ -855,7 +855,7 @@  discard block
 block discarded – undo
855 855
     sn_db_transaction_check(true);
856 856
 
857 857
     // Если флот уже обработан - не существует или возращается - тогда ничего не делаем
858
-    if($this->isEmpty()) {
858
+    if ($this->isEmpty()) {
859 859
       return $result;
860 860
     }
861 861
 
@@ -877,18 +877,18 @@  discard block
 block discarded – undo
877 877
     // TODO - Проверка, что планета всё еще существует на указанных координатах, а не телепортировалась, не удалена хозяином, не уничтожена врагом
878 878
     // Флот, который возвращается на захваченную планету, пропадает
879 879
     // Ship landing is possible only to fleet owner's planet
880
-    if($this->getPlayerOwnerId() == $planet_arrival['id_owner']) {
880
+    if ($this->getPlayerOwnerId() == $planet_arrival['id_owner']) {
881 881
       $db_changeset = array();
882 882
 
883 883
       $fleet_array = $this->shipsGetArray();
884
-      foreach($fleet_array as $ship_id => $ship_count) {
885
-        if($ship_count) {
884
+      foreach ($fleet_array as $ship_id => $ship_count) {
885
+        if ($ship_count) {
886 886
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, $ship_count, $user, $planet_arrival['id']);
887 887
         }
888 888
       }
889 889
 
890 890
       // Adjusting ship amount on planet
891
-      if(!empty($db_changeset)) {
891
+      if (!empty($db_changeset)) {
892 892
         db_changeset_apply($db_changeset);
893 893
       }
894 894
 
@@ -936,7 +936,7 @@  discard block
 block discarded – undo
936 936
    * @param array $resource_list
937 937
    */
938 938
   public function resourcesSet($resource_list) {
939
-    if(!empty($this->propertiesAdjusted['resource_list'])) {
939
+    if (!empty($this->propertiesAdjusted['resource_list'])) {
940 940
       throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::unitSetResourceList', ERR_ERROR);
941 941
     }
942 942
     $this->resourcesAdjust($resource_list, true);
@@ -950,13 +950,13 @@  discard block
 block discarded – undo
950 950
   public function resourcesAdjust($resource_delta_list, $replace_value = false) {
951 951
     !is_array($resource_delta_list) ? $resource_delta_list = array() : false;
952 952
 
953
-    foreach($resource_delta_list as $resource_id => $unit_delta) {
954
-      if(!UnitResourceLoot::is_in_group($resource_id) || !($unit_delta = floor($unit_delta))) {
953
+    foreach ($resource_delta_list as $resource_id => $unit_delta) {
954
+      if (!UnitResourceLoot::is_in_group($resource_id) || !($unit_delta = floor($unit_delta))) {
955 955
         // Not a resource or no resources - continuing
956 956
         continue;
957 957
       }
958 958
 
959
-      if($replace_value) {
959
+      if ($replace_value) {
960 960
         $this->resource_list[$resource_id] = $unit_delta;
961 961
       } else {
962 962
         $this->resource_list[$resource_id] += $unit_delta;
@@ -966,7 +966,7 @@  discard block
 block discarded – undo
966 966
       }
967 967
 
968 968
       // Check for negative unit value
969
-      if($this->resource_list[$resource_id] < 0) {
969
+      if ($this->resource_list[$resource_id] < 0) {
970 970
         // TODO
971 971
         throw new Exception('Resource ' . $resource_id . ' will become negative in ' . get_called_class() . '::unitAdjustResourceList', ERR_ERROR);
972 972
       }
@@ -1018,7 +1018,7 @@  discard block
 block discarded – undo
1018 1018
     sn_db_transaction_check(true);
1019 1019
 
1020 1020
     // Если флот уже обработан - не существует или возращается - тогда ничего не делаем
1021
-    if(!$this->resourcesGetTotal()) {
1021
+    if (!$this->resourcesGetTotal()) {
1022 1022
       return $result;
1023 1023
     }
1024 1024
 
@@ -1038,7 +1038,7 @@  discard block
 block discarded – undo
1038 1038
     // TODO - Проверка, что планета всё еще существует на указанных координатах, а не телепортировалась, не удалена хозяином, не уничтожена врагом
1039 1039
 
1040 1040
     // Restoring resources to planet
1041
-    if($this->resourcesGetTotal()) {
1041
+    if ($this->resourcesGetTotal()) {
1042 1042
       $fleet_resources = $this->resourcesGetList();
1043 1043
       db_planet_set_by_id($planet_arrival['id'],
1044 1044
         "`metal` = `metal` + '{$fleet_resources[RES_METAL]}', `crystal` = `crystal` + '{$fleet_resources[RES_CRYSTAL]}', `deuterium` = `deuterium` + '{$fleet_resources[RES_DEUTERIUM]}'");
@@ -1103,12 +1103,12 @@  discard block
 block discarded – undo
1103 1103
 
1104 1104
   protected function populateTargetPlanet() {
1105 1105
     $targetPlanetCoords = $this->targetVector;
1106
-    if($this->mission_type != MT_NONE) {
1106
+    if ($this->mission_type != MT_NONE) {
1107 1107
       $this->restrictTargetTypeByMission();
1108 1108
 
1109 1109
       // TODO - Нельзя тут просто менять тип планеты или координат!
1110 1110
       // If current planet type is not allowed on mission - switch planet type
1111
-      if(empty($this->allowed_planet_types[$this->targetVector->type])) {
1111
+      if (empty($this->allowed_planet_types[$this->targetVector->type])) {
1112 1112
         $targetPlanetCoords->type = reset($this->allowed_planet_types);
1113 1113
       }
1114 1114
     }
@@ -1117,14 +1117,14 @@  discard block
 block discarded – undo
1117 1117
   }
1118 1118
 
1119 1119
   protected function restrictTargetTypeByMission() {
1120
-    if($this->_mission_type == MT_MISSILE) {
1120
+    if ($this->_mission_type == MT_MISSILE) {
1121 1121
       $this->allowed_planet_types = array(PT_PLANET => PT_PLANET);
1122
-    } elseif($this->_mission_type == MT_COLONIZE || $this->_mission_type == MT_EXPLORE) {
1122
+    } elseif ($this->_mission_type == MT_COLONIZE || $this->_mission_type == MT_EXPLORE) {
1123 1123
       // TODO - PT_NONE
1124 1124
       $this->allowed_planet_types = array(PT_PLANET => PT_PLANET);
1125
-    } elseif($this->_mission_type == MT_RECYCLE) {
1125
+    } elseif ($this->_mission_type == MT_RECYCLE) {
1126 1126
       $this->allowed_planet_types = array(PT_DEBRIS => PT_DEBRIS);
1127
-    } elseif($this->_mission_type == MT_DESTROY) {
1127
+    } elseif ($this->_mission_type == MT_DESTROY) {
1128 1128
       $this->allowed_planet_types = array(PT_MOON => PT_MOON);
1129 1129
     } else {
1130 1130
       $this->allowed_planet_types = array(PT_PLANET => PT_PLANET, PT_MOON => PT_MOON);
@@ -1156,13 +1156,13 @@  discard block
 block discarded – undo
1156 1156
 
1157 1157
 
1158 1158
   public function restrictToKnownSpace() {
1159
-    if(!$this->targetVector->isInKnownSpace()) {
1159
+    if (!$this->targetVector->isInKnownSpace()) {
1160 1160
       throw new Exception('FLIGHT_VECTOR_BEYOND_SYSTEM', FLIGHT_VECTOR_BEYOND_SYSTEM);
1161 1161
     }
1162 1162
   }
1163 1163
 
1164 1164
   public function restrictToTypePlanet($errorCode) {
1165
-    if($this->targetVector->type != PT_PLANET) {
1165
+    if ($this->targetVector->type != PT_PLANET) {
1166 1166
       throw new Exception($errorCode, $errorCode);
1167 1167
     }
1168 1168
   }
@@ -1170,25 +1170,25 @@  discard block
 block discarded – undo
1170 1170
   public function restrictToNoMissiles() {
1171 1171
     $missilesAttack = $this->unitList->unitsCountById(UNIT_DEF_MISSILE_INTERPLANET);
1172 1172
     $missilesDefense = $this->unitList->unitsCountById(UNIT_DEF_MISSILE_INTERCEPTOR);
1173
-    if($missilesAttack > 0 || $missilesDefense > 0) {
1173
+    if ($missilesAttack > 0 || $missilesDefense > 0) {
1174 1174
       throw new Exception('FLIGHT_SHIPS_NO_MISSILES', FLIGHT_SHIPS_NO_MISSILES);
1175 1175
     }
1176 1176
   }
1177 1177
 
1178 1178
   public function restrictToTargetOwn() {
1179
-    if($this->dbTargetRow['id'] != $this->getPlayerOwnerId()) {
1179
+    if ($this->dbTargetRow['id'] != $this->getPlayerOwnerId()) {
1180 1180
       throw new Exception('FLIGHT_VECTOR_ONLY_OWN', FLIGHT_VECTOR_ONLY_OWN);
1181 1181
     }
1182 1182
   }
1183 1183
 
1184 1184
   public function restrictToTargetOther() {
1185
-    if($this->dbTargetRow['id'] == $this->getPlayerOwnerId()) {
1185
+    if ($this->dbTargetRow['id'] == $this->getPlayerOwnerId()) {
1186 1186
       throw new Exception('FLIGHT_VECTOR_ONLY_OTHER', FLIGHT_VECTOR_ONLY_OTHER);
1187 1187
     }
1188 1188
   }
1189 1189
 
1190 1190
   public function restrictToNotOnlySpies() {
1191
-    if($this->unitList->unitsCountById(SHIP_SPY) == $this->shipsGetTotal()) {
1191
+    if ($this->unitList->unitsCountById(SHIP_SPY) == $this->shipsGetTotal()) {
1192 1192
       throw new Exception('FLIGHT_SHIPS_NOT_ONLY_SPIES', FLIGHT_SHIPS_NOT_ONLY_SPIES);
1193 1193
     }
1194 1194
   }
@@ -1198,26 +1198,26 @@  discard block
 block discarded – undo
1198 1198
   }
1199 1199
 
1200 1200
   protected function restrictToMovable() {
1201
-    if(!$this->unitList->unitsIsAllMovable($this->dbOwnerRow)) {
1201
+    if (!$this->unitList->unitsIsAllMovable($this->dbOwnerRow)) {
1202 1202
       throw new Exception('FLIGHT_SHIPS_UNMOVABLE', FLIGHT_SHIPS_UNMOVABLE);
1203 1203
     }
1204 1204
   }
1205 1205
 
1206 1206
   protected function restrictToFleetUnits() {
1207
-    if(!$this->unitList->unitsInGroup(sn_get_groups(array('fleet', 'missile')))) {
1207
+    if (!$this->unitList->unitsInGroup(sn_get_groups(array('fleet', 'missile')))) {
1208 1208
       throw new Exception('FLIGHT_SHIPS_UNIT_WRONG', FLIGHT_SHIPS_UNIT_WRONG);
1209 1209
     }
1210 1210
   }
1211 1211
 
1212 1212
   protected function restrictToColonizer() {
1213 1213
     // Colonization fleet should have at least one colonizer
1214
-    if(!$this->unitList->unitsCountById(SHIP_COLONIZER) <= 0) {
1214
+    if (!$this->unitList->unitsCountById(SHIP_COLONIZER) <= 0) {
1215 1215
       throw new Exception('FLIGHT_SHIPS_NO_COLONIZER', FLIGHT_SHIPS_NO_COLONIZER);
1216 1216
     }
1217 1217
   }
1218 1218
 
1219 1219
   protected function restrictToTargetExists() {
1220
-    if(empty($this->dbTargetRow) || empty($this->dbTargetRow['id'])) {
1220
+    if (empty($this->dbTargetRow) || empty($this->dbTargetRow['id'])) {
1221 1221
       throw new Exception('FLIGHT_VECTOR_NO_TARGET', FLIGHT_VECTOR_NO_TARGET);
1222 1222
     }
1223 1223
   }
@@ -1225,7 +1225,7 @@  discard block
 block discarded – undo
1225 1225
 
1226 1226
   protected function restrictKnownSpaceOrMissionExplore() {
1227 1227
     // Is it exploration - fleet sent beyond of system?
1228
-    if($this->targetVector->isInKnownSpace()) {
1228
+    if ($this->targetVector->isInKnownSpace()) {
1229 1229
       // No exploration beyond this point
1230 1230
       unset($this->allowed_missions[MT_EXPLORE]);
1231 1231
 
@@ -1243,7 +1243,7 @@  discard block
 block discarded – undo
1243 1243
 
1244 1244
   protected function restrictTargetExistsOrMissionColonize() {
1245 1245
     // Is it colonization - fleet sent to empty place?
1246
-    if(!empty($this->dbTargetRow)) {
1246
+    if (!empty($this->dbTargetRow)) {
1247 1247
       // No colonization beyond this point
1248 1248
       unset($this->allowed_missions[MT_COLONIZE]);
1249 1249
 
@@ -1262,7 +1262,7 @@  discard block
 block discarded – undo
1262 1262
   }
1263 1263
 
1264 1264
   protected function restrictNotDebrisOrMissionRecycle() {
1265
-    if($this->targetVector->type != PT_DEBRIS) {
1265
+    if ($this->targetVector->type != PT_DEBRIS) {
1266 1266
       // No recycling beyond this point
1267 1267
       unset($this->allowed_missions[MT_RECYCLE]);
1268 1268
 
@@ -1273,11 +1273,11 @@  discard block
 block discarded – undo
1273 1273
 
1274 1274
     // restrict to recyclers
1275 1275
     $recyclers = 0;
1276
-    foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
1276
+    foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
1277 1277
       $recyclers += $this->unitList->unitsCountById($recycler_id);
1278 1278
     }
1279 1279
 
1280
-    if($recyclers <= 0) {
1280
+    if ($recyclers <= 0) {
1281 1281
       throw new Exception('FLIGHT_SHIPS_NO_RECYCLERS', FLIGHT_SHIPS_NO_RECYCLERS);
1282 1282
     }
1283 1283
 
@@ -1288,14 +1288,14 @@  discard block
 block discarded – undo
1288 1288
 
1289 1289
   protected function restrictMissionMissile() {
1290 1290
     $missilesAttack = $this->unitList->unitsCountById(UNIT_DEF_MISSILE_INTERPLANET);
1291
-    if($missilesAttack <= 0) {
1291
+    if ($missilesAttack <= 0) {
1292 1292
       // No missile attack beyond this point
1293 1293
       unset($this->allowed_missions[MT_MISSILE]);
1294 1294
 
1295 1295
       return;
1296 1296
     }
1297 1297
 
1298
-    if($missilesAttack != $this->shipsGetTotal()) {
1298
+    if ($missilesAttack != $this->shipsGetTotal()) {
1299 1299
       throw new Exception('FLIGHT_SHIPS_ONLY_MISSILES', FLIGHT_SHIPS_ONLY_MISSILES);
1300 1300
     }
1301 1301
 
@@ -1307,7 +1307,7 @@  discard block
 block discarded – undo
1307 1307
   }
1308 1308
 
1309 1309
   protected function restrictToNotOnlySpiesOrMissionSpy() {
1310
-    if($this->unitList->unitsCountById(SHIP_SPY) != $this->shipsGetTotal()) {
1310
+    if ($this->unitList->unitsCountById(SHIP_SPY) != $this->shipsGetTotal()) {
1311 1311
 //      throw new Exception('FLIGHT_SHIPS_ONLY_SPIES', FLIGHT_SHIPS_ONLY_SPIES);
1312 1312
       unset($this->allowed_missions[MT_SPY]);
1313 1313
 
@@ -1323,14 +1323,14 @@  discard block
 block discarded – undo
1323 1323
   protected function restrictMissionDestroy() {
1324 1324
     // If target vector is not Moon - then it can't be Destroy mission
1325 1325
     // If no Reapers (i.e. Death Star) in fleet - then mission Moon Destroy is unaccessible
1326
-    if($this->targetVector->type != PT_MOON || $this->unitList->unitsCountById(SHIP_HUGE_DEATH_STAR) <= 0) {
1326
+    if ($this->targetVector->type != PT_MOON || $this->unitList->unitsCountById(SHIP_HUGE_DEATH_STAR) <= 0) {
1327 1327
       unset($this->allowed_missions[MT_DESTROY]);
1328 1328
     }
1329 1329
   }
1330 1330
 
1331 1331
   protected function restrictMissionACS() {
1332 1332
     // If no ACS group is shown - then it can't be an ACS attack
1333
-    if(empty($this->_group_id)) {
1333
+    if (empty($this->_group_id)) {
1334 1334
       unset($this->allowed_missions[MT_ACS]);
1335 1335
     }
1336 1336
   }
@@ -1338,7 +1338,7 @@  discard block
 block discarded – undo
1338 1338
   /** @throws Exception */
1339 1339
   protected function restrictFriendOrFoe() {
1340 1340
     // Checking target owner
1341
-    if($this->dbTargetRow['id'] == $this->getPlayerOwnerId()) {
1341
+    if ($this->dbTargetRow['id'] == $this->getPlayerOwnerId()) {
1342 1342
       // Spying can't be done on owner's planet/moon
1343 1343
       unset($this->allowed_missions[MT_SPY]);
1344 1344
       // Attack can't be done on owner's planet/moon
@@ -1399,7 +1399,7 @@  discard block
 block discarded – undo
1399 1399
    * @throws Exception
1400 1400
    */
1401 1401
   public function restrictMission() {
1402
-    if($this->targetVector->isEqualToPlanet($this->dbSourcePlanetRow)) {
1402
+    if ($this->targetVector->isEqualToPlanet($this->dbSourcePlanetRow)) {
1403 1403
       throw new Exception('FLIGHT_VECTOR_SAME_SOURCE', FLIGHT_VECTOR_SAME_SOURCE);
1404 1404
     }
1405 1405
 
@@ -1430,7 +1430,7 @@  discard block
 block discarded – undo
1430 1430
 
1431 1431
 
1432 1432
   protected function printErrorIfNoShips() {
1433
-    if($this->unitList->unitsCount() <= 0) {
1433
+    if ($this->unitList->unitsCount() <= 0) {
1434 1434
       message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 5);
1435 1435
     }
1436 1436
   }
@@ -1467,7 +1467,7 @@  discard block
 block discarded – undo
1467 1467
 
1468 1468
     lng_include('overview');
1469 1469
 
1470
-    if(empty($this->dbSourcePlanetRow)) {
1470
+    if (empty($this->dbSourcePlanetRow)) {
1471 1471
       message(classLocale::$lang['fl_noplanetrow'], classLocale::$lang['fl_error']);
1472 1472
     }
1473 1473
 
@@ -1543,9 +1543,9 @@  discard block
 block discarded – undo
1543 1543
 
1544 1544
     try {
1545 1545
       $this->restrictMission();
1546
-    } catch(Exception $e) {
1546
+    } catch (Exception $e) {
1547 1547
       // TODO - MESSAGE BOX
1548
-      if($e->getCode() != FLIGHT_ALLOWED) {
1548
+      if ($e->getCode() != FLIGHT_ALLOWED) {
1549 1549
         pdie(classLocale::$lang['fl_attack_error'][$e->getCode()]);
1550 1550
       } else {
1551 1551
         pdump('FLIGHT_ALLOWED', FLIGHT_ALLOWED);
@@ -1555,20 +1555,19 @@  discard block
 block discarded – undo
1555 1555
     $this->renderAllowedMissions($template_result);
1556 1556
     $this->renderFleet($template_result);
1557 1557
 
1558
-    $max_duration = $this->_mission_type == MT_EXPLORE ? get_player_max_expedition_duration($this->dbOwnerRow) :
1559
-      (isset($this->allowed_missions[MT_HOLD]) ? 12 : 0);
1558
+    $max_duration = $this->_mission_type == MT_EXPLORE ? get_player_max_expedition_duration($this->dbOwnerRow) : (isset($this->allowed_missions[MT_HOLD]) ? 12 : 0);
1560 1559
     $this->renderDuration($template_result, $max_duration);
1561 1560
 
1562 1561
     $travel_data = $this->flt_travel_data($this->oldSpeedInTens);
1563 1562
 
1564 1563
     $sn_group_resources = sn_get_groups('resources_loot');
1565 1564
     $planetResources = array();
1566
-    foreach($sn_group_resources as $resource_id) {
1565
+    foreach ($sn_group_resources as $resource_id) {
1567 1566
       $planetResources[$resource_id] = floor(mrc_get_level($this->dbOwnerRow, $this->dbSourcePlanetRow, $resource_id) - ($resource_id == RES_DEUTERIUM ? $travel_data['consumption'] : 0));
1568 1567
     }
1569 1568
     $this->renderPlanetResources($planetResources, $template_result);
1570 1569
 
1571
-    if(sn_module::$sn_module['unit_captain']->manifest['active'] && ($captain = sn_module::$sn_module['unit_captain']->unit_captain_get($this->dbSourcePlanetRow['id'])) && $captain['unit_location_type'] == LOC_PLANET) {
1570
+    if (sn_module::$sn_module['unit_captain']->manifest['active'] && ($captain = sn_module::$sn_module['unit_captain']->unit_captain_get($this->dbSourcePlanetRow['id'])) && $captain['unit_location_type'] == LOC_PLANET) {
1572 1571
       $template_result += array(
1573 1572
         'CAPTAIN_ID'     => $captain['unit_id'],
1574 1573
         'CAPTAIN_LEVEL'  => $captain['captain_level'],
@@ -1610,10 +1609,10 @@  discard block
 block discarded – undo
1610 1609
   protected function renderAllowedMissions(&$template_result) {
1611 1610
     ksort($this->allowed_missions);
1612 1611
     // If mission is not set - setting first mission from allowed
1613
-    if(empty($this->_mission_type) && is_array($this->allowed_missions)) {
1612
+    if (empty($this->_mission_type) && is_array($this->allowed_missions)) {
1614 1613
       $this->_mission_type = reset($this->allowed_missions);
1615 1614
     }
1616
-    foreach($this->allowed_missions as $key => $value) {
1615
+    foreach ($this->allowed_missions as $key => $value) {
1617 1616
       $template_result['.']['missions'][] = array(
1618 1617
         'ID'   => $key,
1619 1618
         'NAME' => classLocale::$lang['type_mission'][$key],
@@ -1625,9 +1624,9 @@  discard block
 block discarded – undo
1625 1624
    * @param $template_result
1626 1625
    */
1627 1626
   protected function renderDuration(&$template_result, $max_duration) {
1628
-    if($max_duration) {
1627
+    if ($max_duration) {
1629 1628
       $config_game_speed_expedition = ($this->_mission_type == MT_EXPLORE && classSupernova::$config->game_speed_expedition ? classSupernova::$config->game_speed_expedition : 1);
1630
-      for($i = 1; $i <= $max_duration; $i++) {
1629
+      for ($i = 1; $i <= $max_duration; $i++) {
1631 1630
         $template_result['.']['duration'][] = array(
1632 1631
           'ID'   => $i,
1633 1632
           'TIME' => pretty_time(ceil($i * 3600 / $config_game_speed_expedition)),
@@ -1643,7 +1642,7 @@  discard block
 block discarded – undo
1643 1642
   protected function renderPlanetResources(&$planetResources, &$template_result) {
1644 1643
     // TODO - REDO to resource_id
1645 1644
     $i = 0;
1646
-    foreach($planetResources as $resource_id => $resource_amount) {
1645
+    foreach ($planetResources as $resource_id => $resource_amount) {
1647 1646
       $template_result['.']['resources'][] = array(
1648 1647
         'ID'        => $i++, // $resource_id,
1649 1648
         'ON_PLANET' => $resource_amount,
@@ -1657,7 +1656,7 @@  discard block
 block discarded – undo
1657 1656
    * @param $template_result
1658 1657
    */
1659 1658
   protected function renderAllowedPlanetTypes(&$template_result) {
1660
-    foreach($this->allowed_planet_types as $possible_planet_type_id) {
1659
+    foreach ($this->allowed_planet_types as $possible_planet_type_id) {
1661 1660
       $template_result['.']['possible_planet_type_id'][] = array(
1662 1661
         'ID'         => $possible_planet_type_id,
1663 1662
         'NAME'       => classLocale::$lang['sys_planet_type'][$possible_planet_type_id],
@@ -1680,14 +1679,14 @@  discard block
 block discarded – undo
1680 1679
       'TYPE_PRINT' => classLocale::$lang['fl_shrtcup'][$shortcut['planet_type']],
1681 1680
     );
1682 1681
 
1683
-    if(isset($shortcut['priority'])) {
1682
+    if (isset($shortcut['priority'])) {
1684 1683
       $result += array(
1685 1684
         'PRIORITY'       => $shortcut['priority'],
1686 1685
         'PRIORITY_CLASS' => $note_priority_classes[$shortcut['priority']],
1687 1686
       );
1688 1687
     }
1689 1688
 
1690
-    if(isset($shortcut['id'])) {
1689
+    if (isset($shortcut['id'])) {
1691 1690
       $result += array(
1692 1691
         'ID' => $shortcut['id'],
1693 1692
       );
@@ -1702,7 +1701,7 @@  discard block
 block discarded – undo
1702 1701
   protected function renderFleetShortcuts(&$template_result) {
1703 1702
     // Building list of shortcuts
1704 1703
     $query = db_note_list_select_by_owner_and_planet($this->dbOwnerRow);
1705
-    while($row = db_fetch($query)) {
1704
+    while ($row = db_fetch($query)) {
1706 1705
       $template_result['.']['shortcut'][] = $this->renderFleet1TargetSelect($row);
1707 1706
     }
1708 1707
   }
@@ -1714,12 +1713,12 @@  discard block
 block discarded – undo
1714 1713
    */
1715 1714
   protected function renderOwnPlanets(&$template_result) {
1716 1715
     $colonies = db_planet_list_sorted($this->dbOwnerRow);
1717
-    if(count($colonies) <= 1) {
1716
+    if (count($colonies) <= 1) {
1718 1717
       return;
1719 1718
     }
1720 1719
 
1721
-    foreach($colonies as $row) {
1722
-      if($row['id'] == $this->dbSourcePlanetRow['id']) {
1720
+    foreach ($colonies as $row) {
1721
+      if ($row['id'] == $this->dbSourcePlanetRow['id']) {
1723 1722
         continue;
1724 1723
       }
1725 1724
 
@@ -1732,10 +1731,10 @@  discard block
 block discarded – undo
1732 1731
    */
1733 1732
   protected function renderACSList(&$template_result) {
1734 1733
     $query = db_acs_get_list();
1735
-    while($row = db_fetch($query)) {
1734
+    while ($row = db_fetch($query)) {
1736 1735
       $members = explode(',', $row['eingeladen']);
1737
-      foreach($members as $a => $b) {
1738
-        if($b == $this->dbOwnerRow['id']) {
1736
+      foreach ($members as $a => $b) {
1737
+        if ($b == $this->dbOwnerRow['id']) {
1739 1738
           $template_result['.']['acss'][] = $this->renderFleet1TargetSelect($row);
1740 1739
         }
1741 1740
       }
@@ -1746,7 +1745,7 @@  discard block
 block discarded – undo
1746 1745
    * @param $template_result
1747 1746
    */
1748 1747
   protected function renderShipSortOptions(&$template_result) {
1749
-    foreach(classLocale::$lang['player_option_fleet_ship_sort'] as $sort_id => $sort_text) {
1748
+    foreach (classLocale::$lang['player_option_fleet_ship_sort'] as $sort_id => $sort_text) {
1750 1749
       $template_result['.']['ship_sort_list'][] = array(
1751 1750
         'VALUE' => $sort_id,
1752 1751
         'TEXT'  => $sort_text,
Please login to merge, or discard this patch.
includes/classes/UnitList.php 2 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -324,6 +324,10 @@
 block discarded – undo
324 324
    * @return int|mixed
325 325
    */
326 326
   // TODO - REDO!!!!
327
+
328
+  /**
329
+   * @return double
330
+   */
327 331
   function flt_fleet_speed($user) {
328 332
     $speeds = array();
329 333
     if(!empty($this->mapUnitIdToDb)) {
Please login to merge, or discard this patch.
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
    * @param Unit  $value
89 89
    */
90 90
   public function offsetSet($offset, $value) {
91
-    if(isset($this->mapUnitIdToDb[$value->unitId])) {
91
+    if (isset($this->mapUnitIdToDb[$value->unitId])) {
92 92
       classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId ' . $value->unitId . ' already exists');
93 93
     }
94 94
     $this->mapUnitIdToDb[$value->unitId] = $value;
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
   }
97 97
 
98 98
   public function offsetUnset($offset) {
99
-    if(!empty($this[$offset]->unitId)) {
99
+    if (!empty($this[$offset]->unitId)) {
100 100
 //      $unit_id = $this[$offset]->unitId;
101 101
 //      $this->mapUnitIdToDb[$unit_id] = null;
102 102
 //      unset($this->mapUnitIdToDb[$unit_id]);
@@ -117,20 +117,20 @@  discard block
 block discarded – undo
117 117
   public function dbLoad($dbId, $lockSkip = false) {
118 118
 //    $this->_reset();
119 119
 
120
-    if($dbId <= 0) {
120
+    if ($dbId <= 0) {
121 121
       return;
122 122
     }
123 123
 
124
-    if(!is_object($this->locatedAt)) {
124
+    if (!is_object($this->locatedAt)) {
125 125
       classSupernova::$debug->error('UnitList::dbLoad have no locatedAt field set');
126 126
     }
127 127
 
128 128
     $unit_array = classSupernova::db_get_unit_list_by_location(0, $this->getLocationType(), $this->getLocationDbId());
129
-    if(!is_array($unit_array)) {
129
+    if (!is_array($unit_array)) {
130 130
       return;
131 131
     }
132 132
 
133
-    foreach($unit_array as $unit_db_row) {
133
+    foreach ($unit_array as $unit_db_row) {
134 134
       $unit = $this->_createElement();
135 135
       $unit->dbRowParse($unit_db_row);
136 136
 
@@ -145,25 +145,25 @@  discard block
 block discarded – undo
145 145
   }
146 146
 
147 147
   public function dbSave() {
148
-    if(!is_object($this->locatedAt)) {
148
+    if (!is_object($this->locatedAt)) {
149 149
       classSupernova::$debug->error('UnitList::dbSave have no locatedAt field set');
150 150
     }
151 151
 
152
-    foreach($this->mapUnitIdToDb as $unit) {
152
+    foreach ($this->mapUnitIdToDb as $unit) {
153 153
       $unit_db_id = $unit->dbId;
154 154
       $unit->dbSave();
155 155
 
156
-      if($unit->isEmpty()) {
156
+      if ($unit->isEmpty()) {
157 157
         // Removing unit object
158 158
         // TODO - change when there will be common bus for all objects
159 159
         // ...or should I? If COUNT is empty - it means that object does not exists in DB. So it should be deleted from PHP memory and cache too
160 160
         unset($this[$unit_db_id]);
161 161
       } else {
162
-        if($unit->dbId <= 0) {
162
+        if ($unit->dbId <= 0) {
163 163
           classSupernova::$debug->error('Error writing unit to DB');
164 164
         }
165 165
         // If unit is new then putting unit object to container
166
-        if(empty($this->_container[$unit->dbId])) {
166
+        if (empty($this->_container[$unit->dbId])) {
167 167
           $this->_container[$unit->dbId] = $unit;
168 168
         }
169 169
       }
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
   }
202 202
 
203 203
   public function unitGetCount($unit_id) {
204
-    if(empty($this->mapUnitIdToDb[$unit_id])) {
204
+    if (empty($this->mapUnitIdToDb[$unit_id])) {
205 205
       throw new Exception('Unit [' . $unit_id . '] is not exists in UnitList');
206 206
     }
207 207
     return $this->mapUnitIdToDb[$unit_id]->count;
@@ -216,14 +216,14 @@  discard block
 block discarded – undo
216 216
    * @param bool $replace_value
217 217
    */
218 218
   public function unitAdjustCount($unit_id, $unit_count = 0, $replace_value = false) {
219
-    if(empty($this->mapUnitIdToDb[$unit_id])) {
219
+    if (empty($this->mapUnitIdToDb[$unit_id])) {
220 220
       // If unit not exists - creating one and setting all attributes
221 221
       $this->mapUnitIdToDb[$unit_id] = $this->_createElement();
222 222
       $this->mapUnitIdToDb[$unit_id]->setUnitId($unit_id);
223 223
       $this->mapUnitIdToDb[$unit_id]->setLocatedAt($this);
224 224
     }
225 225
 
226
-    if($replace_value) {
226
+    if ($replace_value) {
227 227
       $this->mapUnitIdToDb[$unit_id]->count = $unit_count;
228 228
     } else {
229 229
       $this->mapUnitIdToDb[$unit_id]->adjustCount($unit_count);
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
    */
238 238
   public function unitsGetArray() {
239 239
     $result = array();
240
-    foreach($this->mapUnitIdToDb as $unit) {
240
+    foreach ($this->mapUnitIdToDb as $unit) {
241 241
       $result[$unit->unitId] = $unit->count;
242 242
     }
243 243
 
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
   }
246 246
 
247 247
   public function unitsCountApplyLossMultiplier($ships_lost_multiplier) {
248
-    foreach($this->mapUnitIdToDb as $unit_id => $unit) {
248
+    foreach ($this->mapUnitIdToDb as $unit_id => $unit) {
249 249
       $unit->count = floor($unit->count * $ships_lost_multiplier);
250 250
     }
251 251
   }
@@ -271,8 +271,8 @@  discard block
 block discarded – undo
271 271
 
272 272
   public function unitsPropertySumById($unit_id = 0, $propertyName = 'count') {
273 273
     $result = 0;
274
-    foreach($this->mapUnitIdToDb as $unit) {
275
-      if(!$unit_id || $unit->unitId == $unit_id) {
274
+    foreach ($this->mapUnitIdToDb as $unit) {
275
+      if (!$unit_id || $unit->unitId == $unit_id) {
276 276
         $result += $unit->$propertyName;
277 277
       }
278 278
     }
@@ -289,15 +289,15 @@  discard block
 block discarded – undo
289 289
      * @var Fleet $objFleet
290 290
      */
291 291
     $objFleet = $this->getLocatedAt();
292
-    if(empty($objFleet)) {
292
+    if (empty($objFleet)) {
293 293
       throw new Exception('No fleet owner on UnitList::unitsRender() in ' . __FILE__ . '@' . __LINE__);
294 294
     }
295 295
 
296 296
     $tplShips = array();
297
-    foreach($this->mapUnitIdToDb as $unit) {
297
+    foreach ($this->mapUnitIdToDb as $unit) {
298 298
       $ship_id = $unit->unitId;
299 299
       $ship_count = $unit->count;
300
-      if(!UnitShip::is_in_group($ship_id) || $ship_count <= 0) {
300
+      if (!UnitShip::is_in_group($ship_id) || $ship_count <= 0) {
301 301
         continue;
302 302
       }
303 303
 
@@ -326,9 +326,9 @@  discard block
 block discarded – undo
326 326
   // TODO - REDO!!!!
327 327
   function flt_fleet_speed($user) {
328 328
     $speeds = array();
329
-    if(!empty($this->mapUnitIdToDb)) {
330
-      foreach($this->mapUnitIdToDb as $ship_id => $unit) {
331
-        if($unit->getCount() > 0 && in_array($unit->unitId, sn_get_groups(array('fleet', 'missile')))) {
329
+    if (!empty($this->mapUnitIdToDb)) {
330
+      foreach ($this->mapUnitIdToDb as $ship_id => $unit) {
331
+        if ($unit->getCount() > 0 && in_array($unit->unitId, sn_get_groups(array('fleet', 'missile')))) {
332 332
           $single_ship_data = get_ship_data($unit->unitId, $user);
333 333
           $speeds[] = $single_ship_data['speed'];
334 334
         }
@@ -349,11 +349,11 @@  discard block
 block discarded – undo
349 349
     $fleet_speed = $this->flt_fleet_speed($dbOwnerRow);
350 350
     $real_speed = $speed_percent * sqrt($fleet_speed);
351 351
 
352
-    if($fleet_speed && $game_fleet_speed) {
352
+    if ($fleet_speed && $game_fleet_speed) {
353 353
       $duration = max(1, round((35000 / $speed_percent * sqrt($distance * 10 / $fleet_speed) + 10) / $game_fleet_speed));
354 354
 
355
-      foreach($this->mapUnitIdToDb as $ship_id => $unit) {
356
-        if(!$unit->unitId || $unit->getCount() <= 0) {
355
+      foreach ($this->mapUnitIdToDb as $ship_id => $unit) {
356
+        if (!$unit->unitId || $unit->getCount() <= 0) {
357 357
           continue;
358 358
         }
359 359
 
@@ -384,8 +384,8 @@  discard block
 block discarded – undo
384 384
    * @return bool
385 385
    */
386 386
   public function unitsInGroup($group) {
387
-    foreach($this->mapUnitIdToDb as $unitId => $unit) {
388
-      if(!in_array($unitId, $group)) {
387
+    foreach ($this->mapUnitIdToDb as $unitId => $unit) {
388
+      if (!in_array($unitId, $group)) {
389 389
         return false;
390 390
       }
391 391
     }
@@ -394,9 +394,9 @@  discard block
 block discarded – undo
394 394
   }
395 395
 
396 396
   public function unitsIsAllMovable($dbOwnerRow) {
397
-    foreach($this->mapUnitIdToDb as $unitId => $unit) {
397
+    foreach ($this->mapUnitIdToDb as $unitId => $unit) {
398 398
       $single_ship_data = get_ship_data($unit->unitId, $dbOwnerRow);
399
-      if($single_ship_data['speed'] <= 0) {
399
+      if ($single_ship_data['speed'] <= 0) {
400 400
         return false;
401 401
       }
402 402
     }
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 
476 476
     print('</tr>');
477 477
 
478
-    foreach($this->mapUnitIdToDb as $unit) {
478
+    foreach ($this->mapUnitIdToDb as $unit) {
479 479
       print('<tr>');
480 480
 
481 481
       print('<td>');
@@ -526,14 +526,14 @@  discard block
 block discarded – undo
526 526
 
527 527
 
528 528
   public function unitZeroDbId() {
529
-    foreach($this->mapUnitIdToDb as $unit) {
529
+    foreach ($this->mapUnitIdToDb as $unit) {
530 530
       $unit->zeroDbId();
531 531
     }
532 532
   }
533 533
 
534 534
 
535 535
   public function unitZeroCount() {
536
-    foreach($this->mapUnitIdToDb as $unit) {
536
+    foreach ($this->mapUnitIdToDb as $unit) {
537 537
       $unit->count = 0;
538 538
     }
539 539
   }
Please login to merge, or discard this patch.
includes/includes/eco_bld_structures.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -19,10 +19,10 @@  discard block
 block discarded – undo
19 19
   global $template_result;
20 20
   $classLocale = classLocale::$lang;
21 21
 
22
-  if($ally_id = sys_get_param_id('ally_id')) {
22
+  if ($ally_id = sys_get_param_id('ally_id')) {
23 23
     define('SN_IN_ALLY', true);
24 24
     $ranks = ally_get_ranks($auser['ally']);
25
-    if($ranks[$auser['ally_rank_id']]['admin'] || $auser['ally']['ally_owner'] == $auser['id']) {
25
+    if ($ranks[$auser['ally_rank_id']]['admin'] || $auser['ally']['ally_owner'] == $auser['id']) {
26 26
       $user = &$auser['ally']['player'];
27 27
       $planet = array(
28 28
         'metal'     => $user['metal'],
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
     }
33 33
   }
34 34
 
35
-  if(!$user) {
35
+  if (!$user) {
36 36
     $user = &$auser;
37 37
   }
38 38
 
39
-  switch($action = sys_get_param_escaped('action')) {
39
+  switch ($action = sys_get_param_escaped('action')) {
40 40
     case 'create': // Add unit to que for build
41 41
     case 'create_autoconvert': // Add unit to que for build
42 42
     case 'destroy': // Add unit to que for remove
@@ -53,28 +53,28 @@  discard block
 block discarded – undo
53 53
 
54 54
   $group_missile = sn_get_groups('missile');
55 55
   $silo_capacity_free = 0;
56
-  if($que_type == QUE_STRUCTURES) {
56
+  if ($que_type == QUE_STRUCTURES) {
57 57
     $build_unit_list = sn_get_groups('build_allow');
58 58
     $build_unit_list = $build_unit_list[$planet['planet_type']];
59 59
     $artifact_id = ART_NANO_BUILDER;
60 60
     $page_header = classLocale::$lang['tech'][UNIT_STRUCTURES];
61
-  } elseif($que_type == QUE_RESEARCH) {
62
-    if(!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
61
+  } elseif ($que_type == QUE_RESEARCH) {
62
+    if (!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
63 63
       message(classLocale::$lang['no_laboratory'], classLocale::$lang['tech'][UNIT_TECHNOLOGIES]);
64 64
     }
65 65
 
66
-    if(eco_unit_busy($user, $planet, UNIT_TECHNOLOGIES)) {
66
+    if (eco_unit_busy($user, $planet, UNIT_TECHNOLOGIES)) {
67 67
       message(classLocale::$lang['eco_bld_msg_err_laboratory_upgrading'], classLocale::$lang['tech'][UNIT_TECHNOLOGIES]);
68 68
     }
69 69
     $build_unit_list = sn_get_groups('tech');
70 70
     $artifact_id = ART_HEURISTIC_CHIP;
71 71
     $page_header = classLocale::$lang['tech'][UNIT_TECHNOLOGIES] . ($user['user_as_ally'] ? "&nbsp;{$classLocale['sys_of_ally']}&nbsp;{$user['username']}" : '');
72
-  } elseif($que_type == QUE_MERCENARY) {
72
+  } elseif ($que_type == QUE_MERCENARY) {
73 73
     $build_unit_list = sn_get_groups('mercenaries');
74 74
     $artifact_id = 0;
75 75
     $page_header = classLocale::$lang['tech'][UNIT_MERCENARIES] . ($user['user_as_ally'] ? "&nbsp;{$classLocale['sys_of_ally']}&nbsp;{$user['username']}" : '');
76 76
   } else {
77
-    if(mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
77
+    if (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
78 78
       message(classLocale::$lang['need_hangar'], classLocale::$lang['tech'][STRUC_FACTORY_HANGAR]);
79 79
     }
80 80
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
     $artifact_id = 0;
84 84
 
85 85
     $silo_capacity_free = mrc_get_level($user, $planet, STRUC_SILO) * get_unit_param(STRUC_SILO, P_CAPACITY);
86
-    foreach($group_missile as $unit_id) {
86
+    foreach ($group_missile as $unit_id) {
87 87
       $silo_capacity_free -= (mrc_get_level($user, $planet, $unit_id, false, true) + (isset($in_que[$unit_id]) && $in_que[$unit_id] ? $in_que[$unit_id] : 0)) * get_unit_param($unit_id, P_UNIT_SIZE);
88 88
     }
89 89
     $silo_capacity_free = max(0, $silo_capacity_free);
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
   $config_resource_multiplier_plain = game_resource_multiplier(true);
95 95
 
96 96
   $template = gettemplate('buildings_builds', true);
97
-  if(!empty($operation_result)) {
97
+  if (!empty($operation_result)) {
98 98
     $template_result['.']['result'][] = $operation_result;
99 99
   }
100 100
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 
125 125
   $record_index = 0;
126 126
 
127
-  foreach($build_unit_list as $unit_id) {
127
+  foreach ($build_unit_list as $unit_id) {
128 128
     $level_base = mrc_get_level($user, $planet, $unit_id, false, true);
129 129
     $level_effective = mrc_get_level($user, $planet, $unit_id);
130 130
     $level_in_que = $in_que[$unit_id];
@@ -147,12 +147,12 @@  discard block
 block discarded – undo
147 147
     $can_build = $unit_info[P_MAX_STACK] ? max(0, $unit_info[P_MAX_STACK] - $level_in_que - $level_effective) : $build_data['CAN'][BUILD_CREATE];
148 148
     // Restricting $can_build by free silo capacity
149 149
     $can_build = ($unit_is_missile = in_array($unit_id, $group_missile)) ? min($can_build, floor($silo_capacity_free / $unit_info[P_UNIT_SIZE])) : $can_build;
150
-    if(!$can_build) {
151
-      if(!$build_data['CAN'][BUILD_CREATE]) {
150
+    if (!$can_build) {
151
+      if (!$build_data['CAN'][BUILD_CREATE]) {
152 152
         $build_data['RESULT'][BUILD_CREATE] = BUILD_NO_RESOURCES;
153
-      } elseif($unit_is_missile && $silo_capacity_free < $unit_info[P_UNIT_SIZE]) {
153
+      } elseif ($unit_is_missile && $silo_capacity_free < $unit_info[P_UNIT_SIZE]) {
154 154
         $build_data['RESULT'][BUILD_CREATE] = BUILD_SILO_FULL;
155
-      } elseif($unit_info[P_MAX_STACK]) {
155
+      } elseif ($unit_info[P_MAX_STACK]) {
156 156
         $build_data['RESULT'][BUILD_CREATE] = BUILD_MAX_REACHED;
157 157
       }
158 158
     }
@@ -219,14 +219,14 @@  discard block
 block discarded – undo
219 219
       'MAP_IS_RESOURCE' => !empty($unit_info[P_UNIT_PRODUCTION]),
220 220
     );
221 221
 
222
-    if($unit_stackable) {
222
+    if ($unit_stackable) {
223 223
       $level_production_base = array(
224 224
         'ACTUAL_SHIELD' => pretty_number(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_SHIELD), $unit_info['shield'])),
225 225
         'ACTUAL_ARMOR'  => pretty_number(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_ARMOR), $unit_info['armor'])),
226 226
         'ACTUAL_WEAPON' => pretty_number(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_WEAPON), $unit_info['attack'])),
227 227
       );
228 228
 
229
-      if($unit_info[P_UNIT_TYPE] == UNIT_SHIPS) {
229
+      if ($unit_info[P_UNIT_TYPE] == UNIT_SHIPS) {
230 230
         $ship_data = get_ship_data($unit_id, $user);
231 231
 
232 232
         $level_production_base += array(
@@ -236,9 +236,9 @@  discard block
 block discarded – undo
236 236
         );
237 237
       }
238 238
 
239
-      if($unit_info[P_UNIT_PRODUCTION]) {
240
-        foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
241
-          if($resource_income =
239
+      if ($unit_info[P_UNIT_PRODUCTION]) {
240
+        foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
241
+          if ($resource_income =
242 242
             floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc(1, 10, $user, $planet)
243 243
               * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
244 244
               * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
@@ -248,11 +248,11 @@  discard block
 block discarded – undo
248 248
         }
249 249
       }
250 250
       $production['.']['resource'][] = $level_production_base;
251
-    } elseif($unit_info[P_UNIT_PRODUCTION]) {
251
+    } elseif ($unit_info[P_UNIT_PRODUCTION]) {
252 252
       $level_production_base = array();
253 253
       $element_level_start = $level_effective + $in_que[$unit_id];
254
-      foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
255
-        if($resource_income =
254
+      foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
255
+        if ($resource_income =
256 256
           floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc($element_level_start, 10, $user, $planet)
257 257
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
258 258
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
@@ -262,10 +262,10 @@  discard block
 block discarded – undo
262 262
       }
263 263
 
264 264
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
265
-      for($i = 0; $i < 6; $i++) {
265
+      for ($i = 0; $i < 6; $i++) {
266 266
         $level_production = array('LEVEL' => $level_start + $i);
267
-        foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
268
-          if(
267
+        foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
268
+          if (
269 269
           $resource_income = floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc($level_start + $i, 10, $user, $planet)
270 270
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
271 271
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
         }
277 277
         $production['.']['resource'][] = $level_production;
278 278
       }
279
-    } elseif($unit_id == TECH_ASTROTECH) {
279
+    } elseif ($unit_id == TECH_ASTROTECH) {
280 280
       $element_level_start = $level_effective + $in_que[$unit_id];
281 281
       $level_production_base = array(
282 282
         UNIT_PLAYER_EXPEDITIONS_MAX => get_player_max_expeditons($user, $element_level_start),
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
       );
285 285
 
286 286
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
287
-      for($i = 0; $i < 6; $i++) {
287
+      for ($i = 0; $i < 6; $i++) {
288 288
         $level_production = array('LEVEL' => $level_start + $i);
289 289
         $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i);
290 290
         $level_production['D' . UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX];
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
     $template_result['.']['production'][] = $production;
306 306
   }
307 307
 
308
-  foreach(classLocale::$lang['player_option_building_sort'] as $sort_id => $sort_text) {
308
+  foreach (classLocale::$lang['player_option_building_sort'] as $sort_id => $sort_text) {
309 309
     $template->assign_block_vars('sort_values', array(
310 310
       'VALUE' => $sort_id,
311 311
       'TEXT'  => $sort_text,
Please login to merge, or discard this patch.