diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index d590e5d..d242ec4 100644 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -209,12 +209,12 @@ enum BuffSelectTarget_e enum VirtualWeapon_e { - VW_SafeArea = 9000000, + VW_Gas = 9000000, }; enum VirtualPlayer_e { - VP_SafeArea = 9000000, + VP_Gas = 9000000, }; enum EquipType_e diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 6c250f7..a22db32 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -1541,7 +1541,7 @@ void Creature::UpdatePoisoning() } dmg *= 1 + GetAbility()->GetAttrRate(kHAT_PoisoningReduction); dmg = std::max(10.0f, dmg); - DecHP(dmg, VP_SafeArea, TEXT("battle_server_killer_gas", "毒圈"), VW_SafeArea); + DecHP(dmg, VP_Gas, TEXT("battle_server_killer_gas", "毒圈"), VW_Gas); if (dead) { poisoning_time = 0; break; diff --git a/server/gameserver/incubator.cc b/server/gameserver/incubator.cc index a969987..0f9467a 100644 --- a/server/gameserver/incubator.cc +++ b/server/gameserver/incubator.cc @@ -169,9 +169,9 @@ void Incubator::AutoAllocAndroid() killer->name, killer->GetCurrWeapon()->weapon_id); } else if (room->GetGasData().gas_count > 1) { - hum->BeKill(VP_SafeArea, + hum->BeKill(VP_Gas, TEXT("battle_server_killer_gas", "毒圈"), - VW_SafeArea); + VW_Gas); } else { return; } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 386c06e..51b4a1b 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2583,9 +2583,9 @@ void Room::ProcDieAndroid(int die_time, int die_num) { if (alive_humans.size() == 1) { Human* hum = alive_humans[0]; - hum->BeKill(VP_SafeArea, + hum->BeKill(VP_Gas, TEXT("battle_server_killer_gas", "毒圈"), - VW_SafeArea); + VW_Gas); a8::UnSetBitFlag(hum->status, CS_Disable); return; } @@ -2611,9 +2611,9 @@ void Room::ProcDieAndroid(int die_time, int die_num) killer->GetCurrWeapon()->weapon_id); a8::UnSetBitFlag(hum->status, CS_Disable); } else { - hum->BeKill(VP_SafeArea, + hum->BeKill(VP_Gas, TEXT("battle_server_killer_gas", "毒圈"), - VW_SafeArea); + VW_Gas); if (!alive_humans.empty()) { alive_humans.erase(alive_humans.begin() + i); alive_humans_copy.erase(alive_humans_copy.begin() + i); @@ -2677,9 +2677,9 @@ void Room::CheckAutoDie(Human* target, killer->GetCurrWeapon()->weapon_id); } else { a8::UnSetBitFlag(target->status, CS_Disable); - target->BeKill(VP_SafeArea, + target->BeKill(VP_Gas, TEXT("battle_server_killer_gas", "毒圈"), - VW_SafeArea); + VW_Gas); } } }