Add cCollectableItems. Add PaletteIterator. Add cCreatureModeStrategy::ExecuteAction(). Fix ResourceKey when used in hash_maps.

emd4600 · emd4600 · commit ea28322c7566 · 2024-01-15T21:29:14.000+01:00
diff --git a/EASTL-3.02.01/include/EASTL/fixed_hash_map.h b/EASTL-3.02.01/include/EASTL/fixed_hash_map.h
@@ -807,7 +807,7 @@ namespace eastl
 	}
 
 
-	/// Spore equivalent of fixed_list; only reading is supported, adding elements might crash.
+	/// Spore equivalent of fixed_hash_map; only reading is supported, adding elements might crash.
 	template <typename Key, typename T, size_t nodeCount, size_t bucketCount = nodeCount + 1,
 			  typename Hash = eastl::hash<Key>, typename Predicate = eastl::equal_to<Key>>
 	class sp_fixed_hash_map : public hash_map<Key, T, Hash, Predicate>
diff --git a/EASTL-3.02.01/include/EASTL/fixed_hash_set.h b/EASTL-3.02.01/include/EASTL/fixed_hash_set.h
@@ -808,6 +808,24 @@ namespace eastl
 	}
 
 
+
+	/// Spore equivalent of fixed_hash_set; only reading is supported, adding elements might crash.
+	template <typename Value, size_t nodeCount, size_t bucketCount = nodeCount + 1, bool bEnableOverflow = true,
+			  typename Hash = eastl::hash<Value>, typename Predicate = eastl::equal_to<Value>, bool bCacheHashCode = false, typename OverflowAllocator = EASTLAllocatorType>
+	class sp_fixed_hash_set : public hash_set<Value, Hash, Predicate>
+	{
+	public:
+		typedef hash_set<Value, Hash, Predicate>     base_type;
+		typedef typename base_type::node_type        node_type;
+		typedef typename base_type::size_type        size_type;
+
+	public:
+		/* 20h */	int mPoolAllocator[5];  // actually part of mAllocator
+		/* 34h */	node_type** mBucketBuffer[bucketCount + 1];
+		char mPoolBuffer[(nodeCount + 1) * sizeof(node_type) + (bucketCount + 1) * 4];
+	};
+
+
 } // namespace eastl
 
 EA_RESTORE_VC_WARNING()
diff --git a/Spore ModAPI/SourceCode/App/App.cpp b/Spore ModAPI/SourceCode/App/App.cpp
@@ -34,8 +34,6 @@ namespace App
 
 	auto_STATIC_METHOD_(cIDGenerator, cIDGenerator*, Get);
 
-	auto_STATIC_METHOD_(cCreatureModeStrategy, cCreatureModeStrategy*, Get);
-
 	auto_STATIC_METHOD_(IAppSystem, IAppSystem*, Get);
 
 	auto_STATIC_METHOD(cSporeApp, int, EAMain, Args(CommandLine* commandLine), Args(commandLine));
@@ -90,6 +88,13 @@ namespace App
 
 	auto_STATIC_METHOD_(cAppSystem, cAppSystem*, Create);
 
+
+	//// cCreatureModeStrategy ////
+
+	auto_STATIC_METHOD_(cCreatureModeStrategy, cCreatureModeStrategy*, Get);
+
+	auto_METHOD_VOID(cCreatureModeStrategy, ExecuteAction, Args(uint32_t actionID, void* actionData), Args(actionID, actionData));
+
 #endif
 
 
diff --git a/Spore ModAPI/SourceCode/DLL/AddressesApp.cpp b/Spore ModAPI/SourceCode/DLL/AddressesApp.cpp
@@ -450,6 +450,7 @@ namespace App
 	namespace Addresses(cCreatureModeStrategy)
 	{
 		DefineAddress(Get, SelectAddress(0xD2D640, 0xD38840));
+		DefineAddress(ExecuteAction, SelectAddress(0xD38770, 0xD39360));
 	}
 
 	namespace Addresses(cCellModeStrategy)
diff --git a/Spore ModAPI/SourceCode/DLL/AddressesPalettes.cpp b/Spore ModAPI/SourceCode/DLL/AddressesPalettes.cpp
@@ -11,6 +11,7 @@
 #include <Spore\Palettes\PalettePage.h>
 #include <Spore\Palettes\PalettePageUI.h>
 #include <Spore\Palettes\PaletteUI.h>
