Merge pull request OpenXcom#2 from SupSuper/master

sync

Author: GixG

bin/data/Ruleset/Xcom1Ruleset.rul

@@ -988,7 +988,7 @@ facilities:
     buildCost: 500000
     buildTime: 12
     monthlyCost: 10000
-    radarRange: 1500
+    radarRange: 1695
     radarChance: 10
     mapName: XBASE_04
   - type: STR_LARGE_RADAR_SYSTEM
@@ -997,7 +997,7 @@ facilities:
     buildCost: 800000
     buildTime: 25
     monthlyCost: 15000
-    radarRange: 2250
+    radarRange: 2577
     radarChance: 20
     mapName: XBASE_05
   - type: STR_MISSILE_DEFENSES
@@ -1105,7 +1105,7 @@ facilities:
     buildCost: 1400000
     buildTime: 26
     monthlyCost: 30000
-    radarRange: 2400
+    radarRange: 2759
     radarChance: 100
     mapName: XBASE_15
   - type: STR_HANGAR

src/Geoscape/GeoscapeState.cpp

@@ -1001,7 +1001,7 @@ bool DetectXCOMBase::operator()(const Ufo *ufo) const
 	if ((ufo->getMissionType() != "STR_ALIEN_RETALIATION" && !Options::aggressiveRetaliation) || // only UFOs on retaliation missions actively scan for bases
 		ufo->getTrajectory().getID() == "__RETALIATION_ASSAULT_RUN" || 										// UFOs attacking a base don't detect!
 		ufo->isCrashed() ||																				 // Crashed UFOs don't detect!
-		_base.getDistance(ufo) >= 80 * (1 / 60.0) * (M_PI / 180.0))										 // UFOs have a detection range of 80 XCOM units.
+		_base.getDistance(ufo) >= ufo->getRules()->getSightRange() * (1 / 60.0) * (M_PI / 180.0))		 // UFOs have a detection range of 80 XCOM units. - we use a great circle fomrula and nautical miles.
 	{
 		return false;
 	}
