smrealms / smr

engine/Default/shop_goods_processing.php

Braces +36 added lines, -23 removed lines

@@ -5,59 +5,73 @@ 
 $amount = get_amount();
 $bargain_price = get_bargain_price();
 
-if (!is_numeric($amount) || !is_numeric($bargain_price))
+if (!is_numeric($amount) || !is_numeric($bargain_price)) {
 	create_error('Numbers only please!');
+}
 // get good name, id, ...
 $good_id = $var['good_id'];
 $good_name = Globals::getGoodName($good_id);
 
 // do we have enough turns?
-if ($player->getTurns() == 0)
+if ($player->getTurns() == 0) {
 	create_error('You don\'t have enough turns to trade.');
+}
 
 // get rid of those bugs when we die...there is no port at the home sector
-if (!$sector->hasPort())
+if (!$sector->hasPort()) {
 	create_error('I can\'t see a port in this sector. Can you?');
+}
 $port = $sector->getPort();
 
 // check if the player has the right relations to trade at the current port
-if ($player->getRelation($port->getRaceID()) < RELATIONS_WAR)
+if ($player->getRelation($port->getRaceID()) < RELATIONS_WAR) {
 	create_error('This port refuses to trade with you because you are at <span class="big bold red">WAR!</span>');
+}
 
 // does the port actually buy or sell this good?
 $transaction = $port->getGoodTransaction($good_id);
-if (empty($transaction))
+if (empty($transaction)) {
 	create_error('I don\'t trade in that good.');
+}
 
 $portGood = $port->getGood($good_id);
 // check if there are enough left at port
-if ($port->getGoodAmount($good_id) < $amount)
+if ($port->getGoodAmount($good_id) < $amount) {
 	create_error('I\'m short of ' . $good_name . '. So I\'m not going to sell you ' . $amount . ' pcs.');
+}
 
 // does we have what we are going to sell?
-if ($transaction == 'Sell' && $amount > $ship->getCargo($good_id))
+if ($transaction == 'Sell' && $amount > $ship->getCargo($good_id)) {
 	create_error('Scanning your ships indicates you don\'t have ' . $amount . ' pcs. of ' . $good_name . '!');
+}
 
 // check if we have enough room for the thing we are going to buy
-if ($transaction == 'Buy' && $amount > $ship->getEmptyHolds())
+if ($transaction == 'Buy' && $amount > $ship->getEmptyHolds()) {
 	create_error('Scanning your ships indicates you don\'t have enough free cargo bays!');
+}
 
 // check if the guy has enough money
-if ($transaction == 'Buy' && $player->getCredits() < $bargain_price)
+if ($transaction == 'Buy' && $player->getCredits() < $bargain_price) {
 	create_error('You don\'t have enough credits!');
+}
 
 // get relations for us (global + personal)
 $relations = $player->getRelation($port->getRaceID());
 
-if (!isset($var['ideal_price'])) SmrSession::updateVar('ideal_price', $port->getIdealPrice($good_id, $transaction, $amount, $relations));
+if (!isset($var['ideal_price'])) {
+	SmrSession::updateVar('ideal_price', $port->getIdealPrice($good_id, $transaction, $amount, $relations));
+}
 $ideal_price = $var['ideal_price'];
 
-if (!isset($var['offered_price'])) SmrSession::updateVar('offered_price', $port->getOfferPrice($ideal_price, $relations, $transaction));
+if (!isset($var['offered_price'])) {
+	SmrSession::updateVar('offered_price', $port->getOfferPrice($ideal_price, $relations, $transaction));
+}
 $offered_price = $var['offered_price'];
 
 // nothing should happen here but just to avoid / by 0
-if ($ideal_price == 0 || $offered_price == 0)
+if ($ideal_price == 0 || $offered_price == 0) {
 	create_error('Port calculation error...buy more goods.');
+}
 
 if ($_REQUEST['action'] == 'Steal') {
 	if (!$ship->isUnderground()) {
@@ -109,8 +123,7 @@ 
 		$player->increaseHOF($bargain_price, array('Trade', 'Money', 'Buying'), HOF_PUBLIC);
 		$port->buyGoods($portGood, $amount, $ideal_price, $bargain_price, $gained_exp);
 		$player->increaseRelationsByTrade($amount, $port->getRaceID());
-	}
-	elseif ($transaction == 'Sell') {
+	} elseif ($transaction == 'Sell') {
 		$msg_transaction = 'sold';
 		$ship->decreaseCargo($good_id, $amount);
 		$player->increaseCredits($bargain_price);
@@ -120,8 +133,7 @@ 
 		$player->increaseHOF($bargain_price, array('Trade', 'Money', 'Selling'), HOF_PUBLIC);
 		$port->sellGoods($portGood, $amount, $ideal_price, $bargain_price, $gained_exp);
 		$player->increaseRelationsByTrade($amount, $port->getRaceID());
-	}
-	elseif ($transaction == 'Steal') {
+	} elseif ($transaction == 'Steal') {
 		$msg_transaction = 'stolen';
 		$ship->increaseCargo($good_id, $amount);
 		$player->increaseHOF($amount, array('Trade', 'Goods', 'Stolen'), HOF_ALLIANCE);
@@ -151,13 +163,13 @@ 
 
 	$container['trade_msg'] = $tradeMessage;
 
-	if ($ship->getEmptyHolds() == 0)
-		$container['body'] = 'current_sector.php';
-	else
-		$container['body'] = 'shop_goods.php';
+	if ($ship->getEmptyHolds() == 0) {
+			$container['body'] = 'current_sector.php';
+	} else {
+			$container['body'] = 'shop_goods.php';
+	}
 
-}
-else {
+} else {
 	// does the trader try to outsmart us?
 	$container = create_container('skeleton.php', 'shop_goods_trade.php');
 	transfer('ideal_price');
@@ -172,8 +184,9 @@ 
 }
 
 // only take turns if they bargained
-if (!isset($container['number_of_bargains']) || $container['number_of_bargains'] != 1)
+if (!isset($container['number_of_bargains']) || $container['number_of_bargains'] != 1) {
 	$player->takeTurns(TURNS_PER_TRADE, TURNS_PER_TRADE);
+}
 
 // go to next page
 forward($container);

lib/Default/PlayingCard.class.php

Indentation +2 added lines, -2 removed lines

@@ -44,8 +44,8 @@
 	 */
 	public function getValue() {
 		if ($this->rankID == self::RANK_JACK ||
-		    $this->rankID == self::RANK_QUEEN ||
-		    $this->rankID == self::RANK_KING) {
+			$this->rankID == self::RANK_QUEEN ||
+			$this->rankID == self::RANK_KING) {
 			return 10;
 		} elseif ($this->isAce()) {
 			return 11;

lib/Default/AbstractSmrPlayer.class.php

Indentation +3 added lines, -3 removed lines

@@ -242,9 +242,9 @@
 	 */
 	public function canFight() {
 		return !($this->hasNewbieTurns() ||
-		         $this->isDead() ||
-		         $this->isLandedOnPlanet() ||
-		         $this->hasFederalProtection());
+				 $this->isDead() ||
+				 $this->isLandedOnPlanet() ||
+				 $this->hasFederalProtection());
 	}
 
 	public function setDead($bool) {

Spacing +7 added lines, -7 removed lines

@@ -896,8 +896,8 @@ 
 		}
 		self::$HOFVis[$hofType] = $visibility;
 
-		$hof =& $this->HOF;
-		$hofChanged =& $this->hasHOFChanged;
+		$hof = & $this->HOF;
+		$hofChanged = & $this->hasHOFChanged;
 		$new = false;
 		foreach ($typeList as $type) {
 			if (!isset($hofChanged[$type]))
@@ -906,8 +906,8 @@ 
 				$hof[$type] = array();
 				$new = true;
 			}
-			$hof =& $hof[$type];
-			$hofChanged =& $hofChanged[$type];
+			$hof = & $hof[$type];
+			$hofChanged = & $hofChanged[$type];
 		}
 		if ($hofChanged == null) {
 			$hofChanged = self::HOF_CHANGED;
@@ -1059,7 +1059,7 @@ 
 	}
 
 	private function setupMissionStep($missionID) {
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission['On Step'] >= count(MISSIONS[$missionID]['Steps'])) {
 			// Nothing to do if this mission is already completed
 			return;
@@ -1103,7 +1103,7 @@ 
 			'Starting Sector' => $this->getSectorID()
 		);
 
-		$this->missions[$missionID] =& $mission;
+		$this->missions[$missionID] = & $mission;
 		$this->setupMissionStep($missionID);
 		$this->rebuildMission($missionID);
 
@@ -1162,7 +1162,7 @@ 
 
 	public function claimMissionReward($missionID) {
 		$this->getMissions();
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission === false) {
 			throw new Exception('Unknown mission: ' . $missionID);
 		}

Braces +214 added lines, -147 removed lines

@@ -76,8 +76,9 @@ 
 		return $this->getNewbieTurns() > 0;
 	}
 	public function setNewbieTurns($newbieTurns) {
-		if ($this->newbieTurns == $newbieTurns)
-			return;
+		if ($this->newbieTurns == $newbieTurns) {
+					return;
+		}
 		$this->newbieTurns = $newbieTurns;
 		$this->hasChanged = true;
 	}
