smrealms / smr

lib/Default/AbstractSmrLocation.class.php

Braces +10 added lines, -16 removed lines

@@ -98,8 +98,7 @@ 
 			$this->name = $db->getField('location_name');
 			$this->processor = $db->getField('location_processor');
 			$this->image = $db->getField('location_image');
-		}
-		else {
+		} else {
 			throw new Exception('Cannot find location: ' . $locationTypeID);
 		}
 	}
@@ -158,8 +157,7 @@ 
 		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_fed (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->fed = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_fed WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->fed = false;
 		}
@@ -180,8 +178,7 @@ 
 		if ($bool === true) {
 			$this->db->query('INSERT INTO location_is_bank (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->bank = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_bank WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bank = false;
 		}
@@ -202,8 +199,7 @@ 
 		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_bar (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->bar = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_bar WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bar = false;
 		}
@@ -224,8 +220,7 @@ 
 		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_hq (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->HQ = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_hq WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->HQ = false;
 		}
@@ -246,8 +241,7 @@ 
 		if ($bool === true) {
 			$this->db->query('INSERT INTO location_is_ug (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->UG = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_ug WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->UG = false;
 		}
@@ -335,8 +329,9 @@ 
 		if (!isset($this->weaponsSold)) {
 			$this->weaponsSold = array();
 			$this->db->query('SELECT * FROM location_sells_weapons JOIN weapon_type USING (weapon_type_id) WHERE ' . $this->SQL);
-			while ($this->db->nextRecord())
-				$this->weaponsSold[$this->db->getInt('weapon_type_id')] = SmrWeapon::getWeapon($this->db->getInt('weapon_type_id'), false, $this->db);
+			while ($this->db->nextRecord()) {
+							$this->weaponsSold[$this->db->getInt('weapon_type_id')] = SmrWeapon::getWeapon($this->db->getInt('weapon_type_id'), false, $this->db);
+			}
 		}
 		return $this->weaponsSold;
 	}
@@ -375,8 +370,7 @@ 
 			if ($this->getTypeID() == LOCATION_TYPE_FEDERAL_HQ) {
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_TYPE_FEDERAL_BEACON);
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_TYPE_FEDERAL_MINT);
-			}
-			else {
+			} else {
 				$raceID = $this->getRaceID();
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_BEACONS + $raceID);
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_SHIPS + $raceID);

lib/Default/MySqlDatabase.class.php

Braces +1 added lines, -2 removed lines

@@ -227,8 +227,7 @@
 				}
 			}
 			$string = substr($string, 0, -1);
-		}
-		else {
+		} else {
 			$string = $this->escape(implode($implodeString, $array), $autoQuotes, $quotes);
 		}
 		return $string;

lib/Default/AbstractSmrShip.class.php

Braces +3 added lines, -6 removed lines

@@ -273,8 +273,7 @@ 
 		if ($replacement < 0) {
 			// Shift everything up by one and put the selected weapon at the bottom
 			array_push($this->weapons, array_shift($this->weapons));
-		}
-		else {
+		} else {
 			// Swap the selected weapon with the one above it
 			$temp = $this->weapons[$replacement];
 			$this->weapons[$replacement] = $this->weapons[$orderID];
@@ -288,8 +287,7 @@ 
 		if ($replacement >= count($this->weapons)) {
 			// Shift everything down by one and put the selected weapon at the top
 			array_unshift($this->weapons, array_pop($this->weapons));
-		}
-		else {
+		} else {
 			// Swap the selected weapon with the one below it
 			$temp = $this->weapons[$replacement];
 			$this->weapons[$replacement] = $this->weapons[$orderID];
@@ -348,8 +346,7 @@ 
 			$this->setArmour(150, true);
 			$this->setCargoHolds(40);
 			$this->setShipTypeID(SHIP_TYPE_NEWBIE_MERCHANT_VESSEL);
-		}
-		else {
+		} else {
 			$this->setShields(50, true);
 			$this->setArmour(50, true);
 			$this->setCargoHolds(5);

lib/Default/SmrWeapon.class.php

Braces +9 added lines, -3 removed lines

@@ -193,22 +193,28 @@
 	}
 	
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootForces()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		return $damage;
 	}
 	
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPorts()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		return $damage;
 	}
 	
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPlanets()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		
 		$planetMod = self::PLANET_DAMAGE_MOD;

