Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Document 3 funcs #76

Merged
merged 74 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
908feb9
add function definition for AddCreature
Valla-Chan Jan 9, 2024
0318112
Merge branch 'master' of https://github.com/emd4600/Spore-ModAPI
Valla-Chan Jan 9, 2024
9913d93
Add MouthTypes to CommonIDs.h
Valla-Chan Jan 9, 2024
6da280d
Add name for Unk10 in enum CreaturePersonality
Valla-Chan Aug 19, 2024
fbdc34f
Add definitions to Cursors.h
Valla-Chan Aug 23, 2024
d4d3380
Merge branch 'emd4600:master' into master
Valla-Chan Aug 23, 2024
5172cd9
Merge branch 'master' of https://github.com/Valla-Chan/Spore-ModAPI
Valla-Chan Aug 23, 2024
b9ae16c
Fix typo, remove duplicate of auto_METHOD(cEditor, bool, AddCreature,…
Valla-Chan Aug 23, 2024
2147ceb
Merge branch 'emd4600:master' into master
Valla-Chan Aug 23, 2024
1eed050
Add enum of identity colors to cIdentityColorable
Valla-Chan Aug 23, 2024
ff135fe
Add several more cursors
Valla-Chan Aug 23, 2024
9ba0a2e
Merge branch 'master' of https://github.com/Valla-Chan/Spore-ModAPI
Valla-Chan Aug 23, 2024
f887e7f
ammend comment
Valla-Chan Aug 24, 2024
117e938
remove mouthtypes commit
Valla-Chan Aug 24, 2024
af84e58
Add space game cursors
Valla-Chan Aug 24, 2024
ab8e0a9
fix compile error in cursors.h
Valla-Chan Aug 24, 2024
adaa6ce
remove erroneous comment
Valla-Chan Aug 24, 2024
8807ab6
Merge branch 'emd4600:master' into master
Valla-Chan Aug 24, 2024
f99c941
Merge branch 'emd4600:master' into master
Valla-Chan Aug 24, 2024
546fdde
Merge branch 'emd4600:master' into master
Valla-Chan Aug 24, 2024
489f3ad
change mIDColorID to use IdentityColors
Valla-Chan Aug 25, 2024
3c3ed76
Add 2 new dev cheats (devEffectLog & PrintCursor), add support for pa…
Valla-Chan Aug 25, 2024
49173ec
fix improper effects detour
Valla-Chan Aug 25, 2024
b8bf9c4
Merge branch 'emd4600:master' into master
Valla-Chan Aug 28, 2024
e4a1317
document several part unlocking related fields
Valla-Chan Aug 30, 2024
5343f13
add comment to cCollectibleItems::sub_597BC0
Valla-Chan Aug 30, 2024
56ea6fe
Add cursors, Document string format for CursorManager::Load
Valla-Chan Sep 4, 2024
831a44a
fix typo
Valla-Chan Sep 7, 2024
7787dff
Merge branch 'emd4600:master' into master
Valla-Chan Sep 7, 2024
ffef770
Merge branch 'master' of https://github.com/Valla-Chan/Spore-ModAPI
Valla-Chan Sep 7, 2024
daa82fe
Merge branch 'emd4600:master' into master
Valla-Chan Sep 7, 2024
cc145ad
Add Math::GetDistance
Valla-Chan Sep 8, 2024
3812c5f
Merge branch 'emd4600:master' into master
Valla-Chan Sep 8, 2024
588d5ba
Revert "Add Math::GetDistance"
Valla-Chan Sep 9, 2024
89fb05f
Begin redoing EP1 object system
Valla-Chan Sep 11, 2024
33ceaba
Merge branch 'emd4600:master' into master
Valla-Chan Sep 16, 2024
97039ee
Merge branch 'emd4600:master' into master
Valla-Chan Sep 18, 2024
da5eb0b
Merge branch 'emd4600:master' into master
Valla-Chan Sep 19, 2024
7d3abfa
Revert "change mIDColorID to use IdentityColors"
Valla-Chan Sep 20, 2024
de9e709
Update cIdentityColorable.h
Valla-Chan Sep 20, 2024
233dd5c
cTribeHut - Document field_218
Valla-Chan Sep 20, 2024
e3e3584
cTribeHut - document field_21C
Valla-Chan Sep 20, 2024
431ecdd
Resolve 4/5 PR change requests
Valla-Chan Sep 20, 2024
9fa6047
add 'class' to identitycolor enum
Valla-Chan Sep 20, 2024
d7fee33
SpawnNpcTribe's 4rd interger arg = foodAmount
Valla-Chan Sep 21, 2024
2bb178f
Merge branch 'master' of https://github.com/Valla-Chan/Spore-ModAPI
Valla-Chan Sep 21, 2024
8c2520c
fix typo
Valla-Chan Sep 28, 2024
c16de41
fix typo in LoadBackgroundFiles
Valla-Chan Sep 30, 2024
4053ad8
Add message enums to SimulatorMessages.h, organize by stage
Valla-Chan Sep 30, 2024
afad808
fix typo
Valla-Chan Oct 1, 2024
25cee87
Clarify new simulator messages
Valla-Chan Oct 2, 2024
488c26a
Clarify more messages
Valla-Chan Oct 2, 2024
a0ee254
Add messages, change 1 type
Valla-Chan Oct 3, 2024
8236dd7
Merge branch 'master' of https://github.com/Valla-Chan/Spore-ModAPI
Valla-Chan Oct 3, 2024
8276e41
Update SimulatorMessages.h
Valla-Chan Oct 3, 2024
cdc5dce
Update SimulatorMessages.h
Valla-Chan Oct 3, 2024
9197088
fix typo
Valla-Chan Oct 4, 2024
ed9c724
Document tribe vars
Valla-Chan Oct 7, 2024
4ca2586
Document cTribe.mbMembersFlee, add Button funcs, fix documentation co…
Valla-Chan Oct 7, 2024
f935542
Merge branch 'master' of https://github.com/Valla-Chan/Spore-ModAPI
Valla-Chan Oct 7, 2024
d9a3a71
Annotate unknown func
Valla-Chan Oct 8, 2024
d4c51f5
Merge branch 'master' of https://github.com/Valla-Chan/Spore-ModAPI
Valla-Chan Oct 9, 2024
482d47b
Resolve PR issues
Valla-Chan Oct 9, 2024
20bd733
Revert cTribeTool temp fix
Valla-Chan Oct 9, 2024
86fbc83
Merge branch 'master' of https://github.com/Valla-Chan/Spore-ModAPI
Valla-Chan Oct 10, 2024
f08e17c
Merge branch 'emd4600:master' into master
Valla-Chan Oct 10, 2024
5587d33
fix HandheldItem enum typos
Valla-Chan Oct 10, 2024
3e82986
Merge branch 'emd4600:master' into master
Valla-Chan Oct 10, 2024
8d5a1e5
document tribe vars, rename BakeManager::func4Ch to Bake
Valla-Chan Oct 12, 2024
4631b23
Merge branch 'master' of https://github.com/Valla-Chan/Spore-ModAPI
Valla-Chan Oct 12, 2024
88eb2a1
Document EditorNamePanel Initialize()
Valla-Chan Oct 16, 2024
ac45c89
rename mbMembersFlee to mbDefeated
Valla-Chan Oct 16, 2024
fb39540
Merge branch 'emd4600:master' into master
Valla-Chan Oct 17, 2024
9aed2e2
String16 serialization fix
Valla-Chan Oct 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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