mirror of
https://github.com/projectPiki/pikmin2.git
synced 2024-11-23 05:20:06 +00:00
Link aiBore.cpp
This commit is contained in:
HeartPiece
parent
046eee50a3
commit
88a0d4e4ba
File diff suppressed because it is too large
Load Diff
@ -1003,7 +1003,7 @@ LIBS = [
|
||||
["plugProjectKandoU/gameSoundEvent", True],
|
||||
"plugProjectKandoU/aiBattle",
|
||||
["plugProjectKandoU/gameDeathCount", True],
|
||||
"plugProjectKandoU/aiBore",
|
||||
["plugProjectKandoU/aiBore", True],
|
||||
["plugProjectKandoU/mapPartsView", True],
|
||||
["plugProjectKandoU/singleGS_Ending", True],
|
||||
["plugProjectKandoU/gameIconTexture", True],
|
||||
|
||||
@ -132,28 +132,28 @@
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemRock.cpp">itemRock.cpp</a> | 17257 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pathfinder.cpp">pathfinder.cpp</a> | 19828 |
|
||||
| <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/itemDownFloor.cpp">itemDownFloor.cpp</a> | 21232 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_MainResult.cpp">singleGS_MainResult.cpp</a> | 21235 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveResult.cpp">singleGS_CaveResult.cpp</a> | 22918 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameDynamics.cpp">gameDynamics.cpp</a> | 25155 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiBore.cpp">aiBore.cpp</a> | 25969 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPikihead.cpp">itemPikihead.cpp</a> | 26205 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameSeaMgr.cpp">gameSeaMgr.cpp</a> | 27984 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSectionKantei.cpp">baseGameSectionKantei.cpp</a> | 30383 | <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/singleGS_DayEnd.cpp">singleGS_DayEnd.cpp</a> | 31859 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemBridge.cpp">itemBridge.cpp</a> | 32152 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCPlate.cpp">gameCPlate.cpp</a> | 34673 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayDataMemCard.cpp">gamePlayDataMemCard.cpp</a> | 35977 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/piki.cpp">piki.cpp</a> | 36143 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameGeneratorCache.cpp">gameGeneratorCache.cpp</a> | 37565 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/vsGameSection.cpp">vsGameSection.cpp</a> | 39942 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/collinfo.cpp">collinfo.cpp</a> | 41629 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCaveInfo.cpp">gameCaveInfo.cpp</a> | 48322 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemGate.cpp">itemGate.cpp</a> | 49144 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameDynamics.cpp">gameDynamics.cpp</a> | 25155 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPikihead.cpp">itemPikihead.cpp</a> | 26205 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameSeaMgr.cpp">gameSeaMgr.cpp</a> | 27984 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSectionKantei.cpp">baseGameSectionKantei.cpp</a> | 30383 |
|
||||
| <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/singleGS_DayEnd.cpp">singleGS_DayEnd.cpp</a> | 31859 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemBridge.cpp">itemBridge.cpp</a> | 32152 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCPlate.cpp">gameCPlate.cpp</a> | 34673 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayDataMemCard.cpp">gamePlayDataMemCard.cpp</a> | 35977 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/piki.cpp">piki.cpp</a> | 36143 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameGeneratorCache.cpp">gameGeneratorCache.cpp</a> | 37565 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/vsGameSection.cpp">vsGameSection.cpp</a> | 39942 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/collinfo.cpp">collinfo.cpp</a> | 41629 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCaveInfo.cpp">gameCaveInfo.cpp</a> | 48322 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemGate.cpp">itemGate.cpp</a> | 49144 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/routeMgr.cpp">routeMgr.cpp</a> | 51248 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/cellPyramid.cpp">cellPyramid.cpp</a> | 51300 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiFormation.cpp">aiFormation.cpp</a> | 51656 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiMgr.cpp">pikiMgr.cpp</a> | 52285 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletCarcass.cpp">pelletCarcass.cpp</a> | 55426 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi_demoCheck.cpp">navi_demoCheck.cpp</a> | 60077 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemWeed.cpp">itemWeed.cpp</a> | 62542 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletState.cpp">pelletState.cpp</a> | 65123 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/dynCreature.cpp">dynCreature.cpp</a> | 65156 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayData.cpp">gamePlayData.cpp</a> | 67183 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPlant.cpp">itemPlant.cpp</a> | 73076 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/routeMgr.cpp">routeMgr.cpp</a> | 74808 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/fakePiki.cpp">fakePiki.cpp</a> | 75289 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveGame.cpp">singleGS_CaveGame.cpp</a> | 78419 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/mapMgr.cpp">mapMgr.cpp</a> | 79443 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletItem.cpp">pelletItem.cpp</a> | 80140 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSection.cpp">baseGameSection.cpp</a> | 92458 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 95854 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletOtakara.cpp">pelletOtakara.cpp</a> | 99724 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemMgr.cpp">itemMgr.cpp</a> | 102233 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGameSection.cpp">singleGameSection.cpp</a> | 104501 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 117275 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_MainGame.cpp">singleGS_MainGame.cpp</a> | 138834 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiState.cpp">pikiState.cpp</a> | 152962 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi.cpp">navi.cpp</a> | 163021 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Zukan.cpp">singleGS_Zukan.cpp</a> | 192366 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameMapParts.cpp">gameMapParts.cpp</a> | 193095 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 231667 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/naviState.cpp">naviState.cpp</a> | 257331 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/fakePiki.cpp">fakePiki.cpp</a> | 75289 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveGame.cpp">singleGS_CaveGame.cpp</a> | 78419 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/mapMgr.cpp">mapMgr.cpp</a> | 79443 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletItem.cpp">pelletItem.cpp</a> | 80140 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSection.cpp">baseGameSection.cpp</a> | 92458 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 95854 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletOtakara.cpp">pelletOtakara.cpp</a> | 99724 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemMgr.cpp">itemMgr.cpp</a> | 102233 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGameSection.cpp">singleGameSection.cpp</a> | 104501 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 117275 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_MainGame.cpp">singleGS_MainGame.cpp</a> | 138834 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiState.cpp">pikiState.cpp</a> | 152962 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi.cpp">navi.cpp</a> | 163021 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Zukan.cpp">singleGS_Zukan.cpp</a> | 192366 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameMapParts.cpp">gameMapParts.cpp</a> | 193095 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 231667 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/naviState.cpp">naviState.cpp</a> | 257331 | | |
|
||||
|
||||
### <section id="plugProjectKonoU">plugProjectKonoU</section>
|
||||
| File | Size (bytes) | File | Size (bytes) |
|
||||
@ -257,7 +257,7 @@
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/resourceMgr.cpp">resourceMgr.cpp</a> | 21580 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/matMath.cpp">matMath.cpp</a> | 23292 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/moviePlayer.cpp">moviePlayer.cpp</a> | 30991 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/sysShapeModel.cpp">sysShapeModel.cpp</a> | 34561 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/windowMessage.cpp">windowMessage.cpp</a> | 35108 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/sysShape.cpp">sysShape.cpp</a> | 38673 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/bootSection.cpp">bootSection.cpp</a> | 38745 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/system.cpp">system.cpp</a> | 38829 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/bootSection.cpp">bootSection.cpp</a> | 38745 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/system.cpp">system.cpp</a> | 38886 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/screenMgr.cpp">screenMgr.cpp</a> | 40605 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/movieMessage.cpp">movieMessage.cpp</a> | 46986 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/memoryCard.cpp">memoryCard.cpp</a> | 48609 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/pikmin2MemoryCardMgr.cpp">pikmin2MemoryCardMgr.cpp</a> | 50831 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/graphics.cpp">graphics.cpp</a> | 73058 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageRendering.cpp">messageRendering.cpp</a> | 121472 |
|
||||
|
||||
@ -241,6 +241,8 @@ struct Piki : public FakePiki {
|
||||
|
||||
inline efx::TPkEffect* getEffectObj() { return mEffectsObj; }
|
||||
|
||||
inline f32 getAnimSpeed() const { return mAnimSpeed; }
|
||||
|
||||
static Color4 pikiColors[PikiColorCount + 1];
|
||||
static Color4 pikiColorsCursor[PikiColorCount + 1];
|
||||
static u8 sGraspSituationOptimise;
|
||||
|
||||
@ -21,11 +21,12 @@ struct Model;
|
||||
} // namespace SysShape
|
||||
|
||||
namespace Game {
|
||||
enum WBFlags {
|
||||
WBF_Unset = 0x0,
|
||||
WBF_Unknown1 = 0x1,
|
||||
};
|
||||
|
||||
struct WaterBox {
|
||||
enum Flags {
|
||||
WBF_Unset = 0x0,
|
||||
WBF_Unknown1 = 0x1,
|
||||
};
|
||||
WaterBox();
|
||||
|
||||
/**
|
||||
@ -53,6 +54,11 @@ struct WaterBox {
|
||||
f32); // _40 (weak)
|
||||
virtual void calcMatrix() { } // _44 (weak)
|
||||
|
||||
inline void setFlag(u32 flag) { mFlags |= flag; }
|
||||
inline void resetFlag(u32 flag) { mFlags &= ~flag; }
|
||||
inline bool isFlag(u32 flag) const { return mFlags & flag; }
|
||||
|
||||
// _00
|
||||
u8 mFlags; // _04
|
||||
};
|
||||
|
||||
|
||||
@ -30,15 +30,15 @@ enum WayPointFlags {
|
||||
struct WayPoint : public JKRDisposer {
|
||||
struct RoomList : public CNode {
|
||||
inline RoomList()
|
||||
: _18(-1)
|
||||
: mRoomIdx(-1)
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~RoomList(); // _08 (weak)
|
||||
virtual ~RoomList() { } // _08 (weak)
|
||||
|
||||
// _00 = VTBL
|
||||
// _00-_18 = CNode
|
||||
s16 _18; // _18, possibly count?
|
||||
s16 mRoomIdx; // _18
|
||||
};
|
||||
|
||||
WayPoint();
|
||||
@ -64,14 +64,14 @@ struct WayPoint : public JKRDisposer {
|
||||
void write(Stream&);
|
||||
void createOffPlane(Plane&, WayPoint*);
|
||||
|
||||
inline void setFlag(u32 flag) { mFlags.typeView |= flag; }
|
||||
inline void resetFlag(u32 flag) { mFlags.typeView &= ~flag; }
|
||||
inline bool isFlag(u32 flag) const { return mFlags.typeView & flag; }
|
||||
inline void setFlag(u32 flag) { mFlags |= flag; }
|
||||
inline void resetFlag(u32 flag) { mFlags &= ~flag; }
|
||||
inline bool isFlag(u32 flag) const { return mFlags & flag; }
|
||||
|
||||
inline Vector3f getPosition() { return mPosition; }
|
||||
|
||||
RoomList mRoomList; // _18
|
||||
BitFlag<u8> mFlags; // _34
|
||||
u8 mFlags; // _34
|
||||
s16 mIndex; // _36
|
||||
s16 mNumFromLinks; // _38
|
||||
s16 mFromLinks[8]; // _3A
|
||||
@ -96,13 +96,15 @@ struct WayPointIterator {
|
||||
void next();
|
||||
bool isDone();
|
||||
|
||||
s32 mIndex; // _00
|
||||
int mIndex; // _00
|
||||
WayPoint* mWayPoint; // _04
|
||||
bool _08; // _08
|
||||
};
|
||||
|
||||
struct WPCondition : public Condition<WayPoint> {
|
||||
virtual bool satisfy(WayPoint*) = 0; // _08
|
||||
|
||||
// _00 = VTBL
|
||||
};
|
||||
|
||||
struct WPSearchArg {
|
||||
@ -203,14 +205,16 @@ struct EditorRouteMgr : public RouteMgr {
|
||||
struct GameRouteMgr : public RouteMgr {
|
||||
GameRouteMgr();
|
||||
|
||||
virtual ~GameRouteMgr(); // _08
|
||||
virtual void* getNext(void*); // _14
|
||||
virtual void* getStart(); // _18
|
||||
virtual void* getEnd(); // _1C
|
||||
virtual WayPoint* get(void*); // _20
|
||||
virtual WayPoint* getWayPoint(short); // _2C
|
||||
virtual void read(Stream&); // _30
|
||||
virtual ~GameRouteMgr(); // _08
|
||||
virtual void* getNext(void*); // _14
|
||||
virtual void* getStart(); // _18
|
||||
virtual void* getEnd(); // _1C
|
||||
virtual WayPoint* get(void*); // _20
|
||||
virtual WayPoint* getWayPoint(s16); // _2C
|
||||
virtual void read(Stream&); // _30
|
||||
|
||||
// _00 = VTBL
|
||||
// _00-_20 = RouteMgr
|
||||
WayPoint* mWayPoints; // _20
|
||||
};
|
||||
|
||||
@ -218,12 +222,16 @@ struct GameRouteMgr : public RouteMgr {
|
||||
|
||||
struct WPExcludeSpot : public Game::WPCondition {
|
||||
virtual bool satisfy(Game::WayPoint*); // _08 (weak)
|
||||
|
||||
// _00 = VTBL
|
||||
};
|
||||
|
||||
struct WPFindCond : public Game::WPCondition {
|
||||
virtual bool satisfy(Game::WayPoint* wp)
|
||||
virtual bool satisfy(Game::WayPoint* wp) // _08 (weak)
|
||||
{
|
||||
return (!wp->mFlags.isSet(Game::WPF_Water) && !wp->mFlags.isSet(Game::WPF_Closed));
|
||||
} // _08 (weak)
|
||||
return (!wp->isFlag(Game::WPF_Water) && !wp->isFlag(Game::WPF_Closed));
|
||||
}
|
||||
|
||||
// _00 = VTBL
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -5,12 +5,6 @@
|
||||
|
||||
namespace KandoLib {
|
||||
struct Choice {
|
||||
Choice(int id, f32 chance)
|
||||
{
|
||||
mResult = id;
|
||||
mChance = chance;
|
||||
}
|
||||
|
||||
u32 mResult; // _00
|
||||
f32 mChance; // _04, out of 1.0 (a call to getRandomChoice(choices, 2) will
|
||||
// have both choices set their chance to 0.5)
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
#include "PSM/Se.h"
|
||||
#include "PSM/WorldMapRocket.h"
|
||||
#include "JSystem/JSupport/JSUList.h"
|
||||
#include "PSSystem/PSGame.h"
|
||||
|
||||
namespace PSM {
|
||||
struct Scene_Game;
|
||||
@ -278,4 +279,16 @@ struct Scene_Demo : public SceneBase {
|
||||
|
||||
} // namespace PSM
|
||||
|
||||
inline PSM::Scene_Game* PSMGetGameScene()
|
||||
{
|
||||
PSSystem::SceneMgr* mgr = PSSystem::getSceneMgr();
|
||||
PSSystem::checkSceneMgr(mgr);
|
||||
PSM::SceneBase* scene = static_cast<PSM::SceneBase*>(mgr->getChildScene());
|
||||
if (scene->isGameScene()) {
|
||||
return static_cast<PSM::Scene_Game*>(scene);
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@ -320,8 +320,7 @@ struct ActBoreBase : public Action, virtual SysShape::MotionListener {
|
||||
{
|
||||
}
|
||||
|
||||
virtual void finish() = 0; // _3C
|
||||
virtual void onKeyEvent(const SysShape::KeyEvent& event) = 0; // _40
|
||||
virtual void finish() = 0; // _3C
|
||||
|
||||
// _00 = VTBL
|
||||
// _00-_0C = Action
|
||||
@ -329,6 +328,16 @@ struct ActBoreBase : public Action, virtual SysShape::MotionListener {
|
||||
};
|
||||
|
||||
struct ActBore : public Action {
|
||||
enum BoreFlags {
|
||||
BOREFLAG_Finished = 1,
|
||||
};
|
||||
|
||||
enum BoreBehaviour {
|
||||
BORE_Rest = 0,
|
||||
BORE_Oneshot = 1,
|
||||
BORE_BehaviourCount, // 2
|
||||
};
|
||||
|
||||
ActBore(Game::Piki* p);
|
||||
|
||||
virtual void init(ActionArg* settings); // _08
|
||||
@ -338,15 +347,15 @@ struct ActBore : public Action {
|
||||
void startCurrAction();
|
||||
void finish();
|
||||
|
||||
inline void setFlag(u32 flag) { mFlag.typeView |= flag; }
|
||||
inline void resetFlag(u32 flag) { mFlag.typeView &= ~flag; }
|
||||
inline bool isFlag(u32 flag) const { return mFlag.typeView & flag; }
|
||||
inline void setFlag(u8 flag) { mFlag.typeView |= flag; }
|
||||
inline void resetFlag(u8 flag) { mFlag.typeView &= ~flag; }
|
||||
inline bool isFlag(u8 flag) const { return mFlag.typeView & flag; }
|
||||
|
||||
// _00 = VTBL
|
||||
// _00-_0C = Action
|
||||
u8 mRandBehaviorType; // _0C
|
||||
f32 _10; // _10
|
||||
f32 mTimer; // _14
|
||||
f32 mForceFinishTimer; // _10, counts down from between 6s and 12s, then forces action to finish
|
||||
f32 mOneshotTimer; // _14, must do oneshot while this timer is < 2.0f
|
||||
BitFlag<u8> mFlag; // _18
|
||||
ActBoreBase* mActions[2]; // _1C
|
||||
};
|
||||
@ -907,6 +916,11 @@ struct ActOneshotArg : public ActionArg {
|
||||
};
|
||||
|
||||
struct ActOneshot : public ActBoreBase {
|
||||
enum OneshotFlags {
|
||||
ONESHOTFLAG_AnimFinished = 0x1,
|
||||
ONESHOTFLAG_ForceFinish = 0x2,
|
||||
};
|
||||
|
||||
ActOneshot(Game::Piki* p);
|
||||
|
||||
virtual void init(ActionArg* arg); // _08
|
||||
@ -915,10 +929,14 @@ struct ActOneshot : public ActBoreBase {
|
||||
virtual void finish(); // _3C
|
||||
virtual void onKeyEvent(const SysShape::KeyEvent& event); // _40 (weak)
|
||||
|
||||
inline void setFlag(u8 flag) { mFlag.typeView |= flag; }
|
||||
inline void resetFlag(u8 flag) { mFlag.typeView &= ~flag; }
|
||||
inline bool isFlag(u8 flag) { return mFlag.typeView & flag; }
|
||||
|
||||
// _00 = VTBL
|
||||
// _00-_10 = ActBoreBase
|
||||
ActOneshotArg mOneshotArg; // _10
|
||||
u8 mFlag; // _18
|
||||
BitFlag<u8> mFlag; // _18
|
||||
|
||||
// _1C = MotionListener
|
||||
};
|
||||
@ -1062,6 +1080,19 @@ struct ActRescue : public Action, virtual SysShape::MotionListener {
|
||||
};
|
||||
|
||||
struct ActRest : public ActBoreBase {
|
||||
enum RestState {
|
||||
REST_Start = 0, // starting state -> will sit
|
||||
REST_Sit = 1,
|
||||
REST_Unk2 = 2, // unused
|
||||
REST_Sleep = 3, // sleep?
|
||||
};
|
||||
|
||||
enum RestFlags {
|
||||
RESTFLAG_IsIdle = 0x1,
|
||||
RESTFLAG_CanInterrupt = 0x2,
|
||||
RESTFLAG_ForceFinish = 0x4,
|
||||
};
|
||||
|
||||
ActRest(Game::Piki* p);
|
||||
|
||||
virtual void init(ActionArg* settings); // _08
|
||||
@ -1073,13 +1104,16 @@ struct ActRest : public ActBoreBase {
|
||||
void sitDown();
|
||||
void standUp();
|
||||
|
||||
inline void setFlag(u8 flag) { mFlag.typeView |= flag; }
|
||||
inline void resetFlag(u8 flag) { mFlag.typeView &= ~flag; }
|
||||
inline bool isFlag(u8 flag) { return mFlag.typeView & flag; }
|
||||
|
||||
// _00 = VTBL
|
||||
// _00-_10 = ActBoreBase
|
||||
u8 mState; // _10
|
||||
f32 mTimer; // _14
|
||||
u8 mFlag; // _18
|
||||
|
||||
// _1C = MotionListener
|
||||
u8 mState; // _10
|
||||
f32 mTimer; // _14
|
||||
BitFlag<u8> mFlag; // _18
|
||||
// _1C = MotionListener
|
||||
};
|
||||
|
||||
enum StickAttackObjType {
|
||||
|
||||
@ -113,7 +113,7 @@ KANDO_FILES:=\
|
||||
$(BUILD_DIR)/src/plugProjectKandoU/gameSoundEvent.o\
|
||||
$(BUILD_DIR)/asm/plugProjectKandoU/aiBattle.o\
|
||||
$(BUILD_DIR)/src/plugProjectKandoU/gameDeathCount.o\
|
||||
$(BUILD_DIR)/asm/plugProjectKandoU/aiBore.o\
|
||||
$(BUILD_DIR)/src/plugProjectKandoU/aiBore.o\
|
||||
$(BUILD_DIR)/src/plugProjectKandoU/mapPartsView.o\
|
||||
$(BUILD_DIR)/src/plugProjectKandoU/singleGS_Ending.o\
|
||||
$(BUILD_DIR)/src/plugProjectKandoU/gameIconTexture.o\
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -10,9 +10,9 @@
|
||||
*/
|
||||
u32 KandoLib::getRandomChoice(KandoLib::Choice* choices, int choiceAmt)
|
||||
{
|
||||
float rngChance = randFloat();
|
||||
f32 rngChance = randFloat();
|
||||
KandoLib::Choice* curChoice = choices;
|
||||
float curChance = 0.0f;
|
||||
f32 curChance = 0.0f;
|
||||
|
||||
for (int i = 0; i < choiceAmt; curChoice++, i++) {
|
||||
curChance += curChoice->mChance;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -709,3 +709,5 @@ You have 3127 out of 10000 Pokos and 86 out of 201 treasures.",2023-10-22 14:03:
|
||||
You have 3150 out of 10000 Pokos and 86 out of 201 treasures.",2023-10-24 00:15:48.035379
|
||||
3181,1479964,0.3181109253985941,86,307557,0.43144337706353036,"
|
||||
You have 3181 out of 10000 Pokos and 86 out of 201 treasures.",2023-10-24 10:02:48.672469
|
||||
3190,1484132,0.3190068163371989,86,308030,0.4321069051814111,"
|
||||
You have 3190 out of 10000 Pokos and 86 out of 201 treasures.",2023-10-24 15:37:13.578295
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user