smrealms / smr

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

Spacing +50 added lines, -50 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
-	$ShootingPlayer =& $TraderResults['Player'];
-	$TotalDamage =& $TraderResults['TotalDamage'];
-	if($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
+foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
+	$ShootingPlayer = & $TraderResults['Player'];
+	$TotalDamage = & $TraderResults['TotalDamage'];
+	if ($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
 		echo $ShootingPlayer->getDisplayName();
-		if($TotalDamage > 0) {
+		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<?php
@@ -12,29 +12,29 @@ 
 		continue;
 	}
 
-	if($TraderResults['DeadBeforeShot']) {
+	if ($TraderResults['DeadBeforeShot']) {
 		echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php
 	} else {
-		if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
-			foreach($TraderResults['Weapons'] as $WeaponResults) {
-				$ShootingWeapon =& $WeaponResults['Weapon'];
-				$ShotHit =& $WeaponResults['Hit'];
-				$ActualDamage =& $WeaponResults['ActualDamage'];
-				$WeaponDamage =& $WeaponResults['WeaponDamage'];
-				$TargetPort =& $WeaponResults['TargetPort'];
+		if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
+			foreach ($TraderResults['Weapons'] as $WeaponResults) {
+				$ShootingWeapon = & $WeaponResults['Weapon'];
+				$ShotHit = & $WeaponResults['Hit'];
+				$ActualDamage = & $WeaponResults['ActualDamage'];
+				$WeaponDamage = & $WeaponResults['WeaponDamage'];
+				$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) {
+					if (!$ShotHit) {
 						?> and misses every critical system<?php
-					} else if($ActualDamage['TotalDamage'] == 0) {
-						if($WeaponDamage['Shield'] > 0) {
-							if($ActualDamage['HasCDs']) {
+					} else if ($ActualDamage['TotalDamage'] == 0) {
+						if ($WeaponDamage['Shield'] > 0) {
+							if ($ActualDamage['HasCDs']) {
 								?> which proves ineffective against their combat drones<?php
 							} else {
 								?> which proves ineffective against it's armour<?php
 							}
-						} else if($WeaponDamage['Armour'] > 0) {
+						} else if ($WeaponDamage['Armour'] > 0) {
 							?> which is deflected by their shields<?php
 						} else {
 							?> but it cannot do any damage<?php
@@ -42,55 +42,55 @@ 
 					} 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) {
+						if ($ActualDamage['Shield'] > 0) {
 							?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 							$this->doDamageTypeReductionDisplay($DamageTypes);
 						}
-						if($ActualDamage['NumCDs'] > 0) {
+						if ($ActualDamage['NumCDs'] > 0) {
 							?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 							$this->doDamageTypeReductionDisplay($DamageTypes);
 						}
-						if($ActualDamage['Armour'] > 0) {
+						if ($ActualDamage['Armour'] > 0) {
 							?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 						}
 					}
 				} ?>.
 				<br /><?php
 				if ($ShotHit && $ActualDamage['KillingShot']) {
-					$this->includeTemplate('includes/PortKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPort'=>$TargetPort,'ShootingPlayer'=>$ShootingPlayer));
+					$this->includeTemplate('includes/PortKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPort'=>$TargetPort, 'ShootingPlayer'=>$ShootingPlayer));
 				}
 			}
 		}
-		if(isset($TraderResults['Drones'])) {
-			$Drones =& $TraderResults['Drones'];
-			$ActualDamage =& $Drones['ActualDamage'];
-			$WeaponDamage =& $Drones['WeaponDamage'];
-			$TargetPort =& $Drones['TargetPort'];
+		if (isset($TraderResults['Drones'])) {
+			$Drones = & $TraderResults['Drones'];
+			$ActualDamage = & $Drones['ActualDamage'];
+			$WeaponDamage = & $Drones['WeaponDamage'];
+			$TargetPort = & $Drones['TargetPort'];
 			
 			echo $ShootingPlayer->getDisplayName();
-			if($WeaponDamage['Launched'] == 0) {
+			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']) {
+				if ($ActualDamage['TargetAlreadyDead']) {
 					?>the debris that was once <?php
 				}
 				echo $TargetPort->getDisplayName();
 				
-				if(!$ActualDamage['TargetAlreadyDead']) {
-					if($ActualDamage['TotalDamage'] == 0) {
-						if($WeaponDamage['Shield'] > 0) {
-							if($ActualDamage['HasCDs']) {
+				if (!$ActualDamage['TargetAlreadyDead']) {
+					if ($ActualDamage['TotalDamage'] == 0) {
+						if ($WeaponDamage['Shield'] > 0) {
+							if ($ActualDamage['HasCDs']) {
 								?> which prove ineffective against their combat drones<?php
 							} else {
 								?> which proves ineffective against it's armour<?php
 							}
 						}
-						if($ActualDamage['Armour'] > 0) {
+						if ($ActualDamage['Armour'] > 0) {
 							?> which is deflected by their shields<?php
 						} else {
 							?> but they cannot do any damage<?php
@@ -98,45 +98,45 @@ 
 					} 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) {
+						if ($ActualDamage['Shield'] > 0) {
 							?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 							$this->doDamageTypeReductionDisplay($DamageTypes);
 						}
-						if($ActualDamage['NumCDs'] > 0) {
+						if ($ActualDamage['NumCDs'] > 0) {
 							?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 							$this->doDamageTypeReductionDisplay($DamageTypes);
 						}
-						if($ActualDamage['Armour'] > 0) {
+						if ($ActualDamage['Armour'] > 0) {
 							?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 						}
 					}
 				}
 			} ?>.
 			<br /><?php
-			if($ActualDamage['KillingShot']) {
-				$this->includeTemplate('includes/PortKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPort'=>$TargetPort,'ShootingPlayer'=>$ShootingPlayer));
+			if ($ActualDamage['KillingShot']) {
+				$this->includeTemplate('includes/PortKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPort'=>$TargetPort, 'ShootingPlayer'=>$ShootingPlayer));
 			}
 		}
 	}
 	echo $ShootingPlayer->getDisplayName();
-	if($TotalDamage > 0) {
+	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<?php
-		if(!$TraderResults['DeadBeforeShot']) {
+		if (!$TraderResults['DeadBeforeShot']) {
 			?>. Maybe they should go back to the academy<?php
 		}
 	} ?>.<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 />
+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
 $Downgrades = $TraderTeamCombatResults['Downgrades'];
-if ($Downgrades != 0 ) {
+if ($Downgrades != 0) {
 	?>The port has lost <?php echo $Downgrades . ' ' . pluralise('level', $Downgrades); ?>.<?php
 } ?>

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

Spacing +26 added lines, -26 removed lines

@@ -1,34 +1,34 @@ 
 <?php
-if(isset($ForcesCombatResults['Results']) && is_array($ForcesCombatResults['Results'])) {
-	foreach($ForcesCombatResults['Results'] as $ForceType => $ForceResults) {
-		$ShootingWeapon =& $ForceResults['Weapon'];
-		$ShotHit =& $ForceResults['Hit'];
-		$ActualDamage =& $ForceResults['ActualDamage'];
-		$WeaponDamage =& $ForceResults['WeaponDamage'];
-		$TargetPlayer =& $ForceResults['TargetPlayer'];
+if (isset($ForcesCombatResults['Results']) && is_array($ForcesCombatResults['Results'])) {
+	foreach ($ForcesCombatResults['Results'] as $ForceType => $ForceResults) {
+		$ShootingWeapon = & $ForceResults['Weapon'];
+		$ShotHit = & $ForceResults['Hit'];
+		$ActualDamage = & $ForceResults['ActualDamage'];
+		$WeaponDamage = & $ForceResults['WeaponDamage'];
+		$TargetPlayer = & $ForceResults['TargetPlayer'];
 		?>
 		<span class="cds"><?php echo isset($ActualDamage['Launched']) ? $ActualDamage['Launched'] : $WeaponDamage['Launched']; ?></span><?php
-		if($ForceType == 'Mines') {
+		if ($ForceType == 'Mines') {
 			?> mines kamikaze themselves against <?php
-		} else if($ForceType == 'Drones') {
+		} else if ($ForceType == 'Drones') {
 			?> combat drones launch at <?php
-		} else if($ForceType == 'Scouts') {
+		} else if ($ForceType == 'Scouts') {
 			?> 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) {
+			if (!$ShotHit) {
 				?> and misses<?php
-			} else if($ActualDamage['TotalDamage'] == 0) {
-				if($WeaponDamage['Shield'] > 0) {
-					if($ActualDamage['HasCDs']) {
+			} else if ($ActualDamage['TotalDamage'] == 0) {
+				if ($WeaponDamage['Shield'] > 0) {
+					if ($ActualDamage['HasCDs']) {
 						?> which proves ineffective against their combat drones<?php
 					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				} else if($WeaponDamage['Armour'] > 0) {
+				} else if ($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
 				} else {
 					?> but it cannot do any damage<?php
@@ -37,31 +37,31 @@ 
 				?> 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) {
+			if ($ActualDamage['Shield'] > 0) {
 				?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 				$this->doDamageTypeReductionDisplay($DamageTypes);
 			}
-			if($ActualDamage['NumCDs'] > 0) {
+			if ($ActualDamage['NumCDs'] > 0) {
 				?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> drones<?php
 				$this->doDamageTypeReductionDisplay($DamageTypes);
 			}
-			if($ActualDamage['Armour'] > 0) {
+			if ($ActualDamage['Armour'] > 0) {
 				?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 			}
 		} ?>.
 		<br /><?php
 		if ($ShotHit && $ActualDamage['KillingShot']) {
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$ForceResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$ForceResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 		}
 	}
 }
-if(isset($ForcesCombatResults['ForcesDestroyed']) && $ForcesCombatResults['ForcesDestroyed']) {
+if (isset($ForcesCombatResults['ForcesDestroyed']) && $ForcesCombatResults['ForcesDestroyed']) {
 	?>Forces are <span class="red">DESTROYED!</span><br /><?php
 }
 
-$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 } ?>.
+$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 } ?>.

templates/Default/engine/Default/includes/TraderTeamCombatResults.inc

Spacing +48 added lines, -48 removed lines

@@ -1,36 +1,36 @@ 
 <?php
-if(is_array($TraderTeamCombatResults['Traders'])) {
-	foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
-		$ShootingPlayer =& $TraderResults['Player'];
-		$TotalDamage =& $TraderResults['TotalDamage'];
+if (is_array($TraderTeamCombatResults['Traders'])) {
+	foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
+		$ShootingPlayer = & $TraderResults['Player'];
+		$TotalDamage = & $TraderResults['TotalDamage'];
 	
-		if($TraderResults['DeadBeforeShot']) {
+		if ($TraderResults['DeadBeforeShot']) {
 			echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php
 		} else {
-			if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
-				foreach($TraderResults['Weapons'] as $WeaponResults) {
-					$ShootingWeapon =& $WeaponResults['Weapon'];
-					$ShotHit =& $WeaponResults['Hit'];
-					$ActualDamage =& $WeaponResults['ActualDamage'];
-					$WeaponDamage =& $WeaponResults['WeaponDamage'];
-					$TargetPlayer =& $WeaponResults['TargetPlayer'];
+			if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
+				foreach ($TraderResults['Weapons'] as $WeaponResults) {
+					$ShootingWeapon = & $WeaponResults['Weapon'];
+					$ShotHit = & $WeaponResults['Hit'];
+					$ActualDamage = & $WeaponResults['ActualDamage'];
+					$WeaponDamage = & $WeaponResults['WeaponDamage'];
+					$TargetPlayer = & $WeaponResults['TargetPlayer'];
 					
 					echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php
-					if($ShotHit && $ActualDamage['TargetAlreadyDead']) {
+					if ($ShotHit && $ActualDamage['TargetAlreadyDead']) {
 						?>the debris that was once <?php
 					}
 					echo $TargetPlayer->getDisplayName();
 					if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
-						if(!$ShotHit) {
+						if (!$ShotHit) {
 							?> and misses<?php
-						} else if($ActualDamage['TotalDamage'] == 0) {
-							if($WeaponDamage['Shield'] > 0) {
-								if($ActualDamage['HasCDs']) {
+						} else if ($ActualDamage['TotalDamage'] == 0) {
+							if ($WeaponDamage['Shield'] > 0) {
+								if ($ActualDamage['HasCDs']) {
 									?> which proves ineffective against their combat drones<?php
 								} else {
 									?> which washes harmlessly over their hull<?php
 								}
-							} else if($WeaponDamage['Armour'] > 0) {
+							} else if ($WeaponDamage['Armour'] > 0) {
 								?> which is deflected by their shields<?php
 							} else {
 								?> but it cannot do any damage<?php
@@ -38,94 +38,94 @@ 
 						} 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) {
+							if ($ActualDamage['Shield'] > 0) {
 								?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumCDs'] > 0) {
+							if ($ActualDamage['NumCDs'] > 0) {
 								?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['Armour'] > 0) {
+							if ($ActualDamage['Armour'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 							}
 						}
 					} ?>.
 					<br /><?php
 					if ($ShotHit && $ActualDamage['KillingShot']) {
-						$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer));
+						$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
 					}
 				}
 			}
-			if(isset($TraderResults['Drones'])) {
-				$Drones =& $TraderResults['Drones'];
-				$ActualDamage =& $Drones['ActualDamage'];
-				$WeaponDamage =& $Drones['WeaponDamage'];
-				$TargetPlayer =& $Drones['TargetPlayer'];
+			if (isset($TraderResults['Drones'])) {
+				$Drones = & $TraderResults['Drones'];
+				$ActualDamage = & $Drones['ActualDamage'];
+				$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 $ShootingPlayer->getDisplayName();
-				if($WeaponDamage['Launched'] == 0) {
+				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']) {
+					if ($ActualDamage['TargetAlreadyDead']) {
 						?>the debris that was once <?php
 					}
 					echo $TargetPlayer->getDisplayName();
-					if(!$ActualDamage['TargetAlreadyDead']) {
-						if($ActualDamage['TotalDamage'] == 0) {
-							if($WeaponDamage['Shield'] > 0) {
-								if($ActualDamage['HasCDs']) {
+					if (!$ActualDamage['TargetAlreadyDead']) {
+						if ($ActualDamage['TotalDamage'] == 0) {
+							if ($WeaponDamage['Shield'] > 0) {
+								if ($ActualDamage['HasCDs']) {
 									?> which prove ineffective against their combat drones<?php
 								} else {
 									?> which washes harmlessly over their hull<?php
 								}
 							}
-							if($ActualDamage['Armour'] > 0) {
+							if ($ActualDamage['Armour'] > 0) {
 								?> which is deflected by their shields<?php
 							} else {
 								?> but they cannot do any damage<?php
 							}
 						} else {
 							?> destroying <?php
-							if($ActualDamage['Shield'] > 0) {
+							if ($ActualDamage['Shield'] > 0) {
 								?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumCDs'] > 0) {
+							if ($ActualDamage['NumCDs'] > 0) {
 								?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['Armour'] > 0) {
+							if ($ActualDamage['Armour'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 							}
 						}
 					}
 				} ?>.
 				<br /><?php
-				if($ActualDamage['KillingShot']) {
-					$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer));
+				if ($ActualDamage['KillingShot']) {
+					$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
 				}
 			}
 		}
 		echo $ShootingPlayer->getDisplayName();
-		if($TotalDamage > 0) {
+		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.<?php
-			if(!$TraderResults['DeadBeforeShot']) {
+			if (!$TraderResults['DeadBeforeShot']) {
 				?> Maybe they should go back to the academy<?php
 			}
 		} ?>.<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 />
+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 />

engine/Default/cargo_dump_processing.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 	// Don't lose more exp than you have
 	$lost_xp = min($player->getExperience(),
-	               IRound(SmrPort::getBaseExperience($amount, $good_distance)));
+				   IRound(SmrPort::getBaseExperience($amount, $good_distance)));
 	$player->decreaseExperience($lost_xp);
 	$player->increaseHOF($lost_xp, array('Trade', 'Experience', 'Jettisoned'), HOF_PUBLIC);
 

lib/Default/SmrMines.class.php

Spacing +4 added lines, -4 removed lines

@@ -94,7 +94,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		if ($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships 
 			$damage['MaxDamage'] = IRound($damage['MaxDamage'] * self::FED_SHIP_DAMAGE_MODIFIER);
 			$damage['Shield'] = IRound($damage['Shield'] * self::FED_SHIP_DAMAGE_MODIFIER);
@@ -131,12 +131,12 @@ 
 	}
 	
 	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
 		$return['ActualDamage']['Launched'] = ICeil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		}
 		return $return;
 	}

lib/Default/SmrScoutDrones.class.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfSDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces, $targetPlayer) / 100);
 		$damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ICeil($damage['Launched'] * $damage['Shield']);

admin/Default/1.6/check_map.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	}
 }
 $missingLocs = array_diff(array_keys(SmrLocation::getAllLocations()),
-                          array_keys($existingLocs));
+						  array_keys($existingLocs));
 $missingLocNames = [];
 foreach ($missingLocs as $locID) {
 	$missingLocNames[] = SmrLocation::getLocation($locID)->getName();

engine/Default/shop_hardware_processing.php

Braces +11 added lines, -7 removed lines

@@ -32,11 +32,16 @@ 
 	$ship->increaseHardware($hardware_id, $amount);
 
 	//HoF
-	if ($hardware_id == HARDWARE_COMBAT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_SCOUT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_MINE) $player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
-}
-else if ($action == 'Sell') {
+	if ($hardware_id == HARDWARE_COMBAT) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
+	}
+	if ($hardware_id == HARDWARE_SCOUT) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
+	}
+	if ($hardware_id == HARDWARE_MINE) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
+	}
+	} else if ($action == 'Sell') {
 	// We only allow selling combat drones
 	if ($hardware_id != HARDWARE_COMBAT) {
 		throw new Exception('This item cannot be sold!');
@@ -49,8 +54,7 @@ 
 
 	$player->increaseCredits(IRound($cost * CDS_REFUND_PERCENT) * $amount);
 	$ship->decreaseCDs($amount, true); // 2nd arg avoids under attack warning
-}
-else {
+} else {
 	throw new Exception('Action must be either Buy or Sell.');
 }
 

lib/Default/AbstractSmrCombatWeapon.class.php

Spacing +29 added lines, -29 removed lines

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