+#include <Spore\Palettes\PaletteIterator.h>
 #include <Spore\Palettes\StandardItemUI.h>
 #include <Spore\Palettes\SwatchManager.h>
 
@@ -152,5 +153,13 @@ namespace Palettes
 
 		DefineAddress(Initialize, SelectAddress(0x5F4170, 0x5F43A0));
 	}
+
+	namespace Addresses(PaletteIterator)
+	{
+		DefineAddress(Init, SelectAddress(0x5C7C80, 0x5C7CB0));
+		DefineAddress(HasNext, SelectAddress(0x5C7CD0, 0x5C7D00));
+		DefineAddress(Start, SelectAddress(0x5C7F40, 0x5C7F70));
+		DefineAddress(Next, SelectAddress(0x5C7EE0, 0x5C7F10));
+	}
 }
 #endif
diff --git a/Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp b/Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp
@@ -78,7 +78,9 @@
 #include <Spore\Simulator\cCulturalProjectile.h>
 #include <Spore\Simulator\cFlakProjectile.h>
 #include <Spore\Simulator\cResourceProjectile.h>
+#include <Spore\Simulator\cCollectableItems.h>
 #include <Spore\Simulator\cSpaceDefenseMissile.h>
+#include <Spore\Simulator\cDefaultToolProjectile.h>
 #include <Spore\Simulator\SubSystem\cRelationshipManager.h>
 #include <Spore\Simulator\SubSystem\GameBehaviorManager.h>
 #include <Spore\Simulator\SubSystem\GameInputManager.h>
@@ -1021,6 +1023,13 @@ namespace Simulator
 	{
 		DefineAddress(LaunchProjectile, SelectAddress(0xCB7FD0, 0xCB88B0));
 	}
+
+	namespace Addresses(cCollectableItems)
+	{
+		DefineAddress(LoadConfig, SelectAddress(0x599100, 0x599440));
+		DefineAddress(AddUnlockableItem, SelectAddress(0x598A70, 0x598DB0));
+		DefineAddress(AddUnlockableItemFromProp, SelectAddress(0x598B50, 0x598E90));
+	}
 }
 
 #ifdef SDK_TO_GHIDRA
diff --git a/Spore ModAPI/SourceCode/Editors/EditorPalettes.cpp b/Spore ModAPI/SourceCode/Editors/EditorPalettes.cpp
@@ -25,6 +25,7 @@
 #include <Spore\Palettes\PaletteUI.h>
 #include <Spore\Palettes\PaletteCategoryUI.h>
 #include <Spore\Palettes\PalettePageUI.h>
+#include <Spore\Palettes\PaletteIterator.h>
 #include <Spore\Palettes\ItemViewer.h>
 #include <Spore\Palettes\AdvancedItemViewer.h>
 #include <Spore\Palettes\SwatchManager.h>
@@ -673,5 +674,18 @@ namespace Palettes
 		, field_1BC()
 	{
 	}
+
+
+	auto_METHOD_VOID(PaletteIterator, Init, Args(PaletteMain* palette), Args(palette));
+
+	auto_METHOD_(PaletteIterator, bool, HasNext);
+
+	auto_METHOD(PaletteIterator, PaletteItem*, Start,
+		Args(uint32_t* dstCategoryID, int* dstColumn, int* dstRow, int* dstPageIndex),
+		Args(dstCategoryID, dstColumn, dstRow, dstPageIndex));
+
+	auto_METHOD(PaletteIterator, PaletteItem*, Next,
+		Args(uint32_t* dstCategoryID, int* dstColumn, int* dstRow, int* dstPageIndex),
+		Args(dstCategoryID, dstColumn, dstRow, dstPageIndex));
 }
 #endif
diff --git a/Spore ModAPI/SourceCode/Simulator/SimulatorMisc.cpp b/Spore ModAPI/SourceCode/Simulator/SimulatorMisc.cpp
@@ -13,6 +13,7 @@
 #include <Spore\Simulator\cFlakProjectile.h>
 #include <Spore\Simulator\cResourceProjectile.h>
 #include <Spore\Simulator\cSpaceDefenseMissile.h>