@@ -87,8 +88,9 @@ 
 	}
 
 	public function setShipTypeID($shipID) {
-		if ($this->shipID == $shipID)
-			return;
+		if ($this->shipID == $shipID) {
+					return;
+		}
 		$this->shipID = $shipID;
 		$this->hasChanged = true;
 	}
@@ -198,8 +200,9 @@ 
 		}
 
 		$ship = $this->getShip();
-		if ($ship->hasIllegalGoods())
-			return false;
+		if ($ship->hasIllegalGoods()) {
+					return false;
+		}
 
 		if ($ship->getAttackRating() <= $this->getSafeAttackRating()) {
 			foreach ($sector->getFedRaceIDs() as $fedRaceID) {
@@ -240,8 +243,9 @@ 
 	}
 
 	public function setDead($bool) {
-		if ($this->dead == $bool)
-			return;
+		if ($this->dead == $bool) {
+					return;
+		}
 		$this->dead = $bool;
 		$this->hasChanged = true;
 	}
@@ -251,14 +255,16 @@ 
 	}
 
 	public function increaseKills($kills) {
-		if ($kills < 0)
-			throw new Exception('Trying to increase negative kills.');
+		if ($kills < 0) {
+					throw new Exception('Trying to increase negative kills.');
+		}
 		$this->setKills($this->kills + $kills);
 	}
 
 	public function setKills($kills) {
-		if ($this->kills == $kills)
-			return;
+		if ($this->kills == $kills) {
+					return;
+		}
 		$this->kills = $kills;
 		$this->hasChanged = true;
 	}
@@ -268,14 +274,16 @@ 
 	}
 
 	public function increaseDeaths($deaths) {
-		if ($deaths < 0)
-			throw new Exception('Trying to increase negative deaths.');
+		if ($deaths < 0) {
+					throw new Exception('Trying to increase negative deaths.');
+		}
 		$this->setDeaths($this->getDeaths() + $deaths);
 	}
 
 	public function setDeaths($deaths) {
-		if ($this->deaths == $deaths)
-			return;
+		if ($this->deaths == $deaths) {
+					return;
+		}
 		$this->deaths = $deaths;
 		$this->hasChanged = true;
 	}
@@ -297,24 +305,29 @@ 
 	}
 
 	public function increaseAlignment($align) {
-		if ($align < 0)
-			throw new Exception('Trying to increase negative align.');
-		if ($align == 0)
-			return;
+		if ($align < 0) {
+					throw new Exception('Trying to increase negative align.');
+		}
+		if ($align == 0) {
+					return;
+		}
 		$align += $this->alignment;
 		$this->setAlignment($align);
 	}
 	public function decreaseAlignment($align) {
-		if ($align < 0)
-			throw new Exception('Trying to decrease negative align.');
-		if ($align == 0)
-			return;
+		if ($align < 0) {
+					throw new Exception('Trying to decrease negative align.');
+		}
+		if ($align == 0) {
+					return;
+		}
 		$align = $this->alignment - $align;
 		$this->setAlignment($align);
 	}
 	public function setAlignment($align) {
-		if ($this->alignment == $align)
-			return;
+		if ($this->alignment == $align) {
+					return;
+		}
 		$this->alignment = $align;
 		$this->hasChanged = true;
 	}
@@ -332,8 +345,9 @@ 
 	 * This value is rounded because it is used primarily in HTML img widths.
 	 */
 	public function getNextLevelPercentAcquired() : int {
-		if ($this->getNextLevelExperience() == $this->getThisLevelExperience())
-			return 100;
+		if ($this->getNextLevelExperience() == $this->getThisLevelExperience()) {
+					return 100;
+		}
 		return max(0, min(100, IRound(($this->getExperience() - $this->getThisLevelExperience()) / ($this->getNextLevelExperience() - $this->getThisLevelExperience()) * 100)));
 	}
 
@@ -343,8 +357,10 @@ 
 
 	public function getNextLevelExperience() {
 		$LEVELS_REQUIREMENTS = Globals::getLevelRequirements();
-		if (!isset($LEVELS_REQUIREMENTS[$this->getLevelID() + 1]))
-			return $this->getThisLevelExperience(); //Return current level experience if on last level.
+		if (!isset($LEVELS_REQUIREMENTS[$this->getLevelID() + 1])) {
+					return $this->getThisLevelExperience();
+		}
+		//Return current level experience if on last level.
 		return $LEVELS_REQUIREMENTS[$this->getLevelID() + 1]['Requirement'];
 	}
 
@@ -354,12 +370,15 @@ 
 	}
 
 	public function setExperience($experience) {
-		if ($this->experience == $experience)
-			return;
-		if ($experience < MIN_EXPERIENCE)
-			$experience = MIN_EXPERIENCE;
-		if ($experience > MAX_EXPERIENCE)
-			$experience = MAX_EXPERIENCE;
+		if ($this->experience == $experience) {
+					return;
+		}
+		if ($experience < MIN_EXPERIENCE) {
+					$experience = MIN_EXPERIENCE;
+		}
+		if ($experience > MAX_EXPERIENCE) {
+					$experience = MAX_EXPERIENCE;
+		}
 		$this->experience = $experience;
 		$this->hasChanged = true;
 
@@ -369,46 +388,57 @@ 
 	}
 
 	public function increaseCredits($credits) {
-		if ($credits < 0)
-			throw new Exception('Trying to increase negative credits.');
-		if ($credits == 0)
-			return;
+		if ($credits < 0) {
+					throw new Exception('Trying to increase negative credits.');
+		}
+		if ($credits == 0) {
+					return;
+		}
 		$credits += $this->credits;
 		$this->setCredits($credits);
 	}
 	public function decreaseCredits($credits) {
-		if ($credits < 0)
-			throw new Exception('Trying to decrease negative credits.');
-		if ($credits == 0)
-			return;
+		if ($credits < 0) {
+					throw new Exception('Trying to decrease negative credits.');
+		}
+		if ($credits == 0) {
+					return;
+		}
 		$credits = $this->credits - $credits;
 		$this->setCredits($credits);
 	}
 	public function setCredits($credits) {
-		if ($this->credits == $credits)
-			return;
-		if ($credits < 0)
-			throw new Exception('Trying to set negative credits.');
-		if ($credits > MAX_MONEY)
-			$credits = MAX_MONEY;
+		if ($this->credits == $credits) {
+					return;
+		}
+		if ($credits < 0) {
+					throw new Exception('Trying to set negative credits.');
+		}
+		if ($credits > MAX_MONEY) {
+					$credits = MAX_MONEY;
+		}
 		$this->credits = $credits;
 		$this->hasChanged = true;
 	}
 
 	public function increaseExperience($experience) {
-		if ($experience < 0)
-			throw new Exception('Trying to increase negative experience.');
-		if ($experience == 0)
-			return;
+		if ($experience < 0) {
+					throw new Exception('Trying to increase negative experience.');
+		}
+		if ($experience == 0) {
+					return;
+		}
 		$newExperience = $this->experience + $experience;
 		$this->setExperience($newExperience);
 		$this->increaseHOF($experience, array('Experience', 'Total', 'Gain'), HOF_PUBLIC);
 	}
 	public function decreaseExperience($experience) {
-		if ($experience < 0)
-			throw new Exception('Trying to decrease negative experience.');
-		if ($experience == 0)
-			return;
+		if ($experience < 0) {
+					throw new Exception('Trying to decrease negative experience.');
+		}
+		if ($experience == 0) {
+					return;
+		}
 		$newExperience = $this->experience - $experience;
 		$this->setExperience($newExperience);
 		$this->decreaseHOF($experience, array('Experience', 'Total', 'Loss'), HOF_PUBLIC);
@@ -419,8 +449,9 @@ 
 	}
 
 	public function setLandedOnPlanet($bool) {
-		if ($this->landedOnPlanet == $bool)
-			return;
+		if ($this->landedOnPlanet == $bool) {
+					return;
+		}
 		$this->landedOnPlanet = $bool;
 		$this->hasChanged = true;
 	}
