smrealms / smr

tools/npc/chess.php

Spacing +13 added lines, -13 removed lines

@@ -10,22 +10,22 @@ 
 
 	debug('Script started');
 	define('SCRIPT_ID', $db->getInsertID());
-	$db->query('UPDATE npc_logs SET script_id='.SCRIPT_ID.' WHERE log_id='.SCRIPT_ID);
+	$db->query('UPDATE npc_logs SET script_id=' . SCRIPT_ID . ' WHERE log_id=' . SCRIPT_ID);
 
 	define('NPC_SCRIPT', true);
 
 	$descriptorSpec = array(
-		0 => array("pipe", "r"),  // stdin is a pipe that the child will read from
+		0 => array("pipe", "r"), // stdin is a pipe that the child will read from
 		1 => array("pipe", "w")  // stdout is a pipe that the child will write to
 	);
 	$engine = proc_open(UCI_CHESS_ENGINE, $descriptorSpec, $pipes);
-	$toEngine =& $pipes[0];
-	$fromEngine =& $pipes[1];
+	$toEngine = & $pipes[0];
+	$fromEngine = & $pipes[1];
 
 	function readFromEngine($block = true) {
 		global $fromEngine;
 		stream_set_blocking($fromEngine, $block == true ? 1 : 0);
-		while(($s = fgets($fromEngine)) !== false) {
+		while (($s = fgets($fromEngine)) !== false) {
 			debug('<-- ' . trim($s));
 			stream_set_blocking($fromEngine, 0);
 		}
@@ -34,7 +34,7 @@ 
 		global $toEngine;
 		debug('--> ' . $s);
 		fputs($toEngine, $s . EOL);
-		if($read === true) {
+		if ($read === true) {
 			readFromEngine($block);
 		}
 	}
@@ -45,7 +45,7 @@ 
 	writeToEngine('isready');
 	writeToEngine('ucinewgame', false);
 
-	while(true) {
+	while (true) {
 		//Redefine MICRO_TIME and TIME, the rest of the game expects them to be the single point in time that the script is executing, with it being redefined for each page load - unfortunately NPCs are one consistent script so we have to do a hack and redefine it (or change every instance of the TIME constant).
 		runkit_constant_redefine('MICRO_TIME', microtime(true));
 		runkit_constant_redefine('TIME', IFloor(MICRO_TIME));
@@ -55,9 +55,9 @@ 
 			writeToEngine('position fen ' . $chessGame->getFENString(), false);
 			writeToEngine('go ' . ($chessGame->getCurrentTurnColour() == ChessGame::PLAYER_WHITE ? 'w' : 'b') . 'time ' . UCI_TIME_PER_MOVE_MS, true, false);
 			stream_set_blocking($fromEngine, 1);
-			while(stripos($move = trim(fgets($fromEngine)), 'bestmove') !== 0) {
+			while (stripos($move = trim(fgets($fromEngine)), 'bestmove') !== 0) {
 				debug('<-- ' . $move);
-				if(stripos($move, 'Seg') === 0) {
+				if (stripos($move, 'Seg') === 0) {
 					// Segfault
 					debug('UCI engine segfaulted?');
 					exit;
@@ -77,12 +77,12 @@ 
 	fclose($toEngine);
 	fclose($fromEngine);
 	proc_close($engine);
-} catch(Throwable $e) {
+} catch (Throwable $e) {
 	logException($e);
 	exit;
 }
 function debug($message, $debugObject = null) {
-	global $account,$var,$db;
-	echo date('Y-m-d H:i:s - ').$message.($debugObject!==null?EOL.var_export($debugObject,true):'').EOL;
-	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES ('.(defined('SCRIPT_ID')?SCRIPT_ID:0).', '.(is_object($account)?$account->getAccountID():0).',NOW(),'.$db->escapeString($message).','.$db->escapeString(var_export($debugObject,true)).','.$db->escapeString(var_export($var,true)).')');
+	global $account, $var, $db;
+	echo date('Y-m-d H:i:s - ') . $message . ($debugObject !== null ?EOL.var_export($debugObject, true) : '') . EOL;
+	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES (' . (defined('SCRIPT_ID') ?SCRIPT_ID:0) . ', ' . (is_object($account) ? $account->getAccountID() : 0) . ',NOW(),' . $db->escapeString($message) . ',' . $db->escapeString(var_export($debugObject, true)) . ',' . $db->escapeString(var_export($var, true)) . ')');
 }

engine/Default/shop_hardware_processing.php

Braces +10 added lines, -5 removed lines

@@ -32,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);
-}
-elseif ($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);
+	}
+	} elseif ($action == 'Sell') {
 	// We only allow selling combat drones
 	if ($hardware_id != HARDWARE_COMBAT) {
 		throw new Exception('This item cannot be sold!');

templates/Default/engine/Default/combat_log_viewer.php

Indentation +4 added lines, -4 removed lines

@@ -20,11 +20,11 @@
 	$this->includeTemplate('includes/ForceFullCombatResults.inc', array('FullForceCombatResults'=>$CombatResults));
 } elseif ($CombatResultsType == 'PORT') {
 	$this->includeTemplate('includes/PortFullCombatResults.inc', array('FullPortCombatResults'=>$CombatResults,
-	                                                                  'MinimalDisplay'=>false,
-	                                                                  'AlreadyDestroyed'=>false));
+																	  'MinimalDisplay'=>false,
+																	  'AlreadyDestroyed'=>false));
 } elseif ($CombatResultsType == 'PLANET') {
 	$this->includeTemplate('includes/PlanetFullCombatResults.inc', array('FullPlanetCombatResults'=>$CombatResults,
-	                                                                    'MinimalDisplay'=>false,
-	                                                                    'AlreadyDestroyed'=>false));
+																		'MinimalDisplay'=>false,
+																		'AlreadyDestroyed'=>false));
 }
 ?>

