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 cef18235..a007b2f0 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 @@ -16,12 +16,30 @@ template<> inline bool BaseAgent::_Execute_Method_BaseAgent::CanUseSkill(p0); } +struct METHOD_TYPE_BaseAgent_CurrentTargetMoveCanReach { }; +template<> inline bool BaseAgent::_Execute_Method_() +{ + return this->BaseAgent::CurrentTargetMoveCanReach(); +} + +struct METHOD_TYPE_BaseAgent_DoSkill { }; +template<> inline behaviac::EBTStatus BaseAgent::_Execute_Method_(int p0) +{ + return this->BaseAgent::DoSkill(p0); +} + struct METHOD_TYPE_BaseAgent_DoUseSkill { }; template<> inline behaviac::EBTStatus BaseAgent::_Execute_Method_(int p0) { return this->BaseAgent::DoUseSkill(p0); } +struct METHOD_TYPE_BaseAgent_GetPos { }; +template<> inline glm::vec3 BaseAgent::_Execute_Method_() +{ + return this->BaseAgent::GetPos(); +} + struct METHOD_TYPE_BaseAgent_HasBuffEffect { }; template<> inline bool BaseAgent::_Execute_Method_(int p0) { @@ -34,6 +52,18 @@ template<> inline bool BaseAgent::_Execute_Method_BaseAgent::HasTarget(p0); } +struct METHOD_TYPE_BaseAgent_MoveCanReach { }; +template<> inline bool BaseAgent::_Execute_Method_(const glm::vec3& p0) +{ + return this->BaseAgent::MoveCanReach(p0); +} + +struct METHOD_TYPE_BaseAgent_SelectUseableSkill { }; +template<> inline behaviac::EBTStatus BaseAgent::_Execute_Method_(const behaviac::vector p0) +{ + return this->BaseAgent::SelectUseableSkill(p0); +} + struct METHOD_TYPE_BaseAgent_SetBulletTraceMode { }; template<> inline void BaseAgent::_Execute_Method_(bool p0) { 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 8e9fe748..b82ef3f6 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 @@ -8,6 +8,42 @@ namespace behaviac { + class CInstanceConst_glm_vec3 : public CInstanceConstBase + { + IInstanceMember* _x; + IInstanceMember* _y; + IInstanceMember* _z; + + public: + CInstanceConst_glm_vec3(const char* valueStr) : CInstanceConstBase(valueStr) + { + behaviac::vector paramStrs = behaviac::StringUtils::SplitTokensForStruct(valueStr); + BEHAVIAC_ASSERT(paramStrs.size() == 3); + + _x = AgentMeta::TParseProperty(paramStrs[0].c_str()); + _y = AgentMeta::TParseProperty(paramStrs[1].c_str()); + _z = AgentMeta::TParseProperty(paramStrs[2].c_str()); + } + + ~CInstanceConst_glm_vec3() + { + BEHAVIAC_DELETE _x; + BEHAVIAC_DELETE _y; + BEHAVIAC_DELETE _z; + } + + virtual void run(Agent* self) + { + BEHAVIAC_ASSERT(_x != NULL); + BEHAVIAC_ASSERT(_y != NULL); + BEHAVIAC_ASSERT(_z != NULL); + + _value.x = *(float*)_x->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + _value.y = *(float*)_y->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + _value.z = *(float*)_z->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + } + }; + class CMethod_behaviac_Agent_VectorAdd : public CAgentMethodVoidBase { IInstanceMember* _param0; @@ -223,6 +259,106 @@ namespace behaviac } }; + class CMethod_BaseAgent_MoveCanReach : public CAgentMethodBase + { + IInstanceMember* _target_pos; + + public: + CMethod_BaseAgent_MoveCanReach() : _target_pos(0) + { + } + + CMethod_BaseAgent_MoveCanReach(CMethod_BaseAgent_MoveCanReach &rhs) : CAgentMethodBase(rhs) , _target_pos(0) + { + } + + ~CMethod_BaseAgent_MoveCanReach() + { + BEHAVIAC_DELETE _target_pos; + } + + virtual IInstanceMember* clone() + { + return BEHAVIAC_NEW CMethod_BaseAgent_MoveCanReach(*this); + } + + virtual void load(const char* instance, behaviac::vector& paramStrs) + { + BEHAVIAC_ASSERT(paramStrs.size() == 1); + + behaviac::StringUtils::StringCopySafe(kInstanceNameMax, _instance, instance); + if (behaviac::StringUtils::StartsWith(paramStrs[0].c_str(), "{")) + { + _target_pos = BEHAVIAC_NEW CInstanceConst_glm_vec3(paramStrs[0].c_str()); + } + else + { + _target_pos = AgentMeta::TParseProperty(paramStrs[0].c_str()); + } + } + + virtual void run(Agent* self) + { + BEHAVIAC_ASSERT(_target_pos != NULL); + + _target_pos->run(self); + const glm::vec3& pValue_target_pos = *(const glm::vec3*)_target_pos->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + self = Agent::GetParentAgent(self, _instance); + + _returnValue->value = ((BaseAgent*)self)->_Execute_Method_(pValue_target_pos); + } + }; + + class CMethod_BaseAgent_ShotCanReach : public CAgentMethodBase + { + IInstanceMember* _target_pos; + + public: + CMethod_BaseAgent_ShotCanReach() : _target_pos(0) + { + } + + CMethod_BaseAgent_ShotCanReach(CMethod_BaseAgent_ShotCanReach &rhs) : CAgentMethodBase(rhs) , _target_pos(0) + { + } + + ~CMethod_BaseAgent_ShotCanReach() + { + BEHAVIAC_DELETE _target_pos; + } + + virtual IInstanceMember* clone() + { + return BEHAVIAC_NEW CMethod_BaseAgent_ShotCanReach(*this); + } + + virtual void load(const char* instance, behaviac::vector& paramStrs) + { + BEHAVIAC_ASSERT(paramStrs.size() == 1); + + behaviac::StringUtils::StringCopySafe(kInstanceNameMax, _instance, instance); + if (behaviac::StringUtils::StartsWith(paramStrs[0].c_str(), "{")) + { + _target_pos = BEHAVIAC_NEW CInstanceConst_glm_vec3(paramStrs[0].c_str()); + } + else + { + _target_pos = AgentMeta::TParseProperty(paramStrs[0].c_str()); + } + } + + virtual void run(Agent* self) + { + BEHAVIAC_ASSERT(_target_pos != NULL); + + _target_pos->run(self); + const glm::vec3& pValue_target_pos = *(const glm::vec3*)_target_pos->GetValue(self, behaviac::Meta::IsVector::Result, behaviac::GetClassTypeNumberId()); + self = Agent::GetParentAgent(self, _instance); + + _returnValue->value = ((BaseAgent*)self)->ShotCanReach(pValue_target_pos); + } + }; + class BehaviorLoaderImplement : BehaviorLoader { public: @@ -237,11 +373,18 @@ namespace behaviac virtual bool load() { - AgentMeta::SetTotalSignature(3849912422u); + AgentMeta::SetTotalSignature(2003817338u); AgentMeta* meta = NULL; BEHAVIAC_UNUSED_VAR(meta); + // glm::vec3 + meta = BEHAVIAC_NEW AgentMeta(854293875u); + AgentMeta::GetAgentMetas()[3393792830u] = meta; + meta->RegisterMemberProperty(784805480u, BEHAVIAC_NEW CMemberProperty< float >("x", Set_glm_vec3_x, Get_glm_vec3_x)); + meta->RegisterMemberProperty(937172777u, BEHAVIAC_NEW CMemberProperty< float >("y", Set_glm_vec3_y, Get_glm_vec3_y)); + meta->RegisterMemberProperty(485575914u, BEHAVIAC_NEW CMemberProperty< float >("z", Set_glm_vec3_z, Get_glm_vec3_z)); + // behaviac::Agent meta = BEHAVIAC_NEW AgentMeta(24743406u); AgentMeta::GetAgentMetas()[1770892321u] = meta; @@ -253,18 +396,36 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // BaseAgent - meta = BEHAVIAC_NEW AgentMeta(1438906970u); + meta = BEHAVIAC_NEW AgentMeta(3706475328u); AgentMeta::GetAgentMetas()[2774251291u] = meta; + meta->RegisterMemberProperty(2916366392u, BEHAVIAC_NEW CMemberProperty< int >("find_enemy_target_uniid", Set_BaseAgent_find_enemy_target_uniid, Get_BaseAgent_find_enemy_target_uniid)); + meta->RegisterMemberProperty(2276820502u, BEHAVIAC_NEW CMemberProperty< int >("selected_skill_id", Set_BaseAgent_selected_skill_id, Get_BaseAgent_selected_skill_id)); meta->RegisterMethod(1672911688u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_BaseAgent_CanUseSkill)); + meta->RegisterMethod(513965041u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_BaseAgent_ChaseToKill) /* ChaseToKill */); meta->RegisterMethod(623091365u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_BaseAgent_CoAttackTarget)); + meta->RegisterMethod(1719017386u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_BaseAgent_CoFindPathToCurrentTarget)); + meta->RegisterMethod(1290650388u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_BaseAgent_CoMoveToCurrentTarget)); + meta->RegisterMethod(2039856097u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_BaseAgent_CurrentTargetIsValid)); + meta->RegisterMethod(1047842467u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_BaseAgent_CurrentTargetMoveCanReach)); + meta->RegisterMethod(2126763853u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_BaseAgent_DoSkill)); meta->RegisterMethod(1528295926u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_BaseAgent_DoUseSkill)); + meta->RegisterMethod(2009627204u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_BaseAgent_FindEnemy)); meta->RegisterMethod(32551668u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_BaseAgent_GetAttackRange)); + meta->RegisterMethod(1110255456u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_BaseAgent_GetCurrentTargetDistance)); + meta->RegisterMethod(2755845811u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_BaseAgent_GetFindEnemyResultTargetDistance)); + meta->RegisterMethod(221940739u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_BaseAgent_GetFindEnemyResultTargetPos)); + meta->RegisterMethod(2424678062u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_BaseAgent_GetFindEnemyResultTargetUniId)); + meta->RegisterMethod(3533946671u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_BaseAgent_GetPos)); meta->RegisterMethod(3603629747u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_BaseAgent_HasBuffEffect)); meta->RegisterMethod(3047011226u, BEHAVIAC_NEW CAgentMethod_1< bool, float >(FunctionPointer_BaseAgent_HasTarget)); meta->RegisterMethod(400482748u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_BaseAgent_IsGameOver)); meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_BaseAgent_LogMessage)); + meta->RegisterMethod(745495888u, BEHAVIAC_NEW CMethod_BaseAgent_MoveCanReach()); meta->RegisterMethod(3111585017u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_BaseAgent_OnAttacked) /* OnAttacked */); + meta->RegisterMethod(4091391051u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, behaviac::vector >(FunctionPointer_BaseAgent_SelectUseableSkill)); meta->RegisterMethod(1800373320u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_BaseAgent_SetBulletTraceMode)); + meta->RegisterMethod(3066391950u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_BaseAgent_SetCurrentTarget)); + meta->RegisterMethod(197201453u, BEHAVIAC_NEW CMethod_BaseAgent_ShotCanReach()); meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); meta->RegisterMethod(2306090221u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorClear()); meta->RegisterMethod(3483755530u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorContains()); @@ -272,24 +433,42 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // AndroidAgent - meta = BEHAVIAC_NEW AgentMeta(3563824725u); + meta = BEHAVIAC_NEW AgentMeta(683007333u); AgentMeta::GetAgentMetas()[2475098143u] = meta; + meta->RegisterCustomizedProperty(2916366392u, BEHAVIAC_NEW CCustomizedProperty< int >(2916366392u, "find_enemy_target_uniid", "0")); + meta->RegisterCustomizedProperty(2276820502u, BEHAVIAC_NEW CCustomizedProperty< int >(2276820502u, "selected_skill_id", "0")); meta->RegisterMethod(1672911688u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_AndroidAgent_CanUseSkill)); + meta->RegisterMethod(513965041u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_ChaseToKill) /* ChaseToKill */); meta->RegisterMethod(623091365u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_AndroidAgent_CoAttackTarget)); + meta->RegisterMethod(1719017386u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_AndroidAgent_CoFindPathToCurrentTarget)); + meta->RegisterMethod(1290650388u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_AndroidAgent_CoMoveToCurrentTarget)); + meta->RegisterMethod(2039856097u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_CurrentTargetIsValid)); + meta->RegisterMethod(1047842467u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_CurrentTargetMoveCanReach)); meta->RegisterMethod(2886181657u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_AndroidAgent_DoAttack)); meta->RegisterMethod(2062982811u, BEHAVIAC_NEW CAgentMethod_2< behaviac::EBTStatus, int, int >(FunctionPointer_AndroidAgent_DoIdle)); meta->RegisterMethod(846782702u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_AndroidAgent_DoPursuit)); meta->RegisterMethod(1079343198u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_AndroidAgent_DoRandomShot)); meta->RegisterMethod(130097619u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_AndroidAgent_DoRandomWalk)); + meta->RegisterMethod(2126763853u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_AndroidAgent_DoSkill)); meta->RegisterMethod(1528295926u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_AndroidAgent_DoUseSkill)); + meta->RegisterMethod(2009627204u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_AndroidAgent_FindEnemy)); meta->RegisterMethod(32551668u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetAttackRange)); + meta->RegisterMethod(1110255456u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetCurrentTargetDistance)); + meta->RegisterMethod(2755845811u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_AndroidAgent_GetFindEnemyResultTargetDistance)); + meta->RegisterMethod(221940739u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_AndroidAgent_GetFindEnemyResultTargetPos)); + meta->RegisterMethod(2424678062u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_AndroidAgent_GetFindEnemyResultTargetUniId)); + meta->RegisterMethod(3533946671u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_AndroidAgent_GetPos)); meta->RegisterMethod(1666360340u, BEHAVIAC_NEW CAgentMethod< State_e >(FunctionPointer_AndroidAgent_GetState)); meta->RegisterMethod(3603629747u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_AndroidAgent_HasBuffEffect)); meta->RegisterMethod(3047011226u, BEHAVIAC_NEW CAgentMethod_1< bool, float >(FunctionPointer_AndroidAgent_HasTarget)); meta->RegisterMethod(400482748u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_AndroidAgent_IsGameOver)); meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_AndroidAgent_LogMessage)); + meta->RegisterMethod(745495888u, BEHAVIAC_NEW CMethod_BaseAgent_MoveCanReach()); meta->RegisterMethod(3111585017u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_AndroidAgent_OnAttacked) /* OnAttacked */); + meta->RegisterMethod(4091391051u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, behaviac::vector >(FunctionPointer_AndroidAgent_SelectUseableSkill)); meta->RegisterMethod(1800373320u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_SetBulletTraceMode)); + meta->RegisterMethod(3066391950u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_AndroidAgent_SetCurrentTarget)); + meta->RegisterMethod(197201453u, BEHAVIAC_NEW CMethod_BaseAgent_ShotCanReach()); meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); meta->RegisterMethod(2306090221u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorClear()); meta->RegisterMethod(3483755530u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorContains()); @@ -297,10 +476,17 @@ namespace behaviac meta->RegisterMethod(502968959u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorRemove()); // HeroAgent - meta = BEHAVIAC_NEW AgentMeta(1561120813u); + meta = BEHAVIAC_NEW AgentMeta(3564372298u); AgentMeta::GetAgentMetas()[2270112014u] = meta; + meta->RegisterMemberProperty(2916366392u, BEHAVIAC_NEW CMemberProperty< int >("find_enemy_target_uniid", Set_BaseAgent_find_enemy_target_uniid, Get_BaseAgent_find_enemy_target_uniid)); + meta->RegisterMemberProperty(2276820502u, BEHAVIAC_NEW CMemberProperty< int >("selected_skill_id", Set_BaseAgent_selected_skill_id, Get_BaseAgent_selected_skill_id)); meta->RegisterMethod(1672911688u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_HeroAgent_CanUseSkill)); + meta->RegisterMethod(513965041u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_ChaseToKill) /* ChaseToKill */); meta->RegisterMethod(623091365u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_HeroAgent_CoAttackTarget)); + meta->RegisterMethod(1719017386u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_HeroAgent_CoFindPathToCurrentTarget)); + meta->RegisterMethod(1290650388u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_HeroAgent_CoMoveToCurrentTarget)); + meta->RegisterMethod(2039856097u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_CurrentTargetIsValid)); + meta->RegisterMethod(1047842467u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_CurrentTargetMoveCanReach)); meta->RegisterMethod(2886181657u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_HeroAgent_DoAttack)); meta->RegisterMethod(542584570u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_HeroAgent_DoFlyToMasterAround)); meta->RegisterMethod(1239418881u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_HeroAgent_DoFollowMaster)); @@ -309,16 +495,28 @@ namespace behaviac meta->RegisterMethod(846782702u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_HeroAgent_DoPursuit)); meta->RegisterMethod(1079343198u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_HeroAgent_DoRandomShot)); meta->RegisterMethod(130097619u, BEHAVIAC_NEW CAgentMethod< behaviac::EBTStatus >(FunctionPointer_HeroAgent_DoRandomWalk)); + meta->RegisterMethod(2126763853u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_HeroAgent_DoSkill)); meta->RegisterMethod(1528295926u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, int >(FunctionPointer_HeroAgent_DoUseSkill)); + meta->RegisterMethod(2009627204u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, float >(FunctionPointer_HeroAgent_FindEnemy)); meta->RegisterMethod(32551668u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetAttackRange)); + meta->RegisterMethod(1110255456u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetCurrentTargetDistance)); + meta->RegisterMethod(2755845811u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetFindEnemyResultTargetDistance)); + meta->RegisterMethod(221940739u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_HeroAgent_GetFindEnemyResultTargetPos)); + meta->RegisterMethod(2424678062u, BEHAVIAC_NEW CAgentMethod< int >(FunctionPointer_HeroAgent_GetFindEnemyResultTargetUniId)); meta->RegisterMethod(3721974980u, BEHAVIAC_NEW CAgentMethod< float >(FunctionPointer_HeroAgent_GetMasterDistance)); + meta->RegisterMethod(3533946671u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_HeroAgent_GetPos)); + meta->RegisterMethod(3865393862u, BEHAVIAC_NEW CAgentMethod< glm::vec3 >(FunctionPointer_HeroAgent_GetSafeAreaCenter)); meta->RegisterMethod(3603629747u, BEHAVIAC_NEW CAgentMethod_1< bool, int >(FunctionPointer_HeroAgent_HasBuffEffect)); meta->RegisterMethod(3047011226u, BEHAVIAC_NEW CAgentMethod_1< bool, float >(FunctionPointer_HeroAgent_HasTarget)); meta->RegisterMethod(400482748u, BEHAVIAC_NEW CAgentMethod< bool >(FunctionPointer_HeroAgent_IsGameOver)); meta->RegisterMethod(1045109914u, BEHAVIAC_NEW CAgentStaticMethodVoid_1(FunctionPointer_HeroAgent_LogMessage)); + meta->RegisterMethod(745495888u, BEHAVIAC_NEW CMethod_BaseAgent_MoveCanReach()); meta->RegisterMethod(3111585017u, BEHAVIAC_NEW CAgentMethodVoid_2(FunctionPointer_HeroAgent_OnAttacked) /* OnAttacked */); meta->RegisterMethod(4113176194u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_OnMasterAttackTarget) /* OnMasterAttackTarget */); + meta->RegisterMethod(4091391051u, BEHAVIAC_NEW CAgentMethod_1< behaviac::EBTStatus, behaviac::vector >(FunctionPointer_HeroAgent_SelectUseableSkill)); meta->RegisterMethod(1800373320u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_SetBulletTraceMode)); + meta->RegisterMethod(3066391950u, BEHAVIAC_NEW CAgentMethodVoid_1(FunctionPointer_HeroAgent_SetCurrentTarget)); + meta->RegisterMethod(197201453u, BEHAVIAC_NEW CMethod_BaseAgent_ShotCanReach()); meta->RegisterMethod(2521019022u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorAdd()); meta->RegisterMethod(2306090221u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorClear()); meta->RegisterMethod(3483755530u, BEHAVIAC_NEW CMethod_behaviac_Agent_VectorContains()); @@ -330,6 +528,8 @@ namespace behaviac AgentMeta::Register("AndroidAgent"); AgentMeta::Register("HeroAgent"); AgentMeta::Register("State_e"); + AgentMeta::Register("FindPathResult"); + AgentMeta::Register("glm::vec3"); return true; } @@ -341,6 +541,8 @@ namespace behaviac AgentMeta::UnRegister("AndroidAgent"); AgentMeta::UnRegister("HeroAgent"); AgentMeta::UnRegister("State_e"); + AgentMeta::UnRegister("FindPathResult"); + 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 9c4d5a19..f9cf05a2 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 @@ -16,34 +16,74 @@ namespace behaviac // --------------------------------------------------------------------- inline void FunctionPointer_behaviac_Agent_LogMessage(char* param0) { behaviac::Agent::LogMessage(param0); } + + inline void Set_BaseAgent_find_enemy_target_uniid(Agent* self, int value) { ((BaseAgent*)self)->find_enemy_target_uniid = value; }; + inline const void* Get_BaseAgent_find_enemy_target_uniid(Agent* self) { return &((BaseAgent*)self)->find_enemy_target_uniid; }; + + inline void Set_BaseAgent_selected_skill_id(Agent* self, int value) { ((BaseAgent*)self)->selected_skill_id = value; }; + inline const void* Get_BaseAgent_selected_skill_id(Agent* self) { return &((BaseAgent*)self)->selected_skill_id; }; + inline bool FunctionPointer_BaseAgent_CanUseSkill(Agent* self, int skill_id) { return (bool)((BaseAgent*)self)->_Execute_Method_(skill_id); } + inline void FunctionPointer_BaseAgent_ChaseToKill(Agent* self, int target_uniid) { } /* ChaseToKill */ inline behaviac::EBTStatus FunctionPointer_BaseAgent_CoAttackTarget(Agent* self, int target_id) { return ((BaseAgent*)self)->CoAttackTarget(target_id); } + inline behaviac::EBTStatus FunctionPointer_BaseAgent_CoFindPathToCurrentTarget(Agent* self, float distance) { return ((BaseAgent*)self)->CoFindPathToCurrentTarget(distance); } + inline behaviac::EBTStatus FunctionPointer_BaseAgent_CoMoveToCurrentTarget(Agent* self, float distance) { return ((BaseAgent*)self)->CoMoveToCurrentTarget(distance); } + inline bool FunctionPointer_BaseAgent_CurrentTargetIsValid(Agent* self) { return ((BaseAgent*)self)->CurrentTargetIsValid(); } + inline bool FunctionPointer_BaseAgent_CurrentTargetMoveCanReach(Agent* self) { return (bool)((BaseAgent*)self)->_Execute_Method_(); } + inline behaviac::EBTStatus FunctionPointer_BaseAgent_DoSkill(Agent* self, int skill_id) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(skill_id); } inline behaviac::EBTStatus FunctionPointer_BaseAgent_DoUseSkill(Agent* self, int skill_id) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(skill_id); } + inline behaviac::EBTStatus FunctionPointer_BaseAgent_FindEnemy(Agent* self, float range) { return ((BaseAgent*)self)->FindEnemy(range); } inline float FunctionPointer_BaseAgent_GetAttackRange(Agent* self) { return ((BaseAgent*)self)->GetAttackRange(); } + inline float FunctionPointer_BaseAgent_GetCurrentTargetDistance(Agent* self) { return ((BaseAgent*)self)->GetCurrentTargetDistance(); } + inline float FunctionPointer_BaseAgent_GetFindEnemyResultTargetDistance(Agent* self) { return ((BaseAgent*)self)->GetFindEnemyResultTargetDistance(); } + inline glm::vec3 FunctionPointer_BaseAgent_GetFindEnemyResultTargetPos(Agent* self) { return ((BaseAgent*)self)->GetFindEnemyResultTargetPos(); } + inline int FunctionPointer_BaseAgent_GetFindEnemyResultTargetUniId(Agent* self) { return ((BaseAgent*)self)->GetFindEnemyResultTargetUniId(); } + inline glm::vec3 FunctionPointer_BaseAgent_GetPos(Agent* self) { return (glm::vec3)((BaseAgent*)self)->_Execute_Method_(); } inline bool FunctionPointer_BaseAgent_HasBuffEffect(Agent* self, int buff_effect) { return (bool)((BaseAgent*)self)->_Execute_Method_(buff_effect); } inline bool FunctionPointer_BaseAgent_HasTarget(Agent* self, float range) { return (bool)((BaseAgent*)self)->_Execute_Method_(range); } inline bool FunctionPointer_BaseAgent_IsGameOver(Agent* self) { return ((BaseAgent*)self)->IsGameOver(); } inline void FunctionPointer_BaseAgent_LogMessage(char* param0) { BaseAgent::LogMessage(param0); } inline void FunctionPointer_BaseAgent_OnAttacked(Agent* self, int sender, int time) { } /* OnAttacked */ + inline behaviac::EBTStatus FunctionPointer_BaseAgent_SelectUseableSkill(Agent* self, behaviac::vector skill_ids) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_ >(skill_ids); } inline void FunctionPointer_BaseAgent_SetBulletTraceMode(Agent* self, bool mode) { ((BaseAgent*)self)->_Execute_Method_(mode); } + inline void FunctionPointer_BaseAgent_SetCurrentTarget(Agent* self, int target_uniid) { ((BaseAgent*)self)->SetCurrentTarget(target_uniid); } inline bool FunctionPointer_AndroidAgent_CanUseSkill(Agent* self, int skill_id) { return (bool)((BaseAgent*)self)->_Execute_Method_(skill_id); } + inline void FunctionPointer_AndroidAgent_ChaseToKill(Agent* self, int target_uniid) { } /* ChaseToKill */ inline behaviac::EBTStatus FunctionPointer_AndroidAgent_CoAttackTarget(Agent* self, int target_id) { return ((AndroidAgent*)self)->CoAttackTarget(target_id); } + inline behaviac::EBTStatus FunctionPointer_AndroidAgent_CoFindPathToCurrentTarget(Agent* self, float distance) { return ((AndroidAgent*)self)->CoFindPathToCurrentTarget(distance); } + inline behaviac::EBTStatus FunctionPointer_AndroidAgent_CoMoveToCurrentTarget(Agent* self, float distance) { return ((AndroidAgent*)self)->CoMoveToCurrentTarget(distance); } + inline bool FunctionPointer_AndroidAgent_CurrentTargetIsValid(Agent* self) { return ((AndroidAgent*)self)->CurrentTargetIsValid(); } + inline bool FunctionPointer_AndroidAgent_CurrentTargetMoveCanReach(Agent* self) { return (bool)((BaseAgent*)self)->_Execute_Method_(); } inline behaviac::EBTStatus FunctionPointer_AndroidAgent_DoAttack(Agent* self) { return ((AndroidAgent*)self)->DoAttack(); } inline behaviac::EBTStatus FunctionPointer_AndroidAgent_DoIdle(Agent* self, int min_time, int max_time) { return ((AndroidAgent*)self)->DoIdle(min_time, max_time); } inline behaviac::EBTStatus FunctionPointer_AndroidAgent_DoPursuit(Agent* self) { return ((AndroidAgent*)self)->DoPursuit(); } inline behaviac::EBTStatus FunctionPointer_AndroidAgent_DoRandomShot(Agent* self) { return (behaviac::EBTStatus)((AndroidAgent*)self)->_Execute_Method_(); } inline behaviac::EBTStatus FunctionPointer_AndroidAgent_DoRandomWalk(Agent* self) { return ((AndroidAgent*)self)->DoRandomWalk(); } + inline behaviac::EBTStatus FunctionPointer_AndroidAgent_DoSkill(Agent* self, int skill_id) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(skill_id); } inline behaviac::EBTStatus FunctionPointer_AndroidAgent_DoUseSkill(Agent* self, int skill_id) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(skill_id); } + inline behaviac::EBTStatus FunctionPointer_AndroidAgent_FindEnemy(Agent* self, float range) { return ((AndroidAgent*)self)->FindEnemy(range); } inline float FunctionPointer_AndroidAgent_GetAttackRange(Agent* self) { return ((AndroidAgent*)self)->GetAttackRange(); } + inline float FunctionPointer_AndroidAgent_GetCurrentTargetDistance(Agent* self) { return ((AndroidAgent*)self)->GetCurrentTargetDistance(); } + inline float FunctionPointer_AndroidAgent_GetFindEnemyResultTargetDistance(Agent* self) { return ((AndroidAgent*)self)->GetFindEnemyResultTargetDistance(); } + inline glm::vec3 FunctionPointer_AndroidAgent_GetFindEnemyResultTargetPos(Agent* self) { return ((AndroidAgent*)self)->GetFindEnemyResultTargetPos(); } + inline int FunctionPointer_AndroidAgent_GetFindEnemyResultTargetUniId(Agent* self) { return ((AndroidAgent*)self)->GetFindEnemyResultTargetUniId(); } + inline glm::vec3 FunctionPointer_AndroidAgent_GetPos(Agent* self) { return (glm::vec3)((BaseAgent*)self)->_Execute_Method_(); } inline State_e FunctionPointer_AndroidAgent_GetState(Agent* self) { return (State_e)((AndroidAgent*)self)->_Execute_Method_(); } inline bool FunctionPointer_AndroidAgent_HasBuffEffect(Agent* self, int buff_effect) { return (bool)((BaseAgent*)self)->_Execute_Method_(buff_effect); } inline bool FunctionPointer_AndroidAgent_HasTarget(Agent* self, float range) { return (bool)((BaseAgent*)self)->_Execute_Method_(range); } inline bool FunctionPointer_AndroidAgent_IsGameOver(Agent* self) { return ((AndroidAgent*)self)->IsGameOver(); } inline void FunctionPointer_AndroidAgent_LogMessage(char* param0) { AndroidAgent::LogMessage(param0); } inline void FunctionPointer_AndroidAgent_OnAttacked(Agent* self, int sender, int time) { } /* OnAttacked */ + inline behaviac::EBTStatus FunctionPointer_AndroidAgent_SelectUseableSkill(Agent* self, behaviac::vector skill_ids) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_ >(skill_ids); } inline void FunctionPointer_AndroidAgent_SetBulletTraceMode(Agent* self, bool mode) { ((BaseAgent*)self)->_Execute_Method_(mode); } + inline void FunctionPointer_AndroidAgent_SetCurrentTarget(Agent* self, int target_uniid) { ((AndroidAgent*)self)->SetCurrentTarget(target_uniid); } inline bool FunctionPointer_HeroAgent_CanUseSkill(Agent* self, int skill_id) { return (bool)((BaseAgent*)self)->_Execute_Method_(skill_id); } + inline void FunctionPointer_HeroAgent_ChaseToKill(Agent* self, int target_uniid) { } /* ChaseToKill */ inline behaviac::EBTStatus FunctionPointer_HeroAgent_CoAttackTarget(Agent* self, int target_id) { return ((HeroAgent*)self)->CoAttackTarget(target_id); } + inline behaviac::EBTStatus FunctionPointer_HeroAgent_CoFindPathToCurrentTarget(Agent* self, float distance) { return ((HeroAgent*)self)->CoFindPathToCurrentTarget(distance); } + inline behaviac::EBTStatus FunctionPointer_HeroAgent_CoMoveToCurrentTarget(Agent* self, float distance) { return ((HeroAgent*)self)->CoMoveToCurrentTarget(distance); } + inline bool FunctionPointer_HeroAgent_CurrentTargetIsValid(Agent* self) { return ((HeroAgent*)self)->CurrentTargetIsValid(); } + inline bool FunctionPointer_HeroAgent_CurrentTargetMoveCanReach(Agent* self) { return (bool)((BaseAgent*)self)->_Execute_Method_(); } inline behaviac::EBTStatus FunctionPointer_HeroAgent_DoAttack(Agent* self) { return (behaviac::EBTStatus)((HeroAgent*)self)->_Execute_Method_(); } inline behaviac::EBTStatus FunctionPointer_HeroAgent_DoFlyToMasterAround(Agent* self) { return (behaviac::EBTStatus)((HeroAgent*)self)->_Execute_Method_(); } inline behaviac::EBTStatus FunctionPointer_HeroAgent_DoFollowMaster(Agent* self) { return (behaviac::EBTStatus)((HeroAgent*)self)->_Execute_Method_(); } @@ -52,15 +92,34 @@ namespace behaviac inline behaviac::EBTStatus FunctionPointer_HeroAgent_DoPursuit(Agent* self) { return ((HeroAgent*)self)->DoPursuit(); } inline behaviac::EBTStatus FunctionPointer_HeroAgent_DoRandomShot(Agent* self) { return ((HeroAgent*)self)->DoRandomShot(); } inline behaviac::EBTStatus FunctionPointer_HeroAgent_DoRandomWalk(Agent* self) { return ((HeroAgent*)self)->DoRandomWalk(); } + inline behaviac::EBTStatus FunctionPointer_HeroAgent_DoSkill(Agent* self, int skill_id) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(skill_id); } inline behaviac::EBTStatus FunctionPointer_HeroAgent_DoUseSkill(Agent* self, int skill_id) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_(skill_id); } + inline behaviac::EBTStatus FunctionPointer_HeroAgent_FindEnemy(Agent* self, float range) { return ((HeroAgent*)self)->FindEnemy(range); } inline float FunctionPointer_HeroAgent_GetAttackRange(Agent* self) { return ((HeroAgent*)self)->GetAttackRange(); } + inline float FunctionPointer_HeroAgent_GetCurrentTargetDistance(Agent* self) { return ((HeroAgent*)self)->GetCurrentTargetDistance(); } + inline float FunctionPointer_HeroAgent_GetFindEnemyResultTargetDistance(Agent* self) { return ((HeroAgent*)self)->GetFindEnemyResultTargetDistance(); } + inline glm::vec3 FunctionPointer_HeroAgent_GetFindEnemyResultTargetPos(Agent* self) { return ((HeroAgent*)self)->GetFindEnemyResultTargetPos(); } + inline int FunctionPointer_HeroAgent_GetFindEnemyResultTargetUniId(Agent* self) { return ((HeroAgent*)self)->GetFindEnemyResultTargetUniId(); } inline float FunctionPointer_HeroAgent_GetMasterDistance(Agent* self) { return ((HeroAgent*)self)->GetMasterDistance(); } + inline glm::vec3 FunctionPointer_HeroAgent_GetPos(Agent* self) { return (glm::vec3)((BaseAgent*)self)->_Execute_Method_(); } + inline glm::vec3 FunctionPointer_HeroAgent_GetSafeAreaCenter(Agent* self) { return ((HeroAgent*)self)->GetSafeAreaCenter(); } inline bool FunctionPointer_HeroAgent_HasBuffEffect(Agent* self, int buff_effect) { return (bool)((BaseAgent*)self)->_Execute_Method_(buff_effect); } inline bool FunctionPointer_HeroAgent_HasTarget(Agent* self, float range) { return (bool)((BaseAgent*)self)->_Execute_Method_(range); } inline bool FunctionPointer_HeroAgent_IsGameOver(Agent* self) { return ((HeroAgent*)self)->IsGameOver(); } inline void FunctionPointer_HeroAgent_LogMessage(char* param0) { HeroAgent::LogMessage(param0); } inline void FunctionPointer_HeroAgent_OnAttacked(Agent* self, int sender, int time) { } /* OnAttacked */ inline void FunctionPointer_HeroAgent_OnMasterAttackTarget(Agent* self, int target_uniid) { } /* OnMasterAttackTarget */ + inline behaviac::EBTStatus FunctionPointer_HeroAgent_SelectUseableSkill(Agent* self, behaviac::vector skill_ids) { return (behaviac::EBTStatus)((BaseAgent*)self)->_Execute_Method_ >(skill_ids); } inline void FunctionPointer_HeroAgent_SetBulletTraceMode(Agent* self, bool mode) { ((BaseAgent*)self)->_Execute_Method_(mode); } + inline void FunctionPointer_HeroAgent_SetCurrentTarget(Agent* self, int target_uniid) { ((HeroAgent*)self)->SetCurrentTarget(target_uniid); } + inline void Set_glm_vec3_x(Agent* self, float value) { ((glm::vec3*)self)->x = value; }; + inline const void* Get_glm_vec3_x(Agent* self) { return &((glm::vec3*)self)->x; }; + + inline void Set_glm_vec3_y(Agent* self, float value) { ((glm::vec3*)self)->y = value; }; + inline const void* Get_glm_vec3_y(Agent* self) { return &((glm::vec3*)self)->y; }; + + inline void Set_glm_vec3_z(Agent* self, float value) { ((glm::vec3*)self)->z = value; }; + inline const void* Get_glm_vec3_z(Agent* self) { return &((glm::vec3*)self)->z; }; + } #endif // _BEHAVIAC_AGENT_PROPERTIES_H_ 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 f7775926..903a72a4 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 @@ -23,4 +23,53 @@ DECLARE_BEHAVIAC_ENUM_EX(State_e, State_e); BEHAVIAC_DECLARE_TYPE_VECTOR_HANDLER(State_e); +// ------------------- +// Customized structs +// ------------------- + +BEHAVIAC_EXTEND_EXISTING_TYPE_EX(FindPathResult, false); +BEHAVIAC_DECLARE_TYPE_VECTOR_HANDLER(FindPathResult); + +template< typename SWAPPER > +inline void SwapByteImplement(FindPathResult& v) +{ +} + +namespace behaviac +{ + namespace PrivateDetails + { + template<> + inline bool Equal(const FindPathResult& lhs, const FindPathResult& rhs) + { + return &lhs == &rhs; + } + } +} + +BEHAVIAC_EXTEND_EXISTING_TYPE_EX(glm::vec3, false); +BEHAVIAC_DECLARE_TYPE_VECTOR_HANDLER(glm::vec3); + +template< typename SWAPPER > +inline void SwapByteImplement(glm::vec3& v) +{ + SwapByteImplement< SWAPPER >(v.x); + SwapByteImplement< SWAPPER >(v.y); + SwapByteImplement< SWAPPER >(v.z); +} + +namespace behaviac +{ + namespace PrivateDetails + { + template<> + inline bool Equal(const glm::vec3& lhs, const glm::vec3& rhs) + { + return Equal(lhs.x, rhs.x) + && Equal(lhs.y, rhs.y) + && Equal(lhs.z, rhs.z); + } + } +} + #endif // _BEHAVIAC_CUSTOMIZED_TYPES_H_ diff --git a/server/bin/exported/boss_40101.xml b/server/bin/exported/boss_40101.xml index 9b06fee0..3d1e796c 100644 --- a/server/bin/exported/boss_40101.xml +++ b/server/bin/exported/boss_40101.xml @@ -3,21 +3,22 @@ - - - - + + + + + - - - + + + - + @@ -31,7 +32,7 @@ - + diff --git a/server/bin/exported/boss_40101_attack.xml b/server/bin/exported/boss_40101_attack.xml index 4d18c18a..d92ebc28 100644 --- a/server/bin/exported/boss_40101_attack.xml +++ b/server/bin/exported/boss_40101_attack.xml @@ -6,11 +6,19 @@ - - - - - + + + + + + + + + + + + + diff --git a/server/bin/exported/boss_40101_chase_to_kill.xml b/server/bin/exported/boss_40101_chase_to_kill.xml new file mode 100644 index 00000000..80859439 --- /dev/null +++ b/server/bin/exported/boss_40101_chase_to_kill.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/bin/exported/boss_40101_counter_attack.xml b/server/bin/exported/boss_40101_counter_attack.xml new file mode 100644 index 00000000..caed8e9e --- /dev/null +++ b/server/bin/exported/boss_40101_counter_attack.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/bin/exported/meta/game2006.meta.xml b/server/bin/exported/meta/game2006.meta.xml index 3752dfd9..00c5168b 100644 --- a/server/bin/exported/meta/game2006.meta.xml +++ b/server/bin/exported/meta/game2006.meta.xml @@ -1,3 +1,22 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 600b22b0..abae1ab3 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -2666,7 +2666,7 @@ void Human::ProcLootWeapon(AddItemDTO& dto) #endif dto.handled = true; } else { - #if 1 + #if 0 if (GetBuffByEffectId(kBET_Passenger) || GetBuffByEffectId(kBET_Vertigo)) { return;