smrealms / smr

engine/Default/smr_file_create.php

Braces +20 added lines, -14 removed lines

@@ -4,15 +4,17 @@ 
 // code is read-only. This will help reduce sector lag and possible abuse.
 release_lock();
 
-if (isset($var['AdminCreateGameID']) && $var['AdminCreateGameID'] !== false)
+if (isset($var['AdminCreateGameID']) && $var['AdminCreateGameID'] !== false) {
 	$gameID = $var['AdminCreateGameID'];
-else
+} else {
 	$gameID = $player->getGameID();
+}
 
-if (isset($var['AdminCreateGameID']) && $var['AdminCreateGameID'] !== false)
+if (isset($var['AdminCreateGameID']) && $var['AdminCreateGameID'] !== false) {
 	$adminCreate = true;
-else
+} else {
 	$adminCreate = false;
+}
 
 // NOTE: If the format of this file is changed in an incompatible way,
 // make sure to update the SMR_FILE_VERSION!
@@ -103,8 +105,9 @@ 
 	if ($location->isFed()) {
 		$locSells .= 'Fed=,';
 	}
-	if ($locSells != '')
-		$file .= substr($locSells, 0, -1);
+	if ($locSells != '') {
+			$file .= substr($locSells, 0, -1);
+	}
 	$file .= EOL;
 }
 
