falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile scenarioHtmCallback14

This commit is contained in:
Ryan Dwyer 2022-01-07 17:15:34 +10:00
parent f3118c6135
commit c2ddf5dc62
3 changed files with 179 additions and 896 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/bot.c
View File

@ -10973,7 +10973,7 @@ void botTickUnpaused(struct chrdata *chr)
} else if (g_MpSetup.scenario == MPSCENARIO_HACKERCENTRAL) {
// If the bot has the uplink, go to the terminal
if (g_ScenarioData.htm.uplink == chr->prop) {
if (g_ScenarioData.htm.uplinkingplayernum != mpPlayerGetIndex(chr)) {
if (g_ScenarioData.htm.playernuminrange != mpPlayerGetIndex(chr)) {
newaction = MA_AIBOTGOTOPROP;
aibot->gotoprop = g_ScenarioData.htm.terminals[0].prop;
} else {
@ -11287,13 +11287,13 @@ void botTickUnpaused(struct chrdata *chr)
// empty
} else if (g_MpSetup.scenario == MPSCENARIO_HACKERCENTRAL
&& g_ScenarioData.htm.uplink == chr->prop
&& g_ScenarioData.htm.uplinkingplayernum == mpPlayerGetIndex(chr)) {
&& g_ScenarioData.htm.playernuminrange == mpPlayerGetIndex(chr)) {
chr->myaction = MA_AIBOTMAINLOOP;
}
} else if (chr->myaction == MA_AIBOTDOWNLOAD) {
if (botCanDoCriticalPickup(chr)) {
chr->myaction = MA_AIBOTMAINLOOP;
} else if (g_ScenarioData.htm.uplinkingplayernum != mpPlayerGetIndex(chr)) {
} else if (g_ScenarioData.htm.playernuminrange != mpPlayerGetIndex(chr)) {
chr->myaction = MA_AIBOTMAINLOOP;
}
}

1059
src/game/mplayer/scenarios.c
View File

File diff suppressed because it is too large Load Diff

10
src/include/types.h
View File

@ -4765,11 +4765,11 @@ struct scenariodata_htm {
/*0x800ac112*/ s16 unk002;
/*0x800ac114*/ s16 padnums[60];
/*0x800ac18c*/ struct htmterminal terminals[7]; // only the first element is used
/*0x800ac1e0*/ s16 unk0d0;
/*0x800ac1e2*/ s16 uplinkingplayernum;
/*0x800ac1e4*/ s32 unk0d4;
/*0x800ac1e8*/ u32 unk0d8[12];
/*0x800ac218*/ u32 unk108[12];
/*0x800ac1e0*/ s16 dlplayernum;
/*0x800ac1e2*/ s16 playernuminrange;
/*0x800ac1e4*/ s32 dlterminalnum;
/*0x800ac1e8*/ s32 numpoints[12];
/*0x800ac218*/ s32 dltime240[12];
/*0x800ac248*/ u32 unk138;
/*0x800ac24c*/ struct prop *uplink;
/*0x800ac250*/ u32 unk140;