@@ -1041,12 +1041,11 @@ void GeoscapeState::time10Minutes()
 
 				if ((*j)->getDestination() == 0)
 				{
+					double range = ((*j)->getRules()->getSightRange() * (1 / 60.0) * (M_PI / 180));
 					for(std::vector<AlienBase*>::iterator b = _game->getSavedGame()->getAlienBases()->begin(); b != _game->getSavedGame()->getAlienBases()->end(); b++)
 					{
-						double range = (1696 * (1 / 60.0) * (M_PI / 180));
 						if ((*j)->getDistance(*b) <= range)
 						{
-							// TODO: move the detection range to the ruleset, or use the pre-defined one (which is 600, but detection range should be 500).
 							if (RNG::percent(50-((*j)->getDistance(*b) / range) * 50) && !(*b)->isDiscovered())
 							{
 								(*b)->setDiscovered(true);

src/Ruleset/RuleCraft.cpp

@@ -30,8 +30,9 @@ namespace OpenXcom
 RuleCraft::RuleCraft(const std::string &type) :
     _type(type), _sprite(-1), _fuelMax(0), _damageMax(0), _speedMax(0), _accel(0),
     _weapons(0), _soldiers(0), _vehicles(0), _costBuy(0), _costRent(0), _costSell(0),
-	_refuelItem(""), _repairRate(1), _refuelRate(1), _radarRange(600), _transferTime(0),
-	_score(0), _battlescapeTerrainData(0), _spacecraft(false), _listOrder(0), _maxItems(0)
+	_refuelItem(""), _repairRate(1), _refuelRate(1), _radarRange(672), _sightRange(1696),
+	_transferTime(0), _score(0), _battlescapeTerrainData(0), _spacecraft(false),
+	_listOrder(0), _maxItems(0)
 {
 
 }
@@ -76,6 +77,7 @@ void RuleCraft::load(const YAML::Node &node, Ruleset *ruleset, int modIndex, int
 	_repairRate = node["repairRate"].as<int>(_repairRate);
 	_refuelRate = node["refuelRate"].as<int>(_refuelRate);
 	_radarRange = node["radarRange"].as<int>(_radarRange);
+	_sightRange = node["sightRange"].as<int>(_sightRange);
 	_transferTime = node["transferTime"].as<int>(_transferTime);
 	_score = node["score"].as<int>(_score);
 	if (const YAML::Node &terrain = node["battlescapeTerrainData"])
@@ -266,6 +268,16 @@ int RuleCraft::getRadarRange() const
 	return _radarRange;
 }
 
+/**
+ * Gets the craft's sight range
+ * for detecting bases.
+ * @return The range in nautical miles.
+ */
+int RuleCraft::getSightRange() const
+{
+	return _sightRange;
+}
+
 /**
  * Gets the amount of time this item
  * takes to arrive at a base.

src/Ruleset/RuleCraft.h

@@ -43,7 +43,7 @@ class RuleCraft
 	int _sprite;
 	int _fuelMax, _damageMax, _speedMax, _accel, _weapons, _soldiers, _vehicles, _costBuy, _costRent, _costSell;
 	std::string _refuelItem;
-	int _repairRate, _refuelRate, _radarRange, _transferTime, _score;
+	int _repairRate, _refuelRate, _radarRange, _sightRange, _transferTime, _score;
 	RuleTerrain *_battlescapeTerrainData;
 	bool _spacecraft;
 	int _listOrder, _maxItems;
@@ -89,6 +89,8 @@ class RuleCraft
 	int getRefuelRate() const;
 	/// Gets the craft's radar range.
 	int getRadarRange() const;
+	/// Gets the craft's sight range.
+	int getSightRange() const;
 	/// Gets the craft's transfer time.
 	int getTransferTime() const;
 	/// Gets the craft's score.

src/Ruleset/RuleUfo.cpp

@@ -27,7 +27,10 @@ namespace OpenXcom
  * type of UFO.
  * @param type String defining the type.
  */
-RuleUfo::RuleUfo(const std::string &type) : _type(type), _size("STR_VERY_SMALL"), _sprite(-1), _damageMax(0), _speedMax(0), _accel(0), _power(0), _range(0), _score(0), _reload(0), _breakOffTime(0), _battlescapeTerrainData(0), _modSprite("")
+RuleUfo::RuleUfo(const std::string &type) :
+	_type(type), _size("STR_VERY_SMALL"), _sprite(-1), _damageMax(0), _speedMax(0),
+	_accel(0), _power(0), _range(0), _score(0), _reload(0), _breakOffTime(0), _sightRange(268),
+	_battlescapeTerrainData(0), _modSprite("")
 {
 }
 
@@ -57,6 +60,7 @@ void RuleUfo::load(const YAML::Node &node, Ruleset *ruleset)
 	_score = node["score"].as<int>(_score);
 	_reload = node["reload"].as<int>(_reload);
 	_breakOffTime = node["breakOffTime"].as<int>(_breakOffTime);
+	_sightRange = node["sightRange"].as<int>(_sightRange);
 	if (const YAML::Node &terrain = node["battlescapeTerrainData"])
 	{
 		RuleTerrain *rule = new RuleTerrain(terrain["name"].as<std::string>());
@@ -221,4 +225,13 @@ std::string RuleUfo::getModSprite() const
 	return _modSprite;
 }
 
+/**
+ * Gets the UFO's radar range
+ * for detecting bases.
+ * @return The range in nautical miles.
+ */
+int RuleUfo::getSightRange() const
+{
+	return _sightRange;
+}
 }

src/Ruleset/RuleUfo.h

@@ -39,7 +39,7 @@ class RuleUfo
 private:
 	std::string _type, _size;
 	int _sprite;
-	int _damageMax, _speedMax, _accel, _power, _range, _score, _reload, _breakOffTime;
+	int _damageMax, _speedMax, _accel, _power, _range, _score, _reload, _breakOffTime, _sightRange;
 	RuleTerrain *_battlescapeTerrainData;
 	std::string _modSprite;
 public:
@@ -77,6 +77,8 @@ class RuleUfo
 	int getBreakOffTime() const;
 	/// Gets the name of the surface that represents this UFO.
 	std::string getModSprite() const;
+	/// Gets the UFO's radar range.
+	int getSightRange() const;
 };
 
 }