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-08 10:21:10 +08:00
parent 7faf2e63ec
commit 401f75f629
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
server/gameserver/base_agent.cc
View File

@ -325,12 +325,39 @@ int BaseAgent::GetUseableSkill(Creature* target)
}
#endif
#endif
Skill* skill = GetOwner()->GetMainSkill();
if (skill && GetOwner()->CanUseSkill(skill->GetSkillId())) {
if (skill->GetMinorType()) {
return -1;
if (GetOwner()->GetHeroMeta() && GetOwner()->GetHeroMeta()->id() == 60100) {
{
Skill* skill = GetOwner()->GetSkill(60101);
if (skill && GetOwner()->CanUseSkill(skill->GetSkillId())) {
if (!skill->GetMinorType()) {
return skill->GetSkillId();
}
}
}
{
Skill* skill = GetOwner()->GetSkill(60111);
if (skill && GetOwner()->CanUseSkill(skill->GetSkillId())) {
if (!skill->GetMinorType()) {
return skill->GetSkillId();
}
}
}
if (target->GetPos().Distance2D2(GetOwner()->GetPos()) < 100) {
Skill* skill = GetOwner()->GetSkill(60121);
if (skill && GetOwner()->CanUseSkill(skill->GetSkillId())) {
if (!skill->GetMinorType()) {
return skill->GetSkillId();
}
}
}
} else {
Skill* skill = GetOwner()->GetMainSkill();
if (skill && GetOwner()->CanUseSkill(skill->GetSkillId())) {
if (skill->GetMinorType()) {
return -1;
}
return skill->GetSkillId();
}
return skill->GetSkillId();
}
return -1;
}

2
server/gameserver/mt/SkillNumber.cc
View File

@ -112,7 +112,7 @@ namespace mt
}
#ifdef DEBUG
if (App::Instance()->instance_id == 6 ||
App::Instance()->instance_id == 2) {
App::Instance()->instance_id == 100) {
_float_cd = 6;
}
#endif