@@ -434,7 +465,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;
 			}
@@ -512,8 +545,9 @@ 
 	}
 
 	public function setRaceID($raceID) {
-		if ($this->raceID == $raceID)
-			return;
+		if ($this->raceID == $raceID) {
+					return;
+		}
 		$this->raceID = $raceID;
 		$this->hasChanged = true;
 	}
@@ -535,8 +569,9 @@ 
 	}
 
 	protected function setAllianceID($ID) {
-		if ($this->allianceID == $ID)
-			return;
+		if ($this->allianceID == $ID) {
+					return;
+		}
 		$this->allianceID = $ID;
 		if ($this->allianceID != 0) {
 			$status = $this->hasNewbieStatus() ? 'NEWBIE' : 'VETERAN';
@@ -553,8 +588,7 @@ 
 	public function getAllianceDisplayName($linked = false, $includeAllianceID = false) {
 		if ($this->hasAlliance()) {
 			return $this->getAlliance()->getAllianceDisplayName($linked, $includeAllianceID);
-		}
-		else {
+		} else {
 			return 'No Alliance';
 		}
 	}
@@ -582,8 +616,9 @@ 
 	}
 
 	public function setCombatDronesKamikazeOnMines($bool) {
-		if ($this->combatDronesKamikazeOnMines == $bool)
-			return;
+		if ($this->combatDronesKamikazeOnMines == $bool) {
+					return;
+		}
 		$this->combatDronesKamikazeOnMines = $bool;
 		$this->hasChanged = true;
 	}
@@ -656,21 +691,24 @@ 
 	}
 
 	public function setMilitaryPayment($amount) {
-		if ($this->militaryPayment == $amount)
-			return;
+		if ($this->militaryPayment == $amount) {
+					return;
+		}
 		$this->militaryPayment = $amount;
 		$this->hasChanged = true;
 	}
 
 	public function increaseMilitaryPayment($amount) {
-		if ($amount < 0)
-			throw new Exception('Trying to increase negative military payment.');
+		if ($amount < 0) {
+					throw new Exception('Trying to increase negative military payment.');
+		}
 		$this->setMilitaryPayment($this->getMilitaryPayment() + $amount);
 	}
 
 	public function decreaseMilitaryPayment($amount) {
-		if ($amount < 0)
-			throw new Exception('Trying to decrease negative military payment.');
+		if ($amount < 0) {
+					throw new Exception('Trying to decrease negative military payment.');
+		}
 		$this->setMilitaryPayment($this->getMilitaryPayment() - $amount);
 	}
 
@@ -713,10 +751,11 @@ 
 
 	protected function getNextBountyID() : int {
 		$keys = array_keys($this->getBounties());
-		if (count($keys) > 0)
-			return max($keys) + 1;
-		else
-			return 0;
+		if (count($keys) > 0) {
+					return max($keys) + 1;
+		} else {
+					return 0;
+		}
 	}
 
 	protected function setBounty(array $bounty) : void {
@@ -731,22 +770,25 @@ 
 	}
 
 	public function increaseBountyAmount(int $bountyID, int $amount) : void {
-		if ($amount < 0)
-			throw new Exception('Trying to increase negative bounty.');
+		if ($amount < 0) {
+					throw new Exception('Trying to increase negative bounty.');
+		}
 		$this->setBountyAmount($this->getBountyAmount($bountyID) + $amount);
 	}
 
 	public function decreaseBountyAmount(int $bountyID, int $amount) : void {
-		if ($amount < 0)
-			throw new Exception('Trying to decrease negative bounty.');
+		if ($amount < 0) {
+					throw new Exception('Trying to decrease negative bounty.');
+		}
 		$this->setBountyAmount($this->getBountyAmount($bountyID) + $amount);
 	}
 
 	public function getCurrentBounty(string $type) : array {
 		$bounties = $this->getBounties();
 		foreach ($bounties as $bounty) {
-			if ($bounty['Claimer'] == 0 && $bounty['Type'] == $type)
-				return $bounty;
+			if ($bounty['Claimer'] == 0 && $bounty['Type'] == $type) {
+							return $bounty;
+			}
 		}
 		return $this->createBounty($type);
 	}
