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

Lootdrop level filtering adjustments

Browse Source
This commit is contained in:
Akkadius 2020-08-15 16:37:38 -05:00
parent bda13383ef
commit 94d87584aa
16 changed files with 300 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/eq_packet_structs.h
View File

@ -5341,18 +5341,20 @@ struct MercenaryMerchantResponse_Struct {
struct ServerLootItem_Struct { struct ServerLootItem_Struct {
uint32 item_id; // uint32 item_id; uint32 item_id; // uint32 item_id;
int16 equip_slot; // int16 equip_slot; int16 equip_slot; // int16 equip_slot;
uint16 charges; // uint8 charges; uint16 charges; // uint8 charges;
uint16 lootslot; // uint16 lootslot; uint16 lootslot; // uint16 lootslot;
uint32 aug_1; // uint32 aug_1; uint32 aug_1; // uint32 aug_1;
uint32 aug_2; // uint32 aug_2; uint32 aug_2; // uint32 aug_2;
uint32 aug_3; // uint32 aug_3; uint32 aug_3; // uint32 aug_3;
uint32 aug_4; // uint32 aug_4; uint32 aug_4; // uint32 aug_4;
uint32 aug_5; // uint32 aug_5; uint32 aug_5; // uint32 aug_5;
uint32 aug_6; // uint32 aug_5; uint32 aug_6; // uint32 aug_5;
uint8 attuned; uint8 attuned;
uint8 min_level; uint16 trivial_min_level;
uint8 max_level; uint16 trivial_max_level;
uint16 npc_min_level;
uint16 npc_max_level;
}; };
//Found in client near a ref to the string: //Found in client near a ref to the string:

4
common/eqemu_logsys.h
View File

@ -117,6 +117,7 @@ namespace Logs {
HotReload, HotReload,
Merchants, Merchants,
ZonePoints, ZonePoints,
Loot,
MaxCategoryID /* Don't Remove this */ MaxCategoryID /* Don't Remove this */
}; };
@ -192,7 +193,8 @@ namespace Logs {
"Aura", "Aura",
"HotReload", "HotReload",
"Merchants", "Merchants",
"ZonePoints" "ZonePoints",
"Loot"
}; };
} }

10
common/eqemu_logsys_log_aliases.h
View File

@ -591,6 +591,16 @@
OutF(LogSys, Logs::Detail, Logs::ZonePoints, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\ OutF(LogSys, Logs::Detail, Logs::ZonePoints, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
} while (0) } while (0)
#define LogLoot(message, ...) do {\
if (LogSys.log_settings[Logs::Loot].is_category_enabled == 1)\
OutF(LogSys, Logs::General, Logs::Loot, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
} while (0)
#define LogLootDetail(message, ...) do {\
if (LogSys.log_settings[Logs::Loot].is_category_enabled == 1)\
OutF(LogSys, Logs::Detail, Logs::Loot, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
} while (0)
#define Log(debug_level, log_category, message, ...) do {\ #define Log(debug_level, log_category, message, ...) do {\
if (LogSys.log_settings[log_category].is_category_enabled == 1)\ if (LogSys.log_settings[log_category].is_category_enabled == 1)\
LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\ LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\

16
common/loottable.h
View File

