Added several functions related with star types (like solar mass, radius, etc). Added planet generation function. Fixed ResourceKeyGenerator bug from previous update.

Author: emd4600

Spore ModAPI/SourceCode/App/App.cpp

@@ -1,6 +1,7 @@
 #ifndef MODAPI_DLL_EXPORT
 #include <Spore\App\Thumbnail_cImportExport.h>
 #include <Spore\App\AppData.h>
+#include <Spore\App\ResourceKeyGenerator.h>
 
 namespace App
 {
@@ -21,5 +22,8 @@ namespace App
 	auto_STATIC_METHOD(AppData, Resource::DBPF*, GetPackageForSaveDirectory, Args(uint32_t arg), Args(arg));
 	auto_STATIC_METHOD_VOID(AppData, SetPackageForSaveDirectory, 
 		Args(uint32_t arg, Resource::DBPF* package, bool b), Args(arg, package, b));
+
+
+	auto_STATIC_METHOD_(cResourceKeyGenerator, cResourceKeyGenerator*, Get);
 }
 #endif

Spore ModAPI/SourceCode/DLL/AddressesApp.cpp

@@ -20,6 +20,7 @@
 #include <Spore\App\Thumbnail_cImportExport.h>
 #include <Spore\App\cLocaleManager.h>
 #include <Spore\App\AppData.h>
+#include <Spore\App\ResourceKeyGenerator.h>
 
 namespace Addresses(App)
 {
@@ -367,5 +368,10 @@ namespace App
 		DefineAddress(GetPackageForSaveDirectory, SelectAddress(0x6B22C0, , 0x6B1F20));
 		DefineAddress(SetPackageForSaveDirectory, SelectAddress(0x6B3A90, , 0x6B36F0));
 	}
+
+	namespace Addresses(cResourceKeyGenerator)
+	{
+		DefineAddress(Get, SelectAddress(0x67DF80, , 0x67DE20));
+	}
 }
 #endif

Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp

@@ -46,6 +46,7 @@
 #include <Spore\Simulator\cScenarioPowerup.h>
 #include <Spore\Simulator\cScenarioSimulator.h>
 #include <Spore\Simulator\cScenarioTerraformMode.h>
+#include <Spore\Simulator\SubSystem\SpaceGfx.h>
 #include <Spore\Simulator\cHerd.h>
 #include <Spore\Simulator\cToolStrategy.h>
 #include <Spore\Simulator\cTribeArchetype.h>
@@ -57,6 +58,7 @@
 #include <Spore\Simulator\cStar.h>
 #include <Spore\Simulator\cMissionManager.h>
 #include <Spore\Simulator\Serialization.h>
+#include <Spore\Simulator\SpaceConstants.h>
 #include <Spore\Simulator\SubSystem\cRelationshipManager.h>
 #include <Spore\Simulator\SubSystem\GameBehaviorManager.h>
 #include <Spore\Simulator\SubSystem\GameInputManager.h>
@@ -95,6 +97,17 @@ namespace Addresses(Simulator)
 
 	DefineAddress(RegisterNounType, SelectAddress(0xB23CE0, , 0xB23E40));
 	DefineAddress(GetNounCreateMap, SelectAddress(0xB22090, , 0xB221A0));
+
+	DefineAddress(GetBinarySystemStarTypes, SelectAddress(0xC8A790, , 0xC8B600));
+	DefineAddress(GetBinarySystemBaseRadius, SelectAddress(0xC83720, , 0xC845B0));
+	DefineAddress(GetSolarStarTemperature, SelectAddress(0xC83610, , 0xC844A0));
+	DefineAddress(GetSolarStarMass, SelectAddress(0xC834A0, , 0xC84330));
+	DefineAddress(GetSolarStarRadius, SelectAddress(0xC83420, , 0xC842B0));
+	DefineAddress(GetSolarStarRotationRate, SelectAddress(0xC835A0, , 0xC84430));
+	DefineAddress(GetSolarStarOrbitRadius, SelectAddress(0xC83F60, , 0xC84DF0));
+	DefineAddress(GetPlanetTemperatureType, SelectAddress(0xFC26B0, , 0xFC1F90));
+	DefineAddress(IsBinaryStar, SelectAddress(0xC8A770, , 0xC8B5E0));
+	DefineAddress(IsNotStarOrBinaryStar, SelectAddress(0xC8A840, , 0xC8B6B0));
 }
 
 namespace Simulator
@@ -308,6 +321,7 @@ namespace Simulator
 	{
 		DefineAddress(GetTemperatureScore, SelectAddress(0xC6FD80, NO_ADDRESS, 0xC70BC0));
 		DefineAddress(SetRepresentationMode, SelectAddress(0xC70CD0, , 0xC71B70));
+		DefineAddress(GetRingEffect, SelectAddress(0xC6FB50, , 0xC70990));
 	}
 
 	namespace Addresses(cPlayerInventory)
