View GitHub Repository smr

Schedule Inspection
Subscribe

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

Passed
Pull Request — master (#1006)
by Dan
15:04
created
Status
Category
Toggle Patches
src/templates/Default/engine/Default/includes/PlanetCombatResults.inc.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -20,7 +20,7 @@  discard block
 
 block discarded – undo
20 20 
 		}
21 21 
 		$TargetPlayer = $WeaponResults['TargetPlayer'];
22 22
23 
-		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 
+		echo $CombatPlanet->getCombatName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
24 24 
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
25 25 
 			if (!$ShotHit) {
26 26 
 				?> and misses<?php
 
@@ -39,9 +39,9 @@  discard block
 
 block discarded – undo
39 39 
 			} else {
40 40 
 				?> destroying <?php
41 41 
 				$DamageTypes = 0;
42 
-				if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
43 
-				if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
44 
-				if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
42 
+				if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
43 
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
44 
+				if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
45 45
46 46 
 				if ($ActualDamage['Shield'] > 0) {
47 47 
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
 
@@ -58,7 +58,7 @@  discard block
 
 block discarded – undo
58 58 
 		} ?>.
59 59 
 		<br /><?php
60 60 
 		if ($ShotHit && $ActualDamage['KillingShot']) {
61 
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
61 
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
62 62 
 		}
63 63 
 	}
64 64 
 }
 
@@ -68,15 +68,15 @@  discard block
 
 block discarded – undo
68 68 
 	$WeaponDamage = $Drones['WeaponDamage'];
69 69 
 	$TargetPlayer = $Drones['TargetPlayer'];
70 70 
 	$DamageTypes = 0;
71 
-	if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
72 
-	if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
73 
-	if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
71 
+	if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
72 
+	if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
73 
+	if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
74 74
75 75 
 	echo $CombatPlanet->getCombatName();
76 76 
 	if ($WeaponDamage['Launched'] == 0) {
77 77 
 		?> fails to launch it's combat drones<?php
78 78 
 	} else {
79 
-		?> 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();
79 
+		?> 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();
80 80 
 		if (!$ActualDamage['TargetAlreadyDead']) {
81 81 
 			if ($ActualDamage['TotalDamage'] == 0) {
82 82 
 				if ($WeaponDamage['Shield'] > 0) {
 
@@ -108,7 +108,7 @@  discard block
 
 block discarded – undo
108 108 
 	} ?>.
109 109 
 	<br /><?php
110 110 
 	if ($ActualDamage['KillingShot']) {
111 
-		$this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer));
111 
+		$this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer));
112 112 
 	}
113 113 
 }
114 114
Please login to merge, or discard this patch.
templates/Default/engine/Default/includes/TraderTeamCombatResults.inc.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -40,9 +40,9 @@  discard block
 
 block discarded – undo
40 40 
 						} else {
41 41 
 							?> destroying <?php
42 42 
 							$DamageTypes = 0;
43 
-							if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
44 
-							if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
45 
-							if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
43 
+							if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
44 
+							if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
45 
+							if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
46 46
47 47 
 							if ($ActualDamage['Shield'] > 0) {
48 48 
 								?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59 
 					} ?>.
60 60 
 					<br /><?php
61 61 
 					if ($ShotHit && $ActualDamage['KillingShot']) {
62 
-						$this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer));
62 
+						$this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
63 63 
 					}
64 64 
 				}
65 65 
 			}
 
@@ -69,9 +69,9 @@  discard block
 
 block discarded – undo
69 69 
 				$WeaponDamage = $Drones['WeaponDamage'];
70 70 
 				$TargetPlayer = $Drones['TargetPlayer'];
71 71 
 				$DamageTypes = 0;
72 
-				if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
73 
-				if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
74 
-				if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
72 
+				if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
73 
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
74 
+				if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
75 75
76 76 
 				echo $ShootingPlayer->getDisplayName();
77 77 
 				if ($WeaponDamage['Launched'] == 0) {
 
@@ -114,7 +114,7 @@  discard block
 
 block discarded – undo
114 114 
 				} ?>.
115 115 
 				<br /><?php
116 116 
 				if ($ActualDamage['KillingShot']) {
117 
-					$this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer));
117 
+					$this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
118 118 
 				}
119 119 
 			}
120 120 
 		}
 
@@ -130,4 +130,4 @@  discard block
 
 block discarded – undo
130 130 
 	}
131 131 
 }
132 132 
 $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?>
133 
-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 />
133 
+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 />
Please login to merge, or discard this patch.