pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Environmental Damage for RoF2.

Browse Source
This commit is contained in:
Trevius 2015-02-05 22:34:55 -06:00
parent b96e5a7f4d
commit f26d303ee1
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@ -1,5 +1,8 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50) EQEMu Changelog (Started on Sept 24, 2003 15:50)
------------------------------------------------------- -------------------------------------------------------
== 02/05/2015 ==
Trevius: Fixed Environmental Damage for RoF2.
== 02/03/2015 == == 02/03/2015 ==
Trevius: Crashfix for TempName() when numbers are passed at the end of the name. Trevius: Crashfix for TempName() when numbers are passed at the end of the name.
Uleat: Tweaking of item type exclusions to alleviate strobing conditions with light sources Uleat: Tweaking of item type exclusions to alleviate strobing conditions with light sources

5
common/patches/rof2_structs.h
View File

@ -2865,7 +2865,7 @@ struct SetRunMode_Struct {
}; };
// EnvDamage is EnvDamage2 without a few bytes at the end. // EnvDamage is EnvDamage2 without a few bytes at the end.
// Size: 37 bytes // Size: 39 bytes
struct EnvDamage2_Struct { struct EnvDamage2_Struct {
/*0000*/ uint32 id; /*0000*/ uint32 id;
/*0004*/ uint16 unknown4; /*0004*/ uint16 unknown4;
@ -2877,7 +2877,8 @@ struct EnvDamage2_Struct {
/*0031*/ uint16 unknown31; // New to Underfoot - Seen 66 /*0031*/ uint16 unknown31; // New to Underfoot - Seen 66
/*0033*/ uint16 constant; // Always FFFF /*0033*/ uint16 constant; // Always FFFF
/*0035*/ uint16 unknown35; /*0035*/ uint16 unknown35;
/*0037*/ /*0037*/ uint16 unknown37;
/*0039*/
}; };
//Bazaar Stuff //Bazaar Stuff

8
zone/client_packet.cpp
View File

@ -5516,7 +5516,7 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
if (damage < 0) if (damage < 0)
damage = 31337; damage = 31337;
if (admin >= minStatusToAvoidFalling && GetGM()){ if (admin >= minStatusToAvoidFalling && GetGM()) {
Message(13, "Your GM status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype); Message(13, "Your GM status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
SetHP(GetHP() - 1);//needed or else the client wont acknowledge SetHP(GetHP() - 1);//needed or else the client wont acknowledge
return; return;
@ -5526,11 +5526,11 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
SetHP(GetHP() - 1);//needed or else the client wont acknowledge SetHP(GetHP() - 1);//needed or else the client wont acknowledge
return; return;
} }
else if (zone->GetZoneID() == 183 || zone->GetZoneID() == 184) {
else if (zone->GetZoneID() == 183 || zone->GetZoneID() == 184){ // Hard coded tutorial and load zones for no fall damage
return; return;
} }
else{ else {
SetHP(GetHP() - (damage * RuleR(Character, EnvironmentDamageMulipliter))); SetHP(GetHP() - (damage * RuleR(Character, EnvironmentDamageMulipliter)));
/* EVENT_ENVIRONMENTAL_DAMAGE */ /* EVENT_ENVIRONMENTAL_DAMAGE */