@@ -488,6 +502,8 @@ namespace Simulator
 		DefineAddress(GetStarGridPosition, SelectAddress(0xBA6880, , 0xBA7250));
 		DefineAddress(GenerateEllipticalOrbit, SelectAddress(0xBA81B0, , 0xBA8D90));
 		DefineAddress(GenerateSolSystem, SelectAddress(0xBB1A00, , 0xBB2BF0));
+		DefineAddress(RequirePlanetsForStar, SelectAddress(0xBB3AA0, , 0xBB4C90));
+		DefineAddress(GeneratePlanetsForStar, SelectAddress(0xBB30B0, , 0xBB42A0));
 	}
 
 	namespace Addresses(cSpaceTradeRouteManager)
@@ -716,5 +732,12 @@ namespace Simulator
 	{
 		DefineAddress(Create, SelectAddress(0xBA5920, , 0xBA6300));
 	}
+
+	namespace Addresses(cSpaceGfx)
+	{
+		DefineAddress(Get, SelectAddress(0xB3D3D0, , 0xB3D570));
+		DefineAddress(InitializeInternal, SelectAddress(0x10367E0, , 0x1035910));
+		DefineAddress(DisposeInternal, SelectAddress(0x1038190, , 0x10372C0));
+	}
 }
 #endif

Spore ModAPI/SourceCode/Simulator/Planets.cpp

@@ -24,15 +24,15 @@
 namespace Simulator
 {
 	cStarRecord* cPlanetRecord::GetStarRecord() const {
-		return StarManager.GetStarRecord(mKey.instanceID);
+		return StarManager.GetStarRecord(mKey.GetStarID());
 	}
 
 	StarID cPlanetRecord::GetStarID() const {
-		return PlanetID(mKey.instanceID).GetStarID();
+		return PlanetID(mKey).GetStarID();
 	}
 
 	PlanetID cPlanetRecord::GetID() const {
-		return PlanetID(mKey.instanceID);
+		return mKey;
 	}
 
 	TechLevel cPlanetRecord::GetTechLevel() const {
@@ -52,5 +52,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));
+
+	auto_METHOD(cPlanet, uint32_t, GetRingEffect, Args(bool isFromPlanet), Args(isFromPlanet));
 }
 #endif

Spore ModAPI/SourceCode/Simulator/StarManager.cpp

@@ -18,6 +18,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
 #include <Spore\Simulator\SubSystem\StarManager.h>
+#include <Spore\Simulator\SubSystem\SpaceGfx.h>
+#include <Spore\Simulator\SpaceConstants.h>
 
 namespace Simulator
 {
@@ -107,25 +109,72 @@ namespace Simulator
 
 	auto_METHOD_VOID_(cStarManager, GenerateSolSystem);
 
+	auto_METHOD_VOID(cStarManager, RequirePlanetsForStar,
+		Args(cStarRecord* pStarRecord, StarRequestFilter* pFilter),
+		Args(pStarRecord, pFilter));
+
+	auto_METHOD_VOID(cStarManager, GeneratePlanetsForStar,
+		Args(cStarRecord* pStarRecord, StarRequestFilter* pFilter, bool arg),
+		Args(pStarRecord, pFilter, arg));
+
 	auto_STATIC_METHOD(cStarManager, bool, StarGenerationMessageHandler,
 		Args(uint32_t messageId, Swarm::Components::DistributeEffectMessageData* pDistributeData, StarType starType),
 		Args(messageId, pDistributeData, starType));
 
 
-	cPlanetRecord* PlanetID::GetRecord()
+	cPlanetRecord* PlanetID::GetRecord() const
 	{
 		return StarManager.GetPlanetRecord(*this);
 	}
 
-	cStarRecord* StarID::GetRecord()
+	cStarRecord* StarID::GetRecord() const
 	{
 		return StarManager.GetStarRecord(*this);
 	}
+
+
+
+	auto_STATIC_METHOD_(cSpaceGfx, cSpaceGfx*, Get);
+	auto_METHOD_VOID_(cSpaceGfx, InitializeInternal);
+	auto_METHOD_VOID_(cSpaceGfx, DisposeInternal);
 }
 
 auto_STATIC_METHOD_VOID(Simulator, SpaceTeleportTo, Args(cStarRecord* star), Args(star));
 
 auto_STATIC_METHOD(Simulator, Vector3&, GalaxyCoordinatesTo3D, 
 	Args(float parsecDistance, float angle, Vector3& dst), Args(parsecDistance, angle, dst));
 
