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

Util: Fill SensorMsgFunction header #322

Merged
merged 2 commits into from
Jan 31, 2025

Conversation

german77
Copy link
Contributor

@german77 german77 commented Jan 29, 2025

Another of those annoying headers that conflict every 5 commits and it's no wonder because this header has over 1k functions. I did not include any of the many sub classes that are also in this file.

This should drastically reduce merge conflicts related to this file.


This change is Reviewable

@german77 german77 force-pushed the sensorMsg branch 4 times, most recently from 2133eef to 2239ec1 Compare January 29, 2025 05:12
@LynxDev2
Copy link
Contributor

I’ve implemented most of the al SensorMsg related functions but still want to do the rs ones before a PR, so I appreciate you doing some of the header work for me

Copy link
Owner

@MonsterDruide1 MonsterDruide1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 3 of 3 files at r1, all commit messages.
Reviewable status: all files reviewed, 12 unresolved discussions (waiting on @german77)


src/Util/SensorMsgFunction.h line 70 at r1 (raw file):

bool sendMsgFishingCancel(al::HitSensor* source, al::HitSensor* target);
bool sendMsgFishingFishApproach(al::HitSensor* source, al::HitSensor* target);
bool sendMsgFishingFishf32Touch(al::HitSensor* source, al::HitSensor* target);

Suggestion:

bool sendMsgFishingFishFloatTouch(al::HitSensor* source, al::HitSensor* target);

src/Util/SensorMsgFunction.h line 629 at r1 (raw file):

bool isMsgFishingCancel(const al::SensorMsg*);
bool isMsgFishingFishApproach(const al::SensorMsg*);
bool isMsgFishingFishf32Touch(const al::SensorMsg*);

Suggestion:

bool isMsgFishingFishFloatTouch(const al::SensorMsg*);

src/Util/SensorMsgFunction.h line 946 at r1 (raw file):

bool isMsgHackNpcCapReactionAll(const al::SensorMsg*);
void checkMsgNpcTrampleReactionAll(const al::SensorMsg*, const al::HitSensor*, const al::HitSensor*,
                                   bool);

Suggestion:

bool checkMsgNpcTrampleReactionAll(const al::SensorMsg*, const al::HitSensor*, const al::HitSensor*,
                                   bool);

src/Util/SensorMsgFunction.h line 1080 at r1 (raw file):

bool tryGetBossMagmaResetPos(const al::SensorMsg*, sead::Vector3f*);
bool isMsgBossMagmaQueryToBubble(const al::SensorMsg*);
void getMofumofuBodyChainExplodeDelayStep(const al::SensorMsg*);

Suggestion:

s32 getMofumofuBodyChainExplodeDelayStep(const al::SensorMsg*);

src/Util/SensorMsgFunction.h line 1084 at r1 (raw file):

void calcFishingUpJugemDir(sead::Vector3f*, const al::SensorMsg*);
void getFishingUpf32Pos(const al::SensorMsg*);
bool tryGetFishingUpf32MaterialCode(const al::SensorMsg*);

Suggestion:

const sead::Vector3f& getFishingUpFloatPos(const al::SensorMsg*);
const char* tryGetFishingUpFloatMaterialCode(const al::SensorMsg*);

src/Util/SensorMsgFunction.h line 1085 at r1 (raw file):

void getFishingUpf32Pos(const al::SensorMsg*);
bool tryGetFishingUpf32MaterialCode(const al::SensorMsg*);
void getFishingHookSensor(const al::SensorMsg*);

Suggestion:

al::HitSensor* getFishingHookSensor(const al::SensorMsg*);

src/Util/SensorMsgFunction.h line 1091 at r1 (raw file):

void getGunetterPushCenter(const al::SensorMsg*);
void getGunetterPushRadius(const al::SensorMsg*);
void getNumKuriboTowerOn(const al::SensorMsg*);

Suggestion:

const FishingFish* getCheckFishingTarget(const al::SensorMsg*);
const sead::Vector3f& getGunetterPushCenter(const al::SensorMsg*);
f32 getGunetterPushRadius(const al::SensorMsg*);
u32 getNumKuriboTowerOn(const al::SensorMsg*);

src/Util/SensorMsgFunction.h line 1099 at r1 (raw file):

bool tryGetSandGeyserRaise(const al::SensorMsg*, f32*, f32*);
bool tryTreasureBoxPlayerTrampleJump(al::LiveActor*, al::HitSensor* source, al::HitSensor* target,
                                     f32);

Suggestion:

void tryTreasureBoxPlayerTrampleJump(al::LiveActor*, al::HitSensor* source, al::HitSensor* target,
                                     f32);

src/Util/SensorMsgFunction.h line 1143 at r1 (raw file):

bool tryReceiveMsgNpcScareByEnemyIgnoreTargetHack(const al::SensorMsg*, const CapTargetInfo*);
bool tryIncrementComboCount(s32*, const al::SensorMsg*);
bool tryGetMsgComboCount(const al::SensorMsg*);

Suggestion:

ComboCounter* tryGetMsgComboCount(const al::SensorMsg*);

src/Util/SensorMsgFunction.h line 1144 at r1 (raw file):

bool tryIncrementComboCount(s32*, const al::SensorMsg*);
bool tryGetMsgComboCount(const al::SensorMsg*);
void getMsgComboCount(const al::SensorMsg*);

Suggestion:

ComboCounter* getMsgComboCount(const al::SensorMsg*);

src/Util/SensorMsgFunction.h line 1149 at r1 (raw file):

bool isVisibleChameleon(const al::SensorMsg*);
bool isMsgRequestPlayerStainWet(const al::SensorMsg*, s32*);
bool tryGetKuriboTowerNum(al::HitSensor* source, al::HitSensor* target);

