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

A lot of corpse changes.

Browse Source
This commit is contained in:
Kinglykrab
2014-06-11 07:36:14 -04:00
parent a164ab6fec
commit 6e5e450054
47 changed files with 1140 additions and 1572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/database.cpp
+1 -1
View File
@@ -2700,7 +2700,7 @@ void Database::BuryCorpsesInInstance(uint16 instance_id)
char *query = 0;
MYSQL_RES *result;
if(RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET IsBurried=1, instanceid=0 WHERE instanceid=%u",
if(RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET Isburied=1, instanceid=0 WHERE instanceid=%u",
instance_id), errbuf, &result))
{
mysql_free_result(result);
common/emu_oplist.h
+3 -3
View File
@@ -100,8 +100,8 @@ N(OP_Track),
N(OP_ItemLinkClick),
N(OP_ItemLinkResponse),
N(OP_ItemLinkText),
N(OP_RezzAnswer),
N(OP_RezzComplete),
N(OP_ResurrectionAnswer),
N(OP_ResurrectionComplete),
N(OP_SendZonepoints),
N(OP_SetRunMode),
N(OP_InspectRequest),
@@ -281,7 +281,7 @@ N(OP_LoginComplete),
N(OP_GMNameChange),
N(OP_ReadBook),
N(OP_GMKick),
N(OP_RezzRequest),
N(OP_ResurrectionRequest),
N(OP_MultiLineMsg),
N(OP_TimeOfDay),
N(OP_CompletedTasks),
common/eq_packet_structs.h
+1 -1
View File
@@ -2571,7 +2571,7 @@ struct Resurrect_Struct {
/*020*/ uint32 unknown020;
/*024*/ char your_name[64];
/*088*/ uint32 unknown088;
/*092*/ char rezzer_name[64];
/*092*/ char resurrecter_name[64];
/*156*/ uint32 spellid;
/*160*/ char corpse_name[64];
/*224*/ uint32 action;
common/logtypes.h
+1 -1
View File
@@ -95,7 +95,7 @@ LOG_TYPE( SPELLS, BUFFS, DISABLED )
LOG_TYPE( SPELLS, PROCS, DISABLED )
LOG_TYPE( SPELLS, MODIFIERS, DISABLED )
LOG_TYPE( SPELLS, CRITS, DISABLED )
LOG_TYPE( SPELLS, REZ, DISABLED )
LOG_TYPE( SPELLS, RESURRECTION, DISABLED )
LOG_CATEGORY( FACTION )
common/opcode_dispatch.h
+2 -2
View File
@@ -162,7 +162,7 @@ IN(OP_DeleteItem, DeleteItem_Struct);
IN(OP_CombatAbility, CombatAbility_Struct);
IN(OP_Taunt, ClientTarget_Struct);
INz(OP_InstillDoubt);
IN(OP_RezzAnswer, Resurrect_Struct);
IN(OP_ResurrectionAnswer, Resurrect_Struct);
IN(OP_GMSummon, GMSummon_Struct);
IN(OP_TradeBusy, TradeBusy_Struct);
IN(OP_TradeRequest, TradeRequest_Struct);
@@ -376,7 +376,7 @@ OUT(OP_RandomReply, RandomReply_Struct);
OUT(OP_RecipeReply, RecipeReply_Struct);
OUT(OP_RequestClientZoneChange, RequestClientZoneChange_Struct);
OUT(OP_RespondAA, AATable_Struct);
OUT(OP_RezzRequest, Resurrect_Struct);
OUT(OP_ResurrectionRequest, Resurrect_Struct);
OUT(OP_SetTitleReply, SetTitleReply_Struct);
OUT(OP_ShopDelItem, Merchant_DelItem_Struct);
OUT(OP_SimpleMessage, SimpleMessage_Struct);
common/opcode_map.cpp
+3 -3
View File
@@ -119,9 +119,9 @@ void load_opcode_names()
opcode_map[0x001f]="LiveOP_ItemLinkClick";
opcode_map[0x01f4]="LiveOP_ItemLinkResponse";
opcode_map[0x01d9]="LiveOP_ItemLinkText";
opcode_map[0x0a41]="LiveOP_RezzRequest";
opcode_map[0x00e5]="LiveOP_RezzAnswer";
opcode_map[0x019b]="LiveOP_RezzComplete";
opcode_map[0x0a41]="LiveOP_ResurrectionRequest";
opcode_map[0x00e5]="LiveOP_ResurrectionAnswer";
opcode_map[0x019b]="LiveOP_ResurrectionComplete";
opcode_map[0x0128]="LiveOP_MoveDoor";
opcode_map[0x0127]="LiveOP_ClickDoor";
opcode_map[0x0247]="LiveOP_SendZonepoints";
common/patches/Client62_structs.h
+1 -1
View File
@@ -2043,7 +2043,7 @@ struct Resurrect_Struct {
float z;
char your_name[64];
uint32 unknown88;
char rezzer_name[64];
char resurrecter_name[64];
uint32 spellid;
char corpse_name[64];
uint32 action;
common/patches/RoF.cpp
+4 -4
View File
@@ -4003,7 +4003,7 @@ ENCODE(OP_BeginCast)
FINISH_ENCODE();
}
ENCODE(OP_RezzRequest)
ENCODE(OP_ResurrectionRequest)
{
SETUP_DIRECT_ENCODE(Resurrect_Struct, structs::Resurrect_Struct);
@@ -4013,7 +4013,7 @@ ENCODE(OP_RezzRequest)
OUT(x);
OUT(z);
OUT_str(your_name);
OUT_str(rezzer_name);
OUT_str(resurrecter_name);
OUT(spellid);
OUT_str(corpse_name);
OUT(action);
@@ -4817,7 +4817,7 @@ DECODE(OP_GuildStatus)
FINISH_DIRECT_DECODE();
}
DECODE(OP_RezzAnswer)
DECODE(OP_ResurrectionAnswer)
{
DECODE_LENGTH_EXACT(structs::Resurrect_Struct);
SETUP_DIRECT_DECODE(Resurrect_Struct, structs::Resurrect_Struct);
@@ -4828,7 +4828,7 @@ DECODE(OP_RezzAnswer)
IN(x);
IN(z);
memcpy(emu->your_name, eq->your_name, sizeof(emu->your_name));
memcpy(emu->rezzer_name, eq->rezzer_name, sizeof(emu->rezzer_name));
memcpy(emu->resurrecter_name, eq->resurrecter_name, sizeof(emu->resurrecter_name));
IN(spellid);
memcpy(emu->corpse_name, eq->corpse_name, sizeof(emu->corpse_name));
IN(action);
common/patches/RoF_ops.h
+2 -2
View File
@@ -100,7 +100,7 @@ E(OP_MercenaryDataResponse)
E(OP_GuildMemberUpdate)
E(OP_GMLastName)
E(OP_BeginCast)
E(OP_RezzRequest)
E(OP_ResurrectionRequest)
//list of packets we need to decode on the way in:
D(OP_SetServerFilter)
D(OP_CharacterCreate)
@@ -157,6 +157,6 @@ D(OP_GuildRemove)
D(OP_GuildStatus)
D(OP_Trader)
D(OP_GMLastName)
D(OP_RezzAnswer)
D(OP_ResurrectionAnswer)
#undef E
#undef D
common/patches/RoF_structs.h
+1 -1
View File
@@ -2807,7 +2807,7 @@ struct Resurrect_Struct
/*020*/ uint32 unknown020;
/*024*/ char your_name[64];
/*088*/ uint32 unknown088;
/*092*/ char rezzer_name[64];
/*092*/ char resurrecter_name[64];
/*156*/ uint32 spellid;
/*160*/ char corpse_name[64];
/*224*/ uint32 action;
common/patches/SoD_structs.h
+1 -1
View File
@@ -2461,7 +2461,7 @@ struct Resurrect_Struct {
float z;
char your_name[64];
uint32 unknown88;
char rezzer_name[64];
char resurrecter_name[64];
uint32 spellid;
char corpse_name[64];
uint32 action;
common/patches/SoF_structs.h
+1 -1
View File
@@ -2395,7 +2395,7 @@ struct Resurrect_Struct {
float z;
char your_name[64];
uint32 unknown88;
char rezzer_name[64];
char resurrecter_name[64];
uint32 spellid;
char corpse_name[64];
uint32 action;
common/patches/Titanium_structs.h
+1 -1
View File
@@ -2090,7 +2090,7 @@ struct Resurrect_Struct {
float z;
char your_name[64];
uint32 unknown88;
char rezzer_name[64];
char resurrecter_name[64];
uint32 spellid;
char corpse_name[64];
uint32 action;
common/patches/Underfoot_structs.h
+1 -1
View File
@@ -2500,7 +2500,7 @@ struct Resurrect_Struct {
float z;
char your_name[64];
uint32 unknown88;
char rezzer_name[64];
char resurrecter_name[64];
uint32 spellid;
char corpse_name[64];
uint32 action;
common/ruletypes.h
+1
View File
@@ -313,6 +313,7 @@ RULE_BOOL ( Spells, FocusCombatProcs, false) //Allow all combat procs to receive
RULE_CATEGORY_END()
RULE_CATEGORY( Combat )
RULE_INT ( Combat, AvoidanceCap, 1000 ) // The avoidance cap.
RULE_INT ( Combat, MeleeBaseCritChance, 0 ) //The base crit chance for non warriors, NOTE: This will apply to NPCs as well
RULE_INT ( Combat, WarBerBaseCritChance, 3 ) //The base crit chance for warriors and berserkers, only applies to clients
RULE_INT ( Combat, BerserkBaseCritChance, 6 ) //The bonus base crit chance you get when you're berserk
common/servertalk.h
+6 -6
View File
@@ -45,7 +45,7 @@
#define ServerOP_Petition 0x001E
#define ServerOP_KillPlayer 0x001F
#define ServerOP_UpdateGM 0x0020
#define ServerOP_RezzPlayer 0x0021
#define ServerOP_ResurrectPlayer 0x0021
#define ServerOP_ZoneReboot 0x0022
#define ServerOP_ZoneToZoneRequest 0x0023
#define ServerOP_AcceptWorldEntrance 0x0024
@@ -63,11 +63,11 @@
#define ServerOP_GroupIDReq 0x0030
#define ServerOP_GroupIDReply 0x0031
#define ServerOP_GroupLeave 0x0032 // for disbanding out of zone folks
#define ServerOP_RezzPlayerAccept 0x0033
#define ServerOP_ResurrectPlayerAccept 0x0033
#define ServerOP_SpawnCondition 0x0034
#define ServerOP_SpawnEvent 0x0035
#define ServerOP_SetLaunchName 0x0036
#define ServerOP_RezzPlayerReject 0x0037
#define ServerOP_ResurrectPlayerReject 0x0037
#define ServerOP_SpawnPlayerCorpse 0x0038
#define ServerOP_Consent 0x0039
#define ServerOP_Consent_Response 0x003a
@@ -412,12 +412,12 @@ struct ServerZonePlayer_Struct {
float z_pos;
};
struct RezzPlayer_Struct {
struct ResurrectPlayer_Struct {
uint32 dbid;
uint32 exp;
uint16 rezzopcode;
uint16 resurrectionopcode;
//char packet[160];
Resurrect_Struct rez;
Resurrect_Struct resurrect;
};
struct ServerZoneReboot_Struct {
common/shareddb.cpp
+1 -1
View File
@@ -1355,7 +1355,7 @@ int32 SharedDatabase::DeleteStalePlayerCorpses() {
if(RuleB(Zone, EnableShadowrest))
{
if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET IsBurried = 1 WHERE IsBurried=0 and "
if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET Isburied = 1 WHERE Isburied=0 and "
"(UNIX_TIMESTAMP() - UNIX_TIMESTAMP(timeofdeath)) > %d and not timeofdeath=0",
(RuleI(Character, CorpseDecayTimeMS) / 1000)), errbuf, 0, &affected_rows))
{