@ -39,13 +39,15 @@ struct LootTable_Struct {
}; };
struct LootDropEntries_Struct { struct LootDropEntries_Struct {
uint32 item_id; uint32 item_id;
int8 item_charges; int8 item_charges;
uint8 equip_item; uint8 equip_item;
float chance; float chance;
uint8 minlevel; uint16 trivial_min_level;
uint8 maxlevel; uint16 trivial_max_level;
uint8 multiplier; uint16 npc_min_level;
uint16 npc_max_level;
uint8 multiplier;
}; };
struct LootDrop_Struct { struct LootDrop_Struct {

63
common/shareddb.cpp
View File

@ -2142,7 +2142,7 @@ void SharedDatabase::LoadLootDrops(void *data, uint32 size) {
EQ::FixedMemoryVariableHashSet<LootDrop_Struct> hash(reinterpret_cast<uint8*>(data), size); EQ::FixedMemoryVariableHashSet<LootDrop_Struct> hash(reinterpret_cast<uint8*>(data), size);
uint8 loot_drop[sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * 1260)]; uint8 loot_drop[sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * 1260)];
LootDrop_Struct *ld = reinterpret_cast<LootDrop_Struct*>(loot_drop); LootDrop_Struct *p_loot_drop_struct = reinterpret_cast<LootDrop_Struct*>(loot_drop);
const std::string query = fmt::format( const std::string query = fmt::format(
SQL( SQL(
@ -2152,8 +2152,10 @@ void SharedDatabase::LoadLootDrops(void *data, uint32 size) {
lootdrop_entries.item_charges, lootdrop_entries.item_charges,
lootdrop_entries.equip_item, lootdrop_entries.equip_item,
lootdrop_entries.chance, lootdrop_entries.chance,
lootdrop_entries.minlevel, lootdrop_entries.trivial_min_level,
lootdrop_entries.maxlevel, lootdrop_entries.trivial_max_level,
lootdrop_entries.npc_min_level,
lootdrop_entries.npc_max_level,
lootdrop_entries.multiplier lootdrop_entries.multiplier
FROM FROM
lootdrop lootdrop
@ -2171,37 +2173,44 @@ void SharedDatabase::LoadLootDrops(void *data, uint32 size) {
return; return;
} }
uint32 current_id = 0; uint32 current_id = 0;
uint32 current_entry = 0; uint32 current_entry = 0;
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
uint32 id = static_cast<uint32>(atoul(row[0])); auto id = static_cast<uint32>(atoul(row[0]));
if(id != current_id) { if (id != current_id) {
if(current_id != 0) if (current_id != 0) {
hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) +(sizeof(LootDropEntries_Struct) * ld->NumEntries))); hash.insert(
current_id,
loot_drop,
(sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * p_loot_drop_struct->NumEntries)));
}
memset(loot_drop, 0, sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * 1260)); memset(loot_drop, 0, sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * 1260));
current_entry = 0; current_entry = 0;
current_id = id; current_id = id;
} }
if(current_entry >= 1260) if (current_entry >= 1260) {
continue; continue;
}
ld->Entries[current_entry].item_id = static_cast<uint32>(atoul(row[1])); p_loot_drop_struct->Entries[current_entry].item_id = static_cast<uint32>(atoul(row[1]));
ld->Entries[current_entry].item_charges = static_cast<int8>(atoi(row[2])); p_loot_drop_struct->Entries[current_entry].item_charges = static_cast<int8>(atoi(row[2]));
ld->Entries[current_entry].equip_item = static_cast<uint8>(atoi(row[3])); p_loot_drop_struct->Entries[current_entry].equip_item = static_cast<uint8>(atoi(row[3]));
ld->Entries[current_entry].chance = static_cast<float>(atof(row[4])); p_loot_drop_struct->Entries[current_entry].chance = static_cast<float>(atof(row[4]));
ld->Entries[current_entry].minlevel = static_cast<uint8>(atoi(row[5])); p_loot_drop_struct->Entries[current_entry].trivial_min_level = static_cast<uint16>(atoi(row[5]));
ld->Entries[current_entry].maxlevel = static_cast<uint8>(atoi(row[6])); p_loot_drop_struct->Entries[current_entry].trivial_max_level = static_cast<uint16>(atoi(row[6]));
ld->Entries[current_entry].multiplier = static_cast<uint8>(atoi(row[7])); p_loot_drop_struct->Entries[current_entry].npc_min_level = static_cast<uint16>(atoi(row[7]));
p_loot_drop_struct->Entries[current_entry].npc_max_level = static_cast<uint16>(atoi(row[8]));
p_loot_drop_struct->Entries[current_entry].multiplier = static_cast<uint8>(atoi(row[9]));
++(ld->NumEntries); ++(p_loot_drop_struct->NumEntries);
++current_entry; ++current_entry;
} }
if(current_id != 0) if(current_id != 0)
hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * ld->NumEntries))); hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * p_loot_drop_struct->NumEntries)));
} }

2
common/version.h
View File

@ -34,7 +34,7 @@
* Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/ */
#define CURRENT_BINARY_DATABASE_VERSION 9154 #define CURRENT_BINARY_DATABASE_VERSION 9155
#ifdef BOTS #ifdef BOTS
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9027 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9027

1
utils/sql/db_update_manifest.txt
View File

@ -408,6 +408,7 @@
9152|2020_03_09_convert_myisam_to_innodb.sql|SELECT * FROM db_version WHERE version >= 9152|empty| 9152|2020_03_09_convert_myisam_to_innodb.sql|SELECT * FROM db_version WHERE version >= 9152|empty|
9153|2020_05_09_items_subtype.sql|SHOW COLUMNS from `items` LIKE 'UNK219'|not_empty| 9153|2020_05_09_items_subtype.sql|SHOW COLUMNS from `items` LIKE 'UNK219'|not_empty|
9154|2020_04_11_expansions_content_filters.sql|SHOW COLUMNS from `zone` LIKE 'min_expansion'|empty| 9154|2020_04_11_expansions_content_filters.sql|SHOW COLUMNS from `zone` LIKE 'min_expansion'|empty|
9155|2020_08_15_lootdrop_level_filtering.sql|SHOW COLUMNS from `lootdrop_entries` LIKE 'trivial_min_level'|empty|
# Upgrade conditions: # Upgrade conditions:
# This won't be needed after this system is implemented, but it is used database that are not # This won't be needed after this system is implemented, but it is used database that are not

