smrealms / smr

lib/Default/ChessGame.class.inc

Braces +17 added lines, -34 removed lines

@@ -81,8 +81,7 @@ 
 			$this->blackID = $this->db->getInt('black_id');
 			$this->winner = $this->db->getInt('winner_id');
 			$this->resetHasMoved();
-		}
-		else {
+		} else {
 			throw new Exception('Chess game not found: ' . $chessGameID);
 		}
 	}
@@ -149,8 +148,7 @@ 
 					break;
 				}
 			}
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			if($debugInfo === true) {
 				echo $e->getMessage() . EOL . $e->getTraceAsString() . EOL;
 			}
@@ -199,11 +197,9 @@ 
 			if(!$mate && $this->hasEnded()) {
 				if($this->getWinner() != 0) {
 					$this->moves[] = ($this->getWinner() == $this->getWhiteID() ? 'Black' : 'White') . ' Resigned.';
-				}
-				else if(count($this->moves) < 2) {
+				} else if(count($this->moves) < 2) {
 					$this->moves[] = 'Game Cancelled.';
-				}
-				else {
+				} else {
 					$this->moves[] = 'Game Drawn.';
 				}
 			}
@@ -222,8 +218,7 @@ 
 			for($x=0; $x < 8; $x++) {
 				if($board[$y][$x] == null) {
 					$blanks++;
-				}
-				else {
+				} else {
 					if($blanks > 0) {
 						$fen .= $blanks;
 						$blanks = 0;
@@ -278,8 +273,7 @@ 
 					$fen .= '3';
 				break;
 			}
-		}
-		else {
+		} else {
 			$fen .= '-';
 		}
 		$fen .= ' 0 ' . floor(count($this->moves)/2);
@@ -412,8 +406,7 @@ 
 		}
 		if($pieceID == ChessPiece::PAWN && ($startY == 1 || $startY == 6) && ($endY == 3 || $endY == 4)) {
 			$this->hasMoved[ChessPiece::PAWN] = array($endX, $endY);
-		}
-		else {
+		} else {
 			$this->hasMoved[ChessPiece::PAWN] = array(-1,-1);
 		}
 		return ($castling == 'Queen' ? '0-0-0' : ($castling == 'King' ? '0-0' : ''))
@@ -519,8 +512,7 @@ 
 				$board[$toY][$castling['ToX']]->setX($castling['ToX']);
 				$board[$y][$castling['X']] = null;
 			}
-		}
-		else if($p->pieceID == ChessPiece::PAWN) {
+		} else if($p->pieceID == ChessPiece::PAWN) {
 			if($toY == 0 || $toY == 7) {
 				$pawnPromotion = $p->promote($pawnPromotionPiece, $board);
 			}
@@ -538,8 +530,7 @@ 
 				}
 				$board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] = null;
 			}
-		}
-		else if($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) {
+		} else if($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) {
 				// We set rook moved in here as it's used for move info.
@@ -599,12 +590,10 @@ 
 				$board[$y][$castling['X']]->setX($castling['X']);
 				$board[$toY][$castling['ToX']] = null;
 			}
-		}
-		else if($moveInfo['EnPassant'] === true) {
+		} else if($moveInfo['EnPassant'] === true) {
 			$board[$toY][$toX] = null;
 			$board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] = $moveInfo['PieceTaken'];