@@ -125,19 +128,22 @@ 
 	foreach ($galaxy->getSectors() as $sector) {
 		$file .= '[Sector=' . $sector->getSectorID() . ']' . EOL;
 		
-		if (!$sector->isVisited($player) && $adminCreate === false)
-			continue;
+		if (!$sector->isVisited($player) && $adminCreate === false) {
+					continue;
+		}
 		
 		foreach ($sector->getLinks() as $linkName => $link) {
 			$file .= $linkName . '=' . $link . EOL;
 		}
-		if ($sector->hasWarp())
-			$file .= 'Warp=' . $sector->getWarp() . EOL;
+		if ($sector->hasWarp()) {
+					$file .= 'Warp=' . $sector->getWarp() . EOL;
+		}
 		if (($adminCreate !== false && $sector->hasPort()) || is_object($player) && $sector->hasCachedPort($player)) {
-			if ($adminCreate !== false)
-				$port = $sector->getPort();
-			else
-				$port = $sector->getCachedPort($player);
+			if ($adminCreate !== false) {
+							$port = $sector->getPort();
+			} else {
+							$port = $sector->getCachedPort($player);
+			}
 			$file .= 'Port Level=' . $port->getLevel() . EOL;
 			$file .= 'Port Race=' . $port->getRaceID() . EOL;
 			if (!empty($port->getSoldGoodIDs())) {

htdocs/config.inc

Indentation +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	if (!empty(BUG_REPORT_TO_ADDRESSES)) {
 		$mail = setupMailer();
 		$mail->Subject = (defined('PAGE_PREFIX') ? PAGE_PREFIX : '??? ') .
-		                 'Automatic Bug Report';
+						 'Automatic Bug Report';
 		$mail->setFrom('bugs@smrealms.de');
 		$mail->Body = $message;
 		foreach (BUG_REPORT_TO_ADDRESSES as $toAddress) {

tools/npc/npc.php

Braces +55 added lines, -67 removed lines

@@ -95,12 +95,10 @@ 
 
 	try {
 		changeNPCLogin();
-	}
-	catch (ForwardException $e) {}
+	} catch (ForwardException $e) {}
 
 	NPCStuff();
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	logException($e);
 	// Try to shut down cleanly
 	exitNPC();
@@ -159,8 +157,7 @@ 
 			$fedContainer = null;
 			if ($var['url'] == 'shop_ship_processing.php' && ($fedContainer = plotToFed($player, true)) !== true) { //We just bought a ship, we should head back to our trade gal/uno - we use HQ for now as it's both in our gal and a UNO, plus it's safe which is always a bonus
 				processContainer($fedContainer);
-			}
-			else if ($player->getShip()->isUnderAttack() === true
+			} else if ($player->getShip()->isUnderAttack() === true
 				&&($player->hasPlottedCourse() === false || $player->getPlottedCourse()->getEndSector()->offersFederalProtection() === false)
 				&&($fedContainer == null ? $fedContainer = plotToFed($player, true) : $fedContainer) !== true) { //We're under attack and need to plot course to fed.
 				// Get the lock, remove under attack and update.
@@ -173,20 +170,16 @@ 
 				debug('Under Attack');
 				$underAttack = true;
 				processContainer($fedContainer);
-			}
-			else if ($player->hasPlottedCourse() === true && $player->getPlottedCourse()->getEndSector()->offersFederalProtection()) { //We have a route to fed to follow, figure it's probably a damned sensible thing to follow.
+			} else if ($player->hasPlottedCourse() === true && $player->getPlottedCourse()->getEndSector()->offersFederalProtection()) { //We have a route to fed to follow, figure it's probably a damned sensible thing to follow.
 				debug('Follow Course: ' . $player->getPlottedCourse()->getNextOnPath());
 				processContainer(moveToSector($player, $player->getPlottedCourse()->getNextOnPath()));
-			}
-			else if (($container = canWeUNO($player, true)) !== false) { //We have money and are at a uno, let's uno!
+			} else if (($container = canWeUNO($player, true)) !== false) { //We have money and are at a uno, let's uno!
 				debug('We\'re UNOing');
 				processContainer($container);
-			}
-			else if ($player->hasPlottedCourse() === true) { //We have a route to follow, figure it's probably a sensible thing to follow.
+			} else if ($player->hasPlottedCourse() === true) { //We have a route to follow, figure it's probably a sensible thing to follow.
 				debug('Follow Course: ' . $player->getPlottedCourse()->getNextOnPath());
 				processContainer(moveToSector($player, $player->getPlottedCourse()->getNextOnPath()));
-			}
-			else if ($player->getTurns() < NPC_LOW_TURNS || ($player->getTurns() < $player->getMaxTurns() / 2 && $player->getNewbieTurns() < NPC_LOW_NEWBIE_TURNS) || $underAttack) { //We're low on turns or have been under attack and need to plot course to fed
+			} else if ($player->getTurns() < NPC_LOW_TURNS || ($player->getTurns() < $player->getMaxTurns() / 2 && $player->getNewbieTurns() < NPC_LOW_NEWBIE_TURNS) || $underAttack) { //We're low on turns or have been under attack and need to plot course to fed
 				if ($player->getTurns() < NPC_LOW_TURNS) {
 					debug('Low Turns:' . $player->getTurns());
 				}
@@ -203,16 +196,13 @@ 
 				}
 				$ship = $player->getShip();
 				processContainer(plotToFed($player, !$ship->hasMaxShields() || !$ship->hasMaxArmour() || !$ship->hasMaxCargoHolds()));
-			}
-			else if (($container = checkForShipUpgrade($player)) !== false) { //We have money and are at a uno, let's uno!
+			} else if (($container = checkForShipUpgrade($player)) !== false) { //We have money and are at a uno, let's uno!
 				debug('We\'re reshipping!');
 				processContainer($container);
-			}
-			else if (($container = canWeUNO($player, false)) !== false) { //We need to UNO and have enough money to do it properly so let's do it sooner rather than later.
+			} else if (($container = canWeUNO($player, false)) !== false) { //We need to UNO and have enough money to do it properly so let's do it sooner rather than later.
 				debug('We need to UNO, so off we go!');
 				processContainer($container);
-			}
-			else if ($TRADE_ROUTE instanceof Route) {
+			} else if ($TRADE_ROUTE instanceof Route) {
 				debug('Trade Route');
 				$forwardRoute =& $TRADE_ROUTE->getForwardRoute();
 				$returnRoute =& $TRADE_ROUTE->getReturnRoute();
@@ -220,8 +210,7 @@ 
 					if ($forwardRoute->getBuySectorId() == $player->getSectorID()) {
 						$buyRoute =& $forwardRoute;
 						$sellRoute =& $returnRoute;
-					}
-					else if ($returnRoute->getBuySectorId() == $player->getSectorID()) {
+					} else if ($returnRoute->getBuySectorId() == $player->getSectorID()) {
 						$buyRoute =& $returnRoute;
 						$sellRoute =& $forwardRoute;
 					}
@@ -238,30 +227,25 @@ 
 								//Sell goods
 								debug('Sell Goods');
 								processContainer(tradeGoods($goodID, $player, $port));
-							}
-							else {
+							} else {
 								//Move to next route or fed.
 								if (($TRADE_ROUTE =& changeRoute($TRADE_ROUTES)) === false) {
 									debug('Changing Route Failed');
 									processContainer(plotToFed($player));
-								}
-								else {
+								} else {
 									debug('Route Changed');
 									continue;
 								}
 							}
-						}
-						else if ($ship->hasCargo($buyRoute->getGoodID()) === true) { //We've bought goods, plot to sell
+						} else if ($ship->hasCargo($buyRoute->getGoodID()) === true) { //We've bought goods, plot to sell
 							debug('Plot To Sell: ' . $buyRoute->getSellSectorId());
 							processContainer(plotToSector($player, $buyRoute->getSellSectorId()));
-						}
-						else {
+						} else {
 							//Dump goods
 							debug('Dump Goods');
 							processContainer(dumpCargo($player));
 						}
-					}
-					else { //Buy goods
+					} else { //Buy goods
 						$goodID = $buyRoute->getGoodID();
 
 						$port = $player->getSector()->getPort();
@@ -270,26 +254,22 @@ 
 						if ($tradeable === true && $port->getGoodAmount($goodID) >= $ship->getEmptyHolds()) { //Buy goods
 							debug('Buy Goods');
 							processContainer(tradeGoods($goodID, $player, $port));
-						}
-						else {
+						} else {
 							//Move to next route or fed.
 							if (($TRADE_ROUTE =& changeRoute($TRADE_ROUTES)) === false) {
 								debug('Changing Route Failed');
 								processContainer(plotToFed($player));
-							}
-							else {
+							} else {
 								debug('Route Changed');
 								continue;
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					debug('Plot To Buy: ' . $forwardRoute->getBuySectorId());
 					processContainer(plotToSector($player, $forwardRoute->getBuySectorId()));
 				}
-			}
-			else { //Something weird is going on.. Let's fed and wait.
+			} else { //Something weird is going on.. Let's fed and wait.
 				debug('No actual action? Wtf?');
 				processContainer(plotToFed($player));
 			}
@@ -301,8 +281,7 @@ 
 				processContainer(moveToSector($player,$moveTo));
 			}
 			*/
-		}
-		catch (ForwardException $e) {
+		} catch (ForwardException $e) {
 			global $lock;
 			if ($lock) { //only save if we have the lock.
 				SmrSector::saveSectors();
@@ -310,8 +289,9 @@ 
 				SmrPlayer::savePlayers();
 				SmrForce::saveForces();
 				SmrPort::savePorts();
-				if (class_exists('WeightedRandom', false))
-					WeightedRandom::saveWeightedRandoms();
+				if (class_exists('WeightedRandom', false)) {
+									WeightedRandom::saveWeightedRandoms();
+				}
 				release_lock();
 			}
 			//Clean up the caches as the data may get changed by other players
@@ -429,11 +409,13 @@ 
 }
 
 function canWeUNO(AbstractSmrPlayer $player, $oppurtunisticOnly) {
-	if ($player->getCredits() < MINUMUM_RESERVE_CREDITS)
-		return false;
+	if ($player->getCredits() < MINUMUM_RESERVE_CREDITS) {
+			return false;
+	}
 	$ship = $player->getShip();
-	if ($ship->hasMaxShields() && $ship->hasMaxArmour() && $ship->hasMaxCargoHolds())
-		return false;
+	if ($ship->hasMaxShields() && $ship->hasMaxArmour() && $ship->hasMaxCargoHolds()) {
+			return false;
+	}
 	$sector = $player->getSector();
 
 	// We buy armour in preference to shields as it's cheaper.
@@ -447,8 +429,7 @@ 
 			$hardwareSold = $location->getHardwareSold();
 			if ($player->getNewbieTurns() > MIN_NEWBIE_TURNS_TO_BUY_CARGO && !$ship->hasMaxCargoHolds() && isset($hardwareSold[HARDWARE_CARGO]) && ($amount = floor(($player->getCredits() - MINUMUM_RESERVE_CREDITS) / Globals::getHardwareCost(HARDWARE_CARGO))) > 0) { // Buy cargo holds first if we have plenty of newbie turns left.
 				$hardwareID = HARDWARE_CARGO;
-			}
-			else {
+			} else {
 				foreach ($hardwareArray as $hardwareArrayID) {
 					if (!$ship->hasMaxHardware($hardwareArrayID) && isset($hardwareSold[$hardwareArrayID]) && ($amount = floor(($player->getCredits() - MINUMUM_RESERVE_CREDITS) / Globals::getHardwareCost($hardwareArrayID))) > 0) {
 						$hardwareID = $hardwareArrayID;
@@ -462,11 +443,14 @@ 
 		}
 	}
 
-	if ($oppurtunisticOnly === true)
-		return false;
+	if ($oppurtunisticOnly === true) {
+			return false;
+	}
 
-	if ($player->getCredits() - $ship->getCostToUNO() < MINUMUM_RESERVE_CREDITS)
-		return false; //Only do non-oppurtunistic UNO if we have the money to do it properly!
+	if ($player->getCredits() - $ship->getCostToUNO() < MINUMUM_RESERVE_CREDITS) {
+			return false;
+	}
+	//Only do non-oppurtunistic UNO if we have the money to do it properly!
 
 	foreach ($hardwareArray as $hardwareArrayID) {
 		if (!$ship->hasMaxHardware($hardwareArrayID)) {
@@ -556,8 +540,10 @@ 
 
 function checkForShipUpgrade(AbstractSmrPlayer $player) {
 	foreach (SHIP_UPGRADE_PATH[$player->getRaceID()] as $upgradeShipID) {
-		if ($player->getShipTypeID() == $upgradeShipID) //We can't upgrade, only downgrade.
+		if ($player->getShipTypeID() == $upgradeShipID) {
+			//We can't upgrade, only downgrade.
 			return false;
+		}
 		$cost = $player->getShip()->getCostToUpgrade($upgradeShipID);
 		if ($cost <= 0 || $player->getCredits() - $cost > MINUMUM_RESERVE_CREDITS) {
 			return doShipUpgrade($player, $upgradeShipID);
@@ -579,8 +565,9 @@ 
 
 function &changeRoute(array &$tradeRoutes) {
 	$false = false;
-	if (count($tradeRoutes) == 0)
-		return $false;
+	if (count($tradeRoutes) == 0) {
+			return $false;
+	}
 	$routeKey = array_rand($tradeRoutes);
 	$tradeRoute =& $tradeRoutes[$routeKey];
 	unset($tradeRoutes[$routeKey]);
@@ -594,10 +581,11 @@ 
 
 	$tradeGoods = array(GOOD_NOTHING => false);
 	foreach (Globals::getGoods() as $goodID => $good) {
-		if ($player->meetsAlignmentRestriction($good['AlignRestriction']))
-			$tradeGoods[$goodID] = true;
-		else
-			$tradeGoods[$goodID] = false;
+		if ($player->meetsAlignmentRestriction($good['AlignRestriction'])) {
+					$tradeGoods[$goodID] = true;
+		} else {
+					$tradeGoods[$goodID] = false;
+		}
 	}
 	$tradeRaces = array();
 	foreach (Globals::getRaces() as $raceID => $race) {
@@ -624,8 +612,7 @@ 
 		$routes = unserialize(gzuncompress($db->getField('routes')));
 		debug('Using Cached Routes: #' . count($routes));
 		return $routes;
-	}
-	else {
+	} else {
 		debug('Generating Routes');
 		$allSectors = array();
 		foreach (SmrGalaxy::getGameGalaxies($player->getGameID()) as $galaxy) {
@@ -635,10 +622,11 @@ 
 		$distances =& Plotter::calculatePortToPortDistances($allSectors, $maxDistance, $startSectorID, $endSectorID);
 
 
-		if ($maxNumberOfPorts == 1)
-			$allRoutes = RouteGenerator::generateOneWayRoutes($allSectors, $distances, $tradeGoods, $tradeRaces, $routesForPort);
-		else
-			$allRoutes = RouteGenerator::generateMultiPortRoutes($maxNumberOfPorts, $allSectors, $tradeGoods, $tradeRaces, $distances, $routesForPort, $numberOfRoutes);
+		if ($maxNumberOfPorts == 1) {
+					$allRoutes = RouteGenerator::generateOneWayRoutes($allSectors, $distances, $tradeGoods, $tradeRaces, $routesForPort);
+		} else {
+					$allRoutes = RouteGenerator::generateMultiPortRoutes($maxNumberOfPorts, $allSectors, $tradeGoods, $tradeRaces, $distances, $routesForPort, $numberOfRoutes);
+		}
 
 		unset($distances);
 

Spacing +16 added lines, -16 removed lines

@@ -114,7 +114,7 @@ 
 
 		$actions++;
 		try {
-			$TRADE_ROUTE =& $GLOBALS['TRADE_ROUTE'];
+			$TRADE_ROUTE = & $GLOBALS['TRADE_ROUTE'];
 			debug('Action #' . $actions);
 
 			//We have to reload player on each loop
@@ -133,14 +133,14 @@ 
 			}
 
 			if (!isset($TRADE_ROUTE)) { //We only want to change trade route if there isn't already one set.
-				$TRADE_ROUTES =& findRoutes($player);
-				$TRADE_ROUTE =& changeRoute($TRADE_ROUTES);
+				$TRADE_ROUTES = & findRoutes($player);
+				$TRADE_ROUTE = & changeRoute($TRADE_ROUTES);
 			}
 
 			if ($player->isDead()) {
 				debug('Some evil person killed us, let\'s move on now.');
 				$previousContainer = null; //We died, we don't care what we were doing beforehand.
-				$TRADE_ROUTE =& changeRoute($TRADE_ROUTES); //Change route
+				$TRADE_ROUTE = & changeRoute($TRADE_ROUTES); //Change route
 				processContainer(create_container('death_processing.php'));
 			}
 			if ($player->getNewbieTurns() <= NEWBIE_TURNS_WARNING_LIMIT && $player->getNewbieWarning()) {
@@ -205,16 +205,16 @@ 
 			}
 			else if ($TRADE_ROUTE instanceof Route) {
 				debug('Trade Route');
-				$forwardRoute =& $TRADE_ROUTE->getForwardRoute();
-				$returnRoute =& $TRADE_ROUTE->getReturnRoute();
+				$forwardRoute = & $TRADE_ROUTE->getForwardRoute();
+				$returnRoute = & $TRADE_ROUTE->getReturnRoute();
 				if ($forwardRoute->getBuySectorId() == $player->getSectorID() || $returnRoute->getBuySectorId() == $player->getSectorID()) {
 					if ($forwardRoute->getBuySectorId() == $player->getSectorID()) {
-						$buyRoute =& $forwardRoute;
-						$sellRoute =& $returnRoute;
+						$buyRoute = & $forwardRoute;
+						$sellRoute = & $returnRoute;
 					}
 					else if ($returnRoute->getBuySectorId() == $player->getSectorID()) {
-						$buyRoute =& $returnRoute;
-						$sellRoute =& $forwardRoute;
+						$buyRoute = & $returnRoute;
+						$sellRoute = & $forwardRoute;
 					}
 
 					$ship = $player->getShip();
@@ -232,7 +232,7 @@ 
 							}
 							else {
 								//Move to next route or fed.
-								if (($TRADE_ROUTE =& changeRoute($TRADE_ROUTES)) === false) {
+								if (($TRADE_ROUTE = & changeRoute($TRADE_ROUTES)) === false) {
 									debug('Changing Route Failed');
 									processContainer(plotToFed($player));
 								}
@@ -264,7 +264,7 @@ 
 						}
 						else {
 							//Move to next route or fed.
-							if (($TRADE_ROUTE =& changeRoute($TRADE_ROUTES)) === false) {
+							if (($TRADE_ROUTE = & changeRoute($TRADE_ROUTES)) === false) {
 								debug('Changing Route Failed');
 								processContainer(plotToFed($player));
 							}
@@ -591,9 +591,9 @@ 
 	if (count($tradeRoutes) == 0)
 		return $false;
 	$routeKey = array_rand($tradeRoutes);
-	$tradeRoute =& $tradeRoutes[$routeKey];
+	$tradeRoute = & $tradeRoutes[$routeKey];
 	unset($tradeRoutes[$routeKey]);
-	$GLOBALS['TRADE_ROUTE'] =& $tradeRoute;
+	$GLOBALS['TRADE_ROUTE'] = & $tradeRoute;
 	debug('Switched route', $tradeRoute);
 	return $tradeRoute;
 }
@@ -641,7 +641,7 @@ 
 			$allSectors += $galaxy->getSectors(); //Merge arrays
 		}
 
-		$distances =& Plotter::calculatePortToPortDistances($allSectors, $maxDistance, $startSectorID, $endSectorID);
+		$distances = & Plotter::calculatePortToPortDistances($allSectors, $maxDistance, $startSectorID, $endSectorID);
 
 
 		if ($maxNumberOfPorts == 1)
@@ -651,7 +651,7 @@ 
 
 		unset($distances);
 
-		$allRoutes =& $allRoutes[RouteGenerator::EXP_ROUTE];
+		$allRoutes = & $allRoutes[RouteGenerator::EXP_ROUTE];
 		$routesMerged = array();
 		foreach ($allRoutes as $multi => &$routesByMulti) {
 			$routesMerged += $routesByMulti; //Merge arrays

admin/Default/1.6/universe_create_save_processing.php

Braces +39 added lines, -39 removed lines

@@ -19,21 +19,19 @@ 
 	}
 	SmrSector::saveSectors();
 	$var['message'] = '<span class="green">Success</span> : Succesfully created galaxies.';
-}
-else if ($submit == 'Redo Connections') {
+} else if ($submit == 'Redo Connections') {
 	$galaxy = SmrGalaxy::getGalaxy($var['game_id'], $var['gal_on']);
-	if (!$galaxy->setConnectivity($_REQUEST['connect']))
-		$var['message'] = '<span class="red">Error</span> : Regenerating connections failed.';
-	else
-		$var['message'] = '<span class="green">Success</span> : Regenerated connectivity with ' . $_REQUEST['connect'] . '% target.';
+	if (!$galaxy->setConnectivity($_REQUEST['connect'])) {
+			$var['message'] = '<span class="red">Error</span> : Regenerating connections failed.';
+	} else {
+			$var['message'] = '<span class="green">Success</span> : Regenerated connectivity with ' . $_REQUEST['connect'] . '% target.';
+	}
 	SmrSector::saveSectors();
-}
-elseif ($submit == 'Toggle Link') {
+} elseif ($submit == 'Toggle Link') {
 	$linkSector = SmrSector::getSector($var['game_id'], $var['sector_id']);
 	$linkSector->toggleLink($var['dir']);
 	SmrSector::saveSectors();
-}
-elseif ($submit == 'Create Locations') {
+} elseif ($submit == 'Create Locations') {
 	$galSectors = SmrSector::getGalaxySectors($var['game_id'], $var['gal_on']);
 	foreach ($galSectors as $galSector) {
 		$galSector->removeAllLocations();
@@ -53,8 +51,7 @@ 
 		}
 	}
 	$var['message'] = '<span class="green">Success</span> : Succesfully added locations.';
-}
-elseif ($submit == 'Create Warps') {
+} elseif ($submit == 'Create Warps') {
 	//get all warp info from all gals, some need to be removed, some need to be added
 	$galaxy = SmrGalaxy::getGalaxy($var['game_id'], $var['gal_on']);
 	$galSectors = $galaxy->getSectors();
@@ -94,8 +91,7 @@ 
 	}
 	SmrSector::saveSectors();
 	$var['message'] = '<span class="green">Success</span> : Succesfully added warps.';
-}
-elseif ($submit == 'Create Planets') {
+} elseif ($submit == 'Create Planets') {
 	$galaxy = SmrGalaxy::getGalaxy($var['game_id'], $var['gal_on']);
 	$galSectors = $galaxy->getSectors();
 	foreach ($galSectors as $galSector) {
@@ -108,13 +104,15 @@ 
 		$numberOfPlanets = $_POST['type' . $planetTypeID];
 		for ($i = 1; $i <= $numberOfPlanets; $i++) {
 			$galSector = $galSectors[array_rand($galSectors)];
-			while ($galSector->hasPlanet()) $galSector = $galSectors[array_rand($galSectors)]; //1 per sector
+			while ($galSector->hasPlanet()) {
+				$galSector = $galSectors[array_rand($galSectors)];
+			}
+			//1 per sector
 			$galSector->createPlanet($planetTypeID);
 		}
 	}
 	$var['message'] = '<span class="green">Success</span> : Succesfully added planets.';
-}
-elseif ($submit == 'Create Ports') {
+} elseif ($submit == 'Create Ports') {
 	$numLevelPorts = [];
 	for ($i = 1; $i <= SmrPort::MAX_LEVEL; $i++) {
 		$numLevelPorts[$i] = $_REQUEST['port' . $i] ?? 0;
@@ -169,27 +167,23 @@ 
 		}
 		SmrPort::savePorts();
 		$var['message'] = '<span class="green">Success</span> : Succesfully added ports.';
-	}
-	else {
+	} else {
 		$var['message'] = '<span class="red">Error: Your port race distribution must equal 100!</span>';
 	}
-}
-elseif ($submit == 'Edit Sector') {
+} elseif ($submit == 'Edit Sector') {
 	$editSector = SmrSector::getSector($var['game_id'], $var['sector_id']);
 
 	//update planet
 	if ($_POST['plan_type'] != '0') {
 		if (!$editSector->hasPlanet()) {
 			$editSector->createPlanet($_POST['plan_type']);
-		}
-		else {
+		} else {
 			$type = $editSector->getPlanet()->getTypeID();
 			if ($_POST['plan_type'] != $type) {
 				$editSector->getPlanet()->setTypeID($_POST['plan_type']);
 			}
 		}
-	}
-	else {
+	} else {
 		$editSector->removePlanet();
 	}
 
@@ -228,10 +222,11 @@ 
 	for ($x = 0; $x < UNI_GEN_LOCATION_SLOTS; $x++) {
 		if ($_POST['loc_type' . $x] != 0) {
 			$locationToAdd = SmrLocation::getLocation($_POST['loc_type' . $x]);
-			if ($editSector->hasLocation($locationToAdd->getTypeID()))
-				$locationsToKeep[] = $locationToAdd;
-			else
-				$locationsToAdd[] = $locationToAdd;
+			if ($editSector->hasLocation($locationToAdd->getTypeID())) {
+							$locationsToKeep[] = $locationToAdd;
+			} else {
+							$locationsToAdd[] = $locationToAdd;
+			}
 		}
 	}
 	$editSector->removeAllLocations();
@@ -265,8 +260,7 @@ 
 function checkSectorAllowedForLoc(SmrSector $sector, SmrLocation $location) {
 	if (!$location->isHQ()) {
 		return (count($sector->getLocations()) < 4 && !$sector->offersFederalProtection());
-	}
-	else {
+	} else {
 		//HQs are here
 		//find a sector where there are no locations yet
 		return !$sector->hasLocation();
@@ -274,8 +268,9 @@ 
 }
 
 function addLocationToSector(SmrLocation $location, SmrSector $sector) {
-	if ($sector->hasLocation($location->getTypeID()))
-		return false;
+	if ($sector->hasLocation($location->getTypeID())) {
+			return false;
+	}
 
 	$sector->addLocation($location); //insert the location
 	if ($location->isHQ()) {
@@ -283,13 +278,16 @@ 
 		//Racial/Fed
 		foreach ($location->getLinkedLocations() as $linkedLocation) {
 			$sector->addLocation($linkedLocation);
-			if ($linkedLocation->isFed())
-				$fedBeacon = $linkedLocation;
+			if ($linkedLocation->isFed()) {
+							$fedBeacon = $linkedLocation;
+			}
 		}
 			
 		//add Beacons to all surrounding areas (up to 2 sectors out)
-		if (!$sector->offersFederalProtection())
-			$sector->addLocation($fedBeacon); //add beacon to this sector
+		if (!$sector->offersFederalProtection()) {
+					$sector->addLocation($fedBeacon);
+		}
+		//add beacon to this sector
 		$visitedSectors = array();
 		$links = array('Up', 'Right', 'Down', 'Left');
 		$fedSectors = array($sector);
@@ -299,8 +297,10 @@ 
 				foreach ($links as $link) {
 					if ($fedSector->hasLink($link) && !isset($visitedSectors[$fedSector->getLink($link)])) {
 						$linkSector = $sector->getLinkSector($link);
-						if (!$linkSector->offersFederalProtection())
-							$linkSector->addLocation($fedBeacon); //add beacon to this sector
+						if (!$linkSector->offersFederalProtection()) {
+													$linkSector->addLocation($fedBeacon);
+						}
+						//add beacon to this sector
 						$tempFedSectors[] = $linkSector;
 						$visitedSectors[$fedSector->getLink($link)] = true;
 					}

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 +220 added lines, -151 removed lines

@@ -77,8 +77,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;
 	}
@@ -88,8 +89,9 @@ 
 	}
 
 	public function setShipTypeID($shipID) {
-		if ($this->shipID == $shipID)
-			return;
+		if ($this->shipID == $shipID) {
+					return;
+		}
 		$this->shipID = $shipID;
 		$this->hasChanged = true;
 	}
@@ -199,8 +201,9 @@ 
 		}
 
 		$ship = $this->getShip();
-		if ($ship->hasIllegalGoods())
-			return false;
+		if ($ship->hasIllegalGoods()) {
+					return false;
+		}
 
 		if ($ship->getAttackRating() <= $this->getSafeAttackRating()) {
 			foreach ($sector->getFedRaceIDs() as $fedRaceID) {
@@ -241,8 +244,9 @@ 
 	}
 
 	public function setDead($bool) {
-		if ($this->dead == $bool)
-			return;
+		if ($this->dead == $bool) {
+					return;
+		}
 		$this->dead = $bool;
 		$this->hasChanged = true;
 	}
@@ -252,14 +256,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;
 	}
@@ -269,14 +275,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;
 	}
@@ -298,24 +306,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;
 	}
@@ -329,8 +342,9 @@ 
 	}
 
 	public function getNextLevelPercentAcquired() {
-		if ($this->getNextLevelExperience() == $this->getThisLevelExperience())
-			return 100;
+		if ($this->getNextLevelExperience() == $this->getThisLevelExperience()) {
+					return 100;
+		}
 		return max(0, min(100, round(($this->getExperience() - $this->getThisLevelExperience()) / ($this->getNextLevelExperience() - $this->getThisLevelExperience()) * 100)));
 	}
 
@@ -340,8 +354,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'];
 	}
 
@@ -351,12 +367,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;
 
@@ -366,46 +385,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);
@@ -416,8 +446,9 @@ 
 	}
 
 	public function setLandedOnPlanet($bool) {
-		if ($this->landedOnPlanet == $bool)
-			return;
+		if ($this->landedOnPlanet == $bool) {
+					return;
+		}
 		$this->landedOnPlanet = $bool;
 		$this->hasChanged = true;
 	}
@@ -431,7 +462,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;
 			}
@@ -509,8 +542,9 @@ 
 	}
 
 	public function setRaceID($raceID) {
-		if ($this->raceID == $raceID)
-			return;
+		if ($this->raceID == $raceID) {
+					return;
+		}
 		$this->raceID = $raceID;
 		$this->hasChanged = true;
 	}
@@ -532,8 +566,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';
@@ -550,8 +585,7 @@ 
 	public function getAllianceName($linked = false, $includeAllianceID = false) {
 		if ($this->hasAlliance()) {
 			return $this->getAlliance()->getAllianceName($linked, $includeAllianceID);
-		}
-		else {
+		} else {
 			return 'No Alliance';
 		}
 	}
@@ -579,8 +613,9 @@ 
 	}
 
 	public function setCombatDronesKamikazeOnMines($bool) {
-		if ($this->combatDronesKamikazeOnMines == $bool)
-			return;
+		if ($this->combatDronesKamikazeOnMines == $bool) {
+					return;
+		}
 		$this->combatDronesKamikazeOnMines = $bool;
 		$this->hasChanged = true;
 	}
@@ -597,15 +632,17 @@ 
 			$gadgetID = $GADGETS[$gadgetID]['ID'];
 		}
 		$gadgets = $this->getGadgets();
