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

[Feature] Add RoF2 Guild features (#3699)

Browse Source 
* [Feature] Add additional Guild Features

This adds the following guild features and design pattern
- the existing guild system was used
- guild features are based on RoF2 within source with translaters used to converted between client differences
- backward compatible with Ti and UF, and allows for mixed client servers
- Guild Back for Ti and UF is based on RoF2 Permissions for banking if Guild Leader does not use Ti/UF
- Guild Ranks and Permissions are enabled.
- Guild Tributes are enabled.
- Event logging via rules for donating tribute items and plat
- Rules to limit Guild Tributes based on max level of server
- Rewrote guild communications to client using specific opcodes
-- Server no longer sends a guild member list on each zone
-- Guild window is updated when a member levels, rank changes, zone changes, banker/alt status using individual opcodes
-- When a member is removed or added to a guild, a single opcode is sent to each guild member
-- This reduces network traffic considerably

Known issues:
- Visual bug only. Guild Tributes window will display a 0 for level if tribute is above max level rule setting.
- Visual bug only. Guild Mgmt Window will not display an online member if the player has 'show offline' unchecked and a guild member zones within the Notes/Tribute tab.  This is resolved by selecting and de-selecting the 'Show Offline' checkbox.

* Updated RoF2 Guild Comms

Updated RoF2 Guild Comms
Update RoF2 Opcodes
Rewrote RoF2 Guild Communications using specific opcodes.
Added database changes - they are irreversible

* Formatting

* Update base_guild_members_repository.h

* Format GuildInfo

* Format GuildAction enum

* Formatting in clientlist

* quantity vs quantity

* desc vs description

* Format structs

* Inline struct values

* Formatting

* Formatting

* Formatting fixes

* Formatting items

* Formatting

* Formatting

* struct formatting updates

* Updated formatting

* Updated
- std:string items
- naming conventions
- magic numbers

* Repo refactors
Other formatting updates

* Remove test guild commands

* Updated #guild info command

* Add new repo methods for Neckolla ReplaceOne and ReplaceMany

* Fix guild_tributes repo

* Update database_update_manifest.cpp

* Phase 1 of final testing with RoF2 -> RoF2.
Next phase will be inter compatibility review

* Remove #guild testing commands

* Fix uf translator error
Rewrite LoadGuilds

* Use extended repository

* FIx guild window on member add

* LoadGuild Changes

* Update guild_base.cpp

* Few small fixes for display issue with UF

* Update guild_base.cpp

* Update guild_members_repository.h

* Update zoneserver.cpp

* Update guild.cpp

* Update entity.h

* Switch formatting

* Formatting

* Update worldserver.cpp

* Switch formatting

* Formatting switch statement

* Update guild.cpp

* Formatting in guild_base

* We don't need to validate m_db everywhere

* More formatting / spacing issues

* Switch format

* Update guild_base.cpp

* Fix an UF issue displaying incorrect guildtag as <>

* Updated several constants, fixed a few issues with Ti/UF and guild tributes not being removed or sent when a member is removed/disbands from a guild.

* Formatting and logging updates

* Fix for Loadguilds and permissions after repo updates.

* Cleanup unnecessary m_db checks

* Updated logging to use player_event_logs

* Updated to use the single opcodes for guild traffic for Ti/UF/RoF2.  Several enhancements for guild functionality for more reusable code and readability.

* Update to fix Demote Self and guild invites declining when option set to not accept guild invites

* Potential fix for guild notes/tribute display issues when client has 'Show Offline' unchecked.

* Updates to fox recent master changes

Updates to fix recent master changes

* Updates in response to comments

* Further Updates in response to comments

* Comment updates and refactor for SendAppearance functions

* Comment updates

* Update client spawn process for show guild name

Add show guild tag to default spawn process

* Update to use zone spawn packets for RoF2
Removed several unused functions as a result
Updated MemberRankUpdate to properly update guild_show on rank change.
Updated OP_GuildURLAndChannel opcode for UF/RoF2

* Cleanup of world changes
Created function for repetitive zonelist sendpackets to only booted zones
Re-Inserted accidental delete of scanclosemobs

* Fixes

* Further world cleanup

* Fix a few test guild bank cases for backward compat
Removed a duplicate db call
Fixed a fallthrough issue

* Update guild_mgr.cpp

* Cleanup

---------

Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Mitch Freeman
2024-02-10 05:27:58 -04:00
committed by GitHub
parent dacebca9dd
commit 91f5932c6d
80 changed files with 8152 additions and 2463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/patches/rof.cpp
+28 -23
View File
@@ -1308,13 +1308,13 @@ namespace RoF
PutFieldN(class_);
/* Translate older ranks to new values */
switch (emu_e->rank) {
case 0: { e->rank = htonl(5); break; } // GUILD_MEMBER 0
case 1: { e->rank = htonl(3); break; } // GUILD_OFFICER 1
case 2: { e->rank = htonl(1); break; } // GUILD_LEADER 2
default: { e->rank = htonl(emu_e->rank); break; } // GUILD_NONE
}
//switch (emu_e->rank) {
//case 0: { e->rank = htonl(5); break; } // GUILD_MEMBER 0
//case 1: { e->rank = htonl(3); break; } // GUILD_OFFICER 1
//case 2: { e->rank = htonl(1); break; } // GUILD_LEADER 2
//default: { e->rank = htonl(emu_e->rank); break; } // GUILD_NONE
//}
PutFieldN(rank);
PutFieldN(time_last_on);
PutFieldN(tribute_enable);
e->unknown01 = 0;
@@ -3051,19 +3051,12 @@ namespace RoF
ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
eq->GuildID = emu->Unknown00;
eq->guild_id = emu->Unknown00;
eq->rank = emu->rank;
/* Translate older ranks to new values */
switch (emu->Rank) {
case 0: { eq->Rank = 5; break; } // GUILD_MEMBER 0
case 1: { eq->Rank = 3; break; } // GUILD_OFFICER 1
case 2: { eq->Rank = 1; break; } // GUILD_LEADER 2
default: { eq->Rank = emu->Rank; break; }
}
memcpy(eq->MemberName, emu->MemberName, sizeof(eq->MemberName));
OUT(Banker);
eq->Unknown76 = 1;
memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
OUT(banker);
eq->unknown76 = 1;
FINISH_ENCODE();
}
@@ -3973,10 +3966,22 @@ namespace RoF
/* Translate older ranks to new values */
switch (emu->guildrank) {
case 0: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5); break; } // GUILD_MEMBER 0
case 1: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3); break; } // GUILD_OFFICER 1
case 2: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1); break; } // GUILD_LEADER 2
default: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank); break; } //
case 0: {
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5);
break;
} // GUILD_MEMBER 0
case 1: {
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3);
break;
} // GUILD_OFFICER 1
case 2: {
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1);
break;
} // GUILD_LEADER 2
default: {
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank);
break;
} //
}
}
common/patches/rof2.cpp
+79 -32
View File
@@ -1319,6 +1319,7 @@ namespace RoF2
buffer++;
// Guild ID
//*((uint32*)buffer) = htonl(2);
buffer += sizeof(uint32);
//add member count.
@@ -1357,15 +1358,7 @@ namespace RoF2
PutFieldN(level);
PutFieldN(banker);
PutFieldN(class_);
/* Translate older ranks to new values */
switch (emu_e->rank) {
case 0: { e->rank = htonl(5); break; } // GUILD_MEMBER 0
case 1: { e->rank = htonl(3); break; } // GUILD_OFFICER 1
case 2: { e->rank = htonl(1); break; } // GUILD_LEADER 2
default: { e->rank = htonl(emu_e->rank); break; } // GUILD_NONE
}
PutFieldN(rank);
PutFieldN(time_last_on);
PutFieldN(tribute_enable);
e->unknown01 = 0;
@@ -1395,8 +1388,10 @@ namespace RoF2
OUT(GuildID);
memcpy(eq->MemberName, emu->MemberName, sizeof(eq->MemberName));
OUT(ZoneID);
OUT(InstanceID);
//OUT(ZoneID);
//OUT(InstanceID);
eq->InstanceID = emu->InstanceID;
eq->ZoneID = emu->ZoneID;
OUT(LastSeen);
eq->Unknown76 = 0;
@@ -1422,7 +1417,7 @@ namespace RoF2
if (InBuffer[0])
{
PacketSize += (5 + strlen(InBuffer));
HighestGuildID = i - 1;
HighestGuildID += 1;
}
InBuffer += 64;
}
@@ -1460,6 +1455,30 @@ namespace RoF2
dest->FastQueuePacket(&in, ack_req);
}
ENCODE(OP_GuildTributeDonateItem)
{
SETUP_DIRECT_ENCODE(GuildTributeDonateItemReply_Struct, structs::GuildTributeDonateItemReply_Struct);
Log(Logs::Detail, Logs::Netcode, "RoF2::ENCODE(OP_GuildTributeDonateItem)");
OUT(type);
OUT(sub_index);
OUT(aug_index);
OUT(quantity);
OUT(unknown10);
OUT(unknown20);
OUT(favor);
structs::InventorySlot_Struct iss;
iss = ServerToRoF2Slot(emu->slot);
eq->slot = iss.Slot;
eq->sub_index = iss.SubIndex;
FINISH_ENCODE();
}
ENCODE(OP_HPUpdate)
{
SETUP_DIRECT_ENCODE(SpawnHPUpdate_Struct, structs::SpawnHPUpdate_Struct);
@@ -2466,6 +2485,8 @@ namespace RoF2
{
outapp->WriteUInt32(0xffffffff);
outapp->WriteUInt32(0);
// outapp->WriteUInt32(60);
// outapp->WriteUInt32(1);
}
outapp->WriteUInt32(0); // Unknown
@@ -3104,19 +3125,12 @@ namespace RoF2
ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
eq->GuildID = emu->Unknown00;
eq->guild_id= emu->Unknown00;
eq->rank = emu->rank;
/* Translate older ranks to new values */
switch (emu->Rank) {
case 0: { eq->Rank = 5; break; } // GUILD_MEMBER 0
case 1: { eq->Rank = 3; break; } // GUILD_OFFICER 1
case 2: { eq->Rank = 1; break; } // GUILD_LEADER 2
default: { eq->Rank = emu->Rank; break; }
}
memcpy(eq->MemberName, emu->MemberName, sizeof(eq->MemberName));
OUT(Banker);
eq->Unknown76 = 1;
memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
OUT(banker);
eq->unknown76 = 1;
FINISH_ENCODE();
}
@@ -4178,12 +4192,13 @@ namespace RoF2
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildID);
/* Translate older ranks to new values */
switch (emu->guildrank) {
case 0: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5); break; } // GUILD_MEMBER 0
case 1: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3); break; } // GUILD_OFFICER 1
case 2: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1); break; } // GUILD_LEADER 2
default: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank); break; } //
}
//switch (emu->guildrank) {
//case 0: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5); break; } // GUILD_MEMBER 0
//case 1: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3); break; } // GUILD_OFFICER 1
//case 2: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1); break; } // GUILD_LEADER 2
//default: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank); break; } //
//}
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank);
}
VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->class_);
@@ -4199,7 +4214,7 @@ namespace RoF2
VARSTRUCT_ENCODE_STRING(Buffer, emu->lastName);
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); // aatitle
VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->NPC ? 0 : 1); // unknown - Must be 1 for guild name to be shown abover players head.
VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->guild_show);
VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); // TempPet
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->petOwnerId);
@@ -4955,7 +4970,7 @@ namespace RoF2
strn0cpy(emu->target, eq->target, sizeof(emu->target));
strn0cpy(emu->name, eq->name, sizeof(emu->name));
// IN(rank);
IN(rank);
FINISH_DIRECT_DECODE();
}
@@ -4983,6 +4998,38 @@ namespace RoF2
FINISH_DIRECT_DECODE();
}
DECODE(OP_GuildTributeDonateItem)
{
DECODE_LENGTH_EXACT(structs::GuildTributeDonateItemRequest_Struct);
SETUP_DIRECT_DECODE(GuildTributeDonateItemRequest_Struct, structs::GuildTributeDonateItemRequest_Struct);
Log(Logs::Detail, Logs::Netcode, "RoF2::DECODE(OP_GuildTributeDonateItem)");
IN(type);
IN(slot);
IN(sub_index);
IN(aug_index);
IN(unknown10);
IN(quantity);
IN(tribute_master_id);
IN(unknown20);
IN(guild_id);
IN(unknown28);
IN(unknown32);
structs::InventorySlot_Struct iss;
iss.Slot = eq->slot;
iss.SubIndex = eq->sub_index;
iss.AugIndex = eq->aug_index;
iss.Type = eq->type;
iss.Unknown01 = 0;
iss.Unknown02 = 0;
emu->slot = RoF2ToServerSlot(iss);
FINISH_DIRECT_DECODE();
}
/*DECODE(OP_InspectAnswer)
{
DECODE_LENGTH_EXACT(structs::InspectResponse_Struct);
common/patches/rof2_ops.h
+2
View File
@@ -82,6 +82,7 @@ E(OP_GuildBank)
E(OP_GuildMemberList)
E(OP_GuildMemberUpdate)
E(OP_GuildsList)
E(OP_GuildTributeDonateItem)
E(OP_HPUpdate)
E(OP_Illusion)
E(OP_InspectBuffs)
@@ -182,6 +183,7 @@ D(OP_GuildBank)
D(OP_GuildDemote)
D(OP_GuildRemove)
D(OP_GuildStatus)
D(OP_GuildTributeDonateItem)
D(OP_InspectRequest)
D(OP_ItemLinkClick)
D(OP_ItemVerifyRequest)
common/patches/rof2_structs.h
+33 -8
View File
@@ -2011,6 +2011,31 @@ struct GuildBankClear_Struct
/*16*/ uint32 MainAreaCount;
};
struct GuildTributeDonateItemRequest_Struct {
/*000*/ uint32 type;
/*004*/ uint16 slot;
/*006*/ uint16 sub_index;
/*008*/ uint16 aug_index;
/*010*/ uint16 unknown10;
/*012*/ uint32 quantity;
/*016*/ uint32 tribute_master_id;
/*020*/ uint32 unknown20;
/*024*/ uint32 guild_id;
/*028*/ uint32 unknown28;
/*032*/ uint32 unknown32;
};
struct GuildTributeDonateItemReply_Struct {
/*000*/ uint32 type;
/*004*/ uint16 slot;
/*006*/ uint16 sub_index;
/*008*/ uint16 aug_index;
/*010*/ uint16 unknown10;
/*012*/ uint32 quantity;
/*016*/ uint32 unknown20;
/*020*/ uint32 favor;
};
/*
** Money Loot
** Length: 22 Bytes
@@ -3600,11 +3625,11 @@ struct GuildMakeLeader {
// Update a guild members rank and banker status
struct GuildSetRank_Struct
{
/*00*/ uint32 GuildID; // Was Unknown00
/*04*/ uint32 Rank;
/*08*/ char MemberName[64];
/*72*/ uint32 Banker;
/*76*/ uint32 Unknown76; // Seen 1 - Maybe Banker?
/*00*/ uint32 guild_id; // Was Unknown00
/*04*/ uint32 rank;
/*08*/ char member_name[64];
/*72*/ uint32 banker;
/*76*/ uint32 unknown76; // Seen 1 - Maybe Banker?
/*80*/
};
@@ -3722,15 +3747,15 @@ struct TributeItem_Struct
struct TributePoint_Struct {
int32 tribute_points;
uint32 unknown04;
uint32 unknown04;
int32 career_tribute_points;
uint32 unknown12;
uint32 unknown12;
};
struct TributeMoney_Struct {
uint32 platinum;
uint32 tribute_master_id;
int32 tribute_points;
int32 tribute_points;
};
common/patches/rof_structs.h
+5 -5
View File
@@ -3537,11 +3537,11 @@ struct GuildMakeLeader {
// Update a guild members rank and banker status
struct GuildSetRank_Struct
{
/*00*/ uint32 GuildID; // Was Unknown00
/*04*/ uint32 Rank;
/*08*/ char MemberName[64];
/*72*/ uint32 Banker;
/*76*/ uint32 Unknown76; // Seen 1 - Maybe Banker?
/*00*/ uint32 guild_id; // Was Unknown00
/*04*/ uint32 rank;
/*08*/ char member_name[64];
/*72*/ uint32 banker;
/*76*/ uint32 unknown76; // Seen 1 - Maybe Banker?
/*80*/
};
common/patches/titanium.cpp
+401 -13
View File
@@ -34,6 +34,7 @@
#include "titanium_structs.h"
#include "../path_manager.h"
#include "../raid.h"
#include "../guilds.h"
#include <sstream>
@@ -664,6 +665,151 @@ namespace Titanium
dest->FastQueuePacket(&in, ack_req);
}
ENCODE(OP_SetGuildRank)
{
ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
eq->unknown00 = 0;
eq->unknown04 = 0;
//Translate older ranks to new values* /
switch (emu->rank) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
eq->rank = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
eq->rank = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
eq->rank = GUILD_LEADER_TI;
break;
}
}
memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
OUT(banker);
FINISH_ENCODE();
}
ENCODE(OP_SpawnAppearance)
{
ENCODE_LENGTH_EXACT(SpawnAppearance_Struct);
SETUP_DIRECT_ENCODE(SpawnAppearance_Struct, structs::SpawnAppearance_Struct);
OUT(spawn_id);
OUT(type);
OUT(parameter);
switch (emu->type) {
case AppearanceType::GuildRank: {
//Translate new ranks to old values* /
switch (emu->parameter) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
eq->parameter = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
eq->parameter = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
eq->parameter = GUILD_LEADER_TI;
break;
}
}
break;
}
case AppearanceType::GuildShow: {
FAIL_ENCODE();
return;
}
default: {
break;
}
}
FINISH_ENCODE();
}
ENCODE(OP_GuildMemberAdd)
{
ENCODE_LENGTH_EXACT(GuildMemberAdd_Struct)
SETUP_DIRECT_ENCODE(GuildMemberAdd_Struct, structs::GuildMemberAdd_Struct)
OUT(guild_id)
OUT(level)
OUT(class_)
switch (emu->rank_) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
eq->rank_ = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
eq->rank_ = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
eq->rank_ = GUILD_LEADER_TI;
break;
}
}
OUT(zone_id)
OUT(last_on)
OUT_str(player_name)
FINISH_ENCODE()
}
ENCODE(OP_GuildMemberRankAltBanker)
{
ENCODE_LENGTH_EXACT(GuildMemberRank_Struct)
SETUP_DIRECT_ENCODE(GuildMemberRank_Struct, structs::GuildMemberRank_Struct)
OUT(guild_id)
OUT(alt_banker)
OUT_str(player_name)
switch (emu->rank_) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
eq->rank_ = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
eq->rank_ = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
eq->rank_ = GUILD_LEADER_TI;
break;
}
}
FINISH_ENCODE()
}
ENCODE(OP_GuildMemberList)
{
//consume the packet
@@ -727,12 +873,34 @@ namespace Titanium
str += sl + 1; \
}
#define PutFieldN(field) e->field = htonl(emu_e->field)
/* Translate new ranks to older values */
SlideStructString(name, emu_name);
PutFieldN(level);
PutFieldN(banker);
PutFieldN(class_);
PutFieldN(rank);
switch (emu_e->rank) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
e->rank = htonl(GUILD_MEMBER_TI);
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
e->rank = htonl(GUILD_OFFICER_TI);
break;
}
case GUILD_LEADER: {
e->rank = htonl(GUILD_LEADER_TI);
break;
}
default: {
e->rank = htonl(GUILD_MEMBER_TI);
break;
}
}
PutFieldN(time_last_on);
PutFieldN(tribute_enable);
PutFieldN(total_tribute);
@@ -753,6 +921,38 @@ namespace Titanium
dest->FastQueuePacket(&in, ack_req);
}
ENCODE(OP_SendGuildTributes)
{
ENCODE_LENGTH_ATLEAST(structs::GuildTributeAbility_Struct);
SETUP_VAR_ENCODE(GuildTributeAbility_Struct);
ALLOC_VAR_ENCODE(structs::GuildTributeAbility_Struct, sizeof(GuildTributeAbility_Struct) + strlen(emu->ability.name));
eq->guild_id = emu->guild_id;;
strncpy(eq->ability.name, emu->ability.name, strlen(emu->ability.name));
eq->ability.tribute_id = emu->ability.tribute_id;
eq->ability.tier_count = emu->ability.tier_count;
for (int i = 0; i < ntohl(emu->ability.tier_count); i++) {
eq->ability.tiers[i].cost = emu->ability.tiers[i].cost;
eq->ability.tiers[i].level = emu->ability.tiers[i].level;
eq->ability.tiers[i].tribute_item_id = emu->ability.tiers[i].tribute_item_id;
}
FINISH_ENCODE();
}
ENCODE(OP_GuildTributeDonateItem)
{
SETUP_DIRECT_ENCODE(GuildTributeDonateItemReply_Struct, structs::GuildTributeDonateItemReply_Struct);
Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_GuildTributeDonateItem)");
OUT(quantity);
OUT(favor);
eq->unknown8 = 0;
eq->slot = ServerToTitaniumSlot(emu->slot);
FINISH_ENCODE();
}
ENCODE(OP_Illusion)
{
ENCODE_LENGTH_EXACT(Illusion_Struct);
@@ -867,11 +1067,60 @@ namespace Titanium
ENCODE(OP_LFGuild)
{
struct bit_mask_conversion {
uint32 titanium_mask;
uint32 rof2_mask;
};
std::vector<bit_mask_conversion> bit_mask = {
{.titanium_mask = 2, .rof2_mask = 256},
{.titanium_mask = 4, .rof2_mask = 32768},
{.titanium_mask = 8, .rof2_mask = 65536},
{.titanium_mask = 16, .rof2_mask = 4},
{.titanium_mask = 32, .rof2_mask = 64},
{.titanium_mask = 64, .rof2_mask = 16384},
{.titanium_mask = 128, .rof2_mask = 8192},
{.titanium_mask = 256, .rof2_mask = 128},
{.titanium_mask = 512, .rof2_mask = 2048},
{.titanium_mask = 1024, .rof2_mask = 8},
{.titanium_mask = 2048, .rof2_mask = 16},
{.titanium_mask = 4096, .rof2_mask = 512},
{.titanium_mask = 8192, .rof2_mask = 32},
{.titanium_mask = 16384, .rof2_mask = 1024},
{.titanium_mask = 32768, .rof2_mask = 2},
{.titanium_mask = 65536, .rof2_mask = 4096},
};
EQApplicationPacket *in = *p;
*p = nullptr;
uint32 Command = in->ReadUInt32();
if (Command == 1) {
ENCODE_LENGTH_EXACT(LFGuild_GuildToggle_Struct);
SETUP_DIRECT_ENCODE(LFGuild_GuildToggle_Struct, structs::LFGuild_GuildToggle_Struct);
OUT(Command);
OUT_str(Comment);
OUT(FromLevel);
OUT(ToLevel);
OUT(AACount);
OUT(TimeZone);
OUT(Toggle);
OUT(TimePosted);
OUT_str(Name);
uint32 emu_bitmask = emu->Classes;
uint32 ti_bitmask = 0;
for (auto const& b : bit_mask) {
(emu_bitmask & b.rof2_mask) != 0 ? ti_bitmask |= b.titanium_mask : ti_bitmask &= ~b.titanium_mask;
}
eq->Classes = ti_bitmask;
FINISH_ENCODE();
return;
}
*p = nullptr;
if (Command != 0)
{
dest->FastQueuePacket(&in, ack_req);
@@ -1149,7 +1398,28 @@ namespace Titanium
OUT(pvp);
OUT(anon);
OUT(gm);
OUT(guildrank);
switch (emu->guildrank) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
eq->guildrank = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
eq->guildrank = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
eq->guildrank = GUILD_LEADER_TI;
break;
}
default: {
break;
}
}
OUT(guildbanker);
// OUT(unknown13054[8]);
OUT(exp);
@@ -1250,7 +1520,7 @@ namespace Titanium
{
ENCODE_LENGTH_EXACT(MarkNPC_Struct);
SETUP_DIRECT_ENCODE(MarkNPC_Struct, MarkNPC_Struct);
EQApplicationPacket* outapp = new EQApplicationPacket(OP_MarkNPC, sizeof(MarkNPC_Struct));
MarkNPC_Struct* mnpcs = (MarkNPC_Struct*)outapp->pBuffer;
mnpcs->TargetID = emu->TargetID;
@@ -1267,10 +1537,10 @@ namespace Titanium
*p = nullptr;
unsigned char* __emu_buffer = inapp->pBuffer;
RaidGeneral_Struct* raid_gen = (RaidGeneral_Struct*)__emu_buffer;
switch (raid_gen->action)
{
case raidAdd:
case raidAdd:
{
RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;
@@ -1340,7 +1610,7 @@ namespace Titanium
dest->QueuePacket(inapp);
break;
}
default:
default:
{
RaidGeneral_Struct* emu = (RaidGeneral_Struct*)__emu_buffer;
@@ -1864,7 +2134,28 @@ namespace Titanium
eq->beard = emu->beard;
strcpy(eq->suffix, emu->suffix);
eq->petOwnerId = emu->petOwnerId;
eq->guildrank = emu->guildrank;
switch (emu->guildrank) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
eq->guildrank = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
eq->guildrank = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
eq->guildrank = GUILD_LEADER_TI;
break;
}
default: {
break;
}
}
// eq->unknown0194[3] = emu->unknown0194[3];
for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) {
eq->equipment.Slot[k].Material = emu->equipment.Slot[k].Material;
@@ -2205,6 +2496,34 @@ namespace Titanium
FINISH_DIRECT_DECODE();
}
DECODE(OP_GuildDemote)
{
DECODE_LENGTH_EXACT(structs::GuildDemoteStruct);
SETUP_DIRECT_DECODE(GuildDemoteStruct, structs::GuildDemoteStruct);
memcpy(emu->name, eq->name, sizeof(emu->name));
memcpy(emu->target, eq->target, sizeof(emu->target));
emu->rank = GUILD_MEMBER;
FINISH_DIRECT_DECODE();
}
DECODE(OP_GuildTributeDonateItem)
{
DECODE_LENGTH_EXACT(structs::GuildTributeDonateItemRequest_Struct);
SETUP_DIRECT_DECODE(GuildTributeDonateItemRequest_Struct, structs::GuildTributeDonateItemRequest_Struct);
Log(Logs::Detail, Logs::Netcode, "UF::DECODE(OP_GuildTributeDonateItem)");
IN(quantity);
IN(tribute_master_id);
IN(guild_id);
emu->slot = TitaniumToServerSlot(eq->slot);
FINISH_DIRECT_DECODE();
}
DECODE(OP_InspectAnswer)
{
DECODE_LENGTH_EXACT(structs::InspectResponse_Struct);
@@ -2260,8 +2579,77 @@ namespace Titanium
DECODE(OP_LFGuild)
{
struct bit_mask_conversion {
uint32 titanium_mask;
uint32 rof2_mask;
};
std::vector<bit_mask_conversion> bit_mask = {
{.titanium_mask = 2, .rof2_mask = 256},
{.titanium_mask = 4, .rof2_mask = 32768},
{.titanium_mask = 8, .rof2_mask = 65536},
{.titanium_mask = 16, .rof2_mask = 4},
{.titanium_mask = 32, .rof2_mask = 64},
{.titanium_mask = 64, .rof2_mask = 16384},
{.titanium_mask = 128, .rof2_mask = 8192},
{.titanium_mask = 256, .rof2_mask = 128},
{.titanium_mask = 512, .rof2_mask = 2048},
{.titanium_mask = 1024, .rof2_mask = 8},
{.titanium_mask = 2048, .rof2_mask = 16},
{.titanium_mask = 4096, .rof2_mask = 512},
{.titanium_mask = 8192, .rof2_mask = 32},
{.titanium_mask = 16384, .rof2_mask = 1024},
{.titanium_mask = 32768, .rof2_mask = 2},
{.titanium_mask = 65536, .rof2_mask = 4096},
};
uint32 Command = __packet->ReadUInt32();
if (Command == 3) {
DECODE_LENGTH_EXACT(structs::LFGuild_SearchPlayer_Struct);
SETUP_DIRECT_DECODE(LFGuild_SearchPlayer_Struct, structs::LFGuild_SearchPlayer_Struct);
IN(Command);
IN(Unknown04);
IN(FromLevel);
IN(ToLevel);
IN(MinAA);
IN(TimeZone);
uint32 new_bitmask = 0;
uint32 ti_bitmask = eq->Classes;
for (auto const& b : bit_mask) {
(ti_bitmask & b.titanium_mask) != 0 ? new_bitmask |= b.rof2_mask : new_bitmask &= ~b.rof2_mask;
}
emu->Classes = new_bitmask;
FINISH_DIRECT_DECODE();
return;
}
if (Command == 1) {
DECODE_LENGTH_EXACT(structs::LFGuild_GuildToggle_Struct);
SETUP_DIRECT_DECODE(LFGuild_GuildToggle_Struct, structs::LFGuild_GuildToggle_Struct);
IN(Command);
IN_str(Comment);
IN(FromLevel);
IN(ToLevel);
IN(AACount);
IN(TimeZone);
IN(Toggle);
IN(TimePosted);
IN_str(Name);
uint32 new_bitmask = 0;
uint32 ti_bitmask = eq->Classes;
for (auto const& b : bit_mask) {
(ti_bitmask & b.titanium_mask) != 0 ? new_bitmask |= b.rof2_mask : new_bitmask &= ~b.rof2_mask;
}
emu->Classes = new_bitmask;
FINISH_DIRECT_DECODE();
return;
}
if (Command != 0)
return;
@@ -2401,7 +2789,7 @@ namespace Titanium
IN(general.parameter);
IN_str(general.leader_name);
IN_str(general.player_name);
auto len = 0;
if (__packet->size < sizeof(structs::RaidMOTD_Struct)) {
len = __packet->size - sizeof(structs::RaidGeneral_Struct);
@@ -2409,8 +2797,8 @@ namespace Titanium
else {
len = sizeof(eq->motd);
}
strn0cpy(emu->motd, eq->motd, len > 1024 ? 1024 : len);
strn0cpy(emu->motd, eq->motd, len > 1024 ? 1024 : len);
emu->motd[len - 1] = '\0';
FINISH_VAR_DECODE();
@@ -2428,7 +2816,7 @@ namespace Titanium
FINISH_VAR_DECODE();
break;
}
}
default:
{
SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
common/patches/titanium_ops.h
+8
View File
@@ -44,8 +44,13 @@ E(OP_DzSetLeaderName)
E(OP_Emote)
E(OP_FormattedMessage)
E(OP_GroundSpawn)
E(OP_SetGuildRank)
E(OP_GuildMemberLevelUpdate)
E(OP_GuildMemberList)
E(OP_GuildMemberAdd)
E(OP_GuildMemberRankAltBanker)
E(OP_SendGuildTributes)
E(OP_GuildTributeDonateItem)
E(OP_Illusion)
E(OP_InspectAnswer)
E(OP_InspectRequest)
@@ -69,6 +74,7 @@ E(OP_SendCharInfo)
E(OP_SendAATable)
E(OP_SetFace)
E(OP_ShopPlayerSell)
E(OP_SpawnAppearance)
E(OP_SpecialMesg)
E(OP_TaskDescription)
E(OP_Track)
@@ -100,9 +106,11 @@ D(OP_DzRemovePlayer)
D(OP_DzSwapPlayer)
D(OP_Emote)
D(OP_FaceChange)
D(OP_GuildDemote)
D(OP_InspectAnswer)
D(OP_InspectRequest)
D(OP_ItemLinkClick)
D(OP_GuildTributeDonateItem)
D(OP_LFGuild)
D(OP_LoadSpellSet)
D(OP_LootItem)
common/patches/titanium_structs.h
+46 -1
View File
@@ -1423,6 +1423,23 @@ struct GuildUpdate_Struct {
GuildsListEntry_Struct entry;
};
struct GuildTributeDonateItemRequest_Struct {
/*000*/ uint32 slot;
/*004*/ uint32 quantity;
/*008*/ uint32 tribute_master_id;
/*012*/ uint32 unknown12;
/*016*/ uint32 guild_id;
/*020*/ uint32 unknown20;
/*024*/ uint32 unknown24;
};
struct GuildTributeDonateItemReply_Struct {
/*000*/ uint32 slot;
/*004*/ uint32 quantity;
/*008*/ uint32 unknown8;
/*012*/ uint32 favor;
};
/*
** Money Loot
** Length: 22 Bytes
@@ -3508,7 +3525,7 @@ struct LFGuild_GuildToggle_Struct
/*540*/ uint32 TimeZone;
/*544*/ uint8 Toggle;
/*545*/ uint8 Unknown545[3];
/*548*/ uint32 Expires;
/*548*/ uint32 TimePosted;
/*552*/ char Name[64];
/*616*/
};
@@ -3699,6 +3716,34 @@ struct SayLinkBodyFrame_Struct {
/*045*/
};
struct GuildSetRank_Struct
{
/*00*/ uint32 unknown00;
/*04*/ uint32 unknown04;
/*08*/ uint32 rank;
/*72*/ char member_name[64];
/*76*/ uint32 banker;
};
struct GuildMemberAdd_Struct {
/*000*/ uint32 guild_id;
/*004*/ uint32 unknown04;
/*008*/ uint32 level;
/*012*/ uint32 class_;
/*016*/ uint32 rank_;
/*020*/ uint32 zone_id;
/*024*/ uint32 last_on;
/*028*/ char player_name[64];
};
struct GuildMemberRank_Struct {
/*000*/ uint32 guild_id;
/*004*/ uint32 unknown_004;
/*008*/ uint32 rank_;
/*012*/ char player_name[64];
/*076*/ uint32 alt_banker; //Banker/Alt bit 00 - none 10 - Alt 11 - Alt and Banker 01 - Banker. Banker not functional for RoF2+
};
}; /*structs*/
}; /*Titanium*/
common/patches/uf.cpp
+270 -21
View File
@@ -36,6 +36,7 @@
#include "../classes.h"
#include "../races.h"
#include "../raid.h"
#include "../guilds.h"
#include <iostream>
#include <sstream>
@@ -1134,6 +1135,29 @@ namespace UF
PutFieldN(level);
PutFieldN(banker);
PutFieldN(class_);
//Translate older ranks to new values* /
switch (emu_e->rank) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
emu_e->rank = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
emu_e->rank = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
emu_e->rank = GUILD_LEADER_TI;
break;
}
default: {
break;
}
}
PutFieldN(rank);
PutFieldN(time_last_on);
PutFieldN(tribute_enable);
@@ -1165,14 +1189,14 @@ namespace UF
unsigned char *__emu_buffer = in->pBuffer;
char *InBuffer = (char *)__emu_buffer;
uint32 HighestGuildID = 0;
uint32 actual_no_guilds = 0;
for (unsigned int i = 0; i < NumberOfGuilds; ++i)
{
if (InBuffer[0])
{
PacketSize += (5 + strlen(InBuffer));
HighestGuildID = i - 1;
actual_no_guilds++;
}
InBuffer += 64;
}
@@ -1188,7 +1212,7 @@ namespace UF
memset(OutBuffer, 0, 64);
OutBuffer += 64;
VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, HighestGuildID);
VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, actual_no_guilds);
for (unsigned int i = 0; i < NumberOfGuilds; ++i)
{
@@ -1206,6 +1230,103 @@ namespace UF
dest->FastQueuePacket(&in, ack_req);
}
ENCODE(OP_GuildMemberAdd)
{
ENCODE_LENGTH_EXACT(GuildMemberAdd_Struct)
SETUP_DIRECT_ENCODE(GuildMemberAdd_Struct, structs::GuildMemberAdd_Struct)
OUT(guild_id)
OUT(level)
OUT(class_)
switch (emu->rank_) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
eq->rank_ = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
eq->rank_ = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
eq->rank_ = GUILD_LEADER_TI;
break;
}
}
OUT(zone_id)
OUT(last_on)
OUT_str(player_name)
FINISH_ENCODE()
}
ENCODE(OP_GuildMemberRankAltBanker)
{
ENCODE_LENGTH_EXACT(GuildMemberRank_Struct)
SETUP_DIRECT_ENCODE(GuildMemberRank_Struct, structs::GuildMemberRank_Struct)
OUT(guild_id)
OUT(alt_banker)
OUT_str(player_name)
switch (emu->rank_) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
eq->rank_ = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
eq->rank_ = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
eq->rank_ = GUILD_LEADER_TI;
break;
}
}
FINISH_ENCODE()
}
ENCODE(OP_SendGuildTributes)
{
ENCODE_LENGTH_ATLEAST(structs::GuildTributeAbility_Struct)
SETUP_VAR_ENCODE(GuildTributeAbility_Struct)
ALLOC_VAR_ENCODE(structs::GuildTributeAbility_Struct, sizeof(GuildTributeAbility_Struct) + strlen(emu->ability.name))
eq->guild_id = emu->guild_id;
eq->ability.tribute_id = emu->ability.tribute_id;
eq->ability.tier_count = emu->ability.tier_count;
strncpy(eq->ability.name, emu->ability.name, strlen(emu->ability.name));
for (int i = 0; i < ntohl(emu->ability.tier_count); i++) {
eq->ability.tiers[i].cost = emu->ability.tiers[i].cost;
eq->ability.tiers[i].level = emu->ability.tiers[i].level;
eq->ability.tiers[i].tribute_item_id = emu->ability.tiers[i].tribute_item_id;
}
FINISH_ENCODE()
}
ENCODE(OP_GuildTributeDonateItem)
{
SETUP_DIRECT_ENCODE(GuildTributeDonateItemReply_Struct, structs::GuildTributeDonateItemReply_Struct);
Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_GuildTributeDonateItem)");
OUT(quantity)
OUT(favor)
eq->unknown8 = 0;
eq->slot = ServerToUFSlot(emu->slot);
FINISH_ENCODE()
}
ENCODE(OP_Illusion)
{
ENCODE_LENGTH_EXACT(Illusion_Struct);
@@ -1829,6 +1950,29 @@ namespace UF
OUT(pvp);
OUT(anon);
OUT(gm);
//Translate older ranks to new values* /
switch (emu->guildrank) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
emu->guildrank = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
emu->guildrank = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
emu->guildrank = GUILD_LEADER_TI;
break;
}
default: {
break;
}
}
OUT(guildrank);
OUT(guildbanker);
// OUT(unknown13054[12]);
@@ -2332,29 +2476,83 @@ namespace UF
ENCODE(OP_SpawnAppearance)
{
EQApplicationPacket *in = *p;
*p = nullptr;
ENCODE_LENGTH_EXACT(SpawnAppearance_Struct);
SETUP_DIRECT_ENCODE(SpawnAppearance_Struct, structs::SpawnAppearance_Struct);
unsigned char *emu_buffer = in->pBuffer;
SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;
if (sas->type != AppearanceType::Size)
{
dest->FastQueuePacket(&in, ack_req);
return;
OUT(spawn_id);
OUT(type);
OUT(parameter);
switch (emu->type) {
case AppearanceType::GuildRank: {
//Translate new ranks to old values* /
switch (emu->parameter) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
eq->parameter = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
eq->parameter = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
eq->parameter = GUILD_LEADER_TI;
break;
}
}
break;
}
case AppearanceType::GuildShow: {
FAIL_ENCODE();
return;
}
default: {
break;
}
}
auto outapp = new EQApplicationPacket(OP_ChangeSize, sizeof(ChangeSize_Struct));
ChangeSize_Struct *css = (ChangeSize_Struct *)outapp->pBuffer;
FINISH_ENCODE();
}
css->EntityID = sas->spawn_id;
css->Size = (float)sas->parameter;
css->Unknown08 = 0;
css->Unknown12 = 1.0f;
ENCODE(OP_SetGuildRank)
{
ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
dest->FastQueuePacket(&outapp, ack_req);
delete in;
eq->unknown00 = 0;
eq->unknown04 = 0;
switch (emu->rank) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
emu->rank = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
emu->rank = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
emu->rank = GUILD_LEADER_TI;
break;
}
default: {
break;
}
}
memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
OUT(banker);
FINISH_ENCODE();
}
ENCODE(OP_SpawnDoor)
@@ -2945,6 +3143,29 @@ namespace UF
else
{
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildID);
//Translate older ranks to new values* /
switch (emu->guildrank) {
case GUILD_SENIOR_MEMBER:
case GUILD_MEMBER:
case GUILD_JUNIOR_MEMBER:
case GUILD_INITIATE:
case GUILD_RECRUIT: {
emu->guildrank = GUILD_MEMBER_TI;
break;
}
case GUILD_OFFICER:
case GUILD_SENIOR_OFFICER: {
emu->guildrank = GUILD_OFFICER_TI;
break;
}
case GUILD_LEADER: {
emu->guildrank = GUILD_LEADER_TI;
break;
}
default: {
break;
}
}
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank);
}
VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->class_);
@@ -3577,6 +3798,34 @@ namespace UF
DECODE_FORWARD(OP_GroupInvite);
}
DECODE(OP_GuildDemote)
{
DECODE_LENGTH_EXACT(structs::GuildDemoteStruct);
SETUP_DIRECT_DECODE(GuildDemoteStruct, structs::GuildDemoteStruct);
memcpy(emu->name, eq->name, sizeof(emu->name));
memcpy(emu->target, eq->target, sizeof(emu->target));
emu->rank = GUILD_MEMBER;
FINISH_DIRECT_DECODE();
}
DECODE(OP_GuildTributeDonateItem)
{
DECODE_LENGTH_EXACT(structs::GuildTributeDonateItemRequest_Struct);
SETUP_DIRECT_DECODE(GuildTributeDonateItemRequest_Struct, structs::GuildTributeDonateItemRequest_Struct);
Log(Logs::Detail, Logs::Netcode, "UF::DECODE(OP_GuildTributeDonateItem)");
IN(quantity);
IN(tribute_master_id);
IN(guild_id);
emu->slot = UFToServerSlot(eq->slot);
FINISH_DIRECT_DECODE();
}
DECODE(OP_InspectRequest)
{
DECODE_LENGTH_EXACT(structs::Inspect_Struct);
common/patches/uf_ops.h
+7
View File
@@ -58,6 +58,10 @@ E(OP_GroupInvite)
E(OP_GroupUpdate)
E(OP_GuildMemberList)
E(OP_GuildsList)
E(OP_GuildMemberAdd)
E(OP_SendGuildTributes)
E(OP_GuildMemberRankAltBanker)
E(OP_GuildTributeDonateItem)
E(OP_Illusion)
E(OP_InspectBuffs)
E(OP_InspectRequest)
@@ -82,6 +86,7 @@ E(OP_RespondAA)
E(OP_SendAATable)
E(OP_SendCharInfo)
E(OP_SendZonepoints)
E(OP_SetGuildRank)
E(OP_ShopPlayerBuy)
E(OP_ShopPlayerSell)
E(OP_SomeItemPacketMaybe)
@@ -138,6 +143,8 @@ D(OP_GroupFollow)
D(OP_GroupFollow2)
D(OP_GroupInvite)
D(OP_GroupInvite2)
D(OP_GuildDemote)
D(OP_GuildTributeDonateItem)
D(OP_InspectRequest)
D(OP_ItemLinkClick)
D(OP_ItemVerifyRequest)
common/patches/uf_structs.h
+47
View File
@@ -1670,6 +1670,15 @@ struct Surname_Struct
/*0100*/
};
struct GuildSetRank_Struct
{
/*00*/ uint32 unknown00;
/*04*/ uint32 unknown04;
/*08*/ uint32 rank;
/*72*/ char member_name[64];
/*76*/ uint32 banker;
};
struct GuildsListEntry_Struct {
char name[64];
};
@@ -1685,6 +1694,27 @@ struct GuildUpdate_Struct {
GuildsListEntry_Struct entry;
};
struct GuildMemberAdd_Struct {
/*000*/ uint32 guild_id;
/*004*/ uint32 unknown04;
/*008*/ uint32 unknown08;
/*012*/ uint32 unknown12;
/*016*/ uint32 level;
/*020*/ uint32 class_;
/*024*/ uint32 rank_;
/*028*/ uint32 zone_id;
/*032*/ uint32 last_on;
/*036*/ char player_name[64];
};
struct GuildMemberRank_Struct {
/*000*/ uint32 guild_id;
/*004*/ uint32 unknown_004;
/*008*/ uint32 rank_;
/*012*/ char player_name[64];
/*076*/ uint32 alt_banker; //Banker/Alt bit 00 - none 10 - Alt 11 - Alt and Banker 01 - Banker. Banker not functional for RoF2+
};
/*
** Money Loot
** Length: 22 Bytes
@@ -3067,6 +3097,23 @@ struct GuildMakeLeader{
char target[64];
};
struct GuildTributeDonateItemRequest_Struct {
/*000*/ uint32 slot;
/*004*/ uint32 quantity;
/*008*/ uint32 tribute_master_id;
/*012*/ uint32 unknown12;
/*016*/ uint32 guild_id;
/*020*/ uint32 unknown20;
/*024*/ uint32 unknown24;
};
struct GuildTributeDonateItemReply_Struct {
/*000*/ uint32 slot;
/*004*/ uint32 quantity;
/*008*/ uint32 unknown8;
/*012*/ uint32 favor;
};
struct Make_Pet_Struct { //Simple struct for getting pet info
uint8 level;
uint8 class_;