lib/Default/SmrForce.class.php

Braces +5 added lines, -10 removed lines

@@ -279,8 +279,7 @@ 
 		// Changed (26/10/05) - scout drones count * 2
 		if ($this->getCDs() == 0 && $this->getMines() == 0 && $this->getSDs() > 0) {
 			$time = self::TIME_PER_SCOUT_ONLY * $this->getSDs();
-		}
-		else {
+		} else {
 			$time = ($this->getCDs() * self::TIME_PERCENT_PER_COMBAT + $this->getSDs() * self::TIME_PERCENT_PER_SCOUT + $this->getMines() * self::TIME_PERCENT_PER_MINE) * $this->getMaxGalaxyExpireTime();
 		}
 		$this->setExpire(TIME + $time);
@@ -307,11 +306,9 @@ 
 		}
 		if ($mines < 10) {
 			$turns = 1;
-		}
-		else if ($mines < 25) {
+		} else if ($mines < 25) {
 			$turns = 2;
-		}
-		else {
+		} else {
 			$turns = 3;
 		}
 		if ($ship->isFederal() || $ship->hasDCS()) {
@@ -366,12 +363,10 @@ 
 			if (!$this->exists()) {
 				$this->db->query('DELETE FROM sector_has_forces WHERE ' . $this->SQL);
 				$this->isNew = true;
-			}
-			else if ($this->hasChanged) {
+			} else if ($this->hasChanged) {
 				$this->db->query('UPDATE sector_has_forces SET combat_drones = ' . $this->db->escapeNumber($this->combatDrones) . ', scout_drones = ' . $this->db->escapeNumber($this->scoutDrones) . ', mines = ' . $this->db->escapeNumber($this->mines) . ', expire_time = ' . $this->db->escapeNumber($this->expire) . ' WHERE ' . $this->SQL);
 			}
-		}
-		else if ($this->exists()) {
+		} else if ($this->exists()) {
 			$this->db->query('INSERT INTO sector_has_forces (game_id, sector_id, owner_id, combat_drones, scout_drones, mines, expire_time)
 								VALUES('.$this->db->escapeNumber($this->gameID) . ', ' . $this->db->escapeNumber($this->sectorID) . ', ' . $this->db->escapeNumber($this->ownerID) . ', ' . $this->db->escapeNumber($this->combatDrones) . ', ' . $this->db->escapeNumber($this->scoutDrones) . ', ' . $this->db->escapeNumber($this->mines) . ', ' . $this->db->escapeNumber($this->expire) . ')');
 			$this->isNew = false;

lib/Default/SmrPlanet.class.php

Braces +20 added lines, -36 removed lines

@@ -151,26 +151,19 @@ 
 		$level = $this->getLevel();
 		if ($level < 9) {
 			return .0404;
-		}
-		elseif ($level < 19) {
+		} elseif ($level < 19) {
 			return .0609;
-		}
-		elseif ($level < 29) {
+		} elseif ($level < 29) {
 			return .1236;
-		}
-		elseif ($level < 39) {
+		} elseif ($level < 39) {
 			return .050625;
-		}
-		elseif ($level < 49) {
+		} elseif ($level < 49) {
 			return .0404;
-		}
-		elseif ($level < 59) {
+		} elseif ($level < 59) {
 			return .030225;
-		}
-		elseif ($level < 69) {
+		} elseif ($level < 69) {
 			return .0201;
-		}
-		else {
+		} else {
 			return .018081;
 		}
 	}
@@ -383,8 +376,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setShields($this->getShields() - $number);
-		}
-		else {
+		} else {
 			$this->delayedShieldsDelta -= $number;
 		}
 	}
@@ -395,8 +387,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setShields($this->getShields() + $number);
-		}
-		else {
+		} else {
 			$this->delayedShieldsDelta += $number;
 		}
 	}
@@ -428,8 +419,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setArmour($this->getArmour() - $number);
-		}
-		else {
+		} else {
 			$this->delayedArmourDelta -= $number;
 		}
 	}
@@ -440,8 +430,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setArmour($this->getArmour() + $number);
-		}
-		else {
+		} else {
 			$this->delayedArmourDelta += $number;
 		}
 	}