@@ -754,8 +796,9 @@ 
 	public function hasCurrentBounty(string $type) : bool {
 		$bounties = $this->getBounties();
 		foreach ($bounties as $bounty) {
-			if ($bounty['Claimer'] == 0 && $bounty['Type'] == $type)
-				return true;
+			if ($bounty['Claimer'] == 0 && $bounty['Type'] == $type) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -767,21 +810,24 @@ 
 
 	protected function setCurrentBountyAmount(string $type, int $amount) : void {
 		$bounty = $this->getCurrentBounty($type);
-		if ($bounty['Amount'] == $amount)
-			return;
+		if ($bounty['Amount'] == $amount) {
+					return;
+		}
 		$bounty['Amount'] = $amount;
 		$this->setBounty($bounty);
 	}
 
 	public function increaseCurrentBountyAmount(string $type, int $amount) : void {
-		if ($amount < 0)
-			throw new Exception('Trying to increase negative current bounty.');
+		if ($amount < 0) {
+					throw new Exception('Trying to increase negative current bounty.');
+		}
 		$this->setCurrentBountyAmount($type, $this->getCurrentBountyAmount($type) + $amount);
 	}
 
 	public function decreaseCurrentBountyAmount(string $type, int $amount) : void {
-		if ($amount < 0)
-			throw new Exception('Trying to decrease negative current bounty.');
+		if ($amount < 0) {
+					throw new Exception('Trying to decrease negative current bounty.');
+		}
 		$this->setCurrentBountyAmount($type, $this->getCurrentBountyAmount($type) - $amount);
 	}
 
@@ -792,21 +838,24 @@ 
 
 	protected function setCurrentBountySmrCredits(string $type, int $credits) : void {
 		$bounty = $this->getCurrentBounty($type);
-		if ($bounty['SmrCredits'] == $credits)
-			return;
+		if ($bounty['SmrCredits'] == $credits) {
+					return;
+		}
 		$bounty['SmrCredits'] = $credits;
 		$this->setBounty($bounty);
 	}
 
 	public function increaseCurrentBountySmrCredits(string $type, int $credits) : void {
-		if ($credits < 0)
-			throw new Exception('Trying to increase negative current bounty.');
+		if ($credits < 0) {
+					throw new Exception('Trying to increase negative current bounty.');
+		}
 		$this->setCurrentBountySmrCredits($type, $this->getCurrentBountySmrCredits($type) + $credits);
 	}
 
 	public function decreaseCurrentBountySmrCredits(string $type, int $credits) : void {
-		if ($credits < 0)
-			throw new Exception('Trying to decrease negative current bounty.');
+		if ($credits < 0) {
+					throw new Exception('Trying to decrease negative current bounty.');
+		}
 		$this->setCurrentBountySmrCredits($type, $this->getCurrentBountySmrCredits($type) - $credits);
 	}
 
@@ -824,51 +873,59 @@ 
 
 	public function getHOF(array $typeList = null) {
 		$this->getHOFData();
-		if ($typeList == null)
-			return $this->HOF;
+		if ($typeList == null) {
+					return $this->HOF;
+		}
 		$hof = $this->HOF;
 		foreach ($typeList as $type) {
-			if (!isset($hof[$type]))
-				return 0;
+			if (!isset($hof[$type])) {
+							return 0;
+			}
 			$hof = $hof[$type];
 		}
 		return $hof;
 	}
 
 	public function increaseHOF($amount, array $typeList, $visibility) {
-		if ($amount < 0)
-			throw new Exception('Trying to increase negative HOF: ' . implode(':', $typeList));
-		if ($amount == 0)
-			return;
+		if ($amount < 0) {
+					throw new Exception('Trying to increase negative HOF: ' . implode(':', $typeList));
+		}
+		if ($amount == 0) {
+					return;
+		}
 		$this->setHOF($this->getHOF($typeList) + $amount, $typeList, $visibility);
 	}
 
 	public function decreaseHOF($amount, array $typeList, $visibility) {
-		if ($amount < 0)
-			throw new Exception('Trying to decrease negative HOF: ' . implode(':', $typeList));
-		if ($amount == 0)
-			return;
+		if ($amount < 0) {
+					throw new Exception('Trying to decrease negative HOF: ' . implode(':', $typeList));
+		}
+		if ($amount == 0) {
+					return;
+		}
 		$this->setHOF($this->getHOF($typeList) - $amount, $typeList, $visibility);
 	}
 
 	public function setHOF($amount, array $typeList, $visibility) {
-		if (is_array($this->getHOF($typeList)))
-			throw new Exception('Trying to overwrite a HOF type: ' . implode(':', $typeList));
+		if (is_array($this->getHOF($typeList))) {
+					throw new Exception('Trying to overwrite a HOF type: ' . implode(':', $typeList));
+		}
 		if ($this->isNPC()) {
 			// Don't store HOF for NPCs.
 			return;
 		}
-		if ($this->getHOF($typeList) == $amount)
-			return;
-		if ($amount < 0)
-			$amount = 0;
+		if ($this->getHOF($typeList) == $amount) {
+					return;
+		}
+		if ($amount < 0) {
+					$amount = 0;
+		}
 		$this->getHOF();
 
 		$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;
@@ -877,8 +934,9 @@ 
 		$hofChanged =& $this->hasHOFChanged;
 		$new = false;
 		foreach ($typeList as $type) {
-			if (!isset($hofChanged[$type]))
-				$hofChanged[$type] = array();
+			if (!isset($hofChanged[$type])) {
+							$hofChanged[$type] = array();
+			}
 			if (!isset($hof[$type])) {
 				$hof[$type] = array();
 				$new = true;
@@ -888,8 +946,9 @@ 
 		}
 		if ($hofChanged == null) {
 			$hofChanged = self::HOF_CHANGED;
-			if ($new)
-				$hofChanged = self::HOF_NEW;
+			if ($new) {
+							$hofChanged = self::HOF_NEW;
+			}
 		}
 		$hof = $amount;
 	}
@@ -954,8 +1013,9 @@ 
 	}
 
 	public function setLastActive($lastActive) {
-		if ($this->lastActive == $lastActive)
-			return;
+		if ($this->lastActive == $lastActive) {
+					return;
+		}
 		$this->lastActive = $lastActive;
 		$this->hasChanged = true;
 	}
@@ -965,8 +1025,9 @@ 
 	}
 
 	public function setLastCPLAction($time) {
-		if ($this->lastCPLAction == $time)
-			return;
+		if ($this->lastCPLAction == $time) {
+					return;
+		}
 		$this->lastCPLAction = $time;
 		$this->hasChanged = true;
 	}
@@ -1007,8 +1068,9 @@ 
 
 	protected function getMission($missionID) {
 		$missions = $this->getMissions();
-		if (isset($missions[$missionID]))
-			return $missions[$missionID];
+		if (isset($missions[$missionID])) {
+					return $missions[$missionID];
+		}
 		return false;
 	}
 
@@ -1067,8 +1129,9 @@ 
 	public function addMission($missionID, $step = 0) {
 		$this->getMissions();
 
-		if (isset($this->missions[$missionID]))
-			return;
+		if (isset($this->missions[$missionID])) {
+					return;
+		}
 		$sector = 0;
 
 		$mission = array(
@@ -1097,8 +1160,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'])) {
@@ -1106,8 +1168,7 @@ 
 			}
 			if (isset($currentStep['Level'])) {
 				$currentStep['Level'] = str_replace('<Player Level>', $this->getLevelID(), $currentStep['Level']);
-			}
-			else {
+			} else {
 				$currentStep['Level'] = 0;
 			}
 		}
@@ -1235,12 +1296,15 @@ 
 	}
 
 	public function canSee(AbstractSmrPlayer $otherPlayer) {
-		if (!$otherPlayer->getShip()->isCloaked())
-			return true;
-		if ($this->sameAlliance($otherPlayer))
-			return true;
-		if ($this->getExperience() >= $otherPlayer->getExperience())
-			return true;
+		if (!$otherPlayer->getShip()->isCloaked()) {
+					return true;
+		}
+		if ($this->sameAlliance($otherPlayer)) {
+					return true;
+		}
+		if ($this->getExperience() >= $otherPlayer->getExperience()) {
+					return true;
+		}
 		return false;
 	}
 
@@ -1293,10 +1357,12 @@ 
 	}
 
 	public function meetsAlignmentRestriction($restriction) {
-		if ($restriction < 0)
-			return $this->getAlignment() <= $restriction;
-		if ($restriction > 0)
-			return $this->getAlignment() >= $restriction;
+		if ($restriction < 0) {
+					return $this->getAlignment() <= $restriction;
+		}
+		if ($restriction > 0) {
+					return $this->getAlignment() >= $restriction;
+		}
 		return true;
 	}
 
@@ -1319,8 +1385,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]);
 	}

lib/Default/ChessPiece.class.php

Spacing +84 added lines, -84 removed lines

