Added many fields to cPlanetRecord and cStarManager, added cSpaceNames and cResourceKeyGenerator, added methods related with galaxy generation

Author: emd4600

Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp

@@ -27,6 +27,7 @@
 #include <Spore\Simulator\cPlaceColonyToolStrategy.h>
 #include <Spore\Simulator\cPlaceObjectToolStrategy.h>
 #include <Spore\Simulator\cPlanet.h>
+#include <Spore\Simulator\cPlanetRecord.h>
 #include <Spore\Simulator\cPlayerInventory.h>
 #include <Spore\Simulator\cTimeOfDay.h>
 #include <Spore\Simulator\cRallyCallToolStrategy.h>
@@ -481,6 +482,12 @@ namespace Simulator
 		DefineAddress(RecordToPlanet, SelectAddress(0xBB4960, NO_ADDRESS, 0xBB5B50));
 		DefineAddress(FindClosestStar, SelectAddress(0xBAFD80, , 0xBB1020));
 		DefineAddress(FindStars, SelectAddress(0xBAFF70, , 0xBB1210));
+
+		DefineAddress(CalculatePlanetScores, SelectAddress(0xBA5C10, , 0xBA65F0));
+		DefineAddress(StarGenerationMessageHandler, SelectAddress(0xBB4D10, , 0xBB5F00));
+		DefineAddress(GetStarGridPosition, SelectAddress(0xBA6880, , 0xBA7250));
+		DefineAddress(GenerateEllipticalOrbit, SelectAddress(0xBA81B0, , 0xBA8D90));
+		DefineAddress(GenerateSolSystem, SelectAddress(0xBB1A00, , 0xBB2BF0));
 	}
 
 	namespace Addresses(cSpaceTradeRouteManager)
@@ -704,5 +711,10 @@ namespace Simulator
 	{
 		DefineAddress(SetCurrentAct, SelectAddress(0xF1F260, , 0xF1EE70));
 	}
+
+	namespace Addresses(cPlanetRecord)
+	{
+		DefineAddress(Create, SelectAddress(0xBA5920, , 0xBA6300));
+	}
 }
 #endif

Spore ModAPI/SourceCode/Simulator/Planets.cpp

@@ -28,11 +28,11 @@ namespace Simulator
 	}
 
 	StarID cPlanetRecord::GetStarID() const {
-		return Simulator::GetStarKey(mKey.instanceID);
+		return PlanetID(mKey.instanceID).GetStarID();
 	}
 
 	PlanetID cPlanetRecord::GetID() const {
-		return mKey.instanceID;
+		return PlanetID(mKey.instanceID);
 	}
 
 	TechLevel cPlanetRecord::GetTechLevel() const {
@@ -50,5 +50,7 @@ namespace Simulator
 	}
 
 	auto_METHOD_VOID(cPlanet, SetRepresentationMode, Args(PlanetRepresentationMode mode), Args(mode));
+
+	auto_STATIC_METHOD_VOID(cPlanetRecord, Create, Args(PlanetID planetId, cPlanetRecordPtr& dst), Args(planetId, dst));
 }
 #endif

Spore ModAPI/SourceCode/Simulator/SimulatorMisc.cpp

@@ -1,5 +1,6 @@
 #ifndef MODAPI_DLL_EXPORT
 #include <Spore\Simulator\cHerd.h>
+#include <Spore\Simulator\cSpaceNames.h>
 
 namespace Simulator
 {
@@ -16,5 +17,16 @@ namespace Simulator
 			egg->mEnabled = enabled;
 		}
 	}
+
+
+	auto_STATIC_METHOD_(cSpaceNames, cSpaceNames*, Get);
+
+	string16 cSpaceNames::GenerateRandomName(SpaceNamesType arg)
+	{
+		string16 dst;
+		CALL(GetAddress(cSpaceNames, GenerateRandomName), void, 
+			Args(cSpaceNames*, string16&, SpaceNamesType), Args(this, dst, arg));
+		return dst;
+	}
 }
 #endif

Spore ModAPI/SourceCode/Simulator/StarManager.cpp

