smrealms /
smr
We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -66,68 +66,68 @@ |
||
| 66 | 66 | abstract public function &getModifiedForceDamageAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer); |
| 67 | 67 | |
| 68 | 68 | protected function &doPlayerDamageToForce(array &$return, AbstractSmrPlayer $weaponPlayer, SmrForce $forces) { |
| 69 | - $return['WeaponDamage'] =& $this->getModifiedDamageAgainstForces($weaponPlayer,$forces); |
|
| 70 | - $return['ActualDamage'] =& $forces->doWeaponDamage($return['WeaponDamage']); |
|
| 69 | + $return['WeaponDamage'] = & $this->getModifiedDamageAgainstForces($weaponPlayer, $forces); |
|
| 70 | + $return['ActualDamage'] = & $forces->doWeaponDamage($return['WeaponDamage']); |
|
| 71 | 71 | if ($return['ActualDamage']['KillingShot']) { |
| 72 | - $return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer); |
|
| 72 | + $return['KillResults'] = & $forces->killForcesByPlayer($weaponPlayer); |
|
| 73 | 73 | } |
| 74 | 74 | return $return; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | protected function &doPlayerDamageToPlayer(array &$return, AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) { |
| 78 | - $return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlayer($weaponPlayer,$targetPlayer); |
|
| 79 | - $return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']); |
|
| 78 | + $return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlayer($weaponPlayer, $targetPlayer); |
|
| 79 | + $return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']); |
|
| 80 | 80 | |
| 81 | 81 | if ($return['ActualDamage']['KillingShot']) { |
| 82 | - $return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer); |
|
| 82 | + $return['KillResults'] = & $targetPlayer->killPlayerByPlayer($weaponPlayer); |
|
| 83 | 83 | } |
| 84 | 84 | return $return; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | protected function &doPlayerDamageToPort(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPort $port) { |
| 88 | - $return['WeaponDamage'] =& $this->getModifiedDamageAgainstPort($weaponPlayer,$port); |
|
| 89 | - $return['ActualDamage'] =& $port->doWeaponDamage($return['WeaponDamage']); |
|
| 88 | + $return['WeaponDamage'] = & $this->getModifiedDamageAgainstPort($weaponPlayer, $port); |
|
| 89 | + $return['ActualDamage'] = & $port->doWeaponDamage($return['WeaponDamage']); |
|
| 90 | 90 | if ($return['ActualDamage']['KillingShot']) { |
| 91 | - $return['KillResults'] =& $port->killPortByPlayer($weaponPlayer); |
|
| 91 | + $return['KillResults'] = & $port->killPortByPlayer($weaponPlayer); |
|
| 92 | 92 | } |
| 93 | 93 | return $return; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | protected function &doPlayerDamageToPlanet(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) { |
| 97 | - $return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlanet($weaponPlayer,$planet); |
|
| 98 | - $return['ActualDamage'] =& $planet->doWeaponDamage($return['WeaponDamage'],$delayed); |
|
| 97 | + $return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlanet($weaponPlayer, $planet); |
|
| 98 | + $return['ActualDamage'] = & $planet->doWeaponDamage($return['WeaponDamage'], $delayed); |
|
| 99 | 99 | if ($return['ActualDamage']['KillingShot']) { |
| 100 | - $return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer); |
|
| 100 | + $return['KillResults'] = & $planet->killPlanetByPlayer($weaponPlayer); |
|
| 101 | 101 | } |
| 102 | 102 | return $return; |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | protected function &doPortDamageToPlayer(array &$return, SmrPort $port, AbstractSmrPlayer $targetPlayer) { |
| 106 | - $return['WeaponDamage'] =& $this->getModifiedPortDamageAgainstPlayer($port,$targetPlayer); |
|
| 107 | - $return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']); |
|
| 106 | + $return['WeaponDamage'] = & $this->getModifiedPortDamageAgainstPlayer($port, $targetPlayer); |
|
| 107 | + $return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']); |
|
| 108 | 108 | |
| 109 | 109 | if ($return['ActualDamage']['KillingShot']) { |
| 110 | - $return['KillResults'] =& $targetPlayer->killPlayerByPort($port); |
|
| 110 | + $return['KillResults'] = & $targetPlayer->killPlayerByPort($port); |
|
| 111 | 111 | } |
| 112 | 112 | return $return; |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | protected function &doPlanetDamageToPlayer(array &$return, SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) { |
| 116 | - $return['WeaponDamage'] =& $this->getModifiedPlanetDamageAgainstPlayer($planet,$targetPlayer); |
|
| 117 | - $return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']); |
|
| 116 | + $return['WeaponDamage'] = & $this->getModifiedPlanetDamageAgainstPlayer($planet, $targetPlayer); |
|
| 117 | + $return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']); |
|
| 118 | 118 | |
| 119 | 119 | if ($return['ActualDamage']['KillingShot']) { |
| 120 | - $return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet); |
|
| 120 | + $return['KillResults'] = & $targetPlayer->killPlayerByPlanet($planet); |
|
| 121 | 121 | } |
| 122 | 122 | return $return; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer) { |
| 126 | - $return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer); |
|
| 127 | - $return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']); |
|
| 126 | + $return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer); |
|
| 127 | + $return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']); |
|
| 128 | 128 | |
| 129 | 129 | if ($return['ActualDamage']['KillingShot']) { |
| 130 | - $return['KillResults'] =& $targetPlayer->killPlayerByForces($forces); |
|
| 130 | + $return['KillResults'] = & $targetPlayer->killPlayerByForces($forces); |
|
| 131 | 131 | } |
| 132 | 132 | return $return; |
| 133 | 133 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 94 | 94 | return $return; |
| 95 | 95 | } |
| 96 | - $damage =& $this->getModifiedDamage(); |
|
| 96 | + $damage = & $this->getModifiedDamage(); |
|
| 97 | 97 | if ($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships |
| 98 | 98 | $damage['MaxDamage'] = IRound($damage['MaxDamage'] * self::FED_SHIP_DAMAGE_MODIFIER); |
| 99 | 99 | $damage['Shield'] = IRound($damage['Shield'] * self::FED_SHIP_DAMAGE_MODIFIER); |
@@ -130,12 +130,12 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) { |
| 133 | - $return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker); |
|
| 134 | - $return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']); |
|
| 133 | + $return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker); |
|
| 134 | + $return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']); |
|
| 135 | 135 | $return['ActualDamage']['Launched'] = ICeil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']); |
| 136 | 136 | |
| 137 | 137 | if ($return['ActualDamage']['KillingShot']) { |
| 138 | - $return['KillResults'] =& $targetPlayer->killPlayerByForces($forces); |
|
| 138 | + $return['KillResults'] = & $targetPlayer->killPlayerByForces($forces); |
|
| 139 | 139 | } |
| 140 | 140 | return $return; |
| 141 | 141 | } |