-		if (isset($gadgets[$gadgetID]))
-			return $gadgets[$gadgetID];
+		if (isset($gadgets[$gadgetID])) {
+					return $gadgets[$gadgetID];
+		}
 		return false;
 	}
 
 	public function isGadgetEquipped($gadgetID) {
 		$gadget = $this->getGadget($gadgetID);
-		if ($gadget === false)
-			return false;
+		if ($gadget === false) {
+					return false;
+		}
 		return $gadget['Equipped'] > 0 && $gadget['Equipped'] < TIME && ($gadget['Expires'] == 0 || $gadget['Expires'] > TIME) && $gadget['Cooldown'] <= TIME;
 	}
 
@@ -677,21 +714,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);
 	}
 
@@ -734,10 +774,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 {
@@ -752,22 +793,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);
 	}
@@ -775,8 +819,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;
 	}
@@ -788,21 +833,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);
 	}
 
@@ -813,21 +861,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);
 	}
 
@@ -848,51 +899,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;
@@ -901,8 +960,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;
@@ -912,8 +972,9 @@ 
 		}
 		if ($hofChanged == null) {
 			$hofChanged = self::HOF_CHANGED;
-			if ($new)
-				$hofChanged = self::HOF_NEW;
+			if ($new) {
+							$hofChanged = self::HOF_NEW;
+			}
 		}
 		$hof = $amount;
 	}