7
utils/sql/git/required/2020_08_15_lootdrop_level_filtering.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE `lootdrop_entries` CHANGE `minlevel` `trivial_min_level` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT '';
ALTER TABLE `lootdrop_entries` CHANGE `maxlevel` `trivial_max_level` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT '';
ALTER TABLE `lootdrop_entries` ADD COLUMN `npc_min_level` smallint unsigned NOT NULL DEFAULT '0' COMMENT '';
ALTER TABLE `lootdrop_entries` ADD COLUMN `npc_max_level` smallint unsigned NOT NULL DEFAULT '0' COMMENT '';
ALTER TABLE `lootdrop_entries` CHANGE `trivial_min_level` `trivial_min_level` smallint(5) unsigned NOT NULL DEFAULT 0 COMMENT '';
ALTER TABLE `lootdrop_entries` CHANGE `trivial_max_level` `trivial_max_level` smallint(5) unsigned NOT NULL DEFAULT 0 COMMENT '';
UPDATE `lootdrop_entries` SET `trivial_max_level` = 0 WHERE `trivial_max_level` = 127;

2
zone/aa.cpp
View File

@ -448,7 +448,7 @@ void Mob::WakeTheDead(uint16 spell_id, Mob *target, uint32 duration)
sitem = CorpseToUse->GetWornItem(x); sitem = CorpseToUse->GetWornItem(x);
if(sitem){ if(sitem){
const EQ::ItemData * itm = database.GetItem(sitem); const EQ::ItemData * itm = database.GetItem(sitem);
npca->AddLootDrop(itm, &npca->itemlist, 1, 1, 255, true, true); npca->AddLootDrop(itm, &npca->itemlist, LootDropEntries_Struct{ .equip_item = true }, true);
} }
} }

2
zone/attack.cpp
View File

@ -2464,7 +2464,7 @@ bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, EQ::skills::SkillTy
killer = killer->GetOwner(); killer = killer->GetOwner();
if (killer->IsClient() && !killer->CastToClient()->GetGM()) if (killer->IsClient() && !killer->CastToClient()->GetGM())
this->CheckMinMaxLevel(killer); this->CheckTrivialMinMaxLevelDrop(killer);
} }
entity_list.RemoveFromAutoXTargets(this); entity_list.RemoveFromAutoXTargets(this);

260
zone/loottables.cpp
View File

