- Add cFishHotSpot class and functions GetTribeFishHotSpots(), GetTribeFishTimer(), GetTribeFishEndTime(), SetTribeFishEndTime()

- Add cTribe::GetToolByType() function, and rename functions funcB4h and funcB8h to CreateTool(), RemoveTool()
- Add cTribeToolData class and functions LoadTribeToolsData(), GetTribeToolDataArray(), GetTribeToolData(), DisposeTribeToolsData()
- Add functions GetToolClass(), GetRefundMoney() to cTribeTool
- Add UI::AssetDiscoveryCard
- Fix bug when using ResourceKey as the key in map structures

Author: emd4600

Spore ModAPI/SourceCode/DLL/AddressesPalettes.cpp

@@ -14,6 +14,7 @@
 #include <Spore\Palettes\PaletteIterator.h>
 #include <Spore\Palettes\StandardItemUI.h>
 #include <Spore\Palettes\SwatchManager.h>
+#include <Spore\Palettes\OutfitterItemUI.h>
 
 namespace Palettes
 {
@@ -161,5 +162,9 @@ namespace Palettes
 		DefineAddress(Start, SelectAddress(0x5C7F40, 0x5C7F70));
 		DefineAddress(Next, SelectAddress(0x5C7EE0, 0x5C7F10));
 	}
+
+	namespace Addresses(OutfitterItemUI) {
+		DefineAddress(Initialize, SelectAddress(0x5EF6E0, 0x5EF8D0));
+	}
 }
 #endif

Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp

@@ -84,6 +84,8 @@
 #include <Spore\Simulator\cDefaultToolProjectile.h>
 #include <Spore\Simulator\cPlanetaryArtifact.h>
 #include <Spore\Simulator\cTribe.h>
+#include <Spore\Simulator\cTribeTool.h>
+#include <Spore\Simulator\cTribeToolData.h>
 #include <Spore\Simulator\SubSystem\cRelationshipManager.h>
 #include <Spore\Simulator\SubSystem\GameBehaviorManager.h>
 #include <Spore\Simulator\SubSystem\GameInputManager.h>
@@ -142,11 +144,20 @@ namespace Addresses(Simulator)
 	DefineAddress(CreateUFO, SelectAddress(0x102BB50, 0x102AC60));
 
 	DefineAddress(SpawnNpcTribe, SelectAddress(0xC92860, 0xC932F0));
+	DefineAddress(sTribeFishHotSpots_ptr, SelectAddress(0x157EB90 ,0x157ABB0));
+	DefineAddress(sTribeFishTimer_ptr, SelectAddress(0x1699678 ,0x16953F8));
+	DefineAddress(sTribeFishEndTime_ptr, SelectAddress(0x16995E8 ,0x1695368));
+
+	DefineAddress(LoadTribeToolsData, SelectAddress(0xC9D7F0, 0xC9DFE0));
+	DefineAddress(sTribeToolDataArray_ptr, SelectAddress(0x169DC94 ,0x1699A14));
+	DefineAddress(GetTribeToolData, SelectAddress(0xC9C860, 0xC9D050));
+	DefineAddress(DisposeTribeToolsData, SelectAddress(0xC9DED0, 0xC9E6C0));
 
 	DefineAddress(GetMainSpeciesImageKey, SelectAddress(0x1066AF0, 0x1065F10));
 
 	DefineAddress(GetPlayerHomePlanet, SelectAddress(0x10223F0, 0x1021220));
 
+
 #ifndef SDK_TO_GHIDRA
 	DefineAddress(LightingWorld_ptr, SelectAddress(0x1682CD4, 0x167EA54));
 	DefineAddress(PrecalculatedSolarStarRadius_ptr, SelectAddress(0x157DCF0, 0x1579D10));
@@ -1115,6 +1126,15 @@ namespace Simulator
 		DefineAddress(Get, SelectAddress(0xB3D430, 0xB3D5D0));
 		DefineAddress(PlayCinematic, SelectAddress(0xAE0480, 0xAE08B0));
 	}
+
+	namespace Addresses(cTribe) {
+		DefineAddress(GetToolByType, SelectAddress(0xC8ED20, 0xC8F870));
+	}
+
+	namespace Addresses(cTribeTool) {
+		DefineAddress(GetToolClass, SelectAddress(0xC9CAB0, 0xC9D2A0));
+		DefineAddress(GetRefundMoney, SelectAddress(0xC9C970, 0xC9D160));
+	}
 }
 
 #ifdef SDK_TO_GHIDRA

Spore ModAPI/SourceCode/Simulator/cTribe.cpp

@@ -1,6 +1,8 @@
 #ifndef MODAPI_DLL_EXPORT
 #include <Spore\Simulator\cTribeArchetype.h>
 #include <Spore\Simulator\cTribe.h>