Suggestion:

s32 tryGetKuriboTowerNum(al::HitSensor* source, al::HitSensor* target);

src/Util/SensorMsgFunction.h line 1153 at r1 (raw file):

void getSpherePushCenter(const al::SensorMsg*);
void getSpherePushRadius(const al::SensorMsg*);
void getSmellDigPoint(const al::SensorMsg*);

Suggestion:

const sead::Vector3f& getSpherePushCenter(const al::SensorMsg*);
f32 getSpherePushRadius(const al::SensorMsg*);
DigPoint* getSmellDigPoint(const al::SensorMsg*);

Copy link
Contributor Author

@german77 german77 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 1 of 3 files reviewed, 12 unresolved discussions (waiting on @MonsterDruide1)


src/Util/SensorMsgFunction.h line 70 at r1 (raw file):

bool sendMsgFishingCancel(al::HitSensor* source, al::HitSensor* target);
bool sendMsgFishingFishApproach(al::HitSensor* source, al::HitSensor* target);
bool sendMsgFishingFishf32Touch(al::HitSensor* source, al::HitSensor* target);

Done.


src/Util/SensorMsgFunction.h line 629 at r1 (raw file):

bool isMsgFishingCancel(const al::SensorMsg*);
bool isMsgFishingFishApproach(const al::SensorMsg*);
bool isMsgFishingFishf32Touch(const al::SensorMsg*);

Done.


src/Util/SensorMsgFunction.h line 946 at r1 (raw file):

bool isMsgHackNpcCapReactionAll(const al::SensorMsg*);
void checkMsgNpcTrampleReactionAll(const al::SensorMsg*, const al::HitSensor*, const al::HitSensor*,
                                   bool);

Done.


src/Util/SensorMsgFunction.h line 1080 at r1 (raw file):

bool tryGetBossMagmaResetPos(const al::SensorMsg*, sead::Vector3f*);
bool isMsgBossMagmaQueryToBubble(const al::SensorMsg*);
void getMofumofuBodyChainExplodeDelayStep(const al::SensorMsg*);

Done.


src/Util/SensorMsgFunction.h line 1084 at r1 (raw file):

void calcFishingUpJugemDir(sead::Vector3f*, const al::SensorMsg*);
void getFishingUpf32Pos(const al::SensorMsg*);
bool tryGetFishingUpf32MaterialCode(const al::SensorMsg*);

Done.


src/Util/SensorMsgFunction.h line 1085 at r1 (raw file):

void getFishingUpf32Pos(const al::SensorMsg*);
bool tryGetFishingUpf32MaterialCode(const al::SensorMsg*);
void getFishingHookSensor(const al::SensorMsg*);

Done.


src/Util/SensorMsgFunction.h line 1091 at r1 (raw file):

void getGunetterPushCenter(const al::SensorMsg*);
void getGunetterPushRadius(const al::SensorMsg*);
void getNumKuriboTowerOn(const al::SensorMsg*);

Done.


src/Util/SensorMsgFunction.h line 1099 at r1 (raw file):

bool tryGetSandGeyserRaise(const al::SensorMsg*, f32*, f32*);
bool tryTreasureBoxPlayerTrampleJump(al::LiveActor*, al::HitSensor* source, al::HitSensor* target,
                                     f32);

Done.


src/Util/SensorMsgFunction.h line 1143 at r1 (raw file):

bool tryReceiveMsgNpcScareByEnemyIgnoreTargetHack(const al::SensorMsg*, const CapTargetInfo*);
bool tryIncrementComboCount(s32*, const al::SensorMsg*);
bool tryGetMsgComboCount(const al::SensorMsg*);

Done.


src/Util/SensorMsgFunction.h line 1144 at r1 (raw file):

bool tryIncrementComboCount(s32*, const al::SensorMsg*);
bool tryGetMsgComboCount(const al::SensorMsg*);
void getMsgComboCount(const al::SensorMsg*);

Done.


src/Util/SensorMsgFunction.h line 1149 at r1 (raw file):

bool isVisibleChameleon(const al::SensorMsg*);
bool isMsgRequestPlayerStainWet(const al::SensorMsg*, s32*);
bool tryGetKuriboTowerNum(al::HitSensor* source, al::HitSensor* target);

Done.


src/Util/SensorMsgFunction.h line 1153 at r1 (raw file):

void getSpherePushCenter(const al::SensorMsg*);
void getSpherePushRadius(const al::SensorMsg*);
void getSmellDigPoint(const al::SensorMsg*);

Done.

Copy link
Owner

@MonsterDruide1 MonsterDruide1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r2, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @german77)


src/Util/SensorMsgFunction.h line 70 at r1 (raw file):

Previously, german77 (Narr the Reg) wrote…

Done.

No, still an issue


src/Util/SensorMsgFunction.h line 1149 at r1 (raw file):

Previously, german77 (Narr the Reg) wrote…

Done.

No, unchanged

Copy link
Contributor Author

@german77 german77 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @MonsterDruide1)


src/Util/SensorMsgFunction.h line 70 at r1 (raw file):

Previously, MonsterDruide1 wrote…

No, still an issue

Done.


src/Util/SensorMsgFunction.h line 1149 at r1 (raw file):

Previously, MonsterDruide1 wrote…

No, unchanged

Done.

Copy link
Owner

@MonsterDruide1 MonsterDruide1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @german77)

Copy link
Owner

@MonsterDruide1 MonsterDruide1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dear Reviewable,
Sorry for closing your tab too quickly. Please update your action status to "done".
Thanks!

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @german77)

@MonsterDruide1 MonsterDruide1 merged commit c7245d2 into MonsterDruide1:master Jan 31, 2025
6 checks passed
@german77 german77 deleted the sensorMsg branch January 31, 2025 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants