This commit is contained in:
aozhiwei 2020-07-14 10:02:38 +08:00
parent c86689894e
commit 811ccb7046
2 changed files with 17 additions and 6 deletions

View File

@ -435,11 +435,9 @@ void AndroidNewAI::UpdateThinking()
ChangeToStateNewAI(ASE_RandomWalk);
}
} else {
std::array<Human*, kAndroidAi_RMax> targets = {};
ScanTarget(targets);
Human* target = GetTarget(targets, target_range);
Human* target = GetTarget();
if (target) {
node.target = target;
node_.target = target;
ChangeToStateNewAI(ASE_Attack);
} else {
if ((rand() % 7) < 4) {
@ -453,12 +451,18 @@ void AndroidNewAI::UpdateThinking()
void AndroidNewAI::UpdateAttack()
{
if (node_.target->dead) {
ChangeToStateNewAI(ASE_Thinking);
return;
}
}
void AndroidNewAI::UpdateRandomWalk()
{
Human* hum = (Human*)owner;
if (hum->room->GetFrameNo() > node_.frameno + node_.param1) {
ChangeToStateNewAI(ASE_Thinking);
}
}
void AndroidNewAI::DoMoveNewAI()
@ -528,3 +532,8 @@ void AndroidNewAI::ChangeToStateNewAI(AndroidStateEx_e to_state)
node_.frameno = hum->room->GetFrameNo();
node_.exec_frame_num = 0;
}
Human* AndroidNewAI::GetTarget()
{
return nullptr;
}

View File

@ -59,6 +59,8 @@ private:
void DoMoveNewAI();
void ChangeToStateNewAI(AndroidStateEx_e to_state);
Human* GetTarget();
private:
OldAiData old_ai_data_;