@ -29,6 +29,7 @@
#include "zone_store.h" #include "zone_store.h"
#include "global_loot_manager.h" #include "global_loot_manager.h"
#include "../common/repositories/criteria/content_filter_criteria.h" #include "../common/repositories/criteria/content_filter_criteria.h"
#include "../common/say_link.h"
#include <iostream> #include <iostream>
#include <stdlib.h> #include <stdlib.h>
@ -116,110 +117,127 @@ void ZoneDatabase::AddLootTableToNPC(NPC* npc,uint32 loottable_id, ItemList* ite
// Called by AddLootTableToNPC // Called by AddLootTableToNPC
// maxdrops = size of the array npcd // maxdrops = size of the array npcd
void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* itemlist, uint8 droplimit, uint8 mindrop) { void ZoneDatabase::AddLootDropToNPC(NPC *npc, uint32 lootdrop_id, ItemList *item_list, uint8 droplimit, uint8 mindrop)
const LootDrop_Struct* lds = GetLootDrop(lootdrop_id); {
if (!lds) { const LootDrop_Struct *loot_drop = GetLootDrop(lootdrop_id);
if (!loot_drop) {
return; return;
} }
if(lds->NumEntries == 0) if (loot_drop->NumEntries == 0) {
return; return;
}
if(droplimit == 0 && mindrop == 0) { if (droplimit == 0 && mindrop == 0) {
for(uint32 i = 0; i < lds->NumEntries; ++i) { for (uint32 i = 0; i < loot_drop->NumEntries; ++i) {
int charges = lds->Entries[i].multiplier; int charges = loot_drop->Entries[i].multiplier;
for(int j = 0; j < charges; ++j) { for (int j = 0; j < charges; ++j) {
if(zone->random.Real(0.0, 100.0) <= lds->Entries[i].chance) { if (zone->random.Real(0.0, 100.0) <= loot_drop->Entries[i].chance && npc->MeetsLevelRequirements(loot_drop->Entries[i])) {
const EQ::ItemData* dbitem = GetItem(lds->Entries[i].item_id); const EQ::ItemData *database_item = GetItem(loot_drop->Entries[i].item_id);
npc->AddLootDrop(dbitem, itemlist, lds->Entries[i].item_charges, lds->Entries[i].minlevel, npc->AddLootDrop(
lds->Entries[i].maxlevel, lds->Entries[i].equip_item > 0 ? true : false, false); database_item,
item_list,
loot_drop->Entries[i]
);
} }
} }
} }
return; return;
} }
if(lds->NumEntries > 100 && droplimit == 0) { if (loot_drop->NumEntries > 100 && droplimit == 0) {
droplimit = 10; droplimit = 10;
} }
if(droplimit < mindrop) { if (droplimit < mindrop) {
droplimit = mindrop; droplimit = mindrop;
} }
float roll_t = 0.0f; float roll_t = 0.0f;
float roll_t_min = 0.0f; float roll_t_min = 0.0f;
bool active_item_list = false; bool active_item_list = false;
for(uint32 i = 0; i < lds->NumEntries; ++i) { for (uint32 i = 0; i < loot_drop->NumEntries; ++i) {
const EQ::ItemData* db_item = GetItem(lds->Entries[i].item_id); const EQ::ItemData *db_item = GetItem(loot_drop->Entries[i].item_id);
if(db_item) { if (db_item) {
roll_t += lds->Entries[i].chance; roll_t += loot_drop->Entries[i].chance;
active_item_list = true; active_item_list = true;
} }
} }
roll_t_min = roll_t; roll_t_min = roll_t;
roll_t = EQ::ClampLower(roll_t, 100.0f); roll_t = EQ::ClampLower(roll_t, 100.0f);
if(!active_item_list) { if (!active_item_list) {
return; return;
} }
for(int i = 0; i < mindrop; ++i) { for (int i = 0; i < mindrop; ++i) {
float roll = (float)zone->random.Real(0.0, roll_t_min); float roll = (float) zone->random.Real(0.0, roll_t_min);
for(uint32 j = 0; j < lds->NumEntries; ++j) { for (uint32 j = 0; j < loot_drop->NumEntries; ++j) {
const EQ::ItemData* db_item = GetItem(lds->Entries[j].item_id); const EQ::ItemData *db_item = GetItem(loot_drop->Entries[j].item_id);
if(db_item) { if (db_item) {
if(roll < lds->Entries[j].chance) { if (roll < loot_drop->Entries[j].chance && npc->MeetsLevelRequirements(loot_drop->Entries[j])) {
npc->AddLootDrop(db_item, itemlist, lds->Entries[j].item_charges, lds->Entries[j].minlevel, npc->AddLootDrop(
lds->Entries[j].maxlevel, lds->Entries[j].equip_item > 0 ? true : false, false); db_item,
item_list,
loot_drop->Entries[j]
);
int charges = (int)lds->Entries[i].multiplier; int charges = (int) loot_drop->Entries[i].multiplier;
charges = EQ::ClampLower(charges, 1); charges = EQ::ClampLower(charges, 1);
for(int k = 1; k < charges; ++k) { for (int k = 1; k < charges; ++k) {
float c_roll = (float)zone->random.Real(0.0, 100.0); float c_roll = (float) zone->random.Real(0.0, 100.0);
if(c_roll <= lds->Entries[i].chance) { if (c_roll <= loot_drop->Entries[i].chance) {
npc->AddLootDrop(db_item, itemlist, lds->Entries[j].item_charges, lds->Entries[j].minlevel, npc->AddLootDrop(
lds->Entries[j].maxlevel, lds->Entries[j].equip_item > 0 ? true : false, false); db_item,
item_list,
loot_drop->Entries[i]
);
} }
} }
j = lds->NumEntries; j = loot_drop->NumEntries;
break; break;
} }
else { else {
roll -= lds->Entries[j].chance; roll -= loot_drop->Entries[j].chance;
} }
} }
} }
} }
for(int i = mindrop; i < droplimit; ++i) { for (int i = mindrop; i < droplimit; ++i) {
float roll = (float)zone->random.Real(0.0, roll_t); float roll = (float) zone->random.Real(0.0, roll_t);
for(uint32 j = 0; j < lds->NumEntries; ++j) { for (uint32 j = 0; j < loot_drop->NumEntries; ++j) {
const EQ::ItemData* db_item = GetItem(lds->Entries[j].item_id); const EQ::ItemData *db_item = GetItem(loot_drop->Entries[j].item_id);
if(db_item) { if (db_item) {
if(roll < lds->Entries[j].chance) { if (roll < loot_drop->Entries[j].chance && npc->MeetsLevelRequirements(loot_drop->Entries[j])) {
npc->AddLootDrop(db_item, itemlist, lds->Entries[j].item_charges, lds->Entries[j].minlevel, npc->AddLootDrop(
lds->Entries[j].maxlevel, lds->Entries[j].equip_item > 0 ? true : false, false); db_item,
item_list,
loot_drop->Entries[j]
);
int charges = (int)lds->Entries[i].multiplier; int charges = (int) loot_drop->Entries[i].multiplier;
charges = EQ::ClampLower(charges, 1); charges = EQ::ClampLower(charges, 1);
for(int k = 1; k < charges; ++k) { for (int k = 1; k < charges; ++k) {
float c_roll = (float)zone->random.Real(0.0, 100.0); float c_roll = (float) zone->random.Real(0.0, 100.0);
if(c_roll <= lds->Entries[i].chance) { if (c_roll <= loot_drop->Entries[i].chance) {
npc->AddLootDrop(db_item, itemlist, lds->Entries[j].item_charges, lds->Entries[j].minlevel, npc->AddLootDrop(
lds->Entries[j].maxlevel, lds->Entries[j].equip_item > 0 ? true : false, false); db_item,
item_list,
loot_drop->Entries[i]
);
} }
} }
j = lds->NumEntries; j = loot_drop->NumEntries;
break; break;
} }
else { else {
roll -= lds->Entries[j].chance; roll -= loot_drop->Entries[j].chance;
} }
} }
} }
@ -231,43 +249,86 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml
// npc->SendAppearancePacket(AT_Light, npc->GetActiveLightValue()); // npc->SendAppearancePacket(AT_Light, npc->GetActiveLightValue());
} }
//if itemlist is null, just send wear changes bool NPC::MeetsLevelRequirements(LootDropEntries_Struct loot_drop)
void NPC::AddLootDrop(const EQ::ItemData *item2, ItemList* itemlist, int16 charges, uint8 minlevel, uint8 maxlevel, bool equipit, bool wearchange, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5, uint32 aug6) { {
if(item2 == nullptr) if (loot_drop.npc_min_level > 0 && GetLevel() < loot_drop.npc_min_level) {
return; return false;
//make sure we are doing something...
if(!itemlist && !wearchange)
return;
auto item = new ServerLootItem_Struct;
#if EQDEBUG>=11
LogDebug("Adding drop to npc: [{}], Item: [{}]", GetName(), item2->ID);
#endif
EQApplicationPacket* outapp = nullptr;
WearChange_Struct* wc = nullptr;
if(wearchange) {
outapp = new EQApplicationPacket(OP_WearChange, sizeof(WearChange_Struct));
wc = (WearChange_Struct*)outapp->pBuffer;
wc->spawn_id = GetID();
wc->material=0;
} }
item->item_id = item2->ID; if (loot_drop.npc_max_level > 0 && GetLevel() > loot_drop.npc_max_level) {
item->charges = charges; return false;
item->aug_1 = aug1; }
item->aug_2 = aug2;
item->aug_3 = aug3;
item->aug_4 = aug4;
item->aug_5 = aug5;
item->aug_6 = aug6;
item->attuned = 0;
item->min_level = minlevel;
item->max_level = maxlevel;
item->equip_slot = EQ::invslot::SLOT_INVALID;
if (equipit) { return true;
}
//if itemlist is null, just send wear changes
void NPC::AddLootDrop(
const EQ::ItemData *item2,
ItemList *itemlist,
LootDropEntries_Struct loot_drop,
bool wear_change,
uint32 aug1,
uint32 aug2,
uint32 aug3,
uint32 aug4,
uint32 aug5,
uint32 aug6
)
{
if (item2 == nullptr) {
return;
}
//make sure we are doing something...
if (!itemlist && !wear_change) {
return;
}
auto item = new ServerLootItem_Struct;
if (LogSys.log_settings[Logs::Loot].is_category_enabled == 1) {
EQ::SayLinkEngine linker;
linker.SetLinkType(EQ::saylink::SayLinkItemData);
linker.SetItemData(item2);
LogLoot(
"[NPC::AddLootDrop] NPC [{}] Item ({}) [{}] charges [{}] chance [{}] trivial min/max [{}/{}] npc min/max [{}/{}]",
GetName(),
item2->ID,
linker.GenerateLink(),
loot_drop.item_charges,
loot_drop.chance,
loot_drop.trivial_min_level,
loot_drop.trivial_max_level,
loot_drop.npc_min_level,
loot_drop.npc_max_level
);
}
EQApplicationPacket *outapp = nullptr;
WearChange_Struct *p_wear_change_struct = nullptr;
if (wear_change) {
outapp = new EQApplicationPacket(OP_WearChange, sizeof(WearChange_Struct));
p_wear_change_struct = (WearChange_Struct *) outapp->pBuffer;
p_wear_change_struct->spawn_id = GetID();
p_wear_change_struct->material = 0;
}
item->item_id = item2->ID;
item->charges = loot_drop.item_charges;
item->aug_1 = aug1;
item->aug_2 = aug2;
item->aug_3 = aug3;
item->aug_4 = aug4;
item->aug_5 = aug5;
item->aug_6 = aug6;
item->attuned = 0;
item->trivial_min_level = loot_drop.trivial_min_level;
item->trivial_max_level = loot_drop.trivial_max_level;
item->equip_slot = EQ::invslot::SLOT_INVALID;
if (loot_drop.equip_item > 0) {
uint8 eslot = 0xFF; uint8 eslot = 0xFF;
char newid[20]; char newid[20];
const EQ::ItemData* compitem = nullptr; const EQ::ItemData* compitem = nullptr;
@ -403,9 +464,9 @@ void NPC::AddLootDrop(const EQ::ItemData *item2, ItemList* itemlist, int16 charg
//if we found an open slot it goes in... //if we found an open slot it goes in...
if(eslot != 0xFF) { if(eslot != 0xFF) {
if(wearchange) { if(wear_change) {
wc->wear_slot_id = eslot; p_wear_change_struct->wear_slot_id = eslot;
wc->material = emat; p_wear_change_struct->material = emat;
} }
} }
@ -415,24 +476,25 @@ void NPC::AddLootDrop(const EQ::ItemData *item2, ItemList* itemlist, int16 charg
} }
} }
if(itemlist != nullptr) if (itemlist != nullptr) {
itemlist->push_back(item); itemlist->push_back(item);
else }
safe_delete(item); else safe_delete(item);
if(wearchange && outapp) { if (wear_change && outapp) {
entity_list.QueueClients(this, outapp); entity_list.QueueClients(this, outapp);
safe_delete(outapp); safe_delete(outapp);
} }
UpdateEquipmentLight(); UpdateEquipmentLight();
if (UpdateActiveLight()) if (UpdateActiveLight()) {
SendAppearancePacket(AT_Light, GetActiveLightType()); SendAppearancePacket(AT_Light, GetActiveLightType());
}
} }
void NPC::AddItem(const EQ::ItemData* item, uint16 charges, bool equipitem) { void NPC::AddItem(const EQ::ItemData* item, uint16 charges, bool equipitem) {
//slot isnt needed, its determined from the item. //slot isnt needed, its determined from the item.
AddLootDrop(item, &itemlist, charges, 1, 255, equipitem, equipitem); AddLootDrop(item, &itemlist, LootDropEntries_Struct{ .equip_item = equipitem }, true);
} }
void NPC::AddItem(uint32 itemid, uint16 charges, bool equipitem, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5, uint32 aug6) { void NPC::AddItem(uint32 itemid, uint16 charges, bool equipitem, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5, uint32 aug6) {
@ -440,7 +502,7 @@ void NPC::AddItem(uint32 itemid, uint16 charges, bool equipitem, uint32 aug1, ui
const EQ::ItemData * i = database.GetItem(itemid); const EQ::ItemData * i = database.GetItem(itemid);
if(i == nullptr) if(i == nullptr)
return; return;
AddLootDrop(i, &itemlist, charges, 1, 255, equipitem, equipitem, aug1, aug2, aug3, aug4, aug5, aug6); AddLootDrop(i, &itemlist, LootDropEntries_Struct{ .equip_item = equipitem }, true, aug1, aug2, aug3, aug4, aug5, aug6);
} }
void NPC::AddLootTable() { void NPC::AddLootTable() {

35
zone/npc.cpp
View File

@ -576,25 +576,33 @@ void NPC::RemoveItem(uint32 item_id, uint16 quantity, uint16 slot) {
} }
} }
void NPC::CheckMinMaxLevel(Mob *them) void NPC::CheckTrivialMinMaxLevelDrop(Mob *killer)
{ {
if(them == nullptr || !them->IsClient()) if (killer == nullptr || !killer->IsClient()) {
return; return;
}
uint16 themlevel = them->GetLevel(); uint16 killer_level = killer->GetLevel();
uint8 material; uint8 material;
auto cur = itemlist.begin(); auto cur = itemlist.begin();
while(cur != itemlist.end()) while (cur != itemlist.end()) {
{ if (!(*cur)) {
if(!(*cur))
return; return;
}
if(themlevel < (*cur)->min_level || themlevel > (*cur)->max_level) uint16 trivial_min_level = (*cur)->trivial_min_level;
{ uint16 trivial_max_level = (*cur)->trivial_max_level;
bool fits_trivial_criteria = (
(trivial_min_level > 0 && killer_level < trivial_min_level) ||
(trivial_max_level > 0 && killer_level > trivial_max_level)
);
if (fits_trivial_criteria) {
material = EQ::InventoryProfile::CalcMaterialFromSlot((*cur)->equip_slot); material = EQ::InventoryProfile::CalcMaterialFromSlot((*cur)->equip_slot);
if (material != EQ::textures::materialInvalid) if (material != EQ::textures::materialInvalid) {
SendWearChange(material); SendWearChange(material);
}
cur = itemlist.erase(cur); cur = itemlist.erase(cur);
continue; continue;
@ -603,8 +611,9 @@ void NPC::CheckMinMaxLevel(Mob *them)
} }
UpdateEquipmentLight(); UpdateEquipmentLight();
if (UpdateActiveLight()) if (UpdateActiveLight()) {
SendAppearancePacket(AT_Light, GetActiveLightType()); SendAppearancePacket(AT_Light, GetActiveLightType());
}
} }
void NPC::ClearItemList() { void NPC::ClearItemList() {
@ -647,8 +656,8 @@ void NPC::QueryLoot(Client* to)
item_count, item_count,
linker.GenerateLink().c_str(), linker.GenerateLink().c_str(),
(*cur)->item_id, (*cur)->item_id,
(*cur)->min_level, (*cur)->trivial_min_level,
(*cur)->max_level (*cur)->trivial_max_level
); );
} }

22
zone/npc.h
View File

@ -25,6 +25,7 @@
#include "zonedb.h" #include "zonedb.h"
#include "zone_store.h" #include "zone_store.h"
#include "zonedump.h" #include "zonedump.h"
#include "../common/loottable.h"
#include <deque> #include <deque>
#include <list> #include <list>
@ -193,7 +194,7 @@ public:
void CheckGlobalLootTables(); void CheckGlobalLootTables();
void DescribeAggro(Client *towho, Mob *mob, bool verbose); void DescribeAggro(Client *towho, Mob *mob, bool verbose);
void RemoveItem(uint32 item_id, uint16 quantity = 0, uint16 slot = 0); void RemoveItem(uint32 item_id, uint16 quantity = 0, uint16 slot = 0);
void CheckMinMaxLevel(Mob *them); void CheckTrivialMinMaxLevelDrop(Mob *killer);
void ClearItemList(); void ClearItemList();
ServerLootItem_Struct* GetItem(int slot_id); ServerLootItem_Struct* GetItem(int slot_id);
void AddCash(uint16 in_copper, uint16 in_silver, uint16 in_gold, uint16 in_platinum); void AddCash(uint16 in_copper, uint16 in_silver, uint16 in_gold, uint16 in_platinum);
@ -291,7 +292,22 @@ public:
void PickPocket(Client* thief); void PickPocket(Client* thief);
void Disarm(Client* client, int chance); void Disarm(Client* client, int chance);
void StartSwarmTimer(uint32 duration) { swarm_timer.Start(duration); } void StartSwarmTimer(uint32 duration) { swarm_timer.Start(duration); }
void AddLootDrop(const EQ::ItemData*dbitem, ItemList* itemlistconst, int16 charges, uint8 minlevel, uint8 maxlevel, bool equipit, bool wearchange = false, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0);
void AddLootDrop(
const EQ::ItemData *item2,
ItemList *itemlist,
LootDropEntries_Struct loot_drop,
bool wear_change = false,
uint32 aug1 = 0,
uint32 aug2 = 0,
uint32 aug3 = 0,
uint32 aug4 = 0,
uint32 aug5 = 0,
uint32 aug6 = 0
);
bool MeetsLevelRequirements(LootDropEntries_Struct loot_drop);
virtual void DoClassAttacks(Mob *target); virtual void DoClassAttacks(Mob *target);
void CheckSignal(); void CheckSignal();
inline bool IsNotTargetableWithHotkey() const { return no_target_hotkey; } inline bool IsNotTargetableWithHotkey() const { return no_target_hotkey; }
@ -620,12 +636,12 @@ protected:
bool ignore_despawn; //NPCs with this set to 1 will ignore the despawn value in spawngroup bool ignore_despawn; //NPCs with this set to 1 will ignore the despawn value in spawngroup
private: private:
uint32 loottable_id; uint32 loottable_id;
bool skip_global_loot; bool skip_global_loot;
bool skip_auto_scale; bool skip_auto_scale;
bool p_depop; bool p_depop;
}; };
#endif #endif

