1
This commit is contained in:
parent
84b2c4bf08
commit
0d9007bceb
@ -1126,6 +1126,9 @@ void Creature::StartAction(ActionType_e action_type,
|
||||
if (HasBuffEffect(kBET_Camouflage)) {
|
||||
RemoveBuffByEffectId(kBET_Camouflage);
|
||||
}
|
||||
if (action_type == AT_Rescue) {
|
||||
TryAddBuff(this, kRescueBuffId);
|
||||
}
|
||||
}
|
||||
|
||||
void Creature::CancelAction()
|
||||
@ -1139,6 +1142,9 @@ void Creature::CancelAction()
|
||||
}
|
||||
}
|
||||
}
|
||||
if (action_type == AT_Rescue) {
|
||||
RemoveBuffById(kRescueBuffId);
|
||||
}
|
||||
ResetAction();
|
||||
}
|
||||
|
||||
|
@ -896,6 +896,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
|
||||
&xtimer_attacher.timer_list_
|
||||
);
|
||||
SyncAroundPlayers(__FILE__, __LINE__, __func__);
|
||||
TryAddBuff(this, kDownBuffId);
|
||||
if (GetNearbyTeammateNum(MetaMgr::Instance()->refresh_ai_downed_nearby_range) <
|
||||
MetaMgr::Instance()->refresh_ai_downed_nearby_teammate_num) {
|
||||
#if 0
|
||||
@ -1541,6 +1542,11 @@ void Human::UpdateAction()
|
||||
ProcReliveAction();
|
||||
}
|
||||
break;
|
||||
case AT_Rescue:
|
||||
{
|
||||
RemoveBuffById(kRescueBuffId);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
{
|
||||
}
|
||||
@ -2444,6 +2450,7 @@ void Human::OnDie()
|
||||
|
||||
void Human::FreeDownedTimer()
|
||||
{
|
||||
RemoveBuffById(kDownBuffId);
|
||||
if (downed_timer) {
|
||||
room->xtimer.DeleteTimer(downed_timer);
|
||||
downed_timer = nullptr;
|
||||
|
@ -1268,9 +1268,15 @@ void Room::UpdateGas()
|
||||
);
|
||||
if (!b1 && !b2) {
|
||||
pair.second->poisoning = true;
|
||||
if (!pair.second->GetBuffByEffectId(kBET_Poisoning)) {
|
||||
pair.second->TryAddBuff(pair.second, kPoisioningBuffId);
|
||||
}
|
||||
} else {
|
||||
pair.second->poisoning = false;
|
||||
pair.second->poisoning_time = false;
|
||||
if (pair.second->GetBuffByEffectId(kBET_Poisoning)) {
|
||||
pair.second->RemoveBuffByEffectId(kBET_Poisoning);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user