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

[Player Events] Create new event ITEM_CREATION (#2944)

Browse Source
This commit is contained in:
Chris Miles 2023-02-18 16:05:23 -06:00 committed by GitHub
parent 462656a201
commit db4c515853
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/events/player_event_logs.cpp
View File

@ -699,6 +699,7 @@ void PlayerEventLogs::SetSettingsDefaults()
m_settings[PlayerEvent::KILLED_NPC].event_enabled = 0; m_settings[PlayerEvent::KILLED_NPC].event_enabled = 0;
m_settings[PlayerEvent::KILLED_NAMED_NPC].event_enabled = 1; m_settings[PlayerEvent::KILLED_NAMED_NPC].event_enabled = 1;
m_settings[PlayerEvent::KILLED_RAID_NPC].event_enabled = 1; m_settings[PlayerEvent::KILLED_RAID_NPC].event_enabled = 1;
m_settings[PlayerEvent::ITEM_CREATION].event_enabled = 1;
for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) { for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
m_settings[i].retention_days = RETENTION_DAYS_DEFAULT; m_settings[i].retention_days = RETENTION_DAYS_DEFAULT;

38
common/events/player_events.h
View File

@ -55,6 +55,7 @@ namespace PlayerEvent {
KILLED_NPC, KILLED_NPC,
KILLED_NAMED_NPC, KILLED_NAMED_NPC,
KILLED_RAID_NPC, KILLED_RAID_NPC,
ITEM_CREATION,
MAX // dont remove MAX // dont remove
}; };
@ -110,7 +111,8 @@ namespace PlayerEvent {
"Possible Hack", "Possible Hack",
"Killed NPC", "Killed NPC",
"Killed Named NPC", "Killed Named NPC",
"Killed Raid NPC" "Killed Raid NPC",
"Item Creation"
}; };
// Generic struct used by all events // Generic struct used by all events
@ -184,6 +186,40 @@ namespace PlayerEvent {
} }
}; };
// used in Trade event
struct ItemCreationEvent {
int64 item_id;
std::string item_name;
uint16 to_slot;
int16 charges;
uint32 aug1;
uint32 aug2;
uint32 aug3;
uint32 aug4;
uint32 aug5;
uint32 aug6;
bool attuned;
// cereal
template<class Archive>
void serialize(Archive &ar)
{
ar(
CEREAL_NVP(item_id),
CEREAL_NVP(item_name),
CEREAL_NVP(to_slot),
CEREAL_NVP(charges),
CEREAL_NVP(aug1),
CEREAL_NVP(aug2),
CEREAL_NVP(aug3),
CEREAL_NVP(aug4),
CEREAL_NVP(aug5),
CEREAL_NVP(aug6),
CEREAL_NVP(attuned)
);
}
};
// used in Trade event // used in Trade event
struct TradeItem { struct TradeItem {
int64 item_id; int64 item_id;

21
zone/inventory.cpp
View File

@ -794,6 +794,23 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
} }
} }
if (player_event_logs.IsEventEnabled(PlayerEvent::ITEM_CREATION)) {
auto e = PlayerEvent::ItemCreationEvent{};
e.item_id = item->ID;
e.item_name = item->Name;
e.to_slot = to_slot;
e.charges = charges;
e.aug1 = aug1;
e.aug2 = aug2;
e.aug3 = aug3;
e.aug4 = aug4;
e.aug5 = aug5;
e.aug6 = aug6;
e.attuned = attuned;
RecordPlayerEventLog(PlayerEvent::ITEM_CREATION, e);
}
// put item into inventory // put item into inventory
if (to_slot == EQ::invslot::slotCursor) { if (to_slot == EQ::invslot::slotCursor) {
PushItemOnCursor(*inst); PushItemOnCursor(*inst);
@ -848,13 +865,13 @@ void Client::DropItem(int16 slot_id, bool recurse)
} }
} }
} }
std::string message = fmt::format( std::string message = fmt::format(
"Tried to drop an item on the ground that was no-drop! item_name [{}] item_id ({})", "Tried to drop an item on the ground that was no-drop! item_name [{}] item_id ({})",
invalid_drop->GetItem()->Name, invalid_drop->GetItem()->Name,
invalid_drop->GetItem()->ID invalid_drop->GetItem()->ID
); );
invalid_drop = nullptr; invalid_drop = nullptr;
RecordPlayerEventLog(PlayerEvent::POSSIBLE_HACK, PlayerEvent::PossibleHackEvent{.message = message}); RecordPlayerEventLog(PlayerEvent::POSSIBLE_HACK, PlayerEvent::PossibleHackEvent{.message = message});
GetInv().DeleteItem(slot_id); GetInv().DeleteItem(slot_id);