Skip to content

monobj: opus2 (mlAttackCheck cache, setRepop) #17669

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.

Sign up for GitHub

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

Open
AsclepiusBot wants to merge 4 commits into
base: main
Choose a base branch
from
Open

monobj: opus2 (mlAttackCheck cache, setRepop) #17669

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c1316e
monobj: unify statWatch result into selectedTarget
claude Jun 14, 2026
e583423
monobj: widen setRepop countC to int
claude Jun 14, 2026
9800057
monobj: restructure setRepop particle-base class chain
claude Jun 14, 2026
f030f7a
monobj: cache mlAttackCheck group cursor in wloop
claude Jun 14, 2026
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
31 changes: 17 additions & 14 deletions src/monobj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,10 +670,11 @@ void CGMonObj::setRepop(int mode)
goto pbDone;
} else if (classId == 0xA9) {
goto pbSetA9;
} else if (classId < 0xA9) {
} else if (classId >= 0xA9) {
goto pbDone;
} else {
goto pbSet2;
}
goto pbDone;
pbSetA9:
particleBase = 0;
goto pbDone;
Expand Down Expand Up @@ -710,12 +711,12 @@ void CGMonObj::setRepop(int mode)

reinterpret_cast<CGCharaObj*>(this)->endPSlotBit(0x1000);

short countC = (weaponMode != 0) ?
int countC = (weaponMode != 0) ?
*reinterpret_cast<unsigned short*>(reinterpret_cast<unsigned char*>(object->m_scriptHandle[9]) + 0x1AC) :
*reinterpret_cast<unsigned short*>(reinterpret_cast<unsigned char*>(object->m_scriptHandle[9]) + 0x1AE);
int particleBase = (weaponMode != 0) ? 0x46 : 0x3C;

for (int i = 0; i < static_cast<int>(countC); i++) {
for (int i = 0; i < countC; i++) {
int dataNo = object->m_charaModelHandle->GetPdtSlot();
reinterpret_cast<CGPrgObj*>(this)->putParticleBindTrace((particleBase + i) | (dataNo << 8), *reinterpret_cast<int*>(mon + 0x594), object, kMonObjDefaultScale, 0);
}
Expand Down Expand Up @@ -1360,7 +1361,7 @@ void CGMonObj::statWatch()
*reinterpret_cast<unsigned short*>(script + 0xCC));

// Pass 2: select target.
int result = -1;
selectedTarget = -1;
for (int slot = 0; slot < 4; slot++) {
int partyIndex = *reinterpret_cast<int*>(mon + slot * 4 + 0x620);
CGPartyObj* party = Game.m_partyObjArr[partyIndex];
Expand All @@ -1373,7 +1374,7 @@ void CGMonObj::statWatch()
((static_cast<unsigned short>(reinterpret_cast<CGPrgObj*>(party)->GetCID()) & 0x6D) != 0x6D) ||
(reinterpret_cast<int>(reinterpret_cast<CGObject*>(party)->m_scriptHandle[0xED]) == 0))) {
if (monObj->m_partyDistance[partyIndex] < homeRange2) {
result = partyIndex;
selectedTarget = partyIndex;
if (targetMode == 0) {
break;
}
Expand All @@ -1398,17 +1399,16 @@ void CGMonObj::statWatch()

switch (targetMode) {
case 1:
result = targetPartyIndex;
selectedTarget = targetPartyIndex;
break;
case 2:
case 3:
case 4:
if (accum >= 0) {
result = accum;
selectedTarget = accum;
}
break;
}
selectedTarget = result;
}

if (selectedTarget >= 0) {
Expand Down Expand Up @@ -1790,12 +1790,15 @@ int CGMonObj::mlAttackCheck(int partyIndex)
if (selectorType == 1) {
#define groupCursor (*reinterpret_cast<volatile int*>(&monObj->m_unk6CC))
wloop:
if (groupCount[groupCursor] == 0) {
groupCursor = groupCursor + 1;
if (groupCursor >= 8) {
groupCursor = 0;
{
int wcursor = groupCursor;
if (groupCount[wcursor] == 0) {
groupCursor = wcursor + 1;
if (groupCursor >= 8) {
groupCursor = 0;
}
goto wloop;
}
goto wloop;
}

int pick = Rand__5CMathFUl(&Math);
Expand Down
Loading