From 46203e17f09df7ee54b8af58eb9ad29ff81aea0d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 17 Nov 2023 13:39:30 +0800 Subject: [PATCH] 1 --- .../internal/behaviac_agent_member_visitor.h | 36 +++++++++++++++++++ .../types/internal/behaviac_agent_meta.cpp | 22 ++++++++++-- .../types/internal/behaviac_agent_meta.h | 15 ++++++++ .../internal/behaviac_customized_types.cpp | 10 ++++++ .../internal/behaviac_customized_types.h | 4 +++ server/bin/exported/meta/counterfire.meta.xml | 8 +++-- server/gameserver/hero_agent.cc | 10 ++++++ server/gameserver/hero_agent.h | 2 ++ 8 files changed, 101 insertions(+), 6 deletions(-) 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 9e2b8ee0..f420f8f1 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 @@ -68,12 +68,24 @@ template<> inline void HeroAgent::_Execute_Method_HeroAgent::AbandonPickup(p0, p1); } +struct METHOD_TYPE_HeroAgent_AbandonTeammate { }; +template<> inline void HeroAgent::_Execute_Method_(int p0, int p1) +{ + this->HeroAgent::AbandonTeammate(p0, p1); +} + struct METHOD_TYPE_HeroAgent_Abort { }; template<> inline void HeroAgent::_Execute_Method_(behaviac::string p0, behaviac::vector p1) { this->HeroAgent::Abort(p0, p1); } +struct METHOD_TYPE_HeroAgent_CanThrowItem { }; +template<> inline bool HeroAgent::_Execute_Method_(int p0) +{ + return this->HeroAgent::CanThrowItem(p0); +} + struct METHOD_TYPE_HeroAgent_ClearEvents { }; template<> inline behaviac::EBTStatus HeroAgent::_Execute_Method_() { @@ -92,6 +104,12 @@ template<> inline void HeroAgent::_Execute_Method_(i this->HeroAgent::DecV(p0, p1); } +struct METHOD_TYPE_HeroAgent_GetTeammateDistance { }; +template<> inline float HeroAgent::_Execute_Method_() +{ + return this->HeroAgent::GetTeammateDistance(); +} + struct METHOD_TYPE_HeroAgent_Pickup { }; template<> inline behaviac::EBTStatus HeroAgent::_Execute_Method_() { @@ -116,6 +134,12 @@ template<> inline int HeroAgent::_Execute_Method_HeroAgent::SearchPickupObj(); } +struct METHOD_TYPE_HeroAgent_SearchTeammate { }; +template<> inline bool HeroAgent::_Execute_Method_(int p0) +{ + return this->HeroAgent::SearchTeammate(p0); +} + struct METHOD_TYPE_HeroAgent_SendEmote { }; template<> inline void HeroAgent::_Execute_Method_(int p0) { @@ -158,6 +182,18 @@ template<> inline bool HeroAgent::_Execute_Method_HeroAgent::TargetInShotRange(); } +struct METHOD_TYPE_HeroAgent_TeammateIsValid { }; +template<> inline bool HeroAgent::_Execute_Method_() +{ + return this->HeroAgent::TeammateIsValid(); +} + +struct METHOD_TYPE_HeroAgent_ThrowItem { }; +template<> inline behaviac::EBTStatus HeroAgent::_Execute_Method_(int p0) +{ + return this->HeroAgent::ThrowItem(p0); +} + struct METHOD_TYPE_MasterAgent_IsValid { }; 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 6beeaae7..d11f3a46 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(614896237u); + AgentMeta::SetTotalSignature(3541310967u); AgentMeta* meta = NULL; BEHAVIAC_UNUSED_VAR(meta); @@ -750,9 +750,10 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // HeroAgent - meta = BEHAVIAC_NEW AgentMeta(358188551u); + meta = BEHAVIAC_NEW AgentMeta(1530194628u); 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< HeroAgent* >("current_teammate_agent", Set_HeroAgent_current_teammate_agent, Get_HeroAgent_current_teammate_agent)); meta->RegisterMemberProperty(1530109714u, BEHAVIAC_NEW CMemberProperty< MasterAgent* >("master_agent", Set_HeroAgent_master_agent, Get_HeroAgent_master_agent)); meta->RegisterMemberProperty(3100058733u, BEHAVIAC_NEW CMemberProperty< int >("out_errno", Set_HeroAgent_out_errno, Get_HeroAgent_out_errno)); meta->RegisterMemberProperty(1342699083u, BEHAVIAC_NEW CMemberProperty< glm::vec3 >("out_point0", Set_HeroAgent_out_point0, Get_HeroAgent_out_point0)); @@ -779,11 +780,13 @@ namespace behaviac meta->RegisterMemberProperty(2693987492u, BEHAVIAC_NEW CMemberProperty< float >("tmp_val3", Set_HeroAgent_tmp_val3, Get_HeroAgent_tmp_val3)); meta->RegisterMemberProperty(4023609955u, BEHAVIAC_NEW CMemberProperty< float >("tmp_val4", Set_HeroAgent_tmp_val4, Get_HeroAgent_tmp_val4)); meta->RegisterMethod(2391826255u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_HeroAgent_AbandonPickup)); + meta->RegisterMethod(2895125085u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_HeroAgent_AbandonTeammate)); meta->RegisterMethod(1724035246u, BEHAVIAC_NEW CAgentMethodVoid_2>(FunctionPointer_HeroAgent_Abort)); meta->RegisterMethod(1352812660u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_AbortCoroutine)); meta->RegisterMethod(3724946699u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_BattleMove) /* BattleMove */); meta->RegisterMethod(113953652u, BEHAVIAC_NEW CMethod_HeroAgent_CalcDistance()); meta->RegisterMethod(896336728u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_CanShot)); + meta->RegisterMethod(3040220846u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_HeroAgent_CanThrowItem)); meta->RegisterMethod(1672911688u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_HeroAgent_CanUseSkill)); meta->RegisterMethod(513965041u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_HeroAgent_ChaseToKill) /* ChaseToKill */); meta->RegisterMethod(2692459416u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_ChiMode) /* ChiMode */); @@ -831,6 +834,7 @@ namespace behaviac meta->RegisterMethod(1330753553u, BEHAVIAC_NEW CAgentMethod< behaviac::string >(FunctionPointer_HeroAgent_GetSkillBtFile)); meta->RegisterMethod(2253976520u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_HeroAgent_GetTargetDir)); meta->RegisterMethod(2804704472u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetTargetManhattanDistance)); + meta->RegisterMethod(575648225u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetTeammateDistance)); meta->RegisterMethod(2541118574u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetTickCount)); meta->RegisterMethod(1866966855u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetUniId)); meta->RegisterMethod(4271568288u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetUseSkillTimes)); @@ -873,6 +877,7 @@ namespace behaviac 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(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)); meta->RegisterMethod(1147186661u, BEHAVIAC_NEW CMethod_HeroAgent_SetAttackDir()); meta->RegisterMethod(2408617877u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_HeroAgent_SetBulletAngleOffset)); @@ -885,7 +890,9 @@ namespace behaviac meta->RegisterMethod(277653485u, BEHAVIAC_NEW CAgentMethod_1< bool, float >(FunctionPointer_HeroAgent_TargetInRange)); meta->RegisterMethod(179831127u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_TargetInShotRange)); meta->RegisterMethod(3214329694u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_HeroAgent_TeammateHelpAttack) /* TeammateHelpAttack */); + meta->RegisterMethod(3664148232u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_TeammateIsValid)); meta->RegisterMethod(3795830842u, BEHAVIAC_NEW CAgentMethod_1< int, int >(FunctionPointer_HeroAgent_Test)); + meta->RegisterMethod(2561715433u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_HeroAgent_ThrowItem)); meta->RegisterMethod(1520897413u, BEHAVIAC_NEW CAgentMethod_3< behaviac::EBTStatus, float, int, int >(FunctionPointer_HeroAgent_TrySearchEnemy)); meta->RegisterMethod(1219646948u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_HeroAgent_UseNormalSkill) /* UseNormalSkill */); meta->RegisterMethod(657339709u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_HeroAgent_UseSkill30100) /* UseSkill30100 */); @@ -905,9 +912,10 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // AndroidAgent - meta = BEHAVIAC_NEW AgentMeta(2716876485u); + meta = BEHAVIAC_NEW AgentMeta(323401284u); 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< HeroAgent* >("current_teammate_agent", Set_HeroAgent_current_teammate_agent, Get_HeroAgent_current_teammate_agent)); meta->RegisterMemberProperty(1530109714u, BEHAVIAC_NEW CMemberProperty< MasterAgent* >("master_agent", Set_HeroAgent_master_agent, Get_HeroAgent_master_agent)); meta->RegisterMemberProperty(3100058733u, BEHAVIAC_NEW CMemberProperty< int >("out_errno", Set_HeroAgent_out_errno, Get_HeroAgent_out_errno)); meta->RegisterMemberProperty(1342699083u, BEHAVIAC_NEW CMemberProperty< glm::vec3 >("out_point0", Set_HeroAgent_out_point0, Get_HeroAgent_out_point0)); @@ -934,11 +942,13 @@ namespace behaviac meta->RegisterMemberProperty(2693987492u, BEHAVIAC_NEW CMemberProperty< float >("tmp_val3", Set_HeroAgent_tmp_val3, Get_HeroAgent_tmp_val3)); meta->RegisterMemberProperty(4023609955u, BEHAVIAC_NEW CMemberProperty< float >("tmp_val4", Set_HeroAgent_tmp_val4, Get_HeroAgent_tmp_val4)); meta->RegisterMethod(2391826255u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_AndroidAgent_AbandonPickup)); + meta->RegisterMethod(2895125085u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_AndroidAgent_AbandonTeammate)); meta->RegisterMethod(1724035246u, BEHAVIAC_NEW CAgentMethodVoid_2>(FunctionPointer_AndroidAgent_Abort)); meta->RegisterMethod(1352812660u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_AbortCoroutine)); meta->RegisterMethod(3724946699u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_BattleMove) /* BattleMove */); meta->RegisterMethod(113953652u, BEHAVIAC_NEW CMethod_HeroAgent_CalcDistance()); meta->RegisterMethod(896336728u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_CanShot)); + meta->RegisterMethod(3040220846u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_AndroidAgent_CanThrowItem)); meta->RegisterMethod(1672911688u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_AndroidAgent_CanUseSkill)); meta->RegisterMethod(513965041u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_AndroidAgent_ChaseToKill) /* ChaseToKill */); meta->RegisterMethod(2692459416u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_ChiMode) /* ChiMode */); @@ -987,6 +997,7 @@ namespace behaviac meta->RegisterMethod(1330753553u, BEHAVIAC_NEW CAgentMethod< behaviac::string >(FunctionPointer_AndroidAgent_GetSkillBtFile)); meta->RegisterMethod(2253976520u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_AndroidAgent_GetTargetDir)); meta->RegisterMethod(2804704472u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetTargetManhattanDistance)); + meta->RegisterMethod(575648225u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetTeammateDistance)); meta->RegisterMethod(2541118574u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetTickCount)); meta->RegisterMethod(1866966855u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetUniId)); meta->RegisterMethod(4271568288u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetUseSkillTimes)); @@ -1029,6 +1040,7 @@ namespace behaviac 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(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)); meta->RegisterMethod(1147186661u, BEHAVIAC_NEW CMethod_HeroAgent_SetAttackDir()); meta->RegisterMethod(2408617877u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_AndroidAgent_SetBulletAngleOffset)); @@ -1041,7 +1053,9 @@ namespace behaviac meta->RegisterMethod(277653485u, BEHAVIAC_NEW CAgentMethod_1< bool, float >(FunctionPointer_AndroidAgent_TargetInRange)); meta->RegisterMethod(179831127u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_TargetInShotRange)); meta->RegisterMethod(3214329694u, BEHAVIAC_NEW CAgentMethodVoid(FunctionPointer_AndroidAgent_TeammateHelpAttack) /* TeammateHelpAttack */); + meta->RegisterMethod(3664148232u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_TeammateIsValid)); meta->RegisterMethod(3795830842u, BEHAVIAC_NEW CAgentMethod_1< int, int >(FunctionPointer_AndroidAgent_Test)); + meta->RegisterMethod(2561715433u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_AndroidAgent_ThrowItem)); meta->RegisterMethod(1520897413u, BEHAVIAC_NEW CAgentMethod_3< behaviac::EBTStatus, float, int, int >(FunctionPointer_AndroidAgent_TrySearchEnemy)); meta->RegisterMethod(1219646948u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_AndroidAgent_UseNormalSkill) /* UseNormalSkill */); meta->RegisterMethod(657339709u, BEHAVIAC_NEW CAgentMethodVoid_3(FunctionPointer_AndroidAgent_UseSkill30100) /* UseSkill30100 */); @@ -1101,6 +1115,7 @@ namespace behaviac AgentMeta::Register("BtEvent_e"); AgentMeta::Register("GasMode_e"); AgentMeta::Register("CoId_e"); + AgentMeta::Register("InventorySlot_e"); AgentMeta::Register("glm::vec3"); return true; @@ -1121,6 +1136,7 @@ namespace behaviac AgentMeta::UnRegister("BtEvent_e"); AgentMeta::UnRegister("GasMode_e"); AgentMeta::UnRegister("CoId_e"); + AgentMeta::UnRegister("InventorySlot_e"); AgentMeta::UnRegister("glm::vec3"); return true; 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 6068129b..46bc20e3 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 @@ -78,6 +78,9 @@ namespace behaviac inline void Set_HeroAgent_current_target_agent(Agent* self, TargetAgent* value) { ((HeroAgent*)self)->current_target_agent = value; }; inline const void* Get_HeroAgent_current_target_agent(Agent* self) { return &((HeroAgent*)self)->current_target_agent; }; + inline void Set_HeroAgent_current_teammate_agent(Agent* self, HeroAgent* value) { ((HeroAgent*)self)->current_teammate_agent = value; }; + inline const void* Get_HeroAgent_current_teammate_agent(Agent* self) { return &((HeroAgent*)self)->current_teammate_agent; }; + inline void Set_HeroAgent_master_agent(Agent* self, MasterAgent* value) { ((HeroAgent*)self)->master_agent = value; }; inline const void* Get_HeroAgent_master_agent(Agent* self) { return &((HeroAgent*)self)->master_agent; }; @@ -154,10 +157,12 @@ namespace behaviac inline const void* Get_HeroAgent_tmp_val4(Agent* self) { return &((HeroAgent*)self)->tmp_val4; }; inline void FunctionPointer_HeroAgent_AbandonPickup(Agent* self, int min_time, int max_time) { ((HeroAgent*)self)->_Execute_Method_(min_time, max_time); } + inline void FunctionPointer_HeroAgent_AbandonTeammate(Agent* self, int min_time, int max_time) { ((HeroAgent*)self)->_Execute_Method_(min_time, max_time); } inline void FunctionPointer_HeroAgent_Abort(Agent* self, behaviac::string msg, behaviac::vector args) { ((HeroAgent*)self)->_Execute_Method_ >(msg, args); } inline void FunctionPointer_HeroAgent_AbortCoroutine(Agent* self, CoId_e co_id) { ((BaseAgent*)self)->_Execute_Method_(co_id); } inline void FunctionPointer_HeroAgent_BattleMove(Agent* self, glm::vec3& loc_point0) { } /* BattleMove */ inline bool FunctionPointer_HeroAgent_CanShot(Agent* self) { return ((HeroAgent*)self)->CanShot(); } + inline bool FunctionPointer_HeroAgent_CanThrowItem(Agent* self, int slot) { return (bool)((HeroAgent*)self)->_Execute_Method_(slot); } inline bool FunctionPointer_HeroAgent_CanUseSkill(Agent* self, int skill_id) { return ((HeroAgent*)self)->CanUseSkill(skill_id); } inline void FunctionPointer_HeroAgent_ChaseToKill(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* ChaseToKill */ inline void FunctionPointer_HeroAgent_ChiMode(Agent* self) { } /* ChiMode */ @@ -203,6 +208,7 @@ namespace behaviac inline behaviac::string FunctionPointer_HeroAgent_GetSkillBtFile(Agent* self) { return ((HeroAgent*)self)->GetSkillBtFile(); } inline glm::vec3 FunctionPointer_HeroAgent_GetTargetDir(Agent* self) { return ((HeroAgent*)self)->GetTargetDir(); } inline float FunctionPointer_HeroAgent_GetTargetManhattanDistance(Agent* self) { return ((HeroAgent*)self)->GetTargetManhattanDistance(); } + inline float FunctionPointer_HeroAgent_GetTeammateDistance(Agent* self) { return (float)((HeroAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_HeroAgent_GetTickCount(Agent* self) { return ((HeroAgent*)self)->GetTickCount(); } inline int FunctionPointer_HeroAgent_GetUniId(Agent* self) { return ((HeroAgent*)self)->GetUniId(); } inline int FunctionPointer_HeroAgent_GetUseSkillTimes(Agent* self) { return ((HeroAgent*)self)->GetUseSkillTimes(); } @@ -244,6 +250,7 @@ namespace behaviac 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 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); } inline void FunctionPointer_HeroAgent_SetBulletAngleOffset(Agent* self, int min_val, int max_val) { ((HeroAgent*)self)->_Execute_Method_(min_val, max_val); } inline void FunctionPointer_HeroAgent_SetV(Agent* self, int id, int val) { ((HeroAgent*)self)->_Execute_Method_(id, val); } @@ -253,7 +260,9 @@ namespace behaviac inline bool FunctionPointer_HeroAgent_TargetInRange(Agent* self, float range) { return ((HeroAgent*)self)->TargetInRange(range); } inline bool FunctionPointer_HeroAgent_TargetInShotRange(Agent* self) { return (bool)((HeroAgent*)self)->_Execute_Method_(); } inline void FunctionPointer_HeroAgent_TeammateHelpAttack(Agent* self) { } /* TeammateHelpAttack */ + inline bool FunctionPointer_HeroAgent_TeammateIsValid(Agent* self) { return (bool)((HeroAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_HeroAgent_Test(Agent* self, int p1) { return (int)((BaseAgent*)self)->_Execute_Method_(p1); } + inline behaviac::EBTStatus FunctionPointer_HeroAgent_ThrowItem(Agent* self, int slot) { return (behaviac::EBTStatus)((HeroAgent*)self)->_Execute_Method_(slot); } inline behaviac::EBTStatus FunctionPointer_HeroAgent_TrySearchEnemy(Agent* self, float range, int min_interval, int max_interval) { return ((HeroAgent*)self)->TrySearchEnemy(range, min_interval, max_interval); } inline void FunctionPointer_HeroAgent_UseNormalSkill(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseNormalSkill */ inline void FunctionPointer_HeroAgent_UseSkill30100(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseSkill30100 */ @@ -267,10 +276,12 @@ namespace behaviac inline void FunctionPointer_HeroAgent_UseSkill30900(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseSkill30900 */ inline void FunctionPointer_HeroAgent_UseSkill31000(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseSkill31000 */ inline void FunctionPointer_AndroidAgent_AbandonPickup(Agent* self, int min_time, int max_time) { ((HeroAgent*)self)->_Execute_Method_(min_time, max_time); } + inline void FunctionPointer_AndroidAgent_AbandonTeammate(Agent* self, int min_time, int max_time) { ((HeroAgent*)self)->_Execute_Method_(min_time, max_time); } inline void FunctionPointer_AndroidAgent_Abort(Agent* self, behaviac::string msg, behaviac::vector args) { ((HeroAgent*)self)->_Execute_Method_ >(msg, args); } inline void FunctionPointer_AndroidAgent_AbortCoroutine(Agent* self, CoId_e co_id) { ((BaseAgent*)self)->_Execute_Method_(co_id); } inline void FunctionPointer_AndroidAgent_BattleMove(Agent* self, glm::vec3& loc_point0) { } /* BattleMove */ inline bool FunctionPointer_AndroidAgent_CanShot(Agent* self) { return ((AndroidAgent*)self)->CanShot(); } + inline bool FunctionPointer_AndroidAgent_CanThrowItem(Agent* self, int slot) { return (bool)((HeroAgent*)self)->_Execute_Method_(slot); } inline bool FunctionPointer_AndroidAgent_CanUseSkill(Agent* self, int skill_id) { return ((AndroidAgent*)self)->CanUseSkill(skill_id); } inline void FunctionPointer_AndroidAgent_ChaseToKill(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* ChaseToKill */ inline void FunctionPointer_AndroidAgent_ChiMode(Agent* self) { } /* ChiMode */ @@ -317,6 +328,7 @@ namespace behaviac inline behaviac::string FunctionPointer_AndroidAgent_GetSkillBtFile(Agent* self) { return ((AndroidAgent*)self)->GetSkillBtFile(); } inline glm::vec3 FunctionPointer_AndroidAgent_GetTargetDir(Agent* self) { return ((AndroidAgent*)self)->GetTargetDir(); } inline float FunctionPointer_AndroidAgent_GetTargetManhattanDistance(Agent* self) { return ((AndroidAgent*)self)->GetTargetManhattanDistance(); } + inline float FunctionPointer_AndroidAgent_GetTeammateDistance(Agent* self) { return (float)((HeroAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_AndroidAgent_GetTickCount(Agent* self) { return ((AndroidAgent*)self)->GetTickCount(); } inline int FunctionPointer_AndroidAgent_GetUniId(Agent* self) { return ((AndroidAgent*)self)->GetUniId(); } inline int FunctionPointer_AndroidAgent_GetUseSkillTimes(Agent* self) { return ((AndroidAgent*)self)->GetUseSkillTimes(); } @@ -358,6 +370,7 @@ namespace behaviac 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 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); } inline void FunctionPointer_AndroidAgent_SetBulletAngleOffset(Agent* self, int min_val, int max_val) { ((HeroAgent*)self)->_Execute_Method_(min_val, max_val); } inline void FunctionPointer_AndroidAgent_SetV(Agent* self, int id, int val) { ((HeroAgent*)self)->_Execute_Method_(id, val); } @@ -367,7 +380,9 @@ namespace behaviac inline bool FunctionPointer_AndroidAgent_TargetInRange(Agent* self, float range) { return ((AndroidAgent*)self)->TargetInRange(range); } inline bool FunctionPointer_AndroidAgent_TargetInShotRange(Agent* self) { return (bool)((HeroAgent*)self)->_Execute_Method_(); } inline void FunctionPointer_AndroidAgent_TeammateHelpAttack(Agent* self) { } /* TeammateHelpAttack */ + inline bool FunctionPointer_AndroidAgent_TeammateIsValid(Agent* self) { return (bool)((HeroAgent*)self)->_Execute_Method_(); } inline int FunctionPointer_AndroidAgent_Test(Agent* self, int p1) { return (int)((BaseAgent*)self)->_Execute_Method_(p1); } + inline behaviac::EBTStatus FunctionPointer_AndroidAgent_ThrowItem(Agent* self, int slot) { return (behaviac::EBTStatus)((HeroAgent*)self)->_Execute_Method_(slot); } inline behaviac::EBTStatus FunctionPointer_AndroidAgent_TrySearchEnemy(Agent* self, float range, int min_interval, int max_interval) { return ((AndroidAgent*)self)->TrySearchEnemy(range, min_interval, max_interval); } inline void FunctionPointer_AndroidAgent_UseNormalSkill(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseNormalSkill */ inline void FunctionPointer_AndroidAgent_UseSkill30100(Agent* self, int loc_val0, int loc_val1, int loc_val2) { } /* UseSkill30100 */ diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.cpp b/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.cpp index 0c275cd6..270b9a49 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.cpp +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.cpp @@ -66,3 +66,13 @@ BEHAVIAC_BEGIN_ENUM_EX(CoId_e, CoId_e) } BEHAVIAC_END_ENUM_EX() +BEHAVIAC_BEGIN_ENUM_EX(InventorySlot_e, InventorySlot_e) +{ + BEHAVIAC_ENUMCLASS_DISPLAY_INFO_EX(L"InventorySlot_e", L""); + + BEHAVIAC_ENUM_ITEM_EX(IS_FRAG, "IS_FRAG"); + BEHAVIAC_ENUM_ITEM_EX(IS_SMOKE, "IS_SMOKE"); + BEHAVIAC_ENUM_ITEM_EX(IS_MOLOTOR_COCKTAIL, "IS_MOLOTOR_COCKTAIL"); +} +BEHAVIAC_END_ENUM_EX() + diff --git a/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.h b/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.h index ec5eb47a..9e8b2a57 100644 --- a/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.h +++ b/server/bin/exported/behaviac_generated/types/internal/behaviac_customized_types.h @@ -37,6 +37,10 @@ DECLARE_BEHAVIAC_ENUM_EX(CoId_e, CoId_e); BEHAVIAC_DECLARE_TYPE_VECTOR_HANDLER(CoId_e); +DECLARE_BEHAVIAC_ENUM_EX(InventorySlot_e, InventorySlot_e); +BEHAVIAC_DECLARE_TYPE_VECTOR_HANDLER(InventorySlot_e); + + // ------------------- // Customized structs // ------------------- diff --git a/server/bin/exported/meta/counterfire.meta.xml b/server/bin/exported/meta/counterfire.meta.xml index 7991aef6..d4750748 100644 --- a/server/bin/exported/meta/counterfire.meta.xml +++ b/server/bin/exported/meta/counterfire.meta.xml @@ -1,9 +1,10 @@ - - + + + @@ -31,9 +32,10 @@ - + + diff --git a/server/gameserver/hero_agent.cc b/server/gameserver/hero_agent.cc index 3eb92975..1d1c384a 100644 --- a/server/gameserver/hero_agent.cc +++ b/server/gameserver/hero_agent.cc @@ -1520,3 +1520,13 @@ float HeroAgent::GetTeammateDistance() { return 0; } + +void HeroAgent::AbandonTeammate(int min_time, int max_time) +{ + +} + +bool HeroAgent::TeammateIsValid() +{ + return false; +} diff --git a/server/gameserver/hero_agent.h b/server/gameserver/hero_agent.h index 0e371b95..bedf528d 100644 --- a/server/gameserver/hero_agent.h +++ b/server/gameserver/hero_agent.h @@ -94,6 +94,8 @@ public: bool CanThrowItem(int slot); bool SearchTeammate(int range); float GetTeammateDistance(); + void AbandonTeammate(int min_time, int max_time); + bool TeammateIsValid(); behaviac::EBTStatus RegisterEvents(behaviac::vector events); behaviac::EBTStatus ClearEvents();