creatureStick progress

projectPiki · Sep 27, 2023 · 4757a2e · 4757a2e
1 parent 0fdb658
commit 4757a2e
Show file tree

Hide file tree

Showing 5 changed files with 317 additions and 557 deletions.
diff --git a/docs/recommended_todo.md b/docs/recommended_todo.md
@@ -97,10 +97,10 @@
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/creatureLOD.cpp">creatureLOD.cpp</a> | 18468 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemCave.cpp">itemCave.cpp</a> | 20150 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameResultTexMgr.cpp">gameResultTexMgr.cpp</a> | 21221 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_MainResult.cpp">singleGS_MainResult.cpp</a> | 21236 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveResult.cpp">singleGS_CaveResult.cpp</a> | 22845 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/naviMgr.cpp">naviMgr.cpp</a> | 24409 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiBore.cpp">aiBore.cpp</a> | 26633 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiCrop.cpp">aiCrop.cpp</a> | 26982 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiTransport.cpp">aiTransport.cpp</a> | 27275 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameSystem.cpp">gameSystem.cpp</a> | 27889 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pathfinder.cpp">pathfinder.cpp</a> | 28318 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiAttack.cpp">aiAttack.cpp</a> | 28457 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/creatureStick.cpp">creatureStick.cpp</a> | 29831 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/vsCardMgr.cpp">vsCardMgr.cpp</a> | 31094 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/creatureStick.cpp">creatureStick.cpp</a> | 25340 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiBore.cpp">aiBore.cpp</a> | 26633 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiCrop.cpp">aiCrop.cpp</a> | 26982 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiTransport.cpp">aiTransport.cpp</a> | 27275 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameSystem.cpp">gameSystem.cpp</a> | 27889 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pathfinder.cpp">pathfinder.cpp</a> | 28318 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiAttack.cpp">aiAttack.cpp</a> | 28457 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/vsCardMgr.cpp">vsCardMgr.cpp</a> | 31094 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiEnter.cpp">aiEnter.cpp</a> | 31721 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_DayEnd.cpp">singleGS_DayEnd.cpp</a> | 31850 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemBridge.cpp">itemBridge.cpp</a> | 32146 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameDynamics.cpp">gameDynamics.cpp</a> | 34058 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSectionKantei.cpp">baseGameSectionKantei.cpp</a> | 35202 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayDataMemCard.cpp">gamePlayDataMemCard.cpp</a> | 36035 |

diff --git a/include/Game/Creature.h b/include/Game/Creature.h
@@ -403,9 +403,9 @@ struct Creature : public CellObject {
 	void save(Stream& output, u8 flags);
 	void setPosition(Vector3f& position, bool skipPostProc);
 	void startCapture(Matrixf*);
-	void startStick(Creature*, CollPart*);
-	void startStick(Creature*, s16);
-	void startStickMouth(Creature*, CollPart*);
+	bool startStick(Creature*, CollPart*);
+	bool startStick(Creature*, s16);
+	bool startStickMouth(Creature*, CollPart*);
 	void updateCapture(Matrixf&);
 	void updateCell();
 	void updateLOD(AILODParm&);
@@ -432,7 +432,7 @@ struct Creature : public CellObject {
 	Creature* mCaptured;            // _0FC
 	Creature* mCapture;             // _100
 	Vector3f mClimbingPosition;     // _104
-	s16 mHasStick;                  // _110
+	s16 mStickSlot;                 // _110
 	CollTree* mCollTree;            // _114
 	f32 mMass;                      // _118
 	Vector3f mAcceleration;         // _11C

diff --git a/include/Game/Stickers.h b/include/Game/Stickers.h
@@ -5,8 +5,13 @@
 #include "Container.h"
 #include "Game/Creature.h"
 
+// Maximum number of creatures that can be actively stuck to something at once.
+// If you increase the max pikmin count for a mod, increase this too.
+#define MAX_STICKERS 110
+
 namespace Game {
 struct Stickers : public Container<Creature> {
+
 	Stickers(Creature*);
 
 	virtual ~Stickers();          // _08
@@ -16,6 +21,11 @@ struct Stickers : public Container<Creature> {
 	virtual Creature* get(void*); // _20
 
 	static void initialise();
+
+	static int numBuffer;
+	static int maxBuffer;
+	static Creature** buffer;
+	static bool mutex;
 };
 } // namespace Game