smrealms / smr

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/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/AbstractSmrShip.class.php

Indentation +4 added lines, -4 removed lines

@@ -924,14 +924,14 @@
 
 	public function isFederal() {
 		return $this->getShipTypeID() == SHIP_TYPE_FEDERAL_DISCOVERY ||
-		       $this->getShipTypeID() == SHIP_TYPE_FEDERAL_WARRANT ||
-		       $this->getShipTypeID() == SHIP_TYPE_FEDERAL_ULTIMATUM;
+			   $this->getShipTypeID() == SHIP_TYPE_FEDERAL_WARRANT ||
+			   $this->getShipTypeID() == SHIP_TYPE_FEDERAL_ULTIMATUM;
 	}
 
 	public function isUnderground() {
 		return $this->getShipTypeID() == SHIP_TYPE_THIEF ||
-		       $this->getShipTypeID() == SHIP_TYPE_ASSASSIN ||
-		       $this->getShipTypeID() == SHIP_TYPE_DEATH_CRUISER;
+			   $this->getShipTypeID() == SHIP_TYPE_ASSASSIN ||
+			   $this->getShipTypeID() == SHIP_TYPE_DEATH_CRUISER;
 	}
 
 	public function shootPlayers(array $targetPlayers) {

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 } ?>.

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

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
 			?> scout drones kamikaze themselves against <?php
 		}
 
-		if ($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php }
+		if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php }
 		echo $TargetPlayer->getDisplayName();
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
 			if (!$ShotHit) {
@@ -37,9 +37,9 @@ 
 				?> destroying <?php
 			}
 			$DamageTypes = 0;
-			if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-			if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-			if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+			if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+			if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+			if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
 			if ($ActualDamage['Shield'] > 0) {
 				?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
@@ -55,7 +55,7 @@ 
 		} ?>.
 		<br /><?php
 		if ($ShotHit && $ActualDamage['KillingShot']) {
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$ForceResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$ForceResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 		}
 	}
 }
@@ -64,4 +64,4 @@ 
 }
 
 $TotalDamage = $ForcesCombatResults['TotalDamage'] ?>
-The forces <?php if ($TotalDamage > 0){ ?>hit for a total of <span class="red"><?php echo number_format($TotalDamage) ?></span> damage in this round of combat<?php } else{ ?>do no damage this round<?php } ?>.
+The forces <?php if ($TotalDamage > 0) { ?>hit for a total of <span class="red"><?php echo number_format($TotalDamage) ?></span> damage in this round of combat<?php } else { ?>do no damage this round<?php } ?>.

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

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 				}
 				$TargetPort = $WeaponResults['TargetPort'];
 
-				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?>the remnants of <?php } echo $TargetPort->getDisplayName();
+				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?>the remnants of <?php } echo $TargetPort->getDisplayName();
 				if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
 					if (!$ShotHit) {
 						?> and misses every critical system<?php
@@ -44,9 +44,9 @@ 
 					} else {
 						?> destroying <?php
 						$DamageTypes = 0;
-						if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-						if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-						if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+						if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+						if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+						if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
 						if ($ActualDamage['Shield'] > 0) {
 							?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
@@ -63,7 +63,7 @@ 
 				} ?>.
 				<br /><?php
 				if ($ShotHit && $ActualDamage['KillingShot']) {
-					$this->includeTemplate('includes/PortKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPort'=>$TargetPort,'ShootingPlayer'=>$ShootingPlayer));
+					$this->includeTemplate('includes/PortKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPort'=>$TargetPort, 'ShootingPlayer'=>$ShootingPlayer));
 				}
 			}
 		}

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

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
 		}
 		$TargetPlayer = $WeaponResults['TargetPlayer'];
 
-		echo $CombatPort->getDisplayName() ?> fires an <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
+		echo $CombatPort->getDisplayName() ?> fires an <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
 			if (!$ShotHit) {
 				?> and misses<?php
@@ -39,9 +39,9 @@ 
 			} else {
 				?> destroying <?php
 				$DamageTypes = 0;
-				if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+				if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
 				if ($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
@@ -58,7 +58,7 @@ 
 		} ?>.
 		<br /><?php
 		if ($ShotHit && $ActualDamage['KillingShot']) {
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 		}
 	}
 }
