smrealms / smr

lib/Default/AbstractSmrPlayer.class.inc

Braces +238 added lines, -163 removed lines

@@ -78,8 +78,9 @@ 
 		return $this->getNewbieTurns()>0;
 	}
 	public function setNewbieTurns($newbieTurns) {
-		if($this->newbieTurns == $newbieTurns)
-			return;
+		if($this->newbieTurns == $newbieTurns) {
+					return;
+		}
 		$this->newbieTurns=$newbieTurns;
 		$this->hasChanged=true;
 	}
@@ -89,8 +90,9 @@ 
 	}
 
 	public function setShipTypeID($shipID) {
-		if($this->shipID == $shipID)
-			return;
+		if($this->shipID == $shipID) {
+					return;
+		}
 		$this->shipID=$shipID;
 		$this->hasChanged=true;
 	}
@@ -206,8 +208,9 @@ 
 		}
 
 		$ship = $this->getShip();
-		if ($ship->hasIllegalGoods())
-			return false;
+		if ($ship->hasIllegalGoods()) {
+					return false;
+		}
 
 		if ($ship->getAttackRating() <= $this->getSafeAttackRating()) {
 			foreach($sector->getFedRaceIDs() as $fedRaceID) {
@@ -248,8 +251,9 @@ 
 	}
 
 	public function setDead($bool) {
-		if($this->dead == $bool)
-			return;
+		if($this->dead == $bool) {
+					return;
+		}
 		$this->dead=$bool;
 		$this->hasChanged=true;
 	}
@@ -259,14 +263,16 @@ 
 	}
 
 	public function increaseKills($kills) {
-		if($kills < 0)
-			throw new Exception('Trying to increase negative kills.');
+		if($kills < 0) {
+					throw new Exception('Trying to increase negative kills.');
+		}
 		$this->setKills($this->kills+$kills);
 	}
 
 	public function setKills($kills) {
-		if($this->kills == $kills)
-			return;
+		if($this->kills == $kills) {
+					return;
+		}
 		$this->kills=$kills;
 		$this->hasChanged=true;
 	}
@@ -276,14 +282,16 @@ 
 	}
 
 	public function increaseDeaths($deaths) {
-		if($deaths < 0)
-			throw new Exception('Trying to increase negative deaths.');
+		if($deaths < 0) {
+					throw new Exception('Trying to increase negative deaths.');
+		}
 		$this->setDeaths($this->getDeaths()+$deaths);
 	}
 
 	public function setDeaths($deaths) {
-		if($this->deaths == $deaths)
-			return;
+		if($this->deaths == $deaths) {
+					return;
+		}
 		$this->deaths = $deaths;
 		$this->hasChanged=true;
 	}
@@ -305,24 +313,29 @@ 
 	}
 
 	public function increaseAlignment($align) {
-		if($align < 0)
-			throw new Exception('Trying to increase negative align.');
-		if($align == 0)
-			return;
+		if($align < 0) {
+					throw new Exception('Trying to increase negative align.');
+		}
+		if($align == 0) {
+					return;
+		}
 		$align += $this->alignment;
 		$this->setAlignment($align);
 	}
 	public function decreaseAlignment($align) {
-		if($align < 0)
-			throw new Exception('Trying to decrease negative align.');
-		if($align == 0)
-			return;
+		if($align < 0) {
+					throw new Exception('Trying to decrease negative align.');
+		}
+		if($align == 0) {
+					return;
+		}
 		$align = $this->alignment - $align;
 		$this->setAlignment($align);
 	}
 	public function setAlignment($align) {
-		if($this->alignment == $align)
-			return;
+		if($this->alignment == $align) {
+					return;
+		}
 		$this->alignment = $align;
 		$this->hasChanged=true;
 	}
@@ -336,8 +349,9 @@ 
 	}
 
 	public function getNextLevelPercentAcquired() {
-		if($this->getNextLevelExperience() == $this->getThisLevelExperience())
-			return 100;
+		if($this->getNextLevelExperience() == $this->getThisLevelExperience()) {
+					return 100;
+		}
 		return max(0,min(100,round(($this->getExperience() - $this->getThisLevelExperience()) / ($this->getNextLevelExperience() - $this->getThisLevelExperience())*100)));
 	}
 
