smrealms / smr

tools/discord/commands/turns.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 function get_turns_message($player) {
 	// turns only update when the player is active, so calculate current turns
 	$turns = min($player->getTurns() + $player->getTurnsGained(time(), true),
-	             $player->getMaxTurns());
+				 $player->getMaxTurns());
 	$msg = $player->getPlayerName() . " has $turns/" . $player->getMaxTurns() . " turns.";
 
 	// Calculate time to max turns if under the max

tools/chat_helpers/channel_msg_op_turns.php

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 			continue;
 		}
 		$turns = min($attendeePlayer->getTurns() + $attendeePlayer->getTurnsGained(time(), true),
-		             $attendeePlayer->getMaxTurns());
+					 $attendeePlayer->getMaxTurns());
 		$oppers[$attendeePlayer->getPlayerName()] = $turns;
 	}
 

engine/Default/rankings_alliance_vs_alliance.php

Indentation +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	foreach ($alliance_vs_ids as $id) {
 		$row_alliance = SmrAlliance::getAlliance($id, $player->getGameID());
 		$showRed = (!$curr_alliance->isNone() && $curr_alliance->hasDisbanded()) ||
-		           (!$row_alliance->isNone() && $row_alliance->hasDisbanded());
+				   (!$row_alliance->isNone() && $row_alliance->hasDisbanded());
 		$showBold = $curr_id == $player->getAllianceID() || $id == $player->getAllianceID();
 		$style = '';
 		if ($curr_id == $id && !$row_alliance->isNone()) {

engine/Default/trader_bounties.php

Indentation +1 added lines, -1 removed lines

@@ -15,4 +15,4 @@
 }
 
 $template->assign('AllClaims', array($player->getClaimableBounties('HQ'),
-                                     $player->getClaimableBounties('UG')));
+									 $player->getClaimableBounties('UG')));

engine/Default/combat_simulator.php

Braces +14 added lines, -8 removed lines

@@ -9,10 +9,11 @@ 
 $realAttackers = array();
 $attackers = array();
 $i=1;
