supernova-ws / SuperNova

includes/classes/Fleet.php

Doc Comments +6 added lines, -4 removed lines

@@ -945,7 +945,7 @@ 
   /**
    * Set current resource list from array of units
    *
-   * @param array $resource_list
+   * @param integer[] $resource_list
    */
   public function resourcesSet($resource_list) {
     if (!empty($this->propertiesAdjusted['resource_list'])) {
@@ -993,7 +993,7 @@ 
   }
 
   /**
-   * @param array $rate
+   * @param integer[] $rate
    *
    * @return float
    */
@@ -1024,7 +1024,6 @@ 
    * Restores fleet or resources to planet
    *
    * @param bool $start
-   * @param bool $only_resources
    * @param int  $result
    *
    * @return int
@@ -1075,7 +1074,7 @@ 
   /**
    * @param int $speed_percent
    *
-   * @return array
+   * @return integer
    */
   protected function flt_travel_data($speed_percent = 10) {
     $distance = $this->targetVector->distanceFromCoordinates($this->dbSourcePlanetRow);
@@ -1179,6 +1178,9 @@ 
     }
   }
 
+  /**
+   * @param integer $errorCode
+   */
   public function restrictToTypePlanet($errorCode) {
     if ($this->targetVector->type != PT_PLANET) {
       throw new Exception($errorCode, $errorCode);

Spacing +5 added lines, -6 removed lines

@@ -1656,7 +1656,7 @@ 
   protected function renderFleetShortcuts(&$template_result) {
     // Building list of shortcuts
     $query = db_note_list_select_by_owner_and_planet($this->dbOwnerRow);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $template_result['.']['shortcut'][] = $this->renderFleet1TargetSelect($row);
     }
   }
@@ -1686,7 +1686,7 @@ 
    */
   protected function renderACSList(&$template_result) {
     $query = db_acs_get_list();
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $members = explode(',', $row['eingeladen']);
       foreach ($members as $a => $b) {
         if ($b == $this->dbOwnerRow['id']) {
@@ -1807,8 +1807,7 @@ 
     $this->renderAllowedMissions($template_result);
     $this->renderFleet($template_result);
 
-    $max_duration = $this->_mission_type == MT_EXPLORE ? get_player_max_expedition_duration($this->dbOwnerRow) :
-      (isset($this->allowed_missions[MT_HOLD]) ? 12 : 0);
+    $max_duration = $this->_mission_type == MT_EXPLORE ? get_player_max_expedition_duration($this->dbOwnerRow) : (isset($this->allowed_missions[MT_HOLD]) ? 12 : 0);
     $this->renderDuration($template_result, $max_duration);
 
     $travel_data = $this->flt_travel_data($this->oldSpeedInTens);
@@ -2576,8 +2575,8 @@ 
    */
   protected function unsetMissionSpyComplex() {
     unset($this->allowed_missions[MT_SPY]);
-    if($this->_mission_type == MT_SPY) {
-      if($this->checkRealFlight()) {
+    if ($this->_mission_type == MT_SPY) {
+      if ($this->checkRealFlight()) {
         return false;
       }
       $this->_mission_type = MT_NONE;

includes/vars.php

Spacing +20 added lines, -20 removed lines

@@ -333,26 +333,26 @@ 
     // Each mission will filter only necessary checks and do it in this order
     'mission_checks' => array(
       // Cheap checks - class Fleet already have all this info internally
-      'checkSenderNoVacation'        => FLIGHT_PLAYER_VACATION_OWN,                           //+
-      'checkTargetNoVacation'        => FLIGHT_PLAYER_VACATION,                                  //+
-      'checkFleetNotEmpty'           => FLIGHT_SHIPS_NO_SHIPS,                                //+
+      'checkSenderNoVacation'        => FLIGHT_PLAYER_VACATION_OWN, //+
+      'checkTargetNoVacation'        => FLIGHT_PLAYER_VACATION, //+
+      'checkFleetNotEmpty'           => FLIGHT_SHIPS_NO_SHIPS, //+
       // FLIGHT_MISSION_UNKNOWN
       // FLIGHT_RESOURCES_FORBIDDEN
-      'checkSpeedPercentOld'         => FLIGHT_FLEET_SPEED_WRONG,                             //+
-      'checkTargetNotSource'         => FLIGHT_VECTOR_SAME_SOURCE,                            //+
+      'checkSpeedPercentOld'         => FLIGHT_FLEET_SPEED_WRONG, //+
+      'checkTargetNotSource'         => FLIGHT_VECTOR_SAME_SOURCE, //+
       'checkTargetInUniverse'        => FLIGHT_VECTOR_BEYOND_UNIVERSE,
-      'checkUnitsPositive'           => FLIGHT_SHIPS_NEGATIVE,                                //+
+      'checkUnitsPositive'           => FLIGHT_SHIPS_NEGATIVE, //+
       'checkOnlyFleetUnits'          => FLIGHT_SHIPS_UNIT_WRONG,
-      'checkOnlyFlyingUnits'         => FLIGHT_SHIPS_UNMOVABLE,                               //+
-      'checkResourcesPositive'       => FLIGHT_RESOURCES_NEGATIVE,                            //+
-      'checkNotTooFar'               => FLIGHT_FLEET_TOO_FAR,                                //+
-      'checkEnoughCapacity'          => FLIGHT_FLEET_OVERLOAD,                                //+
+      'checkOnlyFlyingUnits'         => FLIGHT_SHIPS_UNMOVABLE, //+
+      'checkResourcesPositive'       => FLIGHT_RESOURCES_NEGATIVE, //+
+      'checkNotTooFar'               => FLIGHT_FLEET_TOO_FAR, //+
+      'checkEnoughCapacity'          => FLIGHT_FLEET_OVERLOAD, //+
       // Medium checks - currently requires access to DB but potentially doesn't
-      'checkSourceEnoughShips'       => FLIGHT_SHIPS_NOT_ENOUGH,                              //+
-      'checkSourceEnoughFuel'        => FLIGHT_RESOURCES_FUEL_NOT_ENOUGH,                     //+
-      'checkSourceEnoughResources'   => FLIGHT_RESOURCES_NOT_ENOUGH,                          //+
+      'checkSourceEnoughShips'       => FLIGHT_SHIPS_NOT_ENOUGH, //+
+      'checkSourceEnoughFuel'        => FLIGHT_RESOURCES_FUEL_NOT_ENOUGH, //+
+      'checkSourceEnoughResources'   => FLIGHT_RESOURCES_NOT_ENOUGH, //+
       // Heavy checks - will absolutely require DB access
-      'checkEnoughFleetSlots'        => FLIGHT_FLEET_NO_SLOTS,                                //+
+      'checkEnoughFleetSlots'        => FLIGHT_FLEET_NO_SLOTS, //+
 
       // Vector targeting space beyond MaxPlanet forces MT_EXPLORE mission
       'checkKnownSpace'              => array(
@@ -362,7 +362,7 @@ 
           'checkNotOnlySpies'   => FLIGHT_SHIPS_NOT_ONLY_SPIES,
           'checkNoMissiles'     => FLIGHT_SHIPS_NO_MISSILES,
           'forceMissionExplore' => array(
-            true  => FLIGHT_ALLOWED,                                                         //+
+            true  => FLIGHT_ALLOWED, //+
             false => FLIGHT_VECTOR_BEYOND_SYSTEM,
           ),
         ),
@@ -377,7 +377,7 @@ 
           'checkNoMissiles'      => FLIGHT_SHIPS_NO_MISSILES,
           'checkTargetIsPlanet'  => FLIGHT_MISSION_COLONIZE_NOT_PLANET,
           'forceMissionColonize' => array(
-            true  => FLIGHT_ALLOWED,                                                         //+
+            true  => FLIGHT_ALLOWED, //+
             false => FLIGHT_VECTOR_NO_TARGET,
           ),
         ),
@@ -388,11 +388,11 @@ 
       'checkTargetIsDebris'          => array(
         true => array(
           // Recycle mission checks
-          'checkHaveRecyclers'  => FLIGHT_SHIPS_NO_RECYCLERS,             //+
+          'checkHaveRecyclers'  => FLIGHT_SHIPS_NO_RECYCLERS, //+
           'checkNoMissiles'     => FLIGHT_SHIPS_NO_MISSILES,
-          'checkDebrisExists'   => FLIGHT_MISSION_RECYCLE_NO_DEBRIS,    //+
+          'checkDebrisExists'   => FLIGHT_MISSION_RECYCLE_NO_DEBRIS, //+
           'forceMissionRecycle' => array(
-            true  => FLIGHT_ALLOWED,                                                                           //+
+            true  => FLIGHT_ALLOWED, //+
             false => FLIGHT_VECTOR_TARGET_DEBRIS,
           ),
         ),
@@ -488,7 +488,7 @@ 
 
 
       // Check for multiaccount
-      'checkMultiAccount'            => FLIGHT_PLAYER_SAME_IP,                                  //+
+      'checkMultiAccount'            => FLIGHT_PLAYER_SAME_IP, //+
       // TODO - check for moratorium