smrealms / smr

tools/npc/chess.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 	fclose($toEngine);
 	fclose($fromEngine);
 	proc_close($engine);
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	logException($e);
 	exit;
 }

engine/Default/trader_status.php

Braces +18 added lines, -6 removed lines

@@ -33,12 +33,24 @@
 $template->assign('HardwareHREF', SmrSession::getNewHREF($container));
 
 $hardware = [];
-if ($ship->canHaveScanner()) $hardware[] = 'Scanner';
-if ($ship->canHaveIllusion()) $hardware[] = 'Illusion Generator';
-if ($ship->canHaveCloak()) $hardware[] = 'Cloaking Device';
-if ($ship->canHaveJump()) $hardware[] = 'Jump Drive';
-if ($ship->canHaveDCS()) $hardware[] = 'Drone Scrambler';
-if (empty($hardware)) $hardware[] = 'none';
+if ($ship->canHaveScanner()) {
+	$hardware[] = 'Scanner';
+}
+if ($ship->canHaveIllusion()) {
+	$hardware[] = 'Illusion Generator';
+}
+if ($ship->canHaveCloak()) {
+	$hardware[] = 'Cloaking Device';
+}
+if ($ship->canHaveJump()) {
+	$hardware[] = 'Jump Drive';
+}
+if ($ship->canHaveDCS()) {
+	$hardware[] = 'Drone Scrambler';
+}
+if (empty($hardware)) {
+	$hardware[] = 'none';
+}
 $template->assign('Hardware', $hardware);
 
 $db->query('SELECT level_name,requirement FROM level WHERE requirement>' . $db->escapeNumber($player->getExperience()) . ' ORDER BY requirement ASC LIMIT 1');

engine/Default/sector_scan.php

Braces +15 added lines, -12 removed lines

@@ -17,21 +17,23 @@ 
 // iterate over all forces in the target sector
 foreach ($scanSector->getForces() as $scanSectorForces) {
 	// decide if it's a friendly or enemy stack
-	if ($player->sameAlliance($scanSectorForces->getOwner()))
-		$friendly_forces += $scanSectorForces->getMines() * 3 + $scanSectorForces->getCDs() * 2 + $scanSectorForces->getSDs();
-	else
-		$enemy_forces += $scanSectorForces->getMines() * 3 + $scanSectorForces->getCDs() * 2 + $scanSectorForces->getSDs();
-}
+	if ($player->sameAlliance($scanSectorForces->getOwner())) {
+			$friendly_forces += $scanSectorForces->getMines() * 3 + $scanSectorForces->getCDs() * 2 + $scanSectorForces->getSDs();
+	} else {
+			$enemy_forces += $scanSectorForces->getMines() * 3 + $scanSectorForces->getCDs() * 2 + $scanSectorForces->getSDs();
+	}
+	}
 
 foreach ($scanSector->getOtherTraders($player) as $scanSectorPlayer) {
 	$scanSectorShip = $scanSectorPlayer->getShip();
 
 	// he's a friend if he's in our alliance (and we are not in a 0 alliance
-	if ($player->traderMAPAlliance($scanSectorPlayer))
-		$friendly_vessel += $scanSectorShip->getAttackRating();
-	else
-		$enemy_vessel += $scanSectorShip->getDefenseRating() * 10;
-}
+	if ($player->traderMAPAlliance($scanSectorPlayer)) {
+			$friendly_vessel += $scanSectorShip->getAttackRating();
+	} else {
+			$enemy_vessel += $scanSectorShip->getDefenseRating() * 10;
+	}
+	}
 
 $template->assign('FriendlyVessel', $friendly_vessel);
 $template->assign('FriendlyForces', $friendly_forces);
@@ -39,10 +41,11 @@ 
 $template->assign('EnemyForces', $enemy_forces);
 
 // is it a warp or a normal move?
-if ($sector->getWarp() == $var['target_sector'])
+if ($sector->getWarp() == $var['target_sector']) {
 	$turns = TURNS_PER_WARP;
-else
+} else {
 	$turns = TURNS_PER_SECTOR;
+}
 
 $template->assign('ScanSector', $scanSector);
 $template->assign('Turns', $turns);

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);
 		}
 	}

templates/Default/admin/Default/1.6/GameDetails.inc

Braces +4 added lines, -1 removed lines

@@ -44,7 +44,10 @@
 		<td>
 			<select name="game_type" class="InputFields"><?php
 			foreach (SmrGame::GAME_TYPES as $GameTypeID => $GameType) {
-				?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) echo 'selected'; ?>><?php echo $GameType; ?></option><?php
+				?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) {
+					echo 'selected';
+				}
+				?>><?php echo $GameType; ?></option><?php
 			} ?>
 			</select>
 		</td>

templates/Default/engine/Default/beta_functions.php

Braces +14 added lines, -4 removed lines