htdocs/weapon_list.php

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
 	$template->assign('Weapons', $weapons);
 
 	$template->display('weapon_list.php');
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }
 

tools/discord/GameLink.inc

Spacing +5 added lines, -5 removed lines

@@ -3,11 +3,11 @@
 // Holds information linking the received message and the game data
 class GameLink
 {
-	public $valid = false;  // identifies if the message is linked to game data
-	public $user;           // Discord user associated with the message
-	public $account;        // SmrAccount instance
-	public $alliance;       // SmrAlliance instance
-	public $player;         // SmrPlayer instance
+	public $valid = false; // identifies if the message is linked to game data
+	public $user; // Discord user associated with the message
+	public $account; // SmrAccount instance
+	public $alliance; // SmrAlliance instance
+	public $player; // SmrPlayer instance
 
 	// Takes the following arguments:
 	//	channel = Discord\Parts\Channel\Channel instance

lib/Default/ChessGame.class.php

Spacing +51 added lines, -51 removed lines

@@ -201,29 +201,29 @@ 
 
 	public function getFENString() {
 		$fen = '';
-		$board =& $this->getBoard();
+		$board = & $this->getBoard();
 		$blanks = 0;
-		for($y=0; $y < 8; $y++) {
-			if($y > 0) {
+		for ($y = 0; $y < 8; $y++) {
+			if ($y > 0) {
 				$fen .= '/';
 			}
-			for($x=0; $x < 8; $x++) {
-				if($board[$y][$x] == null) {
+			for ($x = 0; $x < 8; $x++) {
+				if ($board[$y][$x] == null) {
 					$blanks++;
 				} else {
-					if($blanks > 0) {
+					if ($blanks > 0) {
 						$fen .= $blanks;
 						$blanks = 0;
 					}
 					$fen .= $board[$y][$x]->getPieceLetter();
 				}
 			}
-			if($blanks > 0) {
+			if ($blanks > 0) {
 				$fen .= $blanks;
 				$blanks = 0;
 			}
 		}
-		switch($this->getCurrentTurnColour()) {
+		switch ($this->getCurrentTurnColour()) {
 			case self::PLAYER_WHITE:
 				$fen .= ' w ';
 			break;
@@ -449,72 +449,72 @@ 
 	}
 
 	public static function movePiece(array &$board, array &$hasMoved, $x, $y, $toX, $toY, $pawnPromotionPiece = ChessPiece::QUEEN) {
-		if(!self::isValidCoord($x, $y, $board)) {
+		if (!self::isValidCoord($x, $y, $board)) {
 			throw new Exception('Invalid from coordinates, x=' . $x . ', y=' . $y);
 		}
-		if(!self::isValidCoord($toX, $toY, $board)) {
+		if (!self::isValidCoord($toX, $toY, $board)) {
 			throw new Exception('Invalid to coordinates, x=' . $toX . ', y=' . $toY);
 		}
 		$pieceTaken = $board[$toY][$toX];
 		$board[$toY][$toX] = $board[$y][$x];
-		$p =& $board[$toY][$toX];
+		$p = & $board[$toY][$toX];
 		$board[$y][$x] = null;
-		if($p == null) {
+		if ($p == null) {
 			throw new Exception('Trying to move non-existent piece: ' . var_export($board, true));
 		}
 		$p->setX($toX);
 		$p->setY($toY);
 
 		$oldPawnMovement = $hasMoved[ChessPiece::PAWN];
-		$nextPawnMovement = array(-1,-1);
+		$nextPawnMovement = array(-1, -1);
 		$castling = false;
 		$enPassant = false;
 		$rookMoved = false;
 		$rookTaken = false;
 		$pawnPromotion = false;
-		if($p->pieceID == ChessPiece::KING) {
+		if ($p->pieceID == ChessPiece::KING) {
 			//Castling?
 			$castling = self::isCastling($x, $toX);
-			if($castling !== false) {
+			if ($castling !== false) {
 				$hasMoved[$p->colour][ChessPiece::KING] = true;
 				$hasMoved[$p->colour][ChessPiece::ROOK][$castling['Type']] = true;
-				if($board[$y][$castling['X']] == null) {
+				if ($board[$y][$castling['X']] == null) {
 					throw new Exception('Cannot castle with non-existent castle.');
 				}
 				$board[$toY][$castling['ToX']] = $board[$y][$castling['X']];
 				$board[$toY][$castling['ToX']]->setX($castling['ToX']);
 				$board[$y][$castling['X']] = null;
 			}
-		} elseif($p->pieceID == ChessPiece::PAWN) {
-			if($toY == 0 || $toY == 7) {
+		} elseif ($p->pieceID == ChessPiece::PAWN) {
+			if ($toY == 0 || $toY == 7) {
 				$pawnPromotion = $p->promote($pawnPromotionPiece, $board);
 			}
 			//Double move to track?
-			elseif(($y == 1 || $y == 6) && ($toY == 3 || $toY == 4)) {
+			elseif (($y == 1 || $y == 6) && ($toY == 3 || $toY == 4)) {
 				$nextPawnMovement = array($toX, $toY);
 			}
 			//En passant?
-			elseif($hasMoved[ChessPiece::PAWN][0] == $toX &&
+			elseif ($hasMoved[ChessPiece::PAWN][0] == $toX &&
 					($hasMoved[ChessPiece::PAWN][1] == 3 && $toY == 2 || $hasMoved[ChessPiece::PAWN][1] == 4 && $toY == 5)) {
 				$enPassant = true;
 				$pieceTaken = $board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]];
-				if($board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] == null) {
+				if ($board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] == null) {
 					throw new Exception('Cannot en passant a non-existent pawn.');
 				}
 				$board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] = null;
 			}
-		} elseif($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) {
+		} elseif ($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) {
 			//Rook moved?
-			if($hasMoved[$p->colour][ChessPiece::ROOK][$x==0?'Queen':'King'] === false) {
+			if ($hasMoved[$p->colour][ChessPiece::ROOK][$x == 0 ? 'Queen' : 'King'] === false) {
 				// We set rook moved in here as it's used for move info.
-				$rookMoved = $x==0?'Queen':'King';
+				$rookMoved = $x == 0 ? 'Queen' : 'King';
 				$hasMoved[$p->colour][ChessPiece::ROOK][$rookMoved] = true;
 			}
 		}
 		// Check if we've taken a rook and marked them as moved, if they've already moved this does nothing, but if they were taken before moving this stops an issue with trying to castle with a non-existent castle.
-		if($pieceTaken != null && $pieceTaken->pieceID == ChessPiece::ROOK && ($toX == 0 || $toX == 7) && $toY == ($pieceTaken->colour == self::PLAYER_WHITE ? 7 : 0)) {
-			if($hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$toX==0?'Queen':'King'] === false) {
-				$rookTaken = $toX==0?'Queen':'King';
+		if ($pieceTaken != null && $pieceTaken->pieceID == ChessPiece::ROOK && ($toX == 0 || $toX == 7) && $toY == ($pieceTaken->colour == self::PLAYER_WHITE ? 7 : 0)) {
+			if ($hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$toX == 0 ? 'Queen' : 'King'] === false) {
+				$rookTaken = $toX == 0 ? 'Queen' : 'King';
 				$hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$rookTaken] = true;
 			}
 		}
@@ -531,18 +531,18 @@ 
 	}
 
 	public static function undoMovePiece(array &$board, array &$hasMoved, $x, $y, $toX, $toY, $moveInfo) {
-		if(!self::isValidCoord($x, $y, $board)) {
+		if (!self::isValidCoord($x, $y, $board)) {
 			throw new Exception('Invalid from coordinates, x=' . $x . ', y=' . $y);
 		}
-		if(!self::isValidCoord($toX, $toY, $board)) {
+		if (!self::isValidCoord($toX, $toY, $board)) {
 			throw new Exception('Invalid to coordinates, x=' . $toX . ', y=' . $toY);
 		}
-		if($board[$y][$x] != null) {
+		if ($board[$y][$x] != null) {
 			throw new Exception('Undoing move onto another piece? x=' . $x . ', y=' . $y);
 		}
 		$board[$y][$x] = $board[$toY][$toX];
-		$p =& $board[$y][$x];
-		if($p == null) {
+		$p = & $board[$y][$x];
+		if ($p == null) {
 			throw new Exception('Trying to undo move of a non-existent piece: ' . var_export($board, true));
 		}
 		$board[$toY][$toX] = $moveInfo['PieceTaken'];
@@ -591,73 +591,73 @@ 
 		$toX = ord($move[2]) - $aVal;
 		$toY = 8 - $move[3];
 		$pawnPromotionPiece = null;
-		if(isset($move[4])) {
+		if (isset($move[4])) {
 			$pawnPromotionPiece = ChessPiece::getPieceForLetter($move[4]);
 		}
 		return $this->tryMove($x, $y, $toX, $toY, $this->getCurrentTurnAccountID(), $pawnPromotionPiece);
 	}
 
 	public function tryMove($x, $y, $toX, $toY, $forAccountID, $pawnPromotionPiece) {
-		if($this->hasEnded()) {
+		if ($this->hasEnded()) {
 			return 5;
 		}
-		if($this->getCurrentTurnAccountID() != $forAccountID) {
+		if ($this->getCurrentTurnAccountID() != $forAccountID) {
 			return 4;
 		}
 		$lastTurnPlayer = $this->getCurrentTurnPlayer();
 		$this->getBoard();
 		$p = $this->board[$y][$x];
-		if($p == null || $p->colour != $this->getColourForAccountID($forAccountID)) {
+		if ($p == null || $p->colour != $this->getColourForAccountID($forAccountID)) {
 			return 2;
 		}
 
 		$moves = $p->getPossibleMoves($this->board, $this->getHasMoved(), $forAccountID);
-		foreach($moves as $move) {
-			if($move[0]==$toX && $move[1]==$toY) {
+		foreach ($moves as $move) {
+			if ($move[0] == $toX && $move[1] == $toY) {
 				$chessType = $this->isNPCGame() ? 'Chess (NPC)' : 'Chess';
 				$currentPlayer = $this->getCurrentTurnPlayer();
 
 				$moveInfo = ChessGame::movePiece($this->board, $this->getHasMoved(), $x, $y, $toX, $toY, $pawnPromotionPiece);
 
 				//We have taken the move, we should refresh $p
-				$p =& $this->board[$toY][$toX];
+				$p = & $this->board[$toY][$toX];
 
 				$pieceTakenID = null;
-				if($moveInfo['PieceTaken'] != null) {
+				if ($moveInfo['PieceTaken'] != null) {
 					$pieceTakenID = $moveInfo['PieceTaken']->pieceID;
-					if($moveInfo['PieceTaken']->pieceID == ChessPiece::KING) {
+					if ($moveInfo['PieceTaken']->pieceID == ChessPiece::KING) {
 						throw new Exception('King was taken.');
 					}
 				}
 
 				$pieceID = $p->pieceID;
 				$pieceNo = $p->pieceNo;
-				if($moveInfo['PawnPromotion'] !== false) {
+				if ($moveInfo['PawnPromotion'] !== false) {
 					$p->pieceID = $moveInfo['PawnPromotion']['PieceID'];
 					$p->pieceNo = $moveInfo['PawnPromotion']['PieceNo'];
 				}
 
 				$checking = null;
-				if($p->isAttacking($this->board, $this->getHasMoved(), true)) {
+				if ($p->isAttacking($this->board, $this->getHasMoved(), true)) {
 					$checking = 'CHECK';
 				}
-				if($this->isCheckmated(self::getOtherColour($p->colour))) {
+				if ($this->isCheckmated(self::getOtherColour($p->colour))) {
 					$checking = 'MATE';
 				}
-				if($this->moves!=null) {
+				if ($this->moves != null) {
 					$this->moves[] = $this->createMove($pieceID, $x, $y, $toX, $toY, $pieceTakenID, $checking, $this->getCurrentTurnColour(), $moveInfo['Castling']['Type'], $moveInfo['EnPassant'], $moveInfo['PawnPromotion'] === false ? null : $moveInfo['PawnPromotion']['PieceID']);
 				}
-				if(self::isPlayerChecked($this->board, $this->getHasMoved(), $p->colour)) {
+				if (self::isPlayerChecked($this->board, $this->getHasMoved(), $p->colour)) {
 					return 3;
 				}
 
 				$otherPlayer = $this->getCurrentTurnPlayer();
-				if($moveInfo['PawnPromotion'] !== false) {
+				if ($moveInfo['PawnPromotion'] !== false) {
 					$piecePromotedSymbol = $p->getPieceSymbol();
-					$currentPlayer->increaseHOF(1, array($chessType,'Moves','Own Pawns Promoted','Total'), HOF_PUBLIC);
-					$otherPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pawns Promoted','Total'), HOF_PUBLIC);
-					$currentPlayer->increaseHOF(1, array($chessType,'Moves','Own Pawns Promoted',$piecePromotedSymbol), HOF_PUBLIC);
-					$otherPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pawns Promoted',$piecePromotedSymbol), HOF_PUBLIC);
+					$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pawns Promoted', 'Total'), HOF_PUBLIC);
+					$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pawns Promoted', 'Total'), HOF_PUBLIC);
+					$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pawns Promoted', $piecePromotedSymbol), HOF_PUBLIC);
+					$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pawns Promoted', $piecePromotedSymbol), HOF_PUBLIC);
 				}
 
 				$castlingType = $moveInfo['Castling'] === false ? null : $moveInfo['Castling']['Type'];

lib/Default/Sorter.class.php

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 	}
 
 	public static function cmpNum($a, $b) {
-		if ($a == $b) return 0;
+		if ($a == $b) {
+			return 0;
+		}
 		return (self::$reverseOrder ? -1 : 1) * ($a < $b ? -1 : 1);
 	}
 

admin/Default/enable_game_processing.php

Indentation +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
 $msg = '<span class="green">SUCCESS: </span>Enabled game ' . $game->getDisplayName();
 
 forward(create_container('skeleton.php', 'enable_game.php',
-                         array('processing_msg' => $msg)));
+						 array('processing_msg' => $msg)));

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 $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 } ?>.