-		}
-		else if($moveInfo['RookMoved'] !== false) {
+		} else if($moveInfo['RookMoved'] !== false) {
 			$hasMoved[$p->colour][ChessPiece::ROOK][$moveInfo['RookMoved']] = false;
 		}
 		if($moveInfo['RookTaken'] !== false) {
@@ -728,8 +717,7 @@ 
 					$this->setWinner($forAccountID);
 					$return = 1;
 					SmrPlayer::sendMessageFromCasino($lastTurnPlayer->getGameID(), $this->getCurrentTurnAccountID(), 'You have just lost [chess=' . $this->getChessGameID() . '] against [player=' . $lastTurnPlayer->getPlayerID() . '].');
-				}
-				else {
+				} else {
 					SmrPlayer::sendMessageFromCasino($lastTurnPlayer->getGameID(), $this->getCurrentTurnAccountID(), 'It is now your turn in [chess=' . $this->getChessGameID() . '] against [player=' . $lastTurnPlayer->getPlayerID() . '].');
 					if($checking == 'CHECK') {
 						$currentPlayer->increaseHOF(1, array($chessType,'Moves','Check Given'), HOF_PUBLIC);
@@ -759,8 +747,7 @@ 
 	public function &getWhitePlayer() {
 		try {
 			return SmrPlayer::getPlayer($this->whiteID, $this->getGameID());
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			$null = null;
 			return $null;
 		}
@@ -773,8 +760,7 @@ 
 	public function &getBlackPlayer() {
 		try {
 			return SmrPlayer::getPlayer($this->blackID, $this->getGameID());
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			$null = null;
 			return $null;
 		}
@@ -796,8 +782,7 @@ 
 	public function &getColourPlayer($colour) {
 		try {
 			return SmrPlayer::getPlayer($this->getColourID($colour), $this->getGameID());
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			$null = null;
 			return $null;
 		}
@@ -854,8 +839,7 @@ 
 	public function &getCurrentTurnPlayer() {
 		try {
 			return SmrPlayer::getPlayer($this->getCurrentTurnAccountID(), $this->getGameID());
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			$null = null;
 			return $null;
 		}
@@ -902,8 +886,7 @@ 
 							SET end_time=' . $this->db->escapeNumber(TIME) . '
 							WHERE chess_game_id=' . $this->db->escapeNumber($this->chessGameID) . ';');
 			return 1;
-		}
-		else {
+		} else {
 			$loserColour = $this->getColourForAccountID($accountID);
 			$winnerAccountID = $this->getColourID(self::getOtherColour($loserColour));
 			$results = $this->setWinner($winnerAccountID);

lib/Default/SmrCombatDrones.class.inc

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'] = ceil($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'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer,$port) / 100);
 		$damage['MaxDamage'] = ceil($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'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer,$planet) / 100);
 		$planetMod = self::PLANET_DAMAGE_MOD;

lib/Default/smr.inc

Braces +141 added lines, -89 removed lines

@@ -17,8 +17,9 @@ 
 
 function parseBoolean($check) {
 	// Only negative strings are not implicitly converted to the correct bool
-	if(is_string($check) && (strcasecmp($check,'NO') == 0 || strcasecmp($check,'FALSE')==0))
-		return false;
+	if(is_string($check) && (strcasecmp($check,'NO') == 0 || strcasecmp($check,'FALSE')==0)) {
+			return false;
+	}
 	return (bool)$check;
 }
 
@@ -37,8 +38,9 @@ 
 			break;
 			case 'player':
 				$playerID = $default;
-				if(!is_numeric($playerID))
-					$playerID = $tagParams['id'];
+				if(!is_numeric($playerID)) {
+									$playerID = $tagParams['id'];
+				}
 				$bbPlayer = SmrPlayer::getPlayerByPlayerID($playerID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
@@ -52,8 +54,9 @@ 
 			case 'alliance':
 				$db = new SmrMySqlDatabase();
 				$allianceID = $default;
-				if(!is_numeric($allianceID))
-					$allianceID = $tagParams['id'];
+				if(!is_numeric($allianceID)) {
+									$allianceID = $tagParams['id'];
+				}
 				$alliance = SmrAlliance::getAlliance($allianceID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
@@ -62,10 +65,11 @@ 
 				if($disableBBLinks===false && $overrideGameID==SmrSession::getGameID()) {
 					$container = create_container('skeleton.php');
 					$container['alliance_id'] = $alliance->getAllianceID();
-					if (is_object($player) && $alliance->getAllianceID() == $player->getAllianceID())
-						$container['body'] = 'alliance_mod.php';
-					else
-						$container['body'] = 'alliance_roster.php';
+					if (is_object($player) && $alliance->getAllianceID() == $player->getAllianceID()) {
+											$container['body'] = 'alliance_mod.php';
+					} else {
+											$container['body'] = 'alliance_roster.php';
+					}
 					return create_link($container, $alliance->getAllianceName());
 				}
 				return $alliance->getAllianceName();
@@ -89,8 +93,9 @@ 
 					return true;
 				}
 				if ($timeString != '' && ($time = strtotime($timeString)) !== false) {
-					if(is_object($account))
-						$time += $account->getOffset() * 3600;
+					if(is_object($account)) {
+											$time += $account->getOffset() * 3600;
+					}
 					return date(DATE_FULL_SHORT, $time);
 				}
 			break;
@@ -133,8 +138,7 @@ 
 				return '<div class="buttonA"><a class="buttonA" href="' . SmrSession::getNewHREF($container) . '">Join ' . $alliance->getAllianceName() . '</a></div>';
 			break;
 		}
-	}
-	catch (Exception $e) {
+	} catch (Exception $e) {
 	}
 	if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 		return false;
@@ -179,15 +183,15 @@ 
 		$bbParser->addRule('join_alliance',$smrRule);
 	}
 	global $disableBBLinks;
-	if($noLinks===true)
-		$disableBBLinks = true;
-	else
-		$disableBBLinks = false;
+	if($noLinks===true) {
+			$disableBBLinks = true;
+	} else {
+			$disableBBLinks = false;
+	}
 	if(strpos($message, '[')!==false) { //We have BBCode so let's do a full parse.
 		$message = $bbParser->parse($message);
 		$message = str_replace('&lt;br /&gt;','<br />',$message);
-	}
-	else { //Otherwise just convert newlines
+	} else { //Otherwise just convert newlines
 		$message = nl2br($message, true);
 	}
 	return $message;
@@ -227,8 +231,7 @@ 
 
 	if(!is_array($actions)) {
 		$form['submit'] =  '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($actions) . '">';
-	}
-	else {
+	} else {
 		$form['submit'] = array();
 		foreach($actions as $action) {
 			$form['submit'][$action[0]] =  '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($action[1]) . '">';
@@ -273,8 +276,9 @@ 
 }
 
 function forward($new_container) {
-	if(defined('OVERRIDE_FORWARD')&&OVERRIDE_FORWARD===true)
-		return overrideForward($new_container);
+	if(defined('OVERRIDE_FORWARD')&&OVERRIDE_FORWARD===true) {
+			return overrideForward($new_container);
+	}
 	resetContainer($new_container);
 	do_voodoo();
 }
@@ -290,8 +294,9 @@ 
 	global $var, $container;
 
 	// transfer this value to next container
-	if(isset($var[$what]))
-		$container[$what] = $var[$what];
+	if(isset($var[$what])) {
+			$container[$what] = $var[$what];
+	}
 
 }
 
@@ -319,8 +324,7 @@ 
 	}
 	if($maxValue-$minValue==0) {
 		return $text;
-	}
-	else {
+	} else {
 		$normalisedValue = round(510*max(0,min($maxValue,$value)-$minValue)/($maxValue-$minValue))-255;
 	}
 	if ($type == 'Game') {
@@ -330,28 +334,33 @@ 
 			if(strlen($g_component) == 1) {
 				$g_component = '0' . $g_component;
 			}
-		}
-		else if($normalisedValue > 0) {
+		} else if($normalisedValue > 0) {
 			$g_component='ff';
 			$r_component = dechex(255-$normalisedValue);
 			if(strlen($r_component) == 1) {
 				$r_component = '0' . $r_component;
 			}
-		}
-		else {
+		} else {
 			$r_component = 'ff';
 			$g_component = 'ff';
 		}
 		$colour = $r_component . $g_component . '00';
-		if ($return_type == 'Colour') return $colour;
+		if ($return_type == 'Colour') {
+			return $colour;
+		}
 		return '<span style="color:#' . $colour . '">' . $text . '</span>';
-	}
-	elseif ($type == 'IRC') {
+	} elseif ($type == 'IRC') {
 		//IRC color codes
-		if ($normalisedValue == 255) $colour = '[k03]';
-		elseif ($normalisedValue == -255) $colour = '[k04]';
-		else $colour = '[k08]';
-		if ($return_type == 'Colour') return $colour;
+		if ($normalisedValue == 255) {
+			$colour = '[k03]';
+		} elseif ($normalisedValue == -255) {
+			$colour = '[k04]';
+		} else {
+			$colour = '[k08]';
+		}
+		if ($return_type == 'Colour') {
+			return $colour;
+		}
 		return $colour . $text;
 	}
 }