@@ -347,8 +361,10 @@ 
 
 	public function getNextLevelExperience() {
 		$LEVELS_REQUIREMENTS = Globals::getLevelRequirements();
-		if(!isset($LEVELS_REQUIREMENTS[$this->getLevelID()+1]))
-			return $this->getThisLevelExperience(); //Return current level experience if on last level.
+		if(!isset($LEVELS_REQUIREMENTS[$this->getLevelID()+1])) {
+					return $this->getThisLevelExperience();
+		}
+		//Return current level experience if on last level.
 		return $LEVELS_REQUIREMENTS[$this->getLevelID()+1]['Requirement'];
 	}
 
@@ -358,12 +374,15 @@ 
 	}
 
 	public function setExperience($experience) {
-		if($this->experience == $experience)
-			return;
-		if($experience<MIN_EXPERIENCE)
-			$experience = MIN_EXPERIENCE;
-		if($experience>MAX_EXPERIENCE)
-			$experience = MAX_EXPERIENCE;
+		if($this->experience == $experience) {
+					return;
+		}
+		if($experience<MIN_EXPERIENCE) {
+					$experience = MIN_EXPERIENCE;
+		}
+		if($experience>MAX_EXPERIENCE) {
+					$experience = MAX_EXPERIENCE;
+		}
 		$this->experience = $experience;
 		$this->hasChanged=true;
 
@@ -373,46 +392,57 @@ 
 	}
 
 	public function increaseCredits($credits) {
-		if($credits < 0)
-			throw new Exception('Trying to increase negative credits.');
-		if($credits == 0)
-			return;
+		if($credits < 0) {
+					throw new Exception('Trying to increase negative credits.');
+		}
+		if($credits == 0) {
+					return;
+		}
 		$credits += $this->credits;
 		$this->setCredits($credits);
 	}
 	public function decreaseCredits($credits) {
-		if($credits < 0)
-			throw new Exception('Trying to decrease negative credits.');
-		if($credits == 0)
-			return;
+		if($credits < 0) {
+					throw new Exception('Trying to decrease negative credits.');
+		}
+		if($credits == 0) {
+					return;
+		}
 		$credits = $this->credits - $credits;
 		$this->setCredits($credits);
 	}
 	public function setCredits($credits) {
-		if($this->credits == $credits)
-			return;
-		if($credits < 0)
-			throw new Exception('Trying to set negative credits.');
-		if($credits > MAX_MONEY)
-			$credits = MAX_MONEY;
+		if($this->credits == $credits) {
+					return;
+		}
+		if($credits < 0) {
+					throw new Exception('Trying to set negative credits.');
+		}
+		if($credits > MAX_MONEY) {
+					$credits = MAX_MONEY;
+		}
 		$this->credits = $credits;
 		$this->hasChanged=true;
 	}
 
 	public function increaseExperience($experience) {
-		if($experience < 0)
-			throw new Exception('Trying to increase negative experience.');
-		if($experience == 0)
-			return;
+		if($experience < 0) {
+					throw new Exception('Trying to increase negative experience.');
+		}
+		if($experience == 0) {
+					return;
+		}
 		$newExperience = $this->experience + $experience;
 		$this->setExperience($newExperience);
 		$this->increaseHOF($experience,array('Experience','Total','Gain'), HOF_PUBLIC);
 	}
 	public function decreaseExperience($experience) {
-		if($experience < 0)
-			throw new Exception('Trying to decrease negative experience.');
-		if($experience == 0)
-			return;
+		if($experience < 0) {
+					throw new Exception('Trying to decrease negative experience.');
+		}
+		if($experience == 0) {
+					return;
+		}
 		$newExperience = $this->experience - $experience;
 		$this->setExperience($newExperience);
 		$this->decreaseHOF($experience,array('Experience','Total','Loss'), HOF_PUBLIC);
@@ -423,8 +453,9 @@ 
 	}
 
 	public function setLandedOnPlanet($bool) {
-		if($this->landedOnPlanet == $bool)
-			return;
+		if($this->landedOnPlanet == $bool) {
+					return;
+		}
 		$this->landedOnPlanet=$bool;
 		$this->hasChanged=true;
 	}
