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

1

Browse Source
This commit is contained in:
aozhiwei 2023-06-02 18:56:23 +08:00
parent bfb8a257a9
commit 2767186ab1
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/base_agent.cc
View File

@ -318,11 +318,13 @@ int BaseAgent::GetUseableSkill(Creature* target)
return -1; return -1;
} }
#endif #endif
#if 0 #ifdef DEBUG
#if 1
if (GetOwner()->IsHuman()) { if (GetOwner()->IsHuman()) {
return -1; return -1;
} }
#endif #endif
#endif
Skill* skill = GetOwner()->GetMainSkill(); Skill* skill = GetOwner()->GetMainSkill();
if (skill && GetOwner()->CanUseSkill(skill->GetSkillId())) { if (skill && GetOwner()->CanUseSkill(skill->GetSkillId())) {
if (skill->GetMinorType()) { if (skill->GetMinorType()) {

15
server/gameserver/skillhelper.cc
View File

@ -39,18 +39,23 @@ void SkillHelper::Init()
} }
} }
magic_skill_hash_[MAGIC_60100_1_BOSS] = 60101; magic_skill_hash_[MAGIC_60100_1_BOSS] = 60101;
magic_skill_hash_[MAGIC_60100_2_BOSS] = 60102; magic_skill_hash_[MAGIC_60100_2_BOSS] = 60111;
magic_skill_hash_[MAGIC_60100_3_BOSS] = 60103; magic_skill_hash_[MAGIC_60100_3_BOSS] = 60121;
skill_magic_hash_[60101] = MAGIC_60100_1_BOSS; skill_magic_hash_[60101] = MAGIC_60100_1_BOSS;
skill_magic_hash_[60102] = MAGIC_60100_2_BOSS; skill_magic_hash_[60111] = MAGIC_60100_2_BOSS;
skill_magic_hash_[60103] = MAGIC_60100_3_BOSS; skill_magic_hash_[60121] = MAGIC_60100_3_BOSS;
} }
void SkillHelper::GetMagicIdAndBaseSkillId(int skill_id, int& magic_id, int& base_skill_id) void SkillHelper::GetMagicIdAndBaseSkillId(int skill_id, int& magic_id, int& base_skill_id)
{ {
magic_id = 0; magic_id = 0;
base_skill_id = 0; base_skill_id = skill_id;
if (skill_magic_hash_.find(skill_id) != skill_magic_hash_.end()) {
magic_id = skill_magic_hash_[skill_id];
base_skill_id = skill_id;
return;
}
for (auto& pair : skill_magic_hash_) { for (auto& pair : skill_magic_hash_) {
#if 1 #if 1
if (skill_id - pair.first >= 0 && if (skill_id - pair.first >= 0 &&