@@ -978,8 +1039,9 @@ 
 	}
 
 	public function setLastActive($lastActive) {
-		if ($this->lastActive == $lastActive)
-			return;
+		if ($this->lastActive == $lastActive) {
+					return;
+		}
 		$this->lastActive = $lastActive;
 		$this->hasChanged = true;
 	}
@@ -989,8 +1051,9 @@ 
 	}
 
 	public function setLastCPLAction($time) {
-		if ($this->lastCPLAction == $time)
-			return;
+		if ($this->lastCPLAction == $time) {
+					return;
+		}
 		$this->lastCPLAction = $time;
 		$this->hasChanged = true;
 	}
@@ -1031,8 +1094,9 @@ 
 
 	protected function getMission($missionID) {
 		$missions = $this->getMissions();
-		if (isset($missions[$missionID]))
-			return $missions[$missionID];
+		if (isset($missions[$missionID])) {
+					return $missions[$missionID];
+		}
 		return false;
 	}
 
@@ -1091,8 +1155,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(
@@ -1121,8 +1186,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'])) {
@@ -1130,8 +1194,7 @@ 
 			}
 			if (isset($currentStep['Level'])) {
 				$currentStep['Level'] = str_replace('<Player Level>', $this->getLevelID(), $currentStep['Level']);
-			}
-			else {
+			} else {
 				$currentStep['Level'] = 0;
 			}
 		}