+
+auto_STATIC_METHOD_VOID(Simulator, GetBinarySystemStarTypes,
+	Args(Simulator::StarType binaryType, Simulator::StarType& star1, Simulator::StarType& star2), 
+	Args(binaryType, star1, star2));
+
+auto_STATIC_METHOD(Simulator, float, GetBinarySystemBaseRadius,
+	Args(Simulator::StarType binaryType), Args(binaryType));
+
+auto_STATIC_METHOD(Simulator, float, GetSolarStarTemperature,
+	Args(Simulator::StarType starType), Args(starType));
+
+auto_STATIC_METHOD(Simulator, float, GetSolarStarMass, 
+	Args(Simulator::StarType starType), Args(starType));
+
+auto_STATIC_METHOD(Simulator, float, GetSolarStarRadius,
+	Args(Simulator::StarType starType), Args(starType));
+
+auto_STATIC_METHOD(Simulator, float, GetSolarStarRotationRate,
+	Args(Simulator::StarType starType), Args(starType));
+
+auto_STATIC_METHOD(Simulator, float, GetSolarStarOrbitRadius,
+	Args(Simulator::StarType starType, Simulator::SolarSystemOrbitTemperature orbitTemperature), 
+	Args(starType, orbitTemperature));
+
+auto_STATIC_METHOD(Simulator, Simulator::PlanetTemperatureType,  GetPlanetTemperatureType,
+	Args(float temperatureScore), Args(temperatureScore));
+
+auto_STATIC_METHOD(Simulator, bool, IsBinaryStar,
+	Args(Simulator::StarType starType), Args(starType));
+
+auto_STATIC_METHOD(Simulator, bool, IsNotStarOrBinaryStar,
+	Args(Simulator::StarType starType), Args(starType));
+
 #endif

Spore ModAPI/SourceCode/Simulator/cGameData.cpp

@@ -55,7 +55,7 @@ namespace Simulator
 	}
 
 	cGameData::cGameData()
-		: field_14()
+		: mpView(nullptr)
 		, mpScenarioMarker(nullptr)
 		, mScenarioClassIndex(-1)
 		, field_20()

Spore ModAPI/Spore ModAPI.vcxproj

@@ -389,10 +389,13 @@
     <ClInclude Include="Spore\Simulator\ICityMusic.h" />
     <ClInclude Include="Spore\Simulator\cBadgeManager.h" />
     <ClInclude Include="Spore\Simulator\cMissionManager.h" />
+    <ClInclude Include="Spore\Simulator\IGameDataView.h" />
     <ClInclude Include="Spore\Simulator\IProjectile.h" />
     <ClInclude Include="Spore\Simulator\SimulatorEnums.h" />
+    <ClInclude Include="Spore\Simulator\SpaceConstants.h" />
     <ClInclude Include="Spore\Simulator\SubSystem\AnimalSpeciesManager.h" />
     <ClInclude Include="Spore\Simulator\SubSystem\PlantSpeciesManager.h" />
+    <ClInclude Include="Spore\Simulator\SubSystem\SpaceGfx.h" />
     <ClInclude Include="Spore\Sporepedia\AssetViewManager.h" />
     <ClInclude Include="Spore\Sporepedia\ObjectTemplateDB.h" />
     <ClInclude Include="Spore\Sporepedia\OTDBParameters.h" />

Spore ModAPI/Spore ModAPI.vcxproj.filters

@@ -1875,6 +1875,15 @@
     <ClInclude Include="Spore\App\ResourceKeyGenerator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Spore\Simulator\IGameDataView.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Spore\Simulator\SubSystem\SpaceGfx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Spore\Simulator\SpaceConstants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SourceCode\Allocator.cpp">

Spore ModAPI/Spore/App/ResourceKeyGenerator.h

@@ -41,8 +41,8 @@ namespace App
 	};
 	ASSERT_SIZE(cResourceKeyGenerator, 0x40);
 
-	namespace Addresses(ResourceKeyGenerator)
+	namespace Addresses(cResourceKeyGenerator)
 	{
-		DeclareAddress(Get);  // 0x67DF80, TODO
+		DeclareAddress(Get);  // 0x67DF80, 0x67DE20
 	}
 }

Spore ModAPI/Spore/Simulator.h

@@ -33,6 +33,7 @@
 #include <Spore\Simulator\SubSystem\UIEventLog.h>
 #include <Spore\Simulator\SubSystem\PlantSpeciesManager.h>
 #include <Spore\Simulator\SubSystem\AnimalSpeciesManager.h>
+#include <Spore\Simulator\SubSystem\SpaceGfx.h>
 
 #include <Spore\Simulator\cGameData.h>
 #include <Spore\Simulator\cGonzagoSimulator.h>