4
zone/pets.cpp
View File

@ -394,7 +394,7 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; i++) for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; i++)
if (petinv[i]) { if (petinv[i]) {
item = database.GetItem(petinv[i]); item = database.GetItem(petinv[i]);
npc->AddLootDrop(item, &npc->itemlist, 0, 1, 127, true, true); npc->AddLootDrop(item, &npc->itemlist, LootDropEntries_Struct{ .equip_item = true }, true);
} }
} }
@ -625,7 +625,7 @@ void NPC::SetPetState(SpellBuff_Struct *pet_buffs, uint32 *items) {
_CLIENTPET(this) && GetPetType() <= petOther); _CLIENTPET(this) && GetPetType() <= petOther);
if (!noDrop || petCanHaveNoDrop) { if (!noDrop || petCanHaveNoDrop) {
AddLootDrop(item2, &itemlist, 0, 1, 255, true, true); AddLootDrop(item2, &itemlist, LootDropEntries_Struct{.equip_item = true }, true);
} }
} }
} }

16
zone/trading.cpp
View File

@ -899,8 +899,12 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
if (baginst) { if (baginst) {
const EQ::ItemData* bagitem = baginst->GetItem(); const EQ::ItemData* bagitem = baginst->GetItem();
if (bagitem && (GetGM() || (bagitem->NoDrop != 0 && baginst->IsAttuned() == false))) { if (bagitem && (GetGM() || (bagitem->NoDrop != 0 && baginst->IsAttuned() == false))) {
tradingWith->CastToNPC()->AddLootDrop(bagitem, &tradingWith->CastToNPC()->itemlist, tradingWith->CastToNPC()->AddLootDrop(
baginst->GetCharges(), 1, 127, true, true); bagitem,
&tradingWith->CastToNPC()->itemlist,
LootDropEntries_Struct{.item_charges = static_cast<int8>(baginst->GetCharges()), .equip_item = true },
true
);
} }
else if (RuleB(NPC, ReturnNonQuestNoDropItems)) { else if (RuleB(NPC, ReturnNonQuestNoDropItems)) {
PushItemOnCursor(*baginst, true); PushItemOnCursor(*baginst, true);
@ -909,8 +913,12 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
} }
} }
tradingWith->CastToNPC()->AddLootDrop(item, &tradingWith->CastToNPC()->itemlist, tradingWith->CastToNPC()->AddLootDrop(
inst->GetCharges(), 1, 127, true, true); item,
&tradingWith->CastToNPC()->itemlist,
LootDropEntries_Struct{.item_charges = static_cast<int8>(inst->GetCharges()), .equip_item = true },
true
);
} }
// Return NO DROP and Attuned items being handed into a non-quest NPC if the rule is true // Return NO DROP and Attuned items being handed into a non-quest NPC if the rule is true
else if (RuleB(NPC, ReturnNonQuestNoDropItems)) { else if (RuleB(NPC, ReturnNonQuestNoDropItems)) {

2
zone/zonedb.h
View File

@ -453,7 +453,7 @@ public:
bool GetPoweredPetEntry(const char *pet_type, int16 petpower, PetRecord *into); bool GetPoweredPetEntry(const char *pet_type, int16 petpower, PetRecord *into);
bool GetBasePetItems(int32 equipmentset, uint32 *items); bool GetBasePetItems(int32 equipmentset, uint32 *items);
void AddLootTableToNPC(NPC* npc, uint32 loottable_id, ItemList* itemlist, uint32* copper, uint32* silver, uint32* gold, uint32* plat); void AddLootTableToNPC(NPC* npc, uint32 loottable_id, ItemList* itemlist, uint32* copper, uint32* silver, uint32* gold, uint32* plat);
void AddLootDropToNPC(NPC* npc, uint32 lootdrop_id, ItemList* itemlist, uint8 droplimit, uint8 mindrop); void AddLootDropToNPC(NPC* npc, uint32 lootdrop_id, ItemList* item_list, uint8 droplimit, uint8 mindrop);
uint32 GetMaxNPCSpellsID(); uint32 GetMaxNPCSpellsID();
uint32 GetMaxNPCSpellsEffectsID(); uint32 GetMaxNPCSpellsEffectsID();
bool GetAuraEntry(uint16 spell_id, AuraRecord &record); bool GetAuraEntry(uint16 spell_id, AuraRecord &record);