+#include <Spore\Simulator\cTribeTool.h>
+#include <Spore\Simulator\cTribeToolData.h>
 
 namespace Simulator
 {
@@ -11,5 +13,38 @@ namespace Simulator
 	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));
+
+	auto_METHOD(cTribe, cTribeTool*, GetToolByType, Args(int toolType), Args(toolType));
+
+	eastl::vector<cFishHotSpotUnk>& GetTribeFishHotSpots() {
+		return *(eastl::vector<cFishHotSpotUnk>*)(GetAddress(Simulator, sTribeFishHotSpots_ptr));
+	}
+
+	cGonzagoTimer& GetTribeFishTimer() {
+		return *(cGonzagoTimer*)(GetAddress(Simulator, sTribeFishTimer_ptr));
+	}
+
+	uint64_t GetTribeFishEndTime() {
+		return *(uint64_t*)(GetAddress(Simulator, sTribeFishEndTime_ptr));
+	}
+	void SetTribeFishEndTime(uint64_t value) {
+		*(uint64_t*)(GetAddress(Simulator, sTribeFishEndTime_ptr)) = value;
+	}
+
+
+	auto_METHOD_(cTribeTool, int, GetToolClass);
+	auto_METHOD_(cTribeTool, int, GetRefundMoney);
+
+
+	auto_STATIC_METHOD_VOID_(Simulator, LoadTribeToolsData);
+
+	eastl::array<cTribeToolData*, 12> GetTribeToolDataArray() {
+		return *(eastl::array<cTribeToolData*, 12>*)(GetAddress(Simulator, sTribeToolDataArray_ptr));
+	}
+
+	auto_STATIC_METHOD(Simulator, cTribeToolData*, GetTribeToolData, Args(int a), Args(a));
+
+	auto_STATIC_METHOD_VOID_(Simulator, DisposeTribeToolsData);
+
 }
 #endif

Spore ModAPI/SourceCode/Sporepedia/AssetData.cpp

@@ -2,6 +2,7 @@
 #include <Spore\Sporepedia\ObjectTemplateDB.h>
 #include <Spore\Sporepedia\AssetData.h>
 #include <Spore\Sporepedia\AssetViewManager.h>
+#include <Spore\Simulator\SubSystem\StarManager.h>
 
 namespace Sporepedia
 {
@@ -142,5 +143,39 @@ namespace Sporepedia
 	auto_METHOD_VIRTUAL_VOID(cSPAssetDataOTDB, IAssetData, SetSummary, Args(bool asyncLoad), Args(asyncLoad));
 	auto_METHOD_VIRTUAL_VOID(cSPAssetDataOTDB, IAssetData, ProcessSummary, Args(OTDB::ParameterResource* pSummary), Args(pSummary));
 	auto_METHOD_VIRTUAL_VOID(cSPAssetDataOTDB, IAssetData, SetParameter, Args(const OTDB::Parameter& parameter), Args(parameter));
+
+
+
+	Simulator::cPlanetRecord* cSPSpaceAssetDataOTDB::GetPlanetRecord() {
+		if (Simulator::cStarManager::Get() && mPlanetID.internalValue != 0) {
+			return StarManager.GetPlanetRecord(mPlanetID);
+		}
+		else {
+			return nullptr;
+		}
+	}
+	void cSPSpaceAssetDataOTDB::SetIsPlayable(bool isPlayable) {
+		mIsPlayable = isPlayable;
+	}
+	void cSPSpaceAssetDataOTDB::SetSubtype(uint32_t subtype) {
+		mSubtype = subtype;
+	}
+	void cSPSpaceAssetDataOTDB::funcC4h() {
+		CALL(Address(0xDCFB70), void, Args(cSPSpaceAssetDataOTDB*), Args(this));
+	}
+
+	cSPSpaceAssetDataOTDB::cSPSpaceAssetDataOTDB()
+		: field_78()
+		, field_7C()
+		, mPlanetID(-1)
+		, field_84()
+		, field_88()
+		, field_8C(0x7fffffff)
+		, field_90(-1.0f)
+		, field_94()
+		, field_98()
+	{
+
+	}
 }
 #endif

Spore ModAPI/SourceCode/UI/UI.cpp

@@ -1,6 +1,8 @@
 #ifndef MODAPI_DLL_EXPORT
 #include <Spore\UI\GameSettings.h>
 #include <Spore\UI\EditorNamePanel.h>
+#include <Spore\UI\cSPAssetView.h>
+#include <Spore\UI\AssetDiscoveryCard.h>
 
 namespace UI
 {
@@ -52,5 +54,47 @@ namespace UI
 		Args(pEntity, pContainer, layoutID, arg, randomNameType));
 
 	auto_METHOD_VOID_(EditorNamePanel, Dispose);