@@ -72,7 +72,7 @@ 
 	if ($WeaponDamage['Launched'] == 0) {
 		?> fails to launch it's 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 } echo $TargetPlayer->getDisplayName();
+		?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if ($ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
 		if (!$ActualDamage['TargetAlreadyDead']) {
 			if ($ActualDamage['TotalDamage'] == 0) {
 				if ($WeaponDamage['Shield'] > 0) {

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

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
 				}
 				$TargetPlanet = $WeaponResults['TargetPlanet'];
 
-				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlanet->getCombatName();
+				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlanet->getCombatName();
 				if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
 					if (!$ShotHit) {
 						?> and misses<?php
@@ -44,9 +44,9 @@ 
 					} else {
 						?> destroying <?php
 						$DamageTypes = 0;
-						if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-						if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-						if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+						if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+						if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+						if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
 						if ($ActualDamage['Shield'] > 0) {
 							?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
@@ -63,7 +63,7 @@ 
 				} ?>.
 				<br /><?php
 				if ($ShotHit && $ActualDamage['KillingShot']) {
-					$this->includeTemplate('includes/PlanetKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlanet'=>$TargetPlanet));
+					$this->includeTemplate('includes/PlanetKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlanet'=>$TargetPlanet));
 				}
 			}
 		}
@@ -73,9 +73,9 @@ 
 			$WeaponDamage = $Drones['WeaponDamage'];
 			$TargetPlanet = $Drones['TargetPlanet'];
 			$DamageTypes = 0;
-			if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-			if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-			if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+			if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+			if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+			if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
 			echo $ShootingPlayer->getDisplayName();
 			if ($WeaponDamage['Launched'] == 0) {
@@ -118,7 +118,7 @@ 
 			} ?>.
 			<br /><?php
 			if ($ActualDamage['KillingShot']) {
-				$this->includeTemplate('includes/PlanetKillMessage.inc.php',array('KillResults'=>$Drones['KillResults'],'TargetPlanet'=>$TargetPlanet));
+				$this->includeTemplate('includes/PlanetKillMessage.inc.php', array('KillResults'=>$Drones['KillResults'], 'TargetPlanet'=>$TargetPlanet));
 			}
 		}
 	}
@@ -133,7 +133,7 @@ 
 	} ?>.<br /><br /><?php
 }
 $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 } ?>.<br /><?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 } ?>.<br /><?php
 foreach ($TraderTeamCombatResults['Downgrades'] as $structureID => $numDestroyed) { ?>
 	This team destroys <span class="red"><?php echo $numDestroyed; ?> </span><?php echo pluralise((new SmrPlanetStructureType($structureID, []))->name(), $numDestroyed); ?>.<br /><?php
 } ?>

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

Spacing +10 added lines, -10 removed lines

@@ -20,7 +20,7 @@ 
 		}
 		$TargetPlayer = $WeaponResults['TargetPlayer'];
 
-		echo $CombatPlanet->getCombatName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
+		echo $CombatPlanet->getCombatName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
 			if (!$ShotHit) {
 				?> and misses<?php
@@ -39,9 +39,9 @@ 
 			} else {
 				?> destroying <?php
 				$DamageTypes = 0;
-				if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+				if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
 				if ($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
@@ -58,7 +58,7 @@ 
 		} ?>.
 		<br /><?php
 		if ($ShotHit && $ActualDamage['KillingShot']) {
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 		}
 	}
 }
@@ -68,15 +68,15 @@ 
 	$WeaponDamage = $Drones['WeaponDamage'];
 	$TargetPlayer = $Drones['TargetPlayer'];
 	$DamageTypes = 0;
-	if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-	if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-	if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+	if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+	if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+	if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
 	echo $CombatPlanet->getCombatName();
 	if ($WeaponDamage['Launched'] == 0) {
 		?> fails to launch it's 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 } echo $TargetPlayer->getDisplayName();
+		?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if ($ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
 		if (!$ActualDamage['TargetAlreadyDead']) {
 			if ($ActualDamage['TotalDamage'] == 0) {
 				if ($WeaponDamage['Shield'] > 0) {
@@ -108,7 +108,7 @@ 
 	} ?>.
 	<br /><?php
 	if ($ActualDamage['KillingShot']) {
-		$this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer));
+		$this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 	}
 }