Scrutinizer GitHub App not installed

We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.

Install GitHub App

Completed
Push — master ( 42cc88...1adc02 )
by Dan
19s queued 16s
created
templates/Default/engine/Default/includes/PlanetCombatResults.inc 2 patches
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $CombatPlanet = $PlanetCombatResults['Planet'];
3 3
 $TotalDamage = $PlanetCombatResults['TotalDamage'];
4
-if($MinimalDisplay) {
4
+if ($MinimalDisplay) {
5 5
 	echo $CombatPlanet->getCombatName();
6
-	if($TotalDamage > 0) {
6
+	if ($TotalDamage > 0) {
7 7
 		?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat of which <span class="red"><?php echo $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
8 8
 	}
9 9
 	else {
@@ -11,29 +11,29 @@  discard block
 block discarded – undo
11 11
 	} ?>. <?php echo $AttackLogLink;
12 12
 	return;
13 13
 }
14
-if(isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
15
-	foreach($PlanetCombatResults['Weapons'] as $WeaponResults) {
16
-		$ShootingWeapon =& $WeaponResults['Weapon'];
17
-		$ShotHit =& $WeaponResults['Hit'];
18
-		$ActualDamage =& $WeaponResults['ActualDamage'];
19
-		$WeaponDamage =& $WeaponResults['WeaponDamage'];
20
-		$TargetPlayer =& $WeaponResults['TargetPlayer'];
14
+if (isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
15
+	foreach ($PlanetCombatResults['Weapons'] as $WeaponResults) {
16
+		$ShootingWeapon = & $WeaponResults['Weapon'];
17
+		$ShotHit = & $WeaponResults['Hit'];
18
+		$ActualDamage = & $WeaponResults['ActualDamage'];
19
+		$WeaponDamage = & $WeaponResults['WeaponDamage'];
20
+		$TargetPlayer = & $WeaponResults['TargetPlayer'];
21 21
 		
22
-		echo $CombatPlanet->getCombatName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
22
+		echo $CombatPlanet->getCombatName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
23 23
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
24
-			if(!$ShotHit) {
24
+			if (!$ShotHit) {
25 25
 				?> and misses<?php
26 26
 			}
27
-			else if($ActualDamage['TotalDamage'] == 0) {
28
-				if($WeaponDamage['Shield'] > 0) {
29
-					if($ActualDamage['HasCDs']) {
27
+			else if ($ActualDamage['TotalDamage'] == 0) {
28
+				if ($WeaponDamage['Shield'] > 0) {
29
+					if ($ActualDamage['HasCDs']) {
30 30
 						?> which proves ineffective against their combat drones<?php
31 31
 					}
32 32
 					else {
33 33
 						?> which washes harmlessly over their hull<?php
34 34
 					}
35 35
 				}
36
-				else if($WeaponDamage['Armour'] > 0) {
36
+				else if ($WeaponDamage['Armour'] > 0) {
37 37
 					?> which is deflected by their shields<?php
38 38
 				}
39 39
 				else {
@@ -43,56 +43,56 @@  discard block
 block discarded – undo
43 43
 			else {
44 44
 				?> destroying <?php
45 45
 				$DamageTypes = 0;
46
-				if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
47
-				if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
48
-				if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
46
+				if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
47
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
48
+				if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
49 49
 
50
-				if($ActualDamage['Shield'] > 0) {
50
+				if ($ActualDamage['Shield'] > 0) {
51 51
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
52 52
 					$this->doDamageTypeReductionDisplay($DamageTypes);
53 53
 				}
54
-				if($ActualDamage['NumCDs'] > 0) {
54
+				if ($ActualDamage['NumCDs'] > 0) {
55 55
 					?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']); ?></span> combat drones<?php
56 56
 					$this->doDamageTypeReductionDisplay($DamageTypes);
57 57
 				}
58
-				if($ActualDamage['Armour'] > 0) {
58
+				if ($ActualDamage['Armour'] > 0) {
59 59
 					?><span class="red"><?php echo number_format($ActualDamage['Armour']); ?></span> plates of armour<?php
60 60
 				}
61 61
 			}
62 62
 		} ?>.
63 63
 		<br /><?php
64 64
 		if ($ShotHit && $ActualDamage['KillingShot']) {
65
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
65
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
66 66
 		}
67 67
 	}
68 68
 }
69
-if(isset($PlanetCombatResults['Drones'])) {
70
-	$Drones =& $PlanetCombatResults['Drones'];
71
-	$ActualDamage =& $Drones['ActualDamage'];
72
-	$WeaponDamage =& $Drones['WeaponDamage'];
73
-	$TargetPlayer =& $Drones['TargetPlayer'];
69
+if (isset($PlanetCombatResults['Drones'])) {
70
+	$Drones = & $PlanetCombatResults['Drones'];
71
+	$ActualDamage = & $Drones['ActualDamage'];
72
+	$WeaponDamage = & $Drones['WeaponDamage'];
73
+	$TargetPlayer = & $Drones['TargetPlayer'];
74 74
 	$DamageTypes = 0;
75
-	if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
76
-	if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
77
-	if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
75
+	if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
76
+	if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
77
+	if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
78 78
 	
79 79
 	echo $CombatPlanet->getCombatName();
80
-	if($WeaponDamage['Launched'] == 0) {
80
+	if ($WeaponDamage['Launched'] == 0) {
81 81
 		?> fails to launch it's combat drones<?php
82 82
 	}
83 83
 	else {
84
-		?> 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();
85
-		if(!$ActualDamage['TargetAlreadyDead']) {
86
-			if($ActualDamage['TotalDamage'] == 0) {
87
-				if($WeaponDamage['Shield'] > 0) {
88
-					if($ActualDamage['HasCDs']) {
84
+		?> 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();
85
+		if (!$ActualDamage['TargetAlreadyDead']) {
86
+			if ($ActualDamage['TotalDamage'] == 0) {
87
+				if ($WeaponDamage['Shield'] > 0) {
88
+					if ($ActualDamage['HasCDs']) {
89 89
 						?> which prove ineffective against their combat drones<?php
90 90
 					}
91 91
 					else {
92 92
 						?> which washes harmlessly over their hull<?php
93 93
 					}
94 94
 				}
95
-				else if($WeaponDamage['Armour'] > 0) {
95
+				else if ($WeaponDamage['Armour'] > 0) {
96 96
 					?> which is deflected by their shields<?php
97 97
 				}
98 98
 				else {
@@ -101,28 +101,28 @@  discard block
 block discarded – undo
101 101
 			}
102 102
 			else {
103 103
 				?> destroying <?php
104
-				if($ActualDamage['Shield'] > 0) {
104
+				if ($ActualDamage['Shield'] > 0) {
105 105
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
106 106
 					$this->doDamageTypeReductionDisplay($DamageTypes);
107 107
 				}
108
-				if($ActualDamage['NumCDs'] > 0) {
108
+				if ($ActualDamage['NumCDs'] > 0) {
109 109
 					?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']); ?></span> combat drones<?php
110 110
 					$this->doDamageTypeReductionDisplay($DamageTypes);
111 111
 				}
112
-				if($ActualDamage['Armour'] > 0) {
112
+				if ($ActualDamage['Armour'] > 0) {
113 113
 					?><span class="red"><?php echo number_format($ActualDamage['Armour']); ?></span> plates of armour<?php
114 114
 				}
115 115
 			}
116 116
 		}
117 117
 	} ?>.
118 118
 	<br /><?php
119
-	if($ActualDamage['KillingShot']) {
120
-		$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer));
119
+	if ($ActualDamage['KillingShot']) {
120
+		$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer));
121 121
 	}
122 122
 }
123 123
 
124 124
 echo $CombatPlanet->getCombatName();
125
-if($TotalDamage > 0) {
125
+if ($TotalDamage > 0) {
126 126
 	?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat<?php
127 127
 }
128 128
 else {
Please login to merge, or discard this patch.
Braces   +12 added lines, -24 removed lines patch added patch discarded remove patch
@@ -5,8 +5,7 @@  discard block
 block discarded – undo
5 5
 	echo $CombatPlanet->getCombatName();
6 6
 	if($TotalDamage > 0) {
7 7
 		?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat of which <span class="red"><?php echo $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
8
-	}
9
-	else {
8
+	} else {
10 9
 		?> does no damage this round<?php
11 10
 	} ?>. <?php echo $AttackLogLink;
12 11
 	return;
@@ -23,24 +22,19 @@  discard block
 block discarded – undo
23 22
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
24 23
 			if(!$ShotHit) {
25 24
 				?> and misses<?php
26
-			}
27
-			else if($ActualDamage['TotalDamage'] == 0) {
25
+			} else if($ActualDamage['TotalDamage'] == 0) {
28 26
 				if($WeaponDamage['Shield'] > 0) {
29 27
 					if($ActualDamage['HasCDs']) {
30 28
 						?> which proves ineffective against their combat drones<?php
31
-					}
32
-					else {
29
+					} else {
33 30
 						?> which washes harmlessly over their hull<?php
34 31
 					}
35
-				}
36
-				else if($WeaponDamage['Armour'] > 0) {
32
+				} else if($WeaponDamage['Armour'] > 0) {
37 33
 					?> which is deflected by their shields<?php
38
-				}
39
-				else {
34
+				} else {
40 35
 					?> but it cannot do any damage<?php
41 36
 				}
42
-			}
43
-			else {
37
+			} else {
44 38
 				?> destroying <?php
45 39
 				$DamageTypes = 0;
46 40
 				if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
@@ -79,27 +73,22 @@  discard block
 block discarded – undo
79 73
 	echo $CombatPlanet->getCombatName();
80 74
 	if($WeaponDamage['Launched'] == 0) {
81 75
 		?> fails to launch it's combat drones<?php
82
-	}
83
-	else {
76
+	} else {
84 77
 		?> 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();
85 78
 		if(!$ActualDamage['TargetAlreadyDead']) {
86 79
 			if($ActualDamage['TotalDamage'] == 0) {
87 80
 				if($WeaponDamage['Shield'] > 0) {
88 81
 					if($ActualDamage['HasCDs']) {
89 82
 						?> which prove ineffective against their combat drones<?php
90
-					}
91
-					else {
83
+					} else {
92 84
 						?> which washes harmlessly over their hull<?php
93 85
 					}
94
-				}
95
-				else if($WeaponDamage['Armour'] > 0) {
86
+				} else if($WeaponDamage['Armour'] > 0) {
96 87
 					?> which is deflected by their shields<?php
97
-				}
98
-				else {
88
+				} else {
99 89
 					?> but they cannot do any damage<?php
100 90
 				}
101
-			}
102
-			else {
91
+			} else {
103 92
 				?> destroying <?php
104 93
 				if($ActualDamage['Shield'] > 0) {
105 94
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
@@ -124,7 +113,6 @@  discard block
 block discarded – undo
124 113
 echo $CombatPlanet->getCombatName();
125 114
 if($TotalDamage > 0) {
126 115
 	?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat<?php
127
-}
128
-else {
116
+} else {
129 117
 	?> does no damage this round. You call that a planet? It needs a better builder<?php
130 118
 } ?>.
Please login to merge, or discard this patch.
templates/Default/engine/Default/includes/PlanetTraderTeamCombatResults.inc 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <?php
2
-foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
3
-	$ShootingPlayer =& $TraderResults['Player'];
4
-	$TotalDamage =& $TraderResults['TotalDamage'];
5
-	if($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
2
+foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
3
+	$ShootingPlayer = & $TraderResults['Player'];
4
+	$TotalDamage = & $TraderResults['TotalDamage'];
5
+	if ($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
6 6
 		echo $ShootingPlayer->getDisplayName();
7
-		if($TotalDamage > 0) {
7
+		if ($TotalDamage > 0) {
8 8
 			?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
9 9
 		} else {
10 10
 			?> does no damage this round<?php
@@ -12,29 +12,29 @@  discard block
 block discarded – undo
12 12
 		continue;
13 13
 	}
14 14
 
15
-	if($TraderResults['DeadBeforeShot']) {
15
+	if ($TraderResults['DeadBeforeShot']) {
16 16
 		echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php
17 17
 	} else {
18
-		if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
19
-			foreach($TraderResults['Weapons'] as $WeaponResults) {
20
-				$ShootingWeapon =& $WeaponResults['Weapon'];
21
-				$ShotHit =& $WeaponResults['Hit'];
22
-				$ActualDamage =& $WeaponResults['ActualDamage'];
23
-				$WeaponDamage =& $WeaponResults['WeaponDamage'];
24
-				$TargetPlanet =& $WeaponResults['TargetPlanet'];
18
+		if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
19
+			foreach ($TraderResults['Weapons'] as $WeaponResults) {
20
+				$ShootingWeapon = & $WeaponResults['Weapon'];
21
+				$ShotHit = & $WeaponResults['Hit'];
22
+				$ActualDamage = & $WeaponResults['ActualDamage'];
23
+				$WeaponDamage = & $WeaponResults['WeaponDamage'];
24
+				$TargetPlanet = & $WeaponResults['TargetPlanet'];
25 25
 				
26
-				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlanet->getCombatName();
26
+				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlanet->getCombatName();
27 27
 				if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
28
-					if(!$ShotHit) {
28
+					if (!$ShotHit) {
29 29
 						?> and misses<?php
30
-					} else if($ActualDamage['TotalDamage'] == 0) {
31
-						if($WeaponDamage['Shield'] > 0) {
32
-							if($ActualDamage['HasCDs']) {
30
+					} else if ($ActualDamage['TotalDamage'] == 0) {
31
+						if ($WeaponDamage['Shield'] > 0) {
32
+							if ($ActualDamage['HasCDs']) {
33 33
 								?> which proves ineffective against their combat drones<?php
34 34
 							} else {
35 35
 								?> which washes harmlessly over their hull<?php
36 36
 							}
37
-						} else if($WeaponDamage['Armour'] > 0) {
37
+						} else if ($WeaponDamage['Armour'] > 0) {
38 38
 							?> which is deflected by their shields<?php
39 39
 						} else {
40 40
 							?> but it cannot do any damage<?php
@@ -42,96 +42,96 @@  discard block
 block discarded – undo
42 42
 					} else {
43 43
 						?> destroying <?php
44 44
 						$DamageTypes = 0;
45
-						if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
46
-						if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
47
-						if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
45
+						if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
46
+						if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
47
+						if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
48 48
 
49
-						if($ActualDamage['Shield'] > 0) {
49
+						if ($ActualDamage['Shield'] > 0) {
50 50
 							?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
51 51
 							$this->doDamageTypeReductionDisplay($DamageTypes);
52 52
 						}
53
-						if($ActualDamage['NumCDs'] > 0) {
53
+						if ($ActualDamage['NumCDs'] > 0) {
54 54
 							?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
55 55
 							$this->doDamageTypeReductionDisplay($DamageTypes);
56 56
 						}
57
-						if($ActualDamage['Armour'] > 0) {
57
+						if ($ActualDamage['Armour'] > 0) {
58 58
 							?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
59 59
 						}
60 60
 					}
61 61
 				} ?>.
62 62
 				<br /><?php
63 63
 				if ($ShotHit && $ActualDamage['KillingShot']) {
64
-					$this->includeTemplate('includes/PlanetKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlanet'=>$TargetPlanet));
64
+					$this->includeTemplate('includes/PlanetKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlanet'=>$TargetPlanet));
65 65
 				}
66 66
 			}
67 67
 		}
68
-		if(isset($TraderResults['Drones'])) {
69
-			$Drones =& $TraderResults['Drones'];
70
-			$ActualDamage =& $Drones['ActualDamage'];
71
-			$WeaponDamage =& $Drones['WeaponDamage'];
72
-			$TargetPlanet =& $Drones['TargetPlanet'];
68
+		if (isset($TraderResults['Drones'])) {
69
+			$Drones = & $TraderResults['Drones'];
70
+			$ActualDamage = & $Drones['ActualDamage'];
71
+			$WeaponDamage = & $Drones['WeaponDamage'];
72
+			$TargetPlanet = & $Drones['TargetPlanet'];
73 73
 			$DamageTypes = 0;
74
-			if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
75
-			if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
76
-			if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
74
+			if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
75
+			if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
76
+			if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
77 77
 
78 78
 			echo $ShootingPlayer->getDisplayName();
79
-			if($WeaponDamage['Launched'] == 0) {
79
+			if ($WeaponDamage['Launched'] == 0) {
80 80
 				?> fails to launch their combat drones<?php
81 81
 			} else {
82 82
 				?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php
83
-				if($ActualDamage['TargetAlreadyDead']) {
83
+				if ($ActualDamage['TargetAlreadyDead']) {
84 84
 					?>the debris that was once <?php
85 85
 				}
86 86
 				echo $TargetPlanet->getCombatName();
87
-				if(!$ActualDamage['TargetAlreadyDead']) {
88
-					if($ActualDamage['TotalDamage'] == 0) {
89
-						if($WeaponDamage['Shield'] > 0) {
90
-							if($ActualDamage['HasCDs']) {
87
+				if (!$ActualDamage['TargetAlreadyDead']) {
88
+					if ($ActualDamage['TotalDamage'] == 0) {
89
+						if ($WeaponDamage['Shield'] > 0) {
90
+							if ($ActualDamage['HasCDs']) {
91 91
 								?> which prove ineffective against their combat drones<?php
92 92
 							} else {
93 93
 								?> which washes harmlessly over their hull<?php
94 94
 							}
95 95
 						}
96
-						if($ActualDamage['Armour'] > 0) {
96
+						if ($ActualDamage['Armour'] > 0) {
97 97
 							?> which is deflected by their shields<?php
98 98
 						} else {
99 99
 							?> but they cannot do any damage<?php
100 100
 						}
101 101
 					} else {
102 102
 						?> destroying <?php
103
-						if($ActualDamage['Shield'] > 0) {
103
+						if ($ActualDamage['Shield'] > 0) {
104 104
 							?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
105 105
 							$this->doDamageTypeReductionDisplay($DamageTypes);
106 106
 						}
107
-						if($ActualDamage['NumCDs'] > 0) {
107
+						if ($ActualDamage['NumCDs'] > 0) {
108 108
 							?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
109 109
 							$this->doDamageTypeReductionDisplay($DamageTypes);
110 110
 						}
111
-						if($ActualDamage['Armour'] > 0) {
111
+						if ($ActualDamage['Armour'] > 0) {
112 112
 							?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
113 113
 						}
114 114
 					}
115 115
 				}
116 116
 			} ?>.
117 117
 			<br /><?php
118
-			if($ActualDamage['KillingShot']) {
119
-				$this->includeTemplate('includes/PlanetKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlanet'=>$TargetPlanet));
118
+			if ($ActualDamage['KillingShot']) {
119
+				$this->includeTemplate('includes/PlanetKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlanet'=>$TargetPlanet));
120 120
 			}
121 121
 		}
122 122
 	}
123 123
 	echo $ShootingPlayer->getDisplayName();
124
-	if($TotalDamage > 0) {
124
+	if ($TotalDamage > 0) {
125 125
 		?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
126 126
 	} else {
127 127
 		?> does no damage this round<?php
128
-		if(!$TraderResults['DeadBeforeShot']) {
128
+		if (!$TraderResults['DeadBeforeShot']) {
129 129
 			?>. Maybe they should go back to the academy<?php
130 130
 		}
131 131
 	} ?>.<br /><br /><?php
132 132
 }
133 133
 $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?>
134
-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
134
+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
135 135
 foreach ($TraderTeamCombatResults['Downgrades'] as $structureID => $numDestroyed) { ?>
136 136
 	This team destroys <span class="red"><?php echo $numDestroyed; ?> </span><?php echo pluralise($TargetPlanet->getStructureTypes($structureID)->name(), $numDestroyed); ?>.<br /><?php
137 137
 } ?>
Please login to merge, or discard this patch.