@@ -473,8 +462,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setCDs($this->getCDs() - $number);
-		}
-		else {
+		} else {
 			$this->delayedCDsDelta -= $number;
 		}
 	}
@@ -485,8 +473,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setCDs($this->getCDs() + $number);
-		}
-		else {
+		} else {
 			$this->delayedCDsDelta += $number;
 		}
 	}
@@ -580,8 +567,9 @@ 
 			// get supplies from db
 			$this->db->query('SELECT good_id, amount FROM planet_has_cargo WHERE ' . $this->SQL);
 			// adding cargo and amount to array
-			while ($this->db->nextRecord())
-				$this->stockpile[$this->db->getInt('good_id')] = $this->db->getInt('amount');
+			while ($this->db->nextRecord()) {
+							$this->stockpile[$this->db->getInt('good_id')] = $this->db->getInt('amount');
+			}
 		}
 		if ($goodID === false) {
 			return $this->stockpile;
@@ -596,8 +584,7 @@ 
 		if ($goodID === false) {
 			$stockpile = $this->getStockpile($goodID);
 			return count($stockpile) > 0 && max($stockpile) > 0;
-		}
-		else {
+		} else {
 			return $this->getStockpile($goodID) > 0;
 		}
 	}
@@ -831,8 +818,7 @@ 
 				if ($amount != 0) {
 					$this->db->query('REPLACE INTO planet_has_cargo (game_id, sector_id, good_id, amount) ' .
 										 'VALUES(' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber($this->getSectorID()) . ', ' . $this->db->escapeNumber($id) . ', ' . $this->db->escapeNumber($amount) . ')');
-				}
-				else {
+				} else {
 					$this->db->query('DELETE FROM planet_has_cargo WHERE ' . $this->SQL . '
 										AND good_id = ' . $this->db->escapeNumber($id));
 				}
@@ -861,8 +847,7 @@ 
 				if ($this->hasBuilding($id)) {
 					$this->db->query('REPLACE INTO planet_has_building (game_id, sector_id, construction_id, amount) ' .
 										'VALUES(' . $this->db->escapeNumber($this->gameID) . ', ' . $this->db->escapeNumber($this->sectorID) . ', ' . $this->db->escapeNumber($id) . ', ' . $this->db->escapeNumber($this->getBuilding($id)) . ')');
-				}
-				else {
+				} else {
 					$this->db->query('DELETE FROM planet_has_building WHERE ' . $this->SQL . '
 										AND construction_id = ' . $this->db->escapeNumber($id));
 				}
@@ -1236,8 +1221,7 @@ 
 					}
 				}
 
-			}
-			else { // hit drones behind shields - we should only use this reduced damage branch if we cannot hit shields.
+			} else { // hit drones behind shields - we should only use this reduced damage branch if we cannot hit shields.
 				$cdDamage = $this->doCDDamage(IFloor(min($damage['MaxDamage'], $damage['Armour']) * DRONES_BEHIND_SHIELDS_DAMAGE_PERCENT), $delayed);
 			}
 		}

lib/Default/SmrCombatDrones.class.php

Braces +10 added lines, -5 removed lines

@@ -13,8 +13,7 @@ 
 			$this->maxDamage = 2;
 			$this->shieldDamage = 2;
 			$this->armourDamage = 2;
-		}
-		else {
+		} else {
 			$this->maxDamage = 1;
 			$this->shieldDamage = 1;
 			$this->armourDamage = 1;
@@ -129,8 +128,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootForces()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces) / 100);
 		$damage['Kamikaze'] = 0;
@@ -151,8 +152,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPorts()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port) / 100);
 		$damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']);
@@ -163,8 +166,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPlanets()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet) / 100);
 		$planetMod = self::PLANET_DAMAGE_MOD;

lib/Default/AbstractSmrAccount.class.php

Braces +7 added lines, -9 removed lines

@@ -239,8 +239,7 @@ 
 			if(empty($this->hofName)) {
 				$this->hofName=$this->login;
 			}
-		}
-		else {
+		} else {
 			throw new AccountNotFoundException('Account ID '.$accountID.' does not exist!');
 		}
 	}
