Merge pull request #96 from Valla-Chan/master

Part Unlocks + Comm Conversations + Documentation

Author: Valla-Chan

Projects/Example Projects/ModCreatorKit/ThumbnailCaptureScript.cpp

@@ -90,7 +90,7 @@ void ThumbnailCaptureScript::DrawLayer(int flags, int layerIndex, App::cViewer**
 			mOldColorSet = true;
 		}
 
-		mpItemViewer->field_16A = false;
+		mpItemViewer->mbRotationEnabled = false;
 
 		auto viewer = mpItemViewer->mpLayeredObject->GetViewer();
 		viewer->SetBackgroundColor(ColorRGBA(0, 0, 0, 0));
@@ -114,7 +114,7 @@ void ThumbnailCaptureScript::DrawLayer(int flags, int layerIndex, App::cViewer**
 		if (mpItemViewer->mZoom == mpItemViewer->mFinalZoom) {
 			CaptureImage();
 			// We will only do it once, also restore the rotation
-			mpItemViewer->field_16A = true;
+			mpItemViewer->mbRotationEnabled = true;
 			mpItemViewer = nullptr;
 
 			model->mColor = ColorRGBA(mOldColor, 1.0f);

Spore ModAPI/SourceCode/DLL/AddressesAnim.cpp

@@ -4,6 +4,11 @@
 
 namespace Anim
 {
+	namespace Addresses(AnimatedCreature)
+	{
+		DefineAddress(PlayAnimation, SelectAddress(0xA0C5D0, 0xA0C5D0));
+	}
+
 	namespace Addresses(IAnimManager)
 	{
 		DefineAddress(Get, SelectAddress(0x67CC70, 0x67CAE0));

Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp

@@ -1128,9 +1128,15 @@ namespace Simulator
 
 	namespace Addresses(cCollectableItems)
 	{
+		DefineAddress(sub_5976E0, SelectAddress(0x5976E0, 0x597A20));
 		DefineAddress(LoadConfig, SelectAddress(0x599100, 0x599440));
 		DefineAddress(AddUnlockableItem, SelectAddress(0x598A70, 0x598DB0));
 		DefineAddress(AddUnlockableItemFromProp, SelectAddress(0x598B50, 0x598E90));
+
+		DefineAddress(UnlockPart, SelectAddress(0x596A60, 0x596DA0));
+		DefineAddress(LockPart, SelectAddress(0x596AD0, 0x596E10));
+		DefineAddress(sub_594010, SelectAddress(0x594010, 0x5942E0));
+
 		DefineAddress(sub_597BC0, SelectAddress(0x597BC0, 0x597F00));
 		DefineAddress(sub_597390, SelectAddress(0x597390, 0x5976D0));
 	}

Spore ModAPI/SourceCode/Editors/EditorPalettes.cpp

@@ -531,17 +531,17 @@ namespace Palettes
 	auto_METHOD_VOID(AdvancedItemViewer, SetAutoRotate, Args(bool arg), Args(arg));
 	auto_METHOD_VOID(AdvancedItemViewer, SetZoom, Args(float zoom), Args(zoom));
 
-	void AdvancedItemViewer::func2Ch(bool value) {
-		field_166 = value;
+	void AdvancedItemViewer::SetShowModelOnHover(bool value) {
+		mbShowModelOnHover = value;
 	}
-	bool AdvancedItemViewer::func30h() const {
-		return field_166;
+	bool AdvancedItemViewer::GetShowModelOnHover() const {
+		return mbShowModelOnHover;
 	}
 	UTFWin::IWindow* AdvancedItemViewer::GetWindow() const {
 		return mpWindow.get();
 	}
 	void AdvancedItemViewer::Set3dPreview(bool value) {
-		field_EA = value;
+		mb3DPreviewEnabled = value;
 	}
 	Anim::AnimatedCreature* AdvancedItemViewer::GetAnimatedCreature() const {
 		return mpCreature.get();
@@ -607,40 +607,40 @@ namespace Palettes
 		, field_34()
 		, field_38()
 		, field_3C()
-		, field_40()
-		, field_44()
-		, field_48()
+		, mInstanceID()
+		, mTypeID()
+		, mGroupID()
 		, mFileName()
 		, mpWindow()
-		, field_60()
-		, mZoom(1.0f)
+		, mpWindowUnk1()
+		, mInitialZoom(1.0f)
 		, mRotation(0.0f)
-		, field_6C(0.0f)
+		, mInitialRotation(0.0f)
+		, mZoom(1.0f)
 		, mFinalZoom(1.0f)
-		, field_94(1.0f)
 		, field_98(Matrix3().SetIdentity())
 		, field_BC()
 		, field_C0()
 		, field_C4()
 		, field_C8(-1)
 		, field_CC(-1)
-		, field_D0(u"ui_material_blink")
-		, field_D4(u"ui_material_blink")
+		, mUIMaterialUnk1(u"ui_material_blink")
+		, mUIMaterialUnk2(u"ui_material_blink")
 		, field_D8()
 		, field_DC()
 		, field_E0(-1)
-		, field_E4(u"ui_material_blink")
+		, mUIMaterialUnk3(u"ui_material_blink")
 		, field_E8(true)
 		, field_E9()
-		, field_EA(true)
+		, mb3DPreviewEnabled(true)
 		, field_EB()
 		, field_EC()
 		, mpCreature()
 		, field_F4(2)
 		, field_F8()
 		, field_FC(true)
 		, field_FD()
-		, field_100(0x71FA7D3F)
+		, mTriggerBehavior(TriggerBehaviors::Drag)
 		, field_104()
 		, mpModel()
 		, field_11C()
@@ -654,10 +654,10 @@ namespace Palettes
 		, mbCreationIsBaked()
 		, field_164()
 		, field_165(true)
-		, field_166(true)
+		, mbShowModelOnHover(true)
 		, field_167()
 		, field_169()
-		, field_16A(true)
+		, mbRotationEnabled(true)
 		, mShowTooltip(true)
 		, mbOmitBackground()
 		, field_170()

Spore ModAPI/SourceCode/Simulator/CommManager.cpp

@@ -11,20 +11,35 @@ namespace Simulator
 
 	auto_METHOD(cCommManager, cCommEvent*, CreateSpaceCommEvent,
 		Args(uint32_t source, PlanetID planetKey, uint32_t fileID,
-			uint32_t dialogID, void* pMission, int priority, unsigned int duration),
+			uint32_t dialogID, cMission* pMission, int priority, unsigned int duration),
 		Args(source, planetKey, fileID, dialogID, pMission, priority, duration));
 
 	auto_METHOD_VOID(cCommManager, ShowCommEvent, Args(cCommEvent* pEvent), Args(pEvent));
 
 	auto_METHOD_const_(cCommManager, bool, IsCommScreenActive);
 
 	auto_METHOD_VOID(cCommManager, HandleCivCommAction, 
-		Args(const CnvAction& action, void* pUnk, cCity* pSourceCity, cCity* pTargetCity),
+		Args(const CnvAction& action, cCivilization* pUnk, cCity* pSourceCity, cCity* pTargetCity),
 		Args(action, pUnk, pSourceCity, pTargetCity));
 
 	auto_METHOD_VOID(cCommManager, HandleSpaceCommAction,
-		Args(const CnvAction& action, uint32_t source, PlanetID planetKey, void* pMission),
+		Args(const CnvAction& action, uint32_t source, PlanetID planetKey, cMission* pMission),
 		Args(action, source, planetKey, pMission));
+
+
+	UTFWin::IWindow* cCommManager::GetCommBackgroundWindow() { return GetCommWindow(kWindowBackground); }
+
+	UTFWin::IWindow* cCommManager::GetCommWindow(uint32_t windowid) {
+		if (CommManager.IsCommScreenActive()) {
+			auto window = WindowManager.GetMainWindow()->FindWindowByID(0x01C3BB0C);
+			return window->FindWindowByID(uint32_t(windowid));
+		}
+		return nullptr;
+	}
+
+	UTFWin::IButton* cCommManager::GetCommButton(uint32_t buttonid) {
+		return object_cast<UTFWin::IButton>(GetCommWindow(buttonid));
+	}
 }
 
 #endif

Spore ModAPI/SourceCode/Simulator/SimulatorMisc.cpp

@@ -155,6 +155,24 @@ namespace Simulator
 		Args(struct ResourceKey key, uint32_t categoryID, int row, int column, int pageIndex),
 		Args(key, categoryID, row, column, pageIndex));
 
+
+	auto_METHOD_VOID_(cCollectableItems, sub_5976E0);
+
+	auto_METHOD_VOID(cCollectableItems, UnlockPart,
+		Args(uint32_t instanceID, uint32_t groupID, int unk),
+		Args(instanceID, groupID, unk));
+
+	auto_METHOD_VOID(cCollectableItems, LockPart,
+		Args(uint32_t instanceID, uint32_t groupID),
+		Args(instanceID, groupID));
+
+	auto_METHOD_VOID_(cCollectableItems, sub_594010);
+
+	auto_METHOD_VOID(cCollectableItems, sub_597BC0,
+		Args(UnkCategoryHashMap& dst, int unk, const ResourceKey& speciesKey),
+		Args(dst, unk, speciesKey));
+
+
 	auto_METHOD_VOID(cCollectableItems, sub_597390,
 		Args(eastl::vector<int>& dst, struct cCollectableItemID itemID, int unk),
 		Args(dst, itemID, unk));

Spore ModAPI/Spore/Anim/AnimatedCreature.h

@@ -107,11 +107,14 @@ namespace Anim
 		/* 64h */	virtual int func64h() = 0;
 		/* 68h */	virtual int func68h() = 0;
 		/* 6Ch */	virtual int func6Ch() = 0;
-		/* 70h */	virtual Graphics::IModelWorld* GetAnimWorld() = 0;
+		/* 70h */	virtual Graphics::IModelWorld* zGetModelWorld() = 0; // Broken.
 		/* 74h */	virtual int func74h() = 0;
 		/* 78h */	virtual int func78h() = 0;  // returns main anim_query?
 		/* 7Ch */	virtual ~AnimatedCreature();
 
+		IAnimWorld* GetAnimWorld() { return (mpAnimWorld); }
+		Graphics::IModelWorld* GetModelWorld() { return GetModel() ? GetModel()->GetModelWorld() : nullptr; }
+
 		static bool IsIdleWalkLookatStart(uint32_t animID);
 		static bool IsIdleWalkStop(uint32_t animID);
 		static bool IsIdleWalk(uint32_t animID);
@@ -124,12 +127,14 @@ namespace Anim
 
 		/* 04h */	Vector3 mPosition;
 		/* 10h */	Quaternion mOrientation;
-		/* 20h */	char padding_20[0x154 - 0x20];
+		/* 20h */	char padding_20[0x74 - 0x20];
 
 		// 3Ch scale?
 
 		// 70h flags?
-		// 74h ColorRGBA that gets copied to model color
+		/* 74h */ ColorRGBA mColor; // gets copied to model color initially. At runtime, color should be applied directly to the mpModel.
+
+		/* 84h */	char padding_84[0x154 - 0x84];
 
 		/* 154h */	int field_154;
 		/* 158h */	int field_158;
@@ -149,6 +154,11 @@ namespace Anim
 	};
 	ASSERT_SIZE(AnimatedCreature, 0x19C);
 
+	namespace Addresses(AnimatedCreature)
+	{
+		DeclareAddress(PlayAnimation);  // 0xA0C5D0 0xA0C5D0
+	}
+
 	struct anim_query
 	{
 		struct AnimReference {

Spore ModAPI/Spore/Anim/IAnimWorld.h

@@ -35,7 +35,7 @@ namespace Anim
 		/* 28h */	virtual void UpdateCreatures(float deltaTime, App::cViewer* = nullptr) = 0;
 		/* 2Ch */	virtual void PostUpdateCreatures(float deltaTime, App::cViewer* = nullptr) = 0;
 		// model is not visible by default
-		/* 30h */	virtual AnimatedCreature* LoadCreature(const ResourceKey& key, int = 2, const Vector3& = Vector3(), const Quaternion& = Quaternion(), bool = true) = 0;
+		/* 30h */	virtual AnimatedCreature* LoadCreature(const ResourceKey& key, int = 2, const Vector3& position = Vector3(), const Quaternion& orientation = Quaternion(), bool = true) = 0;
 		/* 34h */	virtual int func34h(int, int, int, int, int) = 0;
 		// Loads a *.blocks file
 		/* 38h */	virtual int LoadCreatureByName(const char*, int, int, int, int, int) = 0;