+#include <Spore\Simulator\cCollectableItems.h>
 
 namespace Simulator
 {
@@ -121,5 +122,20 @@ namespace Simulator
 	//// cSpaceDefenseMissile ////
 
 	auto_METHOD_VOID(cSpaceDefenseMissile, LaunchProjectile, Args(const Math::Vector3& target, cCombatant* arg), Args(target, arg));
+
+
+	//// cCollectableItems ////
+
+	auto_METHOD_VOID(cCollectableItems, LoadConfig, 
+		Args(uint32_t configGroupID, uint32_t configInstanceID, uint32_t itemsGroupID),
+		Args(configGroupID, configInstanceID, itemsGroupID));
+
+	auto_METHOD_VOID(cCollectableItems, AddUnlockableItem,
+		Args(uint32_t instanceID, uint32_t groupID, int itemUnlockLevel, uint32_t categoryID, int row, int column, int pageIndex, float itemUnlockFindPercentage, uint32_t itemUnlockEffect),
+		Args(instanceID, groupID, itemUnlockLevel, categoryID, row, column, pageIndex, itemUnlockFindPercentage, itemUnlockEffect));
+
+	auto_METHOD(cCollectableItems, bool, AddUnlockableItemFromProp,
+		Args(struct ResourceKey key, uint32_t categoryID, int row, int column, int pageIndex),
+		Args(key, categoryID, row, column, pageIndex));
 }
 #endif
diff --git a/Spore ModAPI/Spore ModAPI.vcxproj b/Spore ModAPI/Spore ModAPI.vcxproj
@@ -382,6 +382,7 @@
     <ClInclude Include="Spore\Palettes\AdvancedItemViewer.h" />
     <ClInclude Include="Spore\Palettes\cSPScenarioBrushItemUI.h" />
     <ClInclude Include="Spore\Palettes\PaletteInfo.h" />
+    <ClInclude Include="Spore\Palettes\PaletteIterator.h" />
     <ClInclude Include="Spore\Palettes\PaletteSubcategoriesUI.h" />
     <ClInclude Include="Spore\Palettes\SwatchManager.h" />
     <ClInclude Include="Spore\Pollinator\AchievementsManager.h" />
@@ -401,6 +402,7 @@
     <ClInclude Include="Spore\Simulator\cBuildingCityHall.h" />
     <ClInclude Include="Spore\Simulator\cBuildingHouse.h" />
     <ClInclude Include="Spore\Simulator\cBuildingIndustry.h" />
+    <ClInclude Include="Spore\Simulator\cCollectableItems.h" />
     <ClInclude Include="Spore\Simulator\cCombatSimulator.h" />
     <ClInclude Include="Spore\Simulator\cCommodityNode.h" />
     <ClInclude Include="Spore\Simulator\cCommunityLayout.h" />
diff --git a/Spore ModAPI/Spore ModAPI.vcxproj.filters b/Spore ModAPI/Spore ModAPI.vcxproj.filters
@@ -2127,7 +2127,7 @@
     <ClInclude Include="Spore\Simulator\SubSystem\SpaceTrading.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-	<ClInclude Include="Spore\Simulator\cCommunityLayout.h">
+    <ClInclude Include="Spore\Simulator\cCommunityLayout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Spore\Simulator\cCulturalTarget.h">
@@ -2161,9 +2161,15 @@
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Spore\Editors\VerbIconData.h">
-	  <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Spore\Simulator\SubSystem\GamePersistenceManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Spore\Simulator\cCollectableItems.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-	<ClInclude Include="Spore\Simulator\SubSystem\GamePersistenceManager.h">
+    <ClInclude Include="Spore\Palettes\PaletteIterator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/Spore ModAPI/Spore/App/cCreatureModeStrategy.h b/Spore ModAPI/Spore/App/cCreatureModeStrategy.h
@@ -8,10 +8,21 @@
 #include <Spore\Simulator\cCreatureDisplayStrategy.h>
 
 #define cCreatureModeStrategyPtr eastl::intrusive_ptr<App::cCreatureModeStrategy>
