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-08-31 19:35:42 +08:00
parent 786afc5f23
commit dfb4042a86
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/constant.h
View File

@ -209,12 +209,12 @@ enum BuffSelectTarget_e
enum VirtualWeapon_e enum VirtualWeapon_e
{ {
VW_SafeArea = 9000000, VW_Gas = 9000000,
}; };
enum VirtualPlayer_e enum VirtualPlayer_e
{ {
VP_SafeArea = 9000000, VP_Gas = 9000000,
}; };
enum EquipType_e enum EquipType_e

2
server/gameserver/creature.cc
View File

@ -1541,7 +1541,7 @@ void Creature::UpdatePoisoning()
} }
dmg *= 1 + GetAbility()->GetAttrRate(kHAT_PoisoningReduction); dmg *= 1 + GetAbility()->GetAttrRate(kHAT_PoisoningReduction);
dmg = std::max(10.0f, dmg); 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) { if (dead) {
poisoning_time = 0; poisoning_time = 0;
break; break;

4
server/gameserver/incubator.cc
View File

@ -169,9 +169,9 @@ void Incubator::AutoAllocAndroid()
killer->name, killer->name,
killer->GetCurrWeapon()->weapon_id); killer->GetCurrWeapon()->weapon_id);
} else if (room->GetGasData().gas_count > 1) { } else if (room->GetGasData().gas_count > 1) {
hum->BeKill(VP_SafeArea, hum->BeKill(VP_Gas,
TEXT("battle_server_killer_gas", "毒圈"), TEXT("battle_server_killer_gas", "毒圈"),
VW_SafeArea); VW_Gas);
} else { } else {
return; return;
} }

12
server/gameserver/room.cc
View File

@ -2583,9 +2583,9 @@ void Room::ProcDieAndroid(int die_time, int die_num)
{ {
if (alive_humans.size() == 1) { if (alive_humans.size() == 1) {
Human* hum = alive_humans[0]; Human* hum = alive_humans[0];
hum->BeKill(VP_SafeArea, hum->BeKill(VP_Gas,
TEXT("battle_server_killer_gas", "毒圈"), TEXT("battle_server_killer_gas", "毒圈"),
VW_SafeArea); VW_Gas);
a8::UnSetBitFlag(hum->status, CS_Disable); a8::UnSetBitFlag(hum->status, CS_Disable);
return; return;
} }
@ -2611,9 +2611,9 @@ void Room::ProcDieAndroid(int die_time, int die_num)
killer->GetCurrWeapon()->weapon_id); killer->GetCurrWeapon()->weapon_id);
a8::UnSetBitFlag(hum->status, CS_Disable); a8::UnSetBitFlag(hum->status, CS_Disable);
} else { } else {
hum->BeKill(VP_SafeArea, hum->BeKill(VP_Gas,
TEXT("battle_server_killer_gas", "毒圈"), TEXT("battle_server_killer_gas", "毒圈"),
VW_SafeArea); VW_Gas);
if (!alive_humans.empty()) { if (!alive_humans.empty()) {
alive_humans.erase(alive_humans.begin() + i); alive_humans.erase(alive_humans.begin() + i);
alive_humans_copy.erase(alive_humans_copy.begin() + i); alive_humans_copy.erase(alive_humans_copy.begin() + i);
@ -2677,9 +2677,9 @@ void Room::CheckAutoDie(Human* target,
killer->GetCurrWeapon()->weapon_id); killer->GetCurrWeapon()->weapon_id);
} else { } else {
a8::UnSetBitFlag(target->status, CS_Disable); a8::UnSetBitFlag(target->status, CS_Disable);
target->BeKill(VP_SafeArea, target->BeKill(VP_Gas,
TEXT("battle_server_killer_gas", "毒圈"), TEXT("battle_server_killer_gas", "毒圈"),
VW_SafeArea); VW_Gas);
} }
} }
} }