@@ -76,8 +76,13 @@ 
 	<input type="number" name="amount" value="0" min="<?php echo MIN_GLOBAL_RELATIONS; ?>" max="<?php echo MAX_GLOBAL_RELATIONS; ?>" style="width:75px" />&nbsp;
 	<select name="race" class="InputFields"><?php
 		foreach (Globals::getRaces() as $race) {
-			if ($race['Race ID'] == $ThisPlayer->getRaceID()) continue;
-			if ($race['Race ID'] == RACE_NEUTRAL) continue; ?>
+			if ($race['Race ID'] == $ThisPlayer->getRaceID()) {
+				continue;
+			}
+			if ($race['Race ID'] == RACE_NEUTRAL) {
+				continue;
+			}
+			?>
 			<option value="<?php echo $race['Race ID']; ?>"><?php echo $race['Race Name']; ?></option><?php
 		} ?>
 	</select>&nbsp;&nbsp;
@@ -88,8 +93,13 @@ 
 <form method="POST" action="<?php echo $ChangeRaceHREF; ?>">
 	<select name="race" class="InputFields"><?php
 		foreach (Globals::getRaces() as $race) {
-			if ($race['Race ID'] == $ThisPlayer->getRaceID()) continue;
-			if ($race['Race ID'] == RACE_NEUTRAL) continue; ?>
+			if ($race['Race ID'] == $ThisPlayer->getRaceID()) {
+				continue;
+			}
+			if ($race['Race ID'] == RACE_NEUTRAL) {
+				continue;
+			}
+			?>
 			<option value="<?php echo $race['Race ID']; ?>"><?php echo $race['Race Name']; ?></option><?php
 		} ?>
 	</select>&nbsp;&nbsp;

tools/irc/channel_msg.php

Braces +49 added lines, -34 removed lines

@@ -47,8 +47,7 @@ 
 	// get smr player
 	try {
 		$player = SmrPlayer::getPlayer($account->getAccountID(), $alliance->getGameId(), true);
-	}
-	catch (PlayerNotFoundException $e) {
+	} catch (PlayerNotFoundException $e) {
 		if ($validationMessages === true) {
 			fputs($fp, 'PRIVMSG ' . $channel . ' :' . $nick . ', you have not joined the game that this channel belongs to.' . EOL);
 		}
@@ -85,36 +84,50 @@ 
 			return true;
 		}
 
-		if (channel_msg_money($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_forces($fp, $rdata, $account, $player))
-			return true;
+		if (channel_msg_money($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_forces($fp, $rdata, $account, $player)) {
+					return true;
+		}
 
-		if (channel_msg_seed($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_seedlist_add($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_seedlist_del($fp, $rdata, $account, $player))
-			return true;
+		if (channel_msg_seed($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_seedlist_add($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_seedlist_del($fp, $rdata, $account, $player)) {
+					return true;
+		}
 
-		if (channel_msg_op_info($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_op_cancel($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_op_set($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_op_turns($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_op_response($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_op_list($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_sd_set($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_sd_del($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_sd_list($fp, $rdata, $account, $player))
-			return true;
+		if (channel_msg_op_info($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_op_cancel($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_op_set($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_op_turns($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_op_response($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_op_list($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_sd_set($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_sd_del($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_sd_list($fp, $rdata, $account, $player)) {
+					return true;
+		}
 
 	}
 
@@ -253,8 +266,9 @@ 
 		$countdown = intval($msg[5]);
 		$message = 'ALERT! ALERT! ALERT!';
 
-		if (isset($msg[6]))
-			$message .= ' ' . $msg[6];
+		if (isset($msg[6])) {
+					$message .= ' ' . $msg[6];
+		}
 
 		echo_r('[TIMER] ' . $nick . ' started a timer with ' . $countdown . ' minute(s) (' . $message . ') in ' . $channel);
 
@@ -364,8 +378,9 @@ 
 		if ($topic == 'seen') {
 			fputs($fp, 'NOTICE ' . $nick . ' :Syntax !seen <nickname>' . EOL);
 			fputs($fp, 'NOTICE ' . $nick . ' :   Displays the last time <nickname> was seen' . EOL);
-		} else
-			fputs($fp, 'NOTICE ' . $nick . ' :There is no help available for this command! Try !help' . EOL);
+		} else {
+					fputs($fp, 'NOTICE ' . $nick . ' :There is no help available for this command! Try !help' . EOL);
+		}
 
 		//		if ($topic == 'login')
 		//			fputs($fp, 'NOTICE '.$nick.' :No help available yet! Ask MrSpock!'.EOL);

tools/discord/commands/seed.php

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 
 $fn_seed = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	$result = shared_channel_msg_seed($link->player);
 	$message->channel->sendMessage(join(EOL, $result));

tools/discord/commands/turns.php

Braces +6 added lines, -2 removed lines

@@ -17,7 +17,9 @@ 
 
 $fn_turns = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	$msg = get_turns_message($link->player);
 	$message->channel->sendMessage($msg);
@@ -25,7 +27,9 @@ 
 
 $fn_turns_all = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 	$player = $link->player;
 
 	$results = array_map('get_turns_message', $player->getSharingPlayers(true));