+
+
+	cSPAssetView::cSPAssetView() {
+		//CALL(GetAddress(cSPAssetView, _ctor), void, Args(cSPAssetView*), Args(this));
+		CALL(Address(0x657DA0), void, Args(cSPAssetView*), Args(this));
+	}
+	// Leave empty implementations for everything, as these methods are never called
+	// We sue Spore's vftable by calling the original constructor
+
+	int cSPAssetView::AddRef() {
+		return DefaultRefCounted::AddRef();
+	}
+	int cSPAssetView::Release() {
+		return DefaultRefCounted::Release();
+	}
+	void* cSPAssetView::Cast(uint32_t) const {
+		return 0;
+	}
+	int cSPAssetView::GetEventFlags() const {
+		return 0;
+	}
+	bool cSPAssetView::HandleUIMessage(UTFWin::IWindow* pWindow, const UTFWin::Message& message) {
+		return false;
+	}
+
+	void cSPAssetView::Load(UTFWin::IWindow* window, Sporepedia::IAssetData* assetData, bool, bool) {
+	}
+	void cSPAssetView::func20h() {
+	}
+	void cSPAssetView::func24h(int, int) {
+	}
+	void cSPAssetView::SetVisible(bool visible) {
+	}
+
+	AssetDiscoveryCard::AssetDiscoveryCard()
+		: mLayout()
+		, mAssetData()
+		, mAssetView()
+		, mContainerWindow()
+		, mAssetWindow()
+	{
+	}
 }
 #endif

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\SubSystem\CinematicManager.h" />
+    <ClInclude Include="Spore\Simulator\SubSystem\UIAssetDiscoveryManager.h" />
     <ClInclude Include="Spore\Simulator\UIStateMachine.h" />
     <ClInclude Include="Spore\BasicIncludes.h" />
     <ClInclude Include="Spore\Cell.h" />
@@ -828,7 +829,9 @@
     <ClInclude Include="Spore\Swarm\Components\cTextureSlot.h" />
     <ClInclude Include="Spore\Terrain\cTerrainSphere.h" />
     <ClInclude Include="Spore\Terrain\cTerrainSphereQuad.h" />
+    <ClInclude Include="Spore\UI\AssetDiscoveryCard.h" />
     <ClInclude Include="Spore\UI\CivCommCursorAttachment.h" />
+    <ClInclude Include="Spore\UI\cSPAssetView.h" />
     <ClInclude Include="Spore\UI\cUINewProgressBar.h" />
     <ClInclude Include="Spore\UI\CursorAttachment.h" />
     <ClInclude Include="Spore\UI\EditorNamePanel.h" />

Spore ModAPI/Spore ModAPI.vcxproj.filters

@@ -2196,6 +2196,15 @@
     <ClInclude Include="Spore\Simulator\SubSystem\CinematicManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Spore\Simulator\SubSystem\UIAssetDiscoveryManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Spore\UI\cSPAssetView.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Spore\UI\AssetDiscoveryCard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SourceCode\Allocator.cpp">

Spore ModAPI/Spore/Palettes/OutfitterItemUI.h

@@ -39,6 +39,7 @@ namespace Palettes
 	class OutfitterItemUI : public DefaultItemFrameUI, public App::IMessageListener
 	{
 	public:
+		virtual void Initialize(PaletteItem* pItem, UTFWin::IWindow* pWindow, UTFWin::IWindow* pItemsPanel, PaletteInfo* pInfo) override;
 
 	public:
 		/* 24h */	IWindowPtr field_24;  // possible display of the creature
@@ -59,6 +60,10 @@ namespace Palettes
 		/* 68h */	int field_68;  // not initialized
 		/// If this palette item happens to be an editor model, this will point to the model type.
 		/* 6Ch */	uint32_t mItemModelTypeID;  // -1
+		/// `toolData_ToolType`
 		/* 70h */	uint32_t mToolTypeID;
 	};
+	namespace Addresses(OutfitterItemUI) {
+		DeclareAddress(Initialize);  // 0x5EF6E0 0x5EF8D0
+	}
 }

Spore ModAPI/Spore/ResourceKey.h

@@ -122,12 +122,22 @@ inline bool ResourceKey::operator !=(const ResourceKey &b) const
 
 inline bool ResourceKey::operator >(const ResourceKey &b) const
 {
-	return groupID > b.groupID;
+	return b < *this;
 }
 
 inline bool ResourceKey::operator <(const ResourceKey &b) const
 {
-	return groupID < b.groupID;
+	if (instanceID == b.instanceID) {
+		if (typeID == b.typeID) {
+			return groupID < b.groupID;
+		}
+		else {
+			return typeID < b.typeID;
+		}
+	}
+	else {
+		return instanceID < b.instanceID;
+	}
 }
 
 namespace eastl

Spore ModAPI/Spore/Simulator.h

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