@@ -438,7 +469,9 @@ 
 		if ($this->level === null) {
 			$LEVELS_REQUIREMENTS = Globals::getLevelRequirements();
 			foreach ($LEVELS_REQUIREMENTS as $level_id => $require) {
-				if ($this->getExperience() >= $require['Requirement']) continue;
+				if ($this->getExperience() >= $require['Requirement']) {
+					continue;
+				}
 				$this->level = $level_id - 1;
 				return $this->level;
 			}
@@ -516,8 +549,9 @@ 
 	}
 
 	public function setRaceID($raceID) {
-		if($this->raceID == $raceID)
-			return;
+		if($this->raceID == $raceID) {
+					return;
+		}
 		$this->raceID=$raceID;
 		$this->hasChanged=true;
 	}
@@ -539,8 +573,9 @@ 
 	}
 
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
-			return;
+		if($this->allianceID == $ID) {
+					return;
+		}
 		$this->allianceID=$ID;
 		if ($this->allianceID != 0) {
 			$status = $this->hasNewbieStatus() ? 'NEWBIE' : 'VETERAN';
@@ -557,8 +592,7 @@ 
 	public function getAllianceName($linked=false, $includeAllianceID=false) {
 		if($this->hasAlliance()) {
 			return $this->getAlliance()->getAllianceName($linked, $includeAllianceID);
-		}
-		else {
+		} else {
 			return 'No Alliance';
 		}
 	}
@@ -586,8 +620,9 @@ 
 	}
 
 	public function setCombatDronesKamikazeOnMines($bool) {
-		if($this->combatDronesKamikazeOnMines == $bool)
-			return;
+		if($this->combatDronesKamikazeOnMines == $bool) {
+					return;
+		}
 		$this->combatDronesKamikazeOnMines = $bool;
 		$this->hasChanged=true;
 	}
@@ -604,15 +639,17 @@ 
 			$gadgetID = $GADGETS[$gadgetID]['ID'];
 		}
 		$gadgets = $this->getGadgets();
-		if(isset($gadgets[$gadgetID]))
-			return $gadgets[$gadgetID];
+		if(isset($gadgets[$gadgetID])) {
+					return $gadgets[$gadgetID];
+		}
 		return false;
 	}
 
 	public function isGadgetEquipped($gadgetID) {
 		$gadget = $this->getGadget($gadgetID);
-		if($gadget===false)
-			return false;
+		if($gadget===false) {
+					return false;
+		}
 		return $gadget['Equipped'] > 0 && $gadget['Equipped'] < TIME && ($gadget['Expires'] == 0 || $gadget['Expires'] > TIME) && $gadget['Cooldown'] <= TIME;
 	}
 
@@ -684,21 +721,24 @@ 
 	}
 
 	public function setMilitaryPayment($amount) {
-		if($this->militaryPayment == $amount)
-			return;
+		if($this->militaryPayment == $amount) {
+					return;
+		}
 		$this->militaryPayment = $amount;
 		$this->hasChanged=true;
 	}
 
 	public function increaseMilitaryPayment($amount) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative military payment.');
+		if($amount < 0) {
+					throw new Exception('Trying to increase negative military payment.');
+		}
 		$this->setMilitaryPayment($this->getMilitaryPayment()+$amount);
 	}
 
 	public function decreaseMilitaryPayment($amount) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative military payment.');
+		if($amount < 0) {
+					throw new Exception('Trying to decrease negative military payment.');
+		}
 		$this->setMilitaryPayment($this->getMilitaryPayment()-$amount);
 	}
 
@@ -740,10 +780,11 @@ 
 
 	public function getNextBountyID() {
 		$keys = array_keys($this->getBounties());
-		if(count($keys)>0)
-			return max($keys)+1;
-		else
-			return 0;
+		if(count($keys)>0) {
+					return max($keys)+1;
+		} else {
+					return 0;
+		}
 	}
 
 	public function setBounty(array $bounty) {
@@ -758,22 +799,25 @@ 
 	}
 
 	public function increaseBountyAmount($bountyID,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative bounty.');
+		if($amount < 0) {
+					throw new Exception('Trying to increase negative bounty.');
+		}
 		$this->setBountyAmount($this->getBountyAmount($bountyID)+$amount);
 	}
 
 	public function decreaseBountyAmount($bountyID,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative bounty.');
+		if($amount < 0) {
+					throw new Exception('Trying to decrease negative bounty.');
+		}
 		$this->setBountyAmount($this->getBountyAmount($bountyID)+$amount);
 	}
 
 	public function getCurrentBounty($type) {
 		$bounties = $this->getBounties();
 		foreach($bounties as $bounty) {
-			if($bounty['Claimer'] == 0 && $bounty['Type']==$type)
-				return $bounty;
+			if($bounty['Claimer'] == 0 && $bounty['Type']==$type) {
+							return $bounty;
+			}
 		}
 		return $this->createBounty($type);
 	}
