- Add BundleManager with method CreateBundles()

- Add cTribe::UpdateFoodVisuals(), and addresses to SpawnMember(), CreateTool(), RemoveTool()
- Rename cCombatant::func2Ch() to Heal()

Author: emd4600

Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp

@@ -106,6 +106,7 @@
 #include <Spore\Simulator\SubSystem\PlantSpeciesManager.h>
 #include <Spore\Simulator\SubSystem\GamePersistenceManager.h>
 #include <Spore\Simulator\SubSystem\CinematicManager.h>
+#include <Spore\Simulator\SubSystem\BundleManager.h>
 #include <Spore\Simulator\NounClassFactories.h>
 
 namespace Addresses(Simulator)
@@ -1129,12 +1130,21 @@ namespace Simulator
 
 	namespace Addresses(cTribe) {
 		DefineAddress(GetToolByType, SelectAddress(0xC8ED20, 0xC8F870));
+		DefineAddress(SpawnMember, SelectAddress(0xC97BA0, 0xC983C0));
+		DefineAddress(CreateTool, SelectAddress(0xC95950, 0xC96170));
+		DefineAddress(RemoveTool, SelectAddress(0xC96800, 0xC97020));
+		DefineAddress(UpdateFoodVisuals, SelectAddress(0xC94520, 0xC94CE0));
 	}
 
 	namespace Addresses(cTribeTool) {
 		DefineAddress(GetToolClass, SelectAddress(0xC9CAB0, 0xC9D2A0));
 		DefineAddress(GetRefundMoney, SelectAddress(0xC9C970, 0xC9D160));
 	}
+
+	namespace Addresses(cBundleManager) {
+		DefineAddress(Get, SelectAddress(0xB3D210, 0xB3D3B0));
+		DefineAddress(CreateBundles, SelectAddress(0xAC7810, 0xAC79F0));
+	}
 }
 
 #ifdef SDK_TO_GHIDRA

Spore ModAPI/SourceCode/Simulator/SimulatorMisc.cpp

@@ -7,6 +7,7 @@
 #include <Spore\Simulator\cSpeciesProfile.h>
 #include <Spore\Simulator\cIdentityColorable.h>
 #include <Spore\Simulator\SubSystem\GamePersistenceManager.h>
+#include <Spore\Simulator\SubSystem\BundleManager.h>
 #include <Spore\Simulator\SubSystem\CinematicManager.h>
 #include <Spore\Simulator\cDefaultToolProjectile.h>
 #include <Spore\Simulator\cArtilleryProjectile.h>
@@ -204,5 +205,14 @@ namespace Simulator
 	int CinematicAction::Release() {
 		return RefCountTemplate::Release();
 	}
+
+	/// BundleManager ///
+
+	auto_STATIC_METHOD_(cBundleManager, cBundleManager*, Get);
+
+	auto_METHOD(cBundleManager, cGameBundle*, CreateBundles,
+		Args(float amount, cGameBundleContainer* container, int bundleType),
+		Args(amount, container, bundleType));
 }
+
 #endif

Spore ModAPI/SourceCode/Simulator/cTribe.cpp

@@ -14,6 +14,8 @@ namespace Simulator
 		Args(const Math::Vector3& position, int tribeArchetype, int numMembers, int arg0, bool arg1, cSpeciesProfile* species),
 		Args(position, tribeArchetype, numMembers, arg0, arg1, species));
 
