diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_member_visitor.h b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_member_visitor.h index 647407f8..9db39383 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_member_visitor.h +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_member_visitor.h @@ -164,6 +164,12 @@ template<> inline void HeroAgent::_Execute_Method_HeroAgent::ResetUseSkillTimes(); } +struct METHOD_TYPE_HeroAgent_SearchHumanEnemy { }; +template<> inline behaviac::EBTStatus HeroAgent::_Execute_Method_(int p0) +{ + return this->HeroAgent::SearchHumanEnemy(p0); +} + struct METHOD_TYPE_HeroAgent_SearchPickupObj { }; template<> inline int HeroAgent::_Execute_Method_() { diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.cpp b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.cpp index 40431677..c119657f 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.cpp +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.cpp @@ -633,7 +633,7 @@ namespace behaviac virtual bool load() { - AgentMeta::SetTotalSignature(4051514415u); + AgentMeta::SetTotalSignature(2686576916u); AgentMeta* meta = NULL; BEHAVIAC_UNUSED_VAR(meta); @@ -750,7 +750,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // HeroAgent - meta = BEHAVIAC_NEW AgentMeta(254256538u); + meta = BEHAVIAC_NEW AgentMeta(1955586164u); AgentMeta::GetAgentMetas()[2270112014u] = meta; meta->RegisterMemberProperty(2706111800u, BEHAVIAC_NEW CMemberProperty< TargetAgent* >("current_target_agent", Set_HeroAgent_current_target_agent, Get_HeroAgent_current_target_agent)); meta->RegisterMemberProperty(3525744799u, BEHAVIAC_NEW CMemberProperty< TeammateAgent* >("current_teammate_agent", Set_HeroAgent_current_teammate_agent, Get_HeroAgent_current_teammate_agent)); @@ -884,6 +884,7 @@ namespace behaviac meta->RegisterMethod(3146209884u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_RunAway) /* RunAway */); meta->RegisterMethod(160678866u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_HeroAgent_RunGas) /* RunGas */); meta->RegisterMethod(3025058903u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_HeroAgent_SearchEnemy)); + meta->RegisterMethod(3238208553u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_HeroAgent_SearchHumanEnemy)); meta->RegisterMethod(1182328469u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_SearchPickupObj)); meta->RegisterMethod(3477639065u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_HeroAgent_SearchTeammate)); meta->RegisterMethod(2380700906u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_SendEmote)); @@ -922,7 +923,7 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // AndroidAgent - meta = BEHAVIAC_NEW AgentMeta(2829637431u); + meta = BEHAVIAC_NEW AgentMeta(3669426665u); AgentMeta::GetAgentMetas()[2475098143u] = meta; meta->RegisterMemberProperty(2706111800u, BEHAVIAC_NEW CMemberProperty< TargetAgent* >("current_target_agent", Set_HeroAgent_current_target_agent, Get_HeroAgent_current_target_agent)); meta->RegisterMemberProperty(3525744799u, BEHAVIAC_NEW CMemberProperty< TeammateAgent* >("current_teammate_agent", Set_HeroAgent_current_teammate_agent, Get_HeroAgent_current_teammate_agent)); @@ -1057,6 +1058,7 @@ namespace behaviac meta->RegisterMethod(3146209884u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_RunAway) /* RunAway */); meta->RegisterMethod(160678866u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_AndroidAgent_RunGas) /* RunGas */); meta->RegisterMethod(3025058903u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_AndroidAgent_SearchEnemy)); + meta->RegisterMethod(3238208553u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_AndroidAgent_SearchHumanEnemy)); meta->RegisterMethod(1182328469u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_SearchPickupObj)); meta->RegisterMethod(3477639065u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_AndroidAgent_SearchTeammate)); meta->RegisterMethod(2380700906u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_SendEmote)); diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.h b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.h index afad946c..e083b573 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.h +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_agent_meta.h @@ -257,6 +257,7 @@ namespace behaviac inline void FunctionPointer_HeroAgent_RunAway(Agent* self, glm::vec3& loc_point0) { } /* RunAway */ inline void FunctionPointer_HeroAgent_RunGas(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* RunGas */ inline behaviac::EBTStatus FunctionPointer_HeroAgent_SearchEnemy(Agent* self, float range) { return ((HeroAgent*)self)->SearchEnemy(range); } + inline behaviac::EBTStatus FunctionPointer_HeroAgent_SearchHumanEnemy(Agent* self, int range) { return (behaviac::EBTStatus)((HeroAgent*)self)->_Execute_Method_(range); } inline int FunctionPointer_HeroAgent_SearchPickupObj(Agent* self) { return (int)((HeroAgent*)self)->_Execute_Method_(); } inline bool FunctionPointer_HeroAgent_SearchTeammate(Agent* self, int range) { return (bool)((HeroAgent*)self)->_Execute_Method_(range); } inline void FunctionPointer_HeroAgent_SendEmote(Agent* self, int emote) { ((HeroAgent*)self)->_Execute_Method_(emote); } @@ -387,6 +388,7 @@ namespace behaviac inline void FunctionPointer_AndroidAgent_RunAway(Agent* self, glm::vec3& loc_point0) { } /* RunAway */ inline void FunctionPointer_AndroidAgent_RunGas(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* RunGas */ inline behaviac::EBTStatus FunctionPointer_AndroidAgent_SearchEnemy(Agent* self, float range) { return ((AndroidAgent*)self)->SearchEnemy(range); } + inline behaviac::EBTStatus FunctionPointer_AndroidAgent_SearchHumanEnemy(Agent* self, int range) { return (behaviac::EBTStatus)((HeroAgent*)self)->_Execute_Method_(range); } inline int FunctionPointer_AndroidAgent_SearchPickupObj(Agent* self) { return (int)((HeroAgent*)self)->_Execute_Method_(); } inline bool FunctionPointer_AndroidAgent_SearchTeammate(Agent* self, int range) { return (bool)((HeroAgent*)self)->_Execute_Method_(range); } inline void FunctionPointer_AndroidAgent_SendEmote(Agent* self, int emote) { ((HeroAgent*)self)->_Execute_Method_(emote); } diff --git a/server/bin/exported/meta/counterfire.meta.xml b/server/bin/exported/meta/counterfire.meta.xml index 590ab2c0..18744cdd 100644 --- a/server/bin/exported/meta/counterfire.meta.xml +++ b/server/bin/exported/meta/counterfire.meta.xml @@ -1,7 +1,7 @@ - - + + @@ -32,7 +32,7 @@ - + diff --git a/server/bin/exported/monster/8002_thief.xml b/server/bin/exported/monster/8002_thief.xml index 276d6229..1aa5cead 100644 --- a/server/bin/exported/monster/8002_thief.xml +++ b/server/bin/exported/monster/8002_thief.xml @@ -2,67 +2,75 @@ - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - + + - + - - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + diff --git a/server/bin/exported/monster/8003_mystery_troop.xml b/server/bin/exported/monster/8003_mystery_troop.xml index 94f8c057..4b1169ba 100644 --- a/server/bin/exported/monster/8003_mystery_troop.xml +++ b/server/bin/exported/monster/8003_mystery_troop.xml @@ -2,67 +2,75 @@ - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - + + - + - - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + diff --git a/server/bin/exported/task/MobaMode.xml b/server/bin/exported/task/MobaMode.xml index 77237a08..3d515fe3 100644 --- a/server/bin/exported/task/MobaMode.xml +++ b/server/bin/exported/task/MobaMode.xml @@ -52,10 +52,17 @@ - - - - + + + + + + + + + + +