@@ -30,8 +30,8 @@ namespace Simulator
 
 	cEmpire* cStarManager::GetEmpire(uint32_t politicalID)
 	{
-		auto it = mEmpiresMap.find(politicalID);
-		if (it != mEmpiresMap.end())
+		auto it = mEmpires.find(politicalID);
+		if (it != mEmpires.end())
 		{
 			return it->second.get();
 		}
@@ -43,23 +43,23 @@ namespace Simulator
 
 	cStarRecord* cStarManager::GetStarRecord(StarID id)
 	{
-		if (id == 0)
+		if (id.internalValue == 0)
 		{
-			return field_14C.get();
+			return mpTempStar.get();
 		}
-		else if (id == -1)
+		else if (id.internalValue == -1)
 		{
 			return nullptr;
 		}
 		else
 		{
-			return mStarRecords[id >> 12][id & 0xFFF].get();
+			return mStarRecordGrid[id.GetSectorIndex()][id.GetStarIndex()].get();
 		}
 	}
 
 	EmpiresMap& cStarManager::GetEmpires()
 	{
-		return mEmpiresMap;
+		return mEmpires;
 	}
 
 
@@ -94,6 +94,33 @@ namespace Simulator
 	auto_METHOD_VOID(cStarManager, FindStars,
 		Args(const Vector3& coords, const StarRequestFilter& filter, vector<cStarRecordPtr>& dst),
 		Args(coords, filter, dst));
+
+	auto_METHOD_VOID(cStarManager, CalculatePlanetScores,
+		Args(cPlanetRecord* pPlanetRecord, cStarRecord* pStar, int arg), Args(pPlanetRecord, pStar, arg));
+
+	auto_METHOD_VOID(cStarManager, GetStarGridPosition,
+		Args(const Vector3& position, unsigned int& dstX, unsigned int& dstY), Args(position, dstX, dstY));
+
+	auto_METHOD_VOID(cStarManager, GenerateEllipticalOrbit,
+		Args(cStarRecord* pStarRecord, cEllipticalOrbit& dst, float mind, float maxd, cPlanetRecord* pOrbitAroundPlanet),
+		Args(pStarRecord, dst, mind, maxd, pOrbitAroundPlanet));
+
+	auto_METHOD_VOID_(cStarManager, GenerateSolSystem);
+
+	auto_STATIC_METHOD(cStarManager, bool, StarGenerationMessageHandler,
+		Args(uint32_t messageId, Swarm::Components::DistributeEffectMessageData* pDistributeData, StarType starType),
+		Args(messageId, pDistributeData, starType));
+
+
+	cPlanetRecord* PlanetID::GetRecord()
+	{
+		return StarManager.GetPlanetRecord(*this);
+	}
+
+	cStarRecord* StarID::GetRecord()
+	{
+		return StarManager.GetStarRecord(*this);
+	}
 }
 
 auto_STATIC_METHOD_VOID(Simulator, SpaceTeleportTo, Args(cStarRecord* star), Args(star));

Spore ModAPI/SourceCode/Simulator/cEmpire.cpp

