Game-Decompilation/Petari
1
0
Fork 0
mirror of https://github.com/SMGCommunity/Petari.git synced 2024-11-23 13:40:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MagicBell::receiveMsgPlayerAttack (Minor Mismatch)

Browse Source
This commit is contained in:
Super Hackio 2024-09-03 17:32:15 -07:00
parent 894e452969
commit d790a76814
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csv/MapObj.csv
View File

@ -2882,7 +2882,7 @@ init__9MagicBellFRC12JMapInfoIter,MagicBell.o,MapObj.a,true
exeWait__9MagicBellFv,MagicBell.o,MapObj.a,true
exeRing__9MagicBellFv,MagicBell.o,MapObj.a,minor
attackSensor__9MagicBellFP9HitSensorP9HitSensor,MagicBell.o,MapObj.a,true
receiveMsgPlayerAttack__9MagicBellFUlP9HitSensorP9HitSensor,MagicBell.o,MapObj.a,false
receiveMsgPlayerAttack__9MagicBellFUlP9HitSensorP9HitSensor,MagicBell.o,MapObj.a,minor
tryRing__9MagicBellFv,MagicBell.o,MapObj.a,false
startRing__9MagicBellFRCQ29JGeometry8TVec3<f>RCQ29JGeometry8TVec3<f>,MagicBell.o,MapObj.a,false
__dt__9MagicBellFv,MagicBell.o,MapObj.a,true

1 Symbol Name Object File Library Archive Matching
2882 exeWait__9MagicBellFv MagicBell.o MapObj.a true
2883 exeRing__9MagicBellFv MagicBell.o MapObj.a minor
2884 attackSensor__9MagicBellFP9HitSensorP9HitSensor MagicBell.o MapObj.a true
2885 receiveMsgPlayerAttack__9MagicBellFUlP9HitSensorP9HitSensor MagicBell.o MapObj.a false minor
2886 tryRing__9MagicBellFv MagicBell.o MapObj.a false
2887 startRing__9MagicBellFRCQ29JGeometry8TVec3<f>RCQ29JGeometry8TVec3<f> MagicBell.o MapObj.a false
2888 __dt__9MagicBellFv MagicBell.o MapObj.a true

22
source/Game/MapObj/MagicBell.cpp
View File

@ -117,7 +117,27 @@ void MagicBell::attackSensor(HitSensor *a1, HitSensor *a2) {
}
}
// MagicBell::receiveMsgPlayerAttack
bool MagicBell::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver)
{
if (MR::isMsgLockOnStarPieceShoot(msg)) {
return false;
}
if (!isNerve(&NrvMagicBell::MagicBellNrvWait::sInstance) && (isNerve(&NrvMagicBell::MagicBellNrvRing::sInstance) && MR::isGreaterStep(this, 10))) {
TVec3f v15(mPosition);
v15.subtract(*MR::getPlayerPos());
v15.y += 100.0f;
MR::normalizeOrZero(&v15);
TVec3f v14(v15);
v14.scale(-200.0f);
v14.addInline2(mPosition);
startRing(v15, v14);
return true;
}
return false;
}
// MagicBell::tryRing
// MagicBell::startRing