Added cGameBundle, added methods to cTribe, added SpawnNpcTribe()

Author: emd4600

Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp

@@ -82,6 +82,7 @@
 #include <Spore\Simulator\cSpaceDefenseMissile.h>
 #include <Spore\Simulator\cDefaultToolProjectile.h>
 #include <Spore\Simulator\cPlanetaryArtifact.h>
+#include <Spore\Simulator\cTribe.h>
 #include <Spore\Simulator\SubSystem\cRelationshipManager.h>
 #include <Spore\Simulator\SubSystem\GameBehaviorManager.h>
 #include <Spore\Simulator\SubSystem\GameInputManager.h>
@@ -137,6 +138,8 @@ namespace Addresses(Simulator)
 	DefineAddress(sCreatureGameUnlockCategoriesCount, SelectAddress(0x1587278, 0x1583298));
 
 	DefineAddress(CreateUFO, SelectAddress(0x102BB50, 0x102AC60));
+
+	DefineAddress(SpawnNpcTribe, SelectAddress(0xC92860, 0xC932F0));
 
 #ifndef SDK_TO_GHIDRA
 	DefineAddress(LightingWorld_ptr, SelectAddress(0x1682CD4, 0x167EA54));

Spore ModAPI/SourceCode/Simulator/cTribe.cpp

@@ -1,9 +1,15 @@
 #ifndef MODAPI_DLL_EXPORT
 #include <Spore\Simulator\cTribeArchetype.h>
+#include <Spore\Simulator\cTribe.h>
 
 namespace Simulator
 {
 	auto_STATIC_METHOD(cTribeArchetype, cTribeArchetype*, GetTribeArchetype,
 		Args(uint32_t archetype), Args(archetype));
+	
+
+	auto_STATIC_METHOD(Simulator, cTribe*, SpawnNpcTribe,
+		Args(const Math::Vector3& position, int tribeArchetype, int numMembers, int arg0, bool arg1, cSpeciesProfile* species),
+		Args(position, tribeArchetype, numMembers, arg0, arg1, species));
 }
 #endif

Spore ModAPI/Spore/Simulator/cGameBundleContainer.h

@@ -19,8 +19,13 @@
 #pragma once
 
 #include <Spore\Simulator\cGameData.h>
+#include <Spore\Simulator\cSpatialObject.h>
+#include <Spore\Simulator\cBehaviorList.h>
 #include <EASTL\vector.h>
 
+#define cGameBundleContainerPtr eastl::intrusive_ptr<Simulator::cGameBundleContainer>
+#define cGameBundlePtr eastl::intrusive_ptr<Simulator::cGameBundle>
+
 namespace Simulator
 {
 #ifdef SDK_TO_GHIDRA
@@ -32,14 +37,38 @@ namespace Simulator
 	class cGameBundle;  //TODO
 #endif
 
+	class cGameBundleContainer;
+
+	class cGameBundle
+		/* 00h */	: public cGameData
+		/* 34h */	, public cSpatialObject
+		/* 108h */	, public cBehaviorList
+	{
+	public:
+		static const uint32_t TYPE = 0x4FFCDEDA;
+		static const uint32_t NOUN_ID = 0x18C431C;
+
+	public:
+		/* 120h */	int field_120;
+		/* 124h */	bool mLoose;
+		/* 128h */	cGameBundleContainerPtr mpContainer;
+		/* 12Ch */	int mType;
+		/* 130h */	int mDisplayType;
+		/* 134h */	int mAmountInBundle;  // not initialized
+		/* 138h */	bool field_138;
+	};
+	ASSERT_SIZE(cGameBundle, 0x13C);
+
 	class cGameBundleContainer
 	{
 	public:
+		static const uint32_t TYPE = 0x135B1E8;
+
 		//PLACEHOLDER
 		virtual ~cGameBundleContainer();
 
 	public:
-		/* 04h */	eastl::vector<cGameBundle> mBundleList;
+		/* 04h */	eastl::vector<cGameBundlePtr> mBundleList;
 		/* 18h */	cGameDataPtr mpOwner;
 		/* 1Ch */	int mContainerCapacity;
 		/* 20h */	int mBundleCapacity;

Spore ModAPI/Spore/Simulator/cTribe.h

@@ -40,6 +40,26 @@ namespace Simulator
 		using Object::Release;
 		using Object::Cast;
 
+		/// Generates the tribe food mat and tribe members
+		/* 8Ch */	virtual void SpawnTribe(const Math::Vector3& position, int numMembers, int, bool);
+		/// Returns the vector with the members of the tribe
+		/* 90h */	virtual eastl::vector<cCreatureCitizenPtr>& GetTribeMembers();
+		/// Returns a vector of all selectable members of the tribe
+		/* 94h */	virtual eastl::vector<cSpatialObjectPtr>& GetSelectableMembers();
+		/* 98h */	virtual cCreatureCitizen* SpawnMember();
+		/* 9Ch */	virtual void func9Ch(int, bool);
+		/// Calls func9Ch() with second parameter true
+		/* A0h */	virtual void funcA0h(int);
+		/* A4h */	virtual int GetTotalFood();
+		/* A8h */	virtual void funcA8h();
+		/* ACh */	virtual cTribeHut* GetHut();
+		/* B0h */	virtual cTribeHut* funcB0h();
+		/// Creates a cCreatureCitizen*
+		/* B4h */	virtual cCreatureCitizen* funcB4h(int);
+		/* B8h */	virtual void funcB8h(int);
+		/* BCh */	virtual eastl::vector<cTribeToolPtr>& GetTools();
+		/* C0h */	virtual eastl::vector<cTribeToolPtr>& funcC0h();
+
 	public:
 		/* 260h */	cTribeFoodMatPtr mpFoodMat;
 		/* 264h */	bool mbMotiveCheatOn;
@@ -138,4 +158,10 @@ namespace Simulator
 		/* 19D8h */	int mPurchasedTools;
 	};
 	ASSERT_SIZE(cTribe, 0x19E0);
+
+	cTribe* SpawnNpcTribe(const Math::Vector3& position, int tribeArchetype, int numMembers, int, bool, cSpeciesProfile* species);
+}
+
+namespace Addresses(Simulator) {
+	DeclareAddress(SpawnNpcTribe);  // 0xC92860 0xC932F0
 }