@@ -781,8 +825,9 @@ 
 	public function hasCurrentBounty($type) {
 		$bounties = $this->getBounties();
 		foreach($bounties as $bounty) {
-			if($bounty['Claimer'] == 0 && $bounty['Type']==$type)
-				return true;
+			if($bounty['Claimer'] == 0 && $bounty['Type']==$type) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -794,21 +839,24 @@ 
 
 	public function setCurrentBountyAmount($type, $amount) {
 		$bounty = $this->getCurrentBounty($type);
-		if($bounty['Amount'] == $amount)
-			return;
+		if($bounty['Amount'] == $amount) {
+					return;
+		}
 		$bounty['Amount'] = $amount;
 		$this->setBounty($bounty);
 	}
 
 	public function increaseCurrentBountyAmount($type,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative current bounty.');
+		if($amount < 0) {
+					throw new Exception('Trying to increase negative current bounty.');
+		}
 		$this->setCurrentBountyAmount($type,$this->getCurrentBountyAmount($type)+$amount);
 	}
 
 	public function decreaseCurrentBountyAmount($type,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative current bounty.');
+		if($amount < 0) {
+					throw new Exception('Trying to decrease negative current bounty.');
+		}
 		$this->setCurrentBountyAmount($type,$this->getCurrentBountyAmount($type)-$amount);
 	}
 
@@ -819,21 +867,24 @@ 
 
 	public function setCurrentBountySmrCredits($type, $credits) {
 		$bounty = $this->getCurrentBounty($type);
-		if($bounty['SmrCredits'] == $credits)
-			return;
+		if($bounty['SmrCredits'] == $credits) {
+					return;
+		}
 		$bounty['SmrCredits'] = $credits;
 		$this->setBounty($bounty);
 	}
 
 	public function increaseCurrentBountySmrCredits($type,$credits) {
-		if($credits<0)
-			throw new Exception('Trying to increase negative current bounty.');
+		if($credits<0) {
+					throw new Exception('Trying to increase negative current bounty.');
+		}
 		$this->setCurrentBountySmrCredits($type,$this->getCurrentBountySmrCredits($type)+$credits);
 	}
 
 	public function decreaseCurrentBountySmrCredits($type,$credits) {
-		if($credits<0)
-			throw new Exception('Trying to decrease negative current bounty.');
+		if($credits<0) {
+					throw new Exception('Trying to decrease negative current bounty.');
+		}
 		$this->setCurrentBountySmrCredits($type,$this->getCurrentBountySmrCredits($type)-$credits);
 	}
 
@@ -854,51 +905,59 @@ 
 
 	public function getHOF(array $typeList = null) {
 		$this->getHOFData();
-		if($typeList==null)
-			return $this->HOF;
+		if($typeList==null) {
+					return $this->HOF;
+		}
 		$hof=$this->HOF;
 		foreach($typeList as $type) {
-			if(!isset($hof[$type]))
-				return 0;
+			if(!isset($hof[$type])) {
+							return 0;
+			}
 			$hof = $hof[$type];
 		}
 		return $hof;
 	}
 
 	public function increaseHOF($amount,array $typeList, $visibility) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative HOF: '.implode(':',$typeList));
-		if($amount == 0)
-			return;
+		if($amount < 0) {
+					throw new Exception('Trying to increase negative HOF: '.implode(':',$typeList));
+		}
+		if($amount == 0) {
+					return;
+		}
 		$this->setHOF($this->getHOF($typeList)+$amount,$typeList, $visibility);
 	}
 
 	public function decreaseHOF($amount,array $typeList, $visibility) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative HOF: '.implode(':',$typeList));
-		if($amount == 0)
-			return;
+		if($amount < 0) {
+					throw new Exception('Trying to decrease negative HOF: '.implode(':',$typeList));
+		}
+		if($amount == 0) {
+					return;
+		}
 		$this->setHOF($this->getHOF($typeList)-$amount,$typeList, $visibility);
 	}
 
 	public function setHOF($amount,array $typeList, $visibility) {
-		if(is_array($this->getHOF($typeList)))
-			throw new Exception('Trying to overwrite a HOF type: '.implode(':',$typeList));
+		if(is_array($this->getHOF($typeList))) {
+					throw new Exception('Trying to overwrite a HOF type: '.implode(':',$typeList));
+		}
 		if($this->isNPC()) {
 			// Don't store HOF for NPCs.
 			return;
 		}
-		if($this->getHOF($typeList)==$amount)
-			return;
-		if($amount < 0)
-			$amount=0;
+		if($this->getHOF($typeList)==$amount) {
+					return;
+		}
+		if($amount < 0) {
+					$amount=0;
+		}
 		$this->getHOF();
 
 		$hofType = implode(':',$typeList);
 		if(!isset(self::$HOFVis[$hofType])) {
 			self::$hasHOFVisChanged[$hofType] = self::HOF_NEW;
-		}
-		else if(self::$HOFVis[$hofType] != $visibility) {
+		} else if(self::$HOFVis[$hofType] != $visibility) {
 			self::$hasHOFVisChanged[$hofType] = self::HOF_CHANGED;
 		}
 		self::$HOFVis[$hofType] = $visibility;
@@ -907,8 +966,9 @@ 
 		$hofChanged =& $this->hasHOFChanged;
 		$new = false;
 		foreach($typeList as $type) {
-			if(!isset($hofChanged[$type]))
-				$hofChanged[$type] = array();
+			if(!isset($hofChanged[$type])) {
+							$hofChanged[$type] = array();
+			}
 			if(!isset($hof[$type])) {
 				$hof[$type] = array();
 				$new = true;
@@ -918,8 +978,9 @@ 
 		}
 		if($hofChanged==null) {
 			$hofChanged = self::HOF_CHANGED;
-			if($new)
-				$hofChanged = self::HOF_NEW;
+			if($new) {
+							$hofChanged = self::HOF_NEW;
+			}
 		}
 		$hof = $amount;
 	}
@@ -945,16 +1006,19 @@ 
 	}
 
 	public function setTurns($turns,$newNoob = false,$updateLastActive = false) {
-		if($this->turns == $turns && ($this->newbieTurns == $newNoob || $newNoob==false) && !$updateLastActive)
-			return;
+		if($this->turns == $turns && ($this->newbieTurns == $newNoob || $newNoob==false) && !$updateLastActive) {
+					return;
+		}
 
 		// Make sure turns are in range [0, MaxTurns]
 		$this->turns = max(0, min($turns, $this->getMaxTurns()));
 
-		if($newNoob !== false)
-			$this->newbieTurns = $newNoob;
-		if ($this->newbieTurns < 0)
-			$this->newbieTurns = 0;
+		if($newNoob !== false) {
+					$this->newbieTurns = $newNoob;
+		}
+		if ($this->newbieTurns < 0) {
+					$this->newbieTurns = 0;
+		}
 
 		$this->hasChanged=true;
 		if($updateLastActive === true) {
@@ -964,8 +1028,9 @@ 
 	}
 
 	public function takeTurns($take, $noob = 0, $updateLastActive = true) {
-		if($take < 0 || $noob < 0)
-			throw new Exception('Trying to take negative turns.');
+		if($take < 0 || $noob < 0) {
+					throw new Exception('Trying to take negative turns.');
+		}
 		$take = ceil($take);
 		$new_turns = $this->getTurns() - $take;
 		$newbiesTaken = min($this->getNewbieTurns(),$noob);
@@ -978,8 +1043,9 @@ 
 	}
 
 	public function giveTurns($give, $noob = 0,$updateLastActive = false) {
-		if($give < 0 || $noob < 0)
-			throw new Exception('Trying to give negative turns.');
+		if($give < 0 || $noob < 0) {
+					throw new Exception('Trying to give negative turns.');
+		}
 		$give = floor($give);
 
 		$this->setTurns($this->getTurns() + $give, $this->getNewbieTurns() + $noob, $updateLastActive);
@@ -990,8 +1056,9 @@ 
 	}
 
 	public function setLastActive($lastActive) {
-		if($this->lastActive == $lastActive)
-			return;
+		if($this->lastActive == $lastActive) {
+					return;
+		}
 		$this->lastActive=$lastActive;
 		$this->hasChanged=true;
 	}
@@ -1001,8 +1068,9 @@ 
 	}
 
 	public function setLastCPLAction($time) {
-		if($this->lastCPLAction == $time)
-			return;
+		if($this->lastCPLAction == $time) {
+					return;
+		}
 		$this->lastCPLAction=$time;
 		$this->hasChanged=true;
 	}
