smrealms / smr

templates/Default/engine/Default/includes/ForcesCombatResults.inc

Spacing +26 added lines, -26 removed lines

@@ -1,34 +1,34 @@ 
 <?php
-if(isset($ForcesCombatResults['Results']) && is_array($ForcesCombatResults['Results'])) {
-	foreach($ForcesCombatResults['Results'] as $ForceType => $ForceResults) {
-		$ShootingWeapon =& $ForceResults['Weapon'];
-		$ShotHit =& $ForceResults['Hit'];
-		$ActualDamage =& $ForceResults['ActualDamage'];
-		$WeaponDamage =& $ForceResults['WeaponDamage'];
-		$TargetPlayer =& $ForceResults['TargetPlayer'];
+if (isset($ForcesCombatResults['Results']) && is_array($ForcesCombatResults['Results'])) {
+	foreach ($ForcesCombatResults['Results'] as $ForceType => $ForceResults) {
+		$ShootingWeapon = & $ForceResults['Weapon'];
+		$ShotHit = & $ForceResults['Hit'];
+		$ActualDamage = & $ForceResults['ActualDamage'];
+		$WeaponDamage = & $ForceResults['WeaponDamage'];
+		$TargetPlayer = & $ForceResults['TargetPlayer'];
 		?>
 		<span class="cds"><?php echo isset($ActualDamage['Launched']) ? $ActualDamage['Launched'] : $WeaponDamage['Launched']; ?></span><?php
-		if($ForceType == 'Mines') {
+		if ($ForceType == 'Mines') {
 			?> mines kamikaze themselves against <?php
-		} else if($ForceType == 'Drones') {
+		} else if ($ForceType == 'Drones') {
 			?> combat drones launch at <?php
-		} else if($ForceType == 'Scouts') {
+		} else if ($ForceType == 'Scouts') {
 			?> scout drones kamikaze themselves against <?php
 		}
 		
-		if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php }
+		if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php }
 		echo $TargetPlayer->getDisplayName();
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
-			if(!$ShotHit) {
+			if (!$ShotHit) {
 				?> and misses<?php
-			} else if($ActualDamage['TotalDamage'] == 0) {
-				if($WeaponDamage['Shield'] > 0) {
-					if($ActualDamage['HasCDs']) {
+			} else if ($ActualDamage['TotalDamage'] == 0) {
+				if ($WeaponDamage['Shield'] > 0) {
+					if ($ActualDamage['HasCDs']) {
 						?> which proves ineffective against their combat drones<?php
 					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				} else if($WeaponDamage['Armour'] > 0) {
+				} else if ($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
 				} else {
 					?> but it cannot do any damage<?php
@@ -37,31 +37,31 @@ 
 				?> destroying <?php
 			}
 			$DamageTypes = 0;
-			if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-			if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-			if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+			if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+			if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+			if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
-			if($ActualDamage['Shield'] > 0) {
+			if ($ActualDamage['Shield'] > 0) {
 				?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 				$this->doDamageTypeReductionDisplay($DamageTypes);
 			}
-			if($ActualDamage['NumCDs'] > 0) {
+			if ($ActualDamage['NumCDs'] > 0) {
 				?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> drones<?php
 				$this->doDamageTypeReductionDisplay($DamageTypes);
 			}
-			if($ActualDamage['Armour'] > 0) {
+			if ($ActualDamage['Armour'] > 0) {
 				?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 			}
 		} ?>.
 		<br /><?php
 		if ($ShotHit && $ActualDamage['KillingShot']) {
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$ForceResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$ForceResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 		}
 	}
 }
-if(isset($ForcesCombatResults['ForcesDestroyed']) && $ForcesCombatResults['ForcesDestroyed']) {
+if (isset($ForcesCombatResults['ForcesDestroyed']) && $ForcesCombatResults['ForcesDestroyed']) {
 	?>Forces are <span class="red">DESTROYED!</span><br /><?php
 }
 
-$TotalDamage =& $ForcesCombatResults['TotalDamage'] ?>
-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 } ?>.
+$TotalDamage = & $ForcesCombatResults['TotalDamage'] ?>
+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 } ?>.

templates/Default/engine/Default/includes/TraderTeamCombatResults.inc

Spacing +48 added lines, -48 removed lines

@@ -1,36 +1,36 @@ 
 <?php
-if(is_array($TraderTeamCombatResults['Traders'])) {
-	foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
-		$ShootingPlayer =& $TraderResults['Player'];
-		$TotalDamage =& $TraderResults['TotalDamage'];
+if (is_array($TraderTeamCombatResults['Traders'])) {
+	foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
+		$ShootingPlayer = & $TraderResults['Player'];
+		$TotalDamage = & $TraderResults['TotalDamage'];
 	
-		if($TraderResults['DeadBeforeShot']) {
+		if ($TraderResults['DeadBeforeShot']) {
 			echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php
 		} else {
-			if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
-				foreach($TraderResults['Weapons'] as $WeaponResults) {
-					$ShootingWeapon =& $WeaponResults['Weapon'];
-					$ShotHit =& $WeaponResults['Hit'];
-					$ActualDamage =& $WeaponResults['ActualDamage'];
-					$WeaponDamage =& $WeaponResults['WeaponDamage'];
-					$TargetPlayer =& $WeaponResults['TargetPlayer'];
+			if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
+				foreach ($TraderResults['Weapons'] as $WeaponResults) {
+					$ShootingWeapon = & $WeaponResults['Weapon'];
+					$ShotHit = & $WeaponResults['Hit'];
+					$ActualDamage = & $WeaponResults['ActualDamage'];
+					$WeaponDamage = & $WeaponResults['WeaponDamage'];
+					$TargetPlayer = & $WeaponResults['TargetPlayer'];
 					
 					echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php
-					if($ShotHit && $ActualDamage['TargetAlreadyDead']) {
+					if ($ShotHit && $ActualDamage['TargetAlreadyDead']) {
 						?>the debris that was once <?php
 					}
 					echo $TargetPlayer->getDisplayName();
 					if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
-						if(!$ShotHit) {
+						if (!$ShotHit) {
 							?> and misses<?php
-						} else if($ActualDamage['TotalDamage'] == 0) {
-							if($WeaponDamage['Shield'] > 0) {
-								if($ActualDamage['HasCDs']) {
+						} else if ($ActualDamage['TotalDamage'] == 0) {
+							if ($WeaponDamage['Shield'] > 0) {
+								if ($ActualDamage['HasCDs']) {
 									?> which proves ineffective against their combat drones<?php
 								} else {
 									?> which washes harmlessly over their hull<?php
 								}
-							} else if($WeaponDamage['Armour'] > 0) {
+							} else if ($WeaponDamage['Armour'] > 0) {
 								?> which is deflected by their shields<?php
 							} else {
 								?> but it cannot do any damage<?php
@@ -38,94 +38,94 @@ 
 						} else {
 							?> destroying <?php
 							$DamageTypes = 0;
-							if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-							if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-							if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+							if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+							if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+							if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
-							if($ActualDamage['Shield'] > 0) {
+							if ($ActualDamage['Shield'] > 0) {
 								?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumCDs'] > 0) {
+							if ($ActualDamage['NumCDs'] > 0) {
 								?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['Armour'] > 0) {
+							if ($ActualDamage['Armour'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 							}
 						}
 					} ?>.
 					<br /><?php
 					if ($ShotHit && $ActualDamage['KillingShot']) {
-						$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer));
+						$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
 					}
 				}
 			}
-			if(isset($TraderResults['Drones'])) {
-				$Drones =& $TraderResults['Drones'];
-				$ActualDamage =& $Drones['ActualDamage'];
-				$WeaponDamage =& $Drones['WeaponDamage'];
-				$TargetPlayer =& $Drones['TargetPlayer'];
+			if (isset($TraderResults['Drones'])) {
+				$Drones = & $TraderResults['Drones'];
+				$ActualDamage = & $Drones['ActualDamage'];
+				$WeaponDamage = & $Drones['WeaponDamage'];
+				$TargetPlayer = & $Drones['TargetPlayer'];
 				$DamageTypes = 0;
-				if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+				if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 	
 				echo $ShootingPlayer->getDisplayName();
-				if($WeaponDamage['Launched'] == 0) {
+				if ($WeaponDamage['Launched'] == 0) {
 					?> fails to launch their combat drones<?php
 				} else {
 					?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php
-					if($ActualDamage['TargetAlreadyDead']) {
+					if ($ActualDamage['TargetAlreadyDead']) {
 						?>the debris that was once <?php
 					}
 					echo $TargetPlayer->getDisplayName();
-					if(!$ActualDamage['TargetAlreadyDead']) {
-						if($ActualDamage['TotalDamage'] == 0) {
-							if($WeaponDamage['Shield'] > 0) {
-								if($ActualDamage['HasCDs']) {
+					if (!$ActualDamage['TargetAlreadyDead']) {
+						if ($ActualDamage['TotalDamage'] == 0) {
+							if ($WeaponDamage['Shield'] > 0) {
+								if ($ActualDamage['HasCDs']) {
 									?> which prove ineffective against their combat drones<?php
 								} else {
 									?> which washes harmlessly over their hull<?php
 								}
 							}
-							if($ActualDamage['Armour'] > 0) {
+							if ($ActualDamage['Armour'] > 0) {
 								?> which is deflected by their shields<?php
 							} else {
 								?> but they cannot do any damage<?php
 							}
 						} else {
 							?> destroying <?php
-							if($ActualDamage['Shield'] > 0) {
+							if ($ActualDamage['Shield'] > 0) {
 								?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumCDs'] > 0) {
+							if ($ActualDamage['NumCDs'] > 0) {
 								?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['Armour'] > 0) {
+							if ($ActualDamage['Armour'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 							}
 						}
 					}
 				} ?>.
 				<br /><?php
-				if($ActualDamage['KillingShot']) {
-					$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer));
+				if ($ActualDamage['KillingShot']) {
+					$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
 				}
 			}
 		}
 		echo $ShootingPlayer->getDisplayName();
-		if($TotalDamage > 0) {
+		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.<?php
-			if(!$TraderResults['DeadBeforeShot']) {
+			if (!$TraderResults['DeadBeforeShot']) {
 				?> Maybe they should go back to the academy<?php
 			}
 		} ?>.<br /><br /><?php
 	}
 }
 $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?>
-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 />
+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 />

engine/Default/cargo_dump_processing.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 	// Don't lose more exp than you have
 	$lost_xp = min($player->getExperience(),
-	               IRound(SmrPort::getBaseExperience($amount, $good_distance)));
+				   IRound(SmrPort::getBaseExperience($amount, $good_distance)));
 	$player->decreaseExperience($lost_xp);
 	$player->increaseHOF($lost_xp, array('Trade', 'Experience', 'Jettisoned'), HOF_PUBLIC);
 

engine/Default/shop_hardware_processing.php

Braces +15 added lines, -9 removed lines

@@ -1,8 +1,9 @@ 
 <?php declare(strict_types=1);
 $action = $_REQUEST['action'];
 $amount = $_REQUEST['amount'];
-if (!is_numeric($amount))
+if (!is_numeric($amount)) {
 	create_error('Numbers only please');
+}
 
 // only whole numbers allowed
 $amount = floor($amount);
@@ -12,8 +13,9 @@ 
 $cost = Globals::getHardwareCost($hardware_id);
 
 // no negative amounts are allowed
-if ($amount <= 0)
+if ($amount <= 0) {
 	create_error('You must actually enter an amount greater than zero!');
+}
 
 if ($action == 'Buy') {
 	// do we have enough cash?
@@ -30,11 +32,16 @@ 
 	$ship->increaseHardware($hardware_id, $amount);
 
 	//HoF
-	if ($hardware_id == HARDWARE_COMBAT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_SCOUT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_MINE) $player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
-}
-else if ($action == 'Sell') {
+	if ($hardware_id == HARDWARE_COMBAT) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
+	}
+	if ($hardware_id == HARDWARE_SCOUT) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
+	}
+	if ($hardware_id == HARDWARE_MINE) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
+	}
+	} else if ($action == 'Sell') {
 	// We only allow selling combat drones
 	if ($hardware_id != HARDWARE_COMBAT) {
 		throw new Exception('This item cannot be sold!');
@@ -47,8 +54,7 @@ 
 
 	$player->increaseCredits(IRound($cost * CDS_REFUND_PERCENT) * $amount);
 	$ship->decreaseCDs($amount, true); // 2nd arg avoids under attack warning
-}
-else {
+} else {
 	throw new Exception('Action must be either Buy or Sell.');
 }
 

lib/Default/SmrWeapon.class.php

Spacing +4 added lines, -4 removed lines

@@ -192,21 +192,21 @@ 
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
 		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		return $damage;
 	}
 	
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
 		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		return $damage;
 	}
 	
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
 		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		
 		$planetMod = self::PLANET_DAMAGE_MOD;
 		$damage['MaxDamage'] = ICeil($damage['MaxDamage'] * $planetMod);
@@ -226,7 +226,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		return $damage;
 	}
 	

Braces +20 added lines, -11 removed lines

@@ -12,17 +12,19 @@ 
 
 	
 	protected static function initialiseDatabase() {
-		if (self::$db == null)
-			self::$db = new SmrMySqlDatabase();
+		if (self::$db == null) {
+					self::$db = new SmrMySqlDatabase();
+		}
 	}
 
 	public static function getWeapon($weaponTypeID, $forceUpdate = false, $db = null) {
 		if ($forceUpdate || !isset(self::$CACHE_WEAPONS[$weaponTypeID])) {
 			$w = new SmrWeapon($weaponTypeID, $db);
-			if ($w->exists())
-				self::$CACHE_WEAPONS[$weaponTypeID] = $w;
-			else
-				self::$CACHE_WEAPONS[$weaponTypeID] = false;
+			if ($w->exists()) {
+							self::$CACHE_WEAPONS[$weaponTypeID] = $w;
+			} else {
+							self::$CACHE_WEAPONS[$weaponTypeID] = false;
+			}
 		}
 		return self::$CACHE_WEAPONS[$weaponTypeID];
 	}
@@ -151,8 +153,9 @@ 
 		$weaponShip = $weaponPlayer->getShip();
 		$targetShip = $targetPlayer->getShip();
 		$mrDiff = $targetShip->getMR() - $weaponShip->getMR();
-		if ($mrDiff > 0)
-			$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		if ($mrDiff > 0) {
+					$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		}
 	
 		return $modifiedAccuracy;
 	}
@@ -190,22 +193,28 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootForces()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		return $damage;
 	}
 	
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPorts()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		return $damage;
 	}
 	
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPlanets()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		
 		$planetMod = self::PLANET_DAMAGE_MOD;

lib/Default/SmrMines.class.php

Spacing +4 added lines, -4 removed lines

@@ -94,7 +94,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);
@@ -131,12 +131,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;
 	}

lib/Default/SmrCombatDrones.class.php

Spacing +7 added lines, -7 removed lines

@@ -129,7 +129,7 @@ 
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
 		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces) / 100);
 		$damage['Kamikaze'] = 0;
 		if ($weaponPlayer->isCombatDronesKamikazeOnMines()) { // If kamikaze then damage is same as MINE_ARMOUR
@@ -151,7 +151,7 @@ 
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
 		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port) / 100);
 		$damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ICeil($damage['Launched'] * $damage['Shield']);
@@ -163,7 +163,7 @@ 
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
 		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet) / 100);
 		$planetMod = self::PLANET_DAMAGE_MOD;
 		$damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage'] * $planetMod);
@@ -178,7 +178,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT;
 			$damage['Shield'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT;
@@ -196,7 +196,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		
 		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_FORCE_DAMAGE_DECIMAL_PERCENT;
@@ -216,7 +216,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		
 		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_PORT_DAMAGE_DECIMAL_PERCENT;
@@ -235,7 +235,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		
 		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_PLANET_DAMAGE_DECIMAL_PERCENT;

Braces +13 added lines, -7 removed lines

@@ -13,8 +13,7 @@ 
 			$this->maxDamage = 2;
 			$this->shieldDamage = 2;
 			$this->armourDamage = 2;
-		}
-		else {
+		} else {
 			$this->maxDamage = 1;
 			$this->shieldDamage = 1;
 			$this->armourDamage = 1;
@@ -84,8 +83,9 @@ 
 		$weaponShip = $weaponPlayer->getShip();
 		$targetShip = $targetPlayer->getShip();
 		$mrDiff = $targetShip->getMR() - $weaponShip->getMR();
-		if ($mrDiff > 0)
-			$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		if ($mrDiff > 0) {
+					$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		}
 	
 		return max(0, min(100, $modifiedAccuracy));
 	}
@@ -127,8 +127,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootForces()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces) / 100);
 		$damage['Kamikaze'] = 0;
@@ -149,8 +151,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPorts()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port) / 100);
 		$damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']);
@@ -161,8 +165,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPlanets()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet) / 100);
 		$planetMod = self::PLANET_DAMAGE_MOD;

lib/Default/SmrScoutDrones.class.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfSDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces, $targetPlayer) / 100);
 		$damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ICeil($damage['Launched'] * $damage['Shield']);

lib/Default/Routes/RouteGenerator.class.php

Indentation +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 				foreach (\Globals::getGoods() as $goodId => $value) {
 					if ($goods[$goodId]===true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_SELLS &&
-						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
+							$sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
 							$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
 						}
 					}
@@ -116,7 +116,7 @@ 
 				foreach (\Globals::getGoods() as $goodId => $value) {
 					if ($goods[$goodId]===true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_SELLS &&
-						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
+							$sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
 							$owr = new OneWayRoute($currentSectorId, $targetSectorId, $sectors[$currentSectorId]->getPort()->getRaceID(), $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
 							$fakeReturn = new OneWayRoute($targetSectorId, $currentSectorId, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOOD_NOTHING);
 							$mpr = new MultiplePortRoute($owr, $fakeReturn);

Spacing +20 added lines, -20 removed lines

@@ -72,24 +72,24 @@ 
 		$routes = array();
 		foreach ($distances as $currentSectorId => $d) {
 			$raceID = $sectors[$currentSectorId]->getPort()->getRaceID();
-			if (isset($races[$raceID])===false) {
-				echo 'Error with Race ID: '.$sectors[$currentSectorId]->getPort()->getRaceID();
+			if (isset($races[$raceID]) === false) {
+				echo 'Error with Race ID: ' . $sectors[$currentSectorId]->getPort()->getRaceID();
 				continue;
 			}
-			if($races[$raceID]===false)
+			if ($races[$raceID] === false)
 				continue;
 			$rl = array();
 			foreach ($d as $targetSectorId => $distance) {
 				if (!$races[$sectors[$targetSectorId]->getPort()->getRaceID()])
 					continue;
-				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
+				if ($routesForPort !== -1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
 					continue;
 
-				if ($goods[GOOD_NOTHING]===true)
+				if ($goods[GOOD_NOTHING] === true)
 					$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOOD_NOTHING);
 
 				foreach (\Globals::getGoods() as $goodId => $value) {
-					if ($goods[$goodId]===true) {
+					if ($goods[$goodId] === true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_SELLS &&
 						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
 							$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
@@ -105,16 +105,16 @@ 
 	public static function generateOneWayRoutes(array $sectors, array $distances, array $goods, array $races, int $routesForPort) : array {
 		self::initialize();
 		foreach ($distances as $currentSectorId => $d) {
-			if ($races[$sectors[$currentSectorId]->getPort()->getRaceID()]===false)
+			if ($races[$sectors[$currentSectorId]->getPort()->getRaceID()] === false)
 				continue;
 			foreach ($d as $targetSectorId => $distance) {
-				if ($races[$sectors[$targetSectorId]->getPort()->getRaceID()]===false)
+				if ($races[$sectors[$targetSectorId]->getPort()->getRaceID()] === false)
 					continue;
-				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
+				if ($routesForPort !== -1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
 					continue;
 
 				foreach (\Globals::getGoods() as $goodId => $value) {
-					if ($goods[$goodId]===true) {
+					if ($goods[$goodId] === true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_SELLS &&
 						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
 							$owr = new OneWayRoute($currentSectorId, $targetSectorId, $sectors[$currentSectorId]->getPort()->getRaceID(), $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
@@ -160,18 +160,18 @@ 
 		$i = 0;
 		krsort(self::$expRoutes, SORT_NUMERIC);
 		foreach (self::$expRoutes as $multi => $routesByMulti) {
-			if(count($routesByMulti)+$i < $trimToBestXRoutes) {
+			if (count($routesByMulti) + $i < $trimToBestXRoutes) {
 				$i += count($routesByMulti);
 			}
-			else if($i > $trimToBestXRoutes) {
+			else if ($i > $trimToBestXRoutes) {
 				unset(self::$expRoutes[$multi]);
 			}
 			else {
-				foreach($routesByMulti as $key => $value) {
+				foreach ($routesByMulti as $key => $value) {
 					$i++;
-					if($i < $trimToBestXRoutes)
+					if ($i < $trimToBestXRoutes)
 						continue;
-					if($i === $trimToBestXRoutes) {
+					if ($i === $trimToBestXRoutes) {
 						self::$dontAddWorseThan[self::EXP_ROUTE] = $multi;
 						continue;
 					}
@@ -183,19 +183,19 @@ 
 		$i = 0;
 		krsort(self::$moneyRoutes, SORT_NUMERIC);
 		foreach (self::$moneyRoutes as $multi => $routesByMulti) {
-			if(count($routesByMulti)+$i < $trimToBestXRoutes) {
+			if (count($routesByMulti) + $i < $trimToBestXRoutes) {
 				$i += count($routesByMulti);
 			}
-			else if($i > $trimToBestXRoutes) {
+			else if ($i > $trimToBestXRoutes) {
 				unset(self::$moneyRoutes[$multi]);
 				continue;
 			}
 			else {
-				foreach($routesByMulti as $key => $value) {
+				foreach ($routesByMulti as $key => $value) {
 					$i++;
-					if($i < $trimToBestXRoutes)
+					if ($i < $trimToBestXRoutes)
 						continue;
-					if($i === $trimToBestXRoutes) {
+					if ($i === $trimToBestXRoutes) {
 						self::$dontAddWorseThan[self::MONEY_ROUTE] = $multi;
 						continue;
 					}

Braces +36 added lines, -30 removed lines

@@ -52,15 +52,16 @@ 
 	private static function getContinueRoutes(int $maxNumPorts, int $startSectorId, Route $routeToContinue, array $forwardRoutes, array $routeLists, bool $lastGoodIsNothing) : void {
 		foreach ($forwardRoutes as $currentStepRoute) {
 			$currentStepBuySector = $currentStepRoute->getBuySectorId();
-			if ($lastGoodIsNothing && ($lastGoodIsNothing = GOOD_NOTHING === $currentStepRoute->getGoodID()))
-				continue; // Don't do two nothings in a row
+			if ($lastGoodIsNothing && ($lastGoodIsNothing = GOOD_NOTHING === $currentStepRoute->getGoodID())) {
+							continue;
+			}
+			// Don't do two nothings in a row
 			if ($currentStepBuySector >= $startSectorId) { // Not already checked or back to start
 				if ($currentStepBuySector === $startSectorId) { // Route returns to start
 					$mpr = new MultiplePortRoute($routeToContinue, $currentStepRoute);
 					self::addExpRoute($mpr);
 					self::addMoneyRoute($mpr);
-				}
-				else if ($maxNumPorts > 1 && !$routeToContinue->containsPort($currentStepBuySector)) {
+				} else if ($maxNumPorts > 1 && !$routeToContinue->containsPort($currentStepBuySector)) {
 					$mpr = new MultiplePortRoute($routeToContinue, $currentStepRoute);
 					self::getContinueRoutes($maxNumPorts - 1, $startSectorId, $mpr, $routeLists[$currentStepBuySector], $routeLists, $lastGoodIsNothing);
 				}
@@ -76,17 +77,21 @@ 
 				echo 'Error with Race ID: '.$sectors[$currentSectorId]->getPort()->getRaceID();
 				continue;
 			}
-			if($races[$raceID]===false)
-				continue;
+			if($races[$raceID]===false) {
+							continue;
+			}
 			$rl = array();
 			foreach ($d as $targetSectorId => $distance) {
-				if (!$races[$sectors[$targetSectorId]->getPort()->getRaceID()])
-					continue;
-				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
-					continue;
+				if (!$races[$sectors[$targetSectorId]->getPort()->getRaceID()]) {
+									continue;
+				}
+				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort) {
+									continue;
+				}
 
-				if ($goods[GOOD_NOTHING]===true)
-					$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOOD_NOTHING);
+				if ($goods[GOOD_NOTHING]===true) {
+									$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOOD_NOTHING);
+				}
 
 				foreach (\Globals::getGoods() as $goodId => $value) {
 					if ($goods[$goodId]===true) {
@@ -105,13 +110,16 @@ 
 	public static function generateOneWayRoutes(array $sectors, array $distances, array $goods, array $races, int $routesForPort) : array {
 		self::initialize();
 		foreach ($distances as $currentSectorId => $d) {
-			if ($races[$sectors[$currentSectorId]->getPort()->getRaceID()]===false)
-				continue;
+			if ($races[$sectors[$currentSectorId]->getPort()->getRaceID()]===false) {
+							continue;
+			}
 			foreach ($d as $targetSectorId => $distance) {
-				if ($races[$sectors[$targetSectorId]->getPort()->getRaceID()]===false)
-					continue;
-				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
-					continue;
+				if ($races[$sectors[$targetSectorId]->getPort()->getRaceID()]===false) {
+									continue;
+				}
+				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort) {
+									continue;
+				}
 
 				foreach (\Globals::getGoods() as $goodId => $value) {
 					if ($goods[$goodId]===true) {
@@ -162,15 +170,14 @@ 
 		foreach (self::$expRoutes as $multi => $routesByMulti) {
 			if(count($routesByMulti)+$i < $trimToBestXRoutes) {
 				$i += count($routesByMulti);
-			}
-			else if($i > $trimToBestXRoutes) {
+			} else if($i > $trimToBestXRoutes) {
 				unset(self::$expRoutes[$multi]);
-			}
-			else {
+			} else {
 				foreach($routesByMulti as $key => $value) {
 					$i++;
-					if($i < $trimToBestXRoutes)
-						continue;
+					if($i < $trimToBestXRoutes) {
+											continue;
+					}
 					if($i === $trimToBestXRoutes) {
 						self::$dontAddWorseThan[self::EXP_ROUTE] = $multi;
 						continue;
@@ -185,16 +192,15 @@ 
 		foreach (self::$moneyRoutes as $multi => $routesByMulti) {
 			if(count($routesByMulti)+$i < $trimToBestXRoutes) {
 				$i += count($routesByMulti);
-			}
-			else if($i > $trimToBestXRoutes) {
+			} else if($i > $trimToBestXRoutes) {
 				unset(self::$moneyRoutes[$multi]);
 				continue;
-			}
-			else {
+			} else {
 				foreach($routesByMulti as $key => $value) {
 					$i++;
-					if($i < $trimToBestXRoutes)
-						continue;
+					if($i < $trimToBestXRoutes) {
+											continue;
+					}
 					if($i === $trimToBestXRoutes) {
 						self::$dontAddWorseThan[self::MONEY_ROUTE] = $multi;
 						continue;