pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 11:48:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Quest API] Add GetEnvironmentalDamageName() to Perl/Lua. (#1964)

Browse Source 
- Add EQ::constants::GetEnvironmentalDamageMap() and EQ::constants::GetEnvironmentalDamageName().
- Add quest::getenvironmentaldamagename(damage_type) to Perl.
- Add eq.get_environmental_damage_name(damage_type) to Lua.
- Cleanup GM messages for avoiding environmental damage.
This commit is contained in:
Kinglykrab
2022-02-10 16:09:56 -05:00
committed by GitHub
parent d656be6be4
commit f9eb4603a3
12 changed files with 98 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
+28 -21
View File
@@ -5784,8 +5784,7 @@ void Client::Handle_OP_EndLootRequest(const EQApplicationPacket *app)
void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
{
if (!ClientFinishedLoading())
{
if (!ClientFinishedLoading()) {
SetHP(GetHP() - 1);
return;
}
@@ -5795,38 +5794,46 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
DumpPacket(app);
return;
}
EnvDamage2_Struct* ed = (EnvDamage2_Struct*)app->pBuffer;
int damage = ed->damage;
if (ed->dmgtype == 252) {
int mod = spellbonuses.ReduceFallDamage + itembonuses.ReduceFallDamage + aabonuses.ReduceFallDamage;
auto damage = ed->damage;
if (ed->dmgtype == EQ::constants::EnvironmentalDamage::Falling) {
uint32 mod = spellbonuses.ReduceFallDamage + itembonuses.ReduceFallDamage + aabonuses.ReduceFallDamage;
damage -= damage * mod / 100;
}
if (damage < 0)
if (damage < 0) {
damage = 31337;
}
if (admin >= minStatusToAvoidFalling && GetGM()) {
Message(Chat::Red, "Your GM status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
Message(
Chat::Red,
fmt::format(
"Your GM status protects you from {} points of {} (Type {}) damage.",
ed->damage,
EQ::constants::GetEnvironmentalDamageName(ed->dmgtype),
ed->dmgtype
).c_str()
);
SetHP(GetHP() - 1);//needed or else the client wont acknowledge
return;
}
else if (GetInvul()) {
Message(Chat::Red, "Your invuln status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
} else if (GetInvul()) {
Message(
Chat::Red,
fmt::format(
"Your invulnerability protects you from {} points of {} (Type {}) damage.",
ed->damage,
EQ::constants::GetEnvironmentalDamageName(ed->dmgtype),
ed->dmgtype
).c_str()
);
SetHP(GetHP() - 1);//needed or else the client wont acknowledge
return;
}
else if (zone->GetZoneID() == 183 || zone->GetZoneID() == 184) {
// Hard coded tutorial and load zones for no fall damage
} else if (zone->GetZoneID() == Zones::TUTORIAL || zone->GetZoneID() == Zones::LOAD) { // Hard coded tutorial and load zones for no fall damage
return;
}
else {
} else {
SetHP(GetHP() - (damage * RuleR(Character, EnvironmentDamageMulipliter)));
/* EVENT_ENVIRONMENTAL_DAMAGE */
int final_damage = (damage * RuleR(Character, EnvironmentDamageMulipliter));
std::string export_string = fmt::format(
"{} {} {}",