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

Damn base values...

Browse Source
This commit is contained in:
Uleat 2017-04-02 16:21:13 -04:00
parent 23115ca177
commit 5d9a89dcd1
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/inventory_profile.cpp
View File

@ -264,10 +264,10 @@ bool EQEmu::InventoryProfile::SwapItem(int16 slot_a, int16 slot_b, SwapItemFailS
fail_state = swapRaceClass; fail_state = swapRaceClass;
return false; return false;
} }
/*if (deity_id && item_a->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_a->Deity)) { if (deity_id && item_a->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_a->Deity)) {
fail_state = swapDeity; fail_state = swapDeity;
return false; return false;
}*/ }
if (level && item_a->ReqLevel && level < item_a->ReqLevel) { if (level && item_a->ReqLevel && level < item_a->ReqLevel) {
fail_state = swapLevel; fail_state = swapLevel;
return false; return false;
@ -290,10 +290,10 @@ bool EQEmu::InventoryProfile::SwapItem(int16 slot_a, int16 slot_b, SwapItemFailS
fail_state = swapRaceClass; fail_state = swapRaceClass;
return false; return false;
} }
/*if (deity_id && item_b->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_b->Deity)) { if (deity_id && item_b->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_b->Deity)) {
fail_state = swapDeity; fail_state = swapDeity;
return false; return false;
}*/ }
if (level && item_b->ReqLevel && level < item_b->ReqLevel) { if (level && item_b->ReqLevel && level < item_b->ReqLevel) {
fail_state = swapLevel; fail_state = swapLevel;
return false; return false;

6
zone/inventory.cpp
View File

@ -1826,17 +1826,15 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
} }
EQEmu::InventoryProfile::SwapItemFailState fail_state = EQEmu::InventoryProfile::swapInvalid; EQEmu::InventoryProfile::SwapItemFailState fail_state = EQEmu::InventoryProfile::swapInvalid;
if (!m_inv.SwapItem(src_slot_id, dst_slot_id, fail_state, GetRace(), GetClass(), GetDeity(), GetLevel())) { if (!m_inv.SwapItem(src_slot_id, dst_slot_id, fail_state, GetBaseRace(), GetBaseClass(), GetDeity(), GetLevel())) {
const char* fail_message = "The selected slot was invalid."; const char* fail_message = "The selected slot was invalid.";
if (fail_state == EQEmu::InventoryProfile::swapRaceClass || fail_state == EQEmu::InventoryProfile::swapDeity) if (fail_state == EQEmu::InventoryProfile::swapRaceClass || fail_state == EQEmu::InventoryProfile::swapDeity)
fail_message = "Your class, deity and/or race may not equip that item."; fail_message = "Your class, deity and/or race may not equip that item.";
else if (fail_state == EQEmu::InventoryProfile::swapLevel) else if (fail_state == EQEmu::InventoryProfile::swapLevel)
fail_message = "You are not sufficient level to use this item."; fail_message = "You are not sufficient level to use this item.";
if (fail_message) { if (fail_message)
Message(CC_Red, "%s", fail_message); Message(CC_Red, "%s", fail_message);
//Log(Logs::General, Logs::Error, "[%s] %s (r:%u, c:%u, d:%u, l:%u)", GetCleanName(), fail_message, GetRace(), GetClass(), GetDeity(), GetLevel());
}
return false; return false;
} }