Skip to content

Commit

Permalink
Document 3 funcs (#76)
Browse files Browse the repository at this point in the history
* add function definition for AddCreature

* Add MouthTypes to CommonIDs.h

* Add name for Unk10 in enum CreaturePersonality

* Add definitions to Cursors.h

* Fix typo, remove duplicate of auto_METHOD(cEditor, bool, AddCreature, add comment to funcC0h in cTribe.h

* Add enum of identity colors to cIdentityColorable

* Add several more cursors

* ammend comment

* remove mouthtypes commit

* Add space game cursors

* fix compile error in cursors.h

* remove erroneous comment

* change mIDColorID to use IdentityColors

* Add 2 new dev cheats (devEffectLog & PrintCursor), add support for palette subcategories in part icon capture.

NOTE:  UNTESTED!
For those who can, please compile this and test it ingame before accepting/rejecting PR.

* fix improper effects detour

* document several part unlocking related fields

* add comment to cCollectibleItems::sub_597BC0

* Add cursors, Document string format for CursorManager::Load

* fix typo

* Add Math::GetDistance

* Revert "Add Math::GetDistance"

This reverts commit cc145ad.

* Begin redoing EP1 object system

* Revert "change mIDColorID to use IdentityColors"

This reverts commit 489f3ad.

* Update cIdentityColorable.h

* cTribeHut - Document field_218

* cTribeHut - document field_21C

* Resolve 4/5 PR change requests

* add 'class' to identitycolor enum

* SpawnNpcTribe's 4rd interger arg = foodAmount

* fix typo

* fix typo in LoadBackgroundFiles

* Add message enums to SimulatorMessages.h, organize by stage

* fix typo

* Clarify new simulator messages

* Clarify more messages

* Add messages, change 1 type

* Update SimulatorMessages.h

* Update SimulatorMessages.h

* fix typo

* Document tribe vars

* Document cTribe.mbMembersFlee, add Button funcs, fix documentation comments

* Annotate unknown func

* Resolve PR issues

* Revert cTribeTool temp fix

* fix HandheldItem enum typos

* document tribe vars, rename BakeManager::func4Ch to Bake

* Document EditorNamePanel Initialize()

* rename mbMembersFlee to mbDefeated

* String16 serialization fix
  • Loading branch information
Valla-Chan authored Oct 17, 2024
1 parent 8fb0a01 commit 31c02f9
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Editors/BakeManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ namespace Editors
/* 40h */ virtual void func40h();
/* 44h */ virtual void func44h();
/* 48h */ virtual void func48h();
/* 4Ch */ virtual void func4Ch(const ResourceKey& nameKey, const BakeParameters& params); // bake?
/* 4Ch */ virtual void Bake(const ResourceKey& nameKey, const BakeParameters& params);

// 60h returns IModelWorld

Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/SerializationTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ namespace Simulator
if (count > 0) {
*dst = eastl::string16(count, ' ');
for (size_t i = 0; i < count; ++i) {
IO::ReadInt16(s, (int16_t*)(*dst)[i], 1, IO::Endian::Little);
IO::ReadInt16(s, (int16_t*)(dst->c_str() + i), 1, IO::Endian::Little);
}
}
return true;
Expand Down
6 changes: 3 additions & 3 deletions Spore ModAPI/Spore/Simulator/cTribe.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ namespace Simulator
/* 2A8h */ eastl::vector<int> field_2A8;
/* 2BCh */ int field_2BC;
/* 2C0h */ float mEggPenFoodValue;
/* 2C4h */ float mInitialRelationship;
/* 2C4h */ float mInitialRelationship; // does not seem to change from 0
/* 2C8h */ float mChieftainRespawnTimer;
/* 2CCh */ float mGiftRelationshipDecayTimer;
/* 2D0h */ ObjectPtr field_2D0;
Expand All @@ -129,7 +129,7 @@ namespace Simulator
/* 310h */ float mClosestWaterDistance;
/* 314h */ eastl::vector<Vector3> mClosestForests;
/* 328h */ int field_328; // not initialized
/* 32Ch */ int mUpgradeLevel;
/* 32Ch */ int mUpgradeLevel; // may be a uint32 or have errors?
/* 330h */ float mZoningRadius; // 30.0
/* 334h */ bool mbRoboTribe;
/* 338h */ int mRoboPopulationCount;
Expand All @@ -151,7 +151,7 @@ namespace Simulator
/* 550h */ int mTribeArchetype; //TODO
/* 554h */ bool field_554;
/* 555h */ bool field_555;
/* 556h */ bool mbMembersFlee; // if true, creatures run away in fear
/* 556h */ bool mbDefeated; // if true, creatures run away in fear then die.
/* 557h */ bool mGoodyPopped;
/* 558h */ char _padding_558[0x1310];
/* 1868h */ int field_1868;
Expand Down
5 changes: 4 additions & 1 deletion Spore ModAPI/Spore/UI/EditorNamePanel.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ namespace UI
EditorNamePanel();
~EditorNamePanel();

/// Creates a functional renaming UI for a nameable entity (eg Tribes and Cities)
/// allowRename when set to false will gray-out the name field
/// randomNameType when set to 0x0 will hide the randomization button
void Initialize(Editors::INameableEntity* pEntity, UTFWin::IWindow* pContainer, uint32_t layoutID,
bool, uint32_t randomNameType);
bool allowRename = true, uint32_t randomNameType = 0x0);
void Dispose();

virtual void SetExtended(bool extended);
Expand Down

0 comments on commit 31c02f9

Please sign in to comment.