@@ -1259,12 +1322,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;
 	}
 
@@ -1317,10 +1383,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;
 	}
 
@@ -1343,8 +1411,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->getField('sector_id')] = false;
+			while ($this->db->nextRecord()) {
+							$this->visitedSectors[$this->db->getField('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/SmrWeapon.class.php

Spacing +4 added lines, -4 removed lines

@@ -193,21 +193,21 @@ 
 	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.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage($weaponPlayer);
+		$damage = & $this->getModifiedDamage($weaponPlayer);
 		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.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage($weaponPlayer);
+		$damage = & $this->getModifiedDamage($weaponPlayer);
 		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.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage($weaponPlayer);
+		$damage = & $this->getModifiedDamage($weaponPlayer);
 		
 		$planetMod = self::PLANET_DAMAGE_MOD;
 		$damage['MaxDamage'] = ceil($damage['MaxDamage'] * $planetMod);
@@ -227,7 +227,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage($weaponPlayer);
+		$damage = & $this->getModifiedDamage($weaponPlayer);
 		return $damage;
 	}
 	

Braces +26 added lines, -15 removed lines

@@ -12,17 +12,19 @@ 
 
 	
 	protected static function initialiseDatabase() {
-		if (self::$db == null)
-			self::$db = new SmrMySqlDatabase();
+		if (self::$db == null) {
+					self::$db = new SmrMySqlDatabase();
+		}
 	}
 
 	public static function &getWeapon($weaponTypeID, $forceUpdate = false, $db = null) {
 		if ($forceUpdate || !isset(self::$CACHE_WEAPONS[$weaponTypeID])) {
 			$w = new SmrWeapon($weaponTypeID, $db);
-			if ($w->exists())
-				self::$CACHE_WEAPONS[$weaponTypeID] = $w;
-			else
-				self::$CACHE_WEAPONS[$weaponTypeID] = false;
+			if ($w->exists()) {
+							self::$CACHE_WEAPONS[$weaponTypeID] = $w;
+			} else {
+							self::$CACHE_WEAPONS[$weaponTypeID] = false;
+			}
 		}
 		return self::$CACHE_WEAPONS[$weaponTypeID];
 	}
@@ -115,8 +117,9 @@ 
 	public function getModifiedAccuracy(AbstractSmrPlayer $weaponPlayer) {
 		$modifiedAccuracy = $this->getBaseAccuracy();
 		$modifiedAccuracy += $this->getBaseAccuracy() * self::getPlayerLevelAccuracyMod($weaponPlayer);
-		if ($weaponPlayer->isGadgetEquipped('Increased Accuracy'))
-			$modifiedAccuracy += $this->getBaseAccuracy() * INCREASED_ACC_GADGET_FACTOR / 100;
+		if ($weaponPlayer->isGadgetEquipped('Increased Accuracy')) {
+					$modifiedAccuracy += $this->getBaseAccuracy() * INCREASED_ACC_GADGET_FACTOR / 100;
+		}
 		return $modifiedAccuracy;
 	}
 	
@@ -140,14 +143,16 @@ 
 	public function getModifiedAccuracyAgainstPlayer(AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
 		$modifiedAccuracy = $this->getModifiedAccuracy($weaponPlayer);
 		$modifiedAccuracy -= $this->getBaseAccuracy() * self::getPlayerLevelAccuracyMod($targetPlayer) / 2;
-		if ($targetPlayer->isGadgetEquipped('Increased Maneuverability'))
-			$modifiedAccuracy -= $this->getBaseAccuracy() * INCREASED_MAN_GADGET_FACTOR / 100;
+		if ($targetPlayer->isGadgetEquipped('Increased Maneuverability')) {
+					$modifiedAccuracy -= $this->getBaseAccuracy() * INCREASED_MAN_GADGET_FACTOR / 100;
+		}
 		
 		$weaponShip = $weaponPlayer->getShip();
 		$targetShip = $targetPlayer->getShip();
 		$mrDiff = $targetShip->getMR() - $weaponShip->getMR();
-		if ($mrDiff > 0)
-			$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		if ($mrDiff > 0) {
+					$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		}
 	
 		return $modifiedAccuracy;
 	}
@@ -191,22 +196,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($weaponPlayer);
 		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($weaponPlayer);
 		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($weaponPlayer);
 		
 		$planetMod = self::PLANET_DAMAGE_MOD;