-if(isset($_POST['attackers']))
+if(isset($_POST['attackers'])) {
 	foreach($_POST['attackers'] as $attackerName) {
 		if($attackerName=='none')
 			continue;
+}
 		if(isset($usedNames[$attackerName])) {
 			$duplicates = true;
 			continue;
@@ -24,17 +25,19 @@ 
 		++$i;
 	}
 
-for(;$i<=10;++$i)
+for(;$i<=10;++$i) {
 	$attackers[$i] = null;
+}
 $template->assign('Attackers',$attackers);
 
 $i=1;
 $realDefenders = array();
 $defenders = array();
-if(isset($_POST['defenders']))
+if(isset($_POST['defenders'])) {
 	foreach($_POST['defenders'] as $defenderName) {
 		if($defenderName=='none')
 			continue;
+}
 		if(isset($usedNames[$defenderName])) {
 			$duplicates = true;
 			continue;
@@ -46,8 +49,9 @@ 
 		++$i;
 	}
 	
-for(;$i<=10;++$i)
+for(;$i<=10;++$i) {
 	$defenders[$i] = null;
+}
 $template->assign('Defenders',$defenders);
 
 $template->assign('Duplicates',$duplicates);
@@ -62,12 +66,14 @@ 
 		while(count($realAttackers)>0 && count($realDefenders)>0) {
 			runAnAttack($realAttackers,$realDefenders);
 			foreach($realAttackers as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
-					unset($realAttackers[$key]);
+				if($teamPlayer->isDead()) {
+									unset($realAttackers[$key]);
+				}
 			} unset($teamPlayer);
 			foreach($realDefenders as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
-					unset($realDefenders[$key]);
+				if($teamPlayer->isDead()) {
+									unset($realDefenders[$key]);
+				}
 			} unset($teamPlayer);
 		}
 	}

Spacing +37 added lines, -37 removed lines

@@ -1,91 +1,91 @@
 <?php declare(strict_types=1);
-$template->assign('PageTopic','Combat Simulator');
+$template->assign('PageTopic', 'Combat Simulator');
 
-$template->assign('EditDummysLink',SmrSession::getNewHREF(create_container('skeleton.php','edit_dummys.php')));
+$template->assign('EditDummysLink', SmrSession::getNewHREF(create_container('skeleton.php', 'edit_dummys.php')));
 $template->assign('DummyNames', DummyPlayer::getDummyPlayerNames());
 
 $duplicates = false;
 $usedNames = array();
 $realAttackers = array();
 $attackers = array();
-$i=1;
-if(isset($_POST['attackers']))
-	foreach($_POST['attackers'] as $attackerName) {
-		if($attackerName=='none')
+$i = 1;
+if (isset($_POST['attackers']))
+	foreach ($_POST['attackers'] as $attackerName) {
+		if ($attackerName == 'none')
 			continue;
-		if(isset($usedNames[$attackerName])) {
+		if (isset($usedNames[$attackerName])) {
 			$duplicates = true;
 			continue;
 		}
 		$usedNames[$attackerName] = true;
-		$attackers[$i] =& DummyPlayer::getCachedDummyPlayer($attackerName);
+		$attackers[$i] = & DummyPlayer::getCachedDummyPlayer($attackerName);
 		$attackers[$i]->setAllianceID(1);
-		$realAttackers[$i] =& $attackers[$i];
+		$realAttackers[$i] = & $attackers[$i];
 		++$i;
 	}
 
-for(;$i<=10;++$i)
+for (;$i <= 10; ++$i)
 	$attackers[$i] = null;
-$template->assign('Attackers',$attackers);
+$template->assign('Attackers', $attackers);
 
-$i=1;
+$i = 1;
 $realDefenders = array();
 $defenders = array();
-if(isset($_POST['defenders']))
-	foreach($_POST['defenders'] as $defenderName) {
-		if($defenderName=='none')
+if (isset($_POST['defenders']))
+	foreach ($_POST['defenders'] as $defenderName) {
+		if ($defenderName == 'none')
 			continue;
-		if(isset($usedNames[$defenderName])) {
+		if (isset($usedNames[$defenderName])) {
 			$duplicates = true;
 			continue;
 		}
 		$usedNames[$attackerName] = true;
-		$defenders[$i] =& DummyPlayer::getCachedDummyPlayer($defenderName);
+		$defenders[$i] = & DummyPlayer::getCachedDummyPlayer($defenderName);
 		$defenders[$i]->setAllianceID(2);
-		$realDefenders[$i] =& $defenders[$i];
+		$realDefenders[$i] = & $defenders[$i];
 		++$i;
 	}
 	
-for(;$i<=10;++$i)
+for (;$i <= 10; ++$i)
 	$defenders[$i] = null;
-$template->assign('Defenders',$defenders);
+$template->assign('Defenders', $defenders);
 
-$template->assign('Duplicates',$duplicates);
+$template->assign('Duplicates', $duplicates);
 
-$template->assign('CombatSimHREF',SmrSession::getNewHREF(create_container('skeleton.php','combat_simulator.php')));
+$template->assign('CombatSimHREF', SmrSession::getNewHREF(create_container('skeleton.php', 'combat_simulator.php')));
 
 if (!empty($realAttackers) && !empty($realDefenders)) {
-	if(isset($_REQUEST['run'])) {
-		runAnAttack($realAttackers,$realDefenders);
+	if (isset($_REQUEST['run'])) {
+		runAnAttack($realAttackers, $realDefenders);
 	}
-	if(isset($_REQUEST['death_run'])) {
-		while(count($realAttackers)>0 && count($realDefenders)>0) {
-			runAnAttack($realAttackers,$realDefenders);
-			foreach($realAttackers as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
+	if (isset($_REQUEST['death_run'])) {
+		while (count($realAttackers) > 0 && count($realDefenders) > 0) {
+			runAnAttack($realAttackers, $realDefenders);
+			foreach ($realAttackers as $key => &$teamPlayer) {
+				if ($teamPlayer->isDead())
 					unset($realAttackers[$key]);
 			} unset($teamPlayer);
-			foreach($realDefenders as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
+			foreach ($realDefenders as $key => &$teamPlayer) {
+				if ($teamPlayer->isDead())
 					unset($realDefenders[$key]);
 			} unset($teamPlayer);
 		}
 	}
 }
 
-function runAnAttack($realAttackers,$realDefenders) {
+function runAnAttack($realAttackers, $realDefenders) {
 	global $template;
 	$results = array('Attackers' => array('Traders' => array(), 'TotalDamage' => 0), 
 					'Defenders' => array('Traders' => array(), 'TotalDamage' => 0));
 	foreach ($realAttackers as $accountID => $teamPlayer) {
-		$playerResults =& $teamPlayer->shootPlayers($realDefenders);
-		$results['Attackers']['Traders'][] =& $playerResults;
+		$playerResults = & $teamPlayer->shootPlayers($realDefenders);
+		$results['Attackers']['Traders'][] = & $playerResults;
 		$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 	}
 	foreach ($realDefenders as $accountID => $teamPlayer) {
-		$playerResults =& $teamPlayer->shootPlayers($realAttackers);
-		$results['Defenders']['Traders'][]  =& $playerResults;
+		$playerResults = & $teamPlayer->shootPlayers($realAttackers);
+		$results['Defenders']['Traders'][] = & $playerResults;
 		$results['Defenders']['TotalDamage'] += $playerResults['TotalDamage'];
 	}
-	$template->assign('TraderCombatResults',$results);
+	$template->assign('TraderCombatResults', $results);
 }

engine/Draft/alliance_pick.php

Indentation +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
 	$leader = SmrPlayer::getPlayer($db->getInt('leader_account_id'), $player->getGameID());
 	$pickedPlayer = SmrPlayer::getPlayer($db->getInt('picked_account_id'), $player->getGameID());
 	$history[] = array('Leader' => $leader,
-	                   'Player' => $pickedPlayer,
-	                   'Time'   => $db->getInt('time'));
+					   'Player' => $pickedPlayer,
+					   'Time'   => $db->getInt('time'));
 }
 
 $template->assign('History', $history);

engine/Draft/alliance_pick.inc

Indentation +3 added lines, -3 removed lines

@@ -15,11 +15,11 @@
 			// Special case for leaders who haven't made their own alliance yet,
 			// or are still in the Newbie Help Alliance.
 			$teams[$leader->getAccountId()] = array('Leader'   => $leader,
-			                                        'Size'     => 0);
+													'Size'     => 0);
 		} else {
 			$teams[$leader->getAccountId()] = array('Leader'   => $leader,
-			                                        'Alliance' => $alliance,
-			                                        'Size'     => $alliance->getNumMembers());
+													'Alliance' => $alliance,
+													'Size'     => $alliance->getNumMembers());
 		}
 	}
 

templates/Default/engine/Default/includes/TraderCombatKillMessage.inc

Indentation +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@
 } else {
 	// Killed by port, planet, forces
 	echo 'The <span class="creds"> ' . number_format($KillResults['LostCredits'])
-	     . '</span> credits that were onboard ' . $TargetPlayer->getDisplayName()
-	     . "'s ship are lost in the wreckage.<br />";
+		 . '</span> credits that were onboard ' . $TargetPlayer->getDisplayName()
+		 . "'s ship are lost in the wreckage.<br />";
 }
 ?>

templates/Default/admin/Default/ip_view_results.php

Indentation +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 	</center><?php
 
 } elseif (in_array($type, ['search', 'alliance_ips', 'wild_log', 'wild_in',
-                           'compare', 'compare_log', 'wild_ip', 'wild_host'])) { ?>
+						   'compare', 'compare_log', 'wild_ip', 'wild_host'])) { ?>
 
 	<center>
 		<?php echo $Summary; ?><br /><br />