@@ -262,8 +261,7 @@ 
 				'Reason' => $this->db->getField('reason'),
 				'ReasonID' => $this->db->getInt('reason_id')
 			);
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
@@ -319,7 +317,9 @@ 
 		if ($curr_ip != 'unknown' && $curr_ip != 'unknown...' && $curr_ip != 'unknown, unknown') {
 			$curr_ip = $fi.'.'.$se.'.'.$th.'.'.$fo;
 			$host = gethostbyaddr($curr_ip);
-		} else $host = 'unknown';
+		} else {
+			$host = 'unknown';
+		}
 
 		// save...first make sure there isn't one for these keys (someone could double click and get error)
 		$this->db->query('REPLACE INTO account_has_ip (account_id, time, ip, host) VALUES ('.$this->db->escapeNumber($this->account_id).', '.$this->db->escapeNumber(TIME).', '.$this->db->escapeString($curr_ip).', '.$this->db->escapeString($host).')');
@@ -997,8 +997,7 @@ 
 		if($hotkeyType!==false) {
 			if(isset($this->hotkeys[$hotkeyType])) {
 				return $this->hotkeys[$hotkeyType];
-			}
-			else {
+			} else {
 				return array();
 			}
 		}
@@ -1178,8 +1177,7 @@ 
 
 		if($days==0) {
 			$expireTime = 0;
-		}
-		else {
+		} else {
 			$expireTime = TIME + $days * 86400;
 		}
 		$this->banAccount($expireTime,$admin,$reasonID,$suspicion);

lib/Default/AbstractSmrPlayer.class.php

Braces +10 added lines, -11 removed lines

@@ -464,7 +464,9 @@ 
 		if ($this->level === null) {
 			$LEVELS_REQUIREMENTS = Globals::getLevelRequirements();
 			foreach ($LEVELS_REQUIREMENTS as $level_id => $require) {
-				if ($this->getExperience() >= $require['Requirement']) continue;
+				if ($this->getExperience() >= $require['Requirement']) {
+					continue;
+				}
 				$this->level = $level_id - 1;
 				return $this->level;
 			}
@@ -585,8 +587,7 @@ 
 	public function getAllianceDisplayName($linked = false, $includeAllianceID = false) {
 		if ($this->hasAlliance()) {
 			return $this->getAlliance()->getAllianceDisplayName($linked, $includeAllianceID);
-		}
-		else {
+		} else {
 			return 'No Alliance';
 		}
 	}
@@ -923,8 +924,7 @@ 
 		$hofType = implode(':', $typeList);
 		if (!isset(self::$HOFVis[$hofType])) {
 			self::$hasHOFVisChanged[$hofType] = self::HOF_NEW;
-		}
-		else if (self::$HOFVis[$hofType] != $visibility) {
+		} else if (self::$HOFVis[$hofType] != $visibility) {
 			self::$hasHOFVisChanged[$hofType] = self::HOF_CHANGED;
 		}
 		self::$HOFVis[$hofType] = $visibility;
@@ -1159,8 +1159,7 @@ 
 		if ($mission['On Step'] >= count(MISSIONS[$missionID]['Steps'])) {
 			// If we have completed this mission just use false to indicate no current task.
 			$currentStep = false;
-		}
-		else {
+		} else {
 			$currentStep = MISSIONS[$missionID]['Steps'][$mission['On Step']];
 			$currentStep['Text'] = str_replace(array('<Race>', '<Sector>', '<Starting Sector>', '<trader>'), array($this->getRaceID(), $mission['Sector'], $mission['Starting Sector'], $this->playerName), $currentStep['Text']);
 			if (isset($currentStep['Task'])) {
@@ -1168,8 +1167,7 @@ 
 			}
 			if (isset($currentStep['Level'])) {
 				$currentStep['Level'] = str_replace('<Player Level>', $this->getLevelID(), $currentStep['Level']);
-			}
-			else {
+			} else {
 				$currentStep['Level'] = 0;
 			}
 		}
@@ -1386,8 +1384,9 @@ 
 		if (!isset($this->visitedSectors)) {
 			$this->visitedSectors = array();
 			$this->db->query('SELECT sector_id FROM player_visited_sector WHERE ' . $this->SQL);
-			while ($this->db->nextRecord())
-				$this->visitedSectors[$this->db->getInt('sector_id')] = false;
+			while ($this->db->nextRecord()) {
+							$this->visitedSectors[$this->db->getInt('sector_id')] = false;
+			}
 		}
 		return !isset($this->visitedSectors[$sectorID]);
 	}