server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename AndroidNewAI AndroidAI

Browse Source
This commit is contained in:
aozhiwei 2021-06-09 11:03:01 +08:00
parent 68f277ab62
commit c23b6dc681
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
server/gameserver/android.ai.cc
View File

@ -71,19 +71,19 @@ ai级别
8: 跑动射击 8: 跑动射击
*/ */
AndroidNewAI::AndroidNewAI() AndroidAI::AndroidAI()
{ {
old_ai_data_ = new OldAiData(); old_ai_data_ = new OldAiData();
node_ = new AINode(); node_ = new AINode();
} }
AndroidNewAI::~AndroidNewAI() AndroidAI::~AndroidAI()
{ {
A8_SAFE_DELETE(old_ai_data_); A8_SAFE_DELETE(old_ai_data_);
A8_SAFE_DELETE(node_); A8_SAFE_DELETE(node_);
} }
void AndroidNewAI::Update(int delta_time) void AndroidAI::Update(int delta_time)
{ {
old_ai_data_->state_elapsed_time += delta_time; old_ai_data_->state_elapsed_time += delta_time;
Human* hum = (Human*)owner; Human* hum = (Human*)owner;
@ -103,7 +103,7 @@ void AndroidNewAI::Update(int delta_time)
UpdateNewAI(); UpdateNewAI();
} }
float AndroidNewAI::GetAttackRate() float AndroidAI::GetAttackRate()
{ {
if (!ai_meta) { if (!ai_meta) {
return 1; return 1;
@ -112,7 +112,7 @@ float AndroidNewAI::GetAttackRate()
} }
} }
void AndroidNewAI::DefaultAi() void AndroidAI::DefaultAi()
{ {
switch (old_ai_data_->state) { switch (old_ai_data_->state) {
case AS_thinking: case AS_thinking:
@ -159,7 +159,7 @@ void AndroidNewAI::DefaultAi()
} }
} }
void AndroidNewAI::ChangeToStateOldAI(AndroidState_e to_state) void AndroidAI::ChangeToStateOldAI(AndroidState_e to_state)
{ {
old_ai_data_->state = to_state; old_ai_data_->state = to_state;
old_ai_data_->state_elapsed_time = 0; old_ai_data_->state_elapsed_time = 0;
@ -179,7 +179,7 @@ void AndroidNewAI::ChangeToStateOldAI(AndroidState_e to_state)
} }
} }
void AndroidNewAI::DoMoveOldAI() void AndroidAI::DoMoveOldAI()
{ {
Human* hum = (Human*)owner; Human* hum = (Human*)owner;
if (hum->room->IsWaitingStart()) { if (hum->room->IsWaitingStart()) {
@ -208,7 +208,7 @@ void AndroidNewAI::DoMoveOldAI()
} }
} }
void AndroidNewAI::DoAttackOldAI() void AndroidAI::DoAttackOldAI()
{ {
Human* hum = (Human*)owner; Human* hum = (Human*)owner;
if (hum->room->IsWaitingStart()) { if (hum->room->IsWaitingStart()) {
@ -238,7 +238,7 @@ void AndroidNewAI::DoAttackOldAI()
} }
} }
void AndroidNewAI::UpdateNewAI() void AndroidAI::UpdateNewAI()
{ {
Human* hum = (Human*)owner; Human* hum = (Human*)owner;
if (a8::HasBitFlag(hum->status, HS_Disable)) { if (a8::HasBitFlag(hum->status, HS_Disable)) {
@ -292,7 +292,7 @@ void AndroidNewAI::UpdateNewAI()
} }
} }
void AndroidNewAI::UpdateIdle() void AndroidAI::UpdateIdle()
{ {
Human* hum = (Human*)owner; Human* hum = (Human*)owner;
if (hum->room->GetFrameNo() > node_->frameno + node_->param1) { if (hum->room->GetFrameNo() > node_->frameno + node_->param1) {
@ -300,7 +300,7 @@ void AndroidNewAI::UpdateIdle()
} }
} }
void AndroidNewAI::UpdateThinking() void AndroidAI::UpdateThinking()
{ {
Human* hum = (Human*)owner; Human* hum = (Human*)owner;
if (hum->room->GetGasData().gas_mode == GasInactive || if (hum->room->GetGasData().gas_mode == GasInactive ||
@ -332,7 +332,7 @@ void AndroidNewAI::UpdateThinking()
} }
} }
void AndroidNewAI::UpdateAttack() void AndroidAI::UpdateAttack()
{ {
Human* myself = (Human*)owner; Human* myself = (Human*)owner;
if (!node_->target.Get() || node_->target.Get()->dead) { if (!node_->target.Get() || node_->target.Get()->dead) {
@ -399,7 +399,7 @@ void AndroidNewAI::UpdateAttack()
} }
} }
void AndroidNewAI::UpdateRandomWalk() void AndroidAI::UpdateRandomWalk()
{ {
Human* hum = (Human*)owner; Human* hum = (Human*)owner;
if (hum->room->GetFrameNo() > node_->frameno + node_->param1) { if (hum->room->GetFrameNo() > node_->frameno + node_->param1) {
@ -407,7 +407,7 @@ void AndroidNewAI::UpdateRandomWalk()
} }
} }
void AndroidNewAI::UpdatePursuit() void AndroidAI::UpdatePursuit()
{ {
Human* myself = (Human*)owner; Human* myself = (Human*)owner;
if (node_->target.Get()) { if (node_->target.Get()) {
@ -428,7 +428,7 @@ void AndroidNewAI::UpdatePursuit()
} }
} }
void AndroidNewAI::DoMoveNewAI() void AndroidAI::DoMoveNewAI()
{ {
Human* hum = (Human*)owner; Human* hum = (Human*)owner;
if (hum->HasBuffEffect(kBET_Vertigo)) { if (hum->HasBuffEffect(kBET_Vertigo)) {
@ -455,7 +455,7 @@ void AndroidNewAI::DoMoveNewAI()
} }
} }
void AndroidNewAI::ChangeToStateNewAI(AndroidStateEx_e to_state) void AndroidAI::ChangeToStateNewAI(AndroidStateEx_e to_state)
{ {
Human* hum = (Human*)owner; Human* hum = (Human*)owner;
switch (to_state) { switch (to_state) {
@ -533,7 +533,7 @@ void AndroidNewAI::ChangeToStateNewAI(AndroidStateEx_e to_state)
node_->exec_frame_num = 0; node_->exec_frame_num = 0;
} }
Creature* AndroidNewAI::GetTarget() Creature* AndroidAI::GetTarget()
{ {
if (GetAiLevel() <= 1) { if (GetAiLevel() <= 1) {
return nullptr; return nullptr;
@ -568,7 +568,7 @@ Creature* AndroidNewAI::GetTarget()
return target; return target;
} }
float AndroidNewAI::GetAttackRange() float AndroidAI::GetAttackRange()
{ {
float attack_range = 0; float attack_range = 0;
Human* myself = (Human*)owner; Human* myself = (Human*)owner;
@ -579,7 +579,7 @@ float AndroidNewAI::GetAttackRange()
return attack_range; return attack_range;
} }
void AndroidNewAI::DoShotNewAI() void AndroidAI::DoShotNewAI()
{ {
Human* myself = (Human*)owner; Human* myself = (Human*)owner;
if (!node_->target.Get()) { if (!node_->target.Get()) {
@ -619,7 +619,7 @@ void AndroidNewAI::DoShotNewAI()
} }
} }
int AndroidNewAI::GetAttackTimes() int AndroidAI::GetAttackTimes()
{ {
Human* myself = (Human*)owner; Human* myself = (Human*)owner;
if (myself->GetCurrWeapon()) { if (myself->GetCurrWeapon()) {

6
server/gameserver/android.ai.h
View File

@ -8,12 +8,12 @@ enum AndroidState_e : int;
struct OldAiData; struct OldAiData;
struct AINode; struct AINode;
class Human; class Human;
class AndroidNewAI : public AIComponent class AndroidAI : public AIComponent
{ {
public: public:
AndroidNewAI(); AndroidAI();
virtual ~AndroidNewAI() override; virtual ~AndroidAI() override;
virtual void Update(int delta_time) override; virtual void Update(int delta_time) override;
float GetAttackRate(); float GetAttackRate();

2
server/gameserver/android.cc
View File

@ -32,7 +32,7 @@ void Android::Initialize()
ai->SetAiLevel(8); ai->SetAiLevel(8);
ai->SetAiMode(kHumanAiMode); ai->SetAiMode(kHumanAiMode);
} else { } else {
ai = new AndroidNewAI; ai = new AndroidAI;
ai->owner = this; ai->owner = this;
} }
Human::Initialize(); Human::Initialize();