Add cPlanetRecord::GetTypeIconKey() and cPlanetRecord::HasControlledCity()

Author: emd4600

Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp

@@ -840,6 +840,8 @@ namespace Simulator
 		DefineAddress(CalculateSpiceProduction, SelectAddress(0xC6F920, 0xC70760));
 		DefineAddress(CalculateDeltaSpiceProduction, SelectAddress(0xC71200, 0xC720A0));
 		DefineAddress(GetTerrainScriptSource, SelectAddress(0xB8D690, 0xB8DEB0));
+		DefineAddress(HasControlledCity, SelectAddress(0xC6F4B0, 0xC702F0));
+		DefineAddress(GetTypeIconKey, SelectAddress(0xE2EBE0, 0xE2EB70));
 	}
 
 	namespace Addresses(cCivData) {

Spore ModAPI/SourceCode/Simulator/Planets.cpp

@@ -85,5 +85,11 @@ namespace Simulator
 		STATIC_CALL(GetAddress(cPlanetRecord, GetTerrainScriptSource), void, Args(ResourceKey&), Args(key));
 		return key;
 	}
+
+	auto_STATIC_METHOD(cPlanetRecord, bool, HasControlledCity,
+		Args(cPlanetRecord* planetRecord, cEmpire* empire, bool requireMoreThanOneTurret), 
+		Args(planetRecord, empire, requireMoreThanOneTurret));
+
+	auto_METHOD_(cPlanetRecord, const ResourceKey&, GetTypeIconKey);
 }
 #endif

Spore ModAPI/Spore/CommonIDs.h

@@ -270,6 +270,9 @@ namespace GroupIDs
 		AssetBrowserSort = 0xC5296FA9,
 		AssetBrowserGraphics = 0xCA14DE92,
 
+		GameEntryImages = 0x199B485,
+		EditorPlannerImages = 0x355BA26,
+
 		Achievements = 0x05BEFD27,
 		AchievementImages = 0x260EB59C,
 

Spore ModAPI/Spore/Simulator/cPlanetRecord.h

@@ -32,6 +32,7 @@
 namespace Simulator
 {
 	class cStarRecord;
+	class cEmpire;
 
 	struct cWallData
 	{
@@ -187,13 +188,17 @@ namespace Simulator
 		void SetGeneratedTerrainKey(const ResourceKey& key);
 		ResourceKey& GetGeneratedTerrainKey();
 
+		ResourceKey GetTerrainScriptSource();
+
+		/// Returns the key to the icon that is displayed in planet tooltip.
+		/// This depends on tech level, and whether it has an adventure.
+		const ResourceKey& GetTypeIconKey();
+
 		/// Generates a `.prop` file ResourceKey that is currently unused in game packages, so that 
 		/// the planet terrain can be saved there.
 		/// @returns
 		static ResourceKey GenerateTerrainKey();
 
-		ResourceKey GetTerrainScriptSource() const;
-
 		/// Returns the distance of the perihelion, which is the planet's closest point to the parent object
 		/// in its orbit (the parent object is either a sun, or another planet if this planet is a moon).
 		/// @param pRecord The planet
@@ -234,6 +239,14 @@ namespace Simulator
 			float baseValue, float maxOutput, float extraFactor, bool isHomeWorld, 
 			bool useSuperpowerMultiplier, bool useStorageMultiplier, float finalFactor, int numCities, bool limitOutput);
 
+		/// Return true if the planet ahs any city controlled by the specified empire.
+		/// If 'requireMoreThanOneTurret' is true, then it will only return true if the controlled city
+		/// has more than one turret.
+		/// @param planetRecord
+		/// @param empire
+		/// @param requireMoreThanOneTurret
+		static bool HasControlledCity(cPlanetRecord* planetRecord, cEmpire* empire, bool requireMoreThanOneTurret = false);
+
 	public:
 		/* 18h */	eastl::string16 mName;
 		/// The type of the planet, which determines whether it is a gas giant, asteroid belt, or regular rocky planet.
@@ -296,6 +309,8 @@ namespace Simulator
 		DeclareAddress(CalculateSpiceProduction);  // 0xC6F920 0xC70760
 		DeclareAddress(CalculateDeltaSpiceProduction);  // 0xC71200 0xC720A0
 		DeclareAddress(GetTerrainScriptSource);  // 0xB8D690 0xB8DEB0
+		DeclareAddress(HasControlledCity);  // 0xC6F4B0 0xC702F0
+		DeclareAddress(GetTypeIconKey);  // 0xE2EBE0 0xE2EB70
 	}
 
 	inline ResourceKey cPlanetRecord::GenerateTerrainKey()