1
This commit is contained in:
parent
e8a2d36a3f
commit
b0f6d691b8
@ -625,6 +625,7 @@ void Creature::DoSkill(int skill_id,
|
||||
if (HasBuffEffect(kBET_Camouflage)) {
|
||||
RemoveBuffByEffectId(kBET_Camouflage);
|
||||
}
|
||||
GetTrigger()->UseSkill(skill);
|
||||
DoSkillPostProc(true, skill_id, target_id, target_pos);
|
||||
#if 0
|
||||
if (skill_id != TURN_OVER_SKILL_ID) {
|
||||
|
@ -850,6 +850,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
|
||||
int dec_hp = MetaMgr::Instance()->GetSysParamAsInt("downed_dec_hp");
|
||||
hum->DecHP(dec_hp, param.param1, param.param2, param.param3);
|
||||
};
|
||||
float old_hp = GetHP();
|
||||
if (energy_shield > 0.001f) {
|
||||
energy_shield = std::max(0.0f, energy_shield - dec_hp);
|
||||
SyncAroundPlayers(__FILE__, __LINE__, __func__);
|
||||
@ -904,6 +905,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
|
||||
}
|
||||
room->frame_event.AddHpChg(GetWeakPtrRef());
|
||||
}
|
||||
GetTrigger()->HpChg(old_hp, GetHP());
|
||||
}
|
||||
|
||||
void Human::AddToNewObjects(Entity* entity)
|
||||
|
Loading…
x
Reference in New Issue
Block a user