@@ -409,9 +418,10 @@ 
 	if(!defined('AJAX_CONTAINER')) {
 		define('AJAX_CONTAINER', isset($var['AJAX']) && $var['AJAX'] === true);
 	}
-	if(!AJAX_CONTAINER && USING_AJAX && SmrSession::$SN != SmrSession::$lastSN)
-		exit;
-//	ob_clean();
+	if(!AJAX_CONTAINER && USING_AJAX && SmrSession::$SN != SmrSession::$lastSN) {
+			exit;
+	}
+	//	ob_clean();
 
 	foreach ($GLOBALS as $key => $value) {
 		$$key = &$GLOBALS[$key];
@@ -420,10 +430,18 @@ 
 	$account =& SmrAccount::getAccount(SmrSession::$account_id);
 	$GLOBALS['account'] =& $account;
 
-	if(!defined('DATE_DATE_SHORT')) define('DATE_DATE_SHORT',$account->getShortDateFormat());
-	if(!defined('DATE_TIME_SHORT')) define('DATE_TIME_SHORT',$account->getShortTimeFormat());
-	if(!defined('DATE_FULL_SHORT')) define('DATE_FULL_SHORT',DATE_DATE_SHORT.' '.DATE_TIME_SHORT);
-	if(!defined('DATE_FULL_SHORT_SPLIT')) define('DATE_FULL_SHORT_SPLIT',DATE_DATE_SHORT.'\<b\r /\>'.DATE_TIME_SHORT);
+	if(!defined('DATE_DATE_SHORT')) {
+		define('DATE_DATE_SHORT',$account->getShortDateFormat());
+	}
+	if(!defined('DATE_TIME_SHORT')) {
+		define('DATE_TIME_SHORT',$account->getShortTimeFormat());
+	}
+	if(!defined('DATE_FULL_SHORT')) {
+		define('DATE_FULL_SHORT',DATE_DATE_SHORT.' '.DATE_TIME_SHORT);
+	}
+	if(!defined('DATE_FULL_SHORT_SPLIT')) {
+		define('DATE_FULL_SHORT_SPLIT',DATE_DATE_SHORT.'\<b\r /\>'.DATE_TIME_SHORT);
+	}
 
 
 	$db = new SmrMySqlDatabase();
@@ -490,8 +508,9 @@ 
 
 		if (!$player->isDead() && $player->getNewbieTurns() <= NEWBIE_TURNS_WARNING_LIMIT &&
 			$player->getNewbieWarning() &&
-			$var['url'] != 'newbie_warning_processing.php')
-			forward(create_container('newbie_warning_processing.php'));
+			$var['url'] != 'newbie_warning_processing.php') {
+					forward(create_container('newbie_warning_processing.php'));
+		}
 	}
 
 	if($var['url'] != 'skeleton.php') {
@@ -501,13 +520,13 @@ 
 		$PHP_OUTPUT = '';
 		if ($var['body']=='error.php') { // infinite includes for error pages
 			require(get_file_loc($var['body']));
-		}
-		else {
+		} else {
 			require_once(get_file_loc($var['body']));
 		}
 
-		if($PHP_OUTPUT!='')
-			$template->assign('PHP_OUTPUT',$PHP_OUTPUT);
+		if($PHP_OUTPUT!='') {
+					$template->assign('PHP_OUTPUT',$PHP_OUTPUT);
+		}
 	}
 
 	if (SmrSession::hasGame()) {
@@ -571,8 +590,9 @@ 
 function acquire_lock($sector) {
 	global $db, $lock, $locksFailed;
 
-	if($lock)
-		return true;
+	if($lock) {
+			return true;
+	}
 
 	// Insert ourselves into the queue.
 	$db->query('INSERT INTO locks_queue (game_id,account_id,sector_id,timestamp) VALUES(' . $db->escapeNumber(SmrSession::getGameID()) . ',' . $db->escapeNumber(SmrSession::$account_id) . ',' . $db->escapeNumber($sector) . ',' . $db->escapeNumber(TIME) . ')');
@@ -598,8 +618,7 @@ 
 
 			usleep(25000 * $locksInQueue);
 			continue;
-		}
-		else {
+		} else {
 			return true;
 		}
 	}
