smrealms / smr

src/admin/Default/ip_view_results.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 	}
 	$accountID = (int)$variable;
 	$template->assign('BanAccountID', $accountID);
-	$summary = 'Account ' . $accountID. ' has had the following IPs at the following times.';
+	$summary = 'Account ' . $accountID . ' has had the following IPs at the following times.';
 	$template->assign('Summary', $summary);
 	$db2->query('SELECT * FROM account_exceptions WHERE account_id = ' . $db->escapeNumber($variable));
 	if ($db2->nextRecord()) {

src/lib/Default/ChessPiece.class.php

Spacing +2 added lines, -2 removed lines

@@ -234,7 +234,7 @@ 
 	}
 
 	public static function getLetterForPiece(int $pieceID, string $colour) : string {
-		$letter = match ($pieceID) {
+		$letter = match($pieceID) {
 			self::KING => 'k',
 			self::QUEEN => 'q',
 			self::ROOK => 'r',
@@ -249,7 +249,7 @@ 
 	}
 
 	public static function getPieceForLetter(string $letter) : int {
-		return match (strtolower($letter)) {
+		return match(strtolower($letter)) {
 			'k' => self::KING,
 			'q' => self::QUEEN,
 			'r' => self::ROOK,

src/lib/Default/AbstractSmrAccount.class.php

Spacing +4 added lines, -4 removed lines

@@ -246,7 +246,7 @@ 
 	/**
 	 * Check if the account is disabled.
 	 */
-	public function isDisabled() : array | false {
+	public function isDisabled() : array|false {
 		$this->db->query('SELECT * FROM account_is_closed JOIN closing_reason USING(reason_id) ' .
 			'WHERE ' . $this->SQL . ' LIMIT 1');
 		if ($this->db->nextRecord()) {
@@ -377,13 +377,13 @@ 
 			$this->db->query('SELECT type,sum(amount) as amount FROM player_hof WHERE ' . $this->SQL . ' AND game_id IN (SELECT game_id FROM game WHERE ignore_stats = \'FALSE\') GROUP BY type');
 			$this->HOF = array();
 			while ($this->db->nextRecord()) {
-				$hof =& $this->HOF;
+				$hof = & $this->HOF;
 				$typeList = explode(':', $this->db->getField('type'));
 				foreach ($typeList as $type) {
 					if (!isset($hof[$type])) {
 						$hof[$type] = array();
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $this->db->getFloat('amount');
 			}
@@ -1125,7 +1125,7 @@ 
 		}
 	}
 
-	public function addPoints(int $numPoints, SmrAccount $admin, int $reasonID, string $suspicion) : int | false {
+	public function addPoints(int $numPoints, SmrAccount $admin, int $reasonID, string $suspicion) : int|false {
 		//do we have points
 		$this->setPoints($this->getPoints() + $numPoints, SmrSession::getTime());
 		$totalPoints = $this->getPoints();

src/lib/Default/DummyShip.class.php

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
 	}
 
 	protected function doFullUNO() {
-		foreach($this->getMaxHardware() as $hardwareTypeID => $max) {
+		foreach ($this->getMaxHardware() as $hardwareTypeID => $max) {
 			$this->hardware[$hardwareTypeID] = $max;
 			$this->oldHardware[$hardwareTypeID] = $max;
 		}
@@ -46,8 +46,8 @@ 
 	}
 
 	public function getIllusionShip() {
-		if(!isset($this->illusionShip)) {
-			$this->illusionShip=false;
+		if (!isset($this->illusionShip)) {
+			$this->illusionShip = false;
 		}
 		return $this->illusionShip;
 	}
@@ -57,20 +57,20 @@ 
 		$db = MySqlDatabase::getInstance();
 		$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 = MySqlDatabase::getInstance();
 			$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);
 			}
@@ -83,7 +83,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;
@@ -92,7 +92,7 @@ 
 
 
 	public function __sleep() {
-		return array('gameID','weapons');
+		return array('gameID', 'weapons');
 	}
 
 	public function __wakeup() {

src/lib/Default/DummyPlayer.class.php

Spacing +20 added lines, -20 removed lines

@@ -1,30 +1,30 @@ 
 <?php declare(strict_types=1);
 
 class DummyPlayer extends AbstractSmrPlayer {
-	public function __construct($gameID=0,$playerName='Dummy',$raceID=1,$experience=1000,$alignment=100,$allianceID=0,$shipTypeID=60) {
+	public function __construct($gameID = 0, $playerName = 'Dummy', $raceID = 1, $experience = 1000, $alignment = 100, $allianceID = 0, $shipTypeID = 60) {
 		$this->accountID				= 0;
-		$this->gameID					= (int) $gameID;
-		$this->playerName				= (string) $playerName;
+		$this->gameID = (int)$gameID;
+		$this->playerName = (string)$playerName;
 		$this->playerID					= 0;
 		$this->sectorID					= 0;
-		$this->lastSectorID				= 0;
+		$this->lastSectorID = 0;
 		$this->turns					= 1000;
-		$this->newbieTurns				= 0;
+		$this->newbieTurns = 0;
 		$this->lastNewsUpdate			= 0;
 		$this->dead						= false;
 		$this->landedOnPlanet			= false;
-		$this->lastActive				= 0;
-		$this->lastCPLAction			= 0;
-		$this->raceID					= (int) $raceID;
-		$this->credits					= 0;
-		$this->experience				= (int) $experience;
-		$this->alignment				= (int) $alignment;
-		$this->militaryPayment			= 0;
-		$this->allianceID				= (int) $allianceID;
-		$this->shipID					= (int) $shipTypeID;
+		$this->lastActive = 0;
+		$this->lastCPLAction = 0;
+		$this->raceID = (int)$raceID;
+		$this->credits = 0;
+		$this->experience				= (int)$experience;
+		$this->alignment = (int)$alignment;
+		$this->militaryPayment = 0;
+		$this->allianceID				= (int)$allianceID;
+		$this->shipID					= (int)$shipTypeID;
 		$this->kills					= 0;
 		$this->deaths					= 0;
-		$this->lastPort					= 0;
+		$this->lastPort = 0;
 		$this->bank						= 0;
 		$this->zoom						= 0;
 
@@ -48,9 +48,9 @@ 
 	}
 
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
+		if ($this->allianceID == $ID)
 			return;
-		$this->allianceID=$ID;
+		$this->allianceID = $ID;
 	}
 
 	public function killPlayerByPlayer(AbstractSmrPlayer $killer) {
@@ -76,7 +76,7 @@ 
 		$db = MySqlDatabase::getInstance();
 		$db->query('REPLACE INTO cached_dummys ' .
 					'(type, id, info) ' .
-					'VALUES (\'DummyPlayer\', '.$db->escapeString($this->getPlayerName()).', '.$db->escapeString($cache).')');
+					'VALUES (\'DummyPlayer\', ' . $db->escapeString($this->getPlayerName()) . ', ' . $db->escapeString($cache) . ')');
 		 unserialize($cache);
 	}
 
@@ -85,7 +85,7 @@ 
 		$db->query('SELECT info FROM cached_dummys
 					WHERE type = \'DummyPlayer\'
 						AND id = ' . $db->escapeString($name) . ' LIMIT 1');
-		if($db->nextRecord()) {
+		if ($db->nextRecord()) {
 			$return = unserialize($db->getField('info'));
 			return $return;
 		}
@@ -100,7 +100,7 @@ 
 		$db->query('SELECT id FROM cached_dummys
 					WHERE type = \'DummyPlayer\'');
 		$dummyNames = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$dummyNames[] = $db->getField('id');
 		}
 		return $dummyNames;

src/lib/Default/AbstractSmrCombatWeapon.class.php

Spacing +8 added lines, -8 removed lines

@@ -67,7 +67,7 @@ 
 	abstract public function getModifiedPlanetDamageAgainstPlayer(SmrPlanet $planet, AbstractSmrPlayer $targetPlayer);
 
 	protected function doPlayerDamageToForce(array $return, AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		$return['WeaponDamage'] = $this->getModifiedDamageAgainstForces($weaponPlayer,$forces);
+		$return['WeaponDamage'] = $this->getModifiedDamageAgainstForces($weaponPlayer, $forces);
 		$return['ActualDamage'] = $forces->doWeaponDamage($return['WeaponDamage']);
 		if ($return['ActualDamage']['KillingShot']) {
 			$return['KillResults'] = $forces->killForcesByPlayer($weaponPlayer);
@@ -76,7 +76,7 @@ 
 	}
 
 	protected function doPlayerDamageToPlayer(array $return, AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] = $this->getModifiedDamageAgainstPlayer($weaponPlayer,$targetPlayer);
+		$return['WeaponDamage'] = $this->getModifiedDamageAgainstPlayer($weaponPlayer, $targetPlayer);
 		$return['ActualDamage'] = $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
@@ -86,7 +86,7 @@ 
 	}
 
 	protected function doPlayerDamageToPort(array $return, AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		$return['WeaponDamage'] = $this->getModifiedDamageAgainstPort($weaponPlayer,$port);
+		$return['WeaponDamage'] = $this->getModifiedDamageAgainstPort($weaponPlayer, $port);
 		$return['ActualDamage'] = $port->doWeaponDamage($return['WeaponDamage']);
 		if ($return['ActualDamage']['KillingShot']) {
 			$return['KillResults'] = $port->killPortByPlayer($weaponPlayer);
@@ -95,8 +95,8 @@ 
 	}
 
 	protected function doPlayerDamageToPlanet(array $return, AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
-		$return['WeaponDamage'] = $this->getModifiedDamageAgainstPlanet($weaponPlayer,$planet);
-		$return['ActualDamage'] = $planet->doWeaponDamage($return['WeaponDamage'],$delayed);
+		$return['WeaponDamage'] = $this->getModifiedDamageAgainstPlanet($weaponPlayer, $planet);
+		$return['ActualDamage'] = $planet->doWeaponDamage($return['WeaponDamage'], $delayed);
 		if ($return['ActualDamage']['KillingShot']) {
 			$return['KillResults'] = $planet->killPlanetByPlayer($weaponPlayer);
 		}
@@ -104,7 +104,7 @@ 
 	}
 
 	protected function doPortDamageToPlayer(array $return, SmrPort $port, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] = $this->getModifiedPortDamageAgainstPlayer($port,$targetPlayer);
+		$return['WeaponDamage'] = $this->getModifiedPortDamageAgainstPlayer($port, $targetPlayer);
 		$return['ActualDamage'] = $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
@@ -114,7 +114,7 @@ 
 	}
 
 	protected function doPlanetDamageToPlayer(array $return, SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] = $this->getModifiedPlanetDamageAgainstPlayer($planet,$targetPlayer);
+		$return['WeaponDamage'] = $this->getModifiedPlanetDamageAgainstPlayer($planet, $targetPlayer);
 		$return['ActualDamage'] = $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
@@ -124,7 +124,7 @@ 
 	}
 
 	protected function doForceDamageToPlayer(array $return, SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] = $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer);
+		$return['WeaponDamage'] = $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer);
 		$return['ActualDamage'] = $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {

src/lib/Default/AbstractSmrPlayer.class.php

Spacing +9 added lines, -9 removed lines

@@ -1711,7 +1711,7 @@ 
 			create_error('The saved sector must be in the box!');
 		}
 
-		$storedDestinations =& $this->getStoredDestinations();
+		$storedDestinations = & $this->getStoredDestinations();
 		foreach ($storedDestinations as &$sd) {
 			if ($sd['SectorID'] == $sectorID) {
 				$sd['OffsetTop'] = $offsetTop;
@@ -2034,13 +2034,13 @@ 
 			$this->db->query('SELECT type,amount FROM player_hof WHERE ' . $this->SQL);
 			$this->HOF = array();
 			while ($this->db->nextRecord()) {
-				$hof =& $this->HOF;
+				$hof = & $this->HOF;
 				$typeList = explode(':', $this->db->getField('type'));
 				foreach ($typeList as $type) {
 					if (!isset($hof[$type])) {
 						$hof[$type] = array();
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $this->db->getFloat('amount');
 			}
@@ -2119,8 +2119,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])) {
@@ -2130,8 +2130,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;
@@ -2780,7 +2780,7 @@ 
 			'Starting Sector' => $this->getSectorID()
 		);
 
-		$this->missions[$missionID] =& $mission;
+		$this->missions[$missionID] = & $mission;
 		$this->setupMissionStep($missionID);
 		$this->rebuildMission($missionID);
 
@@ -2830,7 +2830,7 @@ 
 
 	public function claimMissionReward($missionID) {
 		$this->getMissions();
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission === false) {
 			throw new Exception('Unknown mission: ' . $missionID);
 		}

src/engine/Default/combat_simulator.php

Spacing +34 added lines, -34 removed lines

@@ -1,79 +1,79 @@ 
 <?php declare(strict_types=1);
-$template->assign('PageTopic','Combat Simulator');
+$template->assign('PageTopic', 'Combat Simulator');
 
-$template->assign('EditDummysLink',SmrSession::getNewHREF(create_container('skeleton.php','edit_dummys.php')));
+$template->assign('EditDummysLink', SmrSession::getNewHREF(create_container('skeleton.php', 'edit_dummys.php')));
 $template->assign('DummyNames', DummyPlayer::getDummyPlayerNames());
 
 $duplicates = false;
 $usedNames = array();
 $realAttackers = array();
 $attackers = array();
-$i=1;
-if(isset($_POST['attackers']))
-	foreach($_POST['attackers'] as $attackerName) {
-		if($attackerName=='none')
+$i = 1;
+if (isset($_POST['attackers']))
+	foreach ($_POST['attackers'] as $attackerName) {
+		if ($attackerName == 'none')
 			continue;
-		if(isset($usedNames[$attackerName])) {
+		if (isset($usedNames[$attackerName])) {
 			$duplicates = true;
 			continue;
 		}
 		$usedNames[$attackerName] = true;
-		$attackers[$i] =& DummyPlayer::getCachedDummyPlayer($attackerName);
+		$attackers[$i] = & DummyPlayer::getCachedDummyPlayer($attackerName);
 		$attackers[$i]->setAllianceID(1);
-		$realAttackers[$i] =& $attackers[$i];
+		$realAttackers[$i] = & $attackers[$i];
 		++$i;
 	}
 
-for(;$i<=10;++$i)
+for (;$i <= 10; ++$i)
 	$attackers[$i] = null;
-$template->assign('Attackers',$attackers);
+$template->assign('Attackers', $attackers);
 
-$i=1;
+$i = 1;
 $realDefenders = array();
 $defenders = array();
-if(isset($_POST['defenders']))
-	foreach($_POST['defenders'] as $defenderName) {
-		if($defenderName=='none')
+if (isset($_POST['defenders']))
+	foreach ($_POST['defenders'] as $defenderName) {
+		if ($defenderName == 'none')
 			continue;
-		if(isset($usedNames[$defenderName])) {
+		if (isset($usedNames[$defenderName])) {
 			$duplicates = true;
 			continue;
 		}
 		$usedNames[$attackerName] = true;
-		$defenders[$i] =& DummyPlayer::getCachedDummyPlayer($defenderName);
+		$defenders[$i] = & DummyPlayer::getCachedDummyPlayer($defenderName);
 		$defenders[$i]->setAllianceID(2);
-		$realDefenders[$i] =& $defenders[$i];
+		$realDefenders[$i] = & $defenders[$i];
 		++$i;
 	}
 
-for(;$i<=10;++$i)
+for (;$i <= 10; ++$i)
 	$defenders[$i] = null;
-$template->assign('Defenders',$defenders);
+$template->assign('Defenders', $defenders);
 
-$template->assign('Duplicates',$duplicates);
+$template->assign('Duplicates', $duplicates);
 
-$template->assign('CombatSimHREF',SmrSession::getNewHREF(create_container('skeleton.php','combat_simulator.php')));
+$template->assign('CombatSimHREF', SmrSession::getNewHREF(create_container('skeleton.php', 'combat_simulator.php')));
 
 if (!empty($realAttackers) && !empty($realDefenders)) {
-	if(isset($_REQUEST['run'])) {
-		runAnAttack($realAttackers,$realDefenders);
+	if (isset($_REQUEST['run'])) {
+		runAnAttack($realAttackers, $realDefenders);
 	}
-	if(isset($_REQUEST['death_run'])) {
-		while(count($realAttackers)>0 && count($realDefenders)>0) {
-			runAnAttack($realAttackers,$realDefenders);
-			foreach($realAttackers as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
+	if (isset($_REQUEST['death_run'])) {
+		while (count($realAttackers) > 0 && count($realDefenders) > 0) {
+			runAnAttack($realAttackers, $realDefenders);
+			foreach ($realAttackers as $key => &$teamPlayer) {
+				if ($teamPlayer->isDead())
 					unset($realAttackers[$key]);
 			} unset($teamPlayer);
-			foreach($realDefenders as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
+			foreach ($realDefenders as $key => &$teamPlayer) {
+				if ($teamPlayer->isDead())
 					unset($realDefenders[$key]);
 			} unset($teamPlayer);
 		}
 	}
 }
 
-function runAnAttack($realAttackers,$realDefenders) {
+function runAnAttack($realAttackers, $realDefenders) {
 	global $template;
 	$results = array('Attackers' => array('Traders' => array(), 'TotalDamage' => 0),
 					'Defenders' => array('Traders' => array(), 'TotalDamage' => 0));
@@ -84,8 +84,8 @@ 
 	}
 	foreach ($realDefenders as $accountID => $teamPlayer) {
 		$playerResults = $teamPlayer->shootPlayers($realAttackers);
-		$results['Defenders']['Traders'][]  = $playerResults;
+		$results['Defenders']['Traders'][] = $playerResults;
 		$results['Defenders']['TotalDamage'] += $playerResults['TotalDamage'];
 	}
-	$template->assign('TraderCombatResults',$results);
+	$template->assign('TraderCombatResults', $results);
 }

src/templates/Default/engine/Default/includes/ForceTraderTeamCombatResults.inc.php

Spacing +13 added lines, -13 removed lines

@@ -16,24 +16,24 @@ 
 						$WeaponDamage = $WeaponResults['WeaponDamage'];
 					}
 
-					echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once<?php } ?> the forces<?php
+					echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once<?php } ?> the forces<?php
 					if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
 						if (!$ShotHit) {
 							?> and misses<?php
 						} elseif ($ActualDamage['TotalDamage'] == 0) {
 							if ($WeaponDamage['Shield'] > 0) {
-								?> which proves ineffective against the <?php if ($ActualDamage['HasMines']){ ?>mines<?php } elseif ($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php }
+								?> which proves ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } elseif ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php }
 							} elseif ($WeaponDamage['Armour'] > 0) {
-								?> which is deflected by the <?php if ($ActualDamage['HasMines']){ ?>mines<?php } elseif ($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php
+								?> which is deflected by the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } elseif ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php
 							} else {
 								?> but it cannot do any damage<?php
 							}
 						} else {
 							?> destroying <?php
 							$DamageTypes = 0;
-							if ($ActualDamage['NumMines'] > 0){ $DamageTypes = $DamageTypes+1; }
-							if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-							if ($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; }
+							if ($ActualDamage['NumMines'] > 0) { $DamageTypes = $DamageTypes + 1; }
+							if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+							if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
 							if ($ActualDamage['NumMines'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php
@@ -63,22 +63,22 @@ 
 				if ($WeaponDamage['Launched'] == 0) {
 					?> fails to launch their combat drones<?php
 				} else {
-					?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at<?php if ($ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } ?> the forces<?php
+					?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at<?php if ($ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } ?> the forces<?php
 					if (!$ActualDamage['TargetAlreadyDead']) {
 						if ($ActualDamage['TotalDamage'] == 0) {
 							if ($WeaponDamage['Shield'] > 0) {
-								?> which prove ineffective against the <?php if ($ActualDamage['HasMines']){ ?>mines<?php } elseif ($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php }
+								?> which prove ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } elseif ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php }
 							} elseif ($WeaponDamage['Armour'] > 0) {
 								?> which is deflected by the <?php
-								if ($ActualDamage['HasMines']){ ?>mines<?php } elseif ($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php
+								if ($ActualDamage['HasMines']) { ?>mines<?php } elseif ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php
 							} else {
 								?> but they cannot do any damage<?php
 							}
 						} else {
 							$DamageTypes = 0;
-							if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes+1; }
-							if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-							if ($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; }
+							if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes + 1; }
+							if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+							if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
 							if ($WeaponDamage['Kamikaze'] == 0) {
 								?> destroying <?php
@@ -120,4 +120,4 @@ 
 	}
 }
 $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?>
-This fleet <?php if ($TotalDamage > 0){ ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else{ ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.
+This fleet <?php if ($TotalDamage > 0) { ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else { ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.