smrealms /
smr
We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -1,9 +1,9 @@ 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->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 $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php |
| 8 | 8 | } |
| 9 | 9 | else { |
@@ -11,29 +11,29 @@ discard block |
||
| 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->getDisplayName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName(); |
|
| 22 | + echo $CombatPlanet->getDisplayName() ?> 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 |
||
| 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->getDisplayName(); |
| 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 |
||
| 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->getDisplayName(); |
| 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 { |
@@ -5,8 +5,7 @@ discard block |
||
| 5 | 5 | echo $CombatPlanet->getDisplayName(); |
| 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 |
||
| 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 |
||
| 79 | 73 | echo $CombatPlanet->getDisplayName(); |
| 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 |
||
| 124 | 113 | echo $CombatPlanet->getDisplayName(); |
| 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 | } ?>. |
@@ -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,29 +12,29 @@ 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 | - } 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 proves ineffective against it's armour<?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,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',array('KillResults'=>$WeaponResults['KillResults'],'TargetPort'=>$TargetPort,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 64 | + $this->includeTemplate('includes/PortKillMessage.inc', 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 |
@@ -98,45 +98,45 @@ discard block |
||
| 98 | 98 | } else { |
| 99 | 99 | ?> destroying <?php |
| 100 | 100 | $DamageTypes = 0; |
| 101 | - if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 102 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 103 | - if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 101 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 102 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 103 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 104 | 104 | |
| 105 | - if($ActualDamage['Shield'] > 0) { |
|
| 105 | + if ($ActualDamage['Shield'] > 0) { |
|
| 106 | 106 | ?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php |
| 107 | 107 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 108 | 108 | } |
| 109 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 109 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 110 | 110 | ?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php |
| 111 | 111 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 112 | 112 | } |
| 113 | - if($ActualDamage['Armour'] > 0) { |
|
| 113 | + if ($ActualDamage['Armour'] > 0) { |
|
| 114 | 114 | ?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | } ?>. |
| 119 | 119 | <br /><?php |
| 120 | - if($ActualDamage['KillingShot']) { |
|
| 121 | - $this->includeTemplate('includes/PortKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPort'=>$TargetPort,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 120 | + if ($ActualDamage['KillingShot']) { |
|
| 121 | + $this->includeTemplate('includes/PortKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPort'=>$TargetPort, 'ShootingPlayer'=>$ShootingPlayer)); |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | echo $ShootingPlayer->getDisplayName(); |
| 126 | - if($TotalDamage > 0) { |
|
| 126 | + if ($TotalDamage > 0) { |
|
| 127 | 127 | ?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php |
| 128 | 128 | } else { |
| 129 | 129 | ?> does no damage this round<?php |
| 130 | - if(!$TraderResults['DeadBeforeShot']) { |
|
| 130 | + if (!$TraderResults['DeadBeforeShot']) { |
|
| 131 | 131 | ?>. Maybe they should go back to the academy<?php |
| 132 | 132 | } |
| 133 | 133 | } ?>.<br /><br /><?php |
| 134 | 134 | } |
| 135 | 135 | $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?> |
| 136 | -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 /> |
|
| 136 | +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 /> |
|
| 137 | 137 | |
| 138 | 138 | <?php |
| 139 | 139 | $Downgrades = $TraderTeamCombatResults['Downgrades']; |
| 140 | -if ($Downgrades != 0 ) { |
|
| 140 | +if ($Downgrades != 0) { |
|
| 141 | 141 | ?>The port has lost <?php echo $Downgrades . ' ' . pluralise('level', $Downgrades); ?>.<?php |
| 142 | 142 | } ?> |
@@ -1,34 +1,34 @@ 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 isset($ActualDamage['Launched']) ? $ActualDamage['Launched'] : $WeaponDamage['Launched']; ?></span><?php |
| 11 | - if($ForceType == 'Mines') { |
|
| 11 | + if ($ForceType == 'Mines') { |
|
| 12 | 12 | ?> mines kamikaze themselves against <?php |
| 13 | - } else if($ForceType == 'Drones') { |
|
| 13 | + } else if ($ForceType == 'Drones') { |
|
| 14 | 14 | ?> combat drones launch at <?php |
| 15 | - } else if($ForceType == 'Scouts') { |
|
| 15 | + } else if ($ForceType == 'Scouts') { |
|
| 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 | - } else if($ActualDamage['TotalDamage'] == 0) { |
|
| 25 | - if($WeaponDamage['Shield'] > 0) { |
|
| 26 | - if($ActualDamage['HasCDs']) { |
|
| 24 | + } else if ($ActualDamage['TotalDamage'] == 0) { |
|
| 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 |
| 30 | 30 | } |
| 31 | - } else if($WeaponDamage['Armour'] > 0) { |
|
| 31 | + } else if ($WeaponDamage['Armour'] > 0) { |
|
| 32 | 32 | ?> which is deflected by their shields<?php |
| 33 | 33 | } else { |
| 34 | 34 | ?> but it cannot do any damage<?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',array('KillResults'=>$ForceResults['KillResults'],'TargetPlayer'=>$TargetPlayer)); |
|
| 58 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc', 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 } ?>. |
|
@@ -1,36 +1,36 @@ 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 | - } else if($ActualDamage['TotalDamage'] == 0) { |
|
| 27 | - if($WeaponDamage['Shield'] > 0) { |
|
| 28 | - if($ActualDamage['HasCDs']) { |
|
| 26 | + } else if ($ActualDamage['TotalDamage'] == 0) { |
|
| 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 |
| 32 | 32 | } |
| 33 | - } else if($WeaponDamage['Armour'] > 0) { |
|
| 33 | + } else if ($WeaponDamage['Armour'] > 0) { |
|
| 34 | 34 | ?> which is deflected by their shields<?php |
| 35 | 35 | } else { |
| 36 | 36 | ?> but it cannot do any damage<?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',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 60 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc', 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',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 114 | + if ($ActualDamage['KillingShot']) { |
|
| 115 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc', 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 /> |
|
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | |
| 47 | 47 | // Don't lose more exp than you have |
| 48 | 48 | $lost_xp = min($player->getExperience(), |
| 49 | - IRound(SmrPort::getBaseExperience($amount, $good_distance))); |
|
| 49 | + IRound(SmrPort::getBaseExperience($amount, $good_distance))); |
|
| 50 | 50 | $player->decreaseExperience($lost_xp); |
| 51 | 51 | $player->increaseHOF($lost_xp, array('Trade', 'Experience', 'Jettisoned'), HOF_PUBLIC); |
| 52 | 52 | |
@@ -192,21 +192,21 @@ discard block |
||
| 192 | 192 | public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) { |
| 193 | 193 | if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
| 194 | 194 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 195 | - $damage =& $this->getModifiedDamage(); |
|
| 195 | + $damage = & $this->getModifiedDamage(); |
|
| 196 | 196 | return $damage; |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) { |
| 200 | 200 | if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
| 201 | 201 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 202 | - $damage =& $this->getModifiedDamage(); |
|
| 202 | + $damage = & $this->getModifiedDamage(); |
|
| 203 | 203 | return $damage; |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) { |
| 207 | 207 | if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
| 208 | 208 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 209 | - $damage =& $this->getModifiedDamage(); |
|
| 209 | + $damage = & $this->getModifiedDamage(); |
|
| 210 | 210 | |
| 211 | 211 | $planetMod = self::PLANET_DAMAGE_MOD; |
| 212 | 212 | $damage['MaxDamage'] = ICeil($damage['MaxDamage'] * $planetMod); |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 227 | 227 | return $return; |
| 228 | 228 | } |
| 229 | - $damage =& $this->getModifiedDamage(); |
|
| 229 | + $damage = & $this->getModifiedDamage(); |
|
| 230 | 230 | return $damage; |
| 231 | 231 | } |
| 232 | 232 | |
@@ -193,22 +193,28 @@ |
||
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) { |
| 196 | - if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 196 | + if (!$this->canShootForces()) { |
|
| 197 | + // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 197 | 198 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 199 | + } |
|
| 198 | 200 | $damage =& $this->getModifiedDamage(); |
| 199 | 201 | return $damage; |
| 200 | 202 | } |
| 201 | 203 | |
| 202 | 204 | public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) { |
| 203 | - if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 205 | + if (!$this->canShootPorts()) { |
|
| 206 | + // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 204 | 207 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 208 | + } |
|
| 205 | 209 | $damage =& $this->getModifiedDamage(); |
| 206 | 210 | return $damage; |
| 207 | 211 | } |
| 208 | 212 | |
| 209 | 213 | public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) { |
| 210 | - if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 214 | + if (!$this->canShootPlanets()) { |
|
| 215 | + // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 211 | 216 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 217 | + } |
|
| 212 | 218 | $damage =& $this->getModifiedDamage(); |
| 213 | 219 | |
| 214 | 220 | $planetMod = self::PLANET_DAMAGE_MOD; |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 95 | 95 | return $return; |
| 96 | 96 | } |
| 97 | - $damage =& $this->getModifiedDamage(); |
|
| 97 | + $damage = & $this->getModifiedDamage(); |
|
| 98 | 98 | if ($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships |
| 99 | 99 | $damage['MaxDamage'] = IRound($damage['MaxDamage'] * self::FED_SHIP_DAMAGE_MODIFIER); |
| 100 | 100 | $damage['Shield'] = IRound($damage['Shield'] * self::FED_SHIP_DAMAGE_MODIFIER); |
@@ -131,12 +131,12 @@ discard block |
||
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) { |
| 134 | - $return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker); |
|
| 135 | - $return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']); |
|
| 134 | + $return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker); |
|
| 135 | + $return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']); |
|
| 136 | 136 | $return['ActualDamage']['Launched'] = ICeil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']); |
| 137 | 137 | |
| 138 | 138 | if ($return['ActualDamage']['KillingShot']) { |
| 139 | - $return['KillResults'] =& $targetPlayer->killPlayerByForces($forces); |
|
| 139 | + $return['KillResults'] = & $targetPlayer->killPlayerByForces($forces); |
|
| 140 | 140 | } |
| 141 | 141 | return $return; |
| 142 | 142 | } |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) { |
| 130 | 130 | if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
| 131 | 131 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 132 | - $damage =& $this->getModifiedDamage(); |
|
| 132 | + $damage = & $this->getModifiedDamage(); |
|
| 133 | 133 | $damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces) / 100); |
| 134 | 134 | $damage['Kamikaze'] = 0; |
| 135 | 135 | if ($weaponPlayer->isCombatDronesKamikazeOnMines()) { // If kamikaze then damage is same as MINE_ARMOUR |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) { |
| 152 | 152 | if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
| 153 | 153 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 154 | - $damage =& $this->getModifiedDamage(); |
|
| 154 | + $damage = & $this->getModifiedDamage(); |
|
| 155 | 155 | $damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port) / 100); |
| 156 | 156 | $damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']); |
| 157 | 157 | $damage['Shield'] = ICeil($damage['Launched'] * $damage['Shield']); |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) { |
| 164 | 164 | if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
| 165 | 165 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 166 | - $damage =& $this->getModifiedDamage(); |
|
| 166 | + $damage = & $this->getModifiedDamage(); |
|
| 167 | 167 | $damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet) / 100); |
| 168 | 168 | $planetMod = self::PLANET_DAMAGE_MOD; |
| 169 | 169 | $damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage'] * $planetMod); |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 179 | 179 | return $return; |
| 180 | 180 | } |
| 181 | - $damage =& $this->getModifiedDamage(); |
|
| 181 | + $damage = & $this->getModifiedDamage(); |
|
| 182 | 182 | if ($targetPlayer->getShip()->hasDCS()) { |
| 183 | 183 | $damage['MaxDamage'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT; |
| 184 | 184 | $damage['Shield'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT; |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 197 | 197 | return $return; |
| 198 | 198 | } |
| 199 | - $damage =& $this->getModifiedDamage(); |
|
| 199 | + $damage = & $this->getModifiedDamage(); |
|
| 200 | 200 | |
| 201 | 201 | if ($targetPlayer->getShip()->hasDCS()) { |
| 202 | 202 | $damage['MaxDamage'] *= DCS_FORCE_DAMAGE_DECIMAL_PERCENT; |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 217 | 217 | return $return; |
| 218 | 218 | } |
| 219 | - $damage =& $this->getModifiedDamage(); |
|
| 219 | + $damage = & $this->getModifiedDamage(); |
|
| 220 | 220 | |
| 221 | 221 | if ($targetPlayer->getShip()->hasDCS()) { |
| 222 | 222 | $damage['MaxDamage'] *= DCS_PORT_DAMAGE_DECIMAL_PERCENT; |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 236 | 236 | return $return; |
| 237 | 237 | } |
| 238 | - $damage =& $this->getModifiedDamage(); |
|
| 238 | + $damage = & $this->getModifiedDamage(); |
|
| 239 | 239 | |
| 240 | 240 | if ($targetPlayer->getShip()->hasDCS()) { |
| 241 | 241 | $damage['MaxDamage'] *= DCS_PLANET_DAMAGE_DECIMAL_PERCENT; |
@@ -13,8 +13,7 @@ discard block |
||
| 13 | 13 | $this->maxDamage = 2; |
| 14 | 14 | $this->shieldDamage = 2; |
| 15 | 15 | $this->armourDamage = 2; |
| 16 | - } |
|
| 17 | - else { |
|
| 16 | + } else { |
|
| 18 | 17 | $this->maxDamage = 1; |
| 19 | 18 | $this->shieldDamage = 1; |
| 20 | 19 | $this->armourDamage = 1; |
@@ -129,8 +128,10 @@ discard block |
||
| 129 | 128 | } |
| 130 | 129 | |
| 131 | 130 | public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) { |
| 132 | - if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 131 | + if (!$this->canShootForces()) { |
|
| 132 | + // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 133 | 133 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 134 | + } |
|
| 134 | 135 | $damage =& $this->getModifiedDamage(); |
| 135 | 136 | $damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces) / 100); |
| 136 | 137 | $damage['Kamikaze'] = 0; |
@@ -151,8 +152,10 @@ discard block |
||
| 151 | 152 | } |
| 152 | 153 | |
| 153 | 154 | public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) { |
| 154 | - if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 155 | + if (!$this->canShootPorts()) { |
|
| 156 | + // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 155 | 157 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 158 | + } |
|
| 156 | 159 | $damage =& $this->getModifiedDamage(); |
| 157 | 160 | $damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port) / 100); |
| 158 | 161 | $damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']); |
@@ -163,8 +166,10 @@ discard block |
||
| 163 | 166 | } |
| 164 | 167 | |
| 165 | 168 | public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) { |
| 166 | - if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 169 | + if (!$this->canShootPlanets()) { |
|
| 170 | + // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
|
| 167 | 171 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 172 | + } |
|
| 168 | 173 | $damage =& $this->getModifiedDamage(); |
| 169 | 174 | $damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet) / 100); |
| 170 | 175 | $planetMod = self::PLANET_DAMAGE_MOD; |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 81 | 81 | return $return; |
| 82 | 82 | } |
| 83 | - $damage =& $this->getModifiedDamage(); |
|
| 83 | + $damage = & $this->getModifiedDamage(); |
|
| 84 | 84 | $damage['Launched'] = ICeil($this->getNumberOfSDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces, $targetPlayer) / 100); |
| 85 | 85 | $damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']); |
| 86 | 86 | $damage['Shield'] = ICeil($damage['Launched'] * $damage['Shield']); |