@@ -798,7 +817,9 @@ 
 		$container['player_id']	= $player->getPlayerID();
 		$template->assign('PlayerNameLink',SmrSession::getNewHREF($container));
 
-		if (is_array(Globals::getHiddenPlayers())&&in_array($player->getAccountID(), Globals::getHiddenPlayers())) $template->assign('PlayerInvisible',true);
+		if (is_array(Globals::getHiddenPlayers())&&in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
+			$template->assign('PlayerInvisible',true);
+		}
 
 		// ******* Hardware *******
 		$container = create_container('skeleton.php', 'configure_hardware.php');
@@ -872,7 +893,9 @@ 
 	$string = '';
 	if ($seconds == 0) {
 		$string = '0 seconds';
-		if ($short) $string = '0s';
+		if ($short) {
+			$string = '0s';
+		}
 	}
 	if ($seconds >= 60) {
 		$minutes = floor($seconds/60);
@@ -892,58 +915,85 @@ 
 	}
 	if ($weeks > 0) {
 		$string .= $weeks;
-		if ($short) $string .= 'w';
-		else {
+		if ($short) {
+			$string .= 'w';
+		} else {
 			$string .= ' week';
-			if ($weeks > 1) $string .= 's';
+			if ($weeks > 1) {
+				$string .= 's';
+			}
 		}
 	}
 	if ($days > 0) {
 		$before = $weeks;
 		$after = $hours + $minutes + $seconds;
-		if ($before > 0 && $after > 0) $string .= ', ';
-		elseif ($before > 0 && $after == 0) $string .= ' and ';
+		if ($before > 0 && $after > 0) {
+			$string .= ', ';
+		} elseif ($before > 0 && $after == 0) {
+			$string .= ' and ';
+		}
 		$string .= $days;
-		if ($short) $string .= 'd';
-		else {
+		if ($short) {
+			$string .= 'd';
+		} else {
 			$string .= ' day';
-			if ($days > 1) $string .= 's';
+			if ($days > 1) {
+				$string .= 's';
+			}
 		}
 	}
 	if ($hours > 0) {
 		$before = $weeks + $days;
 		$after = $minutes + $seconds;
-		if ($before > 0 && $after > 0) $string .= ', ';
-		elseif ($before > 0 && $after == 0) $string .= ' and ';
+		if ($before > 0 && $after > 0) {
+			$string .= ', ';
+		} elseif ($before > 0 && $after == 0) {
+			$string .= ' and ';
+		}
 		$string .= $hours;
-		if ($short) $string .= 'h';
-		else {
+		if ($short) {
+			$string .= 'h';
+		} else {
 			$string .= ' hour';
-			if ($hours > 1) $string .= 's';
+			if ($hours > 1) {
+				$string .= 's';
+			}
 		}
 	}
 	if ($minutes > 0) {
 		$before = $weeks + $days + $hours;
 		$after = $seconds;
-		if ($before > 0 && $after > 0) $string .= ', ';
-		elseif ($before > 0 && $after == 0) $string .= ' and ';
+		if ($before > 0 && $after > 0) {
+			$string .= ', ';
+		} elseif ($before > 0 && $after == 0) {
+			$string .= ' and ';
+		}
 		$string .= $minutes;
-		if ($short) $string .= 'm';
-		else {
+		if ($short) {
+			$string .= 'm';
+		} else {
 			$string .= ' minute';
-			if ($minutes > 1) $string .= 's';
+			if ($minutes > 1) {
+				$string .= 's';
+			}
 		}
 	}
 	if ($seconds > 0) {
 		$before = $weeks + $days + $hours + $minutes;
 		$after = 0;
-		if ($before > 0 && $after > 0) $string .= ', ';
-		elseif ($before > 0 && $after == 0) $string .= ' and ';
+		if ($before > 0 && $after > 0) {
+			$string .= ', ';
+		} elseif ($before > 0 && $after == 0) {
+			$string .= ' and ';
+		}
 		$string .= $seconds;
-		if ($short) $string .= 's';
-		else {
+		if ($short) {
+			$string .= 's';
+		} else {
 			$string .= ' second';
-			if ($seconds > 1) $string .= 's';
+			if ($seconds > 1) {
+				$string .= 's';
+			}
 		}
 	}
 	return $string;
@@ -951,16 +1001,18 @@ 
 
 function number_colour_format($number,$justSign = false) {
 	$formatted = '<span';
-	if($number > 0)
-		$formatted .= ' class="green">+';
-	else if($number < 0)
-		$formatted .= ' class="red">-';
-	else
-		$formatted .= '>';
+	if($number > 0) {
+			$formatted .= ' class="green">+';
+	} else if($number < 0) {
+			$formatted .= ' class="red">-';
+	} else {
+			$formatted .= '>';
+	}
 	if($justSign===false) {
 		$decimalPlaces = 0;
-		if(($pos = strpos($number,'.'))!==false)
-			$decimalPlaces = strlen(substr($number,$pos+1));
+		if(($pos = strpos($number,'.'))!==false) {
+					$decimalPlaces = strlen(substr($number,$pos+1));
+		}
 		$formatted .= number_format(abs($number),$decimalPlaces);
 	}
 	$formatted .= '</span>';

lib/Default/Rankings.class.inc

Braces +3 added lines, -6 removed lines

@@ -13,8 +13,7 @@ 
 			$class = '';
 			if ($player->getAllianceID() == $currentAlliance->getAllianceID()) {
 				$class = ' class="bold"';
-			}
-			else if($currentAlliance->hasDisbanded()) {
+			} else if($currentAlliance->hasDisbanded()) {
 				$class = ' class="red"';
 			}
 
@@ -61,12 +60,10 @@ 
 		if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'Show' && is_numeric($_REQUEST['min_rank']) && is_numeric($_REQUEST['max_rank'])) {
 			$minRank = min($_REQUEST['min_rank'], $_REQUEST['max_rank']);
 			$maxRank = max($_REQUEST['min_rank'], $_REQUEST['max_rank']);
-		}
-		elseif(isset($var['MinRank']) && isset($var['MaxRank'])) {
+		} elseif(isset($var['MinRank']) && isset($var['MaxRank'])) {
 			$minRank = $var['MinRank'];
 			$maxRank = $var['MaxRank'];
-		}
-		else {
+		} else {
 			$minRank = $ourRank - 5;
 			$maxRank = $ourRank + 5;
 		}

lib/Default/hof.functions.inc

Braces +11 added lines, -22 removed lines

@@ -8,13 +8,11 @@ 
 	$rank = array('Amount'=>0,'Rank'=>0);
 	if($view == DONATION_NAME) {
 		$db->query('SELECT SUM(amount) as amount FROM account_donated WHERE account_id='.$db->escapeNumber($accountID).' GROUP BY account_id LIMIT 1');
-	}
-	else if($view == USER_SCORE_NAME) {
+	} else if($view == USER_SCORE_NAME) {
 		$statements = SmrAccount::getUserScoreCaseStatement($db);
 		$query = 'SELECT '.$statements['CASE'].' amount FROM (SELECT type, SUM(amount) amount FROM player_hof WHERE type IN ('.$statements['IN'].') AND account_id='.$db->escapeNumber($accountID).$gameIDSql.' GROUP BY account_id,type) x ORDER BY amount DESC';
 		$db->query($query);
-	}
-	else {
+	} else {
 		$db->query('SELECT visibility FROM hof_visibility WHERE type='.$db->escapeArray($viewType,false,true,':',false).' LIMIT 1');
 		if(!$db->nextRecord()) {
 			return $rank;
@@ -38,8 +36,7 @@ 
 	}
 	if($vis==HOF_PUBLIC || $account->getAccountID()==$accountID) {
 		$rank['Amount'] = $realAmount;
-	}
-	else if($vis==HOF_ALLIANCE&&$account->getAccountID()!=$accountID) {
+	} else if($vis==HOF_ALLIANCE&&$account->getAccountID()!=$accountID) {
 		if (isset($gameID)) {
 			$hofPlayer = SmrPlayer::getPlayer($accountID, $gameID);
 			// Only show the real amount if player is in your alliance.
@@ -61,12 +58,10 @@ 
 
 	if($view == DONATION_NAME) {
 		$db->query('SELECT COUNT(account_id) rank FROM (SELECT account_id FROM account_donated GROUP BY account_id HAVING SUM(amount)>' . $db->escapeNumber($rank['Amount']) . ') x');
-	}
-	else if($view == USER_SCORE_NAME) {
+	} else if($view == USER_SCORE_NAME) {
 		$query = 'SELECT COUNT(account_id) rank FROM (SELECT account_id FROM player_hof WHERE type IN ('.$statements['IN'].')'.$gameIDSql.' GROUP BY account_id HAVING '.$statements['CASE'].'>' . $db->escapeNumber($rank['Amount']) . ') x';
 		$db->query($query);
-	}
-	else {
+	} else {
 		$db->query('SELECT COUNT(account_id) rank FROM (SELECT account_id FROM player_hof WHERE type='.$db->escapeArray($viewType,false,true,':',false).$gameIDSql.' GROUP BY account_id HAVING SUM(amount)>'.$db->escapeNumber($realAmount).') x');
 	}
 	if($db->nextRecord()) {
@@ -80,12 +75,10 @@ 
 	if(isset($var['game_id']) && Globals::isValidGame($var['game_id'])) {
 		try {
 			$hofPlayer = SmrPlayer::getPlayer($accountID,$var['game_id']);
-		}
-		catch(PlayerNotFoundException $e) {
+		} catch(PlayerNotFoundException $e) {
 			$hofAccount = SmrAccount::getAccount($accountID);
 		}
-	}
-	else {
+	} else {
 		$hofAccount = SmrAccount::getAccount($accountID);
 	}
 	$bold = '';
@@ -101,17 +94,14 @@ 
 	if (isset($var['game_id'])) {
 		$container['game_id'] = $var['game_id'];
 		$container['sending_page'] = 'personal_current_hof';
-	}
-	else {
+	} else {
 		$container['sending_page'] = 'personal_hof';
 	}
 	if(isset($hofPlayer) && is_object($hofPlayer)) {
 		$return.=('<td align="center"'.$bold.'>'.create_link($container, $hofPlayer->getPlayerName()) .'</td>');
-	}
-	else if(isset($hofAccount) && is_object($hofAccount)) {
+	} else if(isset($hofAccount) && is_object($hofAccount)) {
 		$return.=('<td align="center"'.$bold.'>'.create_link($container, $hofAccount->getHofName()) .'</td>');
-	}
-	else {
+	} else {
 		$return.=('<td align="center"'.$bold.'>Unknown</td>');
 	}
 	$return.=('<td align="center"'.$bold.'>' . $amount . '</td>');
@@ -131,8 +121,7 @@ 
 				$var['type'] = $typeList;
 				$var['view'] = $type;
 				break;
-			}
-			else {
+			} else {
 				$typeList[] = $type;
 			}
 			$viewing .= ' -&gt; ';

lib/Default/Menu.class.inc

Braces +32 added lines, -27 removed lines

@@ -22,8 +22,7 @@ 
 
 		if($alliance_id) {
 			$in_alliance = ($alliance_id == $player->getAllianceID());
-		}
-		else {
+		} else {
 			$in_alliance = $player->hasAlliance();
 		}
 		if(!$in_alliance) {
@@ -36,8 +35,7 @@ 
 				$mbRead = $db->getBoolean('mb_read');
 				$modRead = $db->getBoolean('mod_read');
 				$planetLand = $db->getBoolean('planet_land');
-			}
-			else {
+			} else {
 				$mbRead = FALSE;
 				$modRead = FALSE;
 				$planetLand = FALSE;
@@ -251,9 +249,10 @@ 
 		$menu_items[] = create_link(create_container('skeleton.php', 'bank_personal.php'),
 														'Personal Account','nav');
 
-		if ($player->hasAlliance())
-			$menu_items[] = create_link(create_container('skeleton.php', 'bank_alliance.php'),
+		if ($player->hasAlliance()) {
+					$menu_items[] = create_link(create_container('skeleton.php', 'bank_alliance.php'),
 															'Alliance Account','nav');
+		}
 
 		$menu_items[] = create_link(create_container('skeleton.php', 'bank_anon.php'),
 														'Anonymous Account','nav');
@@ -276,12 +275,14 @@ 
 		$menu_items[] = create_link($container, 'Send Message','nav');
 
 		if($player->getRaceID()==$race_id) {
-			if ($player->isOnCouncil())
-				$menu_items[] = create_link(create_container('skeleton.php', 'council_vote.php'),
+			if ($player->isOnCouncil()) {
+							$menu_items[] = create_link(create_container('skeleton.php', 'council_vote.php'),
 																'Voting Center','nav');
-			if ($player->isPresident())
-				$menu_items[] = create_link(create_container('skeleton.php', 'council_embassy.php'),
+			}
+			if ($player->isPresident()) {
+							$menu_items[] = create_link(create_container('skeleton.php', 'council_embassy.php'),
 																'Embassy','nav');
+			}
 		}
 
 		create_menu($menu_items);
@@ -310,8 +311,9 @@ 
 	static function navigation(&$template, &$player) {
 		$menuItems = array();
 		$menuItems[] = array('Link'=>Globals::getPlotCourseHREF(),'Text'=>'Plot A Course');
-		if(!$player->isLandedOnPlanet())
-			$menuItems[] = array('Link'=>Globals::getLocalMapHREF(),'Text'=>'Local Map');
+		if(!$player->isLandedOnPlanet()) {
+					$menuItems[] = array('Link'=>Globals::getLocalMapHREF(),'Text'=>'Local Map');
+		}
 		$menuItems[] = array('Link'=>'map_galaxy.php" target="gal_map','Text'=>'Galaxy Map');
 		$template->assign('MenuItems', $menuItems);
 	}
@@ -333,14 +335,16 @@ 
 	$return .= ('<tr>');
 	foreach ($menu as $number => $entry) {
 		// insert spacer
-		if ($number > 0)
-			$return .= ('<td>&nbsp;|&nbsp;</td>');
+		if ($number > 0) {
+					$return .= ('<td>&nbsp;|&nbsp;</td>');
+		}
 
 		// if this is the active entry we mark it
-		if ($number == $active_level1)
-			$active = ' class="bold"';
-		else
-			$active = '';
+		if ($number == $active_level1) {
+					$active = ' class="bold"';
+		} else {
+					$active = '';
+		}
 
 		// echo entry itself
 		$return .= ('<td align="center"'.$active.'> ' . $entry['entry'] . '</td>');
@@ -354,17 +358,18 @@ 
 		if (isset($entry['submenu']) && $number == $active_level1) {
 			$return .= ('<td><small>');
 			foreach ($entry['submenu'] as $sub_number => $sub_entry) {
-				if ($sub_number > 0)
-					$return .= (' | ');
-
-				if ($sub_number == $active_level2)
-					$return .= ('<span class="bold">'.$sub_entry.'</span>');
-				else
-					$return .= ($sub_entry);
+				if ($sub_number > 0) {
+									$return .= (' | ');
+				}
+
+				if ($sub_number == $active_level2) {
+									$return .= ('<span class="bold">'.$sub_entry.'</span>');
+				} else {
+									$return .= ($sub_entry);
+				}
 			}
 			$return .= ('</small></td>');
-		}
-		else {
+		} else {
 			// if it's not the first entry we have to put
 			// additional empty cell for the spacer
 			//if ($number > 0)

lib/Default/WeightedRandom.class.inc

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 		$this->db->query('SELECT weighting FROM weighted_random WHERE game_id = '.$this->db->escapeNumber($gameID).' AND account_id = '.$this->db->escapeNumber($accountID).' AND type = '.$this->db->escapeString($type).' AND type_id = '.$this->db->escapeNumber($typeID).' LIMIT 1');
 		if ($this->db->nextRecord()) {
 			$this->weighting = $this->db->getField('weighting');
-		}
-		else {
+		} else {
 			$this->weighting = 0;
 		}
 	}

lib/Default/RouteGenerator.class.inc

Braces +49 added lines, -42 removed lines

@@ -65,15 +65,16 @@ 
 	private static function getContinueRoutes($maxNumPorts, $startSectorId, Route &$routeToContinue, array &$forwardRoutes, array &$routeLists, $lastGoodIsNothing) {
 		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);
 				}
@@ -89,17 +90,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, $races[$raceID], $sectors[$targetSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOOD_NOTHING);
+				if ($goods[GOOD_NOTHING]===true) {
+									$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $races[$raceID], $sectors[$targetSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOOD_NOTHING);
+				}
 
 				$gameGoods = Globals::getGoods();
 				foreach($gameGoods as $goodId => &$value) {
@@ -120,13 +125,16 @@ 
 		self::$expRoutes = array();
 		self::$moneyRoutes = array();
 		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;
+				}
 
 				$gameGoods =& Globals::getGoods();
 				foreach($gameGoods as $goodId => &$value) {
@@ -154,8 +162,7 @@ 
 		if ($overallMultiplier > self::$dontAddWorseThan[self::EXP_ROUTE]) {
 			if (isset(self::$expRoutes[$overallMultiplier])) {
 				$rl =& self::$expRoutes[$overallMultiplier];
-			}
-			else {
+			} else {
 				$rl = array();
 			}
 			$rl[] =& $r;
@@ -168,8 +175,7 @@ 
 		if ($overallMultiplier > self::$dontAddWorseThan[self::MONEY_ROUTE]) {
 			if (isset(self::$moneyRoutes[$overallMultiplier])) {
 				$rl =& self::$moneyRoutes[$overallMultiplier];
-			}
-			else {
+			} else {
 				$rl = array();
 			}
 			$rl[] =& $r;
@@ -183,15 +189,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;
@@ -206,16 +211,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;
@@ -379,18 +383,21 @@ 
 	}
 
 	public function getTurnsForRoute() {
-		if ($this->goodId === GOOD_NOTHING)
-			$tradeTurns = 0;
-		else
-			$tradeTurns = 2 * TURNS_PER_TRADE;
+		if ($this->goodId === GOOD_NOTHING) {
+					$tradeTurns = 0;
+		} else {
+					$tradeTurns = 2 * TURNS_PER_TRADE;
+		}
 		return $this->distance->getTurns() + $tradeTurns;
 	}
 
 	public function compareTo(OneWayRoute &$compare) {
-		if ($this->equals($compare)===true)
-			return 0;
-		if ($this->getOverallExpMultiplier() > $compare->getOverallExpMultiplier())
-			return 1;
+		if ($this->equals($compare)===true) {
+					return 0;
+		}
+		if ($this->getOverallExpMultiplier() > $compare->getOverallExpMultiplier()) {
+					return 1;
+		}
 		return -1;
 	}
 

lib/Default/SmrWeapon.class.inc

Braces +26 added lines, -15 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];
 	}
@@ -115,8 +117,9 @@ 
 	public function getModifiedAccuracy(AbstractSmrPlayer $weaponPlayer) {
 		$modifiedAccuracy = $this->getBaseAccuracy();
 		$modifiedAccuracy += $this->getBaseAccuracy() * self::getPlayerLevelAccuracyMod($weaponPlayer);
-		if ($weaponPlayer->isGadgetEquipped('Increased Accuracy'))
-			$modifiedAccuracy += $this->getBaseAccuracy() * INCREASED_ACC_GADGET_FACTOR/100;
+		if ($weaponPlayer->isGadgetEquipped('Increased Accuracy')) {
+					$modifiedAccuracy += $this->getBaseAccuracy() * INCREASED_ACC_GADGET_FACTOR/100;
+		}
 		return $modifiedAccuracy;
 	}
 	
@@ -140,14 +143,16 @@ 
 	public function getModifiedAccuracyAgainstPlayer(AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
 		$modifiedAccuracy = $this->getModifiedAccuracy($weaponPlayer);
 		$modifiedAccuracy -= $this->getBaseAccuracy() * self::getPlayerLevelAccuracyMod($targetPlayer) / 2;
-		if ($targetPlayer->isGadgetEquipped('Increased Maneuverability'))
-			$modifiedAccuracy -= $this->getBaseAccuracy() * INCREASED_MAN_GADGET_FACTOR/100;
+		if ($targetPlayer->isGadgetEquipped('Increased Maneuverability')) {
+					$modifiedAccuracy -= $this->getBaseAccuracy() * INCREASED_MAN_GADGET_FACTOR/100;
+		}
 		
 		$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;
 	}
@@ -191,22 +196,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($weaponPlayer);
 		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($weaponPlayer);
 		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($weaponPlayer);
 		
 		$planetMod = self::PLANET_DAMAGE_MOD;