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

1

Browse Source
This commit is contained in:
aozhiwei 2021-03-23 19:29:04 +08:00
parent cc22f58811
commit 1e75e2489c
5 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
server/gameserver/creature.cc
View File

@ -1,5 +1,7 @@
#include "precompile.h" #include "precompile.h"
#include <float.h>
#include "creature.h" #include "creature.h"
#include "metamgr.h" #include "metamgr.h"
#include "room.h" #include "room.h"
@ -414,7 +416,7 @@ bool Creature::CanUseSkill(int skill_id)
return skill->GetLeftTime() <= 0; return skill->GetLeftTime() <= 0;
} }
void Creature::DoSkill(int skill_id, int target_id, const a8::Vec2& target_pos) void Creature::DoSkill(int skill_id, int target_id, const a8::Vec2& skill_dir, const a8::Vec2& target_pos)
{ {
DoSkillPreProc(skill_id, target_id, target_pos); DoSkillPreProc(skill_id, target_id, target_pos);
skill_target_id_ = target_id; skill_target_id_ = target_id;
@ -429,19 +431,23 @@ void Creature::DoSkill(int skill_id, int target_id, const a8::Vec2& target_pos)
) { ) {
skill_target_id_ = GetEntityUniId(); skill_target_id_ = GetEntityUniId();
} }
Entity* entity = room->GetEntityByUniId(skill_target_id_); if (CurrentSkill()->meta->i->skill_target() == kST_SpecDir) {
if (entity && entity->IsEntityType(ET_Player)) { UpdateSkill();
Creature* c = (Creature*)entity;
std::set<Entity*> target_list;
skill_target_pos_ = c->GetPos();
SelectSkillTargets(CurrentSkill(), c->GetPos(), target_list);
TriggerBuff(CurrentSkill(), target_list, kBTT_UseSkill);
if (!CurrentSkill()->meta->phases.empty() &&
CurrentSkill()->meta->phases[0].time_offset <= 0) {
UpdateSkill();
}
} else { } else {
playing_skill = false; Entity* entity = room->GetEntityByUniId(skill_target_id_);
if (entity && entity->IsEntityType(ET_Player)) {
Creature* c = (Creature*)entity;
std::set<Entity*> target_list;
skill_target_pos_ = c->GetPos();
SelectSkillTargets(CurrentSkill(), c->GetPos(), target_list);
TriggerBuff(CurrentSkill(), target_list, kBTT_UseSkill);
if (!CurrentSkill()->meta->phases.empty() &&
CurrentSkill()->meta->phases[0].time_offset <= 0) {
UpdateSkill();
}
} else {
playing_skill = false;
}
} }
if (HasBuffEffect(kBET_Camouflage)) { if (HasBuffEffect(kBET_Camouflage)) {
RemoveBuffByEffectId(kBET_Camouflage); RemoveBuffByEffectId(kBET_Camouflage);
@ -506,22 +512,25 @@ void Creature::ProcSkillPhase(MetaData::SkillPhase* phase)
MetaData::Equip* bullet_meta = MetaData::Equip* bullet_meta =
MetaMgr::Instance()->GetEquip(weapon_meta->i->use_bullet()); MetaMgr::Instance()->GetEquip(weapon_meta->i->use_bullet());
if (CurrentSkill()->meta->i->skill_target() == kST_SpecDir) { if (CurrentSkill()->meta->i->skill_target() == kST_SpecDir) {
float target_distance = 5; if (std::abs(skill_dir_.x) > FLT_EPSILON ||
if (bullet_meta && target_distance > 0.00001f) { std::abs(skill_dir_.y) > FLT_EPSILON) {
a8::Vec2 old_attack_dir = attack_dir; float target_distance = 5;
attack_dir = skill_dir_; if (bullet_meta && target_distance > 0.00001f) {
attack_dir.Normalize(); a8::Vec2 old_attack_dir = attack_dir;
InternalShot attack_dir = skill_dir_;
( attack_dir.Normalize();
this, InternalShot
weapon_meta, (
weapon_upgrade_meta, this,
bullet_meta, weapon_meta,
1, weapon_upgrade_meta,
CurrentSkill() ? CurrentSkill()->meta->i->skill_id() : 0, bullet_meta,
target_distance, 1,
false); CurrentSkill() ? CurrentSkill()->meta->i->skill_id() : 0,
attack_dir = old_attack_dir; target_distance,
false);
attack_dir = old_attack_dir;
}
} }
} else { } else {
Entity* entity = room->GetEntityByUniId(skill_target_id_); Entity* entity = room->GetEntityByUniId(skill_target_id_);

2
server/gameserver/creature.h
View File

@ -60,7 +60,7 @@ class Creature : public MoveableEntity
const a8::Vec2& target_pos, const a8::Vec2& target_pos,
std::set<Entity*>& target_list); std::set<Entity*>& target_list);
virtual bool CanUseSkill(int skill_id); virtual bool CanUseSkill(int skill_id);
void DoSkill(int skill_id, int target_id, const a8::Vec2& target_pos); void DoSkill(int skill_id, int target_id, const a8::Vec2& skill_dir, const a8::Vec2& target_pos);
void ResetSkill(); void ResetSkill();
Skill* CurrentSkill(); Skill* CurrentSkill();
MetaData::SkillPhase* GetCurrSkillPhase(); MetaData::SkillPhase* GetCurrSkillPhase();

10
server/gameserver/player.cc
View File

@ -393,7 +393,7 @@ void Player::UpdateUseSkill()
if (HasBuffEffect(kBET_Vertigo)) { if (HasBuffEffect(kBET_Vertigo)) {
return; return;
} }
DoSkill(use_skill_id, skill_target_id, a8::Vec2()); DoSkill(use_skill_id, skill_target_id, skill_dir, a8::Vec2());
use_skill = false; use_skill = false;
} }
@ -1122,6 +1122,14 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
use_skill = msg.use_skill(); use_skill = msg.use_skill();
use_skill_id = msg.skill_id(); use_skill_id = msg.skill_id();
skill_target_id = msg.skill_target_id(); skill_target_id = msg.skill_target_id();
if (std::abs(msg.skill_dir().x()) > FLT_EPSILON ||
std::abs(msg.skill_dir().y()) > FLT_EPSILON
) {
TypeConvert::FromPb(skill_dir, &msg.skill_dir());
skill_dir.Normalize();
} else {
skill_dir = a8::Vec2();
}
} else { } else {
use_skill = false; use_skill = false;
} }

1
server/gameserver/player.h
View File

@ -60,6 +60,7 @@ class Player : public Human
bool use_skill = false; bool use_skill = false;
int use_skill_id = 0; int use_skill_id = 0;
int skill_target_id = 0; int skill_target_id = 0;
a8::Vec2 skill_dir;
bool get_down = false; bool get_down = false;
int get_on = 0; int get_on = 0;

2
server/gameserver/zombiemode.ai.cc
View File

@ -479,7 +479,7 @@ void ZombieModeAI::DoShot()
void ZombieModeAI::DoSkill(int skill_id) void ZombieModeAI::DoSkill(int skill_id)
{ {
Human* myself = (Human*)owner; Human* myself = (Human*)owner;
myself->DoSkill(skill_id, node_->target->GetEntityUniId(), node_->target->GetPos()); myself->DoSkill(skill_id, node_->target->GetEntityUniId(), a8::Vec2(), node_->target->GetPos());
} }
int ZombieModeAI::GetAttackTimes() int ZombieModeAI::GetAttackTimes()