@@ -31,7 +31,7 @@ namespace Simulator
 	auto_METHOD_VOID(cEmpire, SetSpeciesProfile, Args(cSpeciesProfile* pSpecies), Args(pSpecies));
 
 	cStarRecord* cEmpire::GetHomeStarRecord() {
-		if (mHomeStar != -1) {
+		if (mHomeStar.internalValue != -1) {
 			return StarManager.GetStarRecord(mHomeStar);
 		}
 		else {

Spore ModAPI/SourceCode/Simulator/cStarRecord.cpp

@@ -22,6 +22,7 @@
 namespace Simulator
 {
 	auto_METHOD(cStarRecord, cPlanetRecord*, GetPlanetRecord, Args(size_t arg), Args(arg));
+	auto_METHOD_(cStarRecord, vector<cPlanetRecordPtr>&, GetPlanetRecords);
 
 	StarType cStarRecord::GetType() const {
 		return mType;

Spore ModAPI/Spore ModAPI.vcxproj

@@ -311,6 +311,7 @@
     <ClInclude Include="Spore\App\FileDrop.h" />
     <ClInclude Include="Spore\App\GameSpace.h" />
     <ClInclude Include="Spore\App\ITokenTranslator.h" />
+    <ClInclude Include="Spore\App\ResourceKeyGenerator.h" />
     <ClInclude Include="Spore\App\Thumbnail_cImportExport.h" />
     <ClInclude Include="Spore\BasicIncludes.h" />
     <ClInclude Include="Spore\CppRevEng.h" />
@@ -376,6 +377,7 @@
     <ClInclude Include="Spore\Simulator\cScenarioTerraformMode.h" />
     <ClInclude Include="Spore\Simulator\cSimPlanetHighLOD.h" />
     <ClInclude Include="Spore\Simulator\cSolarHitSphere.h" />
+    <ClInclude Include="Spore\Simulator\cSpaceNames.h" />
     <ClInclude Include="Spore\Simulator\cTimeOfDay.h" />
     <ClInclude Include="Spore\Simulator\cTotemPole.h" />
     <ClInclude Include="Spore\Simulator\cTribe.h" />
@@ -660,6 +662,7 @@
     <ClInclude Include="Spore\Simulator\tGameDataVectorT.h" />
     <ClInclude Include="Spore\Simulator\UnknownCreatureClass.h" />
     <ClInclude Include="Spore\Swarm\CollectionResource.h" />
+    <ClInclude Include="Spore\Swarm\Components\DistributeEffect.h" />
     <ClInclude Include="Spore\Swarm\Constants.h" />
     <ClInclude Include="Spore\Swarm\cSwarmManager.h" />
     <ClInclude Include="Spore\Swarm\cEffectWorld.h" />

Spore ModAPI/Spore ModAPI.vcxproj.filters

@@ -1866,6 +1866,15 @@
     <ClInclude Include="Spore\Editors\EditorBaseHandle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Spore\Simulator\cSpaceNames.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Spore\Swarm\Components\DistributeEffect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Spore\App\ResourceKeyGenerator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SourceCode\Allocator.cpp">

Spore ModAPI/Spore/App/IMessageListener.h

@@ -43,7 +43,7 @@ namespace App
 		/// Called every time a message is received. Only the messages with an ID this listened
 		/// signed up for will call this event.
 		/// @param messageID The ID of the message received.
-		/// @param msg The data of the message received, it might be nullptr.
+		/// @param pMessage The data of the message received, it might be nullptr.
 		/// @returns Whether the message was handled or not.
 		///
 		virtual bool HandleMessage(uint32_t messageID, void* msg) = 0;
@@ -65,7 +65,7 @@ namespace App
 		/// Called every time a message is received. Only the messages with an ID this listened
 		/// signed up for will call this event.
 		/// @param messageID The ID of the message received.
-		/// @param msg The data of the message received, it might be nullptr.
+		/// @param pMessage The data of the message received, it might be nullptr.
 		/// @returns Whether the message was handled or not.
 		///
 		virtual bool HandleMessage(uint32_t messageID, void* pMessage) = 0;

Spore ModAPI/Spore/App/IPropManager.h

@@ -31,14 +31,12 @@ using namespace eastl;
 
 namespace App
 {
-	///
-	/// A manager that stores all the property lists in the game, used for most configurations. Property lists (.prop files) are
+	/// A manager that stores all the property lists in the game, used for most configurations. Property lists (`.prop` files) are
 	/// simple instances of the class PropertyList that contains properties. This is used for configuring most objects and things
 	/// in the game.
 	///
-	/// A property manager can also contain definitions for properties, which are stored in the Properties.txt and AppProperties.txt
+	/// A property manager can also contain definitions for properties, which are stored in the `Properties.txt` and `AppProperties.txt`
 	/// files.
-	///
 	class IPropManager
 	{
 	public:
@@ -122,8 +120,7 @@ namespace App
 		/// Gets the instance IDs of all the PropertyList objects contained in the specified group.
 		/// @param groupID The ID of the group where the lists are (i.e. the folder)
 		/// @param[out] result A uint32_t vector that will receive the instance IDs.
-		/// @param 
-		///
+		/// @returns
 		/* 48h */	virtual bool GetAllListIDs(uint32_t groupID, vector<uint32_t>& result) const = 0;
 
 		/* 4Ch */	virtual void* func4Ch(int arg_0, int arg_4) = 0;