+#define ICreatureModeActionHandlerPtr eastl::intrusive_ptr<App::ICreatureModeActionHandler>
 #define CreatureModeStrategy (*App::cCreatureModeStrategy::Get())
 
 namespace App
 {
+	class ICreatureModeActionHandler
+		: public DefaultRefCounted
+	{
+	public:
+		/* 10h */	virtual bool func10h(int);
+		/* 14h */	virtual bool func14h();  // true
+		/* 18h */	virtual bool ExecuteAction(uint32_t actionID, void* actionData);
+		/* 1Ch */	virtual bool func1Ch(int);
+	};
+
 	class cCreatureModeStrategy
 		/* 00h */	: public App::IGameMode
 		/* 04h */	, public App::IMessageListener
@@ -20,7 +31,7 @@ namespace App
 	public:
 		static cCreatureModeStrategy* Get();
 
-		//TODO check sub_D38770, execute action?
+		void ExecuteAction(uint32_t actionID, void* actionData);
 
 	public:
 		/* 24h */	int field_24;
@@ -45,7 +56,7 @@ namespace App
 		/* B0h */	int field_B0;
 		/* B4h */	int field_B4;
 		/* B8h */	int field_B8;
-		/* BCh */	eastl::vector<int> field_BC;
+		/* BCh */	eastl::vector<ICreatureModeActionHandlerPtr> mActionHandlers;
 		/* D0h */	int field_D0;
 		/* D4h */	int field_D4;
 		/* D8h */	int field_D8;
@@ -62,6 +73,7 @@ namespace App
 	namespace Addresses(cCreatureModeStrategy)
 	{
 		DeclareAddress(Get);  // 0xD2D640 0xD38840
+		DeclareAddress(ExecuteAction);  // 0xD38770 0xD39360
 	}
 
 #ifdef SDK_TO_GHIDRA
diff --git a/Spore ModAPI/Spore/BasicIncludes.h b/Spore ModAPI/Spore/BasicIncludes.h
@@ -38,6 +38,7 @@
 #include <Spore\Editors\EditorRequest.h>
 #include <Spore\Editors\EditorMessages.h>
 #include <Spore\Editors\VerbIconData.h>
+#include <Spore\Palettes\PaletteIterator.h>
 
 #include <Spore\App\IClassManager.h>
 #include <Spore\App\FileDrop.h>
diff --git a/Spore ModAPI/Spore/Palettes/PaletteIterator.h b/Spore ModAPI/Spore/Palettes/PaletteIterator.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <Spore\Palettes\PaletteMain.h>
+
+#define PaletteIteratorPtr eastl::intrusive_ptr<Palettes::PaletteIterator>
+
+namespace Palettes
+{
+	/// Used to iterate through the items of an editors palette.
+	/// ```cpp
+	/// PaletteIteratorPtr iterator = new Palettes::PaletteIterator();
+	/// iterator->Init(palette);
+	/// auto item = iterator->Start();
+	/// while (item) {
+	///		// Do something with item...
+	///		item = iterator->Next();
+	/// }
+	/// ```
+	class PaletteIterator
+		: public DefaultRefCounted
+		, public Object
+	{
+	public:
+		static const uint32_t TYPE = 0x42D4548;
+
+		void Init(PaletteMain* palette);
+
+		bool HasNext();
+
+		PaletteItem* Start(uint32_t* dstCategoryID = nullptr, int* dstColumn = nullptr, int* dstRow = nullptr, int* dstPageIndex = nullptr);
+
+		/// Gets the next element in the iterator. Will find the first next palette item that is not null.
+		/// Returns null if it reaches the end of the palette.
+		/// @param[out] dstCategoryID
+		/// @param[out] dstColumn
+		/// @param[out] dstRow
+		/// @param[out] dstPageIndex
+		/// @returns The next palette item, or null if the end was reached
+		PaletteItem* Next(uint32_t* dstCategoryID = nullptr, int* dstColumn = nullptr, int* dstRow = nullptr, int* dstPageIndex = nullptr);
+
+	public:
+		/* 0Ch */	PaletteMainPtr mpPalette;
+		/* 10h */	int mCategoryIndex;
+		/* 14h */	int mSubCategoryIndex;
+		/* 18h */	int mPageIndex;
+		/* 1Ch */	int mItemIndex;
+	};
+	ASSERT_SIZE(PaletteIterator, 0x20);
+
+	namespace Addresses(PaletteIterator)
+	{
+		DeclareAddress(Init);  // 0x5C7C80 0x5C7CB0
+		DeclareAddress(HasNext);  // 0x5C7CD0 0x5C7D00
+		DeclareAddress(Start);  // 0x5C7F40 0x5C7F70
+		DeclareAddress(Next);  // 0x5C7EE0 0x5C7F10
+	}
+}
diff --git a/Spore ModAPI/Spore/ResourceKey.h b/Spore ModAPI/Spore/ResourceKey.h
@@ -133,7 +133,7 @@ namespace eastl
 	/// A necessary structure to be able to use ResourceKey on containers such as hash_map.
 	template <> struct hash<ResourceKey>
 	{
-		size_t operator()(const ResourceKey& val) const { return static_cast<size_t>(val.groupID); }
+		size_t operator()(const ResourceKey& val) const { return static_cast<size_t>(val.instanceID ^ val.typeID); }
 	};
 }
 #endif
