smrealms / smr

src/lib/Default/AbstractSmrCombatWeapon.class.php

Spacing +21 added lines, -21 removed lines

@@ -66,68 +66,68 @@
 	abstract public function &getModifiedForceDamageAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer);
 
 	protected function &doPlayerDamageToForce(array &$return, AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstForces($weaponPlayer,$forces);
-		$return['ActualDamage'] =& $forces->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstForces($weaponPlayer, $forces);
+		$return['ActualDamage'] = & $forces->doWeaponDamage($return['WeaponDamage']);
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+			$return['KillResults'] = & $forces->killForcesByPlayer($weaponPlayer);
 		}
 		return $return;
 	}
 
 	protected function &doPlayerDamageToPlayer(array &$return, AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlayer($weaponPlayer,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlayer($weaponPlayer, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+			$return['KillResults'] = & $targetPlayer->killPlayerByPlayer($weaponPlayer);
 		}
 		return $return;
 	}
 
 	protected function &doPlayerDamageToPort(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPort($weaponPlayer,$port);
-		$return['ActualDamage'] =& $port->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPort($weaponPlayer, $port);
+		$return['ActualDamage'] = & $port->doWeaponDamage($return['WeaponDamage']);
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+			$return['KillResults'] = & $port->killPortByPlayer($weaponPlayer);
 		}
 		return $return;
 	}
 
 	protected function &doPlayerDamageToPlanet(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlanet($weaponPlayer,$planet);
-		$return['ActualDamage'] =& $planet->doWeaponDamage($return['WeaponDamage'],$delayed);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlanet($weaponPlayer, $planet);
+		$return['ActualDamage'] = & $planet->doWeaponDamage($return['WeaponDamage'], $delayed);
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+			$return['KillResults'] = & $planet->killPlanetByPlayer($weaponPlayer);
 		}
 		return $return;
 	}
 
 	protected function &doPortDamageToPlayer(array &$return, SmrPort $port, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedPortDamageAgainstPlayer($port,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedPortDamageAgainstPlayer($port, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+			$return['KillResults'] = & $targetPlayer->killPlayerByPort($port);
 		}
 		return $return;
 	}
 
 	protected function &doPlanetDamageToPlayer(array &$return, SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedPlanetDamageAgainstPlayer($planet,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedPlanetDamageAgainstPlayer($planet, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+			$return['KillResults'] = & $targetPlayer->killPlayerByPlanet($planet);
 		}
 		return $return;
 	}
 
 	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		}
 		return $return;
 	}

src/lib/Default/SmrMines.class.php

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		if ($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships
 			$damage['MaxDamage'] = IRound($damage['MaxDamage'] * self::FED_SHIP_DAMAGE_MODIFIER);
 			$damage['Shield'] = IRound($damage['Shield'] * self::FED_SHIP_DAMAGE_MODIFIER);
@@ -130,12 +130,12 @@ 
 	}
 
 	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
 		$return['ActualDamage']['Launched'] = ICeil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		}
 		return $return;
 	}

src/lib/Default/Rankings.class.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 		global $player, $db;
 		$offset = $minRank - 1;
 		$limit = $maxRank - $offset;
-		$db->query('SELECT alliance_id, alliance_' . $stat . ' AS amount FROM alliance WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER BY amount DESC, alliance_name LIMIT ' . $offset. ', ' . $limit);
+		$db->query('SELECT alliance_id, alliance_' . $stat . ' AS amount FROM alliance WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER BY amount DESC, alliance_name LIMIT ' . $offset . ', ' . $limit);
 		return self::collectAllianceRankings($db, $player, $offset);
 	}
 

src/engine/Default/rankings_alliance_experience.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	$template->assign('OurRank', $ourRank);
 }
 
-$expRanks = function (int $minRank, int $maxRank) use ($player, $db) : array {
+$expRanks = function(int $minRank, int $maxRank) use ($player, $db) : array {
 	$offset = $minRank - 1;
 	$limit = $maxRank - $offset;
 	$db->query('SELECT alliance_id, COALESCE(SUM(experience), 0) amount

src/engine/Default/rankings_alliance_profit.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	$template->assign('OurRank', $ourRank);
 }
 
-$profitRanks = function (int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
+$profitRanks = function(int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
 	$offset = $minRank - 1;
 	$limit = $maxRank - $offset;
 	$db->query('SELECT alliance_id, COALESCE(SUM(amount), 0) amount

src/engine/Default/rankings_player_profit.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 $totalPlayers = $player->getGame()->getTotalPlayers();
 
-$profitRanks = function (int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
+$profitRanks = function(int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
 	$offset = $minRank - 1;
 	$limit = $maxRank - $offset;
 	$db->query('SELECT p.*, COALESCE(ph.amount,0) amount FROM player p LEFT JOIN player_hof ph ON p.account_id = ph.account_id AND p.game_id = ph.game_id AND ph.type = ' . $profitTypeEscaped . ' WHERE p.game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER BY amount DESC, player_name ASC LIMIT ' . $offset . ', ' . $limit);