+	auto_METHOD_VOID(cTribe, UpdateFoodVisuals, Args(float a), Args(a));
+
 	auto_METHOD(cTribe, cTribeTool*, GetToolByType, Args(int toolType), Args(toolType));
 
 	eastl::vector<cFishHotSpotUnk>& GetTribeFishHotSpots() {

Spore ModAPI/Spore ModAPI.vcxproj

@@ -328,6 +328,7 @@
     <ClInclude Include="Spore\App\JobManager.h" />
     <ClInclude Include="Spore\App\Thumbnail_cImportExport.h" />
     <ClInclude Include="Spore\Simulator\cTribeToolData.h" />
+    <ClInclude Include="Spore\Simulator\SubSystem\BundleManager.h" />
     <ClInclude Include="Spore\Simulator\SubSystem\CinematicManager.h" />
     <ClInclude Include="Spore\Simulator\SubSystem\UIAssetDiscoveryManager.h" />
     <ClInclude Include="Spore\Simulator\UIStateMachine.h" />
@@ -843,6 +844,7 @@
     <ClInclude Include="Spore\UI\ITokenTranslator.h" />
     <ClInclude Include="Spore\UI\LayerManager.h" />
     <ClInclude Include="Spore\UI\Minimap.h" />
+    <ClInclude Include="Spore\UI\SimulatorRollovers.h" />
     <ClInclude Include="Spore\UI\ScrollFrameVertical.h" />
     <ClInclude Include="Spore\UI\SpaceGameUI.h" />
     <ClInclude Include="Spore\UI\cSPUITextZoom.h" />

Spore ModAPI/Spore ModAPI.vcxproj.filters

@@ -2208,6 +2208,12 @@
     <ClInclude Include="Spore\Simulator\cTribeToolData.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Spore\UI\SimulatorRollovers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Spore\Simulator\SubSystem\BundleManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SourceCode\Allocator.cpp">

Spore ModAPI/Spore/Simulator.h

@@ -39,6 +39,7 @@
 #include <Spore\Simulator\SubSystem\TerraformingManager.h>
 #include <Spore\Simulator\SubSystem\CinematicManager.h>
 #include <Spore\Simulator\SubSystem\UIAssetDiscoveryManager.h>
+#include <Spore\Simulator\SubSystem\BundleManager.h>
 
 #include <Spore\Simulator\cGameData.h>
 #include <Spore\Simulator\cGonzagoSimulator.h>

Spore ModAPI/Spore/Simulator/SimulatorEnums.h

@@ -715,4 +715,11 @@ namespace Simulator
 		kTribeToolClassSocial = 2,
 		kTribeToolClassOther = 3,
 	};
+
+	enum TribeBundleType
+	{
+		kTribeBundleTypeFruit = 1,
+		kTribeBundleTypeMeat = 2,
+		kTribeBundleTypeFish = 3,
+	};
 }

Spore ModAPI/Spore/Simulator/SubSystem/BundleManager.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#include <Spore\Simulator\SubSystem\cStrategy.h>
+#include <Spore\Simulator\cGameBundleContainer.h>
+
+#define BundleManager (*Simulator::cBundleManager::Get())
+
+namespace Simulator
+{
+	class cBundleManager
+		: public cStrategy
+	{
+	public:
+		static cBundleManager* Get();
+
+		/// Creates one or more bundles of the given type and adds them to the container.
+		/// The number of bundles created depends on the 'amount' and how much value each bundle
+		/// can contain, which depends on the container.
+		/// @param amount
+		/// @param container
+		/// @param bundleType
+		/// @returns The last bundle created
+		cGameBundle* CreateBundles(float amount, cGameBundleContainer* container, int bundleType);
+
+	public:
+		/* 1Ch */	void* mpGroundContainer;  //TODO cGameBundleGroundContainerPtr
+	};
+	ASSERT_SIZE(cBundleManager, 0x20);
+
+	namespace Addresses(cBundleManager) {
+		DeclareAddress(Get);  // 0xB3D210 0xB3D3B0
+		DeclareAddress(CreateBundles);  // 0xAC7810 0xAC79F0
+	}
+}

Spore ModAPI/Spore/Simulator/cCombatant.h

@@ -87,7 +87,7 @@ namespace Simulator
 		/// Generates a random index that allows to select from the existing aim points.
 		/* 24h */	virtual int GetRandomAimIndex();
 		/* 28h */	virtual Math::Vector3 func28h(int);
-		/* 2Ch */	virtual void func2Ch(bool);  // heals buildings?
+		/* 2Ch */	virtual void Heal(bool);  // heals buildings?
 		/* 30h */	virtual Math::Vector3 func30h();
 		/* 34h */	virtual uint32_t func34h();  // returns field_70, an effect ID
 		/* 38h */	virtual void func38h();  // sets lastAttacker to -1 and field_28 to nullptr

Spore ModAPI/Spore/Simulator/cGameBundleContainer.h

@@ -21,6 +21,7 @@
 #include <Spore\Simulator\cGameData.h>
 #include <Spore\Simulator\cSpatialObject.h>
 #include <Spore\Simulator\cBehaviorList.h>
+#include <Spore\Simulator\ISimulatorSerializable.h>
 #include <EASTL\vector.h>
 
 #define cGameBundleContainerPtr eastl::intrusive_ptr<Simulator::cGameBundleContainer>