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

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-19 17:04:19 +08:00
parent c3c5b6ad01
commit d16aacac63
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/constant.h
View File

@ -168,7 +168,8 @@ enum SkillTarget_e
ST_EnemySingle = 6, ST_EnemySingle = 6,
ST_EnemyGroup = 7, ST_EnemyGroup = 7,
ST_EnemyAndObject = 8, ST_EnemyAndObject = 8,
ST_EnemyAndSelf = 9 ST_EnemyAndSelf = 9,
ST_SingleEnemyAndSelf = 10
}; };
enum BuffTriggerType_e enum BuffTriggerType_e

15
server/gameserver/human.cc
View File

@ -1789,6 +1789,7 @@ void Human::SelectSkillTargets(const a8::Vec2& target_pos, std::set<Entity*>& ta
break; break;
case ST_FriendlyIncludeSelf: case ST_FriendlyIncludeSelf:
{ {
target_list.insert(this);
for (auto& cell : grid_list) { for (auto& cell : grid_list) {
for (Human* hum : cell->human_list) { for (Human* hum : cell->human_list) {
if ((hum == this || hum->team_id == team_id) && if ((hum == this || hum->team_id == team_id) &&
@ -1858,6 +1859,20 @@ void Human::SelectSkillTargets(const a8::Vec2& target_pos, std::set<Entity*>& ta
} }
} }
break; break;
case ST_SingleEnemyAndSelf:
{
Entity* entity = room->GetEntityByUniId(skill_target_id);
if (entity && entity->entity_type == ET_Player) {
Human* hum = (Human*)entity;
if (hum->team_id != team_id) {
target_list.insert(hum);
}
}
target_list.insert(this);
}
break;
default:
break;
} }
} }