diff --git a/Spore ModAPI/Spore/Simulator.h b/Spore ModAPI/Spore/Simulator.h
@@ -77,7 +77,7 @@
 #include <Spore\Simulator\cICBM.h>
 #include <Spore\Simulator\cDefaultAoEArea.h>
 #include <Spore\Simulator\cSpear.h>
-#include <Spore\App\ScenarioMode.h>
+#include <Spore\Simulator\cCollectableItems.h>
 
 #include <Spore\Simulator\SimulatorMessages.h>
 
@@ -88,4 +88,8 @@
 
 #include <Spore\Simulator\Serialization.h>
 #include <Spore\Simulator\SerializationTypes.h>
-#include <Spore\Simulator\NounClassFactories.h>
+#include <Spore\Simulator\NounClassFactories.h>
+
+#include <Spore\App\ScenarioMode.h>
+#include <Spore\App\cCreatureModeStrategy.h>
+#include <Spore\App\cCellModeStrategy.h>
diff --git a/Spore ModAPI/Spore/Simulator/SubSystem/StarManager.h b/Spore ModAPI/Spore/Simulator/SubSystem/StarManager.h
@@ -24,6 +24,7 @@
 #include <Spore\Simulator\SubSystem\cRelationshipManager.h>
 #include <Spore\Simulator\cStarRecord.h>
 #include <Spore\Simulator\cPlanet.h>
+#include <Spore\Simulator\cCollectableItems.h>
 #include <Spore\Resource\Database.h>
 #include <Spore\Swarm\Components\DistributeEffect.h>
 #include <Spore\App\IMessageListener.h>
@@ -313,7 +314,7 @@ namespace Simulator
 		//TODO
 		/* 208h */	eastl::vector<eastl::string> mTransactionLog;
 		/* 21Ch */	bool field_21C;  // true
-		/* 220h */	ObjectPtr mpGlobalCLGItems;  //TODO cCollectableItems
+		/* 220h */	cCollectableItemsPtr mpGlobalCLGItems;
 		/// `planetRecords.pkt`
 		/* 224h */	DatabasePtr mpPlanetRecordsTempDatabase;
 		/// `planetRecords.pkp`
diff --git a/Spore ModAPI/Spore/Simulator/cCollectableItems.h b/Spore ModAPI/Spore/Simulator/cCollectableItems.h
diff --git a/Spore ModAPI/Spore/Simulator/cPlayer.h b/Spore ModAPI/Spore/Simulator/cPlayer.h

Original file line number	Diff line number	Diff line change
`@@ -807,7 +807,7 @@ namespace eastl`
`807`	`807`	`}`
`808`	`808`
`809`	`809`
`810`		`- /// Spore equivalent of fixed_list; only reading is supported, adding elements might crash.`
	`810`	`+ /// Spore equivalent of fixed_hash_map; only reading is supported, adding elements might crash.`
`811`	`811`	`template <typename Key, typename T, size_t nodeCount, size_t bucketCount = nodeCount + 1,`
`812`	`812`	`typename Hash = eastl::hash<Key>, typename Predicate = eastl::equal_to<Key>>`
`813`	`813`	`class sp_fixed_hash_map : public hash_map<Key, T, Hash, Predicate>`
Original file line number	Diff line number	Diff line change
`@@ -450,6 +450,7 @@ namespace App`
`450`	`450`	`namespace Addresses(cCreatureModeStrategy)`
`451`	`451`	`{`
`452`	`452`	`DefineAddress(Get, SelectAddress(0xD2D640, 0xD38840));`
	`453`	`+ DefineAddress(ExecuteAction, SelectAddress(0xD38770, 0xD39360));`
`453`	`454`	`}`
`454`	`455`
`455`	`456`	`namespace Addresses(cCellModeStrategy)`