@@ -1017,8 +1085,9 @@ 
 			//Get Player missions
 			$this->db->query('SELECT mission_id FROM player_completed_mission WHERE ' . $this->SQL);
 			$this->completedMissions = array();
-			while ($this->db->nextRecord())
-				$this->completedMissions[$this->db->getField('mission_id')] = $this->db->getField('mission_id');
+			while ($this->db->nextRecord()) {
+							$this->completedMissions[$this->db->getField('mission_id')] = $this->db->getField('mission_id');
+			}
 		}
 		return $this->completedMissions;
 	}
@@ -1055,8 +1124,9 @@ 
 
 	function getMission($missionID) {
 		$missions = $this->getMissions();
-		if(isset($missions[$missionID]))
-			return $missions[$missionID];
+		if(isset($missions[$missionID])) {
+					return $missions[$missionID];
+		}
 		return false;
 	}
 
@@ -1102,8 +1172,9 @@ 
 	function addMission($missionID) {
 		$this->getMissions();
 
-		if(isset($this->missions[$missionID]))
-			return;
+		if(isset($this->missions[$missionID])) {
+					return;
+		}
 		$sector = 0;
 
 		$mission = array(
@@ -1132,8 +1203,7 @@ 
 		if ($mission['On Step'] >= count(MISSIONS[$missionID]['Steps'])) {
 			// If we have completed this mission just use false to indicate no current task.
 			$currentStep = false;
-		}
-		else {
+		} else {
 			$currentStep = MISSIONS[$missionID]['Steps'][$mission['On Step']];
 			$currentStep['Text'] = str_replace(array('<Race>','<Sector>','<Starting Sector>','<trader>'),array($this->getRaceID(),$mission['Sector'],$mission['Starting Sector'],$this->playerName),$currentStep['Text']);
 			if (isset($currentStep['Task'])) {
@@ -1141,8 +1211,7 @@ 
 			}
 			if (isset($currentStep['Level'])) {
 				$currentStep['Level'] = str_replace('<Player Level>', $this->getLevelID(), $currentStep['Level']);
-			}
-			else {
+			} else {
 				$currentStep['Level'] = 0;
 			}
 		}
@@ -1270,12 +1339,15 @@ 
 	}
 
 	public function canSee(AbstractSmrPlayer $otherPlayer) {
-		if(!$otherPlayer->getShip()->isCloaked())
-			return true;
-		if($this->sameAlliance($otherPlayer))
-			return true;
-		if($this->getExperience()>=$otherPlayer->getExperience())
-			return true;
+		if(!$otherPlayer->getShip()->isCloaked()) {
+					return true;
+		}
+		if($this->sameAlliance($otherPlayer)) {
+					return true;
+		}
+		if($this->getExperience()>=$otherPlayer->getExperience()) {
+					return true;
+		}
 		return false;
 	}
 
@@ -1328,10 +1400,12 @@ 
 	}
 
 	public function meetsAlignmentRestriction($restriction) {
-		if($restriction<0)
-			return $this->getAlignment()<=$restriction;
-		if($restriction>0)
-			return $this->getAlignment()>=$restriction;
+		if($restriction<0) {
+					return $this->getAlignment()<=$restriction;
+		}
+		if($restriction>0) {
+					return $this->getAlignment()>=$restriction;
+		}
 		return true;
 	}
 
@@ -1354,8 +1428,9 @@ 
 		if(!isset($this->visitedSectors)) {
 			$this->visitedSectors = array();
 			$this->db->query('SELECT sector_id FROM player_visited_sector WHERE ' . $this->SQL);
-			while($this->db->nextRecord())
-				$this->visitedSectors[$this->db->getField('sector_id')] = false;
+			while($this->db->nextRecord()) {
+							$this->visitedSectors[$this->db->getField('sector_id')] = false;
+			}
 		}
 		return !isset($this->visitedSectors[$sectorID]);
 	}