@@ -52,10 +52,10 @@ 
 	}
 	
 	public function isAttacking(array &$board, array &$hasMoved, $king, $x = -1, $y = -1) {
-		$moves =& $this->getPossibleMoves($board, $hasMoved, null, true);
-		foreach($moves as &$move) {
-			$p =& $board[$move[1]][$move[0]];
-			if(($move[0] == $x && $move[1] == $y) || ($king === true && $p != null && $p->pieceID == self::KING && $this->colour != $p->colour)) {
+		$moves = & $this->getPossibleMoves($board, $hasMoved, null, true);
+		foreach ($moves as &$move) {
+			$p = & $board[$move[1]][$move[0]];
+			if (($move[0] == $x && $move[1] == $y) || ($king === true && $p != null && $p->pieceID == self::KING && $this->colour != $p->colour)) {
 				return true;
 			}
 		}
@@ -64,130 +64,130 @@ 
 
 	public function &getPossibleMoves(array &$board, array &$hasMoved, $forAccountID = null, $attackingCheck = false) {
 		$moves = array();
-		if($forAccountID == null || $this->accountID == $forAccountID) {
-			if($this->pieceID==self::PAWN) {
-				$dirY = $this->colour==ChessGame::PLAYER_BLACK ? 1 : -1;
-				$moveY = $this->y+$dirY;
+		if ($forAccountID == null || $this->accountID == $forAccountID) {
+			if ($this->pieceID == self::PAWN) {
+				$dirY = $this->colour == ChessGame::PLAYER_BLACK ? 1 : -1;
+				$moveY = $this->y + $dirY;
 				//Pawn forward movement is not attacking - so don't check it if doing an attacking check.
-				if(!$attackingCheck) {
-					if(ChessGame::isValidCoord($this->x, $moveY, $board) && $board[$moveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $moveY)) {
-						$moves[] = array($this->x,$moveY);
+				if (!$attackingCheck) {
+					if (ChessGame::isValidCoord($this->x, $moveY, $board) && $board[$moveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $moveY)) {
+						$moves[] = array($this->x, $moveY);
 					}
 					$doubleMoveY = $moveY + $dirY;
-					if($this->y-$dirY == 0 || $this->y-$dirY*2 == count($board)) { //Double move first move
-						if($board[$moveY][$this->x] == null && $board[$doubleMoveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $doubleMoveY)) {
-							$moves[] = array($this->x,$doubleMoveY);
+					if ($this->y - $dirY == 0 || $this->y - $dirY * 2 == count($board)) { //Double move first move
+						if ($board[$moveY][$this->x] == null && $board[$doubleMoveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $doubleMoveY)) {
+							$moves[] = array($this->x, $doubleMoveY);
 						}
 					}
 				}
-				for($i=-1;$i<2;$i+=2) {
-					$moveX = $this->x+$i;
-					if(ChessGame::isValidCoord($moveX, $moveY, $board)) {
-						if($attackingCheck || 
+				for ($i = -1; $i < 2; $i += 2) {
+					$moveX = $this->x + $i;
+					if (ChessGame::isValidCoord($moveX, $moveY, $board)) {
+						if ($attackingCheck || 
 							((($hasMoved[ChessPiece::PAWN][0] == $moveX && $hasMoved[ChessPiece::PAWN][1] == $this->y) || 
-							($board[$moveY][$moveX] != null && $board[$moveY][$moveX]->colour!=$this->colour))
+							($board[$moveY][$moveX] != null && $board[$moveY][$moveX]->colour != $this->colour))
 							&& $this->isSafeMove($board, $hasMoved, $moveX, $moveY))) {
-							$moves[] = array($moveX,$moveY);
+							$moves[] = array($moveX, $moveY);
 						}
 					}
 				}
 			}
-			else if($this->pieceID==self::KING) {
-				for($i = -1; $i < 2; $i++) {
-					for($j = -1; $j < 2; $j++) {
-						if($i!=0 || $j!=0) {
-							$this->addMove($this->x+$i, $this->y+$j, $board, $moves, $hasMoved, $attackingCheck);
+			else if ($this->pieceID == self::KING) {
+				for ($i = -1; $i < 2; $i++) {
+					for ($j = -1; $j < 2; $j++) {
+						if ($i != 0 || $j != 0) {
+							$this->addMove($this->x + $i, $this->y + $j, $board, $moves, $hasMoved, $attackingCheck);
 						}
 					}
 				}
 				//Castling is not attacking - so don't check it if doing an attacking check.
-				if(!$attackingCheck && !$hasMoved[$this->colour][ChessPiece::KING] && !ChessGame::isPlayerChecked($board, $hasMoved, $this->colour)) {
-					if(!$hasMoved[$this->colour][ChessPiece::ROOK]['Queen'] && 
-							ChessGame::isValidCoord($this->x-1, $this->y, $board) && $board[$this->y][$this->x-1] == null &&
-							ChessGame::isValidCoord($this->x-3, $this->y, $board) && $board[$this->y][$this->x-3] == null &&
-							$this->isSafeMove($board, $hasMoved, $this->x-1, $this->y)) {
-						$this->addMove($this->x-2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
+				if (!$attackingCheck && !$hasMoved[$this->colour][ChessPiece::KING] && !ChessGame::isPlayerChecked($board, $hasMoved, $this->colour)) {
+					if (!$hasMoved[$this->colour][ChessPiece::ROOK]['Queen'] && 
+							ChessGame::isValidCoord($this->x - 1, $this->y, $board) && $board[$this->y][$this->x - 1] == null &&
+							ChessGame::isValidCoord($this->x - 3, $this->y, $board) && $board[$this->y][$this->x - 3] == null &&
+							$this->isSafeMove($board, $hasMoved, $this->x - 1, $this->y)) {
+						$this->addMove($this->x - 2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
 					}
-					if(!$hasMoved[$this->colour][ChessPiece::ROOK]['King'] &&
-							ChessGame::isValidCoord($this->x+1, $this->y, $board) && $board[$this->y][$this->x+1] == null &&
-							$this->isSafeMove($board, $hasMoved, $this->x+1, $this->y)) {
-						$this->addMove($this->x+2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
+					if (!$hasMoved[$this->colour][ChessPiece::ROOK]['King'] &&
+							ChessGame::isValidCoord($this->x + 1, $this->y, $board) && $board[$this->y][$this->x + 1] == null &&
+							$this->isSafeMove($board, $hasMoved, $this->x + 1, $this->y)) {
+						$this->addMove($this->x + 2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
 					}
 				}
 			}
-			else if($this->pieceID==self::QUEEN) {
+			else if ($this->pieceID == self::QUEEN) {
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
+				while ($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
+				while ($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
+				while ($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
+				while ($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
+				while ($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
+				while ($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 			}
-			else if($this->pieceID==self::ROOK) {
+			else if ($this->pieceID == self::ROOK) {
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
+				while ($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
+				while ($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
+				while ($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
+				while ($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
 			}
-			else if($this->pieceID==self::BISHOP) {
+			else if ($this->pieceID == self::BISHOP) {
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
+				while ($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
+				while ($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 			}
-			else if($this->pieceID==self::KNIGHT) {
-				$moveX = $this->x-1;
-				$moveY = $this->y-2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2up-left
+			else if ($this->pieceID == self::KNIGHT) {
+				$moveX = $this->x - 1;
+				$moveY = $this->y - 2;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2up-left
 				$moveX += 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2up-right
-				$moveY = $this->y+2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2down-right
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2up-right
+				$moveY = $this->y + 2;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2down-right
 				$moveX -= 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2down-left
-				$moveX = $this->x-2;
-				$moveY = $this->y-1;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2left-up
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2down-left
+				$moveX = $this->x - 2;
+				$moveY = $this->y - 1;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2left-up
 				$moveY += 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2left-down
-				$moveX = $this->x+2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2right-down
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2left-down
+				$moveX = $this->x + 2;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2right-down
 				$moveY -= 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2right-up
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2right-up
 			}
 		}
 		
@@ -195,11 +195,11 @@ 
 	}
 	
 	private function addMove($toX, $toY, array &$board, array &$moves, array &$hasMoved = null, $attackingCheck = true) {
-		if(ChessGame::isValidCoord($toX, $toY, $board)) {
-			if(($board[$toY][$toX] == null || $board[$toY][$toX]->colour!=$this->colour)) {
+		if (ChessGame::isValidCoord($toX, $toY, $board)) {
+			if (($board[$toY][$toX] == null || $board[$toY][$toX]->colour != $this->colour)) {
 				//We can only actually move to this position if it is safe to do so, however we can pass through it looking for a safe move so we still want to return true.
-				if(($attackingCheck == true || $this->isSafeMove($board, $hasMoved, $toX, $toY))) {
-					$moves[] = array($toX,$toY);
+				if (($attackingCheck == true || $this->isSafeMove($board, $hasMoved, $toX, $toY))) {
+					$moves[] = array($toX, $toY);
 				}
 				return true;
 			}
@@ -208,30 +208,30 @@ 
 	}
 	
 	public function promote($pawnPromotionPieceID, array &$board) {
-		if($pawnPromotionPieceID==null) {
+		if ($pawnPromotionPieceID == null) {
 			throw new Exception('Promotion piece cannot be null on a promote.');
 		}
 		$takenNos = array();
-		foreach($board as $row) {
-			foreach($row as $piece) {
-				if($piece != null && $piece->pieceID == $pawnPromotionPieceID && $piece->colour == $this->colour) {
+		foreach ($board as $row) {
+			foreach ($row as $piece) {
+				if ($piece != null && $piece->pieceID == $pawnPromotionPieceID && $piece->colour == $this->colour) {
 					$takenNos[$piece->pieceNo] = true;
 				}
 			}
 		}
-		$i=0;
-		while(isset($takenNos[$i])) {
+		$i = 0;
+		while (isset($takenNos[$i])) {
 			$i++;
 		}
 		return array('PieceID' => $pawnPromotionPieceID, 'PieceNo' => $i);
 	}
 
 	public function getPieceLetter() {
-		return self::getLetterForPiece($this->pieceID,$this->colour);
+		return self::getLetterForPiece($this->pieceID, $this->colour);
 	}
 
 	public function getPieceSymbol() {
-		return self::getSymbolForPiece($this->pieceID,$this->colour);
+		return self::getSymbolForPiece($this->pieceID, $this->colour);
 	}
 
 	public static function getSymbolForPiece($pieceID, $colour) {
@@ -239,7 +239,7 @@ 
 	}
 
 	public static function getLetterForPiece($pieceID, $colour) {
-		switch($pieceID) {
+		switch ($pieceID) {
 			case self::KING:
 				$letter = 'k';
 			break;
@@ -260,14 +260,14 @@ 
 				$letter = 'p';
 			break;
 		}
-		if($colour == ChessGame::PLAYER_WHITE) {
+		if ($colour == ChessGame::PLAYER_WHITE) {
 			$letter = strtoupper($letter);
 		}
 		return $letter;
 	}
 
 	public static function getPieceForLetter($letter) {
-		switch($letter) {
+		switch ($letter) {
 			case 'k':
 			case 'K':
 				return self::KING;

Braces +5 added lines, -10 removed lines

@@ -91,8 +91,7 @@ 
 						}
 					}
 				}
-			}
-			else if($this->pieceID==self::KING) {
+			} else if($this->pieceID==self::KING) {
 				for($i = -1; $i < 2; $i++) {
 					for($j = -1; $j < 2; $j++) {
 						if($i!=0 || $j!=0) {
@@ -114,8 +113,7 @@ 
 						$this->addMove($this->x+2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
 					}
 				}
-			}
-			else if($this->pieceID==self::QUEEN) {
+			} else if($this->pieceID==self::QUEEN) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
@@ -140,8 +138,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
-			}
-			else if($this->pieceID==self::ROOK) {
+			} else if($this->pieceID==self::ROOK) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
@@ -154,8 +151,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
-			}
-			else if($this->pieceID==self::BISHOP) {
+			} else if($this->pieceID==self::BISHOP) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
@@ -168,8 +164,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
-			}
-			else if($this->pieceID==self::KNIGHT) {
+			} else if($this->pieceID==self::KNIGHT) {
 				$moveX = $this->x-1;
 				$moveY = $this->y-2;
 				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2up-left

lib/Default/Plotter.class.php

Braces +13 added lines, -10 removed lines

@@ -92,12 +92,14 @@ 
 		$sectorsTravelled = 0;
 		$visitedSectors = array();
 		$visitedSectors[$checkSector->getSectorID()] = true;
-		if ($x == 'Distance')
-			$distances[0][$checkSector->getSectorID()] = new Distance($gameID, $checkSector->getSectorID());
+		if ($x == 'Distance') {
+					$distances[0][$checkSector->getSectorID()] = new Distance($gameID, $checkSector->getSectorID());
+		}
 
 		$distanceQ = array();
-		for ($i = 0; $i <= TURNS_WARP_SECTOR_EQUIVALENCE; $i++)
-			$distanceQ[] = array();
+		for ($i = 0; $i <= TURNS_WARP_SECTOR_EQUIVALENCE; $i++) {
+					$distanceQ[] = array();
+		}
 		//Warps first as a slight optimisation due to how visitedSectors is set.
 		if ($checkSector->hasWarp() === true) {
 			$d = new Distance($gameID, $checkSector->getSectorID());
@@ -115,8 +117,9 @@ 
 		$maybeWarps = 0;
 		while ($maybeWarps <= TURNS_WARP_SECTOR_EQUIVALENCE) {
 			$sectorsTravelled++;
-			if ($sectorsTravelled > $distanceLimit)
-				return $distances;
+			if ($sectorsTravelled > $distanceLimit) {
+							return $distances;
+			}
 			if ($x == 'Distance') {
 				$distances[$sectorsTravelled] = array();
 			}
@@ -134,11 +137,11 @@ 
 					$checkSector = SmrSector::getSector($gameID, $checkSectorID);
 					if ($x == 'Distance') {
 						$distances[$sectorsTravelled][$checkSector->getSectorID()] = $distance;
-					}
-					else if (($needsToHaveBeenExploredBy === null || $needsToHaveBeenExploredBy->hasVisitedSector($checkSector->getSectorID())) === true
+					} else if (($needsToHaveBeenExploredBy === null || $needsToHaveBeenExploredBy->hasVisitedSector($checkSector->getSectorID())) === true
 							&& $checkSector->hasX($x, $player) === true) {
-						if ($useFirst === true)
-							return $distance;
+						if ($useFirst === true) {
+													return $distance;
+						}
 						$distances[$checkSector->getSectorID()] = $distance;
 					}
 					//Warps first as a slight optimisation due to how visitedSectors is set.

lib/Default/DummyShip.class.php

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
 				$return = unserialize($db->getField('info'));
 				$return->regenerate($player);
 				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] =& $return;
-			}
-			else {
+			} else {
 				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = new DummyShip($player);
 			}
 		}

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,7 @@ 
 		$this->cargo_left = $this->getCargoHolds();
 	}
 	protected function doFullUNO() {
-		foreach($this->getMaxHardware() as $hardwareTypeID => $max) {
+		foreach ($this->getMaxHardware() as $hardwareTypeID => $max) {
 			$this->hardware[$hardwareTypeID] = $max;
 			$this->oldHardware[$hardwareTypeID] = $max;
 		}
@@ -47,8 +47,8 @@ 
 	}
 	
 	public function getIllusionShip() {
-		if(!isset($this->illusionShip)) {
-			$this->illusionShip=false;
+		if (!isset($this->illusionShip)) {
+			$this->illusionShip = false;
 		}
 		return $this->illusionShip;
 	}
@@ -58,20 +58,20 @@ 
 		$db = new SmrMySqlDatabase();
 		$db->query('REPLACE INTO cached_dummys ' .
 					'(type, id, info) ' .
-					'VALUES (\'DummyShip\', '.$db->escapeString($this->getPlayer()->getPlayerName()).', '.$db->escapeString($cache).')');
+					'VALUES (\'DummyShip\', ' . $db->escapeString($this->getPlayer()->getPlayerName()) . ', ' . $db->escapeString($cache) . ')');
 		unserialize($cache);
 	}
 	
 	public static function getCachedDummyShip(AbstractSmrPlayer $player) {
-		if(!isset(self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()])) {
+		if (!isset(self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()])) {
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT info FROM cached_dummys
 						WHERE type = \'DummyShip\'
 						AND id = ' . $db->escapeString($player->getPlayerName()) . ' LIMIT 1');
-			if($db->nextRecord()) {
+			if ($db->nextRecord()) {
 				$return = unserialize($db->getField('info'));
 				$return->regenerate($player);
-				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] =& $return;
+				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = & $return;
 			}
 			else {
 				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = new DummyShip($player);
@@ -85,7 +85,7 @@ 
 		$db->query('SELECT id FROM cached_dummys
 					WHERE type = \'DummyShip\'');
 		$dummyNames = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$dummyNames[] = $db->getField('id');
 		}
 		return $dummyNames;
@@ -94,7 +94,7 @@ 
 	
 	
 	public function __sleep() {
-		return array('gameID','weapons');
+		return array('gameID', 'weapons');
 	}
 	
 	public function __wakeup() {

lib/Default/SmrSector.class.php

Indentation +1 added lines, -1 removed lines

@@ -549,7 +549,7 @@
 	 */
 	public function setWarp(SmrSector $warp) {
 		if ($this->getWarp() == $warp->getSectorID() &&
-		    $warp->getWarp() == $this->getSectorID()) {
+			$warp->getWarp() == $this->getSectorID()) {
 			// Warps are already set correctly!
 			return;
 		}

Braces +143 added lines, -99 removed lines

@@ -126,15 +126,13 @@ 
 				$this->links['Right'] = $db->getInt('link_right');
 			}
 			$this->warp = $db->getInt('warp');
-		}
-		else if ($create) {
+		} else if ($create) {
 			$this->battles = 0;
 			$this->links = array();
 			$this->warp = 0;
 			$this->isNew = true;
 			return;
-		}
-		else {
+		} else {
 			throw new SectorNotFoundException('No sector ' . $sectorID . ' in game ' . $gameID);
 		}
 	}
@@ -167,52 +165,59 @@ 
 	}
 
 	public function markVisited(AbstractSmrPlayer $player) {
-		if ($this->hasPort())
-			$this->getPort()->addCachePort($player->getAccountID());
+		if ($this->hasPort()) {
+					$this->getPort()->addCachePort($player->getAccountID());
+		}
 
 		//now delete the entry from visited
-		if (!$this->isVisited($player))
-			$this->db->query('DELETE FROM player_visited_sector WHERE ' . $this->SQL . '
+		if (!$this->isVisited($player)) {
+					$this->db->query('DELETE FROM player_visited_sector WHERE ' . $this->SQL . '
 								 AND account_id = ' . $this->db->escapeNumber($player->getAccountID()) . ' LIMIT 1');
+		}
 		$this->visited[$player->getAccountID()] = true;
 	}
 
 	public function hasWeaponShop() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isWeaponSold())
-				return true;
+			if ($location->isWeaponSold()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasHQ() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isHQ())
-				return true;
+			if ($location->isHQ()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasUG() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isUG())
-				return true;
+			if ($location->isUG()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasShipShop() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isShipSold())
-				return true;
+			if ($location->isShipSold()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function offersFederalProtection() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isFed())
-				return true;
+			if ($location->isFed()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -220,32 +225,36 @@ 
 	public function getFedRaceIDs() {
 		$raceIDs = array();
 		foreach ($this->getLocations() as $location) {
-			if ($location->isFed())
-				$raceIDs[$location->getRaceID()] = $location->getRaceID();
+			if ($location->isFed()) {
+							$raceIDs[$location->getRaceID()] = $location->getRaceID();
+			}
 		}
 		return $raceIDs;
 	}
 
 	public function hasBar() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isBar())
-				return true;
+			if ($location->isBar()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasHardwareShop() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isHardwareSold())
-				return true;
+			if ($location->isHardwareSold()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasBank() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isBank())
-				return true;
+			if ($location->isBank()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -322,8 +331,9 @@ 
 	}
 
 	public function setGalaxyID($galaxyID) {
-		if ($this->galaxyID == $galaxyID)
-			return;
+		if ($this->galaxyID == $galaxyID) {
+					return;
+		}
 		$this->galaxyID = $galaxyID;
 		$this->hasChanged = true;
 	}
@@ -334,18 +344,21 @@ 
 
 	public function getNumberOfLinks() {
 		$num = 0;
-		if (!is_array($this->getLinks()))
-			return $num;
-		foreach ($this->getLinks() as $link)
-			if ($link !== 0)
+		if (!is_array($this->getLinks())) {
+					return $num;
+		}
+		foreach ($this->getLinks() as $link) {
+					if ($link !== 0)
 				$num++;
+		}
 		return $num;
 	}
 
 	public function getNumberOfConnections() {
 		$links = $this->getNumberOfLinks();
-		if ($this->hasWarp())
-			$links++;
+		if ($this->hasWarp()) {
+					$links++;
+		}
 		return $links;
 	}
 
@@ -354,30 +367,35 @@ 
 	}
 
 	public function getNeighbourID($dir) {
-		if ($this->hasLink($dir))
-			return $this->getLink($dir);
+		if ($this->hasLink($dir)) {
+					return $this->getLink($dir);
+		}
 		$galaxy = $this->getGalaxy();
 		$neighbour = $this->getSectorID();
 		switch ($dir) {
 			case 'Up':
 				$neighbour -= $galaxy->getWidth();
-				if ($neighbour < $galaxy->getStartSector())
-					$neighbour += $galaxy->getSize();
+				if ($neighbour < $galaxy->getStartSector()) {
+									$neighbour += $galaxy->getSize();
+				}
 			break;
 			case 'Down':
 				$neighbour += $galaxy->getWidth();
-				if ($neighbour > $galaxy->getEndSector())
-					$neighbour -= $galaxy->getSize();
+				if ($neighbour > $galaxy->getEndSector()) {
+									$neighbour -= $galaxy->getSize();
+				}
 			break;
 			case 'Left':
 				$neighbour -= 1;
-				if ((1 + $neighbour - $galaxy->getStartSector()) % $galaxy->getWidth() == 0)
-					$neighbour += $galaxy->getWidth();
+				if ((1 + $neighbour - $galaxy->getStartSector()) % $galaxy->getWidth() == 0) {
+									$neighbour += $galaxy->getWidth();
+				}
 			break;
 			case 'Right':
 				$neighbour += 1;
-				if (($neighbour - $galaxy->getStartSector()) % $galaxy->getWidth() == 0)
-					$neighbour -= $galaxy->getWidth();
+				if (($neighbour - $galaxy->getStartSector()) % $galaxy->getWidth() == 0) {
+									$neighbour -= $galaxy->getWidth();
+				}
 			break;
 			default:
 				throw new Exception($dir . ': is not a valid direction');
@@ -386,13 +404,16 @@ 
 	}
 
 	public function getSectorDirection($sectorID) {
-		if ($sectorID == $this->getSectorID())
-			return 'Current';
+		if ($sectorID == $this->getSectorID()) {
+					return 'Current';
+		}
 		$dir = array_search($sectorID, $this->getLinks());
-		if ($dir !== false)
-			return $dir;
-		if ($sectorID == $this->getWarp())
-			return 'Warp';
+		if ($dir !== false) {
+					return $dir;
+		}
+		if ($sectorID == $this->getWarp()) {
+					return 'Warp';
+		}
 		return 'None';
 	}
 
@@ -417,8 +438,9 @@ 
 	}
 
 	public function getLinkSector($name) {
-		if ($this->hasLink($name))
-			return SmrSector::getSector($this->getGameID(), $this->getLink($name));
+		if ($this->hasLink($name)) {
+					return SmrSector::getSector($this->getGameID(), $this->getLink($name));
+		}
 		return false;
 	}
 
@@ -426,12 +448,14 @@ 
 	 * Cannot be used for Warps
 	 */
 	public function setLink($name, $linkID) {
-		if ($this->getLink($name) == $linkID)
-			return;
-		if ($linkID == 0)
-			unset($this->links[$name]);
-		else
-			$this->links[$name] = $linkID;
+		if ($this->getLink($name) == $linkID) {
+					return;
+		}
+		if ($linkID == 0) {
+					unset($this->links[$name]);
+		} else {
+					$this->links[$name] = $linkID;
+		}
 		$this->hasChanged = true;
 	}
 
@@ -439,8 +463,9 @@ 
 	 * Cannot be used for Warps
 	 */
 	public function setLinkSector($dir, SmrSector $linkSector) {
-		if ($this->getLink($dir) == $linkSector->getSectorID() || $linkSector->equals($this))
-			return;
+		if ($this->getLink($dir) == $linkSector->getSectorID() || $linkSector->equals($this)) {
+					return;
+		}
 		$this->setLink($dir, $linkSector->getSectorID());
 		$linkSector->setLink(self::oppositeDir($dir), $this->getSectorID());
 		$this->hasChanged = true;
@@ -464,8 +489,7 @@ 
 	public function toggleLink($dir) {
 		if ($this->hasLink($dir)) {
 			$this->disableLink($dir);
-		}
-		else {
+		} else {
 			$this->enableLink($dir);
 		}
 	}
@@ -629,21 +653,25 @@ 
 		$locations = SmrLocation::getSectorLocations($this->getGameID(), $this->getSectorID());
 		$hasAction = false;
 		foreach ($locations as $location) {
-			if ($location->hasAction())
-				$hasAction = true;
+			if ($location->hasAction()) {
+							$hasAction = true;
+			}
 		}
 		return $hasAction;
 	}
 
 	public function hasLocation($locationTypeID = false) {
 		$locations = $this->getLocations();
-		if (count($locations) == 0)
-			return false;
-		if ($locationTypeID == false)
-			return true;
+		if (count($locations) == 0) {
+					return false;
+		}
+		if ($locationTypeID == false) {
+					return true;
+		}
 		foreach ($locations as $location) {
-			if ($location->getTypeID() == $locationTypeID)
-				return true;
+			if ($location->getTypeID() == $locationTypeID) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -703,11 +731,13 @@ 
 	}
 
 	public function hasEnemyForces(AbstractSmrPlayer $player = null) {
-		if ($player == null || !$this->hasForces())
-			return false;
+		if ($player == null || !$this->hasForces()) {
+					return false;
+		}
 		foreach ($this->getForces() as $force) {
-			if (!$player->forceNAPAlliance($force->getOwner()))
-				return true;
+			if (!$player->forceNAPAlliance($force->getOwner())) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -715,8 +745,9 @@ 
 	public function getEnemyForces(AbstractSmrPlayer $player) {
 		$enemyForces = array();
 		foreach ($this->getForces() as $force) {
-			if (!$player->forceNAPAlliance($force->getOwner()))
-				$enemyForces[] = $force;
+			if (!$player->forceNAPAlliance($force->getOwner())) {
+							$enemyForces[] = $force;
+			}
 		}
 		return $enemyForces;
 	}
@@ -734,11 +765,13 @@ 
 	}
 
 	public function hasFriendlyForces(AbstractSmrPlayer $player = null) {
-		if ($player == null || !$this->hasForces())
-			return false;
+		if ($player == null || !$this->hasForces()) {
+					return false;
+		}
 		foreach ($this->getForces() as $force) {
-			if ($player->forceNAPAlliance($force->getOwner()))
-				return true;
+			if ($player->forceNAPAlliance($force->getOwner())) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -746,8 +779,9 @@ 
 	public function getFriendlyForces(AbstractSmrPlayer $player) {
 		$friendlyForces = array();
 		foreach ($this->getForces() as $force) {
-			if ($player->forceNAPAlliance($force->getOwner()))
-				$friendlyForces[] = $force;
+			if ($player->forceNAPAlliance($force->getOwner())) {
+							$friendlyForces[] = $force;
+			}
 		}
 		return $friendlyForces;
 	}
@@ -775,8 +809,9 @@ 
 	}
 
 	public function hasEnemyTraders(AbstractSmrPlayer $player = null) {
-		if ($player == null || !$this->hasOtherTraders($player))
-			return false;
+		if ($player == null || !$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach ($otherPlayers as $otherPlayer) {
 			if (!$player->traderNAPAlliance($otherPlayer) 
@@ -789,12 +824,14 @@ 
 	}
 
 	public function hasFriendlyTraders(AbstractSmrPlayer $player = null) {
-		if ($player == null || !$this->hasOtherTraders($player))
-			return false;
+		if ($player == null || !$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach ($otherPlayers as $otherPlayer) {
-			if ($player->traderNAPAlliance($otherPlayer))
-				return true;
+			if ($player->traderNAPAlliance($otherPlayer)) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -816,8 +853,9 @@ 
 	}
 
 	public function hasProtectedTraders(AbstractSmrPlayer $player = null) {
-		if ($player == null || !$this->hasOtherTraders($player))
-			return false;
+		if ($player == null || !$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach ($otherPlayers as $otherPlayer) {
 			if (!$player->traderNAPAlliance($otherPlayer) 
@@ -853,8 +891,9 @@ 
 			$planetOwner = $defendingPlanet->getOwner();
 			foreach ($alliancePlayers as $accountID => $player) {
 				if ($player->canFight()) {
-					if ($attackingPlayer->traderAttackPlanetAlliance($player) && !$planetOwner->planetNAPAlliance($player))
-						$fightingPlayers[$accountID] = $alliancePlayers[$accountID];
+					if ($attackingPlayer->traderAttackPlanetAlliance($player) && !$planetOwner->planetNAPAlliance($player)) {
+											$fightingPlayers[$accountID] = $alliancePlayers[$accountID];
+					}
 				}
 			}
 		}
@@ -862,8 +901,9 @@ 
 	}
 
 	public function getFightingTraders(AbstractSmrPlayer $attackingPlayer, AbstractSmrPlayer $defendingPlayer, $checkForCloak = false) {
-		if ($attackingPlayer->traderNAPAlliance($defendingPlayer))
-			throw new Exception('These traders are NAPed.');
+		if ($attackingPlayer->traderNAPAlliance($defendingPlayer)) {
+					throw new Exception('These traders are NAPed.');
+		}
 		$fightingPlayers = array('Attackers' => array(), 'Defenders' => array());
 		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(), $this->getSectorID(), array($attackingPlayer->getAllianceID(), $defendingPlayer->getAllianceID()));
 		$attackers = array();
@@ -923,8 +963,9 @@ 
 	}
 
 	public function setBattles($amount) {
-		if ($this->battles == $amount)
-			return;
+		if ($this->battles == $amount) {
+					return;
+		}
 		$this->battles = $amount;
 		$this->hasChanged = true;
 	}
@@ -946,8 +987,9 @@ 
 	}
 
 	public function isVisited(AbstractSmrPlayer $player = null) {
-		if ($player === null)
-			return true;
+		if ($player === null) {
+					return true;
+		}
 		if (!isset($this->visited[$player->getAccountID()])) {
 			$this->db->query('SELECT sector_id FROM player_visited_sector WHERE ' . $this->SQL . ' AND account_id=' . $this->db->escapeNumber($player->getAccountID()) . ' LIMIT 1');
 			$this->visited[$player->getAccountID()] = !$this->db->nextRecord();
@@ -988,10 +1030,12 @@ 
 			return $x->contains($this);
 		}
 
-		if (is_array($x) && $x['Type'] == 'Good') //Check if it's possible for port to have X, hacky but nice performance gains
+		if (is_array($x) && $x['Type'] == 'Good') {
+			//Check if it's possible for port to have X, hacky but nice performance gains
 			if ($this->hasPort())
 				if ($this->getPort()->hasX($x))
 					return true;
+		}
 
 		//Check if it's possible for location to have X, hacky but nice performance gains
 		if ($x instanceof SmrWeapon || (is_array($x) && ($x['Type'] == 'Ship' || $x['Type'] == 'Hardware')) || (is_string($x) && ($x == 'Bank' || $x == 'Bar' || $x == 'Fed' || $x == 'SafeFed' || $x == 'HQ' || $x == 'UG' || $x == 'Hardware' || $x == 'Ship' || $x == 'Weapon'))) {

lib/Default/SmrForce.class.php

Spacing +3 added lines, -3 removed lines

@@ -446,20 +446,20 @@
 
 		if ($this->hasMines()) {
 			$thisMines = new SmrMines($this->getGameID(), $this->getMines());
-			$results['Results']['Mines'] =& $thisMines->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)], $minesAreAttacker);
+			$results['Results']['Mines'] = & $thisMines->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)], $minesAreAttacker);
 			$results['TotalDamage'] += $results['Results']['Mines']['ActualDamage']['TotalDamage'];
 		}
 
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Results']['Drones'] =& $thisCDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Results']['Drones'] = & $thisCDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Results']['Drones']['ActualDamage']['TotalDamage'];
 		}
 
 		if (!$minesAreAttacker) {
 			if ($this->hasSDs()) {
 				$thisSDs = new SmrScoutDrones($this->getGameID(), $this->getSDs());
-				$results['Results']['Scouts'] =& $thisSDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
+				$results['Results']['Scouts'] = & $thisSDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
 				$results['TotalDamage'] += $results['Results']['Scouts']['ActualDamage']['TotalDamage'];
 			}
 		}

Braces +8 added lines, -12 removed lines

@@ -252,16 +252,16 @@ 
 		}
 		$this->hasChanged = true;
 		$this->expire = $time;
-		if (!$this->isNew)
-			$this->update();
+		if (!$this->isNew) {
+					$this->update();
+		}
 	}
 
 	public function updateExpire() {
 		// 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);
@@ -288,11 +288,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()) {
@@ -347,12 +345,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/AbstractSmrCombatWeapon.class.php

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
 	protected $maxDamage;
 	protected $shieldDamage;
 	protected $armourDamage;
-	protected $empDamage=0;
+	protected $empDamage = 0;
 	protected $accuracy;
 	protected $damageRollover;
 	protected $raidWeapon;
@@ -85,62 +85,62 @@ 
 	abstract public function &getModifiedForceDamageAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer);
 	
 	protected function &doPlayerDamageToForce(array &$return, AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstForces($weaponPlayer,$forces);
-		$return['ActualDamage'] =& $forces->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstForces($weaponPlayer, $forces);
+		$return['ActualDamage'] = & $forces->doWeaponDamage($return['WeaponDamage']);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $forces->killForcesByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPlayer(array &$return, AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlayer($weaponPlayer,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlayer($weaponPlayer, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPort(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPort($weaponPlayer,$port);
-		$return['ActualDamage'] =& $port->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPort($weaponPlayer, $port);
+		$return['ActualDamage'] = & $port->doWeaponDamage($return['WeaponDamage']);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $port->killPortByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPlanet(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlanet($weaponPlayer,$planet);
-		$return['ActualDamage'] =& $planet->doWeaponDamage($return['WeaponDamage'],$delayed);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlanet($weaponPlayer, $planet);
+		$return['ActualDamage'] = & $planet->doWeaponDamage($return['WeaponDamage'], $delayed);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $planet->killPlanetByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPortDamageToPlayer(array &$return, SmrPort $port, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedPortDamageAgainstPlayer($port,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedPortDamageAgainstPlayer($port, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByPort($port);
 		return $return;
 	}
 	
 	protected function &doPlanetDamageToPlayer(array &$return, SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedPlanetDamageAgainstPlayer($planet,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedPlanetDamageAgainstPlayer($planet, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByPlanet($planet);
 		return $return;
 	}
 	
 	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		return $return;
 	}
 	

Braces +21 added lines, -14 removed lines

@@ -87,8 +87,9 @@ 
 	protected function &doPlayerDamageToForce(array &$return, AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstForces($weaponPlayer,$forces);
 		$return['ActualDamage'] =& $forces->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
@@ -96,24 +97,27 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlayer($weaponPlayer,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPort(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPort($weaponPlayer,$port);
 		$return['ActualDamage'] =& $port->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPlanet(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlanet($weaponPlayer,$planet);
 		$return['ActualDamage'] =& $planet->doWeaponDamage($return['WeaponDamage'],$delayed);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
@@ -121,8 +125,9 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedPortDamageAgainstPlayer($port,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+		}
 		return $return;
 	}
 	
@@ -130,8 +135,9 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedPlanetDamageAgainstPlayer($planet,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+		}
 		return $return;
 	}
 	
@@ -139,8 +145,9 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+		}
 		return $return;
 	}