smrealms /
smr
We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -1,30 +1,30 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -$CombatPort =& $PortCombatResults['Port']; |
|
| 2 | +$CombatPort = & $PortCombatResults['Port']; |
|
| 3 | 3 | $TotalDamage = $PortCombatResults['TotalDamage']; |
| 4 | -if($MinimalDisplay) { |
|
| 4 | +if ($MinimalDisplay) { |
|
| 5 | 5 | echo $CombatPort->getDisplayName(); |
| 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 $PortCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php |
| 8 | 8 | } else { |
| 9 | 9 | ?> does no damage this round<?php |
| 10 | 10 | } ?>. <?php echo $AttackLogLink; |
| 11 | 11 | return; |
| 12 | 12 | } |
| 13 | -if(isset($PortCombatResults['Weapons']) && is_array($PortCombatResults['Weapons'])) { |
|
| 14 | - foreach($PortCombatResults['Weapons'] as $WeaponResults) { |
|
| 15 | - $ShootingWeapon =& $WeaponResults['Weapon']; |
|
| 16 | - $ShotHit =& $WeaponResults['Hit']; |
|
| 17 | - $ActualDamage =& $WeaponResults['ActualDamage']; |
|
| 18 | - $WeaponDamage =& $WeaponResults['WeaponDamage']; |
|
| 19 | - $TargetPlayer =& $WeaponResults['TargetPlayer']; |
|
| 13 | +if (isset($PortCombatResults['Weapons']) && is_array($PortCombatResults['Weapons'])) { |
|
| 14 | + foreach ($PortCombatResults['Weapons'] as $WeaponResults) { |
|
| 15 | + $ShootingWeapon = & $WeaponResults['Weapon']; |
|
| 16 | + $ShotHit = & $WeaponResults['Hit']; |
|
| 17 | + $ActualDamage = & $WeaponResults['ActualDamage']; |
|
| 18 | + $WeaponDamage = & $WeaponResults['WeaponDamage']; |
|
| 19 | + $TargetPlayer = & $WeaponResults['TargetPlayer']; |
|
| 20 | 20 | |
| 21 | - echo $CombatPort->getDisplayName() ?> fires an <?php echo $ShootingWeapon->getName() ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName(); |
|
| 21 | + echo $CombatPort->getDisplayName() ?> fires an <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName(); |
|
| 22 | 22 | if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) { |
| 23 | - if(!$ShotHit) { |
|
| 23 | + if (!$ShotHit) { |
|
| 24 | 24 | ?> and misses<?php |
| 25 | 25 | } elseif ($ActualDamage['TotalDamage'] == 0) { |
| 26 | - if($WeaponDamage['Shield'] > 0) { |
|
| 27 | - if($ActualDamage['HasCDs']) { |
|
| 26 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 27 | + if ($ActualDamage['HasCDs']) { |
|
| 28 | 28 | ?> which proves ineffective against their combat drones<?php |
| 29 | 29 | } else { |
| 30 | 30 | ?> which washes harmlessly over their hull<?php |
@@ -37,44 +37,44 @@ discard block |
||
| 37 | 37 | } else { |
| 38 | 38 | ?> destroying <?php |
| 39 | 39 | $DamageTypes = 0; |
| 40 | - if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 41 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 42 | - if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 40 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 41 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 42 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 43 | 43 | |
| 44 | - if($ActualDamage['Shield'] > 0) { |
|
| 44 | + if ($ActualDamage['Shield'] > 0) { |
|
| 45 | 45 | ?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php |
| 46 | 46 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 47 | 47 | } |
| 48 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 48 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 49 | 49 | ?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php |
| 50 | 50 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 51 | 51 | } |
| 52 | - if($ActualDamage['Armour'] > 0) { |
|
| 52 | + if ($ActualDamage['Armour'] > 0) { |
|
| 53 | 53 | ?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php |
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | } ?>. |
| 57 | 57 | <br /><?php |
| 58 | 58 | if ($ShotHit && $ActualDamage['KillingShot']) { |
| 59 | - $this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer)); |
|
| 59 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer)); |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | -if(isset($PortCombatResults['Drones'])) { |
|
| 64 | - $Drones =& $PortCombatResults['Drones']; |
|
| 65 | - $ActualDamage =& $Drones['ActualDamage']; |
|
| 66 | - $WeaponDamage =& $Drones['WeaponDamage']; |
|
| 67 | - $TargetPlayer =& $Drones['TargetPlayer']; |
|
| 63 | +if (isset($PortCombatResults['Drones'])) { |
|
| 64 | + $Drones = & $PortCombatResults['Drones']; |
|
| 65 | + $ActualDamage = & $Drones['ActualDamage']; |
|
| 66 | + $WeaponDamage = & $Drones['WeaponDamage']; |
|
| 67 | + $TargetPlayer = & $Drones['TargetPlayer']; |
|
| 68 | 68 | |
| 69 | 69 | echo $CombatPort->getDisplayName(); |
| 70 | - if($WeaponDamage['Launched'] == 0) { |
|
| 70 | + if ($WeaponDamage['Launched'] == 0) { |
|
| 71 | 71 | ?> fails to launch it's combat drones<?php |
| 72 | 72 | } else { |
| 73 | - ?> 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(); |
|
| 74 | - if(!$ActualDamage['TargetAlreadyDead']) { |
|
| 75 | - if($ActualDamage['TotalDamage'] == 0) { |
|
| 76 | - if($WeaponDamage['Shield'] > 0) { |
|
| 77 | - if($ActualDamage['HasCDs']) { |
|
| 73 | + ?> 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(); |
|
| 74 | + if (!$ActualDamage['TargetAlreadyDead']) { |
|
| 75 | + if ($ActualDamage['TotalDamage'] == 0) { |
|
| 76 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 77 | + if ($ActualDamage['HasCDs']) { |
|
| 78 | 78 | ?> which prove ineffective against their combat drones<?php |
| 79 | 79 | } else { |
| 80 | 80 | ?> which washes harmlessly over their hull<?php |
@@ -1,10 +1,10 @@ discard block |
||
| 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,24 +12,24 @@ discard block |
||
| 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 | - $TargetPort =& $WeaponResults['TargetPort']; |
|
| 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 | + $TargetPort = & $WeaponResults['TargetPort']; |
|
| 25 | 25 | |
| 26 | - echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?>the remnants of <?php } echo $TargetPort->getDisplayName(); |
|
| 26 | + echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?>the remnants of <?php } echo $TargetPort->getDisplayName(); |
|
| 27 | 27 | if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) { |
| 28 | - if(!$ShotHit) { |
|
| 28 | + if (!$ShotHit) { |
|
| 29 | 29 | ?> and misses every critical system<?php |
| 30 | 30 | } elseif ($ActualDamage['TotalDamage'] == 0) { |
| 31 | - if($WeaponDamage['Shield'] > 0) { |
|
| 32 | - if($ActualDamage['HasCDs']) { |
|
| 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 proves ineffective against it's armour<?php |
@@ -42,55 +42,55 @@ discard block |
||
| 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/PortKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPort'=>$TargetPort,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 64 | + $this->includeTemplate('includes/PortKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPort'=>$TargetPort, 'ShootingPlayer'=>$ShootingPlayer)); |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | - if(isset($TraderResults['Drones'])) { |
|
| 69 | - $Drones =& $TraderResults['Drones']; |
|
| 70 | - $ActualDamage =& $Drones['ActualDamage']; |
|
| 71 | - $WeaponDamage =& $Drones['WeaponDamage']; |
|
| 72 | - $TargetPort =& $Drones['TargetPort']; |
|
| 68 | + if (isset($TraderResults['Drones'])) { |
|
| 69 | + $Drones = & $TraderResults['Drones']; |
|
| 70 | + $ActualDamage = & $Drones['ActualDamage']; |
|
| 71 | + $WeaponDamage = & $Drones['WeaponDamage']; |
|
| 72 | + $TargetPort = & $Drones['TargetPort']; |
|
| 73 | 73 | |
| 74 | 74 | echo $ShootingPlayer->getDisplayName(); |
| 75 | - if($WeaponDamage['Launched'] == 0) { |
|
| 75 | + if ($WeaponDamage['Launched'] == 0) { |
|
| 76 | 76 | ?> fails to launch their combat drones<?php |
| 77 | 77 | } else { |
| 78 | 78 | ?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php |
| 79 | - if($ActualDamage['TargetAlreadyDead']) { |
|
| 79 | + if ($ActualDamage['TargetAlreadyDead']) { |
|
| 80 | 80 | ?>the debris that was once <?php |
| 81 | 81 | } |
| 82 | 82 | echo $TargetPort->getDisplayName(); |
| 83 | 83 | |
| 84 | - if(!$ActualDamage['TargetAlreadyDead']) { |
|
| 85 | - if($ActualDamage['TotalDamage'] == 0) { |
|
| 86 | - if($WeaponDamage['Shield'] > 0) { |
|
| 87 | - if($ActualDamage['HasCDs']) { |
|
| 84 | + if (!$ActualDamage['TargetAlreadyDead']) { |
|
| 85 | + if ($ActualDamage['TotalDamage'] == 0) { |
|
| 86 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 87 | + if ($ActualDamage['HasCDs']) { |
|
| 88 | 88 | ?> which prove ineffective against their combat drones<?php |
| 89 | 89 | } else { |
| 90 | 90 | ?> which proves ineffective against it's armour<?php |
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | - if($ActualDamage['Armour'] > 0) { |
|
| 93 | + if ($ActualDamage['Armour'] > 0) { |
|
| 94 | 94 | ?> which is deflected by their shields<?php |
| 95 | 95 | } else { |
| 96 | 96 | ?> but they cannot do any damage<?php |
@@ -1,48 +1,48 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if(is_array($TraderTeamCombatResults['Traders'])) { |
|
| 4 | - foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) { |
|
| 5 | - $ShootingPlayer =& $TraderResults['Player']; |
|
| 6 | - $TotalDamage =& $TraderResults['TotalDamage']; |
|
| 7 | - if($TraderResults['DeadBeforeShot']) { |
|
| 3 | +if (is_array($TraderTeamCombatResults['Traders'])) { |
|
| 4 | + foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) { |
|
| 5 | + $ShootingPlayer = & $TraderResults['Player']; |
|
| 6 | + $TotalDamage = & $TraderResults['TotalDamage']; |
|
| 7 | + if ($TraderResults['DeadBeforeShot']) { |
|
| 8 | 8 | echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php |
| 9 | 9 | } else { |
| 10 | - if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) { |
|
| 11 | - foreach($TraderResults['Weapons'] as $WeaponResults) { |
|
| 12 | - $ShootingWeapon =& $WeaponResults['Weapon']; |
|
| 13 | - $ShotHit =& $WeaponResults['Hit']; |
|
| 14 | - $ActualDamage =& $WeaponResults['ActualDamage']; |
|
| 15 | - $WeaponDamage =& $WeaponResults['WeaponDamage']; |
|
| 16 | - $TargetPlayer =& $WeaponResults['TargetPlayer']; |
|
| 10 | + if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) { |
|
| 11 | + foreach ($TraderResults['Weapons'] as $WeaponResults) { |
|
| 12 | + $ShootingWeapon = & $WeaponResults['Weapon']; |
|
| 13 | + $ShotHit = & $WeaponResults['Hit']; |
|
| 14 | + $ActualDamage = & $WeaponResults['ActualDamage']; |
|
| 15 | + $WeaponDamage = & $WeaponResults['WeaponDamage']; |
|
| 16 | + $TargetPlayer = & $WeaponResults['TargetPlayer']; |
|
| 17 | 17 | |
| 18 | - echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once<?php } ?> the forces<?php |
|
| 18 | + echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once<?php } ?> the forces<?php |
|
| 19 | 19 | if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) { |
| 20 | - if(!$ShotHit) { |
|
| 20 | + if (!$ShotHit) { |
|
| 21 | 21 | ?> and misses<?php |
| 22 | 22 | } elseif ($ActualDamage['TotalDamage'] == 0) { |
| 23 | - if($WeaponDamage['Shield'] > 0) { |
|
| 24 | - ?> which proves ineffective against the <?php if($ActualDamage['HasMines']){ ?>mines<?php } elseif ($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } |
|
| 23 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 24 | + ?> which proves ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } elseif ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } |
|
| 25 | 25 | } elseif ($WeaponDamage['Armour'] > 0) { |
| 26 | - ?> which is deflected by the <?php if($ActualDamage['HasMines']){ ?>mines<?php } elseif ($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php |
|
| 26 | + ?> which is deflected by the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } elseif ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php |
|
| 27 | 27 | } else { |
| 28 | 28 | ?> but it cannot do any damage<?php |
| 29 | 29 | } |
| 30 | 30 | } else { |
| 31 | 31 | ?> destroying <?php |
| 32 | 32 | $DamageTypes = 0; |
| 33 | - if($ActualDamage['NumMines'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 34 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 35 | - if($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 33 | + if ($ActualDamage['NumMines'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 34 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 35 | + if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 36 | 36 | |
| 37 | - if($ActualDamage['NumMines'] > 0) { |
|
| 37 | + if ($ActualDamage['NumMines'] > 0) { |
|
| 38 | 38 | ?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php |
| 39 | 39 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 40 | 40 | } |
| 41 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 41 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 42 | 42 | ?><span class="red"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php |
| 43 | 43 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 44 | 44 | } |
| 45 | - if($ActualDamage['NumSDs'] > 0) { |
|
| 45 | + if ($ActualDamage['NumSDs'] > 0) { |
|
| 46 | 46 | ?><span class="red"><?php echo number_format($ActualDamage['NumSDs']) ?></span> scout drones<?php |
| 47 | 47 | } |
| 48 | 48 | } |
@@ -53,71 +53,71 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | - if(isset($TraderResults['Drones'])) { |
|
| 57 | - $Drones =& $TraderResults['Drones']; |
|
| 58 | - $ActualDamage =& $Drones['ActualDamage']; |
|
| 59 | - $WeaponDamage =& $Drones['WeaponDamage']; |
|
| 60 | - $TargetPlayer =& $Drones['TargetPlayer']; |
|
| 56 | + if (isset($TraderResults['Drones'])) { |
|
| 57 | + $Drones = & $TraderResults['Drones']; |
|
| 58 | + $ActualDamage = & $Drones['ActualDamage']; |
|
| 59 | + $WeaponDamage = & $Drones['WeaponDamage']; |
|
| 60 | + $TargetPlayer = & $Drones['TargetPlayer']; |
|
| 61 | 61 | |
| 62 | 62 | echo $ShootingPlayer->getDisplayName(); |
| 63 | - if($WeaponDamage['Launched'] == 0) { |
|
| 63 | + if ($WeaponDamage['Launched'] == 0) { |
|
| 64 | 64 | ?> fails to launch their combat drones<?php |
| 65 | 65 | } else { |
| 66 | - ?> 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 |
|
| 67 | - if(!$ActualDamage['TargetAlreadyDead']) { |
|
| 68 | - if($ActualDamage['TotalDamage'] == 0) { |
|
| 69 | - if($WeaponDamage['Shield'] > 0) { |
|
| 70 | - ?> which prove ineffective against the <?php if($ActualDamage['HasMines']){ ?>mines<?php } elseif ($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } |
|
| 66 | + ?> 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 |
|
| 67 | + if (!$ActualDamage['TargetAlreadyDead']) { |
|
| 68 | + if ($ActualDamage['TotalDamage'] == 0) { |
|
| 69 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 70 | + ?> which prove ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } elseif ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } |
|
| 71 | 71 | } elseif ($WeaponDamage['Armour'] > 0) { |
| 72 | 72 | ?> which is deflected by the <?php |
| 73 | - if($ActualDamage['HasMines']){ ?>mines<?php } elseif ($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php |
|
| 73 | + if ($ActualDamage['HasMines']) { ?>mines<?php } elseif ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php |
|
| 74 | 74 | } else { |
| 75 | 75 | ?> but they cannot do any damage<?php |
| 76 | 76 | } |
| 77 | 77 | } else { |
| 78 | 78 | $DamageTypes = 0; |
| 79 | - if($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes+1; } |
|
| 80 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 81 | - if($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 79 | + if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes + 1; } |
|
| 80 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 81 | + if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 82 | 82 | |
| 83 | - if($WeaponDamage['Kamikaze'] == 0) { |
|
| 83 | + if ($WeaponDamage['Kamikaze'] == 0) { |
|
| 84 | 84 | ?> destroying <?php |
| 85 | 85 | } else { |
| 86 | 86 | ?> of which <span class="cds"><?php echo $WeaponDamage['Kamikaze'] ?></span> kamikaze against <span class="red"><?php echo $WeaponDamage['Kamikaze'] ?></span> mines<?php |
| 87 | - if($DamageTypes > 0) { |
|
| 87 | + if ($DamageTypes > 0) { |
|
| 88 | 88 | ?> whilst the others destroy <?php |
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | - if($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { |
|
| 91 | + if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { |
|
| 92 | 92 | ?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php |
| 93 | 93 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 94 | 94 | } |
| 95 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 95 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 96 | 96 | ?><span class="red"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php |
| 97 | 97 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 98 | 98 | } |
| 99 | - if($ActualDamage['NumSDs'] > 0) { |
|
| 99 | + if ($ActualDamage['NumSDs'] > 0) { |
|
| 100 | 100 | ?><span class="red"><?php echo number_format($ActualDamage['NumSDs']) ?></span> scout drones<?php |
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | }?>. |
| 105 | 105 | <br /> |
| 106 | - <?php if($ActualDamage['KillingShot']) { |
|
| 106 | + <?php if ($ActualDamage['KillingShot']) { |
|
| 107 | 107 | ?>Forces are <span class="red">DESTROYED!</span><br /><?php |
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | echo $ShootingPlayer->getDisplayName(); |
| 112 | - if($TotalDamage > 0) { |
|
| 112 | + if ($TotalDamage > 0) { |
|
| 113 | 113 | ?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php |
| 114 | 114 | } else { |
| 115 | 115 | ?> does no damage this round.<?php |
| 116 | - if(!$TraderResults['DeadBeforeShot']) { |
|
| 116 | + if (!$TraderResults['DeadBeforeShot']) { |
|
| 117 | 117 | ?> Maybe they should go back to the academy<?php |
| 118 | 118 | } |
| 119 | 119 | } ?>.<br /><br /><?php |
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?> |
| 123 | -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 } ?>. |
|
| 123 | +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 } ?>. |
|
@@ -1,30 +1,30 @@ discard block |
||
| 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 | } else { |
| 9 | 9 | ?> does no damage this round<?php |
| 10 | 10 | } ?>. <?php echo $AttackLogLink; |
| 11 | 11 | return; |
| 12 | 12 | } |
| 13 | -if(isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) { |
|
| 14 | - foreach($PlanetCombatResults['Weapons'] as $WeaponResults) { |
|
| 15 | - $ShootingWeapon =& $WeaponResults['Weapon']; |
|
| 16 | - $ShotHit =& $WeaponResults['Hit']; |
|
| 17 | - $ActualDamage =& $WeaponResults['ActualDamage']; |
|
| 18 | - $WeaponDamage =& $WeaponResults['WeaponDamage']; |
|
| 19 | - $TargetPlayer =& $WeaponResults['TargetPlayer']; |
|
| 13 | +if (isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) { |
|
| 14 | + foreach ($PlanetCombatResults['Weapons'] as $WeaponResults) { |
|
| 15 | + $ShootingWeapon = & $WeaponResults['Weapon']; |
|
| 16 | + $ShotHit = & $WeaponResults['Hit']; |
|
| 17 | + $ActualDamage = & $WeaponResults['ActualDamage']; |
|
| 18 | + $WeaponDamage = & $WeaponResults['WeaponDamage']; |
|
| 19 | + $TargetPlayer = & $WeaponResults['TargetPlayer']; |
|
| 20 | 20 | |
| 21 | - echo $CombatPlanet->getCombatName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName(); |
|
| 21 | + 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 | 22 | if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) { |
| 23 | - if(!$ShotHit) { |
|
| 23 | + if (!$ShotHit) { |
|
| 24 | 24 | ?> and misses<?php |
| 25 | 25 | } elseif ($ActualDamage['TotalDamage'] == 0) { |
| 26 | - if($WeaponDamage['Shield'] > 0) { |
|
| 27 | - if($ActualDamage['HasCDs']) { |
|
| 26 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 27 | + if ($ActualDamage['HasCDs']) { |
|
| 28 | 28 | ?> which proves ineffective against their combat drones<?php |
| 29 | 29 | } else { |
| 30 | 30 | ?> which washes harmlessly over their hull<?php |
@@ -37,48 +37,48 @@ discard block |
||
| 37 | 37 | } else { |
| 38 | 38 | ?> destroying <?php |
| 39 | 39 | $DamageTypes = 0; |
| 40 | - if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 41 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 42 | - if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 40 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 41 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 42 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 43 | 43 | |
| 44 | - if($ActualDamage['Shield'] > 0) { |
|
| 44 | + if ($ActualDamage['Shield'] > 0) { |
|
| 45 | 45 | ?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php |
| 46 | 46 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 47 | 47 | } |
| 48 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 48 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 49 | 49 | ?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']); ?></span> combat drones<?php |
| 50 | 50 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 51 | 51 | } |
| 52 | - if($ActualDamage['Armour'] > 0) { |
|
| 52 | + if ($ActualDamage['Armour'] > 0) { |
|
| 53 | 53 | ?><span class="red"><?php echo number_format($ActualDamage['Armour']); ?></span> plates of armour<?php |
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | } ?>. |
| 57 | 57 | <br /><?php |
| 58 | 58 | if ($ShotHit && $ActualDamage['KillingShot']) { |
| 59 | - $this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer)); |
|
| 59 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer)); |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | -if(isset($PlanetCombatResults['Drones'])) { |
|
| 64 | - $Drones =& $PlanetCombatResults['Drones']; |
|
| 65 | - $ActualDamage =& $Drones['ActualDamage']; |
|
| 66 | - $WeaponDamage =& $Drones['WeaponDamage']; |
|
| 67 | - $TargetPlayer =& $Drones['TargetPlayer']; |
|
| 63 | +if (isset($PlanetCombatResults['Drones'])) { |
|
| 64 | + $Drones = & $PlanetCombatResults['Drones']; |
|
| 65 | + $ActualDamage = & $Drones['ActualDamage']; |
|
| 66 | + $WeaponDamage = & $Drones['WeaponDamage']; |
|
| 67 | + $TargetPlayer = & $Drones['TargetPlayer']; |
|
| 68 | 68 | $DamageTypes = 0; |
| 69 | - if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 70 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 71 | - if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 69 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 70 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 71 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 72 | 72 | |
| 73 | 73 | echo $CombatPlanet->getCombatName(); |
| 74 | - if($WeaponDamage['Launched'] == 0) { |
|
| 74 | + if ($WeaponDamage['Launched'] == 0) { |
|
| 75 | 75 | ?> fails to launch it's combat drones<?php |
| 76 | 76 | } else { |
| 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(); |
|
| 78 | - if(!$ActualDamage['TargetAlreadyDead']) { |
|
| 79 | - if($ActualDamage['TotalDamage'] == 0) { |
|
| 80 | - if($WeaponDamage['Shield'] > 0) { |
|
| 81 | - if($ActualDamage['HasCDs']) { |
|
| 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(); |
|
| 78 | + if (!$ActualDamage['TargetAlreadyDead']) { |
|
| 79 | + if ($ActualDamage['TotalDamage'] == 0) { |
|
| 80 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 81 | + if ($ActualDamage['HasCDs']) { |
|
| 82 | 82 | ?> which prove ineffective against their combat drones<?php |
| 83 | 83 | } else { |
| 84 | 84 | ?> which washes harmlessly over their hull<?php |
@@ -90,28 +90,28 @@ discard block |
||
| 90 | 90 | } |
| 91 | 91 | } else { |
| 92 | 92 | ?> destroying <?php |
| 93 | - if($ActualDamage['Shield'] > 0) { |
|
| 93 | + if ($ActualDamage['Shield'] > 0) { |
|
| 94 | 94 | ?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php |
| 95 | 95 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 96 | 96 | } |
| 97 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 97 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 98 | 98 | ?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']); ?></span> combat drones<?php |
| 99 | 99 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 100 | 100 | } |
| 101 | - if($ActualDamage['Armour'] > 0) { |
|
| 101 | + if ($ActualDamage['Armour'] > 0) { |
|
| 102 | 102 | ?><span class="red"><?php echo number_format($ActualDamage['Armour']); ?></span> plates of armour<?php |
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | } ?>. |
| 107 | 107 | <br /><?php |
| 108 | - if($ActualDamage['KillingShot']) { |
|
| 109 | - $this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer)); |
|
| 108 | + if ($ActualDamage['KillingShot']) { |
|
| 109 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer)); |
|
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | echo $CombatPlanet->getCombatName(); |
| 114 | -if($TotalDamage > 0) { |
|
| 114 | +if ($TotalDamage > 0) { |
|
| 115 | 115 | ?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat<?php |
| 116 | 116 | } else { |
| 117 | 117 | ?> does no damage this round. You call that a planet? It needs a better builder<?php |
@@ -1,31 +1,31 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if(is_array($TraderTeamCombatResults['Traders'])) { |
|
| 3 | - foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) { |
|
| 4 | - $ShootingPlayer =& $TraderResults['Player']; |
|
| 5 | - $TotalDamage =& $TraderResults['TotalDamage']; |
|
| 2 | +if (is_array($TraderTeamCombatResults['Traders'])) { |
|
| 3 | + foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) { |
|
| 4 | + $ShootingPlayer = & $TraderResults['Player']; |
|
| 5 | + $TotalDamage = & $TraderResults['TotalDamage']; |
|
| 6 | 6 | |
| 7 | - if($TraderResults['DeadBeforeShot']) { |
|
| 7 | + if ($TraderResults['DeadBeforeShot']) { |
|
| 8 | 8 | echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php |
| 9 | 9 | } else { |
| 10 | - if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) { |
|
| 11 | - foreach($TraderResults['Weapons'] as $WeaponResults) { |
|
| 12 | - $ShootingWeapon =& $WeaponResults['Weapon']; |
|
| 13 | - $ShotHit =& $WeaponResults['Hit']; |
|
| 14 | - $ActualDamage =& $WeaponResults['ActualDamage']; |
|
| 15 | - $WeaponDamage =& $WeaponResults['WeaponDamage']; |
|
| 16 | - $TargetPlayer =& $WeaponResults['TargetPlayer']; |
|
| 10 | + if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) { |
|
| 11 | + foreach ($TraderResults['Weapons'] as $WeaponResults) { |
|
| 12 | + $ShootingWeapon = & $WeaponResults['Weapon']; |
|
| 13 | + $ShotHit = & $WeaponResults['Hit']; |
|
| 14 | + $ActualDamage = & $WeaponResults['ActualDamage']; |
|
| 15 | + $WeaponDamage = & $WeaponResults['WeaponDamage']; |
|
| 16 | + $TargetPlayer = & $WeaponResults['TargetPlayer']; |
|
| 17 | 17 | |
| 18 | 18 | echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php |
| 19 | - if($ShotHit && $ActualDamage['TargetAlreadyDead']) { |
|
| 19 | + if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { |
|
| 20 | 20 | ?>the debris that was once <?php |
| 21 | 21 | } |
| 22 | 22 | echo $TargetPlayer->getDisplayName(); |
| 23 | 23 | if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) { |
| 24 | - if(!$ShotHit) { |
|
| 24 | + if (!$ShotHit) { |
|
| 25 | 25 | ?> and misses<?php |
| 26 | 26 | } elseif ($ActualDamage['TotalDamage'] == 0) { |
| 27 | - if($WeaponDamage['Shield'] > 0) { |
|
| 28 | - if($ActualDamage['HasCDs']) { |
|
| 27 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 28 | + if ($ActualDamage['HasCDs']) { |
|
| 29 | 29 | ?> which proves ineffective against their combat drones<?php |
| 30 | 30 | } else { |
| 31 | 31 | ?> which washes harmlessly over their hull<?php |
@@ -38,94 +38,94 @@ discard block |
||
| 38 | 38 | } else { |
| 39 | 39 | ?> destroying <?php |
| 40 | 40 | $DamageTypes = 0; |
| 41 | - if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 42 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 43 | - if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 41 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 42 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 43 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 44 | 44 | |
| 45 | - if($ActualDamage['Shield'] > 0) { |
|
| 45 | + if ($ActualDamage['Shield'] > 0) { |
|
| 46 | 46 | ?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php |
| 47 | 47 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 48 | 48 | } |
| 49 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 49 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 50 | 50 | ?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php |
| 51 | 51 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 52 | 52 | } |
| 53 | - if($ActualDamage['Armour'] > 0) { |
|
| 53 | + if ($ActualDamage['Armour'] > 0) { |
|
| 54 | 54 | ?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | } ?>. |
| 58 | 58 | <br /><?php |
| 59 | 59 | if ($ShotHit && $ActualDamage['KillingShot']) { |
| 60 | - $this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 60 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer)); |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | - if(isset($TraderResults['Drones'])) { |
|
| 65 | - $Drones =& $TraderResults['Drones']; |
|
| 66 | - $ActualDamage =& $Drones['ActualDamage']; |
|
| 67 | - $WeaponDamage =& $Drones['WeaponDamage']; |
|
| 68 | - $TargetPlayer =& $Drones['TargetPlayer']; |
|
| 64 | + if (isset($TraderResults['Drones'])) { |
|
| 65 | + $Drones = & $TraderResults['Drones']; |
|
| 66 | + $ActualDamage = & $Drones['ActualDamage']; |
|
| 67 | + $WeaponDamage = & $Drones['WeaponDamage']; |
|
| 68 | + $TargetPlayer = & $Drones['TargetPlayer']; |
|
| 69 | 69 | $DamageTypes = 0; |
| 70 | - if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 71 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 72 | - if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 70 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 71 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 72 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 73 | 73 | |
| 74 | 74 | echo $ShootingPlayer->getDisplayName(); |
| 75 | - if($WeaponDamage['Launched'] == 0) { |
|
| 75 | + if ($WeaponDamage['Launched'] == 0) { |
|
| 76 | 76 | ?> fails to launch their combat drones<?php |
| 77 | 77 | } else { |
| 78 | 78 | ?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php |
| 79 | - if($ActualDamage['TargetAlreadyDead']) { |
|
| 79 | + if ($ActualDamage['TargetAlreadyDead']) { |
|
| 80 | 80 | ?>the debris that was once <?php |
| 81 | 81 | } |
| 82 | 82 | echo $TargetPlayer->getDisplayName(); |
| 83 | - if(!$ActualDamage['TargetAlreadyDead']) { |
|
| 84 | - if($ActualDamage['TotalDamage'] == 0) { |
|
| 85 | - if($WeaponDamage['Shield'] > 0) { |
|
| 86 | - if($ActualDamage['HasCDs']) { |
|
| 83 | + if (!$ActualDamage['TargetAlreadyDead']) { |
|
| 84 | + if ($ActualDamage['TotalDamage'] == 0) { |
|
| 85 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 86 | + if ($ActualDamage['HasCDs']) { |
|
| 87 | 87 | ?> which prove ineffective against their combat drones<?php |
| 88 | 88 | } else { |
| 89 | 89 | ?> which washes harmlessly over their hull<?php |
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | - if($ActualDamage['Armour'] > 0) { |
|
| 92 | + if ($ActualDamage['Armour'] > 0) { |
|
| 93 | 93 | ?> which is deflected by their shields<?php |
| 94 | 94 | } else { |
| 95 | 95 | ?> but they cannot do any damage<?php |
| 96 | 96 | } |
| 97 | 97 | } else { |
| 98 | 98 | ?> destroying <?php |
| 99 | - if($ActualDamage['Shield'] > 0) { |
|
| 99 | + if ($ActualDamage['Shield'] > 0) { |
|
| 100 | 100 | ?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php |
| 101 | 101 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 102 | 102 | } |
| 103 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 103 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 104 | 104 | ?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php |
| 105 | 105 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 106 | 106 | } |
| 107 | - if($ActualDamage['Armour'] > 0) { |
|
| 107 | + if ($ActualDamage['Armour'] > 0) { |
|
| 108 | 108 | ?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php |
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | 112 | } ?>. |
| 113 | 113 | <br /><?php |
| 114 | - if($ActualDamage['KillingShot']) { |
|
| 115 | - $this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 114 | + if ($ActualDamage['KillingShot']) { |
|
| 115 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer)); |
|
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | echo $ShootingPlayer->getDisplayName(); |
| 120 | - if($TotalDamage > 0) { |
|
| 120 | + if ($TotalDamage > 0) { |
|
| 121 | 121 | ?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php |
| 122 | 122 | } else { |
| 123 | 123 | ?> does no damage this round.<?php |
| 124 | - if(!$TraderResults['DeadBeforeShot']) { |
|
| 124 | + if (!$TraderResults['DeadBeforeShot']) { |
|
| 125 | 125 | ?> Maybe they should go back to the academy<?php |
| 126 | 126 | } |
| 127 | 127 | } ?>.<br /><br /><?php |
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?> |
| 131 | -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 /> |
|
| 131 | +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 /> |
|
@@ -1,10 +1,10 @@ discard block |
||
| 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,24 +12,24 @@ discard block |
||
| 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 | 30 | } elseif ($ActualDamage['TotalDamage'] == 0) { |
| 31 | - if($WeaponDamage['Shield'] > 0) { |
|
| 32 | - if($ActualDamage['HasCDs']) { |
|
| 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 |
@@ -42,96 +42,96 @@ discard block |
||
| 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.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlanet'=>$TargetPlanet)); |
|
| 64 | + $this->includeTemplate('includes/PlanetKillMessage.inc.php', 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.php',array('KillResults'=>$Drones['KillResults'],'TargetPlanet'=>$TargetPlanet)); |
|
| 118 | + if ($ActualDamage['KillingShot']) { |
|
| 119 | + $this->includeTemplate('includes/PlanetKillMessage.inc.php', 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 | } ?> |
@@ -1,14 +1,14 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if(isset($ForcesCombatResults['Results']) && is_array($ForcesCombatResults['Results'])) { |
|
| 3 | - foreach($ForcesCombatResults['Results'] as $ForceType => $ForceResults) { |
|
| 4 | - $ShootingWeapon =& $ForceResults['Weapon']; |
|
| 5 | - $ShotHit =& $ForceResults['Hit']; |
|
| 6 | - $ActualDamage =& $ForceResults['ActualDamage']; |
|
| 7 | - $WeaponDamage =& $ForceResults['WeaponDamage']; |
|
| 8 | - $TargetPlayer =& $ForceResults['TargetPlayer']; |
|
| 2 | +if (isset($ForcesCombatResults['Results']) && is_array($ForcesCombatResults['Results'])) { |
|
| 3 | + foreach ($ForcesCombatResults['Results'] as $ForceType => $ForceResults) { |
|
| 4 | + $ShootingWeapon = & $ForceResults['Weapon']; |
|
| 5 | + $ShotHit = & $ForceResults['Hit']; |
|
| 6 | + $ActualDamage = & $ForceResults['ActualDamage']; |
|
| 7 | + $WeaponDamage = & $ForceResults['WeaponDamage']; |
|
| 8 | + $TargetPlayer = & $ForceResults['TargetPlayer']; |
|
| 9 | 9 | ?> |
| 10 | 10 | <span class="cds"><?php echo $ActualDamage['Launched'] ?? $WeaponDamage['Launched']; ?></span><?php |
| 11 | - if($ForceType == 'Mines') { |
|
| 11 | + if ($ForceType == 'Mines') { |
|
| 12 | 12 | ?> mines kamikaze themselves against <?php |
| 13 | 13 | } elseif ($ForceType == 'Drones') { |
| 14 | 14 | ?> combat drones launch at <?php |
@@ -16,14 +16,14 @@ discard block |
||
| 16 | 16 | ?> scout drones kamikaze themselves against <?php |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } |
|
| 19 | + if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } |
|
| 20 | 20 | echo $TargetPlayer->getDisplayName(); |
| 21 | 21 | if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) { |
| 22 | - if(!$ShotHit) { |
|
| 22 | + if (!$ShotHit) { |
|
| 23 | 23 | ?> and misses<?php |
| 24 | 24 | } elseif ($ActualDamage['TotalDamage'] == 0) { |
| 25 | - if($WeaponDamage['Shield'] > 0) { |
|
| 26 | - if($ActualDamage['HasCDs']) { |
|
| 25 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 26 | + if ($ActualDamage['HasCDs']) { |
|
| 27 | 27 | ?> which proves ineffective against their combat drones<?php |
| 28 | 28 | } else { |
| 29 | 29 | ?> which washes harmlessly over their hull<?php |
@@ -37,31 +37,31 @@ discard block |
||
| 37 | 37 | ?> destroying <?php |
| 38 | 38 | } |
| 39 | 39 | $DamageTypes = 0; |
| 40 | - if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 41 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 42 | - if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 40 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 41 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 42 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 43 | 43 | |
| 44 | - if($ActualDamage['Shield'] > 0) { |
|
| 44 | + if ($ActualDamage['Shield'] > 0) { |
|
| 45 | 45 | ?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php |
| 46 | 46 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 47 | 47 | } |
| 48 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 48 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 49 | 49 | ?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> drones<?php |
| 50 | 50 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 51 | 51 | } |
| 52 | - if($ActualDamage['Armour'] > 0) { |
|
| 52 | + if ($ActualDamage['Armour'] > 0) { |
|
| 53 | 53 | ?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php |
| 54 | 54 | } |
| 55 | 55 | } ?>. |
| 56 | 56 | <br /><?php |
| 57 | 57 | if ($ShotHit && $ActualDamage['KillingShot']) { |
| 58 | - $this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$ForceResults['KillResults'],'TargetPlayer'=>$TargetPlayer)); |
|
| 58 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$ForceResults['KillResults'], 'TargetPlayer'=>$TargetPlayer)); |
|
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | -if(isset($ForcesCombatResults['ForcesDestroyed']) && $ForcesCombatResults['ForcesDestroyed']) { |
|
| 62 | +if (isset($ForcesCombatResults['ForcesDestroyed']) && $ForcesCombatResults['ForcesDestroyed']) { |
|
| 63 | 63 | ?>Forces are <span class="red">DESTROYED!</span><br /><?php |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | -$TotalDamage =& $ForcesCombatResults['TotalDamage'] ?> |
|
| 67 | -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 } ?>. |
|
| 66 | +$TotalDamage = & $ForcesCombatResults['TotalDamage'] ?> |
|
| 67 | +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 } ?>. |
|
