From 2fbd5aacccbd7de40988daeccbbc07cc73525696 Mon Sep 17 00:00:00 2001 From: KimLS Date: Sun, 17 May 2020 18:36:06 -0700 Subject: [PATCH] Rename namespace EQEmu to namespace EQ (so we don't have two similar but different namespaces anymore) --- common/any.h | 4 +- common/compression.cpp | 2 +- common/compression.h | 2 +- common/data_verification.h | 2 +- common/database.cpp | 18 +- common/database.h | 4 +- common/database_conversions.cpp | 8 +- common/deity.cpp | 6 +- common/deity.h | 2 +- common/emu_constants.cpp | 14 +- common/emu_constants.h | 6 +- common/emu_versions.cpp | 62 +- common/emu_versions.h | 2 +- common/eq_constants.h | 2 +- common/eq_limits.cpp | 336 +++++------ common/eq_limits.h | 20 +- common/eq_packet_structs.h | 50 +- common/eq_stream_intf.h | 2 +- common/eq_stream_proxy.cpp | 2 +- common/eq_stream_proxy.h | 2 +- common/eqemu_exception.cpp | 2 +- common/eqemu_exception.h | 4 +- common/event/task.h | 6 +- common/extprofile.h | 2 +- common/fixed_memory_hash_set.h | 2 +- common/fixed_memory_variable_hash_set.h | 2 +- common/inventory_profile.cpp | 194 +++--- common/inventory_profile.h | 20 +- common/inventory_slot.cpp | 62 +- common/inventory_slot.h | 2 +- common/ipc_mutex.cpp | 2 +- common/ipc_mutex.h | 2 +- common/item_data.cpp | 20 +- common/item_data.h | 2 +- common/item_instance.cpp | 218 +++---- common/item_instance.h | 12 +- common/light_source.cpp | 10 +- common/light_source.h | 2 +- common/memory_buffer.cpp | 48 +- common/memory_buffer.h | 2 +- common/memory_mapped_file.cpp | 2 +- common/memory_mapped_file.h | 2 +- common/net/daybreak_connection.cpp | 12 +- common/net/daybreak_connection.h | 2 +- common/patches/rof.cpp | 358 +++++------ common/patches/rof.h | 2 +- common/patches/rof2.cpp | 358 +++++------ common/patches/rof2.h | 2 +- common/patches/rof2_limits.h | 30 +- common/patches/rof2_structs.h | 6 +- common/patches/rof_limits.h | 30 +- common/patches/rof_structs.h | 4 +- common/patches/sod.cpp | 212 +++---- common/patches/sod.h | 2 +- common/patches/sod_limits.h | 30 +- common/patches/sod_structs.h | 6 +- common/patches/sof.cpp | 212 +++---- common/patches/sof.h | 2 +- common/patches/sof_limits.h | 30 +- common/patches/sof_structs.h | 6 +- common/patches/titanium.cpp | 222 +++---- common/patches/titanium.h | 2 +- common/patches/titanium_limits.h | 30 +- common/patches/titanium_structs.h | 4 +- common/patches/uf.cpp | 222 +++---- common/patches/uf.h | 2 +- common/patches/uf_limits.h | 30 +- common/patches/uf_structs.h | 6 +- common/profanity_manager.cpp | 28 +- common/profanity_manager.h | 2 +- common/random.h | 4 +- common/say_link.cpp | 36 +- common/say_link.h | 4 +- common/shareddb.cpp | 214 +++---- common/shareddb.h | 56 +- common/skills.cpp | 20 +- common/skills.h | 4 +- common/spdat.h | 2 +- common/struct_strategy.h | 2 +- common/textures.h | 2 +- loginserver/client.h | 2 +- shared_memory/base_data.cpp | 4 +- shared_memory/items.cpp | 6 +- shared_memory/loot.cpp | 10 +- shared_memory/npc_faction.cpp | 6 +- shared_memory/skill_caps.cpp | 6 +- shared_memory/spells.cpp | 4 +- ucs/chatchannel.cpp | 14 +- ucs/clientlist.cpp | 32 +- ucs/clientlist.h | 4 +- ucs/ucs.cpp | 2 +- ucs/worldserver.cpp | 12 +- world/adventure.cpp | 2 +- world/adventure_manager.cpp | 2 +- world/client.cpp | 116 ++-- world/client.h | 4 +- world/main.cpp | 4 +- world/worlddb.cpp | 56 +- world/worlddb.h | 2 +- world/zonelist.cpp | 2 +- world/zoneserver.cpp | 2 +- zone/aa.cpp | 12 +- zone/attack.cpp | 452 +++++++------- zone/beacon.cpp | 2 +- zone/beacon.h | 6 +- zone/bonuses.cpp | 280 ++++----- zone/bot.cpp | 604 +++++++++---------- zone/bot.h | 62 +- zone/bot_command.cpp | 186 +++--- zone/bot_database.cpp | 42 +- zone/bot_database.h | 6 +- zone/botspellsai.cpp | 44 +- zone/client.cpp | 436 +++++++------- zone/client.h | 132 ++-- zone/client_mods.cpp | 60 +- zone/client_packet.cpp | 534 ++++++++--------- zone/client_process.cpp | 132 ++-- zone/command.cpp | 252 ++++---- zone/common.h | 40 +- zone/corpse.cpp | 102 ++-- zone/corpse.h | 12 +- zone/doors.cpp | 10 +- zone/effects.cpp | 10 +- zone/embparser.cpp | 48 +- zone/embparser.h | 32 +- zone/embparser_api.cpp | 166 +++--- zone/embxs.cpp | 2 +- zone/encounter.cpp | 2 +- zone/encounter.h | 6 +- zone/entity.cpp | 26 +- zone/entity.h | 4 +- zone/forage.cpp | 60 +- zone/groups.cpp | 20 +- zone/guild.cpp | 10 +- zone/guild_mgr.cpp | 28 +- zone/guild_mgr.h | 2 +- zone/hate_list.cpp | 2 +- zone/inventory.cpp | 760 ++++++++++++------------ zone/loottables.cpp | 68 +-- zone/lua_client.cpp | 20 +- zone/lua_general.cpp | 382 ++++++------ zone/lua_inventory.cpp | 6 +- zone/lua_inventory.h | 12 +- zone/lua_item.cpp | 2 +- zone/lua_item.h | 12 +- zone/lua_iteminst.cpp | 6 +- zone/lua_iteminst.h | 16 +- zone/lua_mob.cpp | 54 +- zone/lua_mod.cpp | 2 +- zone/lua_parser.cpp | 42 +- zone/lua_parser.h | 44 +- zone/lua_parser_events.cpp | 198 +++--- zone/lua_parser_events.h | 154 ++--- zone/main.cpp | 4 +- zone/map.cpp | 2 +- zone/merc.cpp | 188 +++--- zone/merc.h | 30 +- zone/mob.cpp | 262 ++++---- zone/mob.h | 132 ++-- zone/mob_ai.cpp | 34 +- zone/mob_appearance.cpp | 100 ++-- zone/mob_info.cpp | 18 +- zone/mod_functions.cpp | 24 +- zone/npc.cpp | 112 ++-- zone/npc.h | 22 +- zone/object.cpp | 64 +- zone/object.h | 22 +- zone/pathfinder_nav_mesh.cpp | 2 +- zone/pathing.cpp | 8 +- zone/perl_client.cpp | 26 +- zone/perl_mob.cpp | 30 +- zone/perl_questitem.cpp | 52 +- zone/pets.cpp | 16 +- zone/quest_interface.h | 32 +- zone/quest_parser_collection.cpp | 32 +- zone/quest_parser_collection.h | 34 +- zone/questmgr.cpp | 86 +-- zone/questmgr.h | 14 +- zone/raids.cpp | 8 +- zone/special_attacks.cpp | 474 +++++++-------- zone/spell_effects.cpp | 124 ++-- zone/spells.cpp | 156 ++--- zone/tasks.cpp | 20 +- zone/tasks.h | 4 +- zone/titles.cpp | 6 +- zone/tradeskills.cpp | 272 ++++----- zone/trading.cpp | 250 ++++---- zone/trap.cpp | 2 +- zone/tribute.cpp | 34 +- zone/tune.cpp | 124 ++-- zone/waypoints.cpp | 6 +- zone/worldserver.cpp | 14 +- zone/zone.cpp | 14 +- zone/zone.h | 2 +- zone/zonedb.cpp | 86 +-- zone/zonedb.h | 18 +- zone/zonedump.h | 4 +- zone/zoning.cpp | 4 +- 198 files changed, 6111 insertions(+), 6111 deletions(-) diff --git a/common/any.h b/common/any.h index fd80fbc5f..1ec59cdb4 100644 --- a/common/any.h +++ b/common/any.h @@ -24,7 +24,7 @@ * DEALINGS IN THE SOFTWARE. */ -// EQEmu::Any is a modified version of Boost::Any and as such retains the Boost licensing. +// EQ::Any is a modified version of Boost::Any and as such retains the Boost licensing. #ifndef EQEMU_COMMON_ANY_H #define EQEMU_COMMON_ANY_H @@ -32,7 +32,7 @@ #include #include -namespace EQEmu +namespace EQ { class Any { diff --git a/common/compression.cpp b/common/compression.cpp index c56d9bf6a..07fe13d65 100644 --- a/common/compression.cpp +++ b/common/compression.cpp @@ -3,7 +3,7 @@ #include #include -namespace EQEmu +namespace EQ { uint32 EstimateDeflateBuffer(uint32 len) { z_stream zstream; diff --git a/common/compression.h b/common/compression.h index cc2fac264..20a4103be 100644 --- a/common/compression.h +++ b/common/compression.h @@ -1,6 +1,6 @@ #pragma once -namespace EQEmu +namespace EQ { uint32 EstimateDeflateBuffer(uint32 len); uint32 DeflateData(const char *buffer, uint32 len, char *out_buffer, uint32 out_len_max); diff --git a/common/data_verification.h b/common/data_verification.h index c56f3ce04..07a4b3bf0 100644 --- a/common/data_verification.h +++ b/common/data_verification.h @@ -23,7 +23,7 @@ #include #include -namespace EQEmu { +namespace EQ { template T Clamp(const T &value, const T &lower, const T &upper) { diff --git a/common/database.cpp b/common/database.cpp index 1935406a2..637d66371 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -751,7 +751,7 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe } /* This only for new Character creation storing */ -bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQEmu::InventoryProfile* inv) { +bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQ::InventoryProfile* inv) { uint32 charid = 0; char zone[50]; float x, y, z; @@ -779,8 +779,8 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQEmu /* Insert starting inventory... */ std::string invquery; - for (int16 i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invbag::BANK_BAGS_END;) { - const EQEmu::ItemInstance* newinv = inv->GetItem(i); + for (int16 i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invbag::BANK_BAGS_END;) { + const EQ::ItemInstance* newinv = inv->GetItem(i); if (newinv) { invquery = StringFormat("INSERT INTO `inventory` (charid, slotid, itemid, charges, color) VALUES (%u, %i, %u, %i, %u)", charid, i, newinv->GetItem()->ID, newinv->GetCharges(), newinv->GetColor()); @@ -788,16 +788,16 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQEmu auto results = QueryDatabase(invquery); } - if (i == EQEmu::invslot::slotCursor) { - i = EQEmu::invbag::GENERAL_BAGS_BEGIN; + if (i == EQ::invslot::slotCursor) { + i = EQ::invbag::GENERAL_BAGS_BEGIN; continue; } - else if (i == EQEmu::invbag::CURSOR_BAG_END) { - i = EQEmu::invslot::BANK_BEGIN; + else if (i == EQ::invbag::CURSOR_BAG_END) { + i = EQ::invslot::BANK_BEGIN; continue; } - else if (i == EQEmu::invslot::BANK_END) { - i = EQEmu::invbag::BANK_BAGS_BEGIN; + else if (i == EQ::invslot::BANK_END) { + i = EQ::invbag::BANK_BAGS_BEGIN; continue; } i++; diff --git a/common/database.h b/common/database.h index 962349fa9..6683989e5 100644 --- a/common/database.h +++ b/common/database.h @@ -40,7 +40,7 @@ class MySQLRequestResult; class Client; -namespace EQEmu +namespace EQ { class InventoryProfile; } @@ -115,7 +115,7 @@ public: bool SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp); bool SetHackerFlag(const char* accountname, const char* charactername, const char* hacked); bool SetMQDetectionFlag(const char* accountname, const char* charactername, const char* hacked, const char* zone); - bool StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQEmu::InventoryProfile* inv); + bool StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQ::InventoryProfile* inv); bool UpdateName(const char* oldname, const char* newname); /* General Information Queries */ diff --git a/common/database_conversions.cpp b/common/database_conversions.cpp index ec973d9af..d49651f4d 100644 --- a/common/database_conversions.cpp +++ b/common/database_conversions.cpp @@ -189,7 +189,7 @@ namespace Convert { /*002*/ uint32 HP; /*006*/ uint32 Mana; /*010*/ Convert::SpellBuff_Struct Buffs[BUFF_COUNT]; - /*510*/ uint32 Items[EQEmu::textures::materialCount]; + /*510*/ uint32 Items[EQ::textures::materialCount]; /*546*/ char Name[64]; /*610*/ }; @@ -230,9 +230,9 @@ namespace Convert { /*0304*/ uint8 ability_time_minutes; /*0305*/ uint8 ability_time_hours; //place holder /*0306*/ uint8 unknown0306[6]; // @bp Spacer/Flag? - /*0312*/ uint32 item_material[EQEmu::textures::materialCount]; // Item texture/material of worn/held items + /*0312*/ uint32 item_material[EQ::textures::materialCount]; // Item texture/material of worn/held items /*0348*/ uint8 unknown0348[44]; - /*0392*/ Convert::Color_Struct item_tint[EQEmu::textures::materialCount]; + /*0392*/ Convert::Color_Struct item_tint[EQ::textures::materialCount]; /*0428*/ Convert::AA_Array aa_array[MAX_PP_AA_ARRAY]; /*2348*/ float unknown2384; //seen ~128, ~47 /*2352*/ char servername[32]; // length probably not right @@ -1396,7 +1396,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){ if (rquery != ""){ results = QueryDatabase(rquery); } /* Run Material Color Convert */ first_entry = 0; rquery = ""; - for (i = EQEmu::textures::textureBegin; i < EQEmu::textures::materialCount; i++){ + for (i = EQ::textures::textureBegin; i < EQ::textures::materialCount; i++){ if (pp->item_tint[i].color > 0){ if (first_entry != 1){ rquery = StringFormat("REPLACE INTO `character_material` (id, slot, blue, green, red, use_tint, color) VALUES (%u, %u, %u, %u, %u, %u, %u)", character_id, i, pp->item_tint[i].rgb.blue, pp->item_tint[i].rgb.green, pp->item_tint[i].rgb.red, pp->item_tint[i].rgb.use_tint, pp->item_tint[i].color); diff --git a/common/deity.cpp b/common/deity.cpp index b8a2d87d7..0923c43d0 100644 --- a/common/deity.cpp +++ b/common/deity.cpp @@ -20,7 +20,7 @@ #include "deity.h" -EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityTypeToDeityTypeBit(DeityType deity_type) +EQ::deity::DeityTypeBit EQ::deity::ConvertDeityTypeToDeityTypeBit(DeityType deity_type) { switch (deity_type) { case DeityBertoxxulous: @@ -63,7 +63,7 @@ EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityTypeToDeityTypeBit(DeityTyp }; } -EQEmu::deity::DeityType EQEmu::deity::ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit) +EQ::deity::DeityType EQ::deity::ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit) { switch (deity_type_bit) { case bit_DeityAgnostic: @@ -105,7 +105,7 @@ EQEmu::deity::DeityType EQEmu::deity::ConvertDeityTypeBitToDeityType(DeityTypeBi }; } -const char* EQEmu::deity::DeityName(DeityType deity_type) +const char* EQ::deity::DeityName(DeityType deity_type) { switch (deity_type) { case DeityBertoxxulous: diff --git a/common/deity.h b/common/deity.h index f754352a0..8d0fe4c7a 100644 --- a/common/deity.h +++ b/common/deity.h @@ -23,7 +23,7 @@ #include "types.h" -namespace EQEmu +namespace EQ { namespace deity { enum DeityType { diff --git a/common/emu_constants.cpp b/common/emu_constants.cpp index 950bc5ebb..8a6d2a8bd 100644 --- a/common/emu_constants.cpp +++ b/common/emu_constants.cpp @@ -20,7 +20,7 @@ #include "emu_constants.h" -int16 EQEmu::invtype::GetInvTypeSize(int16 inv_type) { +int16 EQ::invtype::GetInvTypeSize(int16 inv_type) { static const int16 local_array[] = { POSSESSIONS_SIZE, BANK_SIZE, @@ -55,7 +55,7 @@ int16 EQEmu::invtype::GetInvTypeSize(int16 inv_type) { return local_array[inv_type]; } -const char* EQEmu::bug::CategoryIDToCategoryName(CategoryID category_id) { +const char* EQ::bug::CategoryIDToCategoryName(CategoryID category_id) { switch (category_id) { case catVideo: return "Video"; @@ -87,7 +87,7 @@ const char* EQEmu::bug::CategoryIDToCategoryName(CategoryID category_id) { } } -EQEmu::bug::CategoryID EQEmu::bug::CategoryNameToCategoryID(const char* category_name) { +EQ::bug::CategoryID EQ::bug::CategoryNameToCategoryID(const char* category_name) { if (!category_name) return catOther; @@ -119,7 +119,7 @@ EQEmu::bug::CategoryID EQEmu::bug::CategoryNameToCategoryID(const char* category return catOther; } -const char *EQEmu::constants::GetStanceName(StanceType stance_type) { +const char *EQ::constants::GetStanceName(StanceType stance_type) { switch (stance_type) { case stanceUnknown: return "Unknown"; @@ -146,9 +146,9 @@ const char *EQEmu::constants::GetStanceName(StanceType stance_type) { } } -int EQEmu::constants::ConvertStanceTypeToIndex(StanceType stance_type) { - if (stance_type >= EQEmu::constants::stancePassive && stance_type <= EQEmu::constants::stanceBurnAE) - return (stance_type - EQEmu::constants::stancePassive); +int EQ::constants::ConvertStanceTypeToIndex(StanceType stance_type) { + if (stance_type >= EQ::constants::stancePassive && stance_type <= EQ::constants::stanceBurnAE) + return (stance_type - EQ::constants::stancePassive); return 0; } diff --git a/common/emu_constants.h b/common/emu_constants.h index 945f513b5..a29418394 100644 --- a/common/emu_constants.h +++ b/common/emu_constants.h @@ -27,7 +27,7 @@ // local definitions are the result of using hybrid-client or server-only values and methods -namespace EQEmu +namespace EQ { using RoF2::IINVALID; using RoF2::INULL; @@ -193,7 +193,7 @@ namespace EQEmu } // namespace invaug namespace constants { - const EQEmu::versions::ClientVersion CHARACTER_CREATION_CLIENT = EQEmu::versions::ClientVersion::Titanium; + const EQ::versions::ClientVersion CHARACTER_CREATION_CLIENT = EQ::versions::ClientVersion::Titanium; using RoF2::constants::EXPANSION; using RoF2::constants::EXPANSION_BIT; @@ -332,6 +332,6 @@ namespace EQEmu /* hack list to prevent circular references - eq_limits.h:EQEmu::inventory::LookupEntry::InventoryTypeSize[n]; + eq_limits.h:EQ::inventory::LookupEntry::InventoryTypeSize[n]; */ diff --git a/common/emu_versions.cpp b/common/emu_versions.cpp index e5b3c5e70..ea8ddba73 100644 --- a/common/emu_versions.cpp +++ b/common/emu_versions.cpp @@ -21,7 +21,7 @@ #include "emu_constants.h" -bool EQEmu::versions::IsValidClientVersion(ClientVersion client_version) +bool EQ::versions::IsValidClientVersion(ClientVersion client_version) { if (client_version <= ClientVersion::Unknown || client_version > LastClientVersion) return false; @@ -29,7 +29,7 @@ bool EQEmu::versions::IsValidClientVersion(ClientVersion client_version) return true; } -EQEmu::versions::ClientVersion EQEmu::versions::ValidateClientVersion(ClientVersion client_version) +EQ::versions::ClientVersion EQ::versions::ValidateClientVersion(ClientVersion client_version) { if (client_version <= ClientVersion::Unknown || client_version > LastClientVersion) return ClientVersion::Unknown; @@ -37,7 +37,7 @@ EQEmu::versions::ClientVersion EQEmu::versions::ValidateClientVersion(ClientVers return client_version; } -const char* EQEmu::versions::ClientVersionName(ClientVersion client_version) +const char* EQ::versions::ClientVersionName(ClientVersion client_version) { switch (client_version) { case ClientVersion::Unknown: @@ -61,7 +61,7 @@ const char* EQEmu::versions::ClientVersionName(ClientVersion client_version) }; } -uint32 EQEmu::versions::ConvertClientVersionToClientVersionBit(ClientVersion client_version) +uint32 EQ::versions::ConvertClientVersionToClientVersionBit(ClientVersion client_version) { switch (client_version) { case ClientVersion::Titanium: @@ -81,7 +81,7 @@ uint32 EQEmu::versions::ConvertClientVersionToClientVersionBit(ClientVersion cli } } -EQEmu::versions::ClientVersion EQEmu::versions::ConvertClientVersionBitToClientVersion(uint32 client_version_bit) +EQ::versions::ClientVersion EQ::versions::ConvertClientVersionBitToClientVersion(uint32 client_version_bit) { switch (client_version_bit) { case ((uint32)1 << (static_cast(ClientVersion::Titanium) - 1)) : @@ -101,7 +101,7 @@ EQEmu::versions::ClientVersion EQEmu::versions::ConvertClientVersionBitToClientV } } -bool EQEmu::versions::IsValidMobVersion(MobVersion mob_version) +bool EQ::versions::IsValidMobVersion(MobVersion mob_version) { if (mob_version <= MobVersion::Unknown || mob_version > LastMobVersion) return false; @@ -109,7 +109,7 @@ bool EQEmu::versions::IsValidMobVersion(MobVersion mob_version) return true; } -bool EQEmu::versions::IsValidPCMobVersion(MobVersion mob_version) +bool EQ::versions::IsValidPCMobVersion(MobVersion mob_version) { if (mob_version <= MobVersion::Unknown || mob_version > LastPCMobVersion) return false; @@ -117,7 +117,7 @@ bool EQEmu::versions::IsValidPCMobVersion(MobVersion mob_version) return true; } -bool EQEmu::versions::IsValidNonPCMobVersion(MobVersion mob_version) +bool EQ::versions::IsValidNonPCMobVersion(MobVersion mob_version) { if (mob_version <= LastPCMobVersion || mob_version > LastNonPCMobVersion) return false; @@ -125,7 +125,7 @@ bool EQEmu::versions::IsValidNonPCMobVersion(MobVersion mob_version) return true; } -bool EQEmu::versions::IsValidOfflinePCMobVersion(MobVersion mob_version) +bool EQ::versions::IsValidOfflinePCMobVersion(MobVersion mob_version) { if (mob_version <= LastNonPCMobVersion || mob_version > LastOfflinePCMobVersion) return false; @@ -133,7 +133,7 @@ bool EQEmu::versions::IsValidOfflinePCMobVersion(MobVersion mob_version) return true; } -EQEmu::versions::MobVersion EQEmu::versions::ValidateMobVersion(MobVersion mob_version) +EQ::versions::MobVersion EQ::versions::ValidateMobVersion(MobVersion mob_version) { if (mob_version <= MobVersion::Unknown || mob_version > LastMobVersion) return MobVersion::Unknown; @@ -141,7 +141,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ValidateMobVersion(MobVersion mob_v return mob_version; } -EQEmu::versions::MobVersion EQEmu::versions::ValidatePCMobVersion(MobVersion mob_version) +EQ::versions::MobVersion EQ::versions::ValidatePCMobVersion(MobVersion mob_version) { if (mob_version <= MobVersion::Unknown || mob_version > LastPCMobVersion) return MobVersion::Unknown; @@ -149,7 +149,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ValidatePCMobVersion(MobVersion mob return mob_version; } -EQEmu::versions::MobVersion EQEmu::versions::ValidateNonPCMobVersion(MobVersion mob_version) +EQ::versions::MobVersion EQ::versions::ValidateNonPCMobVersion(MobVersion mob_version) { if (mob_version <= LastPCMobVersion || mob_version > LastNonPCMobVersion) return MobVersion::Unknown; @@ -157,7 +157,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ValidateNonPCMobVersion(MobVersion return mob_version; } -EQEmu::versions::MobVersion EQEmu::versions::ValidateOfflinePCMobVersion(MobVersion mob_version) +EQ::versions::MobVersion EQ::versions::ValidateOfflinePCMobVersion(MobVersion mob_version) { if (mob_version <= LastNonPCMobVersion || mob_version > LastOfflinePCMobVersion) return MobVersion::Unknown; @@ -165,7 +165,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ValidateOfflinePCMobVersion(MobVers return mob_version; } -const char* EQEmu::versions::MobVersionName(MobVersion mob_version) +const char* EQ::versions::MobVersionName(MobVersion mob_version) { switch (mob_version) { case MobVersion::Unknown: @@ -217,7 +217,7 @@ const char* EQEmu::versions::MobVersionName(MobVersion mob_version) }; } -EQEmu::versions::ClientVersion EQEmu::versions::ConvertMobVersionToClientVersion(MobVersion mob_version) +EQ::versions::ClientVersion EQ::versions::ConvertMobVersionToClientVersion(MobVersion mob_version) { switch (mob_version) { case MobVersion::Unknown: @@ -240,7 +240,7 @@ EQEmu::versions::ClientVersion EQEmu::versions::ConvertMobVersionToClientVersion } } -EQEmu::versions::MobVersion EQEmu::versions::ConvertClientVersionToMobVersion(ClientVersion client_version) +EQ::versions::MobVersion EQ::versions::ConvertClientVersionToMobVersion(ClientVersion client_version) { switch (client_version) { case ClientVersion::Unknown: @@ -263,7 +263,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ConvertClientVersionToMobVersion(Cl } } -EQEmu::versions::MobVersion EQEmu::versions::ConvertPCMobVersionToOfflinePCMobVersion(MobVersion mob_version) +EQ::versions::MobVersion EQ::versions::ConvertPCMobVersionToOfflinePCMobVersion(MobVersion mob_version) { switch (mob_version) { case MobVersion::Titanium: @@ -283,7 +283,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ConvertPCMobVersionToOfflinePCMobVe } } -EQEmu::versions::MobVersion EQEmu::versions::ConvertOfflinePCMobVersionToPCMobVersion(MobVersion mob_version) +EQ::versions::MobVersion EQ::versions::ConvertOfflinePCMobVersionToPCMobVersion(MobVersion mob_version) { switch (mob_version) { case MobVersion::OfflineTitanium: @@ -303,7 +303,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ConvertOfflinePCMobVersionToPCMobVe } } -EQEmu::versions::ClientVersion EQEmu::versions::ConvertOfflinePCMobVersionToClientVersion(MobVersion mob_version) +EQ::versions::ClientVersion EQ::versions::ConvertOfflinePCMobVersionToClientVersion(MobVersion mob_version) { switch (mob_version) { case MobVersion::OfflineTitanium: @@ -323,7 +323,7 @@ EQEmu::versions::ClientVersion EQEmu::versions::ConvertOfflinePCMobVersionToClie } } -EQEmu::versions::MobVersion EQEmu::versions::ConvertClientVersionToOfflinePCMobVersion(ClientVersion client_version) +EQ::versions::MobVersion EQ::versions::ConvertClientVersionToOfflinePCMobVersion(ClientVersion client_version) { switch (client_version) { case ClientVersion::Titanium: @@ -343,7 +343,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ConvertClientVersionToOfflinePCMobV } } -const char* EQEmu::expansions::ExpansionName(Expansion expansion) +const char* EQ::expansions::ExpansionName(Expansion expansion) { switch (expansion) { case Expansion::EverQuest: @@ -393,12 +393,12 @@ const char* EQEmu::expansions::ExpansionName(Expansion expansion) } } -const char* EQEmu::expansions::ExpansionName(uint32 expansion_bit) +const char* EQ::expansions::ExpansionName(uint32 expansion_bit) { return ExpansionName(ConvertExpansionBitToExpansion(expansion_bit)); } -uint32 EQEmu::expansions::ConvertExpansionToExpansionBit(Expansion expansion) +uint32 EQ::expansions::ConvertExpansionToExpansionBit(Expansion expansion) { switch (expansion) { case Expansion::RoK: @@ -446,7 +446,7 @@ uint32 EQEmu::expansions::ConvertExpansionToExpansionBit(Expansion expansion) } } -EQEmu::expansions::Expansion EQEmu::expansions::ConvertExpansionBitToExpansion(uint32 expansion_bit) +EQ::expansions::Expansion EQ::expansions::ConvertExpansionBitToExpansion(uint32 expansion_bit) { switch (expansion_bit) { case bitRoK: @@ -494,7 +494,7 @@ EQEmu::expansions::Expansion EQEmu::expansions::ConvertExpansionBitToExpansion(u } } -uint32 EQEmu::expansions::ConvertExpansionToExpansionsMask(Expansion expansion) +uint32 EQ::expansions::ConvertExpansionToExpansionsMask(Expansion expansion) { switch (expansion) { case Expansion::RoK: @@ -542,17 +542,17 @@ uint32 EQEmu::expansions::ConvertExpansionToExpansionsMask(Expansion expansion) } } -EQEmu::expansions::Expansion EQEmu::expansions::ConvertClientVersionToExpansion(versions::ClientVersion client_version) +EQ::expansions::Expansion EQ::expansions::ConvertClientVersionToExpansion(versions::ClientVersion client_version) { - return EQEmu::constants::StaticLookup(client_version)->Expansion; + return EQ::constants::StaticLookup(client_version)->Expansion; } -uint32 EQEmu::expansions::ConvertClientVersionToExpansionBit(versions::ClientVersion client_version) +uint32 EQ::expansions::ConvertClientVersionToExpansionBit(versions::ClientVersion client_version) { - return EQEmu::constants::StaticLookup(client_version)->ExpansionBit; + return EQ::constants::StaticLookup(client_version)->ExpansionBit; } -uint32 EQEmu::expansions::ConvertClientVersionToExpansionsMask(versions::ClientVersion client_version) +uint32 EQ::expansions::ConvertClientVersionToExpansionsMask(versions::ClientVersion client_version) { - return EQEmu::constants::StaticLookup(client_version)->ExpansionsMask; + return EQ::constants::StaticLookup(client_version)->ExpansionsMask; } diff --git a/common/emu_versions.h b/common/emu_versions.h index b55c32267..75f6808c3 100644 --- a/common/emu_versions.h +++ b/common/emu_versions.h @@ -25,7 +25,7 @@ #include -namespace EQEmu +namespace EQ { namespace versions { enum class ClientVersion : uint32 { diff --git a/common/eq_constants.h b/common/eq_constants.h index 4cc61c0b4..1a0c517bd 100644 --- a/common/eq_constants.h +++ b/common/eq_constants.h @@ -318,7 +318,7 @@ static const uint8 DamageTypeUnknown = 0xFF; ** ** (indexed by 'Skill' of SkillUseTypes) */ -static const uint8 SkillDamageTypes[EQEmu::skills::HIGHEST_SKILL + 1] = // change to _SkillServerArraySize once activated +static const uint8 SkillDamageTypes[EQ::skills::HIGHEST_SKILL + 1] = // change to _SkillServerArraySize once activated { /*1HBlunt*/ 0, /*1HSlashing*/ 1, diff --git a/common/eq_limits.cpp b/common/eq_limits.cpp index 9f52de30d..72c82f450 100644 --- a/common/eq_limits.cpp +++ b/common/eq_limits.cpp @@ -25,7 +25,7 @@ static bool global_dictionary_init = false; -void EQEmu::InitializeDynamicLookups() { +void EQ::InitializeDynamicLookups() { if (global_dictionary_init == true) return; @@ -37,12 +37,12 @@ void EQEmu::InitializeDynamicLookups() { global_dictionary_init = true; } -static std::unique_ptr constants_dynamic_nongm_lookup_entries[EQEmu::versions::ClientVersionCount]; -static std::unique_ptr constants_dynamic_gm_lookup_entries[EQEmu::versions::ClientVersionCount]; -static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu::versions::ClientVersionCount] = +static std::unique_ptr constants_dynamic_nongm_lookup_entries[EQ::versions::ClientVersionCount]; +static std::unique_ptr constants_dynamic_gm_lookup_entries[EQ::versions::ClientVersionCount]; +static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::versions::ClientVersionCount] = { /*[ClientVersion::Unknown] =*/ - EQEmu::constants::LookupEntry( + EQ::constants::LookupEntry( ClientUnknown::constants::EXPANSION, ClientUnknown::constants::EXPANSION_BIT, ClientUnknown::constants::EXPANSIONS_MASK, @@ -50,7 +50,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu ClientUnknown::INULL ), /*[ClientVersion::Client62] =*/ - EQEmu::constants::LookupEntry( + EQ::constants::LookupEntry( Client62::constants::EXPANSION, Client62::constants::EXPANSION_BIT, Client62::constants::EXPANSIONS_MASK, @@ -58,7 +58,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu Client62::INULL ), /*[ClientVersion::Titanium] =*/ - EQEmu::constants::LookupEntry( + EQ::constants::LookupEntry( Titanium::constants::EXPANSION, Titanium::constants::EXPANSION_BIT, Titanium::constants::EXPANSIONS_MASK, @@ -66,7 +66,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu Titanium::constants::SAY_LINK_BODY_SIZE ), /*[ClientVersion::SoF] =*/ - EQEmu::constants::LookupEntry( + EQ::constants::LookupEntry( SoF::constants::EXPANSION, SoF::constants::EXPANSION_BIT, SoF::constants::EXPANSIONS_MASK, @@ -74,7 +74,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu SoF::constants::SAY_LINK_BODY_SIZE ), /*[ClientVersion::SoD] =*/ - EQEmu::constants::LookupEntry( + EQ::constants::LookupEntry( SoD::constants::EXPANSION, SoD::constants::EXPANSION_BIT, SoD::constants::EXPANSIONS_MASK, @@ -82,7 +82,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu SoD::constants::SAY_LINK_BODY_SIZE ), /*[ClientVersion::UF] =*/ - EQEmu::constants::LookupEntry( + EQ::constants::LookupEntry( UF::constants::EXPANSION, UF::constants::EXPANSION_BIT, UF::constants::EXPANSIONS_MASK, @@ -90,7 +90,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu UF::constants::SAY_LINK_BODY_SIZE ), /*[ClientVersion::RoF] =*/ - EQEmu::constants::LookupEntry( + EQ::constants::LookupEntry( RoF::constants::EXPANSION, RoF::constants::EXPANSION_BIT, RoF::constants::EXPANSIONS_MASK, @@ -98,7 +98,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu RoF::constants::SAY_LINK_BODY_SIZE ), /*[ClientVersion::RoF2] =*/ - EQEmu::constants::LookupEntry( + EQ::constants::LookupEntry( RoF2::constants::EXPANSION, RoF2::constants::EXPANSION_BIT, RoF2::constants::EXPANSIONS_MASK, @@ -108,7 +108,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu }; static bool constants_dictionary_init = false; -void EQEmu::constants::InitializeDynamicLookups() { +void EQ::constants::InitializeDynamicLookups() { if (constants_dictionary_init == true) return; constants_dictionary_init = true; @@ -119,7 +119,7 @@ void EQEmu::constants::InitializeDynamicLookups() { // use static references for now } -const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicLookup(versions::ClientVersion client_version, bool gm_flag) +const EQ::constants::LookupEntry* EQ::constants::DynamicLookup(versions::ClientVersion client_version, bool gm_flag) { if (gm_flag) return DynamicGMLookup(client_version); @@ -127,7 +127,7 @@ const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicLookup(versions::C return DynamicNonGMLookup(client_version); } -const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicNonGMLookup(versions::ClientVersion client_version) +const EQ::constants::LookupEntry* EQ::constants::DynamicNonGMLookup(versions::ClientVersion client_version) { client_version = versions::ValidateClientVersion(client_version); if (constants_dynamic_nongm_lookup_entries[static_cast(client_version)]) @@ -136,7 +136,7 @@ const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicNonGMLookup(versio return &constants_static_lookup_entries[static_cast(client_version)]; } -const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicGMLookup(versions::ClientVersion client_version) +const EQ::constants::LookupEntry* EQ::constants::DynamicGMLookup(versions::ClientVersion client_version) { client_version = versions::ValidateClientVersion(client_version); if (constants_dynamic_gm_lookup_entries[static_cast(client_version)]) @@ -145,18 +145,18 @@ const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicGMLookup(versions: return &constants_static_lookup_entries[static_cast(client_version)]; } -const EQEmu::constants::LookupEntry* EQEmu::constants::StaticLookup(versions::ClientVersion client_version) +const EQ::constants::LookupEntry* EQ::constants::StaticLookup(versions::ClientVersion client_version) { return &constants_static_lookup_entries[static_cast(versions::ValidateClientVersion(client_version))]; } -static std::unique_ptr inventory_dynamic_nongm_lookup_entries[EQEmu::versions::MobVersionCount]; -static std::unique_ptr inventory_dynamic_gm_lookup_entries[EQEmu::versions::MobVersionCount]; -static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu::versions::MobVersionCount] = +static std::unique_ptr inventory_dynamic_nongm_lookup_entries[EQ::versions::MobVersionCount]; +static std::unique_ptr inventory_dynamic_gm_lookup_entries[EQ::versions::MobVersionCount]; +static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::versions::MobVersionCount] = { /*[MobVersion::Unknown] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, @@ -182,8 +182,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::Client62] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( Client62::INULL, Client62::INULL, Client62::INULL, Client62::INULL, Client62::INULL, Client62::INULL, Client62::INULL, Client62::INULL, Client62::INULL, @@ -209,9 +209,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::Titanium] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, Titanium::invtype::BANK_SIZE, Titanium::invtype::SHARED_BANK_SIZE, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, Titanium::invtype::BANK_SIZE, Titanium::invtype::SHARED_BANK_SIZE, Titanium::invtype::TRADE_SIZE, Titanium::invtype::WORLD_SIZE, Titanium::invtype::LIMBO_SIZE, Titanium::invtype::TRIBUTE_SIZE, Titanium::INULL, Titanium::invtype::GUILD_TRIBUTE_SIZE, Titanium::invtype::MERCHANT_SIZE, Titanium::INULL, Titanium::invtype::CORPSE_SIZE, @@ -236,9 +236,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu Titanium::inventory::AllowOverLevelEquipment ), /*[MobVersion::SoF] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, SoF::invtype::BANK_SIZE, SoF::invtype::SHARED_BANK_SIZE, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, SoF::invtype::BANK_SIZE, SoF::invtype::SHARED_BANK_SIZE, SoF::invtype::TRADE_SIZE, SoF::invtype::WORLD_SIZE, SoF::invtype::LIMBO_SIZE, SoF::invtype::TRIBUTE_SIZE, SoF::INULL, SoF::invtype::GUILD_TRIBUTE_SIZE, SoF::invtype::MERCHANT_SIZE, SoF::INULL, SoF::invtype::CORPSE_SIZE, @@ -263,9 +263,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu SoF::inventory::AllowOverLevelEquipment ), /*[MobVersion::SoD] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, SoD::invtype::BANK_SIZE, SoD::invtype::SHARED_BANK_SIZE, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, SoD::invtype::BANK_SIZE, SoD::invtype::SHARED_BANK_SIZE, SoD::invtype::TRADE_SIZE, SoD::invtype::WORLD_SIZE, SoD::invtype::LIMBO_SIZE, SoD::invtype::TRIBUTE_SIZE, SoD::INULL, SoD::invtype::GUILD_TRIBUTE_SIZE, SoD::invtype::MERCHANT_SIZE, SoD::INULL, SoD::invtype::CORPSE_SIZE, @@ -290,9 +290,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu SoD::inventory::AllowOverLevelEquipment ), /*[MobVersion::UF] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, UF::invtype::BANK_SIZE, UF::invtype::SHARED_BANK_SIZE, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, UF::invtype::BANK_SIZE, UF::invtype::SHARED_BANK_SIZE, UF::invtype::TRADE_SIZE, UF::invtype::WORLD_SIZE, UF::invtype::LIMBO_SIZE, UF::invtype::TRIBUTE_SIZE, UF::INULL, UF::invtype::GUILD_TRIBUTE_SIZE, UF::invtype::MERCHANT_SIZE, UF::INULL, UF::invtype::CORPSE_SIZE, @@ -317,9 +317,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu UF::inventory::AllowOverLevelEquipment ), /*[MobVersion::RoF] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, RoF::invtype::BANK_SIZE, RoF::invtype::SHARED_BANK_SIZE, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, RoF::invtype::BANK_SIZE, RoF::invtype::SHARED_BANK_SIZE, RoF::invtype::TRADE_SIZE, RoF::invtype::WORLD_SIZE, RoF::invtype::LIMBO_SIZE, RoF::invtype::TRIBUTE_SIZE, RoF::invtype::TROPHY_TRIBUTE_SIZE, RoF::invtype::GUILD_TRIBUTE_SIZE, RoF::invtype::MERCHANT_SIZE, RoF::invtype::DELETED_SIZE, RoF::invtype::CORPSE_SIZE, @@ -344,9 +344,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu RoF::inventory::AllowOverLevelEquipment ), /*[MobVersion::RoF2] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, RoF2::invtype::BANK_SIZE, RoF2::invtype::SHARED_BANK_SIZE, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, RoF2::invtype::BANK_SIZE, RoF2::invtype::SHARED_BANK_SIZE, RoF2::invtype::TRADE_SIZE, RoF2::invtype::WORLD_SIZE, RoF2::invtype::LIMBO_SIZE, RoF2::invtype::TRIBUTE_SIZE, RoF2::invtype::TROPHY_TRIBUTE_SIZE, RoF2::invtype::GUILD_TRIBUTE_SIZE, RoF2::invtype::MERCHANT_SIZE, RoF2::invtype::DELETED_SIZE, RoF2::invtype::CORPSE_SIZE, @@ -371,9 +371,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu RoF2::inventory::AllowOverLevelEquipment ), /*[MobVersion::NPC] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::invtype::TRADE_SIZE, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, /*InvTypeCorpseSize,*/ @@ -389,8 +389,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, - 0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/ - 0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/ + 0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/ + 0, //EQ::inventory::SocketCount, /*ItemAugSize,*/ false, false, @@ -398,9 +398,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::NPCMerchant] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::invtype::TRADE_SIZE, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, /*InvTypeCorpseSize,*/ @@ -416,8 +416,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, - 0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/ - 0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/ + 0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/ + 0, //EQ::inventory::SocketCount, /*ItemAugSize,*/ false, false, @@ -425,9 +425,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::Merc] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::invtype::TRADE_SIZE, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, /*InvTypeCorpseSize,*/ @@ -443,8 +443,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, - 0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/ - 0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/ + 0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/ + 0, //EQ::inventory::SocketCount, /*ItemAugSize,*/ false, false, @@ -452,9 +452,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::Bot] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::invtype::TRADE_SIZE, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, /*InvTypeCorpseSize,*/ @@ -470,8 +470,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu EntityLimits::Bot::invslot::CURSOR_BITMASK, EntityLimits::Bot::invslot::POSSESSIONS_BITMASK, EntityLimits::Bot::INULL, - 0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/ - EQEmu::invaug::SOCKET_COUNT, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/ + 0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/ + EQ::invaug::SOCKET_COUNT, //EQ::inventory::SocketCount, /*ItemAugSize,*/ false, false, @@ -479,9 +479,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::ClientPet] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::invtype::TRADE_SIZE, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, /*InvTypeCorpseSize,*/ @@ -497,8 +497,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, - 0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/ - 0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/ + 0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/ + 0, //EQ::inventory::SocketCount, /*ItemAugSize,*/ false, false, @@ -506,9 +506,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::NPCPet] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::invtype::TRADE_SIZE, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, /*InvTypeCorpseSize,*/ @@ -524,8 +524,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, - 0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/ - 0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/ + 0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/ + 0, //EQ::inventory::SocketCount, /*ItemAugSize,*/ false, false, @@ -533,9 +533,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::MercPet] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::invtype::TRADE_SIZE, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, /*InvTypeCorpseSize,*/ @@ -551,8 +551,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, - 0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/ - 0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/ + 0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/ + 0, //EQ::inventory::SocketCount, /*ItemAugSize,*/ false, false, @@ -560,9 +560,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::BotPet] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::invtype::TRADE_SIZE, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, /*InvTypeCorpseSize,*/ @@ -578,8 +578,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, - 0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/ - 0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/ + 0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/ + 0, //EQ::inventory::SocketCount, /*ItemAugSize,*/ false, false, @@ -587,8 +587,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::OfflineTitanium] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( Titanium::INULL, Titanium::INULL, Titanium::INULL, Titanium::invtype::TRADE_SIZE, Titanium::INULL, Titanium::INULL, Titanium::INULL, Titanium::INULL, Titanium::INULL, @@ -614,8 +614,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::OfflineSoF] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( SoF::INULL, SoF::INULL, SoF::INULL, SoF::invtype::TRADE_SIZE, SoF::INULL, SoF::INULL, SoF::INULL, SoF::INULL, SoF::INULL, @@ -641,8 +641,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::OfflineSoD] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( SoD::INULL, SoD::INULL, SoD::INULL, SoD::invtype::TRADE_SIZE, SoD::INULL, SoD::INULL, SoD::INULL, SoD::INULL, SoD::INULL, @@ -668,8 +668,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::OfflineUF] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( UF::INULL, UF::INULL, UF::INULL, UF::invtype::TRADE_SIZE, UF::INULL, UF::INULL, UF::INULL, UF::INULL, UF::INULL, @@ -695,8 +695,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::OfflineRoF] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( RoF::INULL, RoF::INULL, RoF::INULL, RoF::invtype::TRADE_SIZE, RoF::INULL, RoF::INULL, RoF::INULL, RoF::INULL, RoF::INULL, @@ -722,8 +722,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu false ), /*[MobVersion::OfflineRoF2] =*/ - EQEmu::inventory::LookupEntry( - EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQ::inventory::LookupEntry( + EQ::inventory::LookupEntry::InventoryTypeSize_Struct( RoF2::INULL, RoF2::INULL, RoF2::INULL, RoF2::invtype::TRADE_SIZE, RoF2::INULL, RoF2::INULL, RoF2::INULL, RoF2::INULL, RoF2::INULL, @@ -751,7 +751,7 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu }; static bool inventory_dictionary_init = false; -void EQEmu::inventory::InitializeDynamicLookups() { +void EQ::inventory::InitializeDynamicLookups() { if (inventory_dictionary_init == true) return; inventory_dictionary_init = true; @@ -774,9 +774,9 @@ void EQEmu::inventory::InitializeDynamicLookups() { const uint32 dynamic_check_mask = ( - EQEmu::expansions::bitPoR | - EQEmu::expansions::bitTBS | - EQEmu::expansions::bitHoT + EQ::expansions::bitPoR | + EQ::expansions::bitTBS | + EQ::expansions::bitHoT ); // if all of the above expansion bits are present, then static references will suffice @@ -784,7 +784,7 @@ void EQEmu::inventory::InitializeDynamicLookups() { return; // Dynamic Lookups (promotive methodology) (all mob versions allowed) - for (uint32 iter = static_cast(EQEmu::versions::MobVersion::Unknown); iter <= static_cast(EQEmu::versions::LastPCMobVersion); ++iter) { + for (uint32 iter = static_cast(EQ::versions::MobVersion::Unknown); iter <= static_cast(EQ::versions::LastPCMobVersion); ++iter) { // no need to dynamic this condition since it is the lowest compatibility standard if ((dynamic_check_mask & ~constants_static_lookup_entries[iter].ExpansionsMask) == dynamic_check_mask) continue; @@ -803,21 +803,21 @@ void EQEmu::inventory::InitializeDynamicLookups() { inventory_dynamic_nongm_lookup_entries[iter]->PossessionsBitmask = 0; // we'll fix later inventory_dynamic_nongm_lookup_entries[iter]->CorpseBitmask = 0; // we'll fix later - if (RuleI(World, ExpansionSettings) & EQEmu::expansions::bitPoR) { + if (RuleI(World, ExpansionSettings) & EQ::expansions::bitPoR) { // update bank size - if (constants_static_lookup_entries[iter].ExpansionsMask & EQEmu::expansions::bitPoR) + if (constants_static_lookup_entries[iter].ExpansionsMask & EQ::expansions::bitPoR) inventory_dynamic_nongm_lookup_entries[iter]->InventoryTypeSize.Bank = SoF::invtype::BANK_SIZE; } - if (RuleI(World, ExpansionSettings) & EQEmu::expansions::bitTBS) { + if (RuleI(World, ExpansionSettings) & EQ::expansions::bitTBS) { // update power source - if (constants_static_lookup_entries[iter].ExpansionsMask & EQEmu::expansions::bitTBS) + if (constants_static_lookup_entries[iter].ExpansionsMask & EQ::expansions::bitTBS) inventory_dynamic_nongm_lookup_entries[iter]->EquipmentBitmask = SoF::invslot::EQUIPMENT_BITMASK; } - if (RuleI(World, ExpansionSettings) & EQEmu::expansions::bitHoT) { + if (RuleI(World, ExpansionSettings) & EQ::expansions::bitHoT) { // update general size - if (constants_static_lookup_entries[iter].ExpansionsMask & EQEmu::expansions::bitHoT) + if (constants_static_lookup_entries[iter].ExpansionsMask & EQ::expansions::bitHoT) inventory_dynamic_nongm_lookup_entries[iter]->GeneralBitmask = RoF::invslot::GENERAL_BITMASK; } @@ -841,7 +841,7 @@ void EQEmu::inventory::InitializeDynamicLookups() { } // Dynamic GM Lookups (demotive methodology) (client-linked mob versions only) - for (uint32 iter = static_cast(EQEmu::versions::MobVersion::Unknown); iter <= static_cast(EQEmu::versions::LastPCMobVersion); ++iter) { + for (uint32 iter = static_cast(EQ::versions::MobVersion::Unknown); iter <= static_cast(EQ::versions::LastPCMobVersion); ++iter) { // no need to dynamic this condition since it is the lowest compatibility standard if ((dynamic_check_mask & ~constants_static_lookup_entries[iter].ExpansionsMask) == dynamic_check_mask) continue; @@ -869,13 +869,13 @@ void EQEmu::inventory::InitializeDynamicLookups() { inventory_dynamic_gm_lookup_entries[iter]->PossessionsBitmask = 0; // we'll fix later inventory_dynamic_gm_lookup_entries[iter]->CorpseBitmask = 0; // we'll fix later - if (~RuleI(World, ExpansionSettings) & EQEmu::expansions::bitPoR) { + if (~RuleI(World, ExpansionSettings) & EQ::expansions::bitPoR) { // update bank size - if (constants_static_lookup_entries[iter].ExpansionsMask & EQEmu::expansions::bitPoR) + if (constants_static_lookup_entries[iter].ExpansionsMask & EQ::expansions::bitPoR) inventory_dynamic_gm_lookup_entries[iter]->InventoryTypeSize.Bank = Titanium::invtype::BANK_SIZE; } - if (~RuleI(World, ExpansionSettings) & EQEmu::expansions::bitTBS) { + if (~RuleI(World, ExpansionSettings) & EQ::expansions::bitTBS) { // update power source switch (iter) { case versions::bitUF: @@ -890,7 +890,7 @@ void EQEmu::inventory::InitializeDynamicLookups() { } } - if (~RuleI(World, ExpansionSettings) & EQEmu::expansions::bitHoT) { + if (~RuleI(World, ExpansionSettings) & EQ::expansions::bitHoT) { // update general size switch (iter) { case versions::bitUF: @@ -927,7 +927,7 @@ void EQEmu::inventory::InitializeDynamicLookups() { // only client versions that require a change from their static definitions have been given a dynamic (gm) lookup entry } -const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicLookup(versions::MobVersion mob_version, bool gm_flag) +const EQ::inventory::LookupEntry* EQ::inventory::DynamicLookup(versions::MobVersion mob_version, bool gm_flag) { if (gm_flag) return DynamicGMLookup(mob_version); @@ -935,7 +935,7 @@ const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicLookup(versions::M return DynamicNonGMLookup(mob_version); } -const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicNonGMLookup(versions::MobVersion mob_version) +const EQ::inventory::LookupEntry* EQ::inventory::DynamicNonGMLookup(versions::MobVersion mob_version) { mob_version = versions::ValidateMobVersion(mob_version); if (inventory_dynamic_nongm_lookup_entries[static_cast(mob_version)]) @@ -944,7 +944,7 @@ const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicNonGMLookup(versio return &inventory_static_lookup_entries[static_cast(mob_version)]; } -const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicGMLookup(versions::MobVersion mob_version) +const EQ::inventory::LookupEntry* EQ::inventory::DynamicGMLookup(versions::MobVersion mob_version) { mob_version = versions::ValidateMobVersion(mob_version); if (inventory_dynamic_gm_lookup_entries[static_cast(mob_version)]) @@ -953,107 +953,107 @@ const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicGMLookup(versions: return &inventory_static_lookup_entries[static_cast(mob_version)]; } -const EQEmu::inventory::LookupEntry* EQEmu::inventory::StaticLookup(versions::MobVersion mob_version) +const EQ::inventory::LookupEntry* EQ::inventory::StaticLookup(versions::MobVersion mob_version) { return &inventory_static_lookup_entries[static_cast(versions::ValidateMobVersion(mob_version))]; } -static std::unique_ptr behavior_dynamic_nongm_lookup_entries[EQEmu::versions::MobVersionCount]; -static std::unique_ptr behavior_dynamic_gm_lookup_entries[EQEmu::versions::MobVersionCount]; -static const EQEmu::behavior::LookupEntry behavior_static_lookup_entries[EQEmu::versions::MobVersionCount] = +static std::unique_ptr behavior_dynamic_nongm_lookup_entries[EQ::versions::MobVersionCount]; +static std::unique_ptr behavior_dynamic_gm_lookup_entries[EQ::versions::MobVersionCount]; +static const EQ::behavior::LookupEntry behavior_static_lookup_entries[EQ::versions::MobVersionCount] = { /*[MobVersion::Unknown] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( true ), /*[MobVersion::Client62] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( true ), /*[MobVersion::Titanium] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( Titanium::behavior::CoinHasWeight ), /*[MobVersion::SoF] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( SoF::behavior::CoinHasWeight ), /*[MobVersion::SoD] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( SoD::behavior::CoinHasWeight ), /*[MobVersion::UF] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( UF::behavior::CoinHasWeight ), /*[MobVersion::RoF] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( RoF::behavior::CoinHasWeight ), /*[MobVersion::RoF2] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( RoF2::behavior::CoinHasWeight ), /*[MobVersion::NPC] =*/ - EQEmu::behavior::LookupEntry( - EQEmu::behavior::CoinHasWeight + EQ::behavior::LookupEntry( + EQ::behavior::CoinHasWeight ), /*[MobVersion::NPCMerchant] =*/ - EQEmu::behavior::LookupEntry( - EQEmu::behavior::CoinHasWeight + EQ::behavior::LookupEntry( + EQ::behavior::CoinHasWeight ), /*[MobVersion::Merc] =*/ - EQEmu::behavior::LookupEntry( - EQEmu::behavior::CoinHasWeight + EQ::behavior::LookupEntry( + EQ::behavior::CoinHasWeight ), /*[MobVersion::Bot] =*/ - EQEmu::behavior::LookupEntry( - EQEmu::behavior::CoinHasWeight + EQ::behavior::LookupEntry( + EQ::behavior::CoinHasWeight ), /*[MobVersion::ClientPet] =*/ - EQEmu::behavior::LookupEntry( - EQEmu::behavior::CoinHasWeight + EQ::behavior::LookupEntry( + EQ::behavior::CoinHasWeight ), /*[MobVersion::NPCPet] =*/ - EQEmu::behavior::LookupEntry( - EQEmu::behavior::CoinHasWeight + EQ::behavior::LookupEntry( + EQ::behavior::CoinHasWeight ), /*[MobVersion::MercPet] =*/ - EQEmu::behavior::LookupEntry( - EQEmu::behavior::CoinHasWeight + EQ::behavior::LookupEntry( + EQ::behavior::CoinHasWeight ), /*[MobVersion::BotPet] =*/ - EQEmu::behavior::LookupEntry( - EQEmu::behavior::CoinHasWeight + EQ::behavior::LookupEntry( + EQ::behavior::CoinHasWeight ), /*[MobVersion::OfflineTitanium] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( Titanium::behavior::CoinHasWeight ), /*[MobVersion::OfflineSoF] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( SoF::behavior::CoinHasWeight ), /*[MobVersion::OfflineSoD] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( SoD::behavior::CoinHasWeight ), /*[MobVersion::OfflineUF] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( UF::behavior::CoinHasWeight ), /*[MobVersion::OfflineRoF] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( RoF::behavior::CoinHasWeight ), /*[MobVersion::OfflineRoF2] =*/ - EQEmu::behavior::LookupEntry( + EQ::behavior::LookupEntry( RoF2::behavior::CoinHasWeight ) }; static bool behavior_dictionary_init = false; -void EQEmu::behavior::InitializeDynamicLookups() { +void EQ::behavior::InitializeDynamicLookups() { if (behavior_dictionary_init == true) return; behavior_dictionary_init = true; @@ -1064,7 +1064,7 @@ void EQEmu::behavior::InitializeDynamicLookups() { // use static references for now } -const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicLookup(versions::MobVersion mob_version, bool gm_flag) +const EQ::behavior::LookupEntry* EQ::behavior::DynamicLookup(versions::MobVersion mob_version, bool gm_flag) { if (gm_flag) return DynamicGMLookup(mob_version); @@ -1072,7 +1072,7 @@ const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicLookup(versions::Mob return DynamicNonGMLookup(mob_version); } -const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicNonGMLookup(versions::MobVersion mob_version) +const EQ::behavior::LookupEntry* EQ::behavior::DynamicNonGMLookup(versions::MobVersion mob_version) { mob_version = versions::ValidateMobVersion(mob_version); if (behavior_dynamic_nongm_lookup_entries[static_cast(mob_version)]) @@ -1081,7 +1081,7 @@ const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicNonGMLookup(versions return &behavior_static_lookup_entries[static_cast(mob_version)]; } -const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicGMLookup(versions::MobVersion mob_version) +const EQ::behavior::LookupEntry* EQ::behavior::DynamicGMLookup(versions::MobVersion mob_version) { mob_version = versions::ValidateMobVersion(mob_version); if (behavior_dynamic_gm_lookup_entries[static_cast(mob_version)]) @@ -1090,17 +1090,17 @@ const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicGMLookup(versions::M return &behavior_static_lookup_entries[static_cast(mob_version)]; } -const EQEmu::behavior::LookupEntry* EQEmu::behavior::StaticLookup(versions::MobVersion mob_version) +const EQ::behavior::LookupEntry* EQ::behavior::StaticLookup(versions::MobVersion mob_version) { return &behavior_static_lookup_entries[static_cast(versions::ValidateMobVersion(mob_version))]; } -static std::unique_ptr spells_dynamic_nongm_lookup_entries[EQEmu::versions::ClientVersionCount]; -static std::unique_ptr spells_dynamic_gm_lookup_entries[EQEmu::versions::ClientVersionCount]; -static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::versions::ClientVersionCount] = +static std::unique_ptr spells_dynamic_nongm_lookup_entries[EQ::versions::ClientVersionCount]; +static std::unique_ptr spells_dynamic_gm_lookup_entries[EQ::versions::ClientVersionCount]; +static const EQ::spells::LookupEntry spells_static_lookup_entries[EQ::versions::ClientVersionCount] = { /*[ClientVersion::Unknown] =*/ - EQEmu::spells::LookupEntry( + EQ::spells::LookupEntry( ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, @@ -1113,7 +1113,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers ClientUnknown::INULL ), /*[ClientVersion::Client62] =*/ - EQEmu::spells::LookupEntry( + EQ::spells::LookupEntry( Client62::INULL, Client62::INULL, Client62::INULL, @@ -1126,7 +1126,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers Client62::INULL ), /*[ClientVersion::Titanium] =*/ - EQEmu::spells::LookupEntry( + EQ::spells::LookupEntry( Titanium::spells::SPELL_ID_MAX, Titanium::spells::SPELLBOOK_SIZE, Titanium::spells::SPELL_GEM_COUNT, @@ -1139,7 +1139,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers Titanium::spells::MERC_BUFFS ), /*[ClientVersion::SoF] =*/ - EQEmu::spells::LookupEntry( + EQ::spells::LookupEntry( SoF::spells::SPELL_ID_MAX, SoF::spells::SPELLBOOK_SIZE, SoF::spells::SPELL_GEM_COUNT, @@ -1152,7 +1152,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers SoF::spells::MERC_BUFFS ), /*[ClientVersion::SoD] =*/ - EQEmu::spells::LookupEntry( + EQ::spells::LookupEntry( SoD::spells::SPELL_ID_MAX, SoD::spells::SPELLBOOK_SIZE, SoD::spells::SPELL_GEM_COUNT, @@ -1165,7 +1165,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers SoD::spells::MERC_BUFFS ), /*[ClientVersion::UF] =*/ - EQEmu::spells::LookupEntry( + EQ::spells::LookupEntry( UF::spells::SPELL_ID_MAX, UF::spells::SPELLBOOK_SIZE, UF::spells::SPELL_GEM_COUNT, @@ -1178,7 +1178,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers UF::spells::MERC_BUFFS ), /*[ClientVersion::RoF] =*/ - EQEmu::spells::LookupEntry( + EQ::spells::LookupEntry( RoF::spells::SPELL_ID_MAX, RoF::spells::SPELLBOOK_SIZE, UF::spells::SPELL_GEM_COUNT, // client translators are setup to allow the max value a client supports..however, the top 4 indices are not valid in this case @@ -1191,7 +1191,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers RoF::spells::MERC_BUFFS ), /*[ClientVersion::RoF2] =*/ - EQEmu::spells::LookupEntry( + EQ::spells::LookupEntry( RoF2::spells::SPELL_ID_MAX, RoF2::spells::SPELLBOOK_SIZE, UF::spells::SPELL_GEM_COUNT, // client translators are setup to allow the max value a client supports..however, the top 4 indices are not valid in this case @@ -1206,7 +1206,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers }; static bool spells_dictionary_init = false; -void EQEmu::spells::InitializeDynamicLookups() { +void EQ::spells::InitializeDynamicLookups() { if (spells_dictionary_init == true) return; spells_dictionary_init = true; @@ -1217,7 +1217,7 @@ void EQEmu::spells::InitializeDynamicLookups() { // use static references for now } -const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicLookup(versions::ClientVersion client_version, bool gm_flag) +const EQ::spells::LookupEntry* EQ::spells::DynamicLookup(versions::ClientVersion client_version, bool gm_flag) { if (gm_flag) return DynamicGMLookup(client_version); @@ -1225,7 +1225,7 @@ const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicLookup(versions::ClientV return DynamicNonGMLookup(client_version); } -const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicNonGMLookup(versions::ClientVersion client_version) +const EQ::spells::LookupEntry* EQ::spells::DynamicNonGMLookup(versions::ClientVersion client_version) { client_version = versions::ValidateClientVersion(client_version); if (spells_dynamic_nongm_lookup_entries[static_cast(client_version)]) @@ -1234,7 +1234,7 @@ const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicNonGMLookup(versions::Cl return &spells_static_lookup_entries[static_cast(client_version)]; } -const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicGMLookup(versions::ClientVersion client_version) +const EQ::spells::LookupEntry* EQ::spells::DynamicGMLookup(versions::ClientVersion client_version) { client_version = versions::ValidateClientVersion(client_version); if (spells_dynamic_gm_lookup_entries[static_cast(client_version)]) @@ -1243,7 +1243,7 @@ const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicGMLookup(versions::Clien return &spells_static_lookup_entries[static_cast(client_version)]; } -const EQEmu::spells::LookupEntry* EQEmu::spells::StaticLookup(versions::ClientVersion client_version) +const EQ::spells::LookupEntry* EQ::spells::StaticLookup(versions::ClientVersion client_version) { return &spells_static_lookup_entries[static_cast(versions::ValidateClientVersion(client_version))]; } diff --git a/common/eq_limits.h b/common/eq_limits.h index 5d62ced66..fe944c816 100644 --- a/common/eq_limits.h +++ b/common/eq_limits.h @@ -31,13 +31,13 @@ #include "../common/patches/rof2_limits.h" -namespace EQEmu +namespace EQ { void InitializeDynamicLookups(); namespace constants { struct LookupEntry { - EQEmu::expansions::Expansion Expansion; + EQ::expansions::Expansion Expansion; uint32 ExpansionBit; uint32 ExpansionsMask; int16 CharacterCreationLimit; @@ -45,7 +45,7 @@ namespace EQEmu LookupEntry(const LookupEntry *lookup_entry) { } LookupEntry( - EQEmu::expansions::Expansion Expansion, + EQ::expansions::Expansion Expansion, uint32 ExpansionBit, uint32 ExpansionsMask, int16 CharacterCreationLimit, @@ -111,7 +111,7 @@ namespace EQEmu union { InventoryTypeSize_Struct InventoryTypeSize; - int16 InventoryTypeSizeArray[25]; // should reflect EQEmu::invtype::TYPE_COUNT referenced in emu_constants.h + int16 InventoryTypeSizeArray[25]; // should reflect EQ::invtype::TYPE_COUNT referenced in emu_constants.h }; uint64 EquipmentBitmask; @@ -244,9 +244,9 @@ namespace ClientUnknown const int16 INULL = 0; namespace constants { - const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::EverQuest; - const uint32 EXPANSION_BIT = EQEmu::expansions::bitEverQuest; - const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskEverQuest; + const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::EverQuest; + const uint32 EXPANSION_BIT = EQ::expansions::bitEverQuest; + const uint32 EXPANSIONS_MASK = EQ::expansions::maskEverQuest; } // namespace constants @@ -258,9 +258,9 @@ namespace Client62 const int16 INULL = 0; namespace constants { - const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::EverQuest; - const uint32 EXPANSION_BIT = EQEmu::expansions::bitEverQuest; - const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskEverQuest; + const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::EverQuest; + const uint32 EXPANSION_BIT = EQ::expansions::bitEverQuest; + const uint32 EXPANSIONS_MASK = EQ::expansions::maskEverQuest; } // namespace constants diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h index e9e7c5ef3..0bd59d360 100644 --- a/common/eq_packet_structs.h +++ b/common/eq_packet_structs.h @@ -129,7 +129,7 @@ struct LDoNTrapTemplate // All clients translate the character select information to some degree -struct CharSelectEquip : EQEmu::textures::Texture_Struct, EQEmu::textures::Tint_Struct {}; +struct CharSelectEquip : EQ::textures::Texture_Struct, EQ::textures::Tint_Struct {}; // RoF2-based hybrid struct struct CharacterSelectEntry_Struct @@ -144,7 +144,7 @@ struct CharacterSelectEntry_Struct uint16 Instance; uint8 Gender; uint8 Face; - CharSelectEquip Equip[EQEmu::textures::materialCount]; + CharSelectEquip Equip[EQ::textures::materialCount]; uint8 Unknown15; // Seen FF uint8 Unknown19; // Seen FF uint32 DrakkinTattoo; @@ -253,7 +253,7 @@ struct Spawn_Struct { /*0189*/ uint32 petOwnerId; // If this is a pet, the spawn id of owner /*0193*/ uint8 guildrank; // 0=normal, 1=officer, 2=leader /*0194*/ uint8 unknown0194[3]; -/*0197*/ EQEmu::TextureProfile equipment; +/*0197*/ EQ::TextureProfile equipment; /*0233*/ float runspeed; // Speed when running /*0036*/ uint8 afk; // 0=no, 1=afk /*0238*/ uint32 guildID; // Current guild @@ -284,7 +284,7 @@ union /*0340*/ uint32 spawnId; // Spawn Id /*0344*/ float bounding_radius; // used in melee, overrides calc /*0347*/ uint8 IsMercenary; -/*0348*/ EQEmu::TintProfile equipment_tint; +/*0348*/ EQ::TintProfile equipment_tint; /*0384*/ uint8 lfg; // 0=off, 1=lfg on /*0385*/ @@ -736,7 +736,7 @@ struct BandolierItem_Struct struct Bandolier_Struct { char Name[32]; - BandolierItem_Struct Items[EQEmu::profile::BANDOLIER_ITEM_COUNT]; + BandolierItem_Struct Items[EQ::profile::BANDOLIER_ITEM_COUNT]; }; //len = 72 @@ -750,7 +750,7 @@ struct PotionBeltItem_Struct //len = 288 struct PotionBelt_Struct { - PotionBeltItem_Struct Items[EQEmu::profile::POTION_BELT_SIZE]; + PotionBeltItem_Struct Items[EQ::profile::POTION_BELT_SIZE]; }; struct MovePotionToBelt_Struct @@ -841,7 +841,7 @@ struct SuspendedMinion_Struct /*002*/ uint32 HP; /*006*/ uint32 Mana; /*010*/ SpellBuff_Struct Buffs[BUFF_COUNT]; - /*510*/ EQEmu::TextureMaterialProfile Items; + /*510*/ EQ::TextureMaterialProfile Items; /*546*/ char Name[64]; /*610*/ }; @@ -933,7 +933,7 @@ struct PlayerProfile_Struct /*0245*/ uint8 guildbanker; /*0246*/ uint8 unknown0246[6]; // /*0252*/ uint32 intoxication; -/*0256*/ uint32 spellSlotRefresh[EQEmu::spells::SPELL_GEM_COUNT]; //in ms +/*0256*/ uint32 spellSlotRefresh[EQ::spells::SPELL_GEM_COUNT]; //in ms /*0292*/ uint32 abilitySlotRefresh; /*0296*/ uint8 haircolor; // Player hair color /*0297*/ uint8 beardcolor; // Player beard color @@ -946,9 +946,9 @@ struct PlayerProfile_Struct /*0304*/ uint8 ability_time_minutes; /*0305*/ uint8 ability_time_hours; //place holder /*0306*/ uint8 unknown0306[6]; // @bp Spacer/Flag? -/*0312*/ EQEmu::TextureMaterialProfile item_material; // Item texture/material of worn/held items +/*0312*/ EQ::TextureMaterialProfile item_material; // Item texture/material of worn/held items /*0348*/ uint8 unknown0348[44]; -/*0392*/ EQEmu::TintProfile item_tint; +/*0392*/ EQ::TintProfile item_tint; /*0428*/ AA_Array aa_array[MAX_PP_AA_ARRAY]; /*2348*/ float unknown2384; //seen ~128, ~47 /*2352*/ char servername[32]; // length probably not right @@ -972,9 +972,9 @@ struct PlayerProfile_Struct /*2505*/ uint8 unknown2541[47]; // ? /*2552*/ uint8 languages[MAX_PP_LANGUAGE]; /*2580*/ uint8 unknown2616[4]; -/*2584*/ uint32 spell_book[EQEmu::spells::SPELLBOOK_SIZE]; +/*2584*/ uint32 spell_book[EQ::spells::SPELLBOOK_SIZE]; /*4504*/ uint8 unknown4540[128]; // Was [428] all 0xff -/*4632*/ uint32 mem_spells[EQEmu::spells::SPELL_GEM_COUNT]; +/*4632*/ uint32 mem_spells[EQ::spells::SPELL_GEM_COUNT]; /*4668*/ uint8 unknown4704[32]; // /*4700*/ float y; // Player y position /*4704*/ float x; // Player x position @@ -1050,7 +1050,7 @@ struct PlayerProfile_Struct /*7212*/ uint32 tribute_points; /*7216*/ uint32 unknown7252; /*7220*/ uint32 tribute_active; //1=active -/*7224*/ Tribute_Struct tributes[EQEmu::invtype::TRIBUTE_SIZE]; +/*7224*/ Tribute_Struct tributes[EQ::invtype::TRIBUTE_SIZE]; /*7264*/ Disciplines_Struct disciplines; /*7664*/ uint32 recastTimers[MAX_RECAST_TYPES]; // Timers (GMT of last use) /*7744*/ char unknown7780[160]; @@ -1077,7 +1077,7 @@ struct PlayerProfile_Struct /*12800*/ uint32 expAA; /*12804*/ uint32 aapoints; //avaliable, unspent /*12808*/ uint8 unknown12844[36]; -/*12844*/ Bandolier_Struct bandoliers[EQEmu::profile::BANDOLIERS_SIZE]; +/*12844*/ Bandolier_Struct bandoliers[EQ::profile::BANDOLIERS_SIZE]; /*14124*/ uint8 unknown14160[4506]; /*18630*/ SuspendedMinion_Struct SuspendedMinion; // No longer in use /*19240*/ uint32 timeentitledonaccount; @@ -1095,16 +1095,16 @@ struct PlayerProfile_Struct /*19568*/ // All player profile packets are translated and this overhead is ignored in out-bound packets - PlayerProfile_Struct() : m_player_profile_version(EQEmu::versions::MobVersion::Unknown) { } + PlayerProfile_Struct() : m_player_profile_version(EQ::versions::MobVersion::Unknown) { } - EQEmu::versions::MobVersion PlayerProfileVersion() { return m_player_profile_version; } - void SetPlayerProfileVersion(EQEmu::versions::MobVersion mob_version) { m_player_profile_version = EQEmu::versions::ValidateMobVersion(mob_version); } - void SetPlayerProfileVersion(EQEmu::versions::ClientVersion client_version) { SetPlayerProfileVersion(EQEmu::versions::ConvertClientVersionToMobVersion(client_version)); } + EQ::versions::MobVersion PlayerProfileVersion() { return m_player_profile_version; } + void SetPlayerProfileVersion(EQ::versions::MobVersion mob_version) { m_player_profile_version = EQ::versions::ValidateMobVersion(mob_version); } + void SetPlayerProfileVersion(EQ::versions::ClientVersion client_version) { SetPlayerProfileVersion(EQ::versions::ConvertClientVersionToMobVersion(client_version)); } private: // No need for gm flag since pp already has one // No need for lookup pointer since this struct is not tied to any one system - EQEmu::versions::MobVersion m_player_profile_version; + EQ::versions::MobVersion m_player_profile_version; }; @@ -1215,7 +1215,7 @@ struct WearChange_Struct { /*010*/ uint32 elite_material; // 1 for Drakkin Elite Material /*014*/ uint32 hero_forge_model; // New to VoA /*018*/ uint32 unknown18; // New to RoF -/*022*/ EQEmu::textures::Tint_Struct color; +/*022*/ EQ::textures::Tint_Struct color; /*026*/ uint8 wear_slot_id; /*027*/ }; @@ -2123,7 +2123,7 @@ struct AdventureLeaderboard_Struct /*struct Item_Shop_Struct { uint16 merchantid; uint8 itemtype; - EQEmu::ItemData item; + EQ::ItemData item; uint8 iss_unknown001[6]; };*/ @@ -2149,7 +2149,7 @@ struct Illusion_Struct { //size: 256 - SoF /*092*/ uint32 drakkin_heritage; // /*096*/ uint32 drakkin_tattoo; // /*100*/ uint32 drakkin_details; // -/*104*/ EQEmu::TintProfile armor_tint; // +/*104*/ EQ::TintProfile armor_tint; // /*140*/ uint8 eyecolor1; // Field Not Identified in any Illusion Struct /*141*/ uint8 eyecolor2; // Field Not Identified in any Illusion Struct /*142*/ uint8 unknown138[114]; // @@ -3489,8 +3489,8 @@ struct SelectTributeReply_Struct { struct TributeInfo_Struct { uint32 active; //0 == inactive, 1 == active - uint32 tributes[EQEmu::invtype::TRIBUTE_SIZE]; //-1 == NONE - uint32 tiers[EQEmu::invtype::TRIBUTE_SIZE]; //all 00's + uint32 tributes[EQ::invtype::TRIBUTE_SIZE]; //-1 == NONE + uint32 tiers[EQ::invtype::TRIBUTE_SIZE]; //all 00's uint32 tribute_master_id; }; @@ -4401,7 +4401,7 @@ struct AnnoyingZoneUnknown_Struct { }; struct LoadSpellSet_Struct { - uint32 spell[EQEmu::spells::SPELL_GEM_COUNT]; // 0xFFFFFFFF if no action, slot number if to unmem starting at 0 + uint32 spell[EQ::spells::SPELL_GEM_COUNT]; // 0xFFFFFFFF if no action, slot number if to unmem starting at 0 uint32 unknown; //there seems to be an extra field in this packet... }; diff --git a/common/eq_stream_intf.h b/common/eq_stream_intf.h index 68a25f41c..b2c889244 100644 --- a/common/eq_stream_intf.h +++ b/common/eq_stream_intf.h @@ -100,7 +100,7 @@ public: virtual MatchState CheckSignature(const Signature *sig) { return MatchFailed; } virtual EQStreamState GetState() = 0; virtual void SetOpcodeManager(OpcodeManager **opm) = 0; - virtual const EQEmu::versions::ClientVersion ClientVersion() const { return EQEmu::versions::ClientVersion::Unknown; } + virtual const EQ::versions::ClientVersion ClientVersion() const { return EQ::versions::ClientVersion::Unknown; } virtual Stats GetStats() const = 0; virtual void ResetStats() = 0; virtual EQStreamManagerInterface* GetManager() const = 0; diff --git a/common/eq_stream_proxy.cpp b/common/eq_stream_proxy.cpp index 587e55b64..ca8cb2142 100644 --- a/common/eq_stream_proxy.cpp +++ b/common/eq_stream_proxy.cpp @@ -22,7 +22,7 @@ std::string EQStreamProxy::Describe() const { return(m_structs->Describe()); } -const EQEmu::versions::ClientVersion EQStreamProxy::ClientVersion() const +const EQ::versions::ClientVersion EQStreamProxy::ClientVersion() const { return m_structs->ClientVersion(); } diff --git a/common/eq_stream_proxy.h b/common/eq_stream_proxy.h index 92de5a463..9d007b48e 100644 --- a/common/eq_stream_proxy.h +++ b/common/eq_stream_proxy.h @@ -28,7 +28,7 @@ public: virtual void RemoveData(); virtual bool CheckState(EQStreamState state); virtual std::string Describe() const; - virtual const EQEmu::versions::ClientVersion ClientVersion() const; + virtual const EQ::versions::ClientVersion ClientVersion() const; virtual EQStreamState GetState(); virtual void SetOpcodeManager(OpcodeManager **opm); virtual Stats GetStats() const; diff --git a/common/eqemu_exception.cpp b/common/eqemu_exception.cpp index 88e1ea225..62376283f 100644 --- a/common/eqemu_exception.cpp +++ b/common/eqemu_exception.cpp @@ -18,7 +18,7 @@ #include "eqemu_exception.h" -namespace EQEmu +namespace EQ { Exception::Exception(const char* name, const std::string& description, const char* file, long line) : line_(line), diff --git a/common/eqemu_exception.h b/common/eqemu_exception.h index 1e888da85..9649c7a98 100644 --- a/common/eqemu_exception.h +++ b/common/eqemu_exception.h @@ -22,7 +22,7 @@ #include #include -namespace EQEmu +namespace EQ { //! EQEmu Exception Class /*! @@ -104,7 +104,7 @@ namespace EQEmu } // EQEmu #ifndef EQ_EXCEPT -#define EQ_EXCEPT(n, d) throw EQEmu::Exception(n, d, __FILE__, __LINE__) +#define EQ_EXCEPT(n, d) throw EQ::Exception(n, d, __FILE__, __LINE__) #endif #endif diff --git a/common/event/task.h b/common/event/task.h index ae19700a2..89077734f 100644 --- a/common/event/task.h +++ b/common/event/task.h @@ -8,7 +8,7 @@ namespace EQ { class Task { public: - typedef std::function ResolveFn; + typedef std::function ResolveFn; typedef std::function RejectFn; typedef std::function FinallyFn; typedef std::function TaskFn; @@ -19,7 +19,7 @@ namespace EQ { RejectFn on_catch; FinallyFn on_finally; bool has_result; - EQEmu::Any result; + EQ::Any result; bool has_error; std::exception error; }; @@ -63,7 +63,7 @@ namespace EQ { uv_queue_work(EventLoop::Get().Handle(), m_work, [](uv_work_t* req) { TaskBaton *baton = (TaskBaton*)req->data; - baton->fn([baton](const EQEmu::Any& result) { + baton->fn([baton](const EQ::Any& result) { baton->has_error = false; baton->has_result = true; baton->result = result; diff --git a/common/extprofile.h b/common/extprofile.h index bdb746068..5f69a449d 100644 --- a/common/extprofile.h +++ b/common/extprofile.h @@ -40,7 +40,7 @@ struct ExtendedProfile_Struct { uint16 old_pet_hp; /* Not Used */ uint16 old_pet_mana; /* Not Used */ SpellBuff_Struct pet_buffs[BUFF_COUNT]; /* Not Used */ - EQEmu::TextureMaterialProfile pet_items; /* Not Used */ + EQ::TextureMaterialProfile pet_items; /* Not Used */ char merc_name[64]; /* Used */ uint32 aa_effects; /* Used */ diff --git a/common/fixed_memory_hash_set.h b/common/fixed_memory_hash_set.h index 2b119bd3f..d02900260 100644 --- a/common/fixed_memory_hash_set.h +++ b/common/fixed_memory_hash_set.h @@ -23,7 +23,7 @@ #include "eqemu_exception.h" #include "types.h" -namespace EQEmu { +namespace EQ { /*! Simple HashSet designed to be used in fixed memory that may be difficult to use an allocator for (shared memory), we assume all keys are unsigned int diff --git a/common/fixed_memory_variable_hash_set.h b/common/fixed_memory_variable_hash_set.h index b25fe5b2f..cc0f7979e 100644 --- a/common/fixed_memory_variable_hash_set.h +++ b/common/fixed_memory_variable_hash_set.h @@ -23,7 +23,7 @@ #include "eqemu_exception.h" #include "types.h" -namespace EQEmu { +namespace EQ { /*! Simple HashSet designed to be used in fixed memory that may be difficult to use an allocator for (shared memory), we assume all keys are unsigned int, values are a pointer and size diff --git a/common/inventory_profile.cpp b/common/inventory_profile.cpp index a51b04998..e93146598 100644 --- a/common/inventory_profile.cpp +++ b/common/inventory_profile.cpp @@ -33,7 +33,7 @@ #include -std::list dirty_inst; +std::list dirty_inst; // @@ -48,50 +48,50 @@ ItemInstQueue::~ItemInstQueue() } // Put item onto back of queue -void ItemInstQueue::push(EQEmu::ItemInstance* inst) +void ItemInstQueue::push(EQ::ItemInstance* inst) { m_list.push_back(inst); } // Put item onto front of queue -void ItemInstQueue::push_front(EQEmu::ItemInstance* inst) +void ItemInstQueue::push_front(EQ::ItemInstance* inst) { m_list.push_front(inst); } // Remove item from front of queue -EQEmu::ItemInstance* ItemInstQueue::pop() +EQ::ItemInstance* ItemInstQueue::pop() { if (m_list.empty()) return nullptr; - EQEmu::ItemInstance* inst = m_list.front(); + EQ::ItemInstance* inst = m_list.front(); m_list.pop_front(); return inst; } // Remove item from back of queue -EQEmu::ItemInstance* ItemInstQueue::pop_back() +EQ::ItemInstance* ItemInstQueue::pop_back() { if (m_list.empty()) return nullptr; - EQEmu::ItemInstance* inst = m_list.back(); + EQ::ItemInstance* inst = m_list.back(); m_list.pop_back(); return inst; } // Look at item at front of queue -EQEmu::ItemInstance* ItemInstQueue::peek_front() const +EQ::ItemInstance* ItemInstQueue::peek_front() const { return (m_list.empty()) ? nullptr : m_list.front(); } // -// class EQEmu::InventoryProfile +// class EQ::InventoryProfile // -EQEmu::InventoryProfile::~InventoryProfile() +EQ::InventoryProfile::~InventoryProfile() { for (auto iter = m_worn.begin(); iter != m_worn.end(); ++iter) { safe_delete(iter->second); @@ -119,18 +119,18 @@ EQEmu::InventoryProfile::~InventoryProfile() m_trade.clear(); } -void EQEmu::InventoryProfile::SetInventoryVersion(versions::MobVersion inventory_version) { +void EQ::InventoryProfile::SetInventoryVersion(versions::MobVersion inventory_version) { m_mob_version = versions::ValidateMobVersion(inventory_version); SetGMInventory(m_gm_inventory); } -void EQEmu::InventoryProfile::SetGMInventory(bool gmi_flag) { +void EQ::InventoryProfile::SetGMInventory(bool gmi_flag) { m_gm_inventory = gmi_flag; m_lookup = inventory::DynamicLookup(m_mob_version, gmi_flag); } -void EQEmu::InventoryProfile::CleanDirty() { +void EQ::InventoryProfile::CleanDirty() { auto iter = dirty_inst.begin(); while (iter != dirty_inst.end()) { delete (*iter); @@ -139,14 +139,14 @@ void EQEmu::InventoryProfile::CleanDirty() { dirty_inst.clear(); } -void EQEmu::InventoryProfile::MarkDirty(ItemInstance *inst) { +void EQ::InventoryProfile::MarkDirty(ItemInstance *inst) { if (inst) { dirty_inst.push_back(inst); } } // Retrieve item at specified slot; returns false if item not found -EQEmu::ItemInstance* EQEmu::InventoryProfile::GetItem(int16 slot_id) const +EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id) const { ItemInstance* result = nullptr; @@ -219,31 +219,31 @@ EQEmu::ItemInstance* EQEmu::InventoryProfile::GetItem(int16 slot_id) const } // Retrieve item at specified position within bag -EQEmu::ItemInstance* EQEmu::InventoryProfile::GetItem(int16 slot_id, uint8 bagidx) const +EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id, uint8 bagidx) const { return GetItem(InventoryProfile::CalcSlotId(slot_id, bagidx)); } // Put an item snto specified slot -int16 EQEmu::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst) +int16 EQ::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst) { - if (slot_id <= EQEmu::invslot::POSSESSIONS_END && slot_id >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) { if ((((uint64)1 << slot_id) & m_lookup->PossessionsBitmask) == 0) - return EQEmu::invslot::SLOT_INVALID; + return EQ::invslot::SLOT_INVALID; } - else if (slot_id <= EQEmu::invbag::GENERAL_BAGS_END && slot_id >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((slot_id - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); + else if (slot_id <= EQ::invbag::GENERAL_BAGS_END && slot_id >= EQ::invbag::GENERAL_BAGS_BEGIN) { + auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((slot_id - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); if ((((uint64)1 << temp_slot) & m_lookup->PossessionsBitmask) == 0) - return EQEmu::invslot::SLOT_INVALID; + return EQ::invslot::SLOT_INVALID; } - else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) - return EQEmu::invslot::SLOT_INVALID; + else if (slot_id <= EQ::invslot::BANK_END && slot_id >= EQ::invslot::BANK_BEGIN) { + if ((slot_id - EQ::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) + return EQ::invslot::SLOT_INVALID; } - else if (slot_id <= EQEmu::invbag::BANK_BAGS_END && slot_id >= EQEmu::invbag::BANK_BAGS_BEGIN) { - auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; + else if (slot_id <= EQ::invbag::BANK_BAGS_END && slot_id >= EQ::invbag::BANK_BAGS_BEGIN) { + auto temp_slot = (slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT; if (temp_slot >= m_lookup->InventoryTypeSize.Bank) - return EQEmu::invslot::SLOT_INVALID; + return EQ::invslot::SLOT_INVALID; } // Clean up item already in slot (if exists) @@ -259,17 +259,17 @@ int16 EQEmu::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst) return _PutItem(slot_id, inst.Clone()); } -int16 EQEmu::InventoryProfile::PushCursor(const ItemInstance &inst) { +int16 EQ::InventoryProfile::PushCursor(const ItemInstance &inst) { m_cursor.push(inst.Clone()); return invslot::slotCursor; } -EQEmu::ItemInstance* EQEmu::InventoryProfile::GetCursorItem() { +EQ::ItemInstance* EQ::InventoryProfile::GetCursorItem() { return m_cursor.peek_front(); } // Swap items in inventory -bool EQEmu::InventoryProfile::SwapItem( +bool EQ::InventoryProfile::SwapItem( int16 source_slot, int16 destination_slot, SwapItemFailState &fail_state, @@ -280,54 +280,54 @@ bool EQEmu::InventoryProfile::SwapItem( ) { fail_state = swapInvalid; - if (source_slot <= EQEmu::invslot::POSSESSIONS_END && source_slot >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (source_slot <= EQ::invslot::POSSESSIONS_END && source_slot >= EQ::invslot::POSSESSIONS_BEGIN) { if ((((uint64) 1 << source_slot) & m_lookup->PossessionsBitmask) == 0) { fail_state = swapNotAllowed; return false; } } - else if (source_slot <= EQEmu::invbag::GENERAL_BAGS_END && source_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((source_slot - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); + else if (source_slot <= EQ::invbag::GENERAL_BAGS_END && source_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) { + auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((source_slot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); if ((((uint64)1 << temp_slot) & m_lookup->PossessionsBitmask) == 0) { fail_state = swapNotAllowed; return false; } } - else if (source_slot <= EQEmu::invslot::BANK_END && source_slot >= EQEmu::invslot::BANK_BEGIN) { - if ((source_slot - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) { + else if (source_slot <= EQ::invslot::BANK_END && source_slot >= EQ::invslot::BANK_BEGIN) { + if ((source_slot - EQ::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) { fail_state = swapNotAllowed; return false; } } - else if (source_slot <= EQEmu::invbag::BANK_BAGS_END && source_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) { - auto temp_slot = (source_slot - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; + else if (source_slot <= EQ::invbag::BANK_BAGS_END && source_slot >= EQ::invbag::BANK_BAGS_BEGIN) { + auto temp_slot = (source_slot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT; if (temp_slot >= m_lookup->InventoryTypeSize.Bank) { fail_state = swapNotAllowed; return false; } } - if (destination_slot <= EQEmu::invslot::POSSESSIONS_END && destination_slot >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (destination_slot <= EQ::invslot::POSSESSIONS_END && destination_slot >= EQ::invslot::POSSESSIONS_BEGIN) { if ((((uint64)1 << destination_slot) & m_lookup->PossessionsBitmask) == 0) { fail_state = swapNotAllowed; return false; } } - else if (destination_slot <= EQEmu::invbag::GENERAL_BAGS_END && destination_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((destination_slot - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); + else if (destination_slot <= EQ::invbag::GENERAL_BAGS_END && destination_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) { + auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((destination_slot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); if ((((uint64)1 << temp_slot) & m_lookup->PossessionsBitmask) == 0) { fail_state = swapNotAllowed; return false; } } - else if (destination_slot <= EQEmu::invslot::BANK_END && destination_slot >= EQEmu::invslot::BANK_BEGIN) { - if ((destination_slot - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) { + else if (destination_slot <= EQ::invslot::BANK_END && destination_slot >= EQ::invslot::BANK_BEGIN) { + if ((destination_slot - EQ::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) { fail_state = swapNotAllowed; return false; } } - else if (destination_slot <= EQEmu::invbag::BANK_BAGS_END && destination_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) { - auto temp_slot = (destination_slot - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; + else if (destination_slot <= EQ::invbag::BANK_BAGS_END && destination_slot >= EQ::invbag::BANK_BAGS_BEGIN) { + auto temp_slot = (destination_slot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT; if (temp_slot >= m_lookup->InventoryTypeSize.Bank) { fail_state = swapNotAllowed; return false; @@ -399,7 +399,7 @@ bool EQEmu::InventoryProfile::SwapItem( } // Remove item from inventory (with memory delete) -bool EQEmu::InventoryProfile::DeleteItem(int16 slot_id, uint8 quantity) { +bool EQ::InventoryProfile::DeleteItem(int16 slot_id, uint8 quantity) { // Pop item out of inventory map (or queue) ItemInstance *item_to_delete = PopItem(slot_id); @@ -434,7 +434,7 @@ bool EQEmu::InventoryProfile::DeleteItem(int16 slot_id, uint8 quantity) { } // Checks All items in a bag for No Drop -bool EQEmu::InventoryProfile::CheckNoDrop(int16 slot_id, bool recurse) +bool EQ::InventoryProfile::CheckNoDrop(int16 slot_id, bool recurse) { ItemInstance* inst = GetItem(slot_id); if (!inst) @@ -445,7 +445,7 @@ bool EQEmu::InventoryProfile::CheckNoDrop(int16 slot_id, bool recurse) // Remove item from bucket without memory delete // Returns item pointer if full delete was successful -EQEmu::ItemInstance* EQEmu::InventoryProfile::PopItem(int16 slot_id) +EQ::ItemInstance* EQ::InventoryProfile::PopItem(int16 slot_id) { ItemInstance* p = nullptr; @@ -488,7 +488,7 @@ EQEmu::ItemInstance* EQEmu::InventoryProfile::PopItem(int16 slot_id) return p; } -bool EQEmu::InventoryProfile::HasSpaceForItem(const ItemData *ItemToTry, int16 Quantity) { +bool EQ::InventoryProfile::HasSpaceForItem(const ItemData *ItemToTry, int16 Quantity) { if (ItemToTry->Stackable) { @@ -592,7 +592,7 @@ bool EQEmu::InventoryProfile::HasSpaceForItem(const ItemData *ItemToTry, int16 Q //This function has a flaw in that it only returns the last stack that it looked at //when quantity is greater than 1 and not all of quantity can be found in 1 stack. -int16 EQEmu::InventoryProfile::HasItem(uint32 item_id, uint8 quantity, uint8 where) +int16 EQ::InventoryProfile::HasItem(uint32 item_id, uint8 quantity, uint8 where) { int16 slot_id = INVALID_INDEX; @@ -642,7 +642,7 @@ int16 EQEmu::InventoryProfile::HasItem(uint32 item_id, uint8 quantity, uint8 whe } //this function has the same quantity flaw mentioned above in HasItem() -int16 EQEmu::InventoryProfile::HasItemByUse(uint8 use, uint8 quantity, uint8 where) +int16 EQ::InventoryProfile::HasItemByUse(uint8 use, uint8 quantity, uint8 where) { int16 slot_id = INVALID_INDEX; @@ -688,7 +688,7 @@ int16 EQEmu::InventoryProfile::HasItemByUse(uint8 use, uint8 quantity, uint8 whe return slot_id; } -int16 EQEmu::InventoryProfile::HasItemByLoreGroup(uint32 loregroup, uint8 where) +int16 EQ::InventoryProfile::HasItemByLoreGroup(uint32 loregroup, uint8 where) { int16 slot_id = INVALID_INDEX; @@ -736,7 +736,7 @@ int16 EQEmu::InventoryProfile::HasItemByLoreGroup(uint32 loregroup, uint8 where) // Locate an available inventory slot // Returns slot_id when there's one available, else SLOT_INVALID -int16 EQEmu::InventoryProfile::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, bool is_arrow) +int16 EQ::InventoryProfile::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, bool is_arrow) { // Check basic inventory for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) { @@ -786,7 +786,7 @@ int16 EQEmu::InventoryProfile::FindFreeSlot(bool for_bag, bool try_cursor, uint8 } // This is a mix of HasSpaceForItem and FindFreeSlot..due to existing coding behavior, it was better to add a new helper function... -int16 EQEmu::InventoryProfile::FindFreeSlotForTradeItem(const ItemInstance* inst, int16 general_start, uint8 bag_start) { +int16 EQ::InventoryProfile::FindFreeSlotForTradeItem(const ItemInstance* inst, int16 general_start, uint8 bag_start) { // Do not arbitrarily use this function..it is designed for use with Client::ResetTrade() and Client::FinishTrade(). // If you have a need, use it..but, understand it is not a suitable replacement for InventoryProfile::FindFreeSlot(). // @@ -924,7 +924,7 @@ int16 EQEmu::InventoryProfile::FindFreeSlotForTradeItem(const ItemInstance* inst } // Opposite of below: Get parent bag slot_id from a slot inside of bag -int16 EQEmu::InventoryProfile::CalcSlotId(int16 slot_id) { +int16 EQ::InventoryProfile::CalcSlotId(int16 slot_id) { int16 parent_slot_id = INVALID_INDEX; // this is not a bag range... using this risks over-writing existing items @@ -952,7 +952,7 @@ int16 EQEmu::InventoryProfile::CalcSlotId(int16 slot_id) { } // Calculate slot_id for an item within a bag -int16 EQEmu::InventoryProfile::CalcSlotId(int16 bagslot_id, uint8 bagidx) { +int16 EQ::InventoryProfile::CalcSlotId(int16 bagslot_id, uint8 bagidx) { if (!InventoryProfile::SupportsContainers(bagslot_id)) return INVALID_INDEX; @@ -977,7 +977,7 @@ int16 EQEmu::InventoryProfile::CalcSlotId(int16 bagslot_id, uint8 bagidx) { return slot_id; } -uint8 EQEmu::InventoryProfile::CalcBagIdx(int16 slot_id) { +uint8 EQ::InventoryProfile::CalcBagIdx(int16 slot_id) { uint8 index = 0; // this is not a bag range... using this risks over-writing existing items @@ -1006,7 +1006,7 @@ uint8 EQEmu::InventoryProfile::CalcBagIdx(int16 slot_id) { return index; } -int16 EQEmu::InventoryProfile::CalcSlotFromMaterial(uint8 material) +int16 EQ::InventoryProfile::CalcSlotFromMaterial(uint8 material) { switch (material) { @@ -1033,7 +1033,7 @@ int16 EQEmu::InventoryProfile::CalcSlotFromMaterial(uint8 material) } } -uint8 EQEmu::InventoryProfile::CalcMaterialFromSlot(int16 equipslot) +uint8 EQ::InventoryProfile::CalcMaterialFromSlot(int16 equipslot) { switch (equipslot) { @@ -1061,7 +1061,7 @@ uint8 EQEmu::InventoryProfile::CalcMaterialFromSlot(int16 equipslot) } } -bool EQEmu::InventoryProfile::CanItemFitInContainer(const ItemData *ItemToTry, const ItemData *Container) { +bool EQ::InventoryProfile::CanItemFitInContainer(const ItemData *ItemToTry, const ItemData *Container) { if (!ItemToTry || !Container) return false; @@ -1078,7 +1078,7 @@ bool EQEmu::InventoryProfile::CanItemFitInContainer(const ItemData *ItemToTry, c return true; } -bool EQEmu::InventoryProfile::SupportsClickCasting(int16 slot_id) +bool EQ::InventoryProfile::SupportsClickCasting(int16 slot_id) { // there are a few non-potion items that identify as ItemTypePotion..so, we still need to ubiquitously include the equipment range if (slot_id >= invslot::EQUIPMENT_BEGIN && slot_id <= invslot::EQUIPMENT_END) { @@ -1095,7 +1095,7 @@ bool EQEmu::InventoryProfile::SupportsClickCasting(int16 slot_id) return false; } -bool EQEmu::InventoryProfile::SupportsPotionBeltCasting(int16 slot_id) +bool EQ::InventoryProfile::SupportsPotionBeltCasting(int16 slot_id) { // does this have the same criteria as 'SupportsClickCasting' above? (bag clicking per client) if (slot_id >= invslot::EQUIPMENT_BEGIN && slot_id <= invslot::EQUIPMENT_END) { @@ -1112,7 +1112,7 @@ bool EQEmu::InventoryProfile::SupportsPotionBeltCasting(int16 slot_id) } // Test whether a given slot can support a container item -bool EQEmu::InventoryProfile::SupportsContainers(int16 slot_id) +bool EQ::InventoryProfile::SupportsContainers(int16 slot_id) { if ((slot_id == invslot::slotCursor) || (slot_id >= invslot::GENERAL_BEGIN && slot_id <= invslot::GENERAL_END) || @@ -1126,7 +1126,7 @@ bool EQEmu::InventoryProfile::SupportsContainers(int16 slot_id) return false; } -int EQEmu::InventoryProfile::GetSlotByItemInst(ItemInstance *inst) { +int EQ::InventoryProfile::GetSlotByItemInst(ItemInstance *inst) { if (!inst) return INVALID_INDEX; @@ -1162,7 +1162,7 @@ int EQEmu::InventoryProfile::GetSlotByItemInst(ItemInstance *inst) { return INVALID_INDEX; } -uint8 EQEmu::InventoryProfile::FindBrightestLightType() +uint8 EQ::InventoryProfile::FindBrightestLightType() { uint8 brightest_light_type = 0; @@ -1213,7 +1213,7 @@ uint8 EQEmu::InventoryProfile::FindBrightestLightType() return brightest_light_type; } -void EQEmu::InventoryProfile::dumpEntireInventory() { +void EQ::InventoryProfile::dumpEntireInventory() { dumpWornItems(); dumpInventory(); @@ -1223,29 +1223,29 @@ void EQEmu::InventoryProfile::dumpEntireInventory() { std::cout << std::endl; } -void EQEmu::InventoryProfile::dumpWornItems() { +void EQ::InventoryProfile::dumpWornItems() { std::cout << "Worn items:" << std::endl; dumpItemCollection(m_worn); } -void EQEmu::InventoryProfile::dumpInventory() { +void EQ::InventoryProfile::dumpInventory() { std::cout << "Inventory items:" << std::endl; dumpItemCollection(m_inv); } -void EQEmu::InventoryProfile::dumpBankItems() { +void EQ::InventoryProfile::dumpBankItems() { std::cout << "Bank items:" << std::endl; dumpItemCollection(m_bank); } -void EQEmu::InventoryProfile::dumpSharedBankItems() { +void EQ::InventoryProfile::dumpSharedBankItems() { std::cout << "Shared Bank items:" << std::endl; dumpItemCollection(m_shbank); } -int EQEmu::InventoryProfile::GetSlotByItemInstCollection(const std::map &collection, ItemInstance *inst) { +int EQ::InventoryProfile::GetSlotByItemInstCollection(const std::map &collection, ItemInstance *inst) { for (auto iter = collection.begin(); iter != collection.end(); ++iter) { ItemInstance *t_inst = iter->second; if (t_inst == inst) { @@ -1261,10 +1261,10 @@ int EQEmu::InventoryProfile::GetSlotByItemInstCollection(const std::map &collection) +void EQ::InventoryProfile::dumpItemCollection(const std::map &collection) { for (auto it = collection.cbegin(); it != collection.cend(); ++it) { auto inst = it->second; @@ -1278,7 +1278,7 @@ void EQEmu::InventoryProfile::dumpItemCollection(const std::map::const_iterator *it) +void EQ::InventoryProfile::dumpBagContents(ItemInstance *inst, std::map::const_iterator *it) { if (!inst || !inst->IsClassBag()) return; @@ -1297,14 +1297,14 @@ void EQEmu::InventoryProfile::dumpBagContents(ItemInstance *inst, std::map& bucket, int16 slot_id) const +EQ::ItemInstance* EQ::InventoryProfile::_GetItem(const std::map& bucket, int16 slot_id) const { - if (slot_id <= EQEmu::invslot::POSSESSIONS_END && slot_id >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) { if ((((uint64)1 << slot_id) & m_lookup->PossessionsBitmask) == 0) return nullptr; } - else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) { - if (slot_id - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) + else if (slot_id <= EQ::invslot::BANK_END && slot_id >= EQ::invslot::BANK_BEGIN) { + if (slot_id - EQ::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) return nullptr; } @@ -1319,7 +1319,7 @@ EQEmu::ItemInstance* EQEmu::InventoryProfile::_GetItem(const std::map= invslot::BANK_BEGIN && slot_id <= invslot::BANK_END) { - if (slot_id - EQEmu::invslot::BANK_BEGIN < m_lookup->InventoryTypeSize.Bank) { + if (slot_id - EQ::invslot::BANK_BEGIN < m_lookup->InventoryTypeSize.Bank) { m_bank[slot_id] = inst; result = slot_id; } @@ -1389,17 +1389,17 @@ int16 EQEmu::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst) } // Internal Method: Checks an inventory bucket for a particular item -int16 EQEmu::InventoryProfile::_HasItem(std::map& bucket, uint32 item_id, uint8 quantity) +int16 EQ::InventoryProfile::_HasItem(std::map& bucket, uint32 item_id, uint8 quantity) { uint32 quantity_found = 0; for (auto iter = bucket.begin(); iter != bucket.end(); ++iter) { - if (iter->first <= EQEmu::invslot::POSSESSIONS_END && iter->first >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (iter->first <= EQ::invslot::POSSESSIONS_END && iter->first >= EQ::invslot::POSSESSIONS_BEGIN) { if ((((uint64)1 << iter->first) & m_lookup->PossessionsBitmask) == 0) continue; } - else if (iter->first <= EQEmu::invslot::BANK_END && iter->first >= EQEmu::invslot::BANK_BEGIN) { - if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) + else if (iter->first <= EQ::invslot::BANK_END && iter->first >= EQ::invslot::BANK_BEGIN) { + if (iter->first - EQ::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) continue; } @@ -1440,7 +1440,7 @@ int16 EQEmu::InventoryProfile::_HasItem(std::map& bucket, } // Internal Method: Checks an inventory queue type bucket for a particular item -int16 EQEmu::InventoryProfile::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity) +int16 EQ::InventoryProfile::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity) { // The downfall of this (these) queue procedure is that callers presume that when an item is // found, it is presented as being available on the cursor. In cases of a parity check, this @@ -1491,17 +1491,17 @@ int16 EQEmu::InventoryProfile::_HasItem(ItemInstQueue& iqueue, uint32 item_id, u } // Internal Method: Checks an inventory bucket for a particular item -int16 EQEmu::InventoryProfile::_HasItemByUse(std::map& bucket, uint8 use, uint8 quantity) +int16 EQ::InventoryProfile::_HasItemByUse(std::map& bucket, uint8 use, uint8 quantity) { uint32 quantity_found = 0; for (auto iter = bucket.begin(); iter != bucket.end(); ++iter) { - if (iter->first <= EQEmu::invslot::POSSESSIONS_END && iter->first >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (iter->first <= EQ::invslot::POSSESSIONS_END && iter->first >= EQ::invslot::POSSESSIONS_BEGIN) { if ((((uint64)1 << iter->first) & m_lookup->PossessionsBitmask) == 0) continue; } - else if (iter->first <= EQEmu::invslot::BANK_END && iter->first >= EQEmu::invslot::BANK_BEGIN) { - if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) + else if (iter->first <= EQ::invslot::BANK_END && iter->first >= EQ::invslot::BANK_BEGIN) { + if (iter->first - EQ::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) continue; } @@ -1532,7 +1532,7 @@ int16 EQEmu::InventoryProfile::_HasItemByUse(std::map& buc } // Internal Method: Checks an inventory queue type bucket for a particular item -int16 EQEmu::InventoryProfile::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity) +int16 EQ::InventoryProfile::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity) { uint32 quantity_found = 0; @@ -1566,15 +1566,15 @@ int16 EQEmu::InventoryProfile::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, u return INVALID_INDEX; } -int16 EQEmu::InventoryProfile::_HasItemByLoreGroup(std::map& bucket, uint32 loregroup) +int16 EQ::InventoryProfile::_HasItemByLoreGroup(std::map& bucket, uint32 loregroup) { for (auto iter = bucket.begin(); iter != bucket.end(); ++iter) { - if (iter->first <= EQEmu::invslot::POSSESSIONS_END && iter->first >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (iter->first <= EQ::invslot::POSSESSIONS_END && iter->first >= EQ::invslot::POSSESSIONS_BEGIN) { if ((((uint64)1 << iter->first) & m_lookup->PossessionsBitmask) == 0) continue; } - else if (iter->first <= EQEmu::invslot::BANK_END && iter->first >= EQEmu::invslot::BANK_BEGIN) { - if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) + else if (iter->first <= EQ::invslot::BANK_END && iter->first >= EQ::invslot::BANK_BEGIN) { + if (iter->first - EQ::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) continue; } @@ -1611,11 +1611,11 @@ int16 EQEmu::InventoryProfile::_HasItemByLoreGroup(std::map::const_iterator cbegin() { return m_list.cbegin(); } - inline std::list::const_iterator cend() { return m_list.cend(); } + inline std::list::const_iterator cbegin() { return m_list.cbegin(); } + inline std::list::const_iterator cend() { return m_list.cend(); } inline int size() { return static_cast(m_list.size()); } // TODO: change to size_t inline bool empty() { return m_list.empty(); } - void push(EQEmu::ItemInstance* inst); - void push_front(EQEmu::ItemInstance* inst); - EQEmu::ItemInstance* pop(); - EQEmu::ItemInstance* pop_back(); - EQEmu::ItemInstance* peek_front() const; + void push(EQ::ItemInstance* inst); + void push_front(EQ::ItemInstance* inst); + EQ::ItemInstance* pop(); + EQ::ItemInstance* pop_back(); + EQ::ItemInstance* peek_front() const; protected: ///////////////////////// // Protected Members ///////////////////////// - std::list m_list; + std::list m_list; }; // ######################################## -// Class: EQEmu::InventoryProfile +// Class: EQ::InventoryProfile // Character inventory -namespace EQEmu +namespace EQ { class InventoryProfile { diff --git a/common/inventory_slot.cpp b/common/inventory_slot.cpp index 21af3eb45..b86b5ca91 100644 --- a/common/inventory_slot.cpp +++ b/common/inventory_slot.cpp @@ -22,7 +22,7 @@ #include "string_util.h" -int8 EQEmu::inventory::ConvertEquipmentIndexToTextureIndex(int16 slot_index) +int8 EQ::inventory::ConvertEquipmentIndexToTextureIndex(int16 slot_index) { switch (slot_index) { case invslot::slotHead: @@ -48,7 +48,7 @@ int8 EQEmu::inventory::ConvertEquipmentIndexToTextureIndex(int16 slot_index) } } -int8 EQEmu::inventory::ConvertEquipmentSlotToTextureIndex(const InventorySlot& inventory_slot) +int8 EQ::inventory::ConvertEquipmentSlotToTextureIndex(const InventorySlot& inventory_slot) { if ((!inventory_slot.Typeless() && !inventory_slot.IsTypeIndex(invtype::typePossessions)) || !inventory_slot.IsContainerIndex(invbag::SLOT_INVALID) || !inventory_slot.IsSocketIndex(invaug::SOCKET_INVALID)) return textures::textureInvalid; @@ -56,7 +56,7 @@ int8 EQEmu::inventory::ConvertEquipmentSlotToTextureIndex(const InventorySlot& i return ConvertEquipmentIndexToTextureIndex(inventory_slot.SlotIndex()); } -int16 EQEmu::inventory::ConvertTextureIndexToEquipmentIndex(int8 texture_index) +int16 EQ::inventory::ConvertTextureIndexToEquipmentIndex(int8 texture_index) { switch (texture_index) { case textures::armorHead: @@ -82,7 +82,7 @@ int16 EQEmu::inventory::ConvertTextureIndexToEquipmentIndex(int8 texture_index) } } -bool EQEmu::InventorySlot::IsValidSlot() const +bool EQ::InventorySlot::IsValidSlot() const { if (_typeless) return false; @@ -100,7 +100,7 @@ bool EQEmu::InventorySlot::IsValidSlot() const return true; } -bool EQEmu::InventorySlot::IsDeleteSlot() const +bool EQ::InventorySlot::IsDeleteSlot() const { if (_typeless) return (_slot_index == invslot::SLOT_INVALID && _container_index == invbag::SLOT_INVALID && _socket_index == invaug::SOCKET_INVALID); @@ -108,7 +108,7 @@ bool EQEmu::InventorySlot::IsDeleteSlot() const return (_type_index == invtype::TYPE_INVALID && _slot_index == invslot::SLOT_INVALID && _container_index == invbag::SLOT_INVALID && _socket_index == invaug::SOCKET_INVALID); } -bool EQEmu::InventorySlot::IsEquipmentIndex(int16 slot_index) +bool EQ::InventorySlot::IsEquipmentIndex(int16 slot_index) { if (slot_index < invslot::EQUIPMENT_BEGIN || slot_index > invslot::EQUIPMENT_END) return false; @@ -116,7 +116,7 @@ bool EQEmu::InventorySlot::IsEquipmentIndex(int16 slot_index) return true; } -bool EQEmu::InventorySlot::IsGeneralIndex(int16 slot_index) +bool EQ::InventorySlot::IsGeneralIndex(int16 slot_index) { if (slot_index < invslot::GENERAL_BEGIN || slot_index > invslot::GENERAL_END) return false; @@ -124,7 +124,7 @@ bool EQEmu::InventorySlot::IsGeneralIndex(int16 slot_index) return true; } -bool EQEmu::InventorySlot::IsCursorIndex(int16 slot_index) +bool EQ::InventorySlot::IsCursorIndex(int16 slot_index) { if (slot_index == invslot::slotCursor) return true; @@ -132,7 +132,7 @@ bool EQEmu::InventorySlot::IsCursorIndex(int16 slot_index) return false; } -bool EQEmu::InventorySlot::IsWeaponIndex(int16 slot_index) +bool EQ::InventorySlot::IsWeaponIndex(int16 slot_index) { if (slot_index == invslot::slotPrimary || slot_index == invslot::slotSecondary || slot_index == invslot::slotRange) return true; @@ -140,7 +140,7 @@ bool EQEmu::InventorySlot::IsWeaponIndex(int16 slot_index) return false; } -bool EQEmu::InventorySlot::IsTextureIndex(int16 slot_index) +bool EQ::InventorySlot::IsTextureIndex(int16 slot_index) { switch (slot_index) { case invslot::slotHead: @@ -158,7 +158,7 @@ bool EQEmu::InventorySlot::IsTextureIndex(int16 slot_index) } } -bool EQEmu::InventorySlot::IsTintableIndex(int16 slot_index) +bool EQ::InventorySlot::IsTintableIndex(int16 slot_index) { switch (slot_index) { case invslot::slotHead: @@ -174,7 +174,7 @@ bool EQEmu::InventorySlot::IsTintableIndex(int16 slot_index) } } -bool EQEmu::InventorySlot::IsEquipmentSlot() const +bool EQ::InventorySlot::IsEquipmentSlot() const { if (!_typeless && (_type_index != invtype::typePossessions)) return false; @@ -185,7 +185,7 @@ bool EQEmu::InventorySlot::IsEquipmentSlot() const return IsEquipmentIndex(_slot_index); } -bool EQEmu::InventorySlot::IsGeneralSlot() const +bool EQ::InventorySlot::IsGeneralSlot() const { if (!_typeless && (_type_index != invtype::typePossessions)) return false; @@ -196,7 +196,7 @@ bool EQEmu::InventorySlot::IsGeneralSlot() const return IsGeneralIndex(_socket_index); } -bool EQEmu::InventorySlot::IsCursorSlot() const +bool EQ::InventorySlot::IsCursorSlot() const { if (!_typeless && (_type_index != invtype::typePossessions)) return false; @@ -207,7 +207,7 @@ bool EQEmu::InventorySlot::IsCursorSlot() const return IsCursorIndex(_slot_index); } -bool EQEmu::InventorySlot::IsWeaponSlot() const +bool EQ::InventorySlot::IsWeaponSlot() const { if (!_typeless && (_type_index != invtype::typePossessions)) return false; @@ -218,7 +218,7 @@ bool EQEmu::InventorySlot::IsWeaponSlot() const return IsWeaponIndex(_slot_index); } -bool EQEmu::InventorySlot::IsTextureSlot() const +bool EQ::InventorySlot::IsTextureSlot() const { if (!_typeless && (_type_index != invtype::typePossessions)) return false; @@ -229,7 +229,7 @@ bool EQEmu::InventorySlot::IsTextureSlot() const return IsTextureIndex(_slot_index); } -bool EQEmu::InventorySlot::IsTintableSlot() const +bool EQ::InventorySlot::IsTintableSlot() const { if (!_typeless && (_type_index != invtype::typePossessions)) return false; @@ -240,7 +240,7 @@ bool EQEmu::InventorySlot::IsTintableSlot() const return IsTintableIndex(_slot_index); } -bool EQEmu::InventorySlot::IsSlot() const +bool EQ::InventorySlot::IsSlot() const { if (!_typeless && (_type_index == invtype::TYPE_INVALID)) return false; @@ -254,7 +254,7 @@ bool EQEmu::InventorySlot::IsSlot() const return true; } -bool EQEmu::InventorySlot::IsSlotSocket() const +bool EQ::InventorySlot::IsSlotSocket() const { if (!_typeless && (_type_index == invtype::TYPE_INVALID)) return false; @@ -268,7 +268,7 @@ bool EQEmu::InventorySlot::IsSlotSocket() const return true; } -bool EQEmu::InventorySlot::IsContainer() const +bool EQ::InventorySlot::IsContainer() const { if (!_typeless && (_type_index == invtype::TYPE_INVALID)) return false; @@ -282,7 +282,7 @@ bool EQEmu::InventorySlot::IsContainer() const return true; } -bool EQEmu::InventorySlot::IsContainerSocket() const +bool EQ::InventorySlot::IsContainerSocket() const { if (!_typeless && (_type_index == invtype::TYPE_INVALID)) return false; @@ -296,12 +296,12 @@ bool EQEmu::InventorySlot::IsContainerSocket() const return true; } -EQEmu::InventorySlot EQEmu::InventorySlot::ToTopOwner() const +EQ::InventorySlot EQ::InventorySlot::ToTopOwner() const { return InventorySlot(_type_index, _slot_index); } -EQEmu::InventorySlot EQEmu::InventorySlot::ToOwner() const +EQ::InventorySlot EQ::InventorySlot::ToOwner() const { if (IsSlot() || IsSlotSocket() || IsContainer()) return InventorySlot(_type_index, _slot_index); @@ -312,17 +312,17 @@ EQEmu::InventorySlot EQEmu::InventorySlot::ToOwner() const return InventorySlot(); } -const std::string EQEmu::InventorySlot::ToString() const +const std::string EQ::InventorySlot::ToString() const { return StringFormat("(%i%s, %i, %i, %i)", _type_index, (_typeless ? " [typeless]" : ""), _slot_index, _container_index, _socket_index); } -const std::string EQEmu::InventorySlot::ToName() const +const std::string EQ::InventorySlot::ToName() const { return StringFormat("InventorySlot - _type_index: %i%s, _slot_index: %i, _container_index: %i, _socket_index: %i", _type_index, (_typeless ? " [typeless]" : ""), _slot_index, _container_index, _socket_index); } -void EQEmu::InventorySlot::SetInvalidSlot() +void EQ::InventorySlot::SetInvalidSlot() { _type_index = invtype::TYPE_INVALID; _slot_index = invslot::SLOT_INVALID; @@ -330,7 +330,7 @@ void EQEmu::InventorySlot::SetInvalidSlot() _socket_index = invaug::SOCKET_INVALID; } -//bool EQEmu::InventorySlot::IsBonusIndex(int16 slot_index) +//bool EQ::InventorySlot::IsBonusIndex(int16 slot_index) //{ // if ((slot_index >= inventory::EquipmentBegin) && (slot_index <= inventory::EquipmentEnd) && (slot_index != inventory::slotAmmo)) // return true; @@ -338,7 +338,7 @@ void EQEmu::InventorySlot::SetInvalidSlot() // return false; //} -//bool EQEmu::InventorySlot::IsBonusSlot() const +//bool EQ::InventorySlot::IsBonusSlot() const //{ // if ((_type_index != inventory::typePossessions) || (_container_index != inventory::containerInvalid) || (_socket_index != inventory::socketInvalid)) // return false; @@ -346,7 +346,7 @@ void EQEmu::InventorySlot::SetInvalidSlot() // return IsBonusIndex(_slot_index); //} -bool inventory_slot_typeless_lessthan(const EQEmu::InventorySlot& lhs, const EQEmu::InventorySlot& rhs) +bool inventory_slot_typeless_lessthan(const EQ::InventorySlot& lhs, const EQ::InventorySlot& rhs) { if (lhs.SlotIndex() < rhs.SlotIndex()) return true; @@ -360,7 +360,7 @@ bool inventory_slot_typeless_lessthan(const EQEmu::InventorySlot& lhs, const EQE return false; } -bool EQEmu::InventorySlot::operator<(const InventorySlot& rhs) const +bool EQ::InventorySlot::operator<(const InventorySlot& rhs) const { if (Typeless() || rhs.Typeless()) return inventory_slot_typeless_lessthan(*this, rhs); @@ -380,7 +380,7 @@ bool EQEmu::InventorySlot::operator<(const InventorySlot& rhs) const return false; } -bool EQEmu::operator==(const InventorySlot& lhs, const InventorySlot& rhs) +bool EQ::operator==(const InventorySlot& lhs, const InventorySlot& rhs) { if (lhs.Typeless() || rhs.Typeless()) return ((lhs.SlotIndex() == rhs.SlotIndex()) && (lhs.ContainerIndex() == rhs.ContainerIndex()) && (lhs.SocketIndex() == rhs.SocketIndex())); diff --git a/common/inventory_slot.h b/common/inventory_slot.h index 967673f99..d61d8acb0 100644 --- a/common/inventory_slot.h +++ b/common/inventory_slot.h @@ -23,7 +23,7 @@ #include "emu_constants.h" -namespace EQEmu +namespace EQ { class InventorySlot; diff --git a/common/ipc_mutex.cpp b/common/ipc_mutex.cpp index 75e0a63a1..5eb4eedfc 100644 --- a/common/ipc_mutex.cpp +++ b/common/ipc_mutex.cpp @@ -31,7 +31,7 @@ #include "eqemu_exception.h" #include "eqemu_config.h" -namespace EQEmu { +namespace EQ { struct IPCMutex::Implementation { #ifdef _WINDOWS HANDLE mut_; diff --git a/common/ipc_mutex.h b/common/ipc_mutex.h index ab0af4817..a8f2fd13c 100644 --- a/common/ipc_mutex.h +++ b/common/ipc_mutex.h @@ -21,7 +21,7 @@ #include -namespace EQEmu { +namespace EQ { //! Interprocess Named Binary Semaphore (Mutex) /*! diff --git a/common/item_data.cpp b/common/item_data.cpp index c0e70d72a..f3e13edf7 100644 --- a/common/item_data.cpp +++ b/common/item_data.cpp @@ -23,7 +23,7 @@ //#include "deity.h" -uint32 EQEmu::item::ConvertAugTypeToAugTypeBit(uint8 aug_type) +uint32 EQ::item::ConvertAugTypeToAugTypeBit(uint8 aug_type) { switch (aug_type) { case AugTypeGeneralSingleStat: @@ -95,7 +95,7 @@ uint32 EQEmu::item::ConvertAugTypeToAugTypeBit(uint8 aug_type) } } -uint8 EQEmu::item::ConvertAugTypeBitToAugType(uint32 aug_type_bit) +uint8 EQ::item::ConvertAugTypeBitToAugType(uint32 aug_type_bit) { switch (aug_type_bit) { case bit_AugTypeGeneralSingleStat: @@ -167,7 +167,7 @@ uint8 EQEmu::item::ConvertAugTypeBitToAugType(uint32 aug_type_bit) } } -bool EQEmu::ItemData::IsEquipable(uint16 race_id, uint16 class_id) const +bool EQ::ItemData::IsEquipable(uint16 race_id, uint16 class_id) const { if (!(Races & GetPlayerRaceBit(race_id))) return false; @@ -178,37 +178,37 @@ bool EQEmu::ItemData::IsEquipable(uint16 race_id, uint16 class_id) const return true; } -bool EQEmu::ItemData::IsClassCommon() const +bool EQ::ItemData::IsClassCommon() const { return (ItemClass == item::ItemClassCommon); } -bool EQEmu::ItemData::IsClassBag() const +bool EQ::ItemData::IsClassBag() const { return (ItemClass == item::ItemClassBag); } -bool EQEmu::ItemData::IsClassBook() const +bool EQ::ItemData::IsClassBook() const { return (ItemClass == item::ItemClassBook); } -bool EQEmu::ItemData::IsType1HWeapon() const +bool EQ::ItemData::IsType1HWeapon() const { return ((ItemType == item::ItemType1HBlunt) || (ItemType == item::ItemType1HSlash) || (ItemType == item::ItemType1HPiercing) || (ItemType == item::ItemTypeMartial)); } -bool EQEmu::ItemData::IsType2HWeapon() const +bool EQ::ItemData::IsType2HWeapon() const { return ((ItemType == item::ItemType2HBlunt) || (ItemType == item::ItemType2HSlash) || (ItemType == item::ItemType2HPiercing)); } -bool EQEmu::ItemData::IsTypeShield() const +bool EQ::ItemData::IsTypeShield() const { return (ItemType == item::ItemTypeShield); } -bool EQEmu::ItemData::CheckLoreConflict(const ItemData* l_item, const ItemData* r_item) +bool EQ::ItemData::CheckLoreConflict(const ItemData* l_item, const ItemData* r_item) { if (!l_item || !r_item) return false; diff --git a/common/item_data.h b/common/item_data.h index d5570f856..d3ae5f928 100644 --- a/common/item_data.h +++ b/common/item_data.h @@ -47,7 +47,7 @@ #include "emu_constants.h" -namespace EQEmu +namespace EQ { namespace item { enum ItemClass { diff --git a/common/item_instance.cpp b/common/item_instance.cpp index 2c186e066..d0bbbca50 100644 --- a/common/item_instance.cpp +++ b/common/item_instance.cpp @@ -54,9 +54,9 @@ static inline int32 GetNextItemInstSerialNumber() { } // -// class EQEmu::ItemInstance +// class EQ::ItemInstance // -EQEmu::ItemInstance::ItemInstance(const ItemData* item, int16 charges) { +EQ::ItemInstance::ItemInstance(const ItemData* item, int16 charges) { m_use_type = ItemInstNormal; if(item) { m_item = new ItemData(*item); @@ -87,7 +87,7 @@ EQEmu::ItemInstance::ItemInstance(const ItemData* item, int16 charges) { m_new_id_file = 0; } -EQEmu::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges) { +EQ::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges) { m_use_type = ItemInstNormal; m_item = db->GetItem(item_id); if(m_item) { @@ -121,7 +121,7 @@ EQEmu::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 char m_new_id_file = 0; } -EQEmu::ItemInstance::ItemInstance(ItemInstTypes use_type) { +EQ::ItemInstance::ItemInstance(ItemInstTypes use_type) { m_use_type = use_type; m_item = nullptr; m_charges = 0; @@ -143,8 +143,8 @@ EQEmu::ItemInstance::ItemInstance(ItemInstTypes use_type) { m_new_id_file = 0; } -// Make a copy of an EQEmu::ItemInstance object -EQEmu::ItemInstance::ItemInstance(const ItemInstance& copy) +// Make a copy of an EQ::ItemInstance object +EQ::ItemInstance::ItemInstance(const ItemInstance& copy) { m_use_type=copy.m_use_type; if(copy.m_item) @@ -202,7 +202,7 @@ EQEmu::ItemInstance::ItemInstance(const ItemInstance& copy) } // Clean up container contents -EQEmu::ItemInstance::~ItemInstance() +EQ::ItemInstance::~ItemInstance() { Clear(); safe_delete(m_item); @@ -211,7 +211,7 @@ EQEmu::ItemInstance::~ItemInstance() } // Query item type -bool EQEmu::ItemInstance::IsType(item::ItemClass item_class) const +bool EQ::ItemInstance::IsType(item::ItemClass item_class) const { // IsType() does not protect against 'm_item = nullptr' @@ -225,23 +225,23 @@ bool EQEmu::ItemInstance::IsType(item::ItemClass item_class) const return (m_item->ItemClass == item_class); } -bool EQEmu::ItemInstance::IsClassCommon() const +bool EQ::ItemInstance::IsClassCommon() const { return (m_item && m_item->IsClassCommon()); } -bool EQEmu::ItemInstance::IsClassBag() const +bool EQ::ItemInstance::IsClassBag() const { return (m_item && m_item->IsClassBag()); } -bool EQEmu::ItemInstance::IsClassBook() const +bool EQ::ItemInstance::IsClassBook() const { return (m_item && m_item->IsClassBook()); } // Is item stackable? -bool EQEmu::ItemInstance::IsStackable() const +bool EQ::ItemInstance::IsStackable() const { if (!m_item) return false; @@ -249,7 +249,7 @@ bool EQEmu::ItemInstance::IsStackable() const return m_item->Stackable; } -bool EQEmu::ItemInstance::IsCharged() const +bool EQ::ItemInstance::IsCharged() const { if (!m_item) return false; @@ -261,7 +261,7 @@ bool EQEmu::ItemInstance::IsCharged() const } // Can item be equipped? -bool EQEmu::ItemInstance::IsEquipable(uint16 race, uint16 class_) const +bool EQ::ItemInstance::IsEquipable(uint16 race, uint16 class_) const { if (!m_item || (m_item->Slots == 0)) return false; @@ -270,18 +270,18 @@ bool EQEmu::ItemInstance::IsEquipable(uint16 race, uint16 class_) const } // Can equip at this slot? -bool EQEmu::ItemInstance::IsEquipable(int16 slot_id) const +bool EQ::ItemInstance::IsEquipable(int16 slot_id) const { if (!m_item) return false; - if (slot_id < EQEmu::invslot::EQUIPMENT_BEGIN || slot_id > EQEmu::invslot::EQUIPMENT_END) + if (slot_id < EQ::invslot::EQUIPMENT_BEGIN || slot_id > EQ::invslot::EQUIPMENT_END) return false; return ((m_item->Slots & (1 << slot_id)) != 0); } -bool EQEmu::ItemInstance::IsAugmentable() const +bool EQ::ItemInstance::IsAugmentable() const { if (!m_item) return false; @@ -294,7 +294,7 @@ bool EQEmu::ItemInstance::IsAugmentable() const return false; } -bool EQEmu::ItemInstance::AvailableWearSlot(uint32 aug_wear_slots) const { +bool EQ::ItemInstance::AvailableWearSlot(uint32 aug_wear_slots) const { if (!m_item || !m_item->IsClassCommon()) return false; @@ -306,10 +306,10 @@ bool EQEmu::ItemInstance::AvailableWearSlot(uint32 aug_wear_slots) const { } } - return (index <= EQEmu::invslot::EQUIPMENT_END); + return (index <= EQ::invslot::EQUIPMENT_END); } -int8 EQEmu::ItemInstance::AvailableAugmentSlot(int32 augtype) const +int8 EQ::ItemInstance::AvailableAugmentSlot(int32 augtype) const { if (!m_item || !m_item->IsClassCommon()) return INVALID_INDEX; @@ -324,7 +324,7 @@ int8 EQEmu::ItemInstance::AvailableAugmentSlot(int32 augtype) const return (index <= invaug::SOCKET_END) ? index : INVALID_INDEX; } -bool EQEmu::ItemInstance::IsAugmentSlotAvailable(int32 augtype, uint8 slot) const +bool EQ::ItemInstance::IsAugmentSlotAvailable(int32 augtype, uint8 slot) const { if (!m_item || !m_item->IsClassCommon()) return false; @@ -336,7 +336,7 @@ bool EQEmu::ItemInstance::IsAugmentSlotAvailable(int32 augtype, uint8 slot) cons } // Retrieve item inside container -EQEmu::ItemInstance* EQEmu::ItemInstance::GetItem(uint8 index) const +EQ::ItemInstance* EQ::ItemInstance::GetItem(uint8 index) const { auto it = m_contents.find(index); if (it != m_contents.end()) { @@ -346,7 +346,7 @@ EQEmu::ItemInstance* EQEmu::ItemInstance::GetItem(uint8 index) const return nullptr; } -uint32 EQEmu::ItemInstance::GetItemID(uint8 slot) const +uint32 EQ::ItemInstance::GetItemID(uint8 slot) const { ItemInstance *item = GetItem(slot); if (item) @@ -355,7 +355,7 @@ uint32 EQEmu::ItemInstance::GetItemID(uint8 slot) const return 0; } -void EQEmu::ItemInstance::PutItem(uint8 index, const ItemInstance& inst) +void EQ::ItemInstance::PutItem(uint8 index, const ItemInstance& inst) { // Clean up item already in slot (if exists) DeleteItem(index); @@ -365,7 +365,7 @@ void EQEmu::ItemInstance::PutItem(uint8 index, const ItemInstance& inst) } // Remove item inside container -void EQEmu::ItemInstance::DeleteItem(uint8 index) +void EQ::ItemInstance::DeleteItem(uint8 index) { ItemInstance* inst = PopItem(index); safe_delete(inst); @@ -373,7 +373,7 @@ void EQEmu::ItemInstance::DeleteItem(uint8 index) // Remove item from container without memory delete // Hands over memory ownership to client of this function call -EQEmu::ItemInstance* EQEmu::ItemInstance::PopItem(uint8 index) +EQ::ItemInstance* EQ::ItemInstance::PopItem(uint8 index) { auto iter = m_contents.find(index); if (iter != m_contents.end()) { @@ -386,7 +386,7 @@ EQEmu::ItemInstance* EQEmu::ItemInstance::PopItem(uint8 index) } // Remove all items from container -void EQEmu::ItemInstance::Clear() +void EQ::ItemInstance::Clear() { // Destroy container contents for (auto iter = m_contents.begin(); iter != m_contents.end(); ++iter) { @@ -396,7 +396,7 @@ void EQEmu::ItemInstance::Clear() } // Remove all items from container -void EQEmu::ItemInstance::ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is_norent) +void EQ::ItemInstance::ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is_norent) { // TODO: This needs work... @@ -458,7 +458,7 @@ void EQEmu::ItemInstance::ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is } } -uint8 EQEmu::ItemInstance::FirstOpenSlot() const +uint8 EQ::ItemInstance::FirstOpenSlot() const { if (!m_item) return INVALID_INDEX; @@ -472,7 +472,7 @@ uint8 EQEmu::ItemInstance::FirstOpenSlot() const return (i < slots) ? i : INVALID_INDEX; } -uint8 EQEmu::ItemInstance::GetTotalItemCount() const +uint8 EQ::ItemInstance::GetTotalItemCount() const { if (!m_item) return 0; @@ -486,7 +486,7 @@ uint8 EQEmu::ItemInstance::GetTotalItemCount() const return item_count; } -bool EQEmu::ItemInstance::IsNoneEmptyContainer() +bool EQ::ItemInstance::IsNoneEmptyContainer() { if (!m_item || !m_item->IsClassBag()) return false; @@ -500,7 +500,7 @@ bool EQEmu::ItemInstance::IsNoneEmptyContainer() } // Retrieve augment inside item -EQEmu::ItemInstance* EQEmu::ItemInstance::GetAugment(uint8 slot) const +EQ::ItemInstance* EQ::ItemInstance::GetAugment(uint8 slot) const { if (m_item && m_item->IsClassCommon()) return GetItem(slot); @@ -508,7 +508,7 @@ EQEmu::ItemInstance* EQEmu::ItemInstance::GetAugment(uint8 slot) const return nullptr; } -EQEmu::ItemInstance* EQEmu::ItemInstance::GetOrnamentationAug(int32 ornamentationAugtype) const +EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAug(int32 ornamentationAugtype) const { if (!m_item || !m_item->IsClassCommon()) { return nullptr; } if (ornamentationAugtype == 0) { return nullptr; } @@ -533,7 +533,7 @@ EQEmu::ItemInstance* EQEmu::ItemInstance::GetOrnamentationAug(int32 ornamentatio return nullptr; } -uint32 EQEmu::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const { +uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const { // Not a Hero Forge item. if (m_ornament_hero_model == 0 || material_slot < 0) return 0; @@ -546,7 +546,7 @@ uint32 EQEmu::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const { return (m_ornament_hero_model * 100) + material_slot; } -bool EQEmu::ItemInstance::UpdateOrnamentationInfo() { +bool EQ::ItemInstance::UpdateOrnamentationInfo() { if (!m_item || !m_item->IsClassCommon()) return false; @@ -582,7 +582,7 @@ bool EQEmu::ItemInstance::UpdateOrnamentationInfo() { return ornamentSet; } -bool EQEmu::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll) { +bool EQ::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll) { if (!ItemToTry || !Container) return false; if (ItemToTry->ItemType == item::ItemTypeArrow || strnlen(Container->CharmFile, 30) == 0) @@ -629,7 +629,7 @@ bool EQEmu::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData return false; } -uint32 EQEmu::ItemInstance::GetAugmentItemID(uint8 slot) const +uint32 EQ::ItemInstance::GetAugmentItemID(uint8 slot) const { if (!m_item || !m_item->IsClassCommon()) return 0; @@ -638,7 +638,7 @@ uint32 EQEmu::ItemInstance::GetAugmentItemID(uint8 slot) const } // Add an augment to the item -void EQEmu::ItemInstance::PutAugment(uint8 slot, const ItemInstance& augment) +void EQ::ItemInstance::PutAugment(uint8 slot, const ItemInstance& augment) { if (!m_item || !m_item->IsClassCommon()) return; @@ -646,7 +646,7 @@ void EQEmu::ItemInstance::PutAugment(uint8 slot, const ItemInstance& augment) PutItem(slot, augment); } -void EQEmu::ItemInstance::PutAugment(SharedDatabase *db, uint8 slot, uint32 item_id) +void EQ::ItemInstance::PutAugment(SharedDatabase *db, uint8 slot, uint32 item_id) { if (item_id == 0) { return; } if (db == nullptr) { return; /* TODO: add log message for nullptr */ } @@ -659,7 +659,7 @@ void EQEmu::ItemInstance::PutAugment(SharedDatabase *db, uint8 slot, uint32 item } // Remove augment from item and destroy it -void EQEmu::ItemInstance::DeleteAugment(uint8 index) +void EQ::ItemInstance::DeleteAugment(uint8 index) { if (!m_item || !m_item->IsClassCommon()) return; @@ -668,7 +668,7 @@ void EQEmu::ItemInstance::DeleteAugment(uint8 index) } // Remove augment from item and return it -EQEmu::ItemInstance* EQEmu::ItemInstance::RemoveAugment(uint8 index) +EQ::ItemInstance* EQ::ItemInstance::RemoveAugment(uint8 index) { if (!m_item || !m_item->IsClassCommon()) return nullptr; @@ -676,7 +676,7 @@ EQEmu::ItemInstance* EQEmu::ItemInstance::RemoveAugment(uint8 index) return PopItem(index); } -bool EQEmu::ItemInstance::IsAugmented() +bool EQ::ItemInstance::IsAugmented() { if (!m_item || !m_item->IsClassCommon()) return false; @@ -690,7 +690,7 @@ bool EQEmu::ItemInstance::IsAugmented() } // Has attack/delay? -bool EQEmu::ItemInstance::IsWeapon() const +bool EQ::ItemInstance::IsWeapon() const { if (!m_item || !m_item->IsClassCommon()) return false; @@ -701,7 +701,7 @@ bool EQEmu::ItemInstance::IsWeapon() const return ((m_item->Damage != 0) && (m_item->Delay != 0)); } -bool EQEmu::ItemInstance::IsAmmo() const +bool EQ::ItemInstance::IsAmmo() const { if (!m_item) return false; @@ -717,7 +717,7 @@ bool EQEmu::ItemInstance::IsAmmo() const } -const EQEmu::ItemData* EQEmu::ItemInstance::GetItem() const +const EQ::ItemData* EQ::ItemInstance::GetItem() const { if (!m_item) return nullptr; @@ -728,13 +728,13 @@ const EQEmu::ItemData* EQEmu::ItemInstance::GetItem() const return m_item; } -const EQEmu::ItemData* EQEmu::ItemInstance::GetUnscaledItem() const +const EQ::ItemData* EQ::ItemInstance::GetUnscaledItem() const { // No operator calls and defaults to nullptr return m_item; } -std::string EQEmu::ItemInstance::GetCustomDataString() const { +std::string EQ::ItemInstance::GetCustomDataString() const { std::string ret_val; auto iter = m_custom_data.begin(); while (iter != m_custom_data.end()) { @@ -753,7 +753,7 @@ std::string EQEmu::ItemInstance::GetCustomDataString() const { return ret_val; } -std::string EQEmu::ItemInstance::GetCustomData(std::string identifier) { +std::string EQ::ItemInstance::GetCustomData(std::string identifier) { std::map::const_iterator iter = m_custom_data.find(identifier); if (iter != m_custom_data.end()) { return iter->second; @@ -762,49 +762,49 @@ std::string EQEmu::ItemInstance::GetCustomData(std::string identifier) { return ""; } -void EQEmu::ItemInstance::SetCustomData(std::string identifier, std::string value) { +void EQ::ItemInstance::SetCustomData(std::string identifier, std::string value) { DeleteCustomData(identifier); m_custom_data[identifier] = value; } -void EQEmu::ItemInstance::SetCustomData(std::string identifier, int value) { +void EQ::ItemInstance::SetCustomData(std::string identifier, int value) { DeleteCustomData(identifier); std::stringstream ss; ss << value; m_custom_data[identifier] = ss.str(); } -void EQEmu::ItemInstance::SetCustomData(std::string identifier, float value) { +void EQ::ItemInstance::SetCustomData(std::string identifier, float value) { DeleteCustomData(identifier); std::stringstream ss; ss << value; m_custom_data[identifier] = ss.str(); } -void EQEmu::ItemInstance::SetCustomData(std::string identifier, bool value) { +void EQ::ItemInstance::SetCustomData(std::string identifier, bool value) { DeleteCustomData(identifier); std::stringstream ss; ss << value; m_custom_data[identifier] = ss.str(); } -void EQEmu::ItemInstance::DeleteCustomData(std::string identifier) { +void EQ::ItemInstance::DeleteCustomData(std::string identifier) { auto iter = m_custom_data.find(identifier); if (iter != m_custom_data.end()) { m_custom_data.erase(iter); } } -// Clone a type of EQEmu::ItemInstance object +// Clone a type of EQ::ItemInstance object // c++ doesn't allow a polymorphic copy constructor, // so we have to resort to a polymorphic Clone() -EQEmu::ItemInstance* EQEmu::ItemInstance::Clone() const +EQ::ItemInstance* EQ::ItemInstance::Clone() const { // Pseudo-polymorphic copy constructor return new ItemInstance(*this); } -bool EQEmu::ItemInstance::IsSlotAllowed(int16 slot_id) const { +bool EQ::ItemInstance::IsSlotAllowed(int16 slot_id) const { if (!m_item) { return false; } else if (InventoryProfile::SupportsContainers(slot_id)) { return true; } else if (m_item->Slots & (1 << slot_id)) { return true; } @@ -812,7 +812,7 @@ bool EQEmu::ItemInstance::IsSlotAllowed(int16 slot_id) const { else { return false; } } -bool EQEmu::ItemInstance::IsDroppable(bool recurse) const +bool EQ::ItemInstance::IsDroppable(bool recurse) const { if (!m_item) return false; @@ -838,7 +838,7 @@ bool EQEmu::ItemInstance::IsDroppable(bool recurse) const return true; } -void EQEmu::ItemInstance::Initialize(SharedDatabase *db) { +void EQ::ItemInstance::Initialize(SharedDatabase *db) { // if there's no actual item, don't do anything if (!m_item) return; @@ -855,7 +855,7 @@ void EQEmu::ItemInstance::Initialize(SharedDatabase *db) { } } -void EQEmu::ItemInstance::ScaleItem() { +void EQ::ItemInstance::ScaleItem() { if (!m_item) return; @@ -939,18 +939,18 @@ void EQEmu::ItemInstance::ScaleItem() { m_scaledItem->CharmFileID = 0; // this stops the client from trying to scale the item itself. } -bool EQEmu::ItemInstance::EvolveOnAllKills() const { +bool EQ::ItemInstance::EvolveOnAllKills() const { return (m_evolveInfo && m_evolveInfo->AllKills); } -int8 EQEmu::ItemInstance::GetMaxEvolveLvl() const { +int8 EQ::ItemInstance::GetMaxEvolveLvl() const { if (m_evolveInfo) return m_evolveInfo->MaxLvl; else return 0; } -uint32 EQEmu::ItemInstance::GetKillsNeeded(uint8 currentlevel) { +uint32 EQ::ItemInstance::GetKillsNeeded(uint8 currentlevel) { uint32 kills = -1; // default to -1 (max uint32 value) because this value is usually divided by, so we don't want to ever return zero. if (m_evolveInfo) if (currentlevel != m_evolveInfo->MaxLvl) @@ -962,24 +962,24 @@ uint32 EQEmu::ItemInstance::GetKillsNeeded(uint8 currentlevel) { return kills; } -void EQEmu::ItemInstance::SetTimer(std::string name, uint32 time) { +void EQ::ItemInstance::SetTimer(std::string name, uint32 time) { Timer t(time); t.Start(time, false); m_timers[name] = t; } -void EQEmu::ItemInstance::StopTimer(std::string name) { +void EQ::ItemInstance::StopTimer(std::string name) { auto iter = m_timers.find(name); if(iter != m_timers.end()) { m_timers.erase(iter); } } -void EQEmu::ItemInstance::ClearTimers() { +void EQ::ItemInstance::ClearTimers() { m_timers.clear(); } -int EQEmu::ItemInstance::GetItemArmorClass(bool augments) const +int EQ::ItemInstance::GetItemArmorClass(bool augments) const { int ac = 0; const auto item = GetItem(); @@ -993,7 +993,7 @@ int EQEmu::ItemInstance::GetItemArmorClass(bool augments) const return ac; } -int EQEmu::ItemInstance::GetItemElementalDamage(int &magic, int &fire, int &cold, int &poison, int &disease, int &chromatic, int &prismatic, int &physical, int &corruption, bool augments) const +int EQ::ItemInstance::GetItemElementalDamage(int &magic, int &fire, int &cold, int &poison, int &disease, int &chromatic, int &prismatic, int &physical, int &corruption, bool augments) const { const auto item = GetItem(); if (item) { @@ -1035,7 +1035,7 @@ int EQEmu::ItemInstance::GetItemElementalDamage(int &magic, int &fire, int &cold return magic + fire + cold + poison + disease + chromatic + prismatic + physical + corruption; } -int EQEmu::ItemInstance::GetItemElementalFlag(bool augments) const +int EQ::ItemInstance::GetItemElementalFlag(bool augments) const { int flag = 0; const auto item = GetItem(); @@ -1056,7 +1056,7 @@ int EQEmu::ItemInstance::GetItemElementalFlag(bool augments) const return flag; } -int EQEmu::ItemInstance::GetItemElementalDamage(bool augments) const +int EQ::ItemInstance::GetItemElementalDamage(bool augments) const { int damage = 0; const auto item = GetItem(); @@ -1077,7 +1077,7 @@ int EQEmu::ItemInstance::GetItemElementalDamage(bool augments) const return damage; } -int EQEmu::ItemInstance::GetItemRecommendedLevel(bool augments) const +int EQ::ItemInstance::GetItemRecommendedLevel(bool augments) const { int level = 0; const auto item = GetItem(); @@ -1099,7 +1099,7 @@ int EQEmu::ItemInstance::GetItemRecommendedLevel(bool augments) const return level; } -int EQEmu::ItemInstance::GetItemRequiredLevel(bool augments) const +int EQ::ItemInstance::GetItemRequiredLevel(bool augments) const { int level = 0; const auto item = GetItem(); @@ -1121,7 +1121,7 @@ int EQEmu::ItemInstance::GetItemRequiredLevel(bool augments) const return level; } -int EQEmu::ItemInstance::GetItemWeaponDamage(bool augments) const +int EQ::ItemInstance::GetItemWeaponDamage(bool augments) const { int damage = 0; const auto item = GetItem(); @@ -1137,7 +1137,7 @@ int EQEmu::ItemInstance::GetItemWeaponDamage(bool augments) const return damage; } -int EQEmu::ItemInstance::GetItemBackstabDamage(bool augments) const +int EQ::ItemInstance::GetItemBackstabDamage(bool augments) const { int damage = 0; const auto item = GetItem(); @@ -1153,7 +1153,7 @@ int EQEmu::ItemInstance::GetItemBackstabDamage(bool augments) const return damage; } -int EQEmu::ItemInstance::GetItemBaneDamageBody(bool augments) const +int EQ::ItemInstance::GetItemBaneDamageBody(bool augments) const { int body = 0; const auto item = GetItem(); @@ -1174,7 +1174,7 @@ int EQEmu::ItemInstance::GetItemBaneDamageBody(bool augments) const return body; } -int EQEmu::ItemInstance::GetItemBaneDamageRace(bool augments) const +int EQ::ItemInstance::GetItemBaneDamageRace(bool augments) const { int race = 0; const auto item = GetItem(); @@ -1195,7 +1195,7 @@ int EQEmu::ItemInstance::GetItemBaneDamageRace(bool augments) const return race; } -int EQEmu::ItemInstance::GetItemBaneDamageBody(bodyType against, bool augments) const +int EQ::ItemInstance::GetItemBaneDamageBody(bodyType against, bool augments) const { int damage = 0; const auto item = GetItem(); @@ -1212,7 +1212,7 @@ int EQEmu::ItemInstance::GetItemBaneDamageBody(bodyType against, bool augments) return damage; } -int EQEmu::ItemInstance::GetItemBaneDamageRace(uint16 against, bool augments) const +int EQ::ItemInstance::GetItemBaneDamageRace(uint16 against, bool augments) const { int damage = 0; const auto item = GetItem(); @@ -1229,7 +1229,7 @@ int EQEmu::ItemInstance::GetItemBaneDamageRace(uint16 against, bool augments) co return damage; } -int EQEmu::ItemInstance::GetItemMagical(bool augments) const +int EQ::ItemInstance::GetItemMagical(bool augments) const { const auto item = GetItem(); if (item) { @@ -1245,7 +1245,7 @@ int EQEmu::ItemInstance::GetItemMagical(bool augments) const return 0; } -int EQEmu::ItemInstance::GetItemHP(bool augments) const +int EQ::ItemInstance::GetItemHP(bool augments) const { int hp = 0; const auto item = GetItem(); @@ -1259,7 +1259,7 @@ int EQEmu::ItemInstance::GetItemHP(bool augments) const return hp; } -int EQEmu::ItemInstance::GetItemMana(bool augments) const +int EQ::ItemInstance::GetItemMana(bool augments) const { int mana = 0; const auto item = GetItem(); @@ -1273,7 +1273,7 @@ int EQEmu::ItemInstance::GetItemMana(bool augments) const return mana; } -int EQEmu::ItemInstance::GetItemEndur(bool augments) const +int EQ::ItemInstance::GetItemEndur(bool augments) const { int endur = 0; const auto item = GetItem(); @@ -1287,7 +1287,7 @@ int EQEmu::ItemInstance::GetItemEndur(bool augments) const return endur; } -int EQEmu::ItemInstance::GetItemAttack(bool augments) const +int EQ::ItemInstance::GetItemAttack(bool augments) const { int atk = 0; const auto item = GetItem(); @@ -1301,7 +1301,7 @@ int EQEmu::ItemInstance::GetItemAttack(bool augments) const return atk; } -int EQEmu::ItemInstance::GetItemStr(bool augments) const +int EQ::ItemInstance::GetItemStr(bool augments) const { int str = 0; const auto item = GetItem(); @@ -1315,7 +1315,7 @@ int EQEmu::ItemInstance::GetItemStr(bool augments) const return str; } -int EQEmu::ItemInstance::GetItemSta(bool augments) const +int EQ::ItemInstance::GetItemSta(bool augments) const { int sta = 0; const auto item = GetItem(); @@ -1329,7 +1329,7 @@ int EQEmu::ItemInstance::GetItemSta(bool augments) const return sta; } -int EQEmu::ItemInstance::GetItemDex(bool augments) const +int EQ::ItemInstance::GetItemDex(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1343,7 +1343,7 @@ int EQEmu::ItemInstance::GetItemDex(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemAgi(bool augments) const +int EQ::ItemInstance::GetItemAgi(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1357,7 +1357,7 @@ int EQEmu::ItemInstance::GetItemAgi(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemInt(bool augments) const +int EQ::ItemInstance::GetItemInt(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1371,7 +1371,7 @@ int EQEmu::ItemInstance::GetItemInt(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemWis(bool augments) const +int EQ::ItemInstance::GetItemWis(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1385,7 +1385,7 @@ int EQEmu::ItemInstance::GetItemWis(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemCha(bool augments) const +int EQ::ItemInstance::GetItemCha(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1399,7 +1399,7 @@ int EQEmu::ItemInstance::GetItemCha(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemMR(bool augments) const +int EQ::ItemInstance::GetItemMR(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1413,7 +1413,7 @@ int EQEmu::ItemInstance::GetItemMR(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemFR(bool augments) const +int EQ::ItemInstance::GetItemFR(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1427,7 +1427,7 @@ int EQEmu::ItemInstance::GetItemFR(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemCR(bool augments) const +int EQ::ItemInstance::GetItemCR(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1441,7 +1441,7 @@ int EQEmu::ItemInstance::GetItemCR(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemPR(bool augments) const +int EQ::ItemInstance::GetItemPR(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1455,7 +1455,7 @@ int EQEmu::ItemInstance::GetItemPR(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemDR(bool augments) const +int EQ::ItemInstance::GetItemDR(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1469,7 +1469,7 @@ int EQEmu::ItemInstance::GetItemDR(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemCorrup(bool augments) const +int EQ::ItemInstance::GetItemCorrup(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1483,7 +1483,7 @@ int EQEmu::ItemInstance::GetItemCorrup(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicStr(bool augments) const +int EQ::ItemInstance::GetItemHeroicStr(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1497,7 +1497,7 @@ int EQEmu::ItemInstance::GetItemHeroicStr(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicSta(bool augments) const +int EQ::ItemInstance::GetItemHeroicSta(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1511,7 +1511,7 @@ int EQEmu::ItemInstance::GetItemHeroicSta(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicDex(bool augments) const +int EQ::ItemInstance::GetItemHeroicDex(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1525,7 +1525,7 @@ int EQEmu::ItemInstance::GetItemHeroicDex(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicAgi(bool augments) const +int EQ::ItemInstance::GetItemHeroicAgi(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1539,7 +1539,7 @@ int EQEmu::ItemInstance::GetItemHeroicAgi(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicInt(bool augments) const +int EQ::ItemInstance::GetItemHeroicInt(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1553,7 +1553,7 @@ int EQEmu::ItemInstance::GetItemHeroicInt(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicWis(bool augments) const +int EQ::ItemInstance::GetItemHeroicWis(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1567,7 +1567,7 @@ int EQEmu::ItemInstance::GetItemHeroicWis(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicCha(bool augments) const +int EQ::ItemInstance::GetItemHeroicCha(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1581,7 +1581,7 @@ int EQEmu::ItemInstance::GetItemHeroicCha(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicMR(bool augments) const +int EQ::ItemInstance::GetItemHeroicMR(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1595,7 +1595,7 @@ int EQEmu::ItemInstance::GetItemHeroicMR(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicFR(bool augments) const +int EQ::ItemInstance::GetItemHeroicFR(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1609,7 +1609,7 @@ int EQEmu::ItemInstance::GetItemHeroicFR(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicCR(bool augments) const +int EQ::ItemInstance::GetItemHeroicCR(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1623,7 +1623,7 @@ int EQEmu::ItemInstance::GetItemHeroicCR(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicPR(bool augments) const +int EQ::ItemInstance::GetItemHeroicPR(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1637,7 +1637,7 @@ int EQEmu::ItemInstance::GetItemHeroicPR(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicDR(bool augments) const +int EQ::ItemInstance::GetItemHeroicDR(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1651,7 +1651,7 @@ int EQEmu::ItemInstance::GetItemHeroicDR(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHeroicCorrup(bool augments) const +int EQ::ItemInstance::GetItemHeroicCorrup(bool augments) const { int total = 0; const auto item = GetItem(); @@ -1665,7 +1665,7 @@ int EQEmu::ItemInstance::GetItemHeroicCorrup(bool augments) const return total; } -int EQEmu::ItemInstance::GetItemHaste(bool augments) const +int EQ::ItemInstance::GetItemHaste(bool augments) const { int total = 0; const auto item = GetItem(); diff --git a/common/item_instance.h b/common/item_instance.h index d38ad0868..263bf676d 100644 --- a/common/item_instance.h +++ b/common/item_instance.h @@ -38,7 +38,7 @@ class EvolveInfo; // Stores information about an evolving item family #include -// Specifies usage type for item inside EQEmu::ItemInstance +// Specifies usage type for item inside EQ::ItemInstance enum ItemInstTypes { ItemInstNormal = 0, @@ -54,11 +54,11 @@ typedef enum { class SharedDatabase; // ######################################## -// Class: EQEmu::ItemInstance +// Class: EQ::ItemInstance // Base class for an instance of an item // An item instance encapsulates item data + data specific // to an item instance (includes dye, augments, charges, etc) -namespace EQEmu +namespace EQ { class InventoryProfile; @@ -222,7 +222,7 @@ namespace EQEmu inline int32 GetSerialNumber() const { return m_SerialNumber; } inline void SetSerialNumber(int32 id) { m_SerialNumber = id; } - std::map& GetTimers() { return m_timers; } + std::map& GetTimers() { return m_timers; } void SetTimer(std::string name, uint32 time); void StopTimer(std::string name); void ClearTimers(); @@ -316,13 +316,13 @@ namespace EQEmu // Items inside of this item (augs or contents); std::map m_contents; // Zero-based index: min=0, max=9 std::map m_custom_data; - std::map m_timers; + std::map m_timers; }; } class EvolveInfo { public: - friend class EQEmu::ItemInstance; + friend class EQ::ItemInstance; //temporary uint16 LvlKills[9]; uint32 FirstItem; diff --git a/common/light_source.cpp b/common/light_source.cpp index 476f315b8..7aeb4d166 100644 --- a/common/light_source.cpp +++ b/common/light_source.cpp @@ -22,7 +22,7 @@ #include -uint8 EQEmu::lightsource::TypeToLevel(uint8 light_type) +uint8 EQ::lightsource::TypeToLevel(uint8 light_type) { switch (light_type) { case LightTypeGlobeOfStars: @@ -55,7 +55,7 @@ uint8 EQEmu::lightsource::TypeToLevel(uint8 light_type) } } -bool EQEmu::lightsource::IsLevelGreater(uint8 left_type, uint8 right_type) +bool EQ::lightsource::IsLevelGreater(uint8 left_type, uint8 right_type) { static const uint8 light_levels[LightTypeCount] = { LightLevelUnlit, /* LightTypeNone */ @@ -82,17 +82,17 @@ bool EQEmu::lightsource::IsLevelGreater(uint8 left_type, uint8 right_type) return (light_levels[left_type] > light_levels[right_type]); } -EQEmu::LightSource_Struct::LightSource_Struct() +EQ::LightSource_Struct::LightSource_Struct() { Clear(); } -void EQEmu::LightSource_Struct::Clear() +void EQ::LightSource_Struct::Clear() { memset(&Slot, 0, (sizeof(uint8) * lightsource::LightCount)); } -void EQEmu::LightSourceProfile::Clear() +void EQ::LightSourceProfile::Clear() { Type.Clear(); Level.Clear(); diff --git a/common/light_source.h b/common/light_source.h index a77049e4f..f68f7fe87 100644 --- a/common/light_source.h +++ b/common/light_source.h @@ -23,7 +23,7 @@ #include "types.h" -namespace EQEmu +namespace EQ { namespace lightsource { enum LightSlot { diff --git a/common/memory_buffer.cpp b/common/memory_buffer.cpp index 898851cb3..9cebd5ff2 100644 --- a/common/memory_buffer.cpp +++ b/common/memory_buffer.cpp @@ -20,7 +20,7 @@ #include "memory_buffer.h" -EQEmu::MemoryBuffer::MemoryBuffer() +EQ::MemoryBuffer::MemoryBuffer() { buffer_ = nullptr; size_ = 0; @@ -29,7 +29,7 @@ EQEmu::MemoryBuffer::MemoryBuffer() write_pos_ = 0; } -EQEmu::MemoryBuffer::MemoryBuffer(size_t sz) +EQ::MemoryBuffer::MemoryBuffer(size_t sz) { buffer_ = nullptr; size_ = 0; @@ -39,7 +39,7 @@ EQEmu::MemoryBuffer::MemoryBuffer(size_t sz) Resize(sz); } -EQEmu::MemoryBuffer::MemoryBuffer(const MemoryBuffer &other) +EQ::MemoryBuffer::MemoryBuffer(const MemoryBuffer &other) { if(other.capacity_) { buffer_ = new uchar[other.capacity_]; @@ -54,7 +54,7 @@ EQEmu::MemoryBuffer::MemoryBuffer(const MemoryBuffer &other) read_pos_ = other.read_pos_; } -EQEmu::MemoryBuffer::MemoryBuffer(MemoryBuffer &&other) +EQ::MemoryBuffer::MemoryBuffer(MemoryBuffer &&other) { uchar *tbuf = other.buffer_; size_t tsz = other.size_; @@ -75,7 +75,7 @@ EQEmu::MemoryBuffer::MemoryBuffer(MemoryBuffer &&other) read_pos_ = tread_pos; } -EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(const MemoryBuffer &other) +EQ::MemoryBuffer& EQ::MemoryBuffer::operator=(const MemoryBuffer &other) { if(this == &other) { return *this; @@ -100,7 +100,7 @@ EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(const MemoryBuffer &other) return *this; } -EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(MemoryBuffer &&other) +EQ::MemoryBuffer& EQ::MemoryBuffer::operator=(MemoryBuffer &&other) { uchar *tbuf = other.buffer_; size_t tsz = other.size_; @@ -122,7 +122,7 @@ EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(MemoryBuffer &&other) return *this; } -EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator+=(const MemoryBuffer &rhs) +EQ::MemoryBuffer& EQ::MemoryBuffer::operator+=(const MemoryBuffer &rhs) { if(!rhs.buffer_) { return *this; @@ -142,52 +142,52 @@ EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator+=(const MemoryBuffer &rhs) return *this; } -EQEmu::MemoryBuffer::~MemoryBuffer() +EQ::MemoryBuffer::~MemoryBuffer() { Clear(); } -uchar& EQEmu::MemoryBuffer::operator[](size_t pos) +uchar& EQ::MemoryBuffer::operator[](size_t pos) { return buffer_[pos]; } -const uchar& EQEmu::MemoryBuffer::operator[](size_t pos) const +const uchar& EQ::MemoryBuffer::operator[](size_t pos) const { return buffer_[pos]; } -bool EQEmu::MemoryBuffer::Empty() +bool EQ::MemoryBuffer::Empty() { return size_ == 0; } -bool EQEmu::MemoryBuffer::Empty() const +bool EQ::MemoryBuffer::Empty() const { return size_ == 0; } -size_t EQEmu::MemoryBuffer::Size() +size_t EQ::MemoryBuffer::Size() { return size_; } -size_t EQEmu::MemoryBuffer::Size() const +size_t EQ::MemoryBuffer::Size() const { return size_; } -size_t EQEmu::MemoryBuffer::Capacity() +size_t EQ::MemoryBuffer::Capacity() { return capacity_; } -size_t EQEmu::MemoryBuffer::Capacity() const +size_t EQ::MemoryBuffer::Capacity() const { return capacity_; } -void EQEmu::MemoryBuffer::Resize(size_t sz) +void EQ::MemoryBuffer::Resize(size_t sz) { if(!buffer_) { size_t new_size = sz + 64; @@ -213,7 +213,7 @@ void EQEmu::MemoryBuffer::Resize(size_t sz) } } -void EQEmu::MemoryBuffer::Clear() +void EQ::MemoryBuffer::Clear() { if(buffer_) { delete[] buffer_; @@ -226,14 +226,14 @@ void EQEmu::MemoryBuffer::Clear() read_pos_ = 0; } -void EQEmu::MemoryBuffer::Zero() +void EQ::MemoryBuffer::Zero() { if(buffer_) { memset(buffer_, 0, capacity_); } } -void EQEmu::MemoryBuffer::Write(const char *val, size_t len) +void EQ::MemoryBuffer::Write(const char *val, size_t len) { size_t size_needed = write_pos_ + len; Resize(size_needed); @@ -242,20 +242,20 @@ void EQEmu::MemoryBuffer::Write(const char *val, size_t len) write_pos_ += len; } -void EQEmu::MemoryBuffer::Read(uchar *buf, size_t len) +void EQ::MemoryBuffer::Read(uchar *buf, size_t len) { memcpy(buf, &buffer_[read_pos_], len); read_pos_ += len; } -void EQEmu::MemoryBuffer::Read(char *str) +void EQ::MemoryBuffer::Read(char *str) { size_t len = strlen((const char*)&buffer_[read_pos_]); memcpy(str, &buffer_[read_pos_], len); read_pos_ += len; } -void EQEmu::OutBuffer::overwrite(OutBuffer::pos_type position, const char *_Str, std::streamsize _Count) +void EQ::OutBuffer::overwrite(OutBuffer::pos_type position, const char *_Str, std::streamsize _Count) { auto last_pos = tellp(); seekp(position); @@ -263,7 +263,7 @@ void EQEmu::OutBuffer::overwrite(OutBuffer::pos_type position, const char *_Str, seekp(last_pos); } -uchar* EQEmu::OutBuffer::detach() +uchar* EQ::OutBuffer::detach() { size_t buffer_size = tellp(); if (buffer_size == 0) diff --git a/common/memory_buffer.h b/common/memory_buffer.h index 474953f91..b1019a232 100644 --- a/common/memory_buffer.h +++ b/common/memory_buffer.h @@ -28,7 +28,7 @@ #include -namespace EQEmu +namespace EQ { class MemoryBuffer { public: diff --git a/common/memory_mapped_file.cpp b/common/memory_mapped_file.cpp index b8b5e2a4b..a11b3c5db 100644 --- a/common/memory_mapped_file.cpp +++ b/common/memory_mapped_file.cpp @@ -33,7 +33,7 @@ #include #endif -namespace EQEmu { +namespace EQ { struct MemoryMappedFile::Implementation { #ifdef _WINDOWS diff --git a/common/memory_mapped_file.h b/common/memory_mapped_file.h index cc4ed700d..d3e832cef 100644 --- a/common/memory_mapped_file.h +++ b/common/memory_mapped_file.h @@ -22,7 +22,7 @@ #include #include "types.h" -namespace EQEmu { +namespace EQ { //! Memory Backed Shared Memory /*! diff --git a/common/net/daybreak_connection.cpp b/common/net/daybreak_connection.cpp index 693a47bf1..125a240dd 100644 --- a/common/net/daybreak_connection.cpp +++ b/common/net/daybreak_connection.cpp @@ -1103,7 +1103,7 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream) InternalBufferedSend(p); entry.second.last_sent = now; entry.second.times_resent++; - entry.second.resend_delay = EQEmu::Clamp(entry.second.resend_delay * 2, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max); + entry.second.resend_delay = EQ::Clamp(entry.second.resend_delay * 2, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max); resends++; } } @@ -1132,7 +1132,7 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream) InternalBufferedSend(p); entry.second.last_sent = now; entry.second.times_resent++; - entry.second.resend_delay = EQEmu::Clamp(entry.second.resend_delay * 2, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max); + entry.second.resend_delay = EQ::Clamp(entry.second.resend_delay * 2, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max); resends++; } } @@ -1184,7 +1184,7 @@ void EQ::Net::DaybreakConnection::OutOfOrderAck(int stream, uint16_t seq) void EQ::Net::DaybreakConnection::UpdateDataBudget(double budget_add) { auto outgoing_data_rate = m_owner->m_options.outgoing_data_rate; - m_outgoing_budget = EQEmu::ClampUpper(m_outgoing_budget + budget_add, outgoing_data_rate); + m_outgoing_budget = EQ::ClampUpper(m_outgoing_budget + budget_add, outgoing_data_rate); } void EQ::Net::DaybreakConnection::SendAck(int stream_id, uint16_t seq) @@ -1405,7 +1405,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id, sent.last_sent = Clock::now(); sent.first_sent = Clock::now(); sent.times_resent = 0; - sent.resend_delay = EQEmu::Clamp( + sent.resend_delay = EQ::Clamp( static_cast((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms), m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max); @@ -1437,7 +1437,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id, sent.last_sent = Clock::now(); sent.first_sent = Clock::now(); sent.times_resent = 0; - sent.resend_delay = EQEmu::Clamp( + sent.resend_delay = EQ::Clamp( static_cast((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms), m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max); @@ -1461,7 +1461,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id, sent.last_sent = Clock::now(); sent.first_sent = Clock::now(); sent.times_resent = 0; - sent.resend_delay = EQEmu::Clamp( + sent.resend_delay = EQ::Clamp( static_cast((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms), m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max); diff --git a/common/net/daybreak_connection.h b/common/net/daybreak_connection.h index 883ecefac..c2c714813 100644 --- a/common/net/daybreak_connection.h +++ b/common/net/daybreak_connection.h @@ -318,7 +318,7 @@ namespace EQ void Attach(uv_loop_t *loop); void Detach(); - EQEmu::Random m_rand; + EQ::Random m_rand; uv_timer_t m_timer; uv_udp_t m_socket; uv_loop_t *m_attached; diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp index dfb0f23a5..c9e80a0f1 100644 --- a/common/patches/rof.cpp +++ b/common/patches/rof.cpp @@ -45,7 +45,7 @@ namespace RoF static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id, uint8 depth, ItemPacketType packet_type); + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id, uint8 depth, ItemPacketType packet_type); // server to client inventory location converters static inline structs::InventorySlot_Struct ServerToRoFSlot(uint32 server_slot); @@ -65,8 +65,8 @@ namespace RoF // client to server say link converter static inline void RoFToServerSayLink(std::string& serverSayLink, const std::string& rofSayLink); - static inline spells::CastingSlot ServerToRoFCastingSlot(EQEmu::spells::CastingSlot slot); - static inline EQEmu::spells::CastingSlot RoFToServerCastingSlot(spells::CastingSlot slot); + static inline spells::CastingSlot ServerToRoFCastingSlot(EQ::spells::CastingSlot slot); + static inline EQ::spells::CastingSlot RoFToServerCastingSlot(spells::CastingSlot slot); static inline int ServerToRoFBuffSlot(int index); static inline int RoFToServerBuffSlot(int index); @@ -147,9 +147,9 @@ namespace RoF return(r); } - const EQEmu::versions::ClientVersion Strategy::ClientVersion() const + const EQ::versions::ClientVersion Strategy::ClientVersion() const { - return EQEmu::versions::ClientVersion::RoF; + return EQ::versions::ClientVersion::RoF; } #include "ss_define.h" @@ -193,7 +193,7 @@ namespace RoF eq->unknown000 = 1; OUT(npcid); - eq->inventory_slot = ServerToRoFTypelessSlot(emu->slot, EQEmu::invtype::typePossessions); + eq->inventory_slot = ServerToRoFTypelessSlot(emu->slot, EQ::invtype::typePossessions); OUT(charges); OUT(sell_price); @@ -246,7 +246,7 @@ namespace RoF SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); OUT(merchant_entity_id); - eq->inventory_slot = ServerToRoFTypelessSlot(emu->slot_id, EQEmu::invtype::typePossessions); + eq->inventory_slot = ServerToRoFTypelessSlot(emu->slot_id, EQ::invtype::typePossessions); OUT(charges); OUT(cost); @@ -270,7 +270,7 @@ namespace RoF ENCODE_LENGTH_EXACT(ApplyPoison_Struct); SETUP_DIRECT_ENCODE(ApplyPoison_Struct, structs::ApplyPoison_Struct); - eq->inventory_slot = ServerToRoFTypelessSlot(emu->inventorySlot, EQEmu::invtype::typePossessions); + eq->inventory_slot = ServerToRoFTypelessSlot(emu->inventorySlot, EQ::invtype::typePossessions); OUT(success); FINISH_ENCODE(); @@ -502,7 +502,7 @@ namespace RoF ENCODE_LENGTH_EXACT(CastSpell_Struct); SETUP_DIRECT_ENCODE(CastSpell_Struct, structs::CastSpell_Struct); - eq->slot = static_cast(ServerToRoFCastingSlot(static_cast(emu->slot))); + eq->slot = static_cast(ServerToRoFCastingSlot(static_cast(emu->slot))); OUT(spell_id); eq->inventory_slot = ServerToRoFSlot(emu->inventoryslot); @@ -570,24 +570,24 @@ namespace RoF //store away the emu struct uchar* __emu_buffer = in->pBuffer; - int item_count = in->size / sizeof(EQEmu::InternalSerializedItem_Struct); - if (!item_count || (in->size % sizeof(EQEmu::InternalSerializedItem_Struct)) != 0) { + int item_count = in->size / sizeof(EQ::InternalSerializedItem_Struct); + if (!item_count || (in->size % sizeof(EQ::InternalSerializedItem_Struct)) != 0) { Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", - opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQEmu::InternalSerializedItem_Struct)); + opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQ::InternalSerializedItem_Struct)); delete in; return; } - EQEmu::InternalSerializedItem_Struct* eq = (EQEmu::InternalSerializedItem_Struct*)in->pBuffer; + EQ::InternalSerializedItem_Struct* eq = (EQ::InternalSerializedItem_Struct*)in->pBuffer; - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)&item_count, sizeof(uint32)); for (int index = 0; index < item_count; ++index, ++eq) { - SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0, ItemPacketCharInventory); + SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, eq->slot_id, 0, ItemPacketCharInventory); if (ob.tellp() == last_pos) LogNetcode("RoF::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory. Item skipped", eq->slot_id); @@ -1513,14 +1513,14 @@ namespace RoF uchar* __emu_buffer = in->pBuffer; ItemPacket_Struct* old_item_pkt = (ItemPacket_Struct*)__emu_buffer; - EQEmu::InternalSerializedItem_Struct* int_struct = (EQEmu::InternalSerializedItem_Struct*)(&__emu_buffer[4]); + EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]); - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)__emu_buffer, 4); - SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0, old_item_pkt->PacketType); + SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, int_struct->slot_id, 0, old_item_pkt->PacketType); if (ob.tellp() == last_pos) { LogNetcode("RoF::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id); delete in; @@ -1957,7 +1957,7 @@ namespace RoF outapp->WriteUInt32(22); // Equipment count - for (int r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) + for (int r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) { outapp->WriteUInt32(emu->item_material.Slot[r].Material); outapp->WriteUInt32(0); @@ -1977,9 +1977,9 @@ namespace RoF outapp->WriteUInt32(0); } - outapp->WriteUInt32(EQEmu::textures::materialCount); // Equipment2 count + outapp->WriteUInt32(EQ::textures::materialCount); // Equipment2 count - for (int r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) + for (int r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) { outapp->WriteUInt32(0); outapp->WriteUInt32(0); @@ -1988,7 +1988,7 @@ namespace RoF outapp->WriteUInt32(0); } - outapp->WriteUInt32(EQEmu::textures::materialCount); // Tint Count + outapp->WriteUInt32(EQ::textures::materialCount); // Tint Count for (int r = 0; r < 7; r++) { @@ -1998,7 +1998,7 @@ namespace RoF outapp->WriteUInt32(0); outapp->WriteUInt32(0); - outapp->WriteUInt32(EQEmu::textures::materialCount); // Tint2 Count + outapp->WriteUInt32(EQ::textures::materialCount); // Tint2 Count for (int r = 0; r < 7; r++) { @@ -2127,7 +2127,7 @@ namespace RoF outapp->WriteUInt32(spells::SPELLBOOK_SIZE); // Spellbook slots - if (spells::SPELLBOOK_SIZE <= EQEmu::spells::SPELLBOOK_SIZE) { + if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) { for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) outapp->WriteUInt32(emu->spell_book[r]); @@ -2136,33 +2136,33 @@ namespace RoF } } else { - for (uint32 r = 0; r < EQEmu::spells::SPELLBOOK_SIZE; r++) { + for (uint32 r = 0; r < EQ::spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) outapp->WriteUInt32(emu->spell_book[r]); else outapp->WriteUInt32(0xFFFFFFFFU); } // invalidate the rest of the spellbook slots - for (uint32 r = EQEmu::spells::SPELLBOOK_SIZE; r < spells::SPELLBOOK_SIZE; r++) { + for (uint32 r = EQ::spells::SPELLBOOK_SIZE; r < spells::SPELLBOOK_SIZE; r++) { outapp->WriteUInt32(0xFFFFFFFFU); } } outapp->WriteUInt32(spells::SPELL_GEM_COUNT); // Memorised spell slots - for (uint32 r = 0; r < EQEmu::spells::SPELL_GEM_COUNT; r++) // first 12 + for (uint32 r = 0; r < EQ::spells::SPELL_GEM_COUNT; r++) // first 12 { outapp->WriteUInt32(emu->mem_spells[r]); } // zeroes for the rest of the slots -- the other 4 which don't work at all! - for (uint32 r = 0; r < spells::SPELL_GEM_COUNT - EQEmu::spells::SPELL_GEM_COUNT; r++) + for (uint32 r = 0; r < spells::SPELL_GEM_COUNT - EQ::spells::SPELL_GEM_COUNT; r++) { outapp->WriteUInt32(0xFFFFFFFFU); } outapp->WriteUInt32(13); // gem refresh count - for (uint32 r = 0; r < EQEmu::spells::SPELL_GEM_COUNT; r++) + for (uint32 r = 0; r < EQ::spells::SPELL_GEM_COUNT; r++) { outapp->WriteUInt32(emu->spellSlotRefresh[r]); // spell gem refresh } @@ -2251,7 +2251,7 @@ namespace RoF outapp->WriteUInt32(profile::BANDOLIERS_SIZE); // Copy bandoliers where server and client indices converge - for (uint32 r = 0; r < EQEmu::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { + for (uint32 r = 0; r < EQ::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { outapp->WriteString(emu->bandoliers[r].Name); for (uint32 j = 0; j < profile::BANDOLIER_ITEM_COUNT; ++j) { // Will need adjusting if 'server != client' is ever true outapp->WriteString(emu->bandoliers[r].Items[j].Name); @@ -2266,7 +2266,7 @@ namespace RoF } } // Nullify bandoliers where server and client indices diverge, with a client bias - for (uint32 r = EQEmu::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { + for (uint32 r = EQ::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { outapp->WriteString(""); for (uint32 j = 0; j < profile::BANDOLIER_ITEM_COUNT; ++j) { // Will need adjusting if 'server != client' is ever true outapp->WriteString(""); @@ -2278,7 +2278,7 @@ namespace RoF outapp->WriteUInt32(profile::POTION_BELT_SIZE); // Copy potion belt where server and client indices converge - for (uint32 r = 0; r < EQEmu::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { + for (uint32 r = 0; r < EQ::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { outapp->WriteString(emu->potionbelt.Items[r].Name); outapp->WriteUInt32(emu->potionbelt.Items[r].ID); if (emu->potionbelt.Items[r].Icon) { @@ -2290,7 +2290,7 @@ namespace RoF } } // Nullify potion belt where server and client indices diverge, with a client bias - for (uint32 r = EQEmu::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { + for (uint32 r = EQ::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { outapp->WriteString(""); outapp->WriteUInt32(0); outapp->WriteSInt32(-1); @@ -2412,9 +2412,9 @@ namespace RoF outapp->WriteUInt8(0); // Unknown outapp->WriteUInt8(0); // Unknown - outapp->WriteUInt32(EQEmu::invtype::TRIBUTE_SIZE); + outapp->WriteUInt32(EQ::invtype::TRIBUTE_SIZE); - for (uint32 r = 0; r < EQEmu::invtype::TRIBUTE_SIZE; r++) + for (uint32 r = 0; r < EQ::invtype::TRIBUTE_SIZE; r++) { outapp->WriteUInt32(emu->tributes[r].tribute); outapp->WriteUInt32(emu->tributes[r].tier); @@ -2949,7 +2949,7 @@ namespace RoF eq_cse->Gender = emu_cse->Gender; eq_cse->Face = emu_cse->Face; - for (int equip_index = 0; equip_index < EQEmu::textures::materialCount; equip_index++) { + for (int equip_index = 0; equip_index < EQ::textures::materialCount; equip_index++) { eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteModel; @@ -3066,7 +3066,7 @@ namespace RoF SETUP_DIRECT_ENCODE(Merchant_Purchase_Struct, structs::Merchant_Purchase_Struct); OUT(npcid); - eq->inventory_slot = ServerToRoFTypelessSlot(emu->itemslot, EQEmu::invtype::typePossessions); + eq->inventory_slot = ServerToRoFTypelessSlot(emu->itemslot, EQ::invtype::typePossessions); //OUT(itemslot); OUT(quantity); OUT(price); @@ -3980,7 +3980,7 @@ namespace RoF if ((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522)) { - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; ++k) + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k) { { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->equipment_tint.Slot[k].Color); @@ -3989,7 +3989,7 @@ namespace RoF structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer; - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) { + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) { Equipment[k].Material = emu->equipment.Slot[k].Material; Equipment[k].Unknown1 = emu->equipment.Slot[k].Unknown1; Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteModel; @@ -3997,7 +3997,7 @@ namespace RoF Equipment[k].Material2 = emu->equipment.Slot[k].Unknown2; } - Buffer += (sizeof(structs::Texture_Struct) * EQEmu::textures::materialCount); + Buffer += (sizeof(structs::Texture_Struct) * EQ::textures::materialCount); } else { @@ -4714,7 +4714,7 @@ namespace RoF IN(item_id); int r; - for (r = EQEmu::invaug::SOCKET_BEGIN; r <= EQEmu::invaug::SOCKET_END; r++) { + for (r = EQ::invaug::SOCKET_BEGIN; r <= EQ::invaug::SOCKET_END; r++) { IN(augments[r]); } IN(link_hash); @@ -4739,7 +4739,7 @@ namespace RoF DECODE_LENGTH_EXACT(structs::LoadSpellSet_Struct); SETUP_DIRECT_DECODE(LoadSpellSet_Struct, structs::LoadSpellSet_Struct); - for (unsigned int i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; ++i) + for (unsigned int i = 0; i < EQ::spells::SPELL_GEM_COUNT; ++i) { if (eq->spell[i] == 0) emu->spell[i] = 0xFFFFFFFF; @@ -5091,9 +5091,9 @@ namespace RoF return NextItemInstSerialNumber; } - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth, ItemPacketType packet_type) + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth, ItemPacketType packet_type) { - const EQEmu::ItemData *item = inst->GetUnscaledItem(); + const EQ::ItemData *item = inst->GetUnscaledItem(); RoF::structs::ItemSerializationHeader hdr; @@ -5156,7 +5156,7 @@ namespace RoF uint32 hero_model = 0; if (inst->GetOrnamentationIDFile()) { - hero_model = inst->GetOrnamentHeroModel(EQEmu::InventoryProfile::CalcMaterialFromSlot(slot_id_in)); + hero_model = inst->GetOrnamentHeroModel(EQ::InventoryProfile::CalcMaterialFromSlot(slot_id_in)); char tmp[30]; memset(tmp, 0x0, 30); @@ -5358,7 +5358,7 @@ namespace RoF // Done to hack older clients to label expendable fishing poles as such // July 28th, 2018 patch - if (item->ItemType == EQEmu::item::ItemTypeFishingPole && item->SubType == 0) { + if (item->ItemType == EQ::item::ItemTypeFishingPole && item->SubType == 0) { itbs.expendablearrow = 1; } @@ -5517,28 +5517,28 @@ namespace RoF ob.write((const char*)&iqbs, sizeof(RoF::structs::ItemQuaternaryBodyStruct)); - EQEmu::OutBuffer::pos_type count_pos = ob.tellp(); + EQ::OutBuffer::pos_type count_pos = ob.tellp(); uint32 subitem_count = 0; ob.write((const char*)&subitem_count, sizeof(uint32)); // moved outside of loop since it is not modified within that scope - int16 SubSlotNumber = EQEmu::invbag::SLOT_INVALID; + int16 SubSlotNumber = EQ::invbag::SLOT_INVALID; - if (slot_id_in <= EQEmu::invslot::GENERAL_END && slot_id_in >= EQEmu::invslot::GENERAL_BEGIN) - SubSlotNumber = EQEmu::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT); - else if (slot_id_in == EQEmu::invslot::slotCursor) - SubSlotNumber = EQEmu::invbag::CURSOR_BAG_BEGIN; - else if (slot_id_in <= EQEmu::invslot::BANK_END && slot_id_in >= EQEmu::invslot::BANK_BEGIN) - SubSlotNumber = EQEmu::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT); - else if (slot_id_in <= EQEmu::invslot::SHARED_BANK_END && slot_id_in >= EQEmu::invslot::SHARED_BANK_BEGIN) - SubSlotNumber = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::SHARED_BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT); + if (slot_id_in <= EQ::invslot::GENERAL_END && slot_id_in >= EQ::invslot::GENERAL_BEGIN) + SubSlotNumber = EQ::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQ::invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT); + else if (slot_id_in == EQ::invslot::slotCursor) + SubSlotNumber = EQ::invbag::CURSOR_BAG_BEGIN; + else if (slot_id_in <= EQ::invslot::BANK_END && slot_id_in >= EQ::invslot::BANK_BEGIN) + SubSlotNumber = EQ::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::BANK_BEGIN) * EQ::invbag::SLOT_COUNT); + else if (slot_id_in <= EQ::invslot::SHARED_BANK_END && slot_id_in >= EQ::invslot::SHARED_BANK_BEGIN) + SubSlotNumber = EQ::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::SHARED_BANK_BEGIN) * EQ::invbag::SLOT_COUNT); else SubSlotNumber = slot_id_in; // not sure if this is the best way to handle this..leaving for now - if (SubSlotNumber != EQEmu::invbag::SLOT_INVALID) { - for (uint32 index = EQEmu::invbag::SLOT_BEGIN; index <= EQEmu::invbag::SLOT_END; ++index) { - EQEmu::ItemInstance* sub = inst->GetItem(index); + if (SubSlotNumber != EQ::invbag::SLOT_INVALID) { + for (uint32 index = EQ::invbag::SLOT_BEGIN; index <= EQ::invbag::SLOT_END; ++index) { + EQ::ItemInstance* sub = inst->GetItem(index); if (!sub) continue; @@ -5564,77 +5564,77 @@ namespace RoF RoFSlot.AugIndex = invaug::SOCKET_INVALID; RoFSlot.Unknown01 = INULL; - uint32 temp_slot = (uint32) EQEmu::invslot::SLOT_INVALID; + uint32 temp_slot = (uint32) EQ::invslot::SLOT_INVALID; - if (server_slot < EQEmu::invtype::POSSESSIONS_SIZE) { + if (server_slot < EQ::invtype::POSSESSIONS_SIZE) { RoFSlot.Type = invtype::typePossessions; RoFSlot.Slot = server_slot; } - else if (server_slot <= EQEmu::invbag::CURSOR_BAG_END && server_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - temp_slot = server_slot - EQEmu::invbag::GENERAL_BAGS_BEGIN; + else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) { + temp_slot = server_slot - EQ::invbag::GENERAL_BAGS_BEGIN; RoFSlot.Type = invtype::typePossessions; - RoFSlot.Slot = invslot::GENERAL_BEGIN + (temp_slot / EQEmu::invbag::SLOT_COUNT); - RoFSlot.SubIndex = temp_slot - ((RoFSlot.Slot - invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT); + RoFSlot.Slot = invslot::GENERAL_BEGIN + (temp_slot / EQ::invbag::SLOT_COUNT); + RoFSlot.SubIndex = temp_slot - ((RoFSlot.Slot - invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT); } - else if (server_slot <= EQEmu::invslot::TRIBUTE_END && server_slot >= EQEmu::invslot::TRIBUTE_BEGIN) { + else if (server_slot <= EQ::invslot::TRIBUTE_END && server_slot >= EQ::invslot::TRIBUTE_BEGIN) { RoFSlot.Type = invtype::typeTribute; - RoFSlot.Slot = server_slot - EQEmu::invslot::TRIBUTE_BEGIN; + RoFSlot.Slot = server_slot - EQ::invslot::TRIBUTE_BEGIN; } - else if (server_slot <= EQEmu::invslot::GUILD_TRIBUTE_END && server_slot >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN) { + else if (server_slot <= EQ::invslot::GUILD_TRIBUTE_END && server_slot >= EQ::invslot::GUILD_TRIBUTE_BEGIN) { RoFSlot.Type = invtype::typeGuildTribute; - RoFSlot.Slot = server_slot - EQEmu::invslot::GUILD_TRIBUTE_BEGIN; + RoFSlot.Slot = server_slot - EQ::invslot::GUILD_TRIBUTE_BEGIN; } - else if (server_slot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { + else if (server_slot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { RoFSlot.Type = invtype::typeWorld; } - else if (server_slot <= EQEmu::invslot::BANK_END && server_slot >= EQEmu::invslot::BANK_BEGIN) { + else if (server_slot <= EQ::invslot::BANK_END && server_slot >= EQ::invslot::BANK_BEGIN) { RoFSlot.Type = invtype::typeBank; - RoFSlot.Slot = server_slot - EQEmu::invslot::BANK_BEGIN; + RoFSlot.Slot = server_slot - EQ::invslot::BANK_BEGIN; } - else if (server_slot <= EQEmu::invbag::BANK_BAGS_END && server_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) { - temp_slot = server_slot - EQEmu::invbag::BANK_BAGS_BEGIN; + else if (server_slot <= EQ::invbag::BANK_BAGS_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) { + temp_slot = server_slot - EQ::invbag::BANK_BAGS_BEGIN; RoFSlot.Type = invtype::typeBank; - RoFSlot.Slot = temp_slot / EQEmu::invbag::SLOT_COUNT; - RoFSlot.SubIndex = temp_slot - (RoFSlot.Slot * EQEmu::invbag::SLOT_COUNT); + RoFSlot.Slot = temp_slot / EQ::invbag::SLOT_COUNT; + RoFSlot.SubIndex = temp_slot - (RoFSlot.Slot * EQ::invbag::SLOT_COUNT); } - else if (server_slot <= EQEmu::invslot::SHARED_BANK_END && server_slot >= EQEmu::invslot::SHARED_BANK_BEGIN) { + else if (server_slot <= EQ::invslot::SHARED_BANK_END && server_slot >= EQ::invslot::SHARED_BANK_BEGIN) { RoFSlot.Type = invtype::typeSharedBank; - RoFSlot.Slot = server_slot - EQEmu::invslot::SHARED_BANK_BEGIN; + RoFSlot.Slot = server_slot - EQ::invslot::SHARED_BANK_BEGIN; } - else if (server_slot <= EQEmu::invbag::SHARED_BANK_BAGS_END && server_slot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) { - temp_slot = server_slot - EQEmu::invbag::SHARED_BANK_BAGS_BEGIN; + else if (server_slot <= EQ::invbag::SHARED_BANK_BAGS_END && server_slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) { + temp_slot = server_slot - EQ::invbag::SHARED_BANK_BAGS_BEGIN; RoFSlot.Type = invtype::typeSharedBank; - RoFSlot.Slot = temp_slot / EQEmu::invbag::SLOT_COUNT; - RoFSlot.SubIndex = temp_slot - (RoFSlot.Slot * EQEmu::invbag::SLOT_COUNT); + RoFSlot.Slot = temp_slot / EQ::invbag::SLOT_COUNT; + RoFSlot.SubIndex = temp_slot - (RoFSlot.Slot * EQ::invbag::SLOT_COUNT); } - else if (server_slot <= EQEmu::invslot::TRADE_END && server_slot >= EQEmu::invslot::TRADE_BEGIN) { + else if (server_slot <= EQ::invslot::TRADE_END && server_slot >= EQ::invslot::TRADE_BEGIN) { RoFSlot.Type = invtype::typeTrade; - RoFSlot.Slot = server_slot - EQEmu::invslot::TRADE_BEGIN; + RoFSlot.Slot = server_slot - EQ::invslot::TRADE_BEGIN; } - else if (server_slot <= EQEmu::invbag::TRADE_BAGS_END && server_slot >= EQEmu::invbag::TRADE_BAGS_BEGIN) { - temp_slot = server_slot - EQEmu::invbag::TRADE_BAGS_BEGIN; + else if (server_slot <= EQ::invbag::TRADE_BAGS_END && server_slot >= EQ::invbag::TRADE_BAGS_BEGIN) { + temp_slot = server_slot - EQ::invbag::TRADE_BAGS_BEGIN; RoFSlot.Type = invtype::typeTrade; - RoFSlot.Slot = temp_slot / EQEmu::invbag::SLOT_COUNT; - RoFSlot.SubIndex = temp_slot - (RoFSlot.Slot * EQEmu::invbag::SLOT_COUNT); + RoFSlot.Slot = temp_slot / EQ::invbag::SLOT_COUNT; + RoFSlot.SubIndex = temp_slot - (RoFSlot.Slot * EQ::invbag::SLOT_COUNT); } - else if (server_slot <= EQEmu::invslot::WORLD_END && server_slot >= EQEmu::invslot::WORLD_BEGIN) { + else if (server_slot <= EQ::invslot::WORLD_END && server_slot >= EQ::invslot::WORLD_BEGIN) { RoFSlot.Type = invtype::typeWorld; - RoFSlot.Slot = server_slot - EQEmu::invslot::WORLD_BEGIN; + RoFSlot.Slot = server_slot - EQ::invslot::WORLD_BEGIN; } Log(Logs::Detail, @@ -5683,7 +5683,7 @@ namespace RoF { uint32 RoFSlot = invslot::SLOT_INVALID; - if (server_corpse_slot <= EQEmu::invslot::CORPSE_END && server_corpse_slot >= EQEmu::invslot::CORPSE_BEGIN) { + if (server_corpse_slot <= EQ::invslot::CORPSE_END && server_corpse_slot >= EQ::invslot::CORPSE_BEGIN) { RoFSlot = server_corpse_slot; } @@ -5700,18 +5700,18 @@ namespace RoF RoFSlot.AugIndex = invaug::SOCKET_INVALID; RoFSlot.Unknown01 = INULL; - uint32 TempSlot = EQEmu::invslot::SLOT_INVALID; + uint32 TempSlot = EQ::invslot::SLOT_INVALID; - if (server_type == EQEmu::invtype::typePossessions) { - if (server_slot < EQEmu::invtype::POSSESSIONS_SIZE) { + if (server_type == EQ::invtype::typePossessions) { + if (server_slot < EQ::invtype::POSSESSIONS_SIZE) { RoFSlot.Slot = server_slot; } - else if (server_slot <= EQEmu::invbag::CURSOR_BAG_END && server_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - TempSlot = server_slot - EQEmu::invbag::GENERAL_BAGS_BEGIN; + else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) { + TempSlot = server_slot - EQ::invbag::GENERAL_BAGS_BEGIN; - RoFSlot.Slot = invslot::GENERAL_BEGIN + (TempSlot / EQEmu::invbag::SLOT_COUNT); - RoFSlot.SubIndex = TempSlot - ((RoFSlot.Slot - invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT); + RoFSlot.Slot = invslot::GENERAL_BEGIN + (TempSlot / EQ::invbag::SLOT_COUNT); + RoFSlot.SubIndex = TempSlot - ((RoFSlot.Slot - invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT); } } @@ -5732,12 +5732,12 @@ namespace RoF rof_slot.AugIndex, rof_slot.Unknown02, rof_slot.Unknown01, - EQEmu::invslot::SLOT_INVALID); + EQ::invslot::SLOT_INVALID); - return EQEmu::invslot::SLOT_INVALID; + return EQ::invslot::SLOT_INVALID; } - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; uint32 temp_slot = invslot::SLOT_INVALID; switch (rof_slot.Type) { @@ -5747,10 +5747,10 @@ namespace RoF server_slot = rof_slot.Slot; } else if (rof_slot.SubIndex >= invbag::SLOT_BEGIN && rof_slot.SubIndex <= invbag::SLOT_END) { if (rof_slot.Slot < invslot::GENERAL_BEGIN) - return EQEmu::invslot::SLOT_INVALID; + return EQ::invslot::SLOT_INVALID; temp_slot = (rof_slot.Slot - invslot::GENERAL_BEGIN) * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::GENERAL_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; + server_slot = EQ::invbag::GENERAL_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; } } @@ -5759,10 +5759,10 @@ namespace RoF case invtype::typeBank: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::BANK_SIZE) { if (rof_slot.SubIndex == invbag::SLOT_INVALID) { - server_slot = EQEmu::invslot::BANK_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::BANK_BEGIN + rof_slot.Slot; } else if (rof_slot.SubIndex >= invbag::SLOT_BEGIN && rof_slot.SubIndex <= invbag::SLOT_END) { temp_slot = rof_slot.Slot * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::BANK_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; + server_slot = EQ::invbag::BANK_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; } } @@ -5771,10 +5771,10 @@ namespace RoF case invtype::typeSharedBank: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::SHARED_BANK_SIZE) { if (rof_slot.SubIndex == invbag::SLOT_INVALID) { - server_slot = EQEmu::invslot::SHARED_BANK_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::SHARED_BANK_BEGIN + rof_slot.Slot; } else if (rof_slot.SubIndex >= invbag::SLOT_BEGIN && rof_slot.SubIndex <= invbag::SLOT_END) { temp_slot = rof_slot.Slot * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; + server_slot = EQ::invbag::SHARED_BANK_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; } } @@ -5783,10 +5783,10 @@ namespace RoF case invtype::typeTrade: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::TRADE_SIZE) { if (rof_slot.SubIndex == invbag::SLOT_INVALID) { - server_slot = EQEmu::invslot::TRADE_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::TRADE_BEGIN + rof_slot.Slot; } else if (rof_slot.SubIndex >= invbag::SLOT_BEGIN && rof_slot.SubIndex <= invbag::SLOT_END) { temp_slot = rof_slot.Slot * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::TRADE_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; + server_slot = EQ::invbag::TRADE_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; } } @@ -5794,32 +5794,32 @@ namespace RoF } case invtype::typeWorld: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::WORLD_SIZE) { - server_slot = EQEmu::invslot::WORLD_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::WORLD_BEGIN + rof_slot.Slot; } else if (rof_slot.Slot == invslot::SLOT_INVALID) { - server_slot = EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE; + server_slot = EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE; } break; } case invtype::typeLimbo: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::LIMBO_SIZE) { - server_slot = EQEmu::invslot::slotCursor; + server_slot = EQ::invslot::slotCursor; } break; } case invtype::typeTribute: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::TRIBUTE_SIZE) { - server_slot = EQEmu::invslot::TRIBUTE_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::TRIBUTE_BEGIN + rof_slot.Slot; } break; } case invtype::typeGuildTribute: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::GUILD_TRIBUTE_SIZE) { - server_slot = EQEmu::invslot::GUILD_TRIBUTE_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::GUILD_TRIBUTE_BEGIN + rof_slot.Slot; } break; @@ -5853,10 +5853,10 @@ namespace RoF static inline uint32 RoFToServerCorpseSlot(structs::InventorySlot_Struct rof_corpse_slot) { - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; if (rof_corpse_slot.Type != invtype::typeCorpse || rof_corpse_slot.SubIndex != invbag::SLOT_INVALID || rof_corpse_slot.AugIndex != invaug::SOCKET_INVALID) { - server_slot = EQEmu::invslot::SLOT_INVALID; + server_slot = EQ::invslot::SLOT_INVALID; } else { @@ -5878,7 +5878,7 @@ namespace RoF } static inline uint32 RoFToServerCorpseMainSlot(uint32 rof_corpse_slot) { - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; if (rof_corpse_slot <= invslot::CORPSE_END && rof_corpse_slot >= invslot::CORPSE_BEGIN) { server_slot = rof_corpse_slot; @@ -5904,12 +5904,12 @@ namespace RoF rof_slot.AugIndex, rof_type, rof_slot.Unknown01, - EQEmu::invslot::SLOT_INVALID); + EQ::invslot::SLOT_INVALID); - return (uint32) EQEmu::invslot::SLOT_INVALID; + return (uint32) EQ::invslot::SLOT_INVALID; } - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; uint32 temp_slot = invslot::SLOT_INVALID; switch (rof_type) { @@ -5919,10 +5919,10 @@ namespace RoF server_slot = rof_slot.Slot; } else if (rof_slot.SubIndex >= invbag::SLOT_BEGIN && rof_slot.SubIndex <= invbag::SLOT_END) { if (rof_slot.Slot < invslot::GENERAL_BEGIN) - return EQEmu::invslot::SLOT_INVALID; + return EQ::invslot::SLOT_INVALID; temp_slot = (rof_slot.Slot - invslot::GENERAL_BEGIN) * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::GENERAL_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; + server_slot = EQ::invbag::GENERAL_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; } } @@ -5931,10 +5931,10 @@ namespace RoF case invtype::typeBank: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::BANK_SIZE) { if (rof_slot.SubIndex == invbag::SLOT_INVALID) { - server_slot = EQEmu::invslot::BANK_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::BANK_BEGIN + rof_slot.Slot; } else if (rof_slot.SubIndex >= invbag::SLOT_BEGIN && rof_slot.SubIndex <= invbag::SLOT_END) { temp_slot = rof_slot.Slot * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::BANK_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; + server_slot = EQ::invbag::BANK_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; } } @@ -5943,10 +5943,10 @@ namespace RoF case invtype::typeSharedBank: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::SHARED_BANK_SIZE) { if (rof_slot.SubIndex == invbag::SLOT_INVALID) { - server_slot = EQEmu::invslot::SHARED_BANK_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::SHARED_BANK_BEGIN + rof_slot.Slot; } else if (rof_slot.SubIndex >= invbag::SLOT_BEGIN && rof_slot.SubIndex <= invbag::SLOT_END) { temp_slot = rof_slot.Slot * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; + server_slot = EQ::invbag::SHARED_BANK_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; } } @@ -5955,10 +5955,10 @@ namespace RoF case invtype::typeTrade: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::TRADE_SIZE) { if (rof_slot.SubIndex == invbag::SLOT_INVALID) { - server_slot = EQEmu::invslot::TRADE_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::TRADE_BEGIN + rof_slot.Slot; } else if (rof_slot.SubIndex >= invbag::SLOT_BEGIN && rof_slot.SubIndex <= invbag::SLOT_END) { temp_slot = rof_slot.Slot * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::TRADE_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; + server_slot = EQ::invbag::TRADE_BAGS_BEGIN + temp_slot + rof_slot.SubIndex; } } @@ -5966,32 +5966,32 @@ namespace RoF } case invtype::typeWorld: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::WORLD_SIZE) { - server_slot = EQEmu::invslot::WORLD_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::WORLD_BEGIN + rof_slot.Slot; } else if (rof_slot.Slot == invslot::SLOT_INVALID) { - server_slot = EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE; + server_slot = EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE; } break; } case invtype::typeLimbo: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::LIMBO_SIZE) { - server_slot = EQEmu::invslot::slotCursor; + server_slot = EQ::invslot::slotCursor; } break; } case invtype::typeTribute: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::TRIBUTE_SIZE) { - server_slot = EQEmu::invslot::TRIBUTE_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::TRIBUTE_BEGIN + rof_slot.Slot; } break; } case invtype::typeGuildTribute: { if (rof_slot.Slot >= invslot::SLOT_BEGIN && rof_slot.Slot < invtype::GUILD_TRIBUTE_SIZE) { - server_slot = EQEmu::invslot::GUILD_TRIBUTE_BEGIN + rof_slot.Slot; + server_slot = EQ::invslot::GUILD_TRIBUTE_BEGIN + rof_slot.Slot; } break; @@ -6024,7 +6024,7 @@ namespace RoF static inline void ServerToRoFSayLink(std::string& rofSayLink, const std::string& serverSayLink) { - if ((constants::SAY_LINK_BODY_SIZE == EQEmu::constants::SAY_LINK_BODY_SIZE) || (serverSayLink.find('\x12') == std::string::npos)) { + if ((constants::SAY_LINK_BODY_SIZE == EQ::constants::SAY_LINK_BODY_SIZE) || (serverSayLink.find('\x12') == std::string::npos)) { rofSayLink = serverSayLink; return; } @@ -6033,7 +6033,7 @@ namespace RoF for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { - if (segments[segment_iter].length() <= EQEmu::constants::SAY_LINK_BODY_SIZE) { + if (segments[segment_iter].length() <= EQ::constants::SAY_LINK_BODY_SIZE) { rofSayLink.append(segments[segment_iter]); // TODO: log size mismatch error continue; @@ -6063,7 +6063,7 @@ namespace RoF static inline void RoFToServerSayLink(std::string& serverSayLink, const std::string& rofSayLink) { - if ((EQEmu::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (rofSayLink.find('\x12') == std::string::npos)) { + if ((EQ::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (rofSayLink.find('\x12') == std::string::npos)) { serverSayLink = rofSayLink; return; } @@ -6095,80 +6095,80 @@ namespace RoF } } - static inline spells::CastingSlot ServerToRoFCastingSlot(EQEmu::spells::CastingSlot slot) + static inline spells::CastingSlot ServerToRoFCastingSlot(EQ::spells::CastingSlot slot) { switch (slot) { - case EQEmu::spells::CastingSlot::Gem1: + case EQ::spells::CastingSlot::Gem1: return spells::CastingSlot::Gem1; - case EQEmu::spells::CastingSlot::Gem2: + case EQ::spells::CastingSlot::Gem2: return spells::CastingSlot::Gem2; - case EQEmu::spells::CastingSlot::Gem3: + case EQ::spells::CastingSlot::Gem3: return spells::CastingSlot::Gem3; - case EQEmu::spells::CastingSlot::Gem4: + case EQ::spells::CastingSlot::Gem4: return spells::CastingSlot::Gem4; - case EQEmu::spells::CastingSlot::Gem5: + case EQ::spells::CastingSlot::Gem5: return spells::CastingSlot::Gem5; - case EQEmu::spells::CastingSlot::Gem6: + case EQ::spells::CastingSlot::Gem6: return spells::CastingSlot::Gem6; - case EQEmu::spells::CastingSlot::Gem7: + case EQ::spells::CastingSlot::Gem7: return spells::CastingSlot::Gem7; - case EQEmu::spells::CastingSlot::Gem8: + case EQ::spells::CastingSlot::Gem8: return spells::CastingSlot::Gem8; - case EQEmu::spells::CastingSlot::Gem9: + case EQ::spells::CastingSlot::Gem9: return spells::CastingSlot::Gem9; - case EQEmu::spells::CastingSlot::Gem10: + case EQ::spells::CastingSlot::Gem10: return spells::CastingSlot::Gem10; - case EQEmu::spells::CastingSlot::Gem11: + case EQ::spells::CastingSlot::Gem11: return spells::CastingSlot::Gem11; - case EQEmu::spells::CastingSlot::Gem12: + case EQ::spells::CastingSlot::Gem12: return spells::CastingSlot::Gem12; - case EQEmu::spells::CastingSlot::Item: - case EQEmu::spells::CastingSlot::PotionBelt: + case EQ::spells::CastingSlot::Item: + case EQ::spells::CastingSlot::PotionBelt: return spells::CastingSlot::Item; - case EQEmu::spells::CastingSlot::Discipline: + case EQ::spells::CastingSlot::Discipline: return spells::CastingSlot::Discipline; - case EQEmu::spells::CastingSlot::AltAbility: + case EQ::spells::CastingSlot::AltAbility: return spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something return spells::CastingSlot::Discipline; } } - static inline EQEmu::spells::CastingSlot RoFToServerCastingSlot(spells::CastingSlot slot) + static inline EQ::spells::CastingSlot RoFToServerCastingSlot(spells::CastingSlot slot) { switch (slot) { case spells::CastingSlot::Gem1: - return EQEmu::spells::CastingSlot::Gem1; + return EQ::spells::CastingSlot::Gem1; case spells::CastingSlot::Gem2: - return EQEmu::spells::CastingSlot::Gem2; + return EQ::spells::CastingSlot::Gem2; case spells::CastingSlot::Gem3: - return EQEmu::spells::CastingSlot::Gem3; + return EQ::spells::CastingSlot::Gem3; case spells::CastingSlot::Gem4: - return EQEmu::spells::CastingSlot::Gem4; + return EQ::spells::CastingSlot::Gem4; case spells::CastingSlot::Gem5: - return EQEmu::spells::CastingSlot::Gem5; + return EQ::spells::CastingSlot::Gem5; case spells::CastingSlot::Gem6: - return EQEmu::spells::CastingSlot::Gem6; + return EQ::spells::CastingSlot::Gem6; case spells::CastingSlot::Gem7: - return EQEmu::spells::CastingSlot::Gem7; + return EQ::spells::CastingSlot::Gem7; case spells::CastingSlot::Gem8: - return EQEmu::spells::CastingSlot::Gem8; + return EQ::spells::CastingSlot::Gem8; case spells::CastingSlot::Gem9: - return EQEmu::spells::CastingSlot::Gem9; + return EQ::spells::CastingSlot::Gem9; case spells::CastingSlot::Gem10: - return EQEmu::spells::CastingSlot::Gem10; + return EQ::spells::CastingSlot::Gem10; case spells::CastingSlot::Gem11: - return EQEmu::spells::CastingSlot::Gem11; + return EQ::spells::CastingSlot::Gem11; case spells::CastingSlot::Gem12: - return EQEmu::spells::CastingSlot::Gem12; + return EQ::spells::CastingSlot::Gem12; case spells::CastingSlot::Discipline: - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; case spells::CastingSlot::Item: - return EQEmu::spells::CastingSlot::Item; + return EQ::spells::CastingSlot::Item; case spells::CastingSlot::AltAbility: - return EQEmu::spells::CastingSlot::AltAbility; + return EQ::spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; } } @@ -6177,12 +6177,12 @@ namespace RoF static inline int ServerToRoFBuffSlot(int index) { // we're a disc - if (index >= EQEmu::spells::LONG_BUFFS + EQEmu::spells::SHORT_BUFFS) - return index - EQEmu::spells::LONG_BUFFS - EQEmu::spells::SHORT_BUFFS + + if (index >= EQ::spells::LONG_BUFFS + EQ::spells::SHORT_BUFFS) + return index - EQ::spells::LONG_BUFFS - EQ::spells::SHORT_BUFFS + spells::LONG_BUFFS + spells::SHORT_BUFFS; // we're a song - if (index >= EQEmu::spells::LONG_BUFFS) - return index - EQEmu::spells::LONG_BUFFS + spells::LONG_BUFFS; + if (index >= EQ::spells::LONG_BUFFS) + return index - EQ::spells::LONG_BUFFS + spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } @@ -6191,11 +6191,11 @@ namespace RoF { // we're a disc if (index >= spells::LONG_BUFFS + spells::SHORT_BUFFS) - return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQEmu::spells::LONG_BUFFS + - EQEmu::spells::SHORT_BUFFS; + return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQ::spells::LONG_BUFFS + + EQ::spells::SHORT_BUFFS; // we're a song if (index >= spells::LONG_BUFFS) - return index - spells::LONG_BUFFS + EQEmu::spells::LONG_BUFFS; + return index - spells::LONG_BUFFS + EQ::spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } diff --git a/common/patches/rof.h b/common/patches/rof.h index 205998b32..21a525192 100644 --- a/common/patches/rof.h +++ b/common/patches/rof.h @@ -43,7 +43,7 @@ namespace RoF protected: virtual std::string Describe() const; - virtual const EQEmu::versions::ClientVersion ClientVersion() const; + virtual const EQ::versions::ClientVersion ClientVersion() const; //magic macro to declare our opcode processors #include "ss_declare.h" diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp index fc841a9b1..1b3827984 100644 --- a/common/patches/rof2.cpp +++ b/common/patches/rof2.cpp @@ -46,7 +46,7 @@ namespace RoF2 static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id, uint8 depth, ItemPacketType packet_type); + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id, uint8 depth, ItemPacketType packet_type); // server to client inventory location converters static inline structs::InventorySlot_Struct ServerToRoF2Slot(uint32 server_slot); @@ -66,8 +66,8 @@ namespace RoF2 // client to server say link converter static inline void RoF2ToServerSayLink(std::string &server_saylink, const std::string &rof2_saylink); - static inline spells::CastingSlot ServerToRoF2CastingSlot(EQEmu::spells::CastingSlot slot); - static inline EQEmu::spells::CastingSlot RoF2ToServerCastingSlot(spells::CastingSlot slot); + static inline spells::CastingSlot ServerToRoF2CastingSlot(EQ::spells::CastingSlot slot); + static inline EQ::spells::CastingSlot RoF2ToServerCastingSlot(spells::CastingSlot slot); static inline int ServerToRoF2BuffSlot(int index); static inline int RoF2ToServerBuffSlot(int index); @@ -151,9 +151,9 @@ namespace RoF2 return(r); } - const EQEmu::versions::ClientVersion Strategy::ClientVersion() const + const EQ::versions::ClientVersion Strategy::ClientVersion() const { - return EQEmu::versions::ClientVersion::RoF2; + return EQ::versions::ClientVersion::RoF2; } #include "ss_define.h" @@ -263,7 +263,7 @@ namespace RoF2 eq->unknown000 = 1; OUT(npcid); - eq->inventory_slot = ServerToRoF2TypelessSlot(emu->slot, EQEmu::invtype::typePossessions); + eq->inventory_slot = ServerToRoF2TypelessSlot(emu->slot, EQ::invtype::typePossessions); OUT(charges); OUT(sell_price); @@ -316,7 +316,7 @@ namespace RoF2 SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); OUT(merchant_entity_id); - eq->inventory_slot = ServerToRoF2TypelessSlot(emu->slot_id, EQEmu::invtype::typePossessions); + eq->inventory_slot = ServerToRoF2TypelessSlot(emu->slot_id, EQ::invtype::typePossessions); OUT(charges); OUT(cost); @@ -340,7 +340,7 @@ namespace RoF2 ENCODE_LENGTH_EXACT(ApplyPoison_Struct); SETUP_DIRECT_ENCODE(ApplyPoison_Struct, structs::ApplyPoison_Struct); - eq->inventorySlot = ServerToRoF2TypelessSlot(emu->inventorySlot, EQEmu::invtype::typePossessions); + eq->inventorySlot = ServerToRoF2TypelessSlot(emu->inventorySlot, EQ::invtype::typePossessions); OUT(success); FINISH_ENCODE(); @@ -571,7 +571,7 @@ namespace RoF2 ENCODE_LENGTH_EXACT(CastSpell_Struct); SETUP_DIRECT_ENCODE(CastSpell_Struct, structs::CastSpell_Struct); - eq->slot = static_cast(ServerToRoF2CastingSlot(static_cast(emu->slot))); + eq->slot = static_cast(ServerToRoF2CastingSlot(static_cast(emu->slot))); OUT(spell_id); eq->inventory_slot = ServerToRoF2Slot(emu->inventoryslot); @@ -639,24 +639,24 @@ namespace RoF2 //store away the emu struct uchar* __emu_buffer = in->pBuffer; - int item_count = in->size / sizeof(EQEmu::InternalSerializedItem_Struct); - if (!item_count || (in->size % sizeof(EQEmu::InternalSerializedItem_Struct)) != 0) { + int item_count = in->size / sizeof(EQ::InternalSerializedItem_Struct); + if (!item_count || (in->size % sizeof(EQ::InternalSerializedItem_Struct)) != 0) { Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", - opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQEmu::InternalSerializedItem_Struct)); + opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQ::InternalSerializedItem_Struct)); delete in; return; } - EQEmu::InternalSerializedItem_Struct* eq = (EQEmu::InternalSerializedItem_Struct*)in->pBuffer; + EQ::InternalSerializedItem_Struct* eq = (EQ::InternalSerializedItem_Struct*)in->pBuffer; - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)&item_count, sizeof(uint32)); for (int index = 0; index < item_count; ++index, ++eq) { - SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0, ItemPacketCharInventory); + SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, eq->slot_id, 0, ItemPacketCharInventory); if (ob.tellp() == last_pos) LogNetcode("RoF2::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory. Item skipped", eq->slot_id); @@ -1562,14 +1562,14 @@ namespace RoF2 uchar* __emu_buffer = in->pBuffer; ItemPacket_Struct* old_item_pkt = (ItemPacket_Struct*)__emu_buffer; - EQEmu::InternalSerializedItem_Struct* int_struct = (EQEmu::InternalSerializedItem_Struct*)(&__emu_buffer[4]); + EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]); - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)__emu_buffer, 4); - SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0, old_item_pkt->PacketType); + SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, int_struct->slot_id, 0, old_item_pkt->PacketType); if (ob.tellp() == last_pos) { LogNetcode("RoF2::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id); delete in; @@ -2014,7 +2014,7 @@ namespace RoF2 outapp->WriteUInt32(22); // Equipment count - for (int r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) + for (int r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) { outapp->WriteUInt32(emu->item_material.Slot[r].Material); outapp->WriteUInt32(0); @@ -2034,9 +2034,9 @@ namespace RoF2 outapp->WriteUInt32(0); } - outapp->WriteUInt32(EQEmu::textures::materialCount); // Equipment2 count + outapp->WriteUInt32(EQ::textures::materialCount); // Equipment2 count - for (int r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) + for (int r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) { outapp->WriteUInt32(0); outapp->WriteUInt32(0); @@ -2045,7 +2045,7 @@ namespace RoF2 outapp->WriteUInt32(0); } - outapp->WriteUInt32(EQEmu::textures::materialCount); // Tint Count + outapp->WriteUInt32(EQ::textures::materialCount); // Tint Count for (int r = 0; r < 7; r++) { @@ -2055,7 +2055,7 @@ namespace RoF2 outapp->WriteUInt32(0); outapp->WriteUInt32(0); - outapp->WriteUInt32(EQEmu::textures::materialCount); // Tint2 Count + outapp->WriteUInt32(EQ::textures::materialCount); // Tint2 Count for (int r = 0; r < 7; r++) { @@ -2184,7 +2184,7 @@ namespace RoF2 outapp->WriteUInt32(spells::SPELLBOOK_SIZE); // Spellbook slots - if (spells::SPELLBOOK_SIZE <= EQEmu::spells::SPELLBOOK_SIZE) { + if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) { for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) outapp->WriteUInt32(emu->spell_book[r]); @@ -2193,33 +2193,33 @@ namespace RoF2 } } else { - for (uint32 r = 0; r < EQEmu::spells::SPELLBOOK_SIZE; r++) { + for (uint32 r = 0; r < EQ::spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) outapp->WriteUInt32(emu->spell_book[r]); else outapp->WriteUInt32(0xFFFFFFFFU); } // invalidate the rest of the spellbook slots - for (uint32 r = EQEmu::spells::SPELLBOOK_SIZE; r < spells::SPELLBOOK_SIZE; r++) { + for (uint32 r = EQ::spells::SPELLBOOK_SIZE; r < spells::SPELLBOOK_SIZE; r++) { outapp->WriteUInt32(0xFFFFFFFFU); } } outapp->WriteUInt32(spells::SPELL_GEM_COUNT); // Memorised spell slots - for (uint32 r = 0; r < EQEmu::spells::SPELL_GEM_COUNT; r++) // write first 12 + for (uint32 r = 0; r < EQ::spells::SPELL_GEM_COUNT; r++) // write first 12 { outapp->WriteUInt32(emu->mem_spells[r]); } // zeroes for the rest of the slots the other 4, which actually don't work on the client at all :D - for (uint32 r = 0; r < spells::SPELL_GEM_COUNT - EQEmu::spells::SPELL_GEM_COUNT; r++) + for (uint32 r = 0; r < spells::SPELL_GEM_COUNT - EQ::spells::SPELL_GEM_COUNT; r++) { outapp->WriteUInt32(0xFFFFFFFFU); } outapp->WriteUInt32(13); // gem refresh counts - for (uint32 r = 0; r < EQEmu::spells::SPELL_GEM_COUNT; r++) + for (uint32 r = 0; r < EQ::spells::SPELL_GEM_COUNT; r++) { outapp->WriteUInt32(emu->spellSlotRefresh[r]); // spell gem refresh } @@ -2308,7 +2308,7 @@ namespace RoF2 outapp->WriteUInt32(profile::BANDOLIERS_SIZE); // Copy bandoliers where server and client indices converge - for (uint32 r = 0; r < EQEmu::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { + for (uint32 r = 0; r < EQ::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { outapp->WriteString(emu->bandoliers[r].Name); for (uint32 j = 0; j < profile::BANDOLIER_ITEM_COUNT; ++j) { // Will need adjusting if 'server != client' is ever true outapp->WriteString(emu->bandoliers[r].Items[j].Name); @@ -2323,7 +2323,7 @@ namespace RoF2 } } // Nullify bandoliers where server and client indices diverge, with a client bias - for (uint32 r = EQEmu::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { + for (uint32 r = EQ::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { outapp->WriteString(""); for (uint32 j = 0; j < profile::BANDOLIER_ITEM_COUNT; ++j) { // Will need adjusting if 'server != client' is ever true outapp->WriteString(""); @@ -2335,7 +2335,7 @@ namespace RoF2 outapp->WriteUInt32(profile::POTION_BELT_SIZE); // Copy potion belt where server and client indices converge - for (uint32 r = 0; r < EQEmu::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { + for (uint32 r = 0; r < EQ::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { outapp->WriteString(emu->potionbelt.Items[r].Name); outapp->WriteUInt32(emu->potionbelt.Items[r].ID); if (emu->potionbelt.Items[r].Icon) { @@ -2347,7 +2347,7 @@ namespace RoF2 } } // Nullify potion belt where server and client indices diverge, with a client bias - for (uint32 r = EQEmu::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { + for (uint32 r = EQ::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { outapp->WriteString(""); outapp->WriteUInt32(0); outapp->WriteSInt32(-1); @@ -2464,9 +2464,9 @@ namespace RoF2 outapp->WriteUInt8(0); // Unknown outapp->WriteUInt8(0); // Unknown - outapp->WriteUInt32(EQEmu::invtype::TRIBUTE_SIZE); + outapp->WriteUInt32(EQ::invtype::TRIBUTE_SIZE); - for (uint32 r = 0; r < EQEmu::invtype::TRIBUTE_SIZE; r++) + for (uint32 r = 0; r < EQ::invtype::TRIBUTE_SIZE; r++) { outapp->WriteUInt32(emu->tributes[r].tribute); outapp->WriteUInt32(emu->tributes[r].tier); @@ -3015,7 +3015,7 @@ namespace RoF2 eq_cse->Gender = emu_cse->Gender; eq_cse->Face = emu_cse->Face; - for (int equip_index = 0; equip_index < EQEmu::textures::materialCount; equip_index++) { + for (int equip_index = 0; equip_index < EQ::textures::materialCount; equip_index++) { eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteModel; @@ -3114,7 +3114,7 @@ namespace RoF2 SETUP_DIRECT_ENCODE(Merchant_Purchase_Struct, structs::Merchant_Purchase_Struct); OUT(npcid); - eq->inventory_slot = ServerToRoF2TypelessSlot(emu->itemslot, EQEmu::invtype::typePossessions); + eq->inventory_slot = ServerToRoF2TypelessSlot(emu->itemslot, EQ::invtype::typePossessions); //OUT(itemslot); OUT(quantity); OUT(price); @@ -4183,7 +4183,7 @@ namespace RoF2 if ((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522)) { - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; ++k) + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k) { { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->equipment_tint.Slot[k].Color); @@ -4192,7 +4192,7 @@ namespace RoF2 structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer; - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) { + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) { Equipment[k].Material = emu->equipment.Slot[k].Material; Equipment[k].Unknown1 = emu->equipment.Slot[k].Unknown1; Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteModel; @@ -4200,7 +4200,7 @@ namespace RoF2 Equipment[k].Material2 = emu->equipment.Slot[k].Unknown2; } - Buffer += (sizeof(structs::Texture_Struct) * EQEmu::textures::materialCount); + Buffer += (sizeof(structs::Texture_Struct) * EQ::textures::materialCount); } else { @@ -4911,7 +4911,7 @@ namespace RoF2 IN(item_id); int r; - for (r = EQEmu::invaug::SOCKET_BEGIN; r <= EQEmu::invaug::SOCKET_END; r++) { + for (r = EQ::invaug::SOCKET_BEGIN; r <= EQ::invaug::SOCKET_END; r++) { IN(augments[r]); } IN(link_hash); @@ -4936,7 +4936,7 @@ namespace RoF2 DECODE_LENGTH_EXACT(structs::LoadSpellSet_Struct); SETUP_DIRECT_DECODE(LoadSpellSet_Struct, structs::LoadSpellSet_Struct); - for (unsigned int i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; ++i) + for (unsigned int i = 0; i < EQ::spells::SPELL_GEM_COUNT; ++i) { if (eq->spell[i] == 0) emu->spell[i] = 0xFFFFFFFF; @@ -5346,9 +5346,9 @@ namespace RoF2 return NextItemInstSerialNumber; } - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth, ItemPacketType packet_type) + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth, ItemPacketType packet_type) { - const EQEmu::ItemData *item = inst->GetUnscaledItem(); + const EQ::ItemData *item = inst->GetUnscaledItem(); RoF2::structs::ItemSerializationHeader hdr; @@ -5411,7 +5411,7 @@ namespace RoF2 uint32 hero_model = 0; if (inst->GetOrnamentationIDFile()) { - hero_model = inst->GetOrnamentHeroModel(EQEmu::InventoryProfile::CalcMaterialFromSlot(slot_id_in)); + hero_model = inst->GetOrnamentHeroModel(EQ::InventoryProfile::CalcMaterialFromSlot(slot_id_in)); char tmp[30]; memset(tmp, 0x0, 30); @@ -5613,7 +5613,7 @@ namespace RoF2 // Done to hack older clients to label expendable fishing poles as such // July 28th, 2018 patch - if (item->ItemType == EQEmu::item::ItemTypeFishingPole && item->SubType == 0) { + if (item->ItemType == EQ::item::ItemTypeFishingPole && item->SubType == 0) { itbs.expendablearrow = 1; } @@ -5782,28 +5782,28 @@ namespace RoF2 ob.write((const char*)&iqbs, sizeof(RoF2::structs::ItemQuaternaryBodyStruct)); - EQEmu::OutBuffer::pos_type count_pos = ob.tellp(); + EQ::OutBuffer::pos_type count_pos = ob.tellp(); uint32 subitem_count = 0; ob.write((const char*)&subitem_count, sizeof(uint32)); // moved outside of loop since it is not modified within that scope - int16 SubSlotNumber = EQEmu::invbag::SLOT_INVALID; + int16 SubSlotNumber = EQ::invbag::SLOT_INVALID; - if (slot_id_in <= EQEmu::invslot::GENERAL_END && slot_id_in >= EQEmu::invslot::GENERAL_BEGIN) - SubSlotNumber = EQEmu::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT); - else if (slot_id_in == EQEmu::invslot::slotCursor) - SubSlotNumber = EQEmu::invbag::CURSOR_BAG_BEGIN; - else if (slot_id_in <= EQEmu::invslot::BANK_END && slot_id_in >= EQEmu::invslot::BANK_BEGIN) - SubSlotNumber = EQEmu::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT); - else if (slot_id_in <= EQEmu::invslot::SHARED_BANK_END && slot_id_in >= EQEmu::invslot::SHARED_BANK_BEGIN) - SubSlotNumber = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::SHARED_BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT); + if (slot_id_in <= EQ::invslot::GENERAL_END && slot_id_in >= EQ::invslot::GENERAL_BEGIN) + SubSlotNumber = EQ::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQ::invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT); + else if (slot_id_in == EQ::invslot::slotCursor) + SubSlotNumber = EQ::invbag::CURSOR_BAG_BEGIN; + else if (slot_id_in <= EQ::invslot::BANK_END && slot_id_in >= EQ::invslot::BANK_BEGIN) + SubSlotNumber = EQ::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::BANK_BEGIN) * EQ::invbag::SLOT_COUNT); + else if (slot_id_in <= EQ::invslot::SHARED_BANK_END && slot_id_in >= EQ::invslot::SHARED_BANK_BEGIN) + SubSlotNumber = EQ::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::SHARED_BANK_BEGIN) * EQ::invbag::SLOT_COUNT); else SubSlotNumber = slot_id_in; // not sure if this is the best way to handle this..leaving for now - if (SubSlotNumber != EQEmu::invbag::SLOT_INVALID) { - for (uint32 index = EQEmu::invbag::SLOT_BEGIN; index <= EQEmu::invbag::SLOT_END; ++index) { - EQEmu::ItemInstance* sub = inst->GetItem(index); + if (SubSlotNumber != EQ::invbag::SLOT_INVALID) { + for (uint32 index = EQ::invbag::SLOT_BEGIN; index <= EQ::invbag::SLOT_END; ++index) { + EQ::ItemInstance* sub = inst->GetItem(index); if (!sub) continue; @@ -5828,77 +5828,77 @@ namespace RoF2 RoF2Slot.AugIndex = invaug::SOCKET_INVALID; RoF2Slot.Unknown01 = INULL; - uint32 TempSlot = EQEmu::invslot::SLOT_INVALID; + uint32 TempSlot = EQ::invslot::SLOT_INVALID; - if (server_slot < EQEmu::invtype::POSSESSIONS_SIZE) { + if (server_slot < EQ::invtype::POSSESSIONS_SIZE) { RoF2Slot.Type = invtype::typePossessions; RoF2Slot.Slot = server_slot; } - else if (server_slot <= EQEmu::invbag::CURSOR_BAG_END && server_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - TempSlot = server_slot - EQEmu::invbag::GENERAL_BAGS_BEGIN; + else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) { + TempSlot = server_slot - EQ::invbag::GENERAL_BAGS_BEGIN; RoF2Slot.Type = invtype::typePossessions; - RoF2Slot.Slot = invslot::GENERAL_BEGIN + (TempSlot / EQEmu::invbag::SLOT_COUNT); - RoF2Slot.SubIndex = TempSlot - ((RoF2Slot.Slot - invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT); + RoF2Slot.Slot = invslot::GENERAL_BEGIN + (TempSlot / EQ::invbag::SLOT_COUNT); + RoF2Slot.SubIndex = TempSlot - ((RoF2Slot.Slot - invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT); } - else if (server_slot <= EQEmu::invslot::TRIBUTE_END && server_slot >= EQEmu::invslot::TRIBUTE_BEGIN) { + else if (server_slot <= EQ::invslot::TRIBUTE_END && server_slot >= EQ::invslot::TRIBUTE_BEGIN) { RoF2Slot.Type = invtype::typeTribute; - RoF2Slot.Slot = server_slot - EQEmu::invslot::TRIBUTE_BEGIN; + RoF2Slot.Slot = server_slot - EQ::invslot::TRIBUTE_BEGIN; } - else if (server_slot <= EQEmu::invslot::GUILD_TRIBUTE_END && server_slot >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN) { + else if (server_slot <= EQ::invslot::GUILD_TRIBUTE_END && server_slot >= EQ::invslot::GUILD_TRIBUTE_BEGIN) { RoF2Slot.Type = invtype::typeGuildTribute; - RoF2Slot.Slot = server_slot - EQEmu::invslot::GUILD_TRIBUTE_BEGIN; + RoF2Slot.Slot = server_slot - EQ::invslot::GUILD_TRIBUTE_BEGIN; } - else if (server_slot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { + else if (server_slot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { RoF2Slot.Type = invtype::typeWorld; } - else if (server_slot <= EQEmu::invslot::BANK_END && server_slot >= EQEmu::invslot::BANK_BEGIN) { + else if (server_slot <= EQ::invslot::BANK_END && server_slot >= EQ::invslot::BANK_BEGIN) { RoF2Slot.Type = invtype::typeBank; - RoF2Slot.Slot = server_slot - EQEmu::invslot::BANK_BEGIN; + RoF2Slot.Slot = server_slot - EQ::invslot::BANK_BEGIN; } - else if (server_slot <= EQEmu::invbag::BANK_BAGS_END && server_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) { - TempSlot = server_slot - EQEmu::invbag::BANK_BAGS_BEGIN; + else if (server_slot <= EQ::invbag::BANK_BAGS_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) { + TempSlot = server_slot - EQ::invbag::BANK_BAGS_BEGIN; RoF2Slot.Type = invtype::typeBank; - RoF2Slot.Slot = TempSlot / EQEmu::invbag::SLOT_COUNT; - RoF2Slot.SubIndex = TempSlot - (RoF2Slot.Slot * EQEmu::invbag::SLOT_COUNT); + RoF2Slot.Slot = TempSlot / EQ::invbag::SLOT_COUNT; + RoF2Slot.SubIndex = TempSlot - (RoF2Slot.Slot * EQ::invbag::SLOT_COUNT); } - else if (server_slot <= EQEmu::invslot::SHARED_BANK_END && server_slot >= EQEmu::invslot::SHARED_BANK_BEGIN) { + else if (server_slot <= EQ::invslot::SHARED_BANK_END && server_slot >= EQ::invslot::SHARED_BANK_BEGIN) { RoF2Slot.Type = invtype::typeSharedBank; - RoF2Slot.Slot = server_slot - EQEmu::invslot::SHARED_BANK_BEGIN; + RoF2Slot.Slot = server_slot - EQ::invslot::SHARED_BANK_BEGIN; } - else if (server_slot <= EQEmu::invbag::SHARED_BANK_BAGS_END && server_slot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) { - TempSlot = server_slot - EQEmu::invbag::SHARED_BANK_BAGS_BEGIN; + else if (server_slot <= EQ::invbag::SHARED_BANK_BAGS_END && server_slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) { + TempSlot = server_slot - EQ::invbag::SHARED_BANK_BAGS_BEGIN; RoF2Slot.Type = invtype::typeSharedBank; - RoF2Slot.Slot = TempSlot / EQEmu::invbag::SLOT_COUNT; - RoF2Slot.SubIndex = TempSlot - (RoF2Slot.Slot * EQEmu::invbag::SLOT_COUNT); + RoF2Slot.Slot = TempSlot / EQ::invbag::SLOT_COUNT; + RoF2Slot.SubIndex = TempSlot - (RoF2Slot.Slot * EQ::invbag::SLOT_COUNT); } - else if (server_slot <= EQEmu::invslot::TRADE_END && server_slot >= EQEmu::invslot::TRADE_BEGIN) { + else if (server_slot <= EQ::invslot::TRADE_END && server_slot >= EQ::invslot::TRADE_BEGIN) { RoF2Slot.Type = invtype::typeTrade; - RoF2Slot.Slot = server_slot - EQEmu::invslot::TRADE_BEGIN; + RoF2Slot.Slot = server_slot - EQ::invslot::TRADE_BEGIN; } - else if (server_slot <= EQEmu::invbag::TRADE_BAGS_END && server_slot >= EQEmu::invbag::TRADE_BAGS_BEGIN) { - TempSlot = server_slot - EQEmu::invbag::TRADE_BAGS_BEGIN; + else if (server_slot <= EQ::invbag::TRADE_BAGS_END && server_slot >= EQ::invbag::TRADE_BAGS_BEGIN) { + TempSlot = server_slot - EQ::invbag::TRADE_BAGS_BEGIN; RoF2Slot.Type = invtype::typeTrade; - RoF2Slot.Slot = TempSlot / EQEmu::invbag::SLOT_COUNT; - RoF2Slot.SubIndex = TempSlot - (RoF2Slot.Slot * EQEmu::invbag::SLOT_COUNT); + RoF2Slot.Slot = TempSlot / EQ::invbag::SLOT_COUNT; + RoF2Slot.SubIndex = TempSlot - (RoF2Slot.Slot * EQ::invbag::SLOT_COUNT); } - else if (server_slot <= EQEmu::invslot::WORLD_END && server_slot >= EQEmu::invslot::WORLD_BEGIN) { + else if (server_slot <= EQ::invslot::WORLD_END && server_slot >= EQ::invslot::WORLD_BEGIN) { RoF2Slot.Type = invtype::typeWorld; - RoF2Slot.Slot = server_slot - EQEmu::invslot::WORLD_BEGIN; + RoF2Slot.Slot = server_slot - EQ::invslot::WORLD_BEGIN; } Log(Logs::Detail, Logs::Netcode, "Convert Server Slot %i to RoF2 Slot [%i, %i, %i, %i] (unk2: %i, unk1: %i)", @@ -5930,7 +5930,7 @@ namespace RoF2 { uint32 RoF2Slot = invslot::SLOT_INVALID; - if (server_corpse_slot <= EQEmu::invslot::CORPSE_END && server_corpse_slot >= EQEmu::invslot::CORPSE_BEGIN) { + if (server_corpse_slot <= EQ::invslot::CORPSE_END && server_corpse_slot >= EQ::invslot::CORPSE_BEGIN) { RoF2Slot = server_corpse_slot; } @@ -5947,18 +5947,18 @@ namespace RoF2 RoF2Slot.AugIndex = invaug::SOCKET_INVALID; RoF2Slot.Unknown01 = INULL; - uint32 TempSlot = EQEmu::invslot::SLOT_INVALID; + uint32 TempSlot = EQ::invslot::SLOT_INVALID; - if (server_type == EQEmu::invtype::typePossessions) { - if (server_slot < EQEmu::invtype::POSSESSIONS_SIZE) { + if (server_type == EQ::invtype::typePossessions) { + if (server_slot < EQ::invtype::POSSESSIONS_SIZE) { RoF2Slot.Slot = server_slot; } - else if (server_slot <= EQEmu::invbag::CURSOR_BAG_END && server_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - TempSlot = server_slot - EQEmu::invbag::GENERAL_BAGS_BEGIN; + else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) { + TempSlot = server_slot - EQ::invbag::GENERAL_BAGS_BEGIN; - RoF2Slot.Slot = invslot::GENERAL_BEGIN + (TempSlot / EQEmu::invbag::SLOT_COUNT); - RoF2Slot.SubIndex = TempSlot - ((RoF2Slot.Slot - invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT); + RoF2Slot.Slot = invslot::GENERAL_BEGIN + (TempSlot / EQ::invbag::SLOT_COUNT); + RoF2Slot.SubIndex = TempSlot - ((RoF2Slot.Slot - invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT); } } @@ -5972,12 +5972,12 @@ namespace RoF2 { if (rof2_slot.AugIndex < invaug::SOCKET_INVALID || rof2_slot.AugIndex >= invaug::SOCKET_COUNT) { Log(Logs::Detail, Logs::Netcode, "Convert RoF2 Slot [%i, %i, %i, %i] (unk2: %i, unk1: %i) to Server Slot %i", - rof2_slot.Type, rof2_slot.Slot, rof2_slot.SubIndex, rof2_slot.AugIndex, rof2_slot.Unknown02, rof2_slot.Unknown01, EQEmu::invslot::SLOT_INVALID); + rof2_slot.Type, rof2_slot.Slot, rof2_slot.SubIndex, rof2_slot.AugIndex, rof2_slot.Unknown02, rof2_slot.Unknown01, EQ::invslot::SLOT_INVALID); - return EQEmu::invslot::SLOT_INVALID; + return EQ::invslot::SLOT_INVALID; } - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; uint32 temp_slot = invslot::SLOT_INVALID; switch (rof2_slot.Type) { @@ -5989,10 +5989,10 @@ namespace RoF2 else if (rof2_slot.SubIndex >= invbag::SLOT_BEGIN && rof2_slot.SubIndex <= invbag::SLOT_END) { if (rof2_slot.Slot < invslot::GENERAL_BEGIN) - return EQEmu::invslot::SLOT_INVALID; + return EQ::invslot::SLOT_INVALID; temp_slot = (rof2_slot.Slot - invslot::GENERAL_BEGIN) * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::GENERAL_BAGS_BEGIN + temp_slot + rof2_slot.SubIndex; + server_slot = EQ::invbag::GENERAL_BAGS_BEGIN + temp_slot + rof2_slot.SubIndex; } } @@ -6001,12 +6001,12 @@ namespace RoF2 case invtype::typeBank: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::BANK_SIZE) { if (rof2_slot.SubIndex == invbag::SLOT_INVALID) { - server_slot = EQEmu::invslot::BANK_BEGIN + rof2_slot.Slot; + server_slot = EQ::invslot::BANK_BEGIN + rof2_slot.Slot; } else if (rof2_slot.SubIndex >= invbag::SLOT_BEGIN && rof2_slot.SubIndex <= invbag::SLOT_END) { temp_slot = rof2_slot.Slot * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::BANK_BAGS_BEGIN + temp_slot + rof2_slot.SubIndex; + server_slot = EQ::invbag::BANK_BAGS_BEGIN + temp_slot + rof2_slot.SubIndex; } } @@ -6015,12 +6015,12 @@ namespace RoF2 case invtype::typeSharedBank: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::SHARED_BANK_SIZE) { if (rof2_slot.SubIndex == invbag::SLOT_INVALID) { - server_slot = EQEmu::invslot::SHARED_BANK_BEGIN + rof2_slot.Slot; + server_slot = EQ::invslot::SHARED_BANK_BEGIN + rof2_slot.Slot; } else if (rof2_slot.SubIndex >= invbag::SLOT_BEGIN && rof2_slot.SubIndex <= invbag::SLOT_END) { temp_slot = rof2_slot.Slot * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + temp_slot + rof2_slot.SubIndex; + server_slot = EQ::invbag::SHARED_BANK_BAGS_BEGIN + temp_slot + rof2_slot.SubIndex; } } @@ -6029,12 +6029,12 @@ namespace RoF2 case invtype::typeTrade: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::TRADE_SIZE) { if (rof2_slot.SubIndex == invbag::SLOT_INVALID) { - server_slot = EQEmu::invslot::TRADE_BEGIN + rof2_slot.Slot; + server_slot = EQ::invslot::TRADE_BEGIN + rof2_slot.Slot; } else if (rof2_slot.SubIndex >= invbag::SLOT_BEGIN && rof2_slot.SubIndex <= invbag::SLOT_END) { temp_slot = rof2_slot.Slot * invbag::SLOT_COUNT; - server_slot = EQEmu::invbag::TRADE_BAGS_BEGIN + temp_slot + rof2_slot.SubIndex; + server_slot = EQ::invbag::TRADE_BAGS_BEGIN + temp_slot + rof2_slot.SubIndex; } } @@ -6042,32 +6042,32 @@ namespace RoF2 } case invtype::typeWorld: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::WORLD_SIZE) { - server_slot = EQEmu::invslot::WORLD_BEGIN + rof2_slot.Slot; + server_slot = EQ::invslot::WORLD_BEGIN + rof2_slot.Slot; } else if (rof2_slot.Slot == invslot::SLOT_INVALID) { - server_slot = EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE; + server_slot = EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE; } break; } case invtype::typeLimbo: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::LIMBO_SIZE) { - server_slot = EQEmu::invslot::slotCursor; + server_slot = EQ::invslot::slotCursor; } break; } case invtype::typeTribute: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::TRIBUTE_SIZE) { - server_slot = EQEmu::invslot::TRIBUTE_BEGIN + rof2_slot.Slot; + server_slot = EQ::invslot::TRIBUTE_BEGIN + rof2_slot.Slot; } break; } case invtype::typeGuildTribute: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::GUILD_TRIBUTE_SIZE) { - server_slot = EQEmu::invslot::GUILD_TRIBUTE_BEGIN + rof2_slot.Slot; + server_slot = EQ::invslot::GUILD_TRIBUTE_BEGIN + rof2_slot.Slot; } break; @@ -6093,10 +6093,10 @@ namespace RoF2 static inline uint32 RoF2ToServerCorpseSlot(structs::InventorySlot_Struct rof2_corpse_slot) { - uint32 ServerSlot = EQEmu::invslot::SLOT_INVALID; + uint32 ServerSlot = EQ::invslot::SLOT_INVALID; if (rof2_corpse_slot.Type != invtype::typeCorpse || rof2_corpse_slot.SubIndex != invbag::SLOT_INVALID || rof2_corpse_slot.AugIndex != invaug::SOCKET_INVALID) { - ServerSlot = EQEmu::invslot::SLOT_INVALID; + ServerSlot = EQ::invslot::SLOT_INVALID; } else { @@ -6111,7 +6111,7 @@ namespace RoF2 static inline uint32 RoF2ToServerCorpseMainSlot(uint32 rof2_corpse_slot) { - uint32 ServerSlot = EQEmu::invslot::SLOT_INVALID; + uint32 ServerSlot = EQ::invslot::SLOT_INVALID; if (rof2_corpse_slot <= invslot::CORPSE_END && rof2_corpse_slot >= invslot::CORPSE_BEGIN) { ServerSlot = rof2_corpse_slot; @@ -6126,12 +6126,12 @@ namespace RoF2 { if (rof2_slot.AugIndex < invaug::SOCKET_INVALID || rof2_slot.AugIndex >= invaug::SOCKET_COUNT) { Log(Logs::Detail, Logs::Netcode, "Convert RoF2 Typeless Slot [%i, %i, %i] (implied type: %i, unk1: %i) to Server Slot %i", - rof2_slot.Slot, rof2_slot.SubIndex, rof2_slot.AugIndex, rof2_type, rof2_slot.Unknown01, EQEmu::invslot::SLOT_INVALID); + rof2_slot.Slot, rof2_slot.SubIndex, rof2_slot.AugIndex, rof2_type, rof2_slot.Unknown01, EQ::invslot::SLOT_INVALID); - return EQEmu::invslot::SLOT_INVALID; + return EQ::invslot::SLOT_INVALID; } - uint32 ServerSlot = EQEmu::invslot::SLOT_INVALID; + uint32 ServerSlot = EQ::invslot::SLOT_INVALID; uint32 TempSlot = invslot::SLOT_INVALID; switch (rof2_type) { @@ -6143,10 +6143,10 @@ namespace RoF2 else if (rof2_slot.SubIndex >= invbag::SLOT_BEGIN && rof2_slot.SubIndex <= invbag::SLOT_END) { if (rof2_slot.Slot < invslot::GENERAL_BEGIN) - return EQEmu::invslot::SLOT_INVALID; + return EQ::invslot::SLOT_INVALID; TempSlot = (rof2_slot.Slot - invslot::GENERAL_BEGIN) * invbag::SLOT_COUNT; - ServerSlot = EQEmu::invbag::GENERAL_BAGS_BEGIN + TempSlot + rof2_slot.SubIndex; + ServerSlot = EQ::invbag::GENERAL_BAGS_BEGIN + TempSlot + rof2_slot.SubIndex; } } @@ -6155,12 +6155,12 @@ namespace RoF2 case invtype::typeBank: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::BANK_SIZE) { if (rof2_slot.SubIndex == invbag::SLOT_INVALID) { - ServerSlot = EQEmu::invslot::BANK_BEGIN + rof2_slot.Slot; + ServerSlot = EQ::invslot::BANK_BEGIN + rof2_slot.Slot; } else if (rof2_slot.SubIndex >= invbag::SLOT_BEGIN && rof2_slot.SubIndex <= invbag::SLOT_END) { TempSlot = rof2_slot.Slot * invbag::SLOT_COUNT; - ServerSlot = EQEmu::invbag::BANK_BAGS_BEGIN + TempSlot + rof2_slot.SubIndex; + ServerSlot = EQ::invbag::BANK_BAGS_BEGIN + TempSlot + rof2_slot.SubIndex; } } @@ -6169,12 +6169,12 @@ namespace RoF2 case invtype::typeSharedBank: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::SHARED_BANK_SIZE) { if (rof2_slot.SubIndex == invbag::SLOT_INVALID) { - ServerSlot = EQEmu::invslot::SHARED_BANK_BEGIN + rof2_slot.Slot; + ServerSlot = EQ::invslot::SHARED_BANK_BEGIN + rof2_slot.Slot; } else if (rof2_slot.SubIndex >= invbag::SLOT_BEGIN && rof2_slot.SubIndex <= invbag::SLOT_END) { TempSlot = rof2_slot.Slot * invbag::SLOT_COUNT; - ServerSlot = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + TempSlot + rof2_slot.SubIndex; + ServerSlot = EQ::invbag::SHARED_BANK_BAGS_BEGIN + TempSlot + rof2_slot.SubIndex; } } @@ -6183,12 +6183,12 @@ namespace RoF2 case invtype::typeTrade: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::TRADE_SIZE) { if (rof2_slot.SubIndex == invbag::SLOT_INVALID) { - ServerSlot = EQEmu::invslot::TRADE_BEGIN + rof2_slot.Slot; + ServerSlot = EQ::invslot::TRADE_BEGIN + rof2_slot.Slot; } else if (rof2_slot.SubIndex >= invbag::SLOT_BEGIN && rof2_slot.SubIndex <= invbag::SLOT_END) { TempSlot = rof2_slot.Slot * invbag::SLOT_COUNT; - ServerSlot = EQEmu::invbag::TRADE_BAGS_BEGIN + TempSlot + rof2_slot.SubIndex; + ServerSlot = EQ::invbag::TRADE_BAGS_BEGIN + TempSlot + rof2_slot.SubIndex; } } @@ -6196,32 +6196,32 @@ namespace RoF2 } case invtype::typeWorld: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::WORLD_SIZE) { - ServerSlot = EQEmu::invslot::WORLD_BEGIN + rof2_slot.Slot; + ServerSlot = EQ::invslot::WORLD_BEGIN + rof2_slot.Slot; } else if (rof2_slot.Slot == invslot::SLOT_INVALID) { - ServerSlot = EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE; + ServerSlot = EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE; } break; } case invtype::typeLimbo: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::LIMBO_SIZE) { - ServerSlot = EQEmu::invslot::slotCursor; + ServerSlot = EQ::invslot::slotCursor; } break; } case invtype::typeTribute: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::TRIBUTE_SIZE) { - ServerSlot = EQEmu::invslot::TRIBUTE_BEGIN + rof2_slot.Slot; + ServerSlot = EQ::invslot::TRIBUTE_BEGIN + rof2_slot.Slot; } break; } case invtype::typeGuildTribute: { if (rof2_slot.Slot >= invslot::SLOT_BEGIN && rof2_slot.Slot < invtype::GUILD_TRIBUTE_SIZE) { - ServerSlot = EQEmu::invslot::GUILD_TRIBUTE_BEGIN + rof2_slot.Slot; + ServerSlot = EQ::invslot::GUILD_TRIBUTE_BEGIN + rof2_slot.Slot; } break; @@ -6247,7 +6247,7 @@ namespace RoF2 static inline void ServerToRoF2SayLink(std::string &rof2_saylink, const std::string &server_saylink) { - if ((constants::SAY_LINK_BODY_SIZE == EQEmu::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) { + if ((constants::SAY_LINK_BODY_SIZE == EQ::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) { rof2_saylink = server_saylink; return; } @@ -6256,7 +6256,7 @@ namespace RoF2 for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { - if (segments[segment_iter].length() <= EQEmu::constants::SAY_LINK_BODY_SIZE) { + if (segments[segment_iter].length() <= EQ::constants::SAY_LINK_BODY_SIZE) { rof2_saylink.append(segments[segment_iter]); // TODO: log size mismatch error continue; @@ -6279,7 +6279,7 @@ namespace RoF2 static inline void RoF2ToServerSayLink(std::string &server_saylink, const std::string &rof2_saylink) { - if ((EQEmu::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (rof2_saylink.find('\x12') == std::string::npos)) { + if ((EQ::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (rof2_saylink.find('\x12') == std::string::npos)) { server_saylink = rof2_saylink; return; } @@ -6309,80 +6309,80 @@ namespace RoF2 } } - static inline spells::CastingSlot ServerToRoF2CastingSlot(EQEmu::spells::CastingSlot slot) + static inline spells::CastingSlot ServerToRoF2CastingSlot(EQ::spells::CastingSlot slot) { switch (slot) { - case EQEmu::spells::CastingSlot::Gem1: + case EQ::spells::CastingSlot::Gem1: return spells::CastingSlot::Gem1; - case EQEmu::spells::CastingSlot::Gem2: + case EQ::spells::CastingSlot::Gem2: return spells::CastingSlot::Gem2; - case EQEmu::spells::CastingSlot::Gem3: + case EQ::spells::CastingSlot::Gem3: return spells::CastingSlot::Gem3; - case EQEmu::spells::CastingSlot::Gem4: + case EQ::spells::CastingSlot::Gem4: return spells::CastingSlot::Gem4; - case EQEmu::spells::CastingSlot::Gem5: + case EQ::spells::CastingSlot::Gem5: return spells::CastingSlot::Gem5; - case EQEmu::spells::CastingSlot::Gem6: + case EQ::spells::CastingSlot::Gem6: return spells::CastingSlot::Gem6; - case EQEmu::spells::CastingSlot::Gem7: + case EQ::spells::CastingSlot::Gem7: return spells::CastingSlot::Gem7; - case EQEmu::spells::CastingSlot::Gem8: + case EQ::spells::CastingSlot::Gem8: return spells::CastingSlot::Gem8; - case EQEmu::spells::CastingSlot::Gem9: + case EQ::spells::CastingSlot::Gem9: return spells::CastingSlot::Gem9; - case EQEmu::spells::CastingSlot::Gem10: + case EQ::spells::CastingSlot::Gem10: return spells::CastingSlot::Gem10; - case EQEmu::spells::CastingSlot::Gem11: + case EQ::spells::CastingSlot::Gem11: return spells::CastingSlot::Gem11; - case EQEmu::spells::CastingSlot::Gem12: + case EQ::spells::CastingSlot::Gem12: return spells::CastingSlot::Gem12; - case EQEmu::spells::CastingSlot::Item: - case EQEmu::spells::CastingSlot::PotionBelt: + case EQ::spells::CastingSlot::Item: + case EQ::spells::CastingSlot::PotionBelt: return spells::CastingSlot::Item; - case EQEmu::spells::CastingSlot::Discipline: + case EQ::spells::CastingSlot::Discipline: return spells::CastingSlot::Discipline; - case EQEmu::spells::CastingSlot::AltAbility: + case EQ::spells::CastingSlot::AltAbility: return spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something return spells::CastingSlot::Discipline; } } - static inline EQEmu::spells::CastingSlot RoF2ToServerCastingSlot(spells::CastingSlot slot) + static inline EQ::spells::CastingSlot RoF2ToServerCastingSlot(spells::CastingSlot slot) { switch (slot) { case spells::CastingSlot::Gem1: - return EQEmu::spells::CastingSlot::Gem1; + return EQ::spells::CastingSlot::Gem1; case spells::CastingSlot::Gem2: - return EQEmu::spells::CastingSlot::Gem2; + return EQ::spells::CastingSlot::Gem2; case spells::CastingSlot::Gem3: - return EQEmu::spells::CastingSlot::Gem3; + return EQ::spells::CastingSlot::Gem3; case spells::CastingSlot::Gem4: - return EQEmu::spells::CastingSlot::Gem4; + return EQ::spells::CastingSlot::Gem4; case spells::CastingSlot::Gem5: - return EQEmu::spells::CastingSlot::Gem5; + return EQ::spells::CastingSlot::Gem5; case spells::CastingSlot::Gem6: - return EQEmu::spells::CastingSlot::Gem6; + return EQ::spells::CastingSlot::Gem6; case spells::CastingSlot::Gem7: - return EQEmu::spells::CastingSlot::Gem7; + return EQ::spells::CastingSlot::Gem7; case spells::CastingSlot::Gem8: - return EQEmu::spells::CastingSlot::Gem8; + return EQ::spells::CastingSlot::Gem8; case spells::CastingSlot::Gem9: - return EQEmu::spells::CastingSlot::Gem9; + return EQ::spells::CastingSlot::Gem9; case spells::CastingSlot::Gem10: - return EQEmu::spells::CastingSlot::Gem10; + return EQ::spells::CastingSlot::Gem10; case spells::CastingSlot::Gem11: - return EQEmu::spells::CastingSlot::Gem11; + return EQ::spells::CastingSlot::Gem11; case spells::CastingSlot::Gem12: - return EQEmu::spells::CastingSlot::Gem12; + return EQ::spells::CastingSlot::Gem12; case spells::CastingSlot::Discipline: - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; case spells::CastingSlot::Item: - return EQEmu::spells::CastingSlot::Item; + return EQ::spells::CastingSlot::Item; case spells::CastingSlot::AltAbility: - return EQEmu::spells::CastingSlot::AltAbility; + return EQ::spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; } } @@ -6391,12 +6391,12 @@ namespace RoF2 static inline int ServerToRoF2BuffSlot(int index) { // we're a disc - if (index >= EQEmu::spells::LONG_BUFFS + EQEmu::spells::SHORT_BUFFS) - return index - EQEmu::spells::LONG_BUFFS - EQEmu::spells::SHORT_BUFFS + + if (index >= EQ::spells::LONG_BUFFS + EQ::spells::SHORT_BUFFS) + return index - EQ::spells::LONG_BUFFS - EQ::spells::SHORT_BUFFS + spells::LONG_BUFFS + spells::SHORT_BUFFS; // we're a song - if (index >= EQEmu::spells::LONG_BUFFS) - return index - EQEmu::spells::LONG_BUFFS + spells::LONG_BUFFS; + if (index >= EQ::spells::LONG_BUFFS) + return index - EQ::spells::LONG_BUFFS + spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } @@ -6405,11 +6405,11 @@ namespace RoF2 { // we're a disc if (index >= spells::LONG_BUFFS + spells::SHORT_BUFFS) - return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQEmu::spells::LONG_BUFFS + - EQEmu::spells::SHORT_BUFFS; + return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQ::spells::LONG_BUFFS + + EQ::spells::SHORT_BUFFS; // we're a song if (index >= spells::LONG_BUFFS) - return index - spells::LONG_BUFFS + EQEmu::spells::LONG_BUFFS; + return index - spells::LONG_BUFFS + EQ::spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } diff --git a/common/patches/rof2.h b/common/patches/rof2.h index 9eef8e596..f5f00db47 100644 --- a/common/patches/rof2.h +++ b/common/patches/rof2.h @@ -43,7 +43,7 @@ namespace RoF2 protected: virtual std::string Describe() const; - virtual const EQEmu::versions::ClientVersion ClientVersion() const; + virtual const EQ::versions::ClientVersion ClientVersion() const; //magic macro to declare our opcode processors #include "ss_declare.h" diff --git a/common/patches/rof2_limits.h b/common/patches/rof2_limits.h index b3a1a4962..114db68aa 100644 --- a/common/patches/rof2_limits.h +++ b/common/patches/rof2_limits.h @@ -31,7 +31,7 @@ namespace RoF2 const int16 INULL = 0; namespace inventory { - inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::RoF2; } const bool ConcatenateInvTypeLimbo = false; @@ -43,7 +43,7 @@ namespace RoF2 } /*inventory*/ namespace invtype { - inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::RoF2; } namespace enum_ { enum InventoryTypes : int16 { @@ -118,7 +118,7 @@ namespace RoF2 } /*invtype*/ namespace invslot { - inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::RoF2; } namespace enum_ { enum InventorySlots : int16 { @@ -196,7 +196,7 @@ namespace RoF2 } /*invslot*/ namespace invbag { - inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::RoF2; } const int16 SLOT_INVALID = IINVALID; const int16 SLOT_BEGIN = INULL; @@ -208,7 +208,7 @@ namespace RoF2 } /*invbag*/ namespace invaug { - inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::RoF2; } const int16 SOCKET_INVALID = IINVALID; const int16 SOCKET_BEGIN = INULL; @@ -220,7 +220,7 @@ namespace RoF2 } /*invaug*/ namespace item { - inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::RoF2; } //enum Unknown : int { // looks like item class..but, RoF has it too - nothing in UF- // Unknown1 = 0, @@ -249,7 +249,7 @@ namespace RoF2 } /*item*/ namespace profile { - inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::RoF2; } const int16 BANDOLIERS_SIZE = 20; // number of bandolier instances const int16 BANDOLIER_ITEM_COUNT = 4; // number of equipment slots in bandolier instance @@ -261,11 +261,11 @@ namespace RoF2 } /*profile*/ namespace constants { - inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::RoF2; } - const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::RoF; - const uint32 EXPANSION_BIT = EQEmu::expansions::bitRoF; - const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskRoF; + const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::RoF; + const uint32 EXPANSION_BIT = EQ::expansions::bitRoF; + const uint32 EXPANSIONS_MASK = EQ::expansions::maskRoF; const size_t CHARACTER_CREATION_LIMIT = 12; @@ -274,21 +274,21 @@ namespace RoF2 } /*constants*/ namespace behavior { - inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::RoF2; } const bool CoinHasWeight = false; } /*behavior*/ namespace skills { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::RoF2; } - const size_t LastUsableSkill = EQEmu::skills::Skill2HPiercing; + const size_t LastUsableSkill = EQ::skills::Skill2HPiercing; } /*skills*/ namespace spells { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::RoF2; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::RoF2; } enum class CastingSlot : uint32 { Gem1 = 0, diff --git a/common/patches/rof2_structs.h b/common/patches/rof2_structs.h index 92021c283..67947d57f 100644 --- a/common/patches/rof2_structs.h +++ b/common/patches/rof2_structs.h @@ -190,7 +190,7 @@ struct TintProfile Tint_Struct Primary; Tint_Struct Secondary; }; - Tint_Struct Slot[EQEmu::textures::materialCount]; + Tint_Struct Slot[EQ::textures::materialCount]; }; }; @@ -222,7 +222,7 @@ struct Texture_Struct // Texture_Struct Primary; // Texture_Struct Secondary; // }; -// Texture_Struct Slot[EQEmu::textures::TextureCount]; +// Texture_Struct Slot[EQ::textures::TextureCount]; // }; // // TextureProfile(); @@ -1113,7 +1113,7 @@ union /*00184*/ Texture_Struct equipment[22]; // Total Slots }; /*00624*/ uint32 equip2_count; // Seen 9 -/*00628*/ Texture_Struct equipment2[EQEmu::textures::materialCount]; // Appears to be Visible slots, but all 0s +/*00628*/ Texture_Struct equipment2[EQ::textures::materialCount]; // Appears to be Visible slots, but all 0s /*00808*/ uint32 tint_count; // Seen 9 /*00812*/ TintProfile item_tint; // RR GG BB 00 /*00848*/ uint32 tint_count2; // Seen 9 diff --git a/common/patches/rof_limits.h b/common/patches/rof_limits.h index 460ebfddb..4df54d1c2 100644 --- a/common/patches/rof_limits.h +++ b/common/patches/rof_limits.h @@ -31,7 +31,7 @@ namespace RoF const int16 INULL = 0; namespace inventory { - inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::RoF; } const bool ConcatenateInvTypeLimbo = false; @@ -43,7 +43,7 @@ namespace RoF } /*inventory*/ namespace invtype { - inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::RoF; } namespace enum_ { enum InventoryTypes : int16 { @@ -116,7 +116,7 @@ namespace RoF } /*invtype*/ namespace invslot { - inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::RoF; } namespace enum_ { enum InventorySlots : int16 { @@ -194,7 +194,7 @@ namespace RoF } /*invslot*/ namespace invbag { - inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::RoF; } const int16 SLOT_INVALID = IINVALID; const int16 SLOT_BEGIN = INULL; @@ -206,7 +206,7 @@ namespace RoF } /*invbag*/ namespace invaug { - inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::RoF; } const int16 SOCKET_INVALID = IINVALID; const int16 SOCKET_BEGIN = INULL; @@ -218,7 +218,7 @@ namespace RoF } /*invaug*/ namespace item { - inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::RoF; } enum ItemPacketType : int { ItemPacketMerchant = 100, @@ -240,7 +240,7 @@ namespace RoF } /*item*/ namespace profile { - inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::RoF; } const int16 BANDOLIERS_SIZE = 20; // number of bandolier instances const int16 BANDOLIER_ITEM_COUNT = 4; // number of equipment slots in bandolier instance @@ -252,11 +252,11 @@ namespace RoF } /*profile*/ namespace constants { - inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::RoF; } - const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::RoF; - const uint32 EXPANSION_BIT = EQEmu::expansions::bitRoF; - const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskRoF; + const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::RoF; + const uint32 EXPANSION_BIT = EQ::expansions::bitRoF; + const uint32 EXPANSIONS_MASK = EQ::expansions::maskRoF; const size_t CHARACTER_CREATION_LIMIT = 12; @@ -265,21 +265,21 @@ namespace RoF } /*constants*/ namespace behavior { - inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::RoF; } const bool CoinHasWeight = false; } /*behavior*/ namespace skills { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::RoF; } - const size_t LastUsableSkill = EQEmu::skills::SkillTripleAttack; + const size_t LastUsableSkill = EQ::skills::SkillTripleAttack; } /*skills*/ namespace spells { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::RoF; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::RoF; } enum class CastingSlot : uint32 { Gem1 = 0, diff --git a/common/patches/rof_structs.h b/common/patches/rof_structs.h index bdf416724..76324d59b 100644 --- a/common/patches/rof_structs.h +++ b/common/patches/rof_structs.h @@ -190,7 +190,7 @@ struct TintProfile Tint_Struct Primary; Tint_Struct Secondary; }; - Tint_Struct Slot[EQEmu::textures::materialCount]; + Tint_Struct Slot[EQ::textures::materialCount]; }; }; @@ -222,7 +222,7 @@ struct Texture_Struct // Texture_Struct Primary; // Texture_Struct Secondary; // }; -// Texture_Struct Slot[EQEmu::textures::TextureCount]; +// Texture_Struct Slot[EQ::textures::TextureCount]; // }; // // TextureProfile(); diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp index 753852a18..6e3f274e7 100644 --- a/common/patches/sod.cpp +++ b/common/patches/sod.cpp @@ -43,7 +43,7 @@ namespace SoD static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id, uint8 depth); + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id, uint8 depth); // server to client inventory location converters static inline uint32 ServerToSoDSlot(uint32 server_slot); @@ -59,8 +59,8 @@ namespace SoD // client to server say link converter static inline void SoDToServerSayLink(std::string &server_saylink, const std::string &sod_saylink); - static inline spells::CastingSlot ServerToSoDCastingSlot(EQEmu::spells::CastingSlot slot); - static inline EQEmu::spells::CastingSlot SoDToServerCastingSlot(spells::CastingSlot slot); + static inline spells::CastingSlot ServerToSoDCastingSlot(EQ::spells::CastingSlot slot); + static inline EQ::spells::CastingSlot SoDToServerCastingSlot(spells::CastingSlot slot); static inline int ServerToSoDBuffSlot(int index); static inline int SoDToServerBuffSlot(int index); @@ -144,9 +144,9 @@ namespace SoD return(r); } - const EQEmu::versions::ClientVersion Strategy::ClientVersion() const + const EQ::versions::ClientVersion Strategy::ClientVersion() const { - return EQEmu::versions::ClientVersion::SoD; + return EQ::versions::ClientVersion::SoD; } #include "ss_define.h" @@ -381,24 +381,24 @@ namespace SoD //store away the emu struct uchar* __emu_buffer = in->pBuffer; - int item_count = in->size / sizeof(EQEmu::InternalSerializedItem_Struct); - if (!item_count || (in->size % sizeof(EQEmu::InternalSerializedItem_Struct)) != 0) { + int item_count = in->size / sizeof(EQ::InternalSerializedItem_Struct); + if (!item_count || (in->size % sizeof(EQ::InternalSerializedItem_Struct)) != 0) { Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", - opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQEmu::InternalSerializedItem_Struct)); + opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQ::InternalSerializedItem_Struct)); delete in; return; } - EQEmu::InternalSerializedItem_Struct* eq = (EQEmu::InternalSerializedItem_Struct*)in->pBuffer; + EQ::InternalSerializedItem_Struct* eq = (EQ::InternalSerializedItem_Struct*)in->pBuffer; - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)&item_count, sizeof(uint32)); for (int index = 0; index < item_count; ++index, ++eq) { - SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0); + SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, eq->slot_id, 0); if (ob.tellp() == last_pos) LogNetcode("SoD::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory. Item skipped", eq->slot_id); @@ -1060,14 +1060,14 @@ namespace SoD //store away the emu struct uchar* __emu_buffer = in->pBuffer; - EQEmu::InternalSerializedItem_Struct* int_struct = (EQEmu::InternalSerializedItem_Struct*)(&__emu_buffer[4]); + EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]); - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)__emu_buffer, 4); - SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0); + SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, int_struct->slot_id, 0); if (ob.tellp() == last_pos) { LogNetcode("SoD::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id); delete in; @@ -1463,7 +1463,7 @@ namespace SoD OUT(hairstyle); OUT(beard); // OUT(unknown00178[10]); - for (r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) { + for (r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) { eq->equipment.Slot[r].Material = emu->item_material.Slot[r].Material; eq->equipment.Slot[r].Unknown1 = 0; eq->equipment.Slot[r].EliteMaterial = 0; @@ -1493,7 +1493,7 @@ namespace SoD OUT(face); // OUT(unknown02264[47]); - if (spells::SPELLBOOK_SIZE <= EQEmu::spells::SPELLBOOK_SIZE) { + if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) { for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) eq->spell_book[r] = emu->spell_book[r]; @@ -1502,14 +1502,14 @@ namespace SoD } } else { - for (uint32 r = 0; r < EQEmu::spells::SPELLBOOK_SIZE; r++) { + for (uint32 r = 0; r < EQ::spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) eq->spell_book[r] = emu->spell_book[r]; else eq->spell_book[r] = 0xFFFFFFFFU; } // invalidate the rest of the spellbook slots - memset(&eq->spell_book[EQEmu::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQEmu::spells::SPELLBOOK_SIZE))); + memset(&eq->spell_book[EQ::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQ::spells::SPELLBOOK_SIZE))); } // OUT(unknown4184[128]); @@ -1553,7 +1553,7 @@ namespace SoD // OUT(unknown06160[4]); // Copy bandoliers where server and client indices converge - for (r = 0; r < EQEmu::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { + for (r = 0; r < EQ::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { OUT_str(bandoliers[r].Name); for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true OUT(bandoliers[r].Items[k].ID); @@ -1562,7 +1562,7 @@ namespace SoD } } // Nullify bandoliers where server and client indices diverge, with a client bias - for (r = EQEmu::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { + for (r = EQ::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { eq->bandoliers[r].Name[0] = '\0'; for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true eq->bandoliers[r].Items[k].ID = 0; @@ -1574,13 +1574,13 @@ namespace SoD // OUT(unknown07444[5120]); // Copy potion belt where server and client indices converge - for (r = 0; r < EQEmu::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { + for (r = 0; r < EQ::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { OUT(potionbelt.Items[r].ID); OUT(potionbelt.Items[r].Icon); OUT_str(potionbelt.Items[r].Name); } // Nullify potion belt where server and client indices diverge, with a client bias - for (r = EQEmu::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { + for (r = EQ::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { eq->potionbelt.Items[r].ID = 0; eq->potionbelt.Items[r].Icon = 0; eq->potionbelt.Items[r].Name[0] = '\0'; @@ -1923,7 +1923,7 @@ namespace SoD eq_cse->HairColor = emu_cse->HairColor; eq_cse->Face = emu_cse->Face; - for (int equip_index = EQEmu::textures::textureBegin; equip_index < EQEmu::textures::materialCount; equip_index++) { + for (int equip_index = EQ::textures::textureBegin; equip_index < EQ::textures::materialCount; equip_index++) { eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteModel; @@ -2484,7 +2484,7 @@ namespace SoD float SpawnSize = emu->size; if (!((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522))) { - PacketSize -= (sizeof(structs::Texture_Struct) * EQEmu::textures::materialCount); + PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount); if (emu->size == 0) { @@ -2681,7 +2681,7 @@ namespace SoD if ((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522)) { - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; ++k) + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k) { { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->equipment_tint.Slot[k].Color); @@ -2708,13 +2708,13 @@ namespace SoD { structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer; - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) { + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) { Equipment[k].Material = emu->equipment.Slot[k].Material; Equipment[k].Unknown1 = emu->equipment.Slot[k].Unknown1; Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteModel; } - Buffer += (sizeof(structs::Texture_Struct) * EQEmu::textures::materialCount); + Buffer += (sizeof(structs::Texture_Struct) * EQ::textures::materialCount); } if (strlen(emu->title)) { @@ -3146,7 +3146,7 @@ namespace SoD for (int i = 0; i < spells::SPELL_GEM_COUNT; ++i) emu->spell[i] = eq->spell[i]; - for (int i = spells::SPELL_GEM_COUNT; i < EQEmu::spells::SPELL_GEM_COUNT; ++i) + for (int i = spells::SPELL_GEM_COUNT; i < EQ::spells::SPELL_GEM_COUNT; ++i) emu->spell[i] = 0xFFFFFFFF; FINISH_DIRECT_DECODE(); @@ -3440,9 +3440,9 @@ namespace SoD return NextItemInstSerialNumber; } - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth) + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth) { - const EQEmu::ItemData *item = inst->GetUnscaledItem(); + const EQ::ItemData *item = inst->GetUnscaledItem(); SoD::structs::ItemSerializationHeader hdr; @@ -3633,7 +3633,7 @@ namespace SoD // Done to hack older clients to label expendable fishing poles as such // July 28th, 2018 patch - if (item->ItemType == EQEmu::item::ItemTypeFishingPole && item->SubType == 0) { + if (item->ItemType == EQ::item::ItemTypeFishingPole && item->SubType == 0) { itbs.expendablearrow = 1; } @@ -3757,30 +3757,30 @@ namespace SoD ob.write((const char*)&iqbs, sizeof(SoD::structs::ItemQuaternaryBodyStruct)); - EQEmu::OutBuffer::pos_type count_pos = ob.tellp(); + EQ::OutBuffer::pos_type count_pos = ob.tellp(); uint32 subitem_count = 0; ob.write((const char*)&subitem_count, sizeof(uint32)); // moved outside of loop since it is not modified within that scope - int16 SubSlotNumber = EQEmu::invbag::SLOT_INVALID; + int16 SubSlotNumber = EQ::invbag::SLOT_INVALID; - if (slot_id_in <= EQEmu::invslot::slotGeneral8 && slot_id_in >= EQEmu::invslot::GENERAL_BEGIN) - SubSlotNumber = EQEmu::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT); - else if (slot_id_in <= EQEmu::invslot::GENERAL_END && slot_id_in >= EQEmu::invslot::slotGeneral9) - SubSlotNumber = EQEmu::invbag::SLOT_INVALID; - else if (slot_id_in == EQEmu::invslot::slotCursor) - SubSlotNumber = EQEmu::invbag::CURSOR_BAG_BEGIN; - else if (slot_id_in <= EQEmu::invslot::BANK_END && slot_id_in >= EQEmu::invslot::BANK_BEGIN) - SubSlotNumber = EQEmu::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT); - else if (slot_id_in <= EQEmu::invslot::SHARED_BANK_END && slot_id_in >= EQEmu::invslot::SHARED_BANK_BEGIN) - SubSlotNumber = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::SHARED_BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT); + if (slot_id_in <= EQ::invslot::slotGeneral8 && slot_id_in >= EQ::invslot::GENERAL_BEGIN) + SubSlotNumber = EQ::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQ::invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT); + else if (slot_id_in <= EQ::invslot::GENERAL_END && slot_id_in >= EQ::invslot::slotGeneral9) + SubSlotNumber = EQ::invbag::SLOT_INVALID; + else if (slot_id_in == EQ::invslot::slotCursor) + SubSlotNumber = EQ::invbag::CURSOR_BAG_BEGIN; + else if (slot_id_in <= EQ::invslot::BANK_END && slot_id_in >= EQ::invslot::BANK_BEGIN) + SubSlotNumber = EQ::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::BANK_BEGIN) * EQ::invbag::SLOT_COUNT); + else if (slot_id_in <= EQ::invslot::SHARED_BANK_END && slot_id_in >= EQ::invslot::SHARED_BANK_BEGIN) + SubSlotNumber = EQ::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::SHARED_BANK_BEGIN) * EQ::invbag::SLOT_COUNT); else SubSlotNumber = slot_id_in; // not sure if this is the best way to handle this..leaving for now - if (SubSlotNumber != EQEmu::invbag::SLOT_INVALID) { - for (uint32 index = EQEmu::invbag::SLOT_BEGIN; index <= EQEmu::invbag::SLOT_END; ++index) { - EQEmu::ItemInstance* sub = inst->GetItem(index); + if (SubSlotNumber != EQ::invbag::SLOT_INVALID) { + for (uint32 index = EQ::invbag::SLOT_BEGIN; index <= EQ::invbag::SLOT_END; ++index) { + EQ::ItemInstance* sub = inst->GetItem(index); if (!sub) continue; @@ -3799,59 +3799,59 @@ namespace SoD { uint32 SoDSlot = invslot::SLOT_INVALID; - if (serverSlot <= EQEmu::invslot::slotGeneral8) { + if (serverSlot <= EQ::invslot::slotGeneral8) { SoDSlot = serverSlot; } - else if (serverSlot <= EQEmu::invslot::CORPSE_END && serverSlot >= EQEmu::invslot::slotCursor) { + else if (serverSlot <= EQ::invslot::CORPSE_END && serverSlot >= EQ::invslot::slotCursor) { SoDSlot = serverSlot - 2; } - else if (serverSlot <= EQEmu::invbag::GENERAL_BAGS_8_END && serverSlot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { + else if (serverSlot <= EQ::invbag::GENERAL_BAGS_8_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) { SoDSlot = serverSlot + 11; } - else if (serverSlot <= EQEmu::invbag::CURSOR_BAG_END && serverSlot >= EQEmu::invbag::CURSOR_BAG_BEGIN) { + else if (serverSlot <= EQ::invbag::CURSOR_BAG_END && serverSlot >= EQ::invbag::CURSOR_BAG_BEGIN) { SoDSlot = serverSlot - 9; } - else if (serverSlot <= EQEmu::invslot::TRIBUTE_END && serverSlot >= EQEmu::invslot::TRIBUTE_BEGIN) { + else if (serverSlot <= EQ::invslot::TRIBUTE_END && serverSlot >= EQ::invslot::TRIBUTE_BEGIN) { SoDSlot = serverSlot; } - else if (serverSlot <= EQEmu::invslot::GUILD_TRIBUTE_END && serverSlot >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN) { + else if (serverSlot <= EQ::invslot::GUILD_TRIBUTE_END && serverSlot >= EQ::invslot::GUILD_TRIBUTE_BEGIN) { SoDSlot = serverSlot; } - else if (serverSlot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { + else if (serverSlot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { SoDSlot = serverSlot; } - else if (serverSlot <= EQEmu::invslot::BANK_END && serverSlot >= EQEmu::invslot::BANK_BEGIN) { + else if (serverSlot <= EQ::invslot::BANK_END && serverSlot >= EQ::invslot::BANK_BEGIN) { SoDSlot = serverSlot; } - else if (serverSlot <= EQEmu::invbag::BANK_BAGS_END && serverSlot >= EQEmu::invbag::BANK_BAGS_BEGIN) { + else if (serverSlot <= EQ::invbag::BANK_BAGS_END && serverSlot >= EQ::invbag::BANK_BAGS_BEGIN) { SoDSlot = serverSlot + 1; } - else if (serverSlot <= EQEmu::invslot::SHARED_BANK_END && serverSlot >= EQEmu::invslot::SHARED_BANK_BEGIN) { + else if (serverSlot <= EQ::invslot::SHARED_BANK_END && serverSlot >= EQ::invslot::SHARED_BANK_BEGIN) { SoDSlot = serverSlot; } - else if (serverSlot <= EQEmu::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) { + else if (serverSlot <= EQ::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) { SoDSlot = serverSlot + 1; } - else if (serverSlot <= EQEmu::invslot::TRADE_END && serverSlot >= EQEmu::invslot::TRADE_BEGIN) { + else if (serverSlot <= EQ::invslot::TRADE_END && serverSlot >= EQ::invslot::TRADE_BEGIN) { SoDSlot = serverSlot; } - else if (serverSlot <= EQEmu::invbag::TRADE_BAGS_END && serverSlot >= EQEmu::invbag::TRADE_BAGS_BEGIN) { + else if (serverSlot <= EQ::invbag::TRADE_BAGS_END && serverSlot >= EQ::invbag::TRADE_BAGS_BEGIN) { SoDSlot = serverSlot; } - else if (serverSlot <= EQEmu::invslot::WORLD_END && serverSlot >= EQEmu::invslot::WORLD_BEGIN) { + else if (serverSlot <= EQ::invslot::WORLD_END && serverSlot >= EQ::invslot::WORLD_BEGIN) { SoDSlot = serverSlot; } @@ -3864,11 +3864,11 @@ namespace SoD { uint32 SoDSlot = invslot::SLOT_INVALID; - if (server_corpse_slot <= EQEmu::invslot::slotGeneral8 && server_corpse_slot >= EQEmu::invslot::slotGeneral1) { + if (server_corpse_slot <= EQ::invslot::slotGeneral8 && server_corpse_slot >= EQ::invslot::slotGeneral1) { SoDSlot = server_corpse_slot; } - else if (server_corpse_slot <= EQEmu::invslot::CORPSE_END && server_corpse_slot >= EQEmu::invslot::slotCursor) { + else if (server_corpse_slot <= EQ::invslot::CORPSE_END && server_corpse_slot >= EQ::invslot::slotCursor) { SoDSlot = server_corpse_slot - 2; } @@ -3879,7 +3879,7 @@ namespace SoD static inline uint32 SoDToServerSlot(uint32 sod_slot) { - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; if (sod_slot <= invslot::slotGeneral8) { server_slot = sod_slot; @@ -3944,7 +3944,7 @@ namespace SoD static inline uint32 SoDToServerCorpseSlot(uint32 sod_corpse_slot) { - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; if (sod_corpse_slot <= invslot::slotGeneral8 && sod_corpse_slot >= invslot::slotGeneral1) { server_slot = sod_corpse_slot; @@ -3961,7 +3961,7 @@ namespace SoD static inline void ServerToSoDSayLink(std::string &sod_saylink, const std::string &server_saylink) { - if ((constants::SAY_LINK_BODY_SIZE == EQEmu::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) { + if ((constants::SAY_LINK_BODY_SIZE == EQ::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) { sod_saylink = server_saylink; return; } @@ -3970,7 +3970,7 @@ namespace SoD for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { - if (segments[segment_iter].length() <= EQEmu::constants::SAY_LINK_BODY_SIZE) { + if (segments[segment_iter].length() <= EQ::constants::SAY_LINK_BODY_SIZE) { sod_saylink.append(segments[segment_iter]); // TODO: log size mismatch error continue; @@ -4001,7 +4001,7 @@ namespace SoD static inline void SoDToServerSayLink(std::string &server_saylink, const std::string &sod_saylink) { - if ((EQEmu::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (sod_saylink.find('\x12') == std::string::npos)) { + if ((EQ::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (sod_saylink.find('\x12') == std::string::npos)) { server_saylink = sod_saylink; return; } @@ -4035,84 +4035,84 @@ namespace SoD } } - static inline spells::CastingSlot ServerToSoDCastingSlot(EQEmu::spells::CastingSlot slot) + static inline spells::CastingSlot ServerToSoDCastingSlot(EQ::spells::CastingSlot slot) { switch (slot) { - case EQEmu::spells::CastingSlot::Gem1: + case EQ::spells::CastingSlot::Gem1: return spells::CastingSlot::Gem1; - case EQEmu::spells::CastingSlot::Gem2: + case EQ::spells::CastingSlot::Gem2: return spells::CastingSlot::Gem2; - case EQEmu::spells::CastingSlot::Gem3: + case EQ::spells::CastingSlot::Gem3: return spells::CastingSlot::Gem3; - case EQEmu::spells::CastingSlot::Gem4: + case EQ::spells::CastingSlot::Gem4: return spells::CastingSlot::Gem4; - case EQEmu::spells::CastingSlot::Gem5: + case EQ::spells::CastingSlot::Gem5: return spells::CastingSlot::Gem5; - case EQEmu::spells::CastingSlot::Gem6: + case EQ::spells::CastingSlot::Gem6: return spells::CastingSlot::Gem6; - case EQEmu::spells::CastingSlot::Gem7: + case EQ::spells::CastingSlot::Gem7: return spells::CastingSlot::Gem7; - case EQEmu::spells::CastingSlot::Gem8: + case EQ::spells::CastingSlot::Gem8: return spells::CastingSlot::Gem8; - case EQEmu::spells::CastingSlot::Gem9: + case EQ::spells::CastingSlot::Gem9: return spells::CastingSlot::Gem9; - case EQEmu::spells::CastingSlot::Gem10: + case EQ::spells::CastingSlot::Gem10: return spells::CastingSlot::Gem10; - case EQEmu::spells::CastingSlot::Item: - case EQEmu::spells::CastingSlot::PotionBelt: + case EQ::spells::CastingSlot::Item: + case EQ::spells::CastingSlot::PotionBelt: return spells::CastingSlot::Item; - case EQEmu::spells::CastingSlot::Discipline: + case EQ::spells::CastingSlot::Discipline: return spells::CastingSlot::Discipline; - case EQEmu::spells::CastingSlot::AltAbility: + case EQ::spells::CastingSlot::AltAbility: return spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something return spells::CastingSlot::Discipline; } } - static inline EQEmu::spells::CastingSlot SoDToServerCastingSlot(spells::CastingSlot slot) + static inline EQ::spells::CastingSlot SoDToServerCastingSlot(spells::CastingSlot slot) { switch (slot) { case spells::CastingSlot::Gem1: - return EQEmu::spells::CastingSlot::Gem1; + return EQ::spells::CastingSlot::Gem1; case spells::CastingSlot::Gem2: - return EQEmu::spells::CastingSlot::Gem2; + return EQ::spells::CastingSlot::Gem2; case spells::CastingSlot::Gem3: - return EQEmu::spells::CastingSlot::Gem3; + return EQ::spells::CastingSlot::Gem3; case spells::CastingSlot::Gem4: - return EQEmu::spells::CastingSlot::Gem4; + return EQ::spells::CastingSlot::Gem4; case spells::CastingSlot::Gem5: - return EQEmu::spells::CastingSlot::Gem5; + return EQ::spells::CastingSlot::Gem5; case spells::CastingSlot::Gem6: - return EQEmu::spells::CastingSlot::Gem6; + return EQ::spells::CastingSlot::Gem6; case spells::CastingSlot::Gem7: - return EQEmu::spells::CastingSlot::Gem7; + return EQ::spells::CastingSlot::Gem7; case spells::CastingSlot::Gem8: - return EQEmu::spells::CastingSlot::Gem8; + return EQ::spells::CastingSlot::Gem8; case spells::CastingSlot::Gem9: - return EQEmu::spells::CastingSlot::Gem9; + return EQ::spells::CastingSlot::Gem9; case spells::CastingSlot::Gem10: - return EQEmu::spells::CastingSlot::Gem10; + return EQ::spells::CastingSlot::Gem10; case spells::CastingSlot::Discipline: - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; case spells::CastingSlot::Item: - return EQEmu::spells::CastingSlot::Item; + return EQ::spells::CastingSlot::Item; case spells::CastingSlot::AltAbility: - return EQEmu::spells::CastingSlot::AltAbility; + return EQ::spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; } } static inline int ServerToSoDBuffSlot(int index) { // we're a disc - if (index >= EQEmu::spells::LONG_BUFFS + EQEmu::spells::SHORT_BUFFS) - return index - EQEmu::spells::LONG_BUFFS - EQEmu::spells::SHORT_BUFFS + + if (index >= EQ::spells::LONG_BUFFS + EQ::spells::SHORT_BUFFS) + return index - EQ::spells::LONG_BUFFS - EQ::spells::SHORT_BUFFS + spells::LONG_BUFFS + spells::SHORT_BUFFS; // we're a song - if (index >= EQEmu::spells::LONG_BUFFS) - return index - EQEmu::spells::LONG_BUFFS + spells::LONG_BUFFS; + if (index >= EQ::spells::LONG_BUFFS) + return index - EQ::spells::LONG_BUFFS + spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } @@ -4121,11 +4121,11 @@ namespace SoD { // we're a disc if (index >= spells::LONG_BUFFS + spells::SHORT_BUFFS) - return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQEmu::spells::LONG_BUFFS + - EQEmu::spells::SHORT_BUFFS; + return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQ::spells::LONG_BUFFS + + EQ::spells::SHORT_BUFFS; // we're a song if (index >= spells::LONG_BUFFS) - return index - spells::LONG_BUFFS + EQEmu::spells::LONG_BUFFS; + return index - spells::LONG_BUFFS + EQ::spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } diff --git a/common/patches/sod.h b/common/patches/sod.h index 977645231..1a0188f6e 100644 --- a/common/patches/sod.h +++ b/common/patches/sod.h @@ -43,7 +43,7 @@ namespace SoD protected: virtual std::string Describe() const; - virtual const EQEmu::versions::ClientVersion ClientVersion() const; + virtual const EQ::versions::ClientVersion ClientVersion() const; //magic macro to declare our opcode processors #include "ss_declare.h" diff --git a/common/patches/sod_limits.h b/common/patches/sod_limits.h index 7927a255b..46d8293fe 100644 --- a/common/patches/sod_limits.h +++ b/common/patches/sod_limits.h @@ -31,7 +31,7 @@ namespace SoD const int16 INULL = 0; namespace inventory { - inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::SoD; } const bool ConcatenateInvTypeLimbo = true; @@ -43,7 +43,7 @@ namespace SoD } /*inventory*/ namespace invtype { - inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::SoD; } namespace enum_ { enum InventoryTypes : int16 { @@ -106,7 +106,7 @@ namespace SoD } /*invtype*/ namespace invslot { - inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::SoD; } namespace enum_ { enum InventorySlots : int16 { @@ -205,7 +205,7 @@ namespace SoD } /*invslot*/ namespace invbag { - inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::SoD; } const int16 SLOT_INVALID = IINVALID; const int16 SLOT_BEGIN = INULL; @@ -237,7 +237,7 @@ namespace SoD } /*invbag*/ namespace invaug { - inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::SoD; } const int16 SOCKET_INVALID = IINVALID; const int16 SOCKET_BEGIN = INULL; @@ -249,7 +249,7 @@ namespace SoD } /*invaug*/ namespace item { - inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::SoD; } enum ItemPacketType : int { ItemPacketMerchant = 100, @@ -267,7 +267,7 @@ namespace SoD } /*item*/ namespace profile { - inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::SoD; } const int16 BANDOLIERS_SIZE = 20; // number of bandolier instances const int16 BANDOLIER_ITEM_COUNT = 4; // number of equipment slots in bandolier instance @@ -279,11 +279,11 @@ namespace SoD } /*profile*/ namespace constants { - inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::SoD; } - const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::SoD; - const uint32 EXPANSION_BIT = EQEmu::expansions::bitSoD; - const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskSoD; + const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::SoD; + const uint32 EXPANSION_BIT = EQ::expansions::bitSoD; + const uint32 EXPANSIONS_MASK = EQ::expansions::maskSoD; const size_t CHARACTER_CREATION_LIMIT = 12; @@ -292,21 +292,21 @@ namespace SoD } /*constants*/ namespace behavior { - inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::SoD; } const bool CoinHasWeight = false; } /*behavior*/ namespace skills { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::SoD; } - const size_t LastUsableSkill = EQEmu::skills::SkillTripleAttack; + const size_t LastUsableSkill = EQ::skills::SkillTripleAttack; } /*skills*/ namespace spells { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::SoD; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::SoD; } enum class CastingSlot : uint32 { Gem1 = 0, diff --git a/common/patches/sod_structs.h b/common/patches/sod_structs.h index 76a534e6a..2a8b0cec8 100644 --- a/common/patches/sod_structs.h +++ b/common/patches/sod_structs.h @@ -149,7 +149,7 @@ struct TintProfile Tint_Struct Primary; Tint_Struct Secondary; }; - Tint_Struct Slot[EQEmu::textures::materialCount]; + Tint_Struct Slot[EQ::textures::materialCount]; }; }; @@ -178,7 +178,7 @@ struct TextureProfile Texture_Struct Primary; Texture_Struct Secondary; }; - Texture_Struct Slot[EQEmu::textures::materialCount]; + Texture_Struct Slot[EQ::textures::materialCount]; }; TextureProfile(); @@ -195,7 +195,7 @@ struct CharacterSelectEntry_Struct /*0000*/ uint8 Beard; // /*0001*/ uint8 HairColor; // /*0000*/ uint8 Face; // -/*0000*/ CharSelectEquip Equip[EQEmu::textures::materialCount]; +/*0000*/ CharSelectEquip Equip[EQ::textures::materialCount]; /*0000*/ uint32 PrimaryIDFile; // /*0000*/ uint32 SecondaryIDFile; // /*0000*/ uint8 Unknown15; // 0xff diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp index 6bfb19de5..94e94f946 100644 --- a/common/patches/sof.cpp +++ b/common/patches/sof.cpp @@ -43,7 +43,7 @@ namespace SoF static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id, uint8 depth); + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id, uint8 depth); // server to client inventory location converters static inline uint32 ServerToSoFSlot(uint32 server_slot); @@ -59,8 +59,8 @@ namespace SoF // client to server say link converter static inline void SoFToServerSayLink(std::string &server_saylink, const std::string &sof_saylink); - static inline spells::CastingSlot ServerToSoFCastingSlot(EQEmu::spells::CastingSlot slot); - static inline EQEmu::spells::CastingSlot SoFToServerCastingSlot(spells::CastingSlot slot, uint32 item_location); + static inline spells::CastingSlot ServerToSoFCastingSlot(EQ::spells::CastingSlot slot); + static inline EQ::spells::CastingSlot SoFToServerCastingSlot(spells::CastingSlot slot, uint32 item_location); static inline int ServerToSoFBuffSlot(int index); static inline int SoFToServerBuffSlot(int index); @@ -142,9 +142,9 @@ namespace SoF return(r); } - const EQEmu::versions::ClientVersion Strategy::ClientVersion() const + const EQ::versions::ClientVersion Strategy::ClientVersion() const { - return EQEmu::versions::ClientVersion::SoF; + return EQ::versions::ClientVersion::SoF; } #include "ss_define.h" @@ -361,24 +361,24 @@ namespace SoF //store away the emu struct uchar* __emu_buffer = in->pBuffer; - int item_count = in->size / sizeof(EQEmu::InternalSerializedItem_Struct); - if (!item_count || (in->size % sizeof(EQEmu::InternalSerializedItem_Struct)) != 0) { + int item_count = in->size / sizeof(EQ::InternalSerializedItem_Struct); + if (!item_count || (in->size % sizeof(EQ::InternalSerializedItem_Struct)) != 0) { Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", - opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQEmu::InternalSerializedItem_Struct)); + opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQ::InternalSerializedItem_Struct)); delete in; return; } - EQEmu::InternalSerializedItem_Struct* eq = (EQEmu::InternalSerializedItem_Struct*)in->pBuffer; + EQ::InternalSerializedItem_Struct* eq = (EQ::InternalSerializedItem_Struct*)in->pBuffer; - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)&item_count, sizeof(uint32)); for (int index = 0; index < item_count; ++index, ++eq) { - SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0); + SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, eq->slot_id, 0); if (ob.tellp() == last_pos) LogNetcode("SoF::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory. Item skipped", eq->slot_id); @@ -855,14 +855,14 @@ namespace SoF //store away the emu struct uchar* __emu_buffer = in->pBuffer; - EQEmu::InternalSerializedItem_Struct* int_struct = (EQEmu::InternalSerializedItem_Struct*)(&__emu_buffer[4]); + EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]); - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)__emu_buffer, 4); - SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0); + SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, int_struct->slot_id, 0); if (ob.tellp() == last_pos) { LogNetcode("SoF::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id); delete in; @@ -956,7 +956,7 @@ namespace SoF // Since HT/LoH are translated up, we need to translate down only for memSpellSpellbar case if (emu->scribing == 3) - eq->slot = static_cast(ServerToSoFCastingSlot(static_cast(emu->slot))); + eq->slot = static_cast(ServerToSoFCastingSlot(static_cast(emu->slot))); else OUT(slot); OUT(spell_id); @@ -1130,7 +1130,7 @@ namespace SoF OUT(hairstyle); OUT(beard); // OUT(unknown00178[10]); - for (r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) { + for (r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) { eq->equipment.Slot[r].Material = emu->item_material.Slot[r].Material; eq->equipment.Slot[r].Unknown1 = 0; eq->equipment.Slot[r].EliteMaterial = 0; @@ -1160,7 +1160,7 @@ namespace SoF OUT(face); // OUT(unknown02264[47]); - if (spells::SPELLBOOK_SIZE <= EQEmu::spells::SPELLBOOK_SIZE) { + if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) { for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) eq->spell_book[r] = emu->spell_book[r]; @@ -1169,14 +1169,14 @@ namespace SoF } } else { - for (uint32 r = 0; r < EQEmu::spells::SPELLBOOK_SIZE; r++) { + for (uint32 r = 0; r < EQ::spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) eq->spell_book[r] = emu->spell_book[r]; else eq->spell_book[r] = 0xFFFFFFFFU; } // invalidate the rest of the spellbook slots - memset(&eq->spell_book[EQEmu::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQEmu::spells::SPELLBOOK_SIZE))); + memset(&eq->spell_book[EQ::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQ::spells::SPELLBOOK_SIZE))); } // OUT(unknown4184[128]); @@ -1223,7 +1223,7 @@ namespace SoF // OUT(unknown06160[4]); // Copy bandoliers where server and client indices converge - for (r = 0; r < EQEmu::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { + for (r = 0; r < EQ::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { OUT_str(bandoliers[r].Name); for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true OUT(bandoliers[r].Items[k].ID); @@ -1232,7 +1232,7 @@ namespace SoF } } // Nullify bandoliers where server and client indices diverge, with a client bias - for (r = EQEmu::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { + for (r = EQ::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { eq->bandoliers[r].Name[0] = '\0'; for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true eq->bandoliers[r].Items[k].ID = 0; @@ -1244,13 +1244,13 @@ namespace SoF // OUT(unknown07444[5120]); // Copy potion belt where server and client indices converge - for (r = 0; r < EQEmu::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { + for (r = 0; r < EQ::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { OUT(potionbelt.Items[r].ID); OUT(potionbelt.Items[r].Icon); OUT_str(potionbelt.Items[r].Name); } // Nullify potion belt where server and client indices diverge, with a client bias - for (r = EQEmu::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { + for (r = EQ::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { eq->potionbelt.Items[r].ID = 0; eq->potionbelt.Items[r].Icon = 0; eq->potionbelt.Items[r].Name[0] = '\0'; @@ -1593,7 +1593,7 @@ namespace SoF eq_cse->HairColor = emu_cse->HairColor; eq_cse->Face = emu_cse->Face; - for (int equip_index = EQEmu::textures::textureBegin; equip_index < EQEmu::textures::materialCount; equip_index++) { + for (int equip_index = EQ::textures::textureBegin; equip_index < EQ::textures::materialCount; equip_index++) { eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteModel; @@ -2015,7 +2015,7 @@ namespace SoF eq->deity = emu->deity; eq->drakkin_heritage = emu->drakkin_heritage; eq->gender = emu->gender; - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) { + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) { eq->equipment.Slot[k].Material = emu->equipment.Slot[k].Material; eq->equipment.Slot[k].Unknown1 = emu->equipment.Slot[k].Unknown1; eq->equipment.Slot[k].EliteMaterial = emu->equipment.Slot[k].EliteModel; @@ -2081,7 +2081,7 @@ namespace SoF strcpy(eq->name, emu->name); eq->petOwnerId = emu->petOwnerId; eq->pvp = 0; // 0 = non-pvp colored name, 1 = red pvp name - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) { + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) { eq->equipment_tint.Slot[k].Color = emu->equipment_tint.Slot[k].Color; } eq->anon = emu->anon; @@ -2300,7 +2300,7 @@ namespace SoF DECODE_LENGTH_EXACT(structs::BugReport_Struct); SETUP_DIRECT_DECODE(BugReport_Struct, structs::BugReport_Struct); - emu->category_id = EQEmu::bug::CategoryNameToCategoryID(eq->category_name); + emu->category_id = EQ::bug::CategoryNameToCategoryID(eq->category_name); memcpy(emu->category_name, eq, sizeof(structs::BugReport_Struct)); FINISH_DIRECT_DECODE(); @@ -2556,7 +2556,7 @@ namespace SoF for (int i = 0; i < spells::SPELL_GEM_COUNT; ++i) IN(spell[i]); - for (int i = spells::SPELL_GEM_COUNT; i < EQEmu::spells::SPELL_GEM_COUNT; ++i) + for (int i = spells::SPELL_GEM_COUNT; i < EQ::spells::SPELL_GEM_COUNT; ++i) emu->spell[i] = 0xFFFFFFFF; IN(unknown); @@ -2838,9 +2838,9 @@ namespace SoF return NextItemInstSerialNumber; } - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth) + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth) { - const EQEmu::ItemData *item = inst->GetUnscaledItem(); + const EQ::ItemData *item = inst->GetUnscaledItem(); SoF::structs::ItemSerializationHeader hdr; @@ -3030,7 +3030,7 @@ namespace SoF // Done to hack older clients to label expendable fishing poles as such // July 28th, 2018 patch - if (item->ItemType == EQEmu::item::ItemTypeFishingPole && item->SubType == 0) { + if (item->ItemType == EQ::item::ItemTypeFishingPole && item->SubType == 0) { itbs.expendablearrow = 1; } @@ -3153,30 +3153,30 @@ namespace SoF ob.write((const char*)&iqbs, sizeof(SoF::structs::ItemQuaternaryBodyStruct)); - EQEmu::OutBuffer::pos_type count_pos = ob.tellp(); + EQ::OutBuffer::pos_type count_pos = ob.tellp(); uint32 subitem_count = 0; ob.write((const char*)&subitem_count, sizeof(uint32)); // moved outside of loop since it is not modified within that scope - int16 SubSlotNumber = EQEmu::invbag::SLOT_INVALID; + int16 SubSlotNumber = EQ::invbag::SLOT_INVALID; - if (slot_id_in <= EQEmu::invslot::slotGeneral8 && slot_id_in >= EQEmu::invslot::GENERAL_BEGIN) - SubSlotNumber = EQEmu::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT); - else if (slot_id_in <= EQEmu::invslot::GENERAL_END && slot_id_in >= EQEmu::invslot::slotGeneral9) - SubSlotNumber = EQEmu::invbag::SLOT_INVALID; - else if (slot_id_in == EQEmu::invslot::slotCursor) - SubSlotNumber = EQEmu::invbag::CURSOR_BAG_BEGIN; - else if (slot_id_in <= EQEmu::invslot::BANK_END && slot_id_in >= EQEmu::invslot::BANK_BEGIN) - SubSlotNumber = EQEmu::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT); - else if (slot_id_in <= EQEmu::invslot::SHARED_BANK_END && slot_id_in >= EQEmu::invslot::SHARED_BANK_BEGIN) - SubSlotNumber = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::SHARED_BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT); + if (slot_id_in <= EQ::invslot::slotGeneral8 && slot_id_in >= EQ::invslot::GENERAL_BEGIN) + SubSlotNumber = EQ::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQ::invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT); + else if (slot_id_in <= EQ::invslot::GENERAL_END && slot_id_in >= EQ::invslot::slotGeneral9) + SubSlotNumber = EQ::invbag::SLOT_INVALID; + else if (slot_id_in == EQ::invslot::slotCursor) + SubSlotNumber = EQ::invbag::CURSOR_BAG_BEGIN; + else if (slot_id_in <= EQ::invslot::BANK_END && slot_id_in >= EQ::invslot::BANK_BEGIN) + SubSlotNumber = EQ::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::BANK_BEGIN) * EQ::invbag::SLOT_COUNT); + else if (slot_id_in <= EQ::invslot::SHARED_BANK_END && slot_id_in >= EQ::invslot::SHARED_BANK_BEGIN) + SubSlotNumber = EQ::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::SHARED_BANK_BEGIN) * EQ::invbag::SLOT_COUNT); else SubSlotNumber = slot_id_in; // not sure if this is the best way to handle this..leaving for now - if (SubSlotNumber != EQEmu::invbag::SLOT_INVALID) { - for (uint32 index = EQEmu::invbag::SLOT_BEGIN; index <= EQEmu::invbag::SLOT_END; ++index) { - EQEmu::ItemInstance* sub = inst->GetItem(index); + if (SubSlotNumber != EQ::invbag::SLOT_INVALID) { + for (uint32 index = EQ::invbag::SLOT_BEGIN; index <= EQ::invbag::SLOT_END; ++index) { + EQ::ItemInstance* sub = inst->GetItem(index); if (!sub) continue; @@ -3195,59 +3195,59 @@ namespace SoF { uint32 sof_slot = invslot::SLOT_INVALID; - if (server_slot <= EQEmu::invslot::slotGeneral8) { + if (server_slot <= EQ::invslot::slotGeneral8) { sof_slot = server_slot; } - else if (server_slot <= EQEmu::invslot::CORPSE_END && server_slot >= EQEmu::invslot::slotCursor) { + else if (server_slot <= EQ::invslot::CORPSE_END && server_slot >= EQ::invslot::slotCursor) { sof_slot = server_slot - 2; } - else if (server_slot <= EQEmu::invbag::GENERAL_BAGS_8_END && server_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { + else if (server_slot <= EQ::invbag::GENERAL_BAGS_8_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) { sof_slot = server_slot + 11; } - else if (server_slot <= EQEmu::invbag::CURSOR_BAG_END && server_slot >= EQEmu::invbag::CURSOR_BAG_BEGIN) { + else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::CURSOR_BAG_BEGIN) { sof_slot = server_slot - 9; } - else if (server_slot <= EQEmu::invslot::TRIBUTE_END && server_slot >= EQEmu::invslot::TRIBUTE_BEGIN) { + else if (server_slot <= EQ::invslot::TRIBUTE_END && server_slot >= EQ::invslot::TRIBUTE_BEGIN) { sof_slot = server_slot; } - else if (server_slot <= EQEmu::invslot::GUILD_TRIBUTE_END && server_slot >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN) { + else if (server_slot <= EQ::invslot::GUILD_TRIBUTE_END && server_slot >= EQ::invslot::GUILD_TRIBUTE_BEGIN) { sof_slot = server_slot; } - else if (server_slot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { + else if (server_slot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { sof_slot = server_slot; } - else if (server_slot <= EQEmu::invslot::BANK_END && server_slot >= EQEmu::invslot::BANK_BEGIN) { + else if (server_slot <= EQ::invslot::BANK_END && server_slot >= EQ::invslot::BANK_BEGIN) { sof_slot = server_slot; } - else if (server_slot <= EQEmu::invbag::BANK_BAGS_END && server_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) { + else if (server_slot <= EQ::invbag::BANK_BAGS_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) { sof_slot = server_slot + 1; } - else if (server_slot <= EQEmu::invslot::SHARED_BANK_END && server_slot >= EQEmu::invslot::SHARED_BANK_BEGIN) { + else if (server_slot <= EQ::invslot::SHARED_BANK_END && server_slot >= EQ::invslot::SHARED_BANK_BEGIN) { sof_slot = server_slot; } - else if (server_slot <= EQEmu::invbag::SHARED_BANK_BAGS_END && server_slot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) { + else if (server_slot <= EQ::invbag::SHARED_BANK_BAGS_END && server_slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) { sof_slot = server_slot + 1; } - else if (server_slot <= EQEmu::invslot::TRADE_END && server_slot >= EQEmu::invslot::TRADE_BEGIN) { + else if (server_slot <= EQ::invslot::TRADE_END && server_slot >= EQ::invslot::TRADE_BEGIN) { sof_slot = server_slot; } - else if (server_slot <= EQEmu::invbag::TRADE_BAGS_END && server_slot >= EQEmu::invbag::TRADE_BAGS_BEGIN) { + else if (server_slot <= EQ::invbag::TRADE_BAGS_END && server_slot >= EQ::invbag::TRADE_BAGS_BEGIN) { sof_slot = server_slot; } - else if (server_slot <= EQEmu::invslot::WORLD_END && server_slot >= EQEmu::invslot::WORLD_BEGIN) { + else if (server_slot <= EQ::invslot::WORLD_END && server_slot >= EQ::invslot::WORLD_BEGIN) { sof_slot = server_slot; } @@ -3260,11 +3260,11 @@ namespace SoF { uint32 SoFSlot = invslot::SLOT_INVALID; - if (server_corpse_slot <= EQEmu::invslot::slotGeneral8 && server_corpse_slot >= EQEmu::invslot::slotGeneral1) { + if (server_corpse_slot <= EQ::invslot::slotGeneral8 && server_corpse_slot >= EQ::invslot::slotGeneral1) { SoFSlot = server_corpse_slot; } - else if (server_corpse_slot <= EQEmu::invslot::CORPSE_END && server_corpse_slot >= EQEmu::invslot::slotCursor) { + else if (server_corpse_slot <= EQ::invslot::CORPSE_END && server_corpse_slot >= EQ::invslot::slotCursor) { SoFSlot = server_corpse_slot - 2; } @@ -3279,7 +3279,7 @@ namespace SoF static inline uint32 SoFToServerSlot(uint32 sof_slot) { - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; if (sof_slot <= invslot::slotGeneral8) { server_slot = sof_slot; @@ -3344,7 +3344,7 @@ namespace SoF static inline uint32 SoFToServerCorpseSlot(uint32 sof_corpse_slot) { - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; if (sof_corpse_slot <= invslot::slotGeneral8 && sof_corpse_slot >= invslot::slotGeneral1) { server_slot = sof_corpse_slot; @@ -3365,7 +3365,7 @@ namespace SoF static inline void ServerToSoFSayLink(std::string &sof_saylink, const std::string &server_saylink) { - if ((constants::SAY_LINK_BODY_SIZE == EQEmu::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) { + if ((constants::SAY_LINK_BODY_SIZE == EQ::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) { sof_saylink = server_saylink; return; } @@ -3374,7 +3374,7 @@ namespace SoF for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { - if (segments[segment_iter].length() <= EQEmu::constants::SAY_LINK_BODY_SIZE) { + if (segments[segment_iter].length() <= EQ::constants::SAY_LINK_BODY_SIZE) { sof_saylink.append(segments[segment_iter]); // TODO: log size mismatch error continue; @@ -3405,7 +3405,7 @@ namespace SoF static inline void SoFToServerSayLink(std::string &server_saylink, const std::string &sof_saylink) { - if ((EQEmu::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (sof_saylink.find('\x12') == std::string::npos)) { + if ((EQ::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (sof_saylink.find('\x12') == std::string::npos)) { server_saylink = sof_saylink; return; } @@ -3439,84 +3439,84 @@ namespace SoF } } - static inline spells::CastingSlot ServerToSoFCastingSlot(EQEmu::spells::CastingSlot slot) { + static inline spells::CastingSlot ServerToSoFCastingSlot(EQ::spells::CastingSlot slot) { switch (slot) { - case EQEmu::spells::CastingSlot::Gem1: + case EQ::spells::CastingSlot::Gem1: return spells::CastingSlot::Gem1; - case EQEmu::spells::CastingSlot::Gem2: + case EQ::spells::CastingSlot::Gem2: return spells::CastingSlot::Gem2; - case EQEmu::spells::CastingSlot::Gem3: + case EQ::spells::CastingSlot::Gem3: return spells::CastingSlot::Gem3; - case EQEmu::spells::CastingSlot::Gem4: + case EQ::spells::CastingSlot::Gem4: return spells::CastingSlot::Gem4; - case EQEmu::spells::CastingSlot::Gem5: + case EQ::spells::CastingSlot::Gem5: return spells::CastingSlot::Gem5; - case EQEmu::spells::CastingSlot::Gem6: + case EQ::spells::CastingSlot::Gem6: return spells::CastingSlot::Gem6; - case EQEmu::spells::CastingSlot::Gem7: + case EQ::spells::CastingSlot::Gem7: return spells::CastingSlot::Gem7; - case EQEmu::spells::CastingSlot::Gem8: + case EQ::spells::CastingSlot::Gem8: return spells::CastingSlot::Gem8; - case EQEmu::spells::CastingSlot::Gem9: + case EQ::spells::CastingSlot::Gem9: return spells::CastingSlot::Gem9; - case EQEmu::spells::CastingSlot::Item: + case EQ::spells::CastingSlot::Item: return spells::CastingSlot::Item; - case EQEmu::spells::CastingSlot::PotionBelt: + case EQ::spells::CastingSlot::PotionBelt: return spells::CastingSlot::PotionBelt; - case EQEmu::spells::CastingSlot::Discipline: + case EQ::spells::CastingSlot::Discipline: return spells::CastingSlot::Discipline; - case EQEmu::spells::CastingSlot::AltAbility: + case EQ::spells::CastingSlot::AltAbility: return spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something return spells::CastingSlot::Discipline; } } - static inline EQEmu::spells::CastingSlot SoFToServerCastingSlot(spells::CastingSlot slot, uint32 item_location) { + static inline EQ::spells::CastingSlot SoFToServerCastingSlot(spells::CastingSlot slot, uint32 item_location) { switch (slot) { case spells::CastingSlot::Gem1: - return EQEmu::spells::CastingSlot::Gem1; + return EQ::spells::CastingSlot::Gem1; case spells::CastingSlot::Gem2: - return EQEmu::spells::CastingSlot::Gem2; + return EQ::spells::CastingSlot::Gem2; case spells::CastingSlot::Gem3: - return EQEmu::spells::CastingSlot::Gem3; + return EQ::spells::CastingSlot::Gem3; case spells::CastingSlot::Gem4: - return EQEmu::spells::CastingSlot::Gem4; + return EQ::spells::CastingSlot::Gem4; case spells::CastingSlot::Gem5: - return EQEmu::spells::CastingSlot::Gem5; + return EQ::spells::CastingSlot::Gem5; case spells::CastingSlot::Gem6: - return EQEmu::spells::CastingSlot::Gem6; + return EQ::spells::CastingSlot::Gem6; case spells::CastingSlot::Gem7: - return EQEmu::spells::CastingSlot::Gem7; + return EQ::spells::CastingSlot::Gem7; case spells::CastingSlot::Gem8: - return EQEmu::spells::CastingSlot::Gem8; + return EQ::spells::CastingSlot::Gem8; case spells::CastingSlot::Gem9: - return EQEmu::spells::CastingSlot::Gem9; + return EQ::spells::CastingSlot::Gem9; case spells::CastingSlot::Ability: - return EQEmu::spells::CastingSlot::Ability; + return EQ::spells::CastingSlot::Ability; // Tit uses 10 for item and discipline casting, but items have a valid location case spells::CastingSlot::Item: if (item_location == INVALID_INDEX) - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; else - return EQEmu::spells::CastingSlot::Item; + return EQ::spells::CastingSlot::Item; case spells::CastingSlot::PotionBelt: - return EQEmu::spells::CastingSlot::PotionBelt; + return EQ::spells::CastingSlot::PotionBelt; case spells::CastingSlot::AltAbility: - return EQEmu::spells::CastingSlot::AltAbility; + return EQ::spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; } } static inline int ServerToSoFBuffSlot(int index) { // we're a disc - if (index >= EQEmu::spells::LONG_BUFFS + EQEmu::spells::SHORT_BUFFS) - return index - EQEmu::spells::LONG_BUFFS - EQEmu::spells::SHORT_BUFFS + + if (index >= EQ::spells::LONG_BUFFS + EQ::spells::SHORT_BUFFS) + return index - EQ::spells::LONG_BUFFS - EQ::spells::SHORT_BUFFS + spells::LONG_BUFFS + spells::SHORT_BUFFS; // we're a song - if (index >= EQEmu::spells::LONG_BUFFS) - return index - EQEmu::spells::LONG_BUFFS + spells::LONG_BUFFS; + if (index >= EQ::spells::LONG_BUFFS) + return index - EQ::spells::LONG_BUFFS + spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } @@ -3525,11 +3525,11 @@ namespace SoF { // we're a disc if (index >= spells::LONG_BUFFS + spells::SHORT_BUFFS) - return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQEmu::spells::LONG_BUFFS + - EQEmu::spells::SHORT_BUFFS; + return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQ::spells::LONG_BUFFS + + EQ::spells::SHORT_BUFFS; // we're a song if (index >= spells::LONG_BUFFS) - return index - spells::LONG_BUFFS + EQEmu::spells::LONG_BUFFS; + return index - spells::LONG_BUFFS + EQ::spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } diff --git a/common/patches/sof.h b/common/patches/sof.h index dde55f9a3..47a6433ac 100644 --- a/common/patches/sof.h +++ b/common/patches/sof.h @@ -43,7 +43,7 @@ namespace SoF protected: virtual std::string Describe() const; - virtual const EQEmu::versions::ClientVersion ClientVersion() const; + virtual const EQ::versions::ClientVersion ClientVersion() const; //magic macro to declare our opcode processors #include "ss_declare.h" diff --git a/common/patches/sof_limits.h b/common/patches/sof_limits.h index a03676f2d..063644e18 100644 --- a/common/patches/sof_limits.h +++ b/common/patches/sof_limits.h @@ -31,7 +31,7 @@ namespace SoF const int16 INULL = 0; namespace inventory { - inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::SoF; } const bool ConcatenateInvTypeLimbo = true; @@ -43,7 +43,7 @@ namespace SoF } /*inventory*/ namespace invtype { - inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::SoF; } namespace enum_ { enum InventoryTypes : int16 { @@ -106,7 +106,7 @@ namespace SoF } /*invtype*/ namespace invslot { - inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::SoF; } namespace enum_ { enum InventorySlots : int16 { @@ -205,7 +205,7 @@ namespace SoF } /*invslot*/ namespace invbag { - inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::SoF; } const int16 SLOT_INVALID = IINVALID; const int16 SLOT_BEGIN = INULL; @@ -237,7 +237,7 @@ namespace SoF } /*invbag*/ namespace invaug { - inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::SoF; } const int16 SOCKET_INVALID = IINVALID; const int16 SOCKET_BEGIN = INULL; @@ -249,7 +249,7 @@ namespace SoF } /*invaug*/ namespace item { - inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::SoF; } enum ItemPacketType : int { ItemPacketMerchant = 100, @@ -267,7 +267,7 @@ namespace SoF } /*item*/ namespace profile { - inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::SoF; } const int16 BANDOLIERS_SIZE = 20; // number of bandolier instances const int16 BANDOLIER_ITEM_COUNT = 4; // number of equipment slots in bandolier instance @@ -279,11 +279,11 @@ namespace SoF } /*profile*/ namespace constants { - inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::SoF; } - const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::SoF; - const uint32 EXPANSION_BIT = EQEmu::expansions::bitSoF; - const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskSoF; + const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::SoF; + const uint32 EXPANSION_BIT = EQ::expansions::bitSoF; + const uint32 EXPANSIONS_MASK = EQ::expansions::maskSoF; const size_t CHARACTER_CREATION_LIMIT = 12; @@ -292,21 +292,21 @@ namespace SoF } /*constants*/ namespace behavior { - inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::SoF; } const bool CoinHasWeight = true; } /*behavior*/ namespace skills { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::SoF; } - const size_t LastUsableSkill = EQEmu::skills::SkillTripleAttack; + const size_t LastUsableSkill = EQ::skills::SkillTripleAttack; } /*skills*/ namespace spells { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::SoF; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::SoF; } enum class CastingSlot : uint32 { Gem1 = 0, diff --git a/common/patches/sof_structs.h b/common/patches/sof_structs.h index 1507630bd..c76ef0b96 100644 --- a/common/patches/sof_structs.h +++ b/common/patches/sof_structs.h @@ -168,7 +168,7 @@ struct TintProfile Tint_Struct Primary; Tint_Struct Secondary; }; - Tint_Struct Slot[EQEmu::textures::materialCount]; + Tint_Struct Slot[EQ::textures::materialCount]; }; }; @@ -197,7 +197,7 @@ struct TextureProfile Texture_Struct Primary; Texture_Struct Secondary; }; - Texture_Struct Slot[EQEmu::textures::materialCount]; + Texture_Struct Slot[EQ::textures::materialCount]; }; TextureProfile(); @@ -214,7 +214,7 @@ struct CharacterSelectEntry_Struct /*0000*/ uint8 Beard; // /*0001*/ uint8 HairColor; // /*0000*/ uint8 Face; // -/*0000*/ CharSelectEquip Equip[EQEmu::textures::materialCount]; +/*0000*/ CharSelectEquip Equip[EQ::textures::materialCount]; /*0000*/ uint32 PrimaryIDFile; // /*0000*/ uint32 SecondaryIDFile; // /*0000*/ uint8 Unknown15; // 0xff diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp index b612b9173..505bca10c 100644 --- a/common/patches/titanium.cpp +++ b/common/patches/titanium.cpp @@ -42,7 +42,7 @@ namespace Titanium static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth); + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth); // server to client inventory location converters static inline int16 ServerToTitaniumSlot(uint32 server_slot); @@ -58,8 +58,8 @@ namespace Titanium // client to server say link converter static inline void TitaniumToServerSayLink(std::string &server_saylink, const std::string &titanium_saylink); - static inline spells::CastingSlot ServerToTitaniumCastingSlot(EQEmu::spells::CastingSlot slot); - static inline EQEmu::spells::CastingSlot TitaniumToServerCastingSlot(spells::CastingSlot slot, uint32 item_location); + static inline spells::CastingSlot ServerToTitaniumCastingSlot(EQ::spells::CastingSlot slot); + static inline EQ::spells::CastingSlot TitaniumToServerCastingSlot(spells::CastingSlot slot, uint32 item_location); static inline int ServerToTitaniumBuffSlot(int index); static inline int TitaniumToServerBuffSlot(int index); @@ -143,9 +143,9 @@ namespace Titanium return(r); } - const EQEmu::versions::ClientVersion Strategy::ClientVersion() const + const EQ::versions::ClientVersion Strategy::ClientVersion() const { - return EQEmu::versions::ClientVersion::Titanium; + return EQ::versions::ClientVersion::Titanium; } #include "ss_define.h" @@ -320,22 +320,22 @@ namespace Titanium //store away the emu struct uchar* __emu_buffer = in->pBuffer; - int itemcount = in->size / sizeof(EQEmu::InternalSerializedItem_Struct); - if (itemcount == 0 || (in->size % sizeof(EQEmu::InternalSerializedItem_Struct)) != 0) { + int itemcount = in->size / sizeof(EQ::InternalSerializedItem_Struct); + if (itemcount == 0 || (in->size % sizeof(EQ::InternalSerializedItem_Struct)) != 0) { Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", - opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQEmu::InternalSerializedItem_Struct)); + opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQ::InternalSerializedItem_Struct)); delete in; return; } - EQEmu::InternalSerializedItem_Struct* eq = (EQEmu::InternalSerializedItem_Struct*)in->pBuffer; + EQ::InternalSerializedItem_Struct* eq = (EQ::InternalSerializedItem_Struct*)in->pBuffer; //do the transform... - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); for (int r = 0; r < itemcount; r++, eq++) { - SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, ServerToTitaniumSlot(eq->slot_id), 0); + SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, ServerToTitaniumSlot(eq->slot_id), 0); if (ob.tellp() == last_pos) LogNetcode("Titanium::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory. Item skipped", eq->slot_id); @@ -796,14 +796,14 @@ namespace Titanium OUT(TargetID); OUT(playerid); - for (int i = EQEmu::invslot::slotCharm; i <= EQEmu::invslot::slotWaist; ++i) { + for (int i = EQ::invslot::slotCharm; i <= EQ::invslot::slotWaist; ++i) { strn0cpy(eq->itemnames[i], emu->itemnames[i], sizeof(eq->itemnames[i])); OUT(itemicons[i]); } // move ammo down to last element in titanium array - strn0cpy(eq->itemnames[invslot::slotAmmo], emu->itemnames[EQEmu::invslot::slotAmmo], sizeof(eq->itemnames[invslot::slotAmmo])); - eq->itemicons[invslot::slotAmmo] = emu->itemicons[EQEmu::invslot::slotAmmo]; + strn0cpy(eq->itemnames[invslot::slotAmmo], emu->itemnames[EQ::invslot::slotAmmo], sizeof(eq->itemnames[invslot::slotAmmo])); + eq->itemicons[invslot::slotAmmo] = emu->itemicons[EQ::invslot::slotAmmo]; strn0cpy(eq->text, emu->text, sizeof(eq->text)); @@ -832,14 +832,14 @@ namespace Titanium //store away the emu struct uchar* __emu_buffer = in->pBuffer; - EQEmu::InternalSerializedItem_Struct* int_struct = (EQEmu::InternalSerializedItem_Struct*)(&__emu_buffer[4]); + EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]); - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)__emu_buffer, 4); - SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, ServerToTitaniumSlot(int_struct->slot_id), 0); + SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, ServerToTitaniumSlot(int_struct->slot_id), 0); if (ob.tellp() == last_pos) { LogNetcode("Titanium::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id); delete in; @@ -909,7 +909,7 @@ namespace Titanium // Since HT/LoH are translated up, we need to translate down only for memSpellSpellbar case if (emu->scribing == 3) - eq->slot = static_cast(ServerToTitaniumCastingSlot(static_cast(emu->slot))); + eq->slot = static_cast(ServerToTitaniumCastingSlot(static_cast(emu->slot))); else OUT(slot); OUT(spell_id); @@ -1009,7 +1009,7 @@ namespace Titanium OUT(hairstyle); OUT(beard); // OUT(unknown00178[10]); - for (r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) { + for (r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) { OUT(item_material.Slot[r].Material); OUT(item_tint.Slot[r].Color); } @@ -1032,7 +1032,7 @@ namespace Titanium OUT(face); // OUT(unknown02264[47]); - if (spells::SPELLBOOK_SIZE <= EQEmu::spells::SPELLBOOK_SIZE) { + if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) { for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) eq->spell_book[r] = emu->spell_book[r]; @@ -1041,14 +1041,14 @@ namespace Titanium } } else { - for (uint32 r = 0; r < EQEmu::spells::SPELLBOOK_SIZE; r++) { + for (uint32 r = 0; r < EQ::spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) eq->spell_book[r] = emu->spell_book[r]; else eq->spell_book[r] = 0xFFFFFFFFU; } // invalidate the rest of the spellbook slots - memset(&eq->spell_book[EQEmu::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQEmu::spells::SPELLBOOK_SIZE))); + memset(&eq->spell_book[EQ::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQ::spells::SPELLBOOK_SIZE))); } // OUT(unknown4184[448]); @@ -1092,7 +1092,7 @@ namespace Titanium // OUT(unknown06160[4]); // Copy bandoliers where server and client indices converge - for (r = 0; r < EQEmu::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { + for (r = 0; r < EQ::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { OUT_str(bandoliers[r].Name); for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true OUT(bandoliers[r].Items[k].ID); @@ -1101,7 +1101,7 @@ namespace Titanium } } // Nullify bandoliers where server and client indices diverge, with a client bias - for (r = EQEmu::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { + for (r = EQ::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { eq->bandoliers[r].Name[0] = '\0'; for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true eq->bandoliers[r].Items[k].ID = 0; @@ -1113,13 +1113,13 @@ namespace Titanium // OUT(unknown07444[5120]); // Copy potion belt where server and client indices converge - for (r = 0; r < EQEmu::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { + for (r = 0; r < EQ::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { OUT(potionbelt.Items[r].ID); OUT(potionbelt.Items[r].Icon); OUT_str(potionbelt.Items[r].Name); } // Nullify potion belt where server and client indices diverge, with a client bias - for (r = EQEmu::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { + for (r = EQ::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { eq->potionbelt.Items[r].ID = 0; eq->potionbelt.Items[r].Icon = 0; eq->potionbelt.Items[r].Name[0] = '\0'; @@ -1349,14 +1349,14 @@ namespace Titanium if (eq->Race[char_index] > 473) eq->Race[char_index] = 1; - for (int index = 0; index < EQEmu::textures::materialCount; ++index) { + for (int index = 0; index < EQ::textures::materialCount; ++index) { eq->CS_Colors[char_index].Slot[index].Color = emu_cse->Equip[index].Color; } eq->BeardColor[char_index] = emu_cse->BeardColor; eq->HairStyle[char_index] = emu_cse->HairStyle; - for (int index = 0; index < EQEmu::textures::materialCount; ++index) { + for (int index = 0; index < EQ::textures::materialCount; ++index) { eq->Equip[char_index].Slot[index].Material = emu_cse->Equip[index].Material; } @@ -1386,14 +1386,14 @@ namespace Titanium for (; char_index < 10; ++char_index) { eq->Race[char_index] = 0; - for (int index = 0; index < EQEmu::textures::materialCount; ++index) { + for (int index = 0; index < EQ::textures::materialCount; ++index) { eq->CS_Colors[char_index].Slot[index].Color = 0; } eq->BeardColor[char_index] = 0; eq->HairStyle[char_index] = 0; - for (int index = 0; index < EQEmu::textures::materialCount; ++index) { + for (int index = 0; index < EQ::textures::materialCount; ++index) { eq->Equip[char_index].Slot[index].Material = 0; } @@ -1717,7 +1717,7 @@ namespace Titanium eq->petOwnerId = emu->petOwnerId; eq->guildrank = emu->guildrank; // eq->unknown0194[3] = emu->unknown0194[3]; - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) { + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) { eq->equipment.Slot[k].Material = emu->equipment.Slot[k].Material; eq->equipment_tint.Slot[k].Color = emu->equipment_tint.Slot[k].Color; } @@ -1830,7 +1830,7 @@ namespace Titanium DECODE_LENGTH_EXACT(structs::BugReport_Struct); SETUP_DIRECT_DECODE(BugReport_Struct, structs::BugReport_Struct); - emu->category_id = EQEmu::bug::CategoryNameToCategoryID(eq->category_name); + emu->category_id = EQ::bug::CategoryNameToCategoryID(eq->category_name); memcpy(emu->category_name, eq, sizeof(structs::BugReport_Struct)); FINISH_DIRECT_DECODE(); @@ -1993,12 +1993,12 @@ namespace Titanium } // move ammo up to last element in server array - strn0cpy(emu->itemnames[EQEmu::invslot::slotAmmo], eq->itemnames[invslot::slotAmmo], sizeof(emu->itemnames[EQEmu::invslot::slotAmmo])); - emu->itemicons[EQEmu::invslot::slotAmmo] = eq->itemicons[invslot::slotAmmo]; + strn0cpy(emu->itemnames[EQ::invslot::slotAmmo], eq->itemnames[invslot::slotAmmo], sizeof(emu->itemnames[EQ::invslot::slotAmmo])); + emu->itemicons[EQ::invslot::slotAmmo] = eq->itemicons[invslot::slotAmmo]; // nullify power source element in server array - strn0cpy(emu->itemnames[EQEmu::invslot::slotPowerSource], "", sizeof(emu->itemnames[EQEmu::invslot::slotPowerSource])); - emu->itemicons[EQEmu::invslot::slotPowerSource] = 0xFFFFFFFF; + strn0cpy(emu->itemnames[EQ::invslot::slotPowerSource], "", sizeof(emu->itemnames[EQ::invslot::slotPowerSource])); + emu->itemicons[EQ::invslot::slotPowerSource] = 0xFFFFFFFF; strn0cpy(emu->text, eq->text, sizeof(emu->text)); @@ -2053,7 +2053,7 @@ namespace Titanium for (int i = 0; i < spells::SPELL_GEM_COUNT; ++i) IN(spell[i]); - for (int i = spells::SPELL_GEM_COUNT; i < EQEmu::spells::SPELL_GEM_COUNT; ++i) + for (int i = spells::SPELL_GEM_COUNT; i < EQ::spells::SPELL_GEM_COUNT; ++i) emu->spell[i] = 0xFFFFFFFF; IN(unknown); @@ -2273,9 +2273,9 @@ namespace Titanium } // file scope helper methods - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth) { + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth) { const char *protection = "\\\\\\\\\\"; - const EQEmu::ItemData *item = inst->GetUnscaledItem(); + const EQ::ItemData *item = inst->GetUnscaledItem(); ob << StringFormat( "%.*s%s", @@ -2293,7 +2293,7 @@ namespace Titanium ob << '|' << itoa((!inst->GetMerchantSlot() ? inst->GetSerialNumber() : inst->GetMerchantSlot())); // merchant serial number ob << '|' << itoa(inst->GetRecastTimestamp()); // recast timestamp - ob << '|' << itoa(((inst->IsStackable() ? ((inst->GetItem()->ItemType == EQEmu::item::ItemTypePotion) ? 1 : 0) + ob << '|' << itoa(((inst->IsStackable() ? ((inst->GetItem()->ItemType == EQ::item::ItemTypePotion) ? 1 : 0) : inst->GetCharges()))); // charge count ob << '|' << itoa((inst->IsAttuned() ? 1 : 0)); // inst attuned ob << '|' << itoa(0); // unknown @@ -2502,10 +2502,10 @@ namespace Titanium ob << StringFormat("%.*s\"", depth, protection); // Quotes (and protection, if needed) around static data // Sub data - for (int index = EQEmu::invbag::SLOT_BEGIN; index <= invbag::SLOT_END; ++index) { + for (int index = EQ::invbag::SLOT_BEGIN; index <= invbag::SLOT_END; ++index) { ob << '|'; - EQEmu::ItemInstance *sub = inst->GetItem(index); + EQ::ItemInstance *sub = inst->GetItem(index); if (!sub) continue; @@ -2525,59 +2525,59 @@ namespace Titanium static inline int16 ServerToTitaniumSlot(uint32 server_slot) { int16 titanium_slot = invslot::SLOT_INVALID; - if (server_slot <= EQEmu::invslot::slotWaist) { + if (server_slot <= EQ::invslot::slotWaist) { titanium_slot = server_slot; } - else if (server_slot == EQEmu::invslot::slotAmmo) { + else if (server_slot == EQ::invslot::slotAmmo) { titanium_slot = server_slot - 1; } - else if (server_slot <= EQEmu::invslot::slotGeneral8 && server_slot >= EQEmu::invslot::slotGeneral1) { + else if (server_slot <= EQ::invslot::slotGeneral8 && server_slot >= EQ::invslot::slotGeneral1) { titanium_slot = server_slot - 1; } - else if (server_slot <= (EQEmu::invslot::POSSESSIONS_COUNT + EQEmu::invslot::slotWaist) && - server_slot >= EQEmu::invslot::slotCursor) { + else if (server_slot <= (EQ::invslot::POSSESSIONS_COUNT + EQ::invslot::slotWaist) && + server_slot >= EQ::invslot::slotCursor) { titanium_slot = server_slot - 3; } - else if (server_slot == (EQEmu::invslot::POSSESSIONS_COUNT + EQEmu::invslot::slotAmmo)) { + else if (server_slot == (EQ::invslot::POSSESSIONS_COUNT + EQ::invslot::slotAmmo)) { titanium_slot = server_slot - 4; } - else if (server_slot <= EQEmu::invbag::GENERAL_BAGS_8_END && - server_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { + else if (server_slot <= EQ::invbag::GENERAL_BAGS_8_END && + server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) { titanium_slot = server_slot; } - else if (server_slot <= EQEmu::invbag::CURSOR_BAG_END && server_slot >= EQEmu::invbag::CURSOR_BAG_BEGIN) { + else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::CURSOR_BAG_BEGIN) { titanium_slot = server_slot - 20; } - else if (server_slot <= EQEmu::invslot::TRIBUTE_END && server_slot >= EQEmu::invslot::TRIBUTE_BEGIN) { + else if (server_slot <= EQ::invslot::TRIBUTE_END && server_slot >= EQ::invslot::TRIBUTE_BEGIN) { titanium_slot = server_slot; } - else if (server_slot <= EQEmu::invslot::GUILD_TRIBUTE_END && - server_slot >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN) { + else if (server_slot <= EQ::invslot::GUILD_TRIBUTE_END && + server_slot >= EQ::invslot::GUILD_TRIBUTE_BEGIN) { titanium_slot = server_slot; } - else if (server_slot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { + else if (server_slot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { titanium_slot = server_slot; } - else if (server_slot <= EQEmu::invslot::BANK_END && server_slot >= EQEmu::invslot::BANK_BEGIN) { + else if (server_slot <= EQ::invslot::BANK_END && server_slot >= EQ::invslot::BANK_BEGIN) { titanium_slot = server_slot; } - else if (server_slot <= EQEmu::invbag::BANK_BAGS_16_END && server_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) { + else if (server_slot <= EQ::invbag::BANK_BAGS_16_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) { titanium_slot = server_slot; } - else if (server_slot <= EQEmu::invslot::SHARED_BANK_END && server_slot >= EQEmu::invslot::SHARED_BANK_BEGIN) { + else if (server_slot <= EQ::invslot::SHARED_BANK_END && server_slot >= EQ::invslot::SHARED_BANK_BEGIN) { titanium_slot = server_slot; } - else if (server_slot <= EQEmu::invbag::SHARED_BANK_BAGS_END && - server_slot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) { + else if (server_slot <= EQ::invbag::SHARED_BANK_BAGS_END && + server_slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) { titanium_slot = server_slot; } - else if (server_slot <= EQEmu::invslot::TRADE_END && server_slot >= EQEmu::invslot::TRADE_BEGIN) { + else if (server_slot <= EQ::invslot::TRADE_END && server_slot >= EQ::invslot::TRADE_BEGIN) { titanium_slot = server_slot; } - else if (server_slot <= EQEmu::invbag::TRADE_BAGS_END && server_slot >= EQEmu::invbag::TRADE_BAGS_BEGIN) { + else if (server_slot <= EQ::invbag::TRADE_BAGS_END && server_slot >= EQ::invbag::TRADE_BAGS_BEGIN) { titanium_slot = server_slot; } - else if (server_slot <= EQEmu::invslot::WORLD_END && server_slot >= EQEmu::invslot::WORLD_BEGIN) { + else if (server_slot <= EQ::invslot::WORLD_END && server_slot >= EQ::invslot::WORLD_BEGIN) { titanium_slot = server_slot; } @@ -2590,16 +2590,16 @@ namespace Titanium static inline int16 ServerToTitaniumCorpseSlot(uint32 server_corpse_slot) { int16 titanium_slot = invslot::SLOT_INVALID; - if (server_corpse_slot <= EQEmu::invslot::slotGeneral8 && server_corpse_slot >= EQEmu::invslot::slotGeneral1) { + if (server_corpse_slot <= EQ::invslot::slotGeneral8 && server_corpse_slot >= EQ::invslot::slotGeneral1) { titanium_slot = server_corpse_slot - 1; } - else if (server_corpse_slot <= (EQEmu::invslot::POSSESSIONS_COUNT + EQEmu::invslot::slotWaist) && - server_corpse_slot >= EQEmu::invslot::slotCursor) { + else if (server_corpse_slot <= (EQ::invslot::POSSESSIONS_COUNT + EQ::invslot::slotWaist) && + server_corpse_slot >= EQ::invslot::slotCursor) { titanium_slot = server_corpse_slot - 3; } - else if (server_corpse_slot == (EQEmu::invslot::POSSESSIONS_COUNT + EQEmu::invslot::slotAmmo)) { + else if (server_corpse_slot == (EQ::invslot::POSSESSIONS_COUNT + EQ::invslot::slotAmmo)) { titanium_slot = server_corpse_slot - 4; } @@ -2613,7 +2613,7 @@ namespace Titanium } static inline uint32 TitaniumToServerSlot(int16 titanium_slot) { - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; if (titanium_slot <= invslot::slotWaist) { server_slot = titanium_slot; @@ -2675,7 +2675,7 @@ namespace Titanium static inline uint32 TitaniumToServerCorpseSlot(int16 titanium_corpse_slot) { - uint32 server_slot = EQEmu::invslot::SLOT_INVALID; + uint32 server_slot = EQ::invslot::SLOT_INVALID; if (titanium_corpse_slot <= invslot::slotGeneral8 && titanium_corpse_slot >= invslot::slotGeneral1) { server_slot = titanium_corpse_slot + 1; @@ -2696,7 +2696,7 @@ namespace Titanium static inline void ServerToTitaniumSayLink(std::string &titanium_saylink, const std::string &server_saylink) { - if ((constants::SAY_LINK_BODY_SIZE == EQEmu::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) { + if ((constants::SAY_LINK_BODY_SIZE == EQ::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) { titanium_saylink = server_saylink; return; } @@ -2705,7 +2705,7 @@ namespace Titanium for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { - if (segments[segment_iter].length() <= EQEmu::constants::SAY_LINK_BODY_SIZE) { + if (segments[segment_iter].length() <= EQ::constants::SAY_LINK_BODY_SIZE) { titanium_saylink.append(segments[segment_iter]); // TODO: log size mismatch error continue; @@ -2736,7 +2736,7 @@ namespace Titanium static inline void TitaniumToServerSayLink(std::string &server_saylink, const std::string &titanium_saylink) { - if ((EQEmu::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (titanium_saylink.find('\x12') == std::string::npos)) { + if ((EQ::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (titanium_saylink.find('\x12') == std::string::npos)) { server_saylink = titanium_saylink; return; } @@ -2772,85 +2772,85 @@ namespace Titanium } } - static inline spells::CastingSlot ServerToTitaniumCastingSlot(EQEmu::spells::CastingSlot slot) { + static inline spells::CastingSlot ServerToTitaniumCastingSlot(EQ::spells::CastingSlot slot) { switch (slot) { - case EQEmu::spells::CastingSlot::Gem1: + case EQ::spells::CastingSlot::Gem1: return spells::CastingSlot::Gem1; - case EQEmu::spells::CastingSlot::Gem2: + case EQ::spells::CastingSlot::Gem2: return spells::CastingSlot::Gem2; - case EQEmu::spells::CastingSlot::Gem3: + case EQ::spells::CastingSlot::Gem3: return spells::CastingSlot::Gem3; - case EQEmu::spells::CastingSlot::Gem4: + case EQ::spells::CastingSlot::Gem4: return spells::CastingSlot::Gem4; - case EQEmu::spells::CastingSlot::Gem5: + case EQ::spells::CastingSlot::Gem5: return spells::CastingSlot::Gem5; - case EQEmu::spells::CastingSlot::Gem6: + case EQ::spells::CastingSlot::Gem6: return spells::CastingSlot::Gem6; - case EQEmu::spells::CastingSlot::Gem7: + case EQ::spells::CastingSlot::Gem7: return spells::CastingSlot::Gem7; - case EQEmu::spells::CastingSlot::Gem8: + case EQ::spells::CastingSlot::Gem8: return spells::CastingSlot::Gem8; - case EQEmu::spells::CastingSlot::Gem9: + case EQ::spells::CastingSlot::Gem9: return spells::CastingSlot::Gem9; - case EQEmu::spells::CastingSlot::Item: + case EQ::spells::CastingSlot::Item: return spells::CastingSlot::Item; - case EQEmu::spells::CastingSlot::PotionBelt: + case EQ::spells::CastingSlot::PotionBelt: return spells::CastingSlot::PotionBelt; - case EQEmu::spells::CastingSlot::Discipline: + case EQ::spells::CastingSlot::Discipline: return spells::CastingSlot::Discipline; - case EQEmu::spells::CastingSlot::AltAbility: + case EQ::spells::CastingSlot::AltAbility: return spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something return spells::CastingSlot::Discipline; } } - static inline EQEmu::spells::CastingSlot TitaniumToServerCastingSlot(spells::CastingSlot slot, uint32 item_location) { + static inline EQ::spells::CastingSlot TitaniumToServerCastingSlot(spells::CastingSlot slot, uint32 item_location) { switch (slot) { case spells::CastingSlot::Gem1: - return EQEmu::spells::CastingSlot::Gem1; + return EQ::spells::CastingSlot::Gem1; case spells::CastingSlot::Gem2: - return EQEmu::spells::CastingSlot::Gem2; + return EQ::spells::CastingSlot::Gem2; case spells::CastingSlot::Gem3: - return EQEmu::spells::CastingSlot::Gem3; + return EQ::spells::CastingSlot::Gem3; case spells::CastingSlot::Gem4: - return EQEmu::spells::CastingSlot::Gem4; + return EQ::spells::CastingSlot::Gem4; case spells::CastingSlot::Gem5: - return EQEmu::spells::CastingSlot::Gem5; + return EQ::spells::CastingSlot::Gem5; case spells::CastingSlot::Gem6: - return EQEmu::spells::CastingSlot::Gem6; + return EQ::spells::CastingSlot::Gem6; case spells::CastingSlot::Gem7: - return EQEmu::spells::CastingSlot::Gem7; + return EQ::spells::CastingSlot::Gem7; case spells::CastingSlot::Gem8: - return EQEmu::spells::CastingSlot::Gem8; + return EQ::spells::CastingSlot::Gem8; case spells::CastingSlot::Gem9: - return EQEmu::spells::CastingSlot::Gem9; + return EQ::spells::CastingSlot::Gem9; case spells::CastingSlot::Ability: - return EQEmu::spells::CastingSlot::Ability; + return EQ::spells::CastingSlot::Ability; // Tit uses 10 for item and discipline casting, but items have a valid location case spells::CastingSlot::Item: if (item_location == INVALID_INDEX) - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; else - return EQEmu::spells::CastingSlot::Item; + return EQ::spells::CastingSlot::Item; case spells::CastingSlot::PotionBelt: - return EQEmu::spells::CastingSlot::PotionBelt; + return EQ::spells::CastingSlot::PotionBelt; case spells::CastingSlot::AltAbility: - return EQEmu::spells::CastingSlot::AltAbility; + return EQ::spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; } } static inline int ServerToTitaniumBuffSlot(int index) { // we're a disc - if (index >= EQEmu::spells::LONG_BUFFS + EQEmu::spells::SHORT_BUFFS) - return index - EQEmu::spells::LONG_BUFFS - EQEmu::spells::SHORT_BUFFS + + if (index >= EQ::spells::LONG_BUFFS + EQ::spells::SHORT_BUFFS) + return index - EQ::spells::LONG_BUFFS - EQ::spells::SHORT_BUFFS + spells::LONG_BUFFS + spells::SHORT_BUFFS; // we're a song - if (index >= EQEmu::spells::LONG_BUFFS) - return index - EQEmu::spells::LONG_BUFFS + spells::LONG_BUFFS; + if (index >= EQ::spells::LONG_BUFFS) + return index - EQ::spells::LONG_BUFFS + spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } @@ -2859,11 +2859,11 @@ namespace Titanium { // we're a disc if (index >= spells::LONG_BUFFS + spells::SHORT_BUFFS) - return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQEmu::spells::LONG_BUFFS + - EQEmu::spells::SHORT_BUFFS; + return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQ::spells::LONG_BUFFS + + EQ::spells::SHORT_BUFFS; // we're a song if (index >= spells::LONG_BUFFS) - return index - spells::LONG_BUFFS + EQEmu::spells::LONG_BUFFS; + return index - spells::LONG_BUFFS + EQ::spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } diff --git a/common/patches/titanium.h b/common/patches/titanium.h index 2f063c9ad..9e5cc7af5 100644 --- a/common/patches/titanium.h +++ b/common/patches/titanium.h @@ -43,7 +43,7 @@ namespace Titanium protected: virtual std::string Describe() const; - virtual const EQEmu::versions::ClientVersion ClientVersion() const; + virtual const EQ::versions::ClientVersion ClientVersion() const; //magic macro to declare our opcode processors #include "ss_declare.h" diff --git a/common/patches/titanium_limits.h b/common/patches/titanium_limits.h index 5a804defb..09d3d99ca 100644 --- a/common/patches/titanium_limits.h +++ b/common/patches/titanium_limits.h @@ -31,7 +31,7 @@ namespace Titanium const int16 INULL = 0; namespace inventory { - inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::Titanium; } const bool ConcatenateInvTypeLimbo = true; @@ -43,7 +43,7 @@ namespace Titanium } /*inventory*/ namespace invtype { - inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::Titanium; } namespace enum_ { enum InventoryTypes : int16 { @@ -106,7 +106,7 @@ namespace Titanium } /*invtype*/ namespace invslot { - inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::Titanium; } namespace enum_ { enum InventorySlots : int16 { @@ -204,7 +204,7 @@ namespace Titanium } /*invslot*/ namespace invbag { - inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::Titanium; } const int16 SLOT_INVALID = IINVALID; const int16 SLOT_BEGIN = INULL; @@ -236,7 +236,7 @@ namespace Titanium } /*invbag*/ namespace invaug { - inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::Titanium; } const int16 SOCKET_INVALID = IINVALID; const int16 SOCKET_BEGIN = INULL; @@ -248,7 +248,7 @@ namespace Titanium } /*invaug*/ namespace item { - inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::Titanium; } enum ItemPacketType : int { ItemPacketMerchant = 100, @@ -266,7 +266,7 @@ namespace Titanium } /*item*/ namespace profile { - inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::Titanium; } const int16 BANDOLIERS_SIZE = 4; // number of bandolier instances const int16 BANDOLIER_ITEM_COUNT = 4; // number of equipment slots in bandolier instance @@ -278,11 +278,11 @@ namespace Titanium } /*profile*/ namespace constants { - inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::Titanium; } - const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::DoD; // Someone had this as PoR in another section... - const uint32 EXPANSION_BIT = EQEmu::expansions::bitDoD; - const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskDoD; + const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::DoD; // Someone had this as PoR in another section... + const uint32 EXPANSION_BIT = EQ::expansions::bitDoD; + const uint32 EXPANSIONS_MASK = EQ::expansions::maskDoD; const size_t CHARACTER_CREATION_LIMIT = 8; // Hard-coded in client - DO NOT ALTER @@ -291,21 +291,21 @@ namespace Titanium } /*constants*/ namespace behavior { - inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::Titanium; } const bool CoinHasWeight = true; } /*behavior*/ namespace skills { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::Titanium; } - const size_t LastUsableSkill = EQEmu::skills::SkillFrenzy; + const size_t LastUsableSkill = EQ::skills::SkillFrenzy; } /*skills*/ namespace spells { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::Titanium; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::Titanium; } enum class CastingSlot : uint32 { Gem1 = 0, diff --git a/common/patches/titanium_structs.h b/common/patches/titanium_structs.h index de350db0b..f620089d6 100644 --- a/common/patches/titanium_structs.h +++ b/common/patches/titanium_structs.h @@ -161,7 +161,7 @@ struct TintProfile { Tint_Struct Primary; Tint_Struct Secondary; }; - Tint_Struct Slot[EQEmu::textures::materialCount]; + Tint_Struct Slot[EQ::textures::materialCount]; }; }; @@ -184,7 +184,7 @@ struct TextureProfile Texture_Struct Primary; Texture_Struct Secondary; }; - Texture_Struct Slot[EQEmu::textures::materialCount]; + Texture_Struct Slot[EQ::textures::materialCount]; }; TextureProfile(); diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp index 576996e76..49c13833d 100644 --- a/common/patches/uf.cpp +++ b/common/patches/uf.cpp @@ -43,7 +43,7 @@ namespace UF static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id, uint8 depth); + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id, uint8 depth); // server to client inventory location converters static inline uint32 ServerToUFSlot(uint32 serverSlot); @@ -59,8 +59,8 @@ namespace UF // client to server say link converter static inline void UFToServerSayLink(std::string& serverSayLink, const std::string& ufSayLink); - static inline spells::CastingSlot ServerToUFCastingSlot(EQEmu::spells::CastingSlot slot); - static inline EQEmu::spells::CastingSlot UFToServerCastingSlot(spells::CastingSlot slot); + static inline spells::CastingSlot ServerToUFCastingSlot(EQ::spells::CastingSlot slot); + static inline EQ::spells::CastingSlot UFToServerCastingSlot(spells::CastingSlot slot); static inline int ServerToUFBuffSlot(int index); static inline int UFToServerBuffSlot(int index); @@ -144,9 +144,9 @@ namespace UF return(r); } - const EQEmu::versions::ClientVersion Strategy::ClientVersion() const + const EQ::versions::ClientVersion Strategy::ClientVersion() const { - return EQEmu::versions::ClientVersion::UF; + return EQ::versions::ClientVersion::UF; } #include "ss_define.h" @@ -501,24 +501,24 @@ namespace UF //store away the emu struct uchar* __emu_buffer = in->pBuffer; - int item_count = in->size / sizeof(EQEmu::InternalSerializedItem_Struct); - if (!item_count || (in->size % sizeof(EQEmu::InternalSerializedItem_Struct)) != 0) { + int item_count = in->size / sizeof(EQ::InternalSerializedItem_Struct); + if (!item_count || (in->size % sizeof(EQ::InternalSerializedItem_Struct)) != 0) { Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", - opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQEmu::InternalSerializedItem_Struct)); + opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQ::InternalSerializedItem_Struct)); delete in; return; } - EQEmu::InternalSerializedItem_Struct* eq = (EQEmu::InternalSerializedItem_Struct*)in->pBuffer; + EQ::InternalSerializedItem_Struct* eq = (EQ::InternalSerializedItem_Struct*)in->pBuffer; - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)&item_count, sizeof(uint32)); for (int index = 0; index < item_count; ++index, ++eq) { - SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0); + SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, eq->slot_id, 0); if (ob.tellp() == last_pos) LogNetcode("UF::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory. Item skipped", eq->slot_id); @@ -1268,14 +1268,14 @@ namespace UF //store away the emu struct uchar* __emu_buffer = in->pBuffer; - EQEmu::InternalSerializedItem_Struct* int_struct = (EQEmu::InternalSerializedItem_Struct*)(&__emu_buffer[4]); + EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]); - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); ob.write((const char*)__emu_buffer, 4); - SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0); + SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, int_struct->slot_id, 0); if (ob.tellp() == last_pos) { LogNetcode("UF::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id); delete in; @@ -1693,7 +1693,7 @@ namespace UF OUT(hairstyle); OUT(beard); // OUT(unknown00178[10]); - for (r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) { + for (r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) { eq->equipment.Slot[r].Material = emu->item_material.Slot[r].Material; eq->equipment.Slot[r].Unknown1 = 0; eq->equipment.Slot[r].EliteMaterial = 0; @@ -1725,7 +1725,7 @@ namespace UF OUT(face); // OUT(unknown02264[47]); - if (spells::SPELLBOOK_SIZE <= EQEmu::spells::SPELLBOOK_SIZE) { + if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) { for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) eq->spell_book[r] = emu->spell_book[r]; @@ -1734,14 +1734,14 @@ namespace UF } } else { - for (uint32 r = 0; r < EQEmu::spells::SPELLBOOK_SIZE; r++) { + for (uint32 r = 0; r < EQ::spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) eq->spell_book[r] = emu->spell_book[r]; else eq->spell_book[r] = 0xFFFFFFFFU; } // invalidate the rest of the spellbook slots - memset(&eq->spell_book[EQEmu::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQEmu::spells::SPELLBOOK_SIZE))); + memset(&eq->spell_book[EQ::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQ::spells::SPELLBOOK_SIZE))); } // OUT(unknown4184[128]); @@ -1797,7 +1797,7 @@ namespace UF // OUT(unknown06160[4]); // Copy bandoliers where server and client indices converge - for (r = 0; r < EQEmu::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { + for (r = 0; r < EQ::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) { OUT_str(bandoliers[r].Name); for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true OUT(bandoliers[r].Items[k].ID); @@ -1806,7 +1806,7 @@ namespace UF } } // Nullify bandoliers where server and client indices diverge, with a client bias - for (r = EQEmu::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { + for (r = EQ::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) { eq->bandoliers[r].Name[0] = '\0'; for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true eq->bandoliers[r].Items[k].ID = 0; @@ -1818,13 +1818,13 @@ namespace UF // OUT(unknown07444[5120]); // Copy potion belt where server and client indices converge - for (r = 0; r < EQEmu::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { + for (r = 0; r < EQ::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) { OUT(potionbelt.Items[r].ID); OUT(potionbelt.Items[r].Icon); OUT_str(potionbelt.Items[r].Name); } // Nullify potion belt where server and client indices diverge, with a client bias - for (r = EQEmu::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { + for (r = EQ::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) { eq->potionbelt.Items[r].ID = 0; eq->potionbelt.Items[r].Icon = 0; eq->potionbelt.Items[r].Name[0] = '\0'; @@ -2196,7 +2196,7 @@ namespace UF eq_cse->HairColor = emu_cse->HairColor; eq_cse->Face = emu_cse->Face; - for (int equip_index = EQEmu::textures::textureBegin; equip_index < EQEmu::textures::materialCount; equip_index++) { + for (int equip_index = EQ::textures::textureBegin; equip_index < EQ::textures::materialCount; equip_index++) { eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteModel; @@ -2755,7 +2755,7 @@ namespace UF float SpawnSize = emu->size; if (!((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522))) { - PacketSize -= (sizeof(structs::Texture_Struct) * EQEmu::textures::materialCount); + PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount); if (emu->size == 0) { @@ -2954,7 +2954,7 @@ namespace UF if ((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522)) { - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; ++k) + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k) { { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->equipment_tint.Slot[k].Color); @@ -2990,7 +2990,7 @@ namespace UF { structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer; - for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) { + for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) { if (emu->equipment.Slot[k].Material > 99999) { Equipment[k].Material = 63; } else { @@ -3000,7 +3000,7 @@ namespace UF Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteModel; } - Buffer += (sizeof(structs::Texture_Struct) * EQEmu::textures::materialCount); + Buffer += (sizeof(structs::Texture_Struct) * EQ::textures::materialCount); } if (strlen(emu->title)) { @@ -3498,7 +3498,7 @@ namespace UF DECODE_LENGTH_EXACT(structs::LoadSpellSet_Struct); SETUP_DIRECT_DECODE(LoadSpellSet_Struct, structs::LoadSpellSet_Struct); - for (unsigned int i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; ++i) + for (unsigned int i = 0; i < EQ::spells::SPELL_GEM_COUNT; ++i) if (eq->spell[i] == 0) emu->spell[i] = 0xFFFFFFFF; else @@ -3737,9 +3737,9 @@ namespace UF return NextItemInstSerialNumber; } - void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth) + void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth) { - const EQEmu::ItemData *item = inst->GetUnscaledItem(); + const EQ::ItemData *item = inst->GetUnscaledItem(); UF::structs::ItemSerializationHeader hdr; @@ -3783,7 +3783,7 @@ namespace UF int ornamentationAugtype = RuleI(Character, OrnamentationAugmentType); uint16 ornaIcon = 0; if (inst->GetOrnamentationAug(ornamentationAugtype)) { - const EQEmu::ItemData *aug_weap = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem(); + const EQ::ItemData *aug_weap = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem(); ornaIcon = aug_weap->Icon; ob.write(aug_weap->IDFile, strlen(aug_weap->IDFile)); @@ -3968,7 +3968,7 @@ namespace UF // Done to hack older clients to label expendable fishing poles as such // July 28th, 2018 patch - if (item->ItemType == EQEmu::item::ItemTypeFishingPole && item->SubType == 0) { + if (item->ItemType == EQ::item::ItemTypeFishingPole && item->SubType == 0) { itbs.expendablearrow = 1; } @@ -4116,30 +4116,30 @@ namespace UF ob.write((const char*)&iqbs, sizeof(UF::structs::ItemQuaternaryBodyStruct)); - EQEmu::OutBuffer::pos_type count_pos = ob.tellp(); + EQ::OutBuffer::pos_type count_pos = ob.tellp(); uint32 subitem_count = 0; ob.write((const char*)&subitem_count, sizeof(uint32)); // moved outside of loop since it is not modified within that scope - int16 SubSlotNumber = EQEmu::invbag::SLOT_INVALID; + int16 SubSlotNumber = EQ::invbag::SLOT_INVALID; - if (slot_id_in <= EQEmu::invslot::slotGeneral8 && slot_id_in >= EQEmu::invslot::GENERAL_BEGIN) - SubSlotNumber = EQEmu::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT); - else if (slot_id_in <= EQEmu::invslot::GENERAL_END && slot_id_in >= EQEmu::invslot::slotGeneral9) - SubSlotNumber = EQEmu::invbag::SLOT_INVALID; - else if (slot_id_in == EQEmu::invslot::slotCursor) - SubSlotNumber = EQEmu::invbag::CURSOR_BAG_BEGIN; - else if (slot_id_in <= EQEmu::invslot::BANK_END && slot_id_in >= EQEmu::invslot::BANK_BEGIN) - SubSlotNumber = EQEmu::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT); - else if (slot_id_in <= EQEmu::invslot::SHARED_BANK_END && slot_id_in >= EQEmu::invslot::SHARED_BANK_BEGIN) - SubSlotNumber = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::SHARED_BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT); + if (slot_id_in <= EQ::invslot::slotGeneral8 && slot_id_in >= EQ::invslot::GENERAL_BEGIN) + SubSlotNumber = EQ::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQ::invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT); + else if (slot_id_in <= EQ::invslot::GENERAL_END && slot_id_in >= EQ::invslot::slotGeneral9) + SubSlotNumber = EQ::invbag::SLOT_INVALID; + else if (slot_id_in == EQ::invslot::slotCursor) + SubSlotNumber = EQ::invbag::CURSOR_BAG_BEGIN; + else if (slot_id_in <= EQ::invslot::BANK_END && slot_id_in >= EQ::invslot::BANK_BEGIN) + SubSlotNumber = EQ::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::BANK_BEGIN) * EQ::invbag::SLOT_COUNT); + else if (slot_id_in <= EQ::invslot::SHARED_BANK_END && slot_id_in >= EQ::invslot::SHARED_BANK_BEGIN) + SubSlotNumber = EQ::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::SHARED_BANK_BEGIN) * EQ::invbag::SLOT_COUNT); else SubSlotNumber = slot_id_in; // not sure if this is the best way to handle this..leaving for now - if (SubSlotNumber != EQEmu::invbag::SLOT_INVALID) { - for (uint32 index = EQEmu::invbag::SLOT_BEGIN; index <= EQEmu::invbag::SLOT_END; ++index) { - EQEmu::ItemInstance* sub = inst->GetItem(index); + if (SubSlotNumber != EQ::invbag::SLOT_INVALID) { + for (uint32 index = EQ::invbag::SLOT_BEGIN; index <= EQ::invbag::SLOT_END; ++index) { + EQ::ItemInstance* sub = inst->GetItem(index); if (!sub) continue; @@ -4158,59 +4158,59 @@ namespace UF { uint32 UFSlot = invslot::SLOT_INVALID; - if (serverSlot <= EQEmu::invslot::slotGeneral8) { + if (serverSlot <= EQ::invslot::slotGeneral8) { UFSlot = serverSlot; } - else if (serverSlot <= EQEmu::invslot::CORPSE_END && serverSlot >= EQEmu::invslot::slotCursor) { + else if (serverSlot <= EQ::invslot::CORPSE_END && serverSlot >= EQ::invslot::slotCursor) { UFSlot = serverSlot - 2; } - else if (serverSlot <= EQEmu::invbag::GENERAL_BAGS_8_END && serverSlot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { + else if (serverSlot <= EQ::invbag::GENERAL_BAGS_8_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) { UFSlot = serverSlot + 11; } - else if (serverSlot <= EQEmu::invbag::CURSOR_BAG_END && serverSlot >= EQEmu::invbag::CURSOR_BAG_BEGIN) { + else if (serverSlot <= EQ::invbag::CURSOR_BAG_END && serverSlot >= EQ::invbag::CURSOR_BAG_BEGIN) { UFSlot = serverSlot - 9; } - else if (serverSlot <= EQEmu::invslot::TRIBUTE_END && serverSlot >= EQEmu::invslot::TRIBUTE_BEGIN) { + else if (serverSlot <= EQ::invslot::TRIBUTE_END && serverSlot >= EQ::invslot::TRIBUTE_BEGIN) { UFSlot = serverSlot; } - else if (serverSlot <= EQEmu::invslot::GUILD_TRIBUTE_END && serverSlot >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN) { + else if (serverSlot <= EQ::invslot::GUILD_TRIBUTE_END && serverSlot >= EQ::invslot::GUILD_TRIBUTE_BEGIN) { UFSlot = serverSlot; } - else if (serverSlot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { + else if (serverSlot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { UFSlot = serverSlot; } - else if (serverSlot <= EQEmu::invslot::BANK_END && serverSlot >= EQEmu::invslot::BANK_BEGIN) { + else if (serverSlot <= EQ::invslot::BANK_END && serverSlot >= EQ::invslot::BANK_BEGIN) { UFSlot = serverSlot; } - else if (serverSlot <= EQEmu::invbag::BANK_BAGS_END && serverSlot >= EQEmu::invbag::BANK_BAGS_BEGIN) { + else if (serverSlot <= EQ::invbag::BANK_BAGS_END && serverSlot >= EQ::invbag::BANK_BAGS_BEGIN) { UFSlot = serverSlot + 1; } - else if (serverSlot <= EQEmu::invslot::SHARED_BANK_END && serverSlot >= EQEmu::invslot::SHARED_BANK_BEGIN) { + else if (serverSlot <= EQ::invslot::SHARED_BANK_END && serverSlot >= EQ::invslot::SHARED_BANK_BEGIN) { UFSlot = serverSlot; } - else if (serverSlot <= EQEmu::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) { + else if (serverSlot <= EQ::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) { UFSlot = serverSlot + 1; } - else if (serverSlot <= EQEmu::invslot::TRADE_END && serverSlot >= EQEmu::invslot::TRADE_BEGIN) { + else if (serverSlot <= EQ::invslot::TRADE_END && serverSlot >= EQ::invslot::TRADE_BEGIN) { UFSlot = serverSlot; } - else if (serverSlot <= EQEmu::invbag::TRADE_BAGS_END && serverSlot >= EQEmu::invbag::TRADE_BAGS_BEGIN) { + else if (serverSlot <= EQ::invbag::TRADE_BAGS_END && serverSlot >= EQ::invbag::TRADE_BAGS_BEGIN) { UFSlot = serverSlot; } - else if (serverSlot <= EQEmu::invslot::WORLD_END && serverSlot >= EQEmu::invslot::WORLD_BEGIN) { + else if (serverSlot <= EQ::invslot::WORLD_END && serverSlot >= EQ::invslot::WORLD_BEGIN) { UFSlot = serverSlot; } @@ -4223,11 +4223,11 @@ namespace UF { uint32 UFSlot = invslot::SLOT_INVALID; - if (serverCorpseSlot <= EQEmu::invslot::slotGeneral8 && serverCorpseSlot >= EQEmu::invslot::slotGeneral1) { + if (serverCorpseSlot <= EQ::invslot::slotGeneral8 && serverCorpseSlot >= EQ::invslot::slotGeneral1) { UFSlot = serverCorpseSlot; } - else if (serverCorpseSlot <= EQEmu::invslot::CORPSE_END && serverCorpseSlot >= EQEmu::invslot::slotCursor) { + else if (serverCorpseSlot <= EQ::invslot::CORPSE_END && serverCorpseSlot >= EQ::invslot::slotCursor) { UFSlot = serverCorpseSlot - 2; } @@ -4238,7 +4238,7 @@ namespace UF static inline uint32 UFToServerSlot(uint32 ufSlot) { - uint32 ServerSlot = EQEmu::invslot::SLOT_INVALID; + uint32 ServerSlot = EQ::invslot::SLOT_INVALID; if (ufSlot <= invslot::slotGeneral8) { ServerSlot = ufSlot; @@ -4303,7 +4303,7 @@ namespace UF static inline uint32 UFToServerCorpseSlot(uint32 ufCorpseSlot) { - uint32 ServerSlot = EQEmu::invslot::SLOT_INVALID; + uint32 ServerSlot = EQ::invslot::SLOT_INVALID; if (ufCorpseSlot <= invslot::slotGeneral8 && ufCorpseSlot >= invslot::slotGeneral1) { ServerSlot = ufCorpseSlot; @@ -4320,7 +4320,7 @@ namespace UF static inline void ServerToUFSayLink(std::string& ufSayLink, const std::string& serverSayLink) { - if ((constants::SAY_LINK_BODY_SIZE == EQEmu::constants::SAY_LINK_BODY_SIZE) || (serverSayLink.find('\x12') == std::string::npos)) { + if ((constants::SAY_LINK_BODY_SIZE == EQ::constants::SAY_LINK_BODY_SIZE) || (serverSayLink.find('\x12') == std::string::npos)) { ufSayLink = serverSayLink; return; } @@ -4329,7 +4329,7 @@ namespace UF for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { - if (segments[segment_iter].length() <= EQEmu::constants::SAY_LINK_BODY_SIZE) { + if (segments[segment_iter].length() <= EQ::constants::SAY_LINK_BODY_SIZE) { ufSayLink.append(segments[segment_iter]); // TODO: log size mismatch error continue; @@ -4360,7 +4360,7 @@ namespace UF static inline void UFToServerSayLink(std::string& serverSayLink, const std::string& ufSayLink) { - if ((EQEmu::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (ufSayLink.find('\x12') == std::string::npos)) { + if ((EQ::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (ufSayLink.find('\x12') == std::string::npos)) { serverSayLink = ufSayLink; return; } @@ -4394,92 +4394,92 @@ namespace UF } } - static inline spells::CastingSlot ServerToUFCastingSlot(EQEmu::spells::CastingSlot slot) + static inline spells::CastingSlot ServerToUFCastingSlot(EQ::spells::CastingSlot slot) { switch (slot) { - case EQEmu::spells::CastingSlot::Gem1: + case EQ::spells::CastingSlot::Gem1: return spells::CastingSlot::Gem1; - case EQEmu::spells::CastingSlot::Gem2: + case EQ::spells::CastingSlot::Gem2: return spells::CastingSlot::Gem2; - case EQEmu::spells::CastingSlot::Gem3: + case EQ::spells::CastingSlot::Gem3: return spells::CastingSlot::Gem3; - case EQEmu::spells::CastingSlot::Gem4: + case EQ::spells::CastingSlot::Gem4: return spells::CastingSlot::Gem4; - case EQEmu::spells::CastingSlot::Gem5: + case EQ::spells::CastingSlot::Gem5: return spells::CastingSlot::Gem5; - case EQEmu::spells::CastingSlot::Gem6: + case EQ::spells::CastingSlot::Gem6: return spells::CastingSlot::Gem6; - case EQEmu::spells::CastingSlot::Gem7: + case EQ::spells::CastingSlot::Gem7: return spells::CastingSlot::Gem7; - case EQEmu::spells::CastingSlot::Gem8: + case EQ::spells::CastingSlot::Gem8: return spells::CastingSlot::Gem8; - case EQEmu::spells::CastingSlot::Gem9: + case EQ::spells::CastingSlot::Gem9: return spells::CastingSlot::Gem9; - case EQEmu::spells::CastingSlot::Gem10: + case EQ::spells::CastingSlot::Gem10: return spells::CastingSlot::Gem10; - case EQEmu::spells::CastingSlot::Gem11: + case EQ::spells::CastingSlot::Gem11: return spells::CastingSlot::Gem11; - case EQEmu::spells::CastingSlot::Gem12: + case EQ::spells::CastingSlot::Gem12: return spells::CastingSlot::Gem12; - case EQEmu::spells::CastingSlot::Item: - case EQEmu::spells::CastingSlot::PotionBelt: + case EQ::spells::CastingSlot::Item: + case EQ::spells::CastingSlot::PotionBelt: return spells::CastingSlot::Item; - case EQEmu::spells::CastingSlot::Discipline: + case EQ::spells::CastingSlot::Discipline: return spells::CastingSlot::Discipline; - case EQEmu::spells::CastingSlot::AltAbility: + case EQ::spells::CastingSlot::AltAbility: return spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something return spells::CastingSlot::Discipline; } } - static inline EQEmu::spells::CastingSlot UFToServerCastingSlot(spells::CastingSlot slot) + static inline EQ::spells::CastingSlot UFToServerCastingSlot(spells::CastingSlot slot) { switch (slot) { case spells::CastingSlot::Gem1: - return EQEmu::spells::CastingSlot::Gem1; + return EQ::spells::CastingSlot::Gem1; case spells::CastingSlot::Gem2: - return EQEmu::spells::CastingSlot::Gem2; + return EQ::spells::CastingSlot::Gem2; case spells::CastingSlot::Gem3: - return EQEmu::spells::CastingSlot::Gem3; + return EQ::spells::CastingSlot::Gem3; case spells::CastingSlot::Gem4: - return EQEmu::spells::CastingSlot::Gem4; + return EQ::spells::CastingSlot::Gem4; case spells::CastingSlot::Gem5: - return EQEmu::spells::CastingSlot::Gem5; + return EQ::spells::CastingSlot::Gem5; case spells::CastingSlot::Gem6: - return EQEmu::spells::CastingSlot::Gem6; + return EQ::spells::CastingSlot::Gem6; case spells::CastingSlot::Gem7: - return EQEmu::spells::CastingSlot::Gem7; + return EQ::spells::CastingSlot::Gem7; case spells::CastingSlot::Gem8: - return EQEmu::spells::CastingSlot::Gem8; + return EQ::spells::CastingSlot::Gem8; case spells::CastingSlot::Gem9: - return EQEmu::spells::CastingSlot::Gem9; + return EQ::spells::CastingSlot::Gem9; case spells::CastingSlot::Gem10: - return EQEmu::spells::CastingSlot::Gem10; + return EQ::spells::CastingSlot::Gem10; case spells::CastingSlot::Gem11: - return EQEmu::spells::CastingSlot::Gem11; + return EQ::spells::CastingSlot::Gem11; case spells::CastingSlot::Gem12: - return EQEmu::spells::CastingSlot::Gem12; + return EQ::spells::CastingSlot::Gem12; case spells::CastingSlot::Discipline: - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; case spells::CastingSlot::Item: - return EQEmu::spells::CastingSlot::Item; + return EQ::spells::CastingSlot::Item; case spells::CastingSlot::AltAbility: - return EQEmu::spells::CastingSlot::AltAbility; + return EQ::spells::CastingSlot::AltAbility; default: // we shouldn't have any issues with other slots ... just return something - return EQEmu::spells::CastingSlot::Discipline; + return EQ::spells::CastingSlot::Discipline; } } static inline int ServerToUFBuffSlot(int index) { // we're a disc - if (index >= EQEmu::spells::LONG_BUFFS + EQEmu::spells::SHORT_BUFFS) - return index - EQEmu::spells::LONG_BUFFS - EQEmu::spells::SHORT_BUFFS + + if (index >= EQ::spells::LONG_BUFFS + EQ::spells::SHORT_BUFFS) + return index - EQ::spells::LONG_BUFFS - EQ::spells::SHORT_BUFFS + spells::LONG_BUFFS + spells::SHORT_BUFFS; // we're a song - if (index >= EQEmu::spells::LONG_BUFFS) - return index - EQEmu::spells::LONG_BUFFS + spells::LONG_BUFFS; + if (index >= EQ::spells::LONG_BUFFS) + return index - EQ::spells::LONG_BUFFS + spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } @@ -4488,11 +4488,11 @@ namespace UF { // we're a disc if (index >= spells::LONG_BUFFS + spells::SHORT_BUFFS) - return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQEmu::spells::LONG_BUFFS + - EQEmu::spells::SHORT_BUFFS; + return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQ::spells::LONG_BUFFS + + EQ::spells::SHORT_BUFFS; // we're a song if (index >= spells::LONG_BUFFS) - return index - spells::LONG_BUFFS + EQEmu::spells::LONG_BUFFS; + return index - spells::LONG_BUFFS + EQ::spells::LONG_BUFFS; // we're a normal buff return index; // as long as we guard against bad slots server side, we should be fine } diff --git a/common/patches/uf.h b/common/patches/uf.h index c36d9e851..465f32e74 100644 --- a/common/patches/uf.h +++ b/common/patches/uf.h @@ -43,7 +43,7 @@ namespace UF protected: virtual std::string Describe() const; - virtual const EQEmu::versions::ClientVersion ClientVersion() const; + virtual const EQ::versions::ClientVersion ClientVersion() const; //magic macro to declare our opcode processors #include "ss_declare.h" diff --git a/common/patches/uf_limits.h b/common/patches/uf_limits.h index 429d57cd5..978699ed2 100644 --- a/common/patches/uf_limits.h +++ b/common/patches/uf_limits.h @@ -31,7 +31,7 @@ namespace UF const int16 INULL = 0; namespace inventory { - inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::UF; } const bool ConcatenateInvTypeLimbo = true; @@ -43,7 +43,7 @@ namespace UF } /*inventory*/ namespace invtype { - inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::UF; } namespace enum_ { enum InventoryTypes : int16 { @@ -106,7 +106,7 @@ namespace UF } /*invtype*/ namespace invslot { - inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::UF; } namespace enum_ { enum InventorySlots : int16 { @@ -205,7 +205,7 @@ namespace UF } /*invslot*/ namespace invbag { - inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::UF; } const int16 SLOT_INVALID = IINVALID; const int16 SLOT_BEGIN = INULL; @@ -237,7 +237,7 @@ namespace UF } /*invbag*/ namespace invaug { - inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::UF; } const int16 SOCKET_INVALID = IINVALID; const int16 SOCKET_BEGIN = INULL; @@ -249,7 +249,7 @@ namespace UF } /*invaug*/ namespace item { - inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::UF; } enum ItemPacketType : int { ItemPacketMerchant = 100, @@ -268,7 +268,7 @@ namespace UF } /*item*/ namespace profile { - inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::UF; } const int16 BANDOLIERS_SIZE = 20; // number of bandolier instances const int16 BANDOLIER_ITEM_COUNT = 4; // number of equipment slots in bandolier instance @@ -280,11 +280,11 @@ namespace UF } /*profile*/ namespace constants { - inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::UF; } - const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::UF; - const uint32 EXPANSION_BIT = EQEmu::expansions::bitUF; - const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskUF; + const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::UF; + const uint32 EXPANSION_BIT = EQ::expansions::bitUF; + const uint32 EXPANSIONS_MASK = EQ::expansions::maskUF; const size_t CHARACTER_CREATION_LIMIT = 12; @@ -293,21 +293,21 @@ namespace UF } /*constants*/ namespace behavior { - inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::UF; } const bool CoinHasWeight = false; } /*behavior*/ namespace skills { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::UF; } - const size_t LastUsableSkill = EQEmu::skills::SkillTripleAttack; + const size_t LastUsableSkill = EQ::skills::SkillTripleAttack; } /*skills*/ namespace spells { - inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::UF; } + inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::UF; } enum class CastingSlot : uint32 { Gem1 = 0, diff --git a/common/patches/uf_structs.h b/common/patches/uf_structs.h index 3a66e2a88..a87ab7a07 100644 --- a/common/patches/uf_structs.h +++ b/common/patches/uf_structs.h @@ -149,7 +149,7 @@ struct TintProfile Tint_Struct Primary; Tint_Struct Secondary; }; - Tint_Struct Slot[EQEmu::textures::materialCount]; + Tint_Struct Slot[EQ::textures::materialCount]; }; }; @@ -178,7 +178,7 @@ struct TextureProfile Texture_Struct Primary; Texture_Struct Secondary; }; - Texture_Struct Slot[EQEmu::textures::materialCount]; + Texture_Struct Slot[EQ::textures::materialCount]; }; TextureProfile(); @@ -195,7 +195,7 @@ struct CharacterSelectEntry_Struct /*0000*/ uint8 Beard; // /*0001*/ uint8 HairColor; // /*0000*/ uint8 Face; // -/*0000*/ CharSelectEquip Equip[EQEmu::textures::materialCount]; +/*0000*/ CharSelectEquip Equip[EQ::textures::materialCount]; /*0000*/ uint32 PrimaryIDFile; // /*0000*/ uint32 SecondaryIDFile; // /*0000*/ uint8 Unknown15; // 0xff diff --git a/common/profanity_manager.cpp b/common/profanity_manager.cpp index 70817576f..005fc4909 100644 --- a/common/profanity_manager.cpp +++ b/common/profanity_manager.cpp @@ -28,7 +28,7 @@ static std::list profanity_list; static bool update_originator_flag = false; -bool EQEmu::ProfanityManager::LoadProfanityList(DBcore *db) { +bool EQ::ProfanityManager::LoadProfanityList(DBcore *db) { if (update_originator_flag == true) { update_originator_flag = false; return true; @@ -40,7 +40,7 @@ bool EQEmu::ProfanityManager::LoadProfanityList(DBcore *db) { return true; } -bool EQEmu::ProfanityManager::UpdateProfanityList(DBcore *db) { +bool EQ::ProfanityManager::UpdateProfanityList(DBcore *db) { if (!load_database_entries(db)) return false; @@ -49,7 +49,7 @@ bool EQEmu::ProfanityManager::UpdateProfanityList(DBcore *db) { return true; } -bool EQEmu::ProfanityManager::DeleteProfanityList(DBcore *db) { +bool EQ::ProfanityManager::DeleteProfanityList(DBcore *db) { if (!clear_database_entries(db)) return false; @@ -58,7 +58,7 @@ bool EQEmu::ProfanityManager::DeleteProfanityList(DBcore *db) { return true; } -bool EQEmu::ProfanityManager::AddProfanity(DBcore *db, const char *profanity) { +bool EQ::ProfanityManager::AddProfanity(DBcore *db, const char *profanity) { if (!db || !profanity) return false; @@ -86,7 +86,7 @@ bool EQEmu::ProfanityManager::AddProfanity(DBcore *db, const char *profanity) { return true; } -bool EQEmu::ProfanityManager::RemoveProfanity(DBcore *db, const char *profanity) { +bool EQ::ProfanityManager::RemoveProfanity(DBcore *db, const char *profanity) { if (!db || !profanity) return false; @@ -111,7 +111,7 @@ bool EQEmu::ProfanityManager::RemoveProfanity(DBcore *db, const char *profanity) return true; } -void EQEmu::ProfanityManager::RedactMessage(char *message) { +void EQ::ProfanityManager::RedactMessage(char *message) { if (!message) return; @@ -142,7 +142,7 @@ void EQEmu::ProfanityManager::RedactMessage(char *message) { } } -void EQEmu::ProfanityManager::RedactMessage(std::string &message) { +void EQ::ProfanityManager::RedactMessage(std::string &message) { if (message.length() < REDACTION_LENGTH_MIN || message.length() >= 4096) return; @@ -169,14 +169,14 @@ void EQEmu::ProfanityManager::RedactMessage(std::string &message) { } } -bool EQEmu::ProfanityManager::ContainsCensoredLanguage(const char *message) { +bool EQ::ProfanityManager::ContainsCensoredLanguage(const char *message) { if (!message) return false; return ContainsCensoredLanguage(std::string(message)); } -bool EQEmu::ProfanityManager::ContainsCensoredLanguage(const std::string &message) { +bool EQ::ProfanityManager::ContainsCensoredLanguage(const std::string &message) { if (message.length() < REDACTION_LENGTH_MIN || message.length() >= 4096) return false; @@ -192,15 +192,15 @@ bool EQEmu::ProfanityManager::ContainsCensoredLanguage(const std::string &messag return false; } -const std::list &EQEmu::ProfanityManager::GetProfanityList() { +const std::list &EQ::ProfanityManager::GetProfanityList() { return profanity_list; } -bool EQEmu::ProfanityManager::IsCensorshipActive() { +bool EQ::ProfanityManager::IsCensorshipActive() { return (profanity_list.size() != 0); } -bool EQEmu::ProfanityManager::load_database_entries(DBcore *db) { +bool EQ::ProfanityManager::load_database_entries(DBcore *db) { if (!db) return false; @@ -223,7 +223,7 @@ bool EQEmu::ProfanityManager::load_database_entries(DBcore *db) { return true; } -bool EQEmu::ProfanityManager::clear_database_entries(DBcore *db) { +bool EQ::ProfanityManager::clear_database_entries(DBcore *db) { if (!db) return false; @@ -237,7 +237,7 @@ bool EQEmu::ProfanityManager::clear_database_entries(DBcore *db) { return true; } -bool EQEmu::ProfanityManager::check_for_existing_entry(const char *profanity) { +bool EQ::ProfanityManager::check_for_existing_entry(const char *profanity) { if (!profanity) return false; diff --git a/common/profanity_manager.h b/common/profanity_manager.h index fa601f0f0..a1ad93a86 100644 --- a/common/profanity_manager.h +++ b/common/profanity_manager.h @@ -26,7 +26,7 @@ class DBcore; -namespace EQEmu +namespace EQ { class ProfanityManager { public: diff --git a/common/random.h b/common/random.h index 0c877bfea..203755efd 100644 --- a/common/random.h +++ b/common/random.h @@ -32,7 +32,7 @@ * Eventually this should be derived from an abstract base class */ -namespace EQEmu { +namespace EQ { class Random { public: // AKA old MakeRandomInt @@ -80,7 +80,7 @@ namespace EQEmu { { static_assert(std::is_same::iterator_category>::value, - "EQEmu::Random::Shuffle requires random access iterators"); + "EQ::Random::Shuffle requires random access iterators"); std::shuffle(first, last, m_gen); } diff --git a/common/say_link.cpp b/common/say_link.cpp index f4937fe88..5fb847294 100644 --- a/common/say_link.cpp +++ b/common/say_link.cpp @@ -26,10 +26,10 @@ #include "../zone/zonedb.h" -bool EQEmu::saylink::DegenerateLinkBody(SayLinkBody_Struct &say_link_body_struct, const std::string &say_link_body) +bool EQ::saylink::DegenerateLinkBody(SayLinkBody_Struct &say_link_body_struct, const std::string &say_link_body) { memset(&say_link_body_struct, 0, sizeof(say_link_body_struct)); - if (say_link_body.length() != EQEmu::constants::SAY_LINK_BODY_SIZE) { + if (say_link_body.length() != EQ::constants::SAY_LINK_BODY_SIZE) { return false; } @@ -50,7 +50,7 @@ bool EQEmu::saylink::DegenerateLinkBody(SayLinkBody_Struct &say_link_body_struct return true; } -bool EQEmu::saylink::GenerateLinkBody(std::string &say_link_body, const SayLinkBody_Struct &say_link_body_struct) +bool EQ::saylink::GenerateLinkBody(std::string &say_link_body, const SayLinkBody_Struct &say_link_body_struct) { say_link_body = StringFormat( "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%02X" "%05X" "%08X", @@ -69,19 +69,19 @@ bool EQEmu::saylink::GenerateLinkBody(std::string &say_link_body, const SayLinkB (0xFFFFFFFF & say_link_body_struct.hash) ); - if (say_link_body.length() != EQEmu::constants::SAY_LINK_BODY_SIZE) { + if (say_link_body.length() != EQ::constants::SAY_LINK_BODY_SIZE) { return false; } return true; } -EQEmu::SayLinkEngine::SayLinkEngine() +EQ::SayLinkEngine::SayLinkEngine() { Reset(); } -const std::string &EQEmu::SayLinkEngine::GenerateLink() +const std::string &EQ::SayLinkEngine::GenerateLink() { m_Link.clear(); m_LinkBody.clear(); @@ -90,25 +90,25 @@ const std::string &EQEmu::SayLinkEngine::GenerateLink() generate_body(); generate_text(); - if ((m_LinkBody.length() == EQEmu::constants::SAY_LINK_BODY_SIZE) && (m_LinkText.length() > 0)) { + if ((m_LinkBody.length() == EQ::constants::SAY_LINK_BODY_SIZE) && (m_LinkText.length() > 0)) { m_Link.push_back(0x12); m_Link.append(m_LinkBody); m_Link.append(m_LinkText); m_Link.push_back(0x12); } - if ((m_Link.length() == 0) || (m_Link.length() > (EQEmu::constants::SAY_LINK_MAXIMUM_SIZE))) { + if ((m_Link.length() == 0) || (m_Link.length() > (EQ::constants::SAY_LINK_MAXIMUM_SIZE))) { m_Error = true; m_Link = ""; LogError("SayLinkEngine::GenerateLink() failed to generate a useable say link"); LogError(">> LinkType: {}, Lengths: {link: {}({}), body: {}({}), text: {}({})}", m_LinkType, m_Link.length(), - EQEmu::constants::SAY_LINK_MAXIMUM_SIZE, + EQ::constants::SAY_LINK_MAXIMUM_SIZE, m_LinkBody.length(), - EQEmu::constants::SAY_LINK_BODY_SIZE, + EQ::constants::SAY_LINK_BODY_SIZE, m_LinkText.length(), - EQEmu::constants::SAY_LINK_TEXT_SIZE + EQ::constants::SAY_LINK_TEXT_SIZE ); LogError(">> LinkBody: {}", m_LinkBody.c_str()); LogError(">> LinkText: {}", m_LinkText.c_str()); @@ -117,7 +117,7 @@ const std::string &EQEmu::SayLinkEngine::GenerateLink() return m_Link; } -void EQEmu::SayLinkEngine::Reset() +void EQ::SayLinkEngine::Reset() { m_LinkType = saylink::SayLinkBlank; m_ItemData = nullptr; @@ -134,7 +134,7 @@ void EQEmu::SayLinkEngine::Reset() m_Error = false; } -void EQEmu::SayLinkEngine::generate_body() +void EQ::SayLinkEngine::generate_body() { /* Current server mask: EQClientRoF2 @@ -147,7 +147,7 @@ void EQEmu::SayLinkEngine::generate_body() memset(&m_LinkBodyStruct, 0, sizeof(SayLinkBody_Struct)); - const EQEmu::ItemData *item_data = nullptr; + const EQ::ItemData *item_data = nullptr; switch (m_LinkType) { case saylink::SayLinkBlank: @@ -257,14 +257,14 @@ void EQEmu::SayLinkEngine::generate_body() ); } -void EQEmu::SayLinkEngine::generate_text() +void EQ::SayLinkEngine::generate_text() { if (m_LinkProxyStruct.text != nullptr) { m_LinkText = m_LinkProxyStruct.text; return; } - const EQEmu::ItemData *item_data = nullptr; + const EQ::ItemData *item_data = nullptr; switch (m_LinkType) { case saylink::SayLinkBlank: @@ -291,7 +291,7 @@ void EQEmu::SayLinkEngine::generate_text() m_LinkText = "null"; } -std::string EQEmu::SayLinkEngine::GenerateQuestSaylink(std::string saylink_text, bool silent, std::string link_name) +std::string EQ::SayLinkEngine::GenerateQuestSaylink(std::string saylink_text, bool silent, std::string link_name) { uint32 saylink_id = 0; @@ -327,7 +327,7 @@ std::string EQEmu::SayLinkEngine::GenerateQuestSaylink(std::string saylink_text, /** * Generate the actual link */ - EQEmu::SayLinkEngine linker; + EQ::SayLinkEngine linker; linker.SetProxyItemID(SAYLINK_ITEM_ID); if (silent) { linker.SetProxyAugment2ID(saylink_id); diff --git a/common/say_link.h b/common/say_link.h index c282bde05..c0ea5a235 100644 --- a/common/say_link.h +++ b/common/say_link.h @@ -27,7 +27,7 @@ struct ServerLootItem_Struct; -namespace EQEmu +namespace EQ { struct ItemData; class ItemInstance; @@ -72,7 +72,7 @@ namespace EQEmu SayLinkEngine(); void SetLinkType(saylink::SayLinkType link_type) { m_LinkType = link_type; } - void SetItemData(const EQEmu::ItemData* item_data) { m_ItemData = item_data; } + void SetItemData(const EQ::ItemData* item_data) { m_ItemData = item_data; } void SetLootData(const ServerLootItem_Struct* loot_data) { m_LootData = loot_data; } void SetItemInst(const ItemInstance* item_inst) { m_ItemInst = item_inst; } diff --git a/common/shareddb.cpp b/common/shareddb.cpp index 6c327b188..789b739a8 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -164,14 +164,14 @@ std::string SharedDatabase::GetMailKey(int CharID, bool key_only) } } -bool SharedDatabase::SaveCursor(uint32 char_id, std::list::const_iterator &start, std::list::const_iterator &end) +bool SharedDatabase::SaveCursor(uint32 char_id, std::list::const_iterator &start, std::list::const_iterator &end) { // Delete cursor items std::string query = StringFormat("DELETE FROM inventory WHERE charid = %i " "AND ((slotid >= 8000 AND slotid <= 8999) " "OR slotid = %i OR (slotid >= %i AND slotid <= %i) )", - char_id, EQEmu::invslot::slotCursor, - EQEmu::invbag::CURSOR_BAG_BEGIN, EQEmu::invbag::CURSOR_BAG_END); + char_id, EQ::invslot::slotCursor, + EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END); auto results = QueryDatabase(query); if (!results.Success()) { std::cout << "Clearing cursor failed: " << results.ErrorMessage() << std::endl; @@ -181,8 +181,8 @@ bool SharedDatabase::SaveCursor(uint32 char_id, std::list: int i = 8000; for(auto it = start; it != end; ++it, i++) { if (i > 8999) { break; } // shouldn't be anything in the queue that indexes this high - EQEmu::ItemInstance *inst = *it; - int16 use_slot = (i == 8000) ? EQEmu::invslot::slotCursor : i; + EQ::ItemInstance *inst = *it; + int16 use_slot = (i == 8000) ? EQ::invslot::slotCursor : i; if (!SaveInventory(char_id, inst, use_slot)) { return false; } @@ -191,7 +191,7 @@ bool SharedDatabase::SaveCursor(uint32 char_id, std::list: return true; } -bool SharedDatabase::VerifyInventory(uint32 account_id, int16 slot_id, const EQEmu::ItemInstance* inst) +bool SharedDatabase::VerifyInventory(uint32 account_id, int16 slot_id, const EQ::ItemInstance* inst) { // Delete cursor items std::string query = StringFormat("SELECT itemid, charges FROM sharedbank " @@ -224,15 +224,15 @@ bool SharedDatabase::VerifyInventory(uint32 account_id, int16 slot_id, const EQE return true; } -bool SharedDatabase::SaveInventory(uint32 char_id, const EQEmu::ItemInstance* inst, int16 slot_id) { +bool SharedDatabase::SaveInventory(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id) { //never save tribute slots: - if (slot_id >= EQEmu::invslot::TRIBUTE_BEGIN && slot_id <= EQEmu::invslot::TRIBUTE_END) + if (slot_id >= EQ::invslot::TRIBUTE_BEGIN && slot_id <= EQ::invslot::TRIBUTE_END) return true; - if (slot_id >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN && slot_id <= EQEmu::invslot::GUILD_TRIBUTE_END) + if (slot_id >= EQ::invslot::GUILD_TRIBUTE_BEGIN && slot_id <= EQ::invslot::GUILD_TRIBUTE_END) return true; - if (slot_id >= EQEmu::invslot::SHARED_BANK_BEGIN && slot_id <= EQEmu::invbag::SHARED_BANK_BAGS_END) { + if (slot_id >= EQ::invslot::SHARED_BANK_BEGIN && slot_id <= EQ::invbag::SHARED_BANK_BAGS_END) { // Shared bank inventory if (!inst) { return DeleteSharedBankSlot(char_id, slot_id); @@ -240,7 +240,7 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const EQEmu::ItemInstance* in else { // Needed to clear out bag slots that 'REPLACE' in UpdateSharedBankSlot does not overwrite..otherwise, duplication occurs // (This requires that parent then child items be sent..which should be how they are currently passed) - if (EQEmu::InventoryProfile::SupportsContainers(slot_id)) + if (EQ::InventoryProfile::SupportsContainers(slot_id)) DeleteSharedBankSlot(char_id, slot_id); return UpdateSharedBankSlot(char_id, inst, slot_id); } @@ -251,18 +251,18 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const EQEmu::ItemInstance* in // Needed to clear out bag slots that 'REPLACE' in UpdateInventorySlot does not overwrite..otherwise, duplication occurs // (This requires that parent then child items be sent..which should be how they are currently passed) - if (EQEmu::InventoryProfile::SupportsContainers(slot_id)) + if (EQ::InventoryProfile::SupportsContainers(slot_id)) DeleteInventorySlot(char_id, slot_id); return UpdateInventorySlot(char_id, inst, slot_id); } -bool SharedDatabase::UpdateInventorySlot(uint32 char_id, const EQEmu::ItemInstance* inst, int16 slot_id) { +bool SharedDatabase::UpdateInventorySlot(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id) { // need to check 'inst' argument for valid pointer - uint32 augslot[EQEmu::invaug::SOCKET_COUNT] = { 0, 0, 0, 0, 0, 0 }; + uint32 augslot[EQ::invaug::SOCKET_COUNT] = { 0, 0, 0, 0, 0, 0 }; if (inst->IsClassCommon()) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { - EQEmu::ItemInstance *auginst = inst->GetItem(i); + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { + EQ::ItemInstance *auginst = inst->GetItem(i); augslot[i] = (auginst && auginst->GetItem()) ? auginst->GetItem()->ID : 0; } } @@ -288,12 +288,12 @@ bool SharedDatabase::UpdateInventorySlot(uint32 char_id, const EQEmu::ItemInstan auto results = QueryDatabase(query); // Save bag contents, if slot supports bag contents - if (inst->IsClassBag() && EQEmu::InventoryProfile::SupportsContainers(slot_id)) + if (inst->IsClassBag() && EQ::InventoryProfile::SupportsContainers(slot_id)) // Limiting to bag slot count will get rid of 'hidden' duplicated items and 'Invalid Slot ID' // messages through attrition (and the modded code in SaveInventory) - for (uint8 idx = EQEmu::invbag::SLOT_BEGIN; idx < inst->GetItem()->BagSlots && idx <= EQEmu::invbag::SLOT_END; idx++) { - const EQEmu::ItemInstance* baginst = inst->GetItem(idx); - SaveInventory(char_id, baginst, EQEmu::InventoryProfile::CalcSlotId(slot_id, idx)); + for (uint8 idx = EQ::invbag::SLOT_BEGIN; idx < inst->GetItem()->BagSlots && idx <= EQ::invbag::SLOT_END; idx++) { + const EQ::ItemInstance* baginst = inst->GetItem(idx); + SaveInventory(char_id, baginst, EQ::InventoryProfile::CalcSlotId(slot_id, idx)); } if (!results.Success()) { @@ -303,13 +303,13 @@ bool SharedDatabase::UpdateInventorySlot(uint32 char_id, const EQEmu::ItemInstan return true; } -bool SharedDatabase::UpdateSharedBankSlot(uint32 char_id, const EQEmu::ItemInstance* inst, int16 slot_id) { +bool SharedDatabase::UpdateSharedBankSlot(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id) { // need to check 'inst' argument for valid pointer - uint32 augslot[EQEmu::invaug::SOCKET_COUNT] = { 0, 0, 0, 0, 0, 0 }; + uint32 augslot[EQ::invaug::SOCKET_COUNT] = { 0, 0, 0, 0, 0, 0 }; if (inst->IsClassCommon()) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { - EQEmu::ItemInstance *auginst = inst->GetItem(i); + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { + EQ::ItemInstance *auginst = inst->GetItem(i); augslot[i] = (auginst && auginst->GetItem()) ? auginst->GetItem()->ID : 0; } } @@ -334,12 +334,12 @@ bool SharedDatabase::UpdateSharedBankSlot(uint32 char_id, const EQEmu::ItemInsta auto results = QueryDatabase(query); // Save bag contents, if slot supports bag contents - if (inst->IsClassBag() && EQEmu::InventoryProfile::SupportsContainers(slot_id)) { + if (inst->IsClassBag() && EQ::InventoryProfile::SupportsContainers(slot_id)) { // Limiting to bag slot count will get rid of 'hidden' duplicated items and 'Invalid Slot ID' // messages through attrition (and the modded code in SaveInventory) - for (uint8 idx = EQEmu::invbag::SLOT_BEGIN; idx < inst->GetItem()->BagSlots && idx <= EQEmu::invbag::SLOT_END; idx++) { - const EQEmu::ItemInstance* baginst = inst->GetItem(idx); - SaveInventory(char_id, baginst, EQEmu::InventoryProfile::CalcSlotId(slot_id, idx)); + for (uint8 idx = EQ::invbag::SLOT_BEGIN; idx < inst->GetItem()->BagSlots && idx <= EQ::invbag::SLOT_END; idx++) { + const EQ::ItemInstance* baginst = inst->GetItem(idx); + SaveInventory(char_id, baginst, EQ::InventoryProfile::CalcSlotId(slot_id, idx)); } } @@ -360,10 +360,10 @@ bool SharedDatabase::DeleteInventorySlot(uint32 char_id, int16 slot_id) { } // Delete bag slots, if need be - if (!EQEmu::InventoryProfile::SupportsContainers(slot_id)) + if (!EQ::InventoryProfile::SupportsContainers(slot_id)) return true; - int16 base_slot_id = EQEmu::InventoryProfile::CalcSlotId(slot_id, EQEmu::invbag::SLOT_BEGIN); + int16 base_slot_id = EQ::InventoryProfile::CalcSlotId(slot_id, EQ::invbag::SLOT_BEGIN); query = StringFormat("DELETE FROM inventory WHERE charid = %i AND slotid >= %i AND slotid < %i", char_id, base_slot_id, (base_slot_id+10)); results = QueryDatabase(query); @@ -386,10 +386,10 @@ bool SharedDatabase::DeleteSharedBankSlot(uint32 char_id, int16 slot_id) { } // Delete bag slots, if need be - if (!EQEmu::InventoryProfile::SupportsContainers(slot_id)) + if (!EQ::InventoryProfile::SupportsContainers(slot_id)) return true; - int16 base_slot_id = EQEmu::InventoryProfile::CalcSlotId(slot_id, EQEmu::invbag::SLOT_BEGIN); + int16 base_slot_id = EQ::InventoryProfile::CalcSlotId(slot_id, EQ::invbag::SLOT_BEGIN); query = StringFormat("DELETE FROM sharedbank WHERE acctid = %i " "AND slotid >= %i AND slotid < %i", account_id, base_slot_id, (base_slot_id+10)); @@ -429,9 +429,9 @@ bool SharedDatabase::SetSharedPlatinum(uint32 account_id, int32 amount_to_add) { return true; } -bool SharedDatabase::SetStartingItems(PlayerProfile_Struct* pp, EQEmu::InventoryProfile* inv, uint32 si_race, uint32 si_class, uint32 si_deity, uint32 si_current_zone, char* si_name, int admin_level) { +bool SharedDatabase::SetStartingItems(PlayerProfile_Struct* pp, EQ::InventoryProfile* inv, uint32 si_race, uint32 si_class, uint32 si_deity, uint32 si_current_zone, char* si_name, int admin_level) { - const EQEmu::ItemData* myitem; + const EQ::ItemData* myitem; std::string query = StringFormat("SELECT itemid, item_charges, slot FROM starting_items " "WHERE (race = %i or race = 0) AND (class = %i or class = 0) AND " @@ -452,7 +452,7 @@ bool SharedDatabase::SetStartingItems(PlayerProfile_Struct* pp, EQEmu::Inventory if(!myitem) continue; - EQEmu::ItemInstance* myinst = CreateBaseItem(myitem, charges); + EQ::ItemInstance* myinst = CreateBaseItem(myitem, charges); if(slot < 0) slot = inv->FindFreeSlot(0, 0); @@ -466,7 +466,7 @@ bool SharedDatabase::SetStartingItems(PlayerProfile_Struct* pp, EQEmu::Inventory // Retrieve shared bank inventory based on either account or character -bool SharedDatabase::GetSharedBank(uint32 id, EQEmu::InventoryProfile *inv, bool is_charid) +bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is_charid) { std::string query; @@ -493,7 +493,7 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQEmu::InventoryProfile *inv, bool uint32 item_id = (uint32)atoi(row[1]); int8 charges = (int8)atoi(row[2]); - uint32 aug[EQEmu::invaug::SOCKET_COUNT]; + uint32 aug[EQ::invaug::SOCKET_COUNT]; aug[0] = (uint32)atoi(row[3]); aug[1] = (uint32)atoi(row[4]); aug[2] = (uint32)atoi(row[5]); @@ -501,7 +501,7 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQEmu::InventoryProfile *inv, bool aug[4] = (uint32)atoi(row[7]); aug[5] = (uint32)atoi(row[8]); - const EQEmu::ItemData *item = GetItem(item_id); + const EQ::ItemData *item = GetItem(item_id); if (!item) { LogError("Warning: [{}] [{}] has an invalid item_id [{}] in inventory slot [{}]", @@ -511,9 +511,9 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQEmu::InventoryProfile *inv, bool int16 put_slot_id = INVALID_INDEX; - EQEmu::ItemInstance *inst = CreateBaseItem(item, charges); + EQ::ItemInstance *inst = CreateBaseItem(item, charges); if (inst && item->IsClassCommon()) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { if (aug[i]) inst->PutAugment(this, i, aug[i]); } @@ -563,7 +563,7 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQEmu::InventoryProfile *inv, bool } // Overloaded: Retrieve character inventory based on character id (zone entry) -bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv) +bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv) { if (!char_id || !inv) return false; @@ -591,28 +591,28 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv) for (auto row = results.begin(); row != results.end(); ++row) { int16 slot_id = atoi(row[0]); - if (slot_id <= EQEmu::invslot::POSSESSIONS_END && slot_id >= EQEmu::invslot::POSSESSIONS_BEGIN) { // Titanium thru UF check + if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) { // Titanium thru UF check if ((((uint64)1 << slot_id) & pmask) == 0) { cv_conflict = true; continue; } } - else if (slot_id <= EQEmu::invbag::GENERAL_BAGS_END && slot_id >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { // Titanium thru UF check - auto parent_slot = EQEmu::invslot::GENERAL_BEGIN + ((slot_id - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); + else if (slot_id <= EQ::invbag::GENERAL_BAGS_END && slot_id >= EQ::invbag::GENERAL_BAGS_BEGIN) { // Titanium thru UF check + auto parent_slot = EQ::invslot::GENERAL_BEGIN + ((slot_id - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); if ((((uint64)1 << parent_slot) & pmask) == 0) { cv_conflict = true; continue; } } - else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) { // Titanium check - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= bank_size) { + else if (slot_id <= EQ::invslot::BANK_END && slot_id >= EQ::invslot::BANK_BEGIN) { // Titanium check + if ((slot_id - EQ::invslot::BANK_BEGIN) >= bank_size) { cv_conflict = true; continue; } } - else if (slot_id <= EQEmu::invbag::BANK_BAGS_END && slot_id >= EQEmu::invbag::BANK_BAGS_BEGIN) { // Titanium check - auto parent_index = ((slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); - if (parent_index < EQEmu::invslot::SLOT_BEGIN || parent_index >= bank_size) { + else if (slot_id <= EQ::invbag::BANK_BAGS_END && slot_id >= EQ::invbag::BANK_BAGS_BEGIN) { // Titanium check + auto parent_index = ((slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); + if (parent_index < EQ::invslot::SLOT_BEGIN || parent_index >= bank_size) { cv_conflict = true; continue; } @@ -622,7 +622,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv) uint16 charges = atoi(row[2]); uint32 color = atoul(row[3]); - uint32 aug[EQEmu::invaug::SOCKET_COUNT]; + uint32 aug[EQ::invaug::SOCKET_COUNT]; aug[0] = (uint32)atoul(row[4]); aug[1] = (uint32)atoul(row[5]); @@ -637,7 +637,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv) uint32 ornament_idfile = (uint32)atoul(row[13]); uint32 ornament_hero_model = (uint32)atoul(row[14]); - const EQEmu::ItemData *item = GetItem(item_id); + const EQ::ItemData *item = GetItem(item_id); if (!item) { LogError("Warning: charid [{}] has an invalid item_id [{}] in inventory slot [{}]", char_id, item_id, @@ -647,7 +647,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv) int16 put_slot_id = INVALID_INDEX; - EQEmu::ItemInstance *inst = CreateBaseItem(item, charges); + EQ::ItemInstance *inst = CreateBaseItem(item, charges); if (inst == nullptr) continue; @@ -682,7 +682,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv) inst->SetOrnamentationIDFile(ornament_idfile); inst->SetOrnamentHeroModel(item->HerosForgeModel); - if (instnodrop || (inst->GetItem()->Attuneable && slot_id >= EQEmu::invslot::EQUIPMENT_BEGIN && slot_id <= EQEmu::invslot::EQUIPMENT_END)) + if (instnodrop || (inst->GetItem()->Attuneable && slot_id >= EQ::invslot::EQUIPMENT_BEGIN && slot_id <= EQ::invslot::EQUIPMENT_END)) inst->SetAttuned(true); if (color > 0) @@ -703,7 +703,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv) } if (item->IsClassCommon()) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { if (aug[i]) inst->PutAugment(this, i, aug[i]); } @@ -735,7 +735,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv) LogError("ClientVersion/Expansion conflict during inventory load at zone entry for [{}] (charid: [{}], inver: [{}], gmi: [{}])", char_name, char_id, - EQEmu::versions::MobVersionName(inv->InventoryVersion()), + EQ::versions::MobVersionName(inv->InventoryVersion()), (inv->GMInventory() ? "true" : "false") ); } @@ -745,7 +745,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv) } // Overloaded: Retrieve character inventory based on account_id and character name (char select) -bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQEmu::InventoryProfile *inv) // deprecated +bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQ::InventoryProfile *inv) // deprecated { // Retrieve character inventory std::string query = @@ -769,7 +769,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQEmu::Inventor int8 charges = atoi(row[2]); uint32 color = atoul(row[3]); - uint32 aug[EQEmu::invaug::SOCKET_COUNT]; + uint32 aug[EQ::invaug::SOCKET_COUNT]; aug[0] = (uint32)atoi(row[4]); aug[1] = (uint32)atoi(row[5]); aug[2] = (uint32)atoi(row[6]); @@ -782,12 +782,12 @@ bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQEmu::Inventor uint32 ornament_idfile = (uint32)atoul(row[13]); uint32 ornament_hero_model = (uint32)atoul(row[14]); - const EQEmu::ItemData *item = GetItem(item_id); + const EQ::ItemData *item = GetItem(item_id); int16 put_slot_id = INVALID_INDEX; if (!item) continue; - EQEmu::ItemInstance *inst = CreateBaseItem(item, charges); + EQ::ItemInstance *inst = CreateBaseItem(item, charges); if (inst == nullptr) continue; @@ -830,7 +830,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQEmu::Inventor inst->SetCharges(charges); if (item->IsClassCommon()) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { if (aug[i]) inst->PutAugment(this, i, aug[i]); } @@ -914,11 +914,11 @@ bool SharedDatabase::LoadItems(const std::string &prefix) { try { auto Config = EQEmuConfig::get(); - EQEmu::IPCMutex mutex("items"); + EQ::IPCMutex mutex("items"); mutex.Lock(); std::string file_name = Config->SharedMemDir + prefix + std::string("items"); - items_mmf = std::unique_ptr(new EQEmu::MemoryMappedFile(file_name)); - items_hash = std::unique_ptr>(new EQEmu::FixedMemoryHashSet(reinterpret_cast(items_mmf->Get()), items_mmf->Size())); + items_mmf = std::unique_ptr(new EQ::MemoryMappedFile(file_name)); + items_hash = std::unique_ptr>(new EQ::FixedMemoryHashSet(reinterpret_cast(items_mmf->Get()), items_mmf->Size())); mutex.Unlock(); } catch(std::exception& ex) { LogError("Error Loading Items: {}", ex.what()); @@ -930,7 +930,7 @@ bool SharedDatabase::LoadItems(const std::string &prefix) { void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_item_id) { - EQEmu::FixedMemoryHashSet hash(reinterpret_cast(data), size, items, max_item_id); + EQ::FixedMemoryHashSet hash(reinterpret_cast(data), size, items, max_item_id); std::string ndbuffer; bool disableNoRent = false; @@ -958,7 +958,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ } } - EQEmu::ItemData item; + EQ::ItemData item; const std::string query = "SELECT source," #define F(x) "`"#x"`," @@ -971,7 +971,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ } for (auto row = results.begin(); row != results.end(); ++row) { - memset(&item, 0, sizeof(EQEmu::ItemData)); + memset(&item, 0, sizeof(EQ::ItemData)); item.ItemClass = (uint8)atoi(row[ItemField::itemclass]); strcpy(item.Name, row[ItemField::name]); @@ -1189,7 +1189,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ } } -const EQEmu::ItemData *SharedDatabase::GetItem(uint32 id) +const EQ::ItemData *SharedDatabase::GetItem(uint32 id) { if (id == 0) { return nullptr; @@ -1206,7 +1206,7 @@ const EQEmu::ItemData *SharedDatabase::GetItem(uint32 id) return nullptr; } -const EQEmu::ItemData* SharedDatabase::IterateItems(uint32* id) { +const EQ::ItemData* SharedDatabase::IterateItems(uint32* id) { if(!items_hash || !id) { return nullptr; } @@ -1284,7 +1284,7 @@ const NPCFactionList* SharedDatabase::GetNPCFactionEntry(uint32 id) { } void SharedDatabase::LoadNPCFactionLists(void *data, uint32 size, uint32 list_count, uint32 max_lists) { - EQEmu::FixedMemoryHashSet hash(reinterpret_cast(data), size, list_count, max_lists); + EQ::FixedMemoryHashSet hash(reinterpret_cast(data), size, list_count, max_lists); NPCFactionList faction; const std::string query = "SELECT npc_faction.id, npc_faction.primaryfaction, npc_faction.ignore_primary_assist, " @@ -1338,11 +1338,11 @@ bool SharedDatabase::LoadNPCFactionLists(const std::string &prefix) { try { auto Config = EQEmuConfig::get(); - EQEmu::IPCMutex mutex("faction"); + EQ::IPCMutex mutex("faction"); mutex.Lock(); std::string file_name = Config->SharedMemDir + prefix + std::string("faction"); - faction_mmf = std::unique_ptr(new EQEmu::MemoryMappedFile(file_name)); - faction_hash = std::unique_ptr>(new EQEmu::FixedMemoryHashSet(reinterpret_cast(faction_mmf->Get()), faction_mmf->Size())); + faction_mmf = std::unique_ptr(new EQ::MemoryMappedFile(file_name)); + faction_hash = std::unique_ptr>(new EQ::FixedMemoryHashSet(reinterpret_cast(faction_mmf->Get()), faction_mmf->Size())); mutex.Unlock(); } catch(std::exception& ex) { LogError("Error Loading npc factions: {}", ex.what()); @@ -1352,18 +1352,18 @@ bool SharedDatabase::LoadNPCFactionLists(const std::string &prefix) { return true; } -// Create appropriate EQEmu::ItemInstance class -EQEmu::ItemInstance* SharedDatabase::CreateItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5, uint32 aug6, uint8 attuned) +// Create appropriate EQ::ItemInstance class +EQ::ItemInstance* SharedDatabase::CreateItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5, uint32 aug6, uint8 attuned) { - const EQEmu::ItemData* item = nullptr; - EQEmu::ItemInstance* inst = nullptr; + const EQ::ItemData* item = nullptr; + EQ::ItemInstance* inst = nullptr; item = GetItem(item_id); if (item) { inst = CreateBaseItem(item, charges); if (inst == nullptr) { - LogError("Error: valid item data returned a null reference for EQEmu::ItemInstance creation in SharedDatabase::CreateItem()"); + LogError("Error: valid item data returned a null reference for EQ::ItemInstance creation in SharedDatabase::CreateItem()"); LogError("Item Data = ID: {}, Name: {}, Charges: {}", item->ID, item->Name, charges); return nullptr; } @@ -1381,15 +1381,15 @@ EQEmu::ItemInstance* SharedDatabase::CreateItem(uint32 item_id, int16 charges, u } -// Create appropriate EQEmu::ItemInstance class -EQEmu::ItemInstance* SharedDatabase::CreateItem(const EQEmu::ItemData* item, int16 charges, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5, uint32 aug6, uint8 attuned) +// Create appropriate EQ::ItemInstance class +EQ::ItemInstance* SharedDatabase::CreateItem(const EQ::ItemData* item, int16 charges, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5, uint32 aug6, uint8 attuned) { - EQEmu::ItemInstance* inst = nullptr; + EQ::ItemInstance* inst = nullptr; if (item) { inst = CreateBaseItem(item, charges); if (inst == nullptr) { - LogError("Error: valid item data returned a null reference for EQEmu::ItemInstance creation in SharedDatabase::CreateItem()"); + LogError("Error: valid item data returned a null reference for EQ::ItemInstance creation in SharedDatabase::CreateItem()"); LogError("Item Data = ID: {}, Name: {}, Charges: {}", item->ID, item->Name, charges); return nullptr; } @@ -1406,8 +1406,8 @@ EQEmu::ItemInstance* SharedDatabase::CreateItem(const EQEmu::ItemData* item, int return inst; } -EQEmu::ItemInstance* SharedDatabase::CreateBaseItem(const EQEmu::ItemData* item, int16 charges) { - EQEmu::ItemInstance* inst = nullptr; +EQ::ItemInstance* SharedDatabase::CreateBaseItem(const EQ::ItemData* item, int16 charges) { + EQ::ItemInstance* inst = nullptr; if (item) { // if maxcharges is -1 that means it is an unlimited use item. // set it to 1 charge so that it is usable on creation @@ -1417,10 +1417,10 @@ EQEmu::ItemInstance* SharedDatabase::CreateBaseItem(const EQEmu::ItemData* item, if(charges <= 0 && item->Stackable) charges = 1; - inst = new EQEmu::ItemInstance(item, charges); + inst = new EQ::ItemInstance(item, charges); if (inst == nullptr) { - LogError("Error: valid item data returned a null reference for EQEmu::ItemInstance creation in SharedDatabase::CreateBaseItem()"); + LogError("Error: valid item data returned a null reference for EQ::ItemInstance creation in SharedDatabase::CreateBaseItem()"); LogError("Item Data = ID: {}, Name: {}, Charges: {}", item->ID, item->Name, charges); return nullptr; } @@ -1533,16 +1533,16 @@ bool SharedDatabase::LoadSkillCaps(const std::string &prefix) { skill_caps_mmf.reset(nullptr); uint32 class_count = PLAYER_CLASS_COUNT; - uint32 skill_count = EQEmu::skills::HIGHEST_SKILL + 1; + uint32 skill_count = EQ::skills::HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; uint32 size = (class_count * skill_count * level_count * sizeof(uint16)); try { auto Config = EQEmuConfig::get(); - EQEmu::IPCMutex mutex("skill_caps"); + EQ::IPCMutex mutex("skill_caps"); mutex.Lock(); std::string file_name = Config->SharedMemDir + prefix + std::string("skill_caps"); - skill_caps_mmf = std::unique_ptr(new EQEmu::MemoryMappedFile(file_name)); + skill_caps_mmf = std::unique_ptr(new EQ::MemoryMappedFile(file_name)); mutex.Unlock(); } catch(std::exception &ex) { LogError("Error loading skill caps: {}", ex.what()); @@ -1554,7 +1554,7 @@ bool SharedDatabase::LoadSkillCaps(const std::string &prefix) { void SharedDatabase::LoadSkillCaps(void *data) { uint32 class_count = PLAYER_CLASS_COUNT; - uint32 skill_count = EQEmu::skills::HIGHEST_SKILL + 1; + uint32 skill_count = EQ::skills::HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; uint16 *skill_caps_table = reinterpret_cast(data); @@ -1579,7 +1579,7 @@ void SharedDatabase::LoadSkillCaps(void *data) { } } -uint16 SharedDatabase::GetSkillCap(uint8 Class_, EQEmu::skills::SkillType Skill, uint8 Level) { +uint16 SharedDatabase::GetSkillCap(uint8 Class_, EQ::skills::SkillType Skill, uint8 Level) { if(!skill_caps_mmf) { return 0; } @@ -1593,7 +1593,7 @@ uint16 SharedDatabase::GetSkillCap(uint8 Class_, EQEmu::skills::SkillType Skill, } uint32 class_count = PLAYER_CLASS_COUNT; - uint32 skill_count = EQEmu::skills::HIGHEST_SKILL + 1; + uint32 skill_count = EQ::skills::HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; if(Class_ > class_count || static_cast(Skill) > skill_count || Level > level_count) { return 0; @@ -1608,7 +1608,7 @@ uint16 SharedDatabase::GetSkillCap(uint8 Class_, EQEmu::skills::SkillType Skill, return skill_caps_table[index]; } -uint8 SharedDatabase::GetTrainLevel(uint8 Class_, EQEmu::skills::SkillType Skill, uint8 Level) { +uint8 SharedDatabase::GetTrainLevel(uint8 Class_, EQ::skills::SkillType Skill, uint8 Level) { if(!skill_caps_mmf) { return 0; } @@ -1622,7 +1622,7 @@ uint8 SharedDatabase::GetTrainLevel(uint8 Class_, EQEmu::skills::SkillType Skill } uint32 class_count = PLAYER_CLASS_COUNT; - uint32 skill_count = EQEmu::skills::HIGHEST_SKILL + 1; + uint32 skill_count = EQ::skills::HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; if(Class_ > class_count || static_cast(Skill) > skill_count || Level > level_count) { return 0; @@ -1695,11 +1695,11 @@ bool SharedDatabase::LoadSpells(const std::string &prefix, int32 *records, const try { auto Config = EQEmuConfig::get(); - EQEmu::IPCMutex mutex("spells"); + EQ::IPCMutex mutex("spells"); mutex.Lock(); std::string file_name = Config->SharedMemDir + prefix + std::string("spells"); - spells_mmf = std::unique_ptr(new EQEmu::MemoryMappedFile(file_name)); + spells_mmf = std::unique_ptr(new EQ::MemoryMappedFile(file_name)); *records = *reinterpret_cast(spells_mmf->Get()); *sp = reinterpret_cast((char*)spells_mmf->Get() + 4); mutex.Unlock(); @@ -1793,10 +1793,10 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) { int tmp_skill = atoi(row[100]);; - if (tmp_skill < 0 || tmp_skill > EQEmu::skills::HIGHEST_SKILL) - sp[tempid].skill = EQEmu::skills::SkillBegging; /* not much better we can do. */ // can probably be changed to client-based 'SkillNone' once activated + if (tmp_skill < 0 || tmp_skill > EQ::skills::HIGHEST_SKILL) + sp[tempid].skill = EQ::skills::SkillBegging; /* not much better we can do. */ // can probably be changed to client-based 'SkillNone' once activated else - sp[tempid].skill = (EQEmu::skills::SkillType) tmp_skill; + sp[tempid].skill = (EQ::skills::SkillType) tmp_skill; sp[tempid].zonetype=atoi(row[101]); sp[tempid].EnvironmentType=atoi(row[102]); @@ -1902,11 +1902,11 @@ bool SharedDatabase::LoadBaseData(const std::string &prefix) { try { auto Config = EQEmuConfig::get(); - EQEmu::IPCMutex mutex("base_data"); + EQ::IPCMutex mutex("base_data"); mutex.Lock(); std::string file_name = Config->SharedMemDir + prefix + std::string("base_data"); - base_data_mmf = std::unique_ptr(new EQEmu::MemoryMappedFile(file_name)); + base_data_mmf = std::unique_ptr(new EQ::MemoryMappedFile(file_name)); mutex.Unlock(); } catch(std::exception& ex) { LogError("Error Loading Base Data: {}", ex.what()); @@ -2035,7 +2035,7 @@ void SharedDatabase::GetLootDropInfo(uint32 &loot_drop_count, uint32 &max_loot_d } void SharedDatabase::LoadLootTables(void *data, uint32 size) { - EQEmu::FixedMemoryVariableHashSet hash(reinterpret_cast(data), size); + EQ::FixedMemoryVariableHashSet hash(reinterpret_cast(data), size); uint8 loot_table[sizeof(LootTable_Struct) + (sizeof(LootTableEntries_Struct) * 128)]; LootTable_Struct *lt = reinterpret_cast(loot_table); @@ -2089,7 +2089,7 @@ void SharedDatabase::LoadLootTables(void *data, uint32 size) { void SharedDatabase::LoadLootDrops(void *data, uint32 size) { - EQEmu::FixedMemoryVariableHashSet hash(reinterpret_cast(data), size); + EQ::FixedMemoryVariableHashSet hash(reinterpret_cast(data), size); uint8 loot_drop[sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * 1260)]; LootDrop_Struct *ld = reinterpret_cast(loot_drop); @@ -2142,16 +2142,16 @@ bool SharedDatabase::LoadLoot(const std::string &prefix) { try { auto Config = EQEmuConfig::get(); - EQEmu::IPCMutex mutex("loot"); + EQ::IPCMutex mutex("loot"); mutex.Lock(); std::string file_name_lt = Config->SharedMemDir + prefix + std::string("loot_table"); - loot_table_mmf = std::unique_ptr(new EQEmu::MemoryMappedFile(file_name_lt)); - loot_table_hash = std::unique_ptr>(new EQEmu::FixedMemoryVariableHashSet( + loot_table_mmf = std::unique_ptr(new EQ::MemoryMappedFile(file_name_lt)); + loot_table_hash = std::unique_ptr>(new EQ::FixedMemoryVariableHashSet( reinterpret_cast(loot_table_mmf->Get()), loot_table_mmf->Size())); std::string file_name_ld = Config->SharedMemDir + prefix + std::string("loot_drop"); - loot_drop_mmf = std::unique_ptr(new EQEmu::MemoryMappedFile(file_name_ld)); - loot_drop_hash = std::unique_ptr>(new EQEmu::FixedMemoryVariableHashSet( + loot_drop_mmf = std::unique_ptr(new EQ::MemoryMappedFile(file_name_ld)); + loot_drop_hash = std::unique_ptr>(new EQ::FixedMemoryVariableHashSet( reinterpret_cast(loot_drop_mmf->Get()), loot_drop_mmf->Size())); mutex.Unlock(); diff --git a/common/shareddb.h b/common/shareddb.h index 8deb65126..e7bbd3e61 100644 --- a/common/shareddb.h +++ b/common/shareddb.h @@ -41,7 +41,7 @@ struct NPCFactionList; struct LootTable_Struct; struct LootDrop_Struct; -namespace EQEmu +namespace EQ { struct ItemData; class ItemInstance; @@ -80,22 +80,22 @@ class SharedDatabase : public Database /* Character InventoryProfile */ - bool SaveCursor(uint32 char_id, std::list::const_iterator &start, std::list::const_iterator &end); - bool SaveInventory(uint32 char_id, const EQEmu::ItemInstance* inst, int16 slot_id); + bool SaveCursor(uint32 char_id, std::list::const_iterator &start, std::list::const_iterator &end); + bool SaveInventory(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id); bool DeleteSharedBankSlot(uint32 char_id, int16 slot_id); bool DeleteInventorySlot(uint32 char_id, int16 slot_id); - bool UpdateInventorySlot(uint32 char_id, const EQEmu::ItemInstance* inst, int16 slot_id); - bool UpdateSharedBankSlot(uint32 char_id, const EQEmu::ItemInstance* inst, int16 slot_id); - bool VerifyInventory(uint32 account_id, int16 slot_id, const EQEmu::ItemInstance* inst); - bool GetSharedBank(uint32 id, EQEmu::InventoryProfile* inv, bool is_charid); + bool UpdateInventorySlot(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id); + bool UpdateSharedBankSlot(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id); + bool VerifyInventory(uint32 account_id, int16 slot_id, const EQ::ItemInstance* inst); + bool GetSharedBank(uint32 id, EQ::InventoryProfile* inv, bool is_charid); int32 GetSharedPlatinum(uint32 account_id); bool SetSharedPlatinum(uint32 account_id, int32 amount_to_add); - bool GetInventory(uint32 char_id, EQEmu::InventoryProfile* inv); - bool GetInventory(uint32 account_id, char* name, EQEmu::InventoryProfile* inv); // deprecated + bool GetInventory(uint32 char_id, EQ::InventoryProfile* inv); + bool GetInventory(uint32 account_id, char* name, EQ::InventoryProfile* inv); // deprecated std::map GetItemRecastTimestamps(uint32 char_id); uint32 GetItemRecastTimestamp(uint32 char_id, uint32 recast_type); void ClearOldRecastTimestamps(uint32 char_id); - bool SetStartingItems(PlayerProfile_Struct* pp, EQEmu::InventoryProfile* inv, uint32 si_race, uint32 si_class, uint32 si_deity, uint32 si_current_zone, char* si_name, int admin); + bool SetStartingItems(PlayerProfile_Struct* pp, EQ::InventoryProfile* inv, uint32 si_race, uint32 si_class, uint32 si_deity, uint32 si_current_zone, char* si_name, int admin); std::string GetBook(const char *txtfile, int16 *language); @@ -103,9 +103,9 @@ class SharedDatabase : public Database /* Item Methods */ - EQEmu::ItemInstance* CreateItem(uint32 item_id, int16 charges = 0, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0, uint8 attuned = 0); - EQEmu::ItemInstance* CreateItem(const EQEmu::ItemData* item, int16 charges = 0, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0, uint8 attuned = 0); - EQEmu::ItemInstance* CreateBaseItem(const EQEmu::ItemData* item, int16 charges = 0); + EQ::ItemInstance* CreateItem(uint32 item_id, int16 charges = 0, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0, uint8 attuned = 0); + EQ::ItemInstance* CreateItem(const EQ::ItemData* item, int16 charges = 0, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0, uint8 attuned = 0); + EQ::ItemInstance* CreateBaseItem(const EQ::ItemData* item, int16 charges = 0); /* Shared Memory crap @@ -115,8 +115,8 @@ class SharedDatabase : public Database void GetItemsCount(int32 &item_count, uint32 &max_id); void LoadItems(void *data, uint32 size, int32 items, uint32 max_item_id); bool LoadItems(const std::string &prefix); - const EQEmu::ItemData* IterateItems(uint32* id); - const EQEmu::ItemData* GetItem(uint32 id); + const EQ::ItemData* IterateItems(uint32* id); + const EQ::ItemData* GetItem(uint32 id); const EvolveInfo* GetEvolveInfo(uint32 loregroup); //faction lists @@ -136,8 +136,8 @@ class SharedDatabase : public Database void LoadSkillCaps(void *data); bool LoadSkillCaps(const std::string &prefix); - uint16 GetSkillCap(uint8 Class_, EQEmu::skills::SkillType Skill, uint8 Level); - uint8 GetTrainLevel(uint8 Class_, EQEmu::skills::SkillType Skill, uint8 Level); + uint16 GetSkillCap(uint8 Class_, EQ::skills::SkillType Skill, uint8 Level); + uint8 GetTrainLevel(uint8 Class_, EQ::skills::SkillType Skill, uint8 Level); int GetMaxSpellID(); bool LoadSpells(const std::string &prefix, int32 *records, const SPDat_Spell_Struct **sp); @@ -151,17 +151,17 @@ class SharedDatabase : public Database protected: - std::unique_ptr skill_caps_mmf; - std::unique_ptr items_mmf; - std::unique_ptr> items_hash; - std::unique_ptr faction_mmf; - std::unique_ptr> faction_hash; - std::unique_ptr loot_table_mmf; - std::unique_ptr> loot_table_hash; - std::unique_ptr loot_drop_mmf; - std::unique_ptr> loot_drop_hash; - std::unique_ptr base_data_mmf; - std::unique_ptr spells_mmf; + std::unique_ptr skill_caps_mmf; + std::unique_ptr items_mmf; + std::unique_ptr> items_hash; + std::unique_ptr faction_mmf; + std::unique_ptr> faction_hash; + std::unique_ptr loot_table_mmf; + std::unique_ptr> loot_table_hash; + std::unique_ptr loot_drop_mmf; + std::unique_ptr> loot_drop_hash; + std::unique_ptr base_data_mmf; + std::unique_ptr spells_mmf; }; #endif /*SHAREDDB_H_*/ diff --git a/common/skills.cpp b/common/skills.cpp index 947861163..81b1a926c 100644 --- a/common/skills.cpp +++ b/common/skills.cpp @@ -22,7 +22,7 @@ #include -bool EQEmu::skills::IsTradeskill(SkillType skill) +bool EQ::skills::IsTradeskill(SkillType skill) { switch (skill) { case SkillFishing: @@ -43,7 +43,7 @@ bool EQEmu::skills::IsTradeskill(SkillType skill) } } -bool EQEmu::skills::IsSpecializedSkill(SkillType skill) +bool EQ::skills::IsSpecializedSkill(SkillType skill) { // this could be a simple if, but if this is more portable if any IDs change (probably won't) // or any other specialized are added (also unlikely) @@ -59,7 +59,7 @@ bool EQEmu::skills::IsSpecializedSkill(SkillType skill) } } -float EQEmu::skills::GetSkillMeleePushForce(SkillType skill) +float EQ::skills::GetSkillMeleePushForce(SkillType skill) { // This is the force/magnitude of the push from an attack of this skill type // You can find these numbers in the clients skill struct @@ -96,7 +96,7 @@ float EQEmu::skills::GetSkillMeleePushForce(SkillType skill) } } -bool EQEmu::skills::IsBardInstrumentSkill(SkillType skill) +bool EQ::skills::IsBardInstrumentSkill(SkillType skill) { switch (skill) { case SkillBrassInstruments: @@ -110,7 +110,7 @@ bool EQEmu::skills::IsBardInstrumentSkill(SkillType skill) } } -bool EQEmu::skills::IsCastingSkill(SkillType skill) +bool EQ::skills::IsCastingSkill(SkillType skill) { switch (skill) { case SkillAbjuration: @@ -124,7 +124,7 @@ bool EQEmu::skills::IsCastingSkill(SkillType skill) } } -int32 EQEmu::skills::GetBaseDamage(SkillType skill) +int32 EQ::skills::GetBaseDamage(SkillType skill) { switch (skill) { case SkillBash: @@ -148,7 +148,7 @@ int32 EQEmu::skills::GetBaseDamage(SkillType skill) } } -bool EQEmu::skills::IsMeleeDmg(SkillType skill) +bool EQ::skills::IsMeleeDmg(SkillType skill) { switch (skill) { case Skill1HBlunt: @@ -175,7 +175,7 @@ bool EQEmu::skills::IsMeleeDmg(SkillType skill) } } -const std::map& EQEmu::skills::GetSkillTypeMap() +const std::map& EQ::skills::GetSkillTypeMap() { /* VS2013 code static const std::map skill_use_types_map = { @@ -355,12 +355,12 @@ const std::map& EQEmu::skills::GetSkillTy return skill_type_map; } -EQEmu::SkillProfile::SkillProfile() +EQ::SkillProfile::SkillProfile() { memset(&Skill, 0, (sizeof(uint32) * PACKET_SKILL_ARRAY_SIZE)); } -uint32 EQEmu::SkillProfile::GetSkill(int skill_id) +uint32 EQ::SkillProfile::GetSkill(int skill_id) { if (skill_id < 0 || skill_id >= PACKET_SKILL_ARRAY_SIZE) return 0; diff --git a/common/skills.h b/common/skills.h index 43a31ed15..81790ede1 100644 --- a/common/skills.h +++ b/common/skills.h @@ -26,7 +26,7 @@ #include -namespace EQEmu +namespace EQ { namespace skills { enum SkillType : int { @@ -287,7 +287,7 @@ namespace EQEmu uint32* GetSkills() { return reinterpret_cast(&Skill); } - skills::SkillType GetLastUseableSkill() { return EQEmu::skills::Skill2HPiercing; } + skills::SkillType GetLastUseableSkill() { return EQ::skills::Skill2HPiercing; } size_t GetSkillsArraySize() { return PACKET_SKILL_ARRAY_SIZE; } uint32 GetSkill(int skill_id); diff --git a/common/spdat.h b/common/spdat.h index 9c9cf3f53..811825757 100644 --- a/common/spdat.h +++ b/common/spdat.h @@ -748,7 +748,7 @@ struct SPDat_Spell_Struct /* 086 */ int effectid[EFFECT_COUNT]; // Spell's effects -- SPELLAFFECT1 ... SPELLAFFECT12 /* 098 */ SpellTargetType targettype; // Spell's Target -- TYPENUMBER /* 099 */ int basediff; // base difficulty fizzle adjustment -- BASEDIFFICULTY -/* 100 */ EQEmu::skills::SkillType skill; // -- CASTINGSKILL +/* 100 */ EQ::skills::SkillType skill; // -- CASTINGSKILL /* 101 */ int8 zonetype; // 01=Outdoors, 02=dungeons, ff=Any -- ZONETYPE /* 102 */ int8 EnvironmentType; // -- ENVIRONMENTTYPE /* 103 */ int8 TimeOfDay; // -- TIMEOFDAY diff --git a/common/struct_strategy.h b/common/struct_strategy.h index 3c92cf060..da4142295 100644 --- a/common/struct_strategy.h +++ b/common/struct_strategy.h @@ -25,7 +25,7 @@ public: void Decode(EQApplicationPacket *p) const; virtual std::string Describe() const = 0; - virtual const EQEmu::versions::ClientVersion ClientVersion() const = 0; + virtual const EQ::versions::ClientVersion ClientVersion() const = 0; protected: //some common coders: diff --git a/common/textures.h b/common/textures.h index f489977ce..b415c442c 100644 --- a/common/textures.h +++ b/common/textures.h @@ -23,7 +23,7 @@ #include "types.h" -namespace EQEmu +namespace EQ { namespace textures { enum : int8 { textureInvalid = -1, textureBegin }; diff --git a/loginserver/client.h b/loginserver/client.h index b8f092db3..9d76e7e78 100644 --- a/loginserver/client.h +++ b/loginserver/client.h @@ -195,7 +195,7 @@ public: void CreateEQEmuAccount(const std::string &in_account_name, const std::string &in_account_password, unsigned int loginserver_account_id); private: - EQEmu::Random random; + EQ::Random random; std::shared_ptr connection; LSClientVersion version; LSClientStatus status; diff --git a/shared_memory/base_data.cpp b/shared_memory/base_data.cpp index 557d13ce5..f65780886 100644 --- a/shared_memory/base_data.cpp +++ b/shared_memory/base_data.cpp @@ -24,7 +24,7 @@ #include "../common/eqemu_exception.h" void LoadBaseData(SharedDatabase *database, const std::string &prefix) { - EQEmu::IPCMutex mutex("base_data"); + EQ::IPCMutex mutex("base_data"); mutex.Lock(); int records = (database->GetMaxBaseDataLevel() + 1); if(records == 0) { @@ -35,7 +35,7 @@ void LoadBaseData(SharedDatabase *database, const std::string &prefix) { auto Config = EQEmuConfig::get(); std::string file_name = Config->SharedMemDir + prefix + std::string("base_data"); - EQEmu::MemoryMappedFile mmf(file_name, size); + EQ::MemoryMappedFile mmf(file_name, size); mmf.ZeroFile(); void *ptr = mmf.Get(); diff --git a/shared_memory/items.cpp b/shared_memory/items.cpp index 6923fea3d..b1052730c 100644 --- a/shared_memory/items.cpp +++ b/shared_memory/items.cpp @@ -25,7 +25,7 @@ #include "../common/item_data.h" void LoadItems(SharedDatabase *database, const std::string &prefix) { - EQEmu::IPCMutex mutex("items"); + EQ::IPCMutex mutex("items"); mutex.Lock(); int32 items = -1; @@ -35,11 +35,11 @@ void LoadItems(SharedDatabase *database, const std::string &prefix) { EQ_EXCEPT("Shared Memory", "Unable to get any items from the database."); } - uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size(items, max_item)); + uint32 size = static_cast(EQ::FixedMemoryHashSet::estimated_size(items, max_item)); auto Config = EQEmuConfig::get(); std::string file_name = Config->SharedMemDir + prefix + std::string("items"); - EQEmu::MemoryMappedFile mmf(file_name, size); + EQ::MemoryMappedFile mmf(file_name, size); mmf.ZeroFile(); void *ptr = mmf.Get(); diff --git a/shared_memory/loot.cpp b/shared_memory/loot.cpp index 742f373bf..a8ab94326 100644 --- a/shared_memory/loot.cpp +++ b/shared_memory/loot.cpp @@ -26,7 +26,7 @@ #include "../common/loottable.h" void LoadLoot(SharedDatabase *database, const std::string &prefix) { - EQEmu::IPCMutex mutex("loot"); + EQ::IPCMutex mutex("loot"); mutex.Lock(); uint32 loot_table_count, loot_table_max, loot_table_entries_count; @@ -48,15 +48,15 @@ void LoadLoot(SharedDatabase *database, const std::string &prefix) { std::string file_name_lt = Config->SharedMemDir + prefix + std::string("loot_table"); std::string file_name_ld = Config->SharedMemDir + prefix + std::string("loot_drop"); - EQEmu::MemoryMappedFile mmf_loot_table(file_name_lt, loot_table_size); - EQEmu::MemoryMappedFile mmf_loot_drop(file_name_ld, loot_drop_size); + EQ::MemoryMappedFile mmf_loot_table(file_name_lt, loot_table_size); + EQ::MemoryMappedFile mmf_loot_drop(file_name_ld, loot_drop_size); mmf_loot_table.ZeroFile(); mmf_loot_drop.ZeroFile(); - EQEmu::FixedMemoryVariableHashSet loot_table_hash(reinterpret_cast(mmf_loot_table.Get()), + EQ::FixedMemoryVariableHashSet loot_table_hash(reinterpret_cast(mmf_loot_table.Get()), loot_table_size, loot_table_max); - EQEmu::FixedMemoryVariableHashSet loot_drop_hash(reinterpret_cast(mmf_loot_drop.Get()), + EQ::FixedMemoryVariableHashSet loot_drop_hash(reinterpret_cast(mmf_loot_drop.Get()), loot_drop_size, loot_drop_max); database->LoadLootTables(mmf_loot_table.Get(), loot_table_max); diff --git a/shared_memory/npc_faction.cpp b/shared_memory/npc_faction.cpp index 2c6ab0098..fb2d20ac4 100644 --- a/shared_memory/npc_faction.cpp +++ b/shared_memory/npc_faction.cpp @@ -25,18 +25,18 @@ #include "../common/faction.h" void LoadFactions(SharedDatabase *database, const std::string &prefix) { - EQEmu::IPCMutex mutex("faction"); + EQ::IPCMutex mutex("faction"); mutex.Lock(); uint32 lists = 0; uint32 max_list = 0; database->GetFactionListInfo(lists, max_list); - uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size(lists, max_list)); + uint32 size = static_cast(EQ::FixedMemoryHashSet::estimated_size(lists, max_list)); auto Config = EQEmuConfig::get(); std::string file_name = Config->SharedMemDir + prefix + std::string("faction"); - EQEmu::MemoryMappedFile mmf(file_name, size); + EQ::MemoryMappedFile mmf(file_name, size); mmf.ZeroFile(); void *ptr = mmf.Get(); diff --git a/shared_memory/skill_caps.cpp b/shared_memory/skill_caps.cpp index 758ce6955..8f11e31dd 100644 --- a/shared_memory/skill_caps.cpp +++ b/shared_memory/skill_caps.cpp @@ -26,17 +26,17 @@ #include "../common/features.h" void LoadSkillCaps(SharedDatabase *database, const std::string &prefix) { - EQEmu::IPCMutex mutex("skill_caps"); + EQ::IPCMutex mutex("skill_caps"); mutex.Lock(); uint32 class_count = PLAYER_CLASS_COUNT; - uint32 skill_count = EQEmu::skills::HIGHEST_SKILL + 1; + uint32 skill_count = EQ::skills::HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; uint32 size = (class_count * skill_count * level_count * sizeof(uint16)); auto Config = EQEmuConfig::get(); std::string file_name = Config->SharedMemDir + prefix + std::string("skill_caps"); - EQEmu::MemoryMappedFile mmf(file_name, size); + EQ::MemoryMappedFile mmf(file_name, size); mmf.ZeroFile(); void *ptr = mmf.Get(); diff --git a/shared_memory/spells.cpp b/shared_memory/spells.cpp index c653e26f5..0faf5d764 100644 --- a/shared_memory/spells.cpp +++ b/shared_memory/spells.cpp @@ -25,7 +25,7 @@ #include "../common/spdat.h" void LoadSpells(SharedDatabase *database, const std::string &prefix) { - EQEmu::IPCMutex mutex("spells"); + EQ::IPCMutex mutex("spells"); mutex.Lock(); int records = database->GetMaxSpellID() + 1; if(records == 0) { @@ -36,7 +36,7 @@ void LoadSpells(SharedDatabase *database, const std::string &prefix) { auto Config = EQEmuConfig::get(); std::string file_name = Config->SharedMemDir + prefix + std::string("spells"); - EQEmu::MemoryMappedFile mmf(file_name, size); + EQ::MemoryMappedFile mmf(file_name, size); mmf.ZeroFile(); void *ptr = mmf.Get(); diff --git a/ucs/chatchannel.cpp b/ucs/chatchannel.cpp index efac898d5..da3390f55 100644 --- a/ucs/chatchannel.cpp +++ b/ucs/chatchannel.cpp @@ -393,7 +393,7 @@ void ChatChannel::SendMessageToChannel(std::string Message, Client* Sender) { if(!Sender) return; - std::string cv_messages[EQEmu::versions::ClientVersionCount]; + std::string cv_messages[EQ::versions::ClientVersionCount]; ChatMessagesSent++; @@ -412,18 +412,18 @@ void ChatChannel::SendMessageToChannel(std::string Message, Client* Sender) { if (cv_messages[static_cast(ChannelClient->GetClientVersion())].length() == 0) { switch (ChannelClient->GetClientVersion()) { - case EQEmu::versions::ClientVersion::Titanium: + case EQ::versions::ClientVersion::Titanium: ServerToClient45SayLink(cv_messages[static_cast(ChannelClient->GetClientVersion())], Message); break; - case EQEmu::versions::ClientVersion::SoF: - case EQEmu::versions::ClientVersion::SoD: - case EQEmu::versions::ClientVersion::UF: + case EQ::versions::ClientVersion::SoF: + case EQ::versions::ClientVersion::SoD: + case EQ::versions::ClientVersion::UF: ServerToClient50SayLink(cv_messages[static_cast(ChannelClient->GetClientVersion())], Message); break; - case EQEmu::versions::ClientVersion::RoF: + case EQ::versions::ClientVersion::RoF: ServerToClient55SayLink(cv_messages[static_cast(ChannelClient->GetClientVersion())], Message); break; - case EQEmu::versions::ClientVersion::RoF2: + case EQ::versions::ClientVersion::RoF2: default: cv_messages[static_cast(ChannelClient->GetClientVersion())] = Message; break; diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp index 0b1d43262..2d5d40fb9 100644 --- a/ucs/clientlist.cpp +++ b/ucs/clientlist.cpp @@ -523,7 +523,7 @@ Client::Client(std::shared_ptr eqs) { GlobalChatLimiterTimer = new Timer(RuleI(Chat, IntervalDurationMS)); TypeOfConnection = ConnectionTypeUnknown; - ClientVersion_ = EQEmu::versions::ClientVersion::Unknown; + ClientVersion_ = EQ::versions::ClientVersion::Unknown; UnderfootOrLater = false; } @@ -2163,54 +2163,54 @@ void Client::SetConnectionType(char c) { switch (c) { - case EQEmu::versions::ucsTitaniumChat: + case EQ::versions::ucsTitaniumChat: { TypeOfConnection = ConnectionTypeChat; - ClientVersion_ = EQEmu::versions::ClientVersion::Titanium; + ClientVersion_ = EQ::versions::ClientVersion::Titanium; LogInfo("Connection type is Chat (Titanium)"); break; } - case EQEmu::versions::ucsTitaniumMail: + case EQ::versions::ucsTitaniumMail: { TypeOfConnection = ConnectionTypeMail; - ClientVersion_ = EQEmu::versions::ClientVersion::Titanium; + ClientVersion_ = EQ::versions::ClientVersion::Titanium; LogInfo("Connection type is Mail (Titanium)"); break; } - case EQEmu::versions::ucsSoFCombined: + case EQ::versions::ucsSoFCombined: { TypeOfConnection = ConnectionTypeCombined; - ClientVersion_ = EQEmu::versions::ClientVersion::SoF; + ClientVersion_ = EQ::versions::ClientVersion::SoF; LogInfo("Connection type is Combined (SoF)"); break; } - case EQEmu::versions::ucsSoDCombined: + case EQ::versions::ucsSoDCombined: { TypeOfConnection = ConnectionTypeCombined; - ClientVersion_ = EQEmu::versions::ClientVersion::SoD; + ClientVersion_ = EQ::versions::ClientVersion::SoD; LogInfo("Connection type is Combined (SoD)"); break; } - case EQEmu::versions::ucsUFCombined: + case EQ::versions::ucsUFCombined: { TypeOfConnection = ConnectionTypeCombined; - ClientVersion_ = EQEmu::versions::ClientVersion::UF; + ClientVersion_ = EQ::versions::ClientVersion::UF; UnderfootOrLater = true; LogInfo("Connection type is Combined (Underfoot)"); break; } - case EQEmu::versions::ucsRoFCombined: + case EQ::versions::ucsRoFCombined: { TypeOfConnection = ConnectionTypeCombined; - ClientVersion_ = EQEmu::versions::ClientVersion::RoF; + ClientVersion_ = EQ::versions::ClientVersion::RoF; UnderfootOrLater = true; LogInfo("Connection type is Combined (RoF)"); break; } - case EQEmu::versions::ucsRoF2Combined: + case EQ::versions::ucsRoF2Combined: { TypeOfConnection = ConnectionTypeCombined; - ClientVersion_ = EQEmu::versions::ClientVersion::RoF2; + ClientVersion_ = EQ::versions::ClientVersion::RoF2; UnderfootOrLater = true; LogInfo("Connection type is Combined (RoF2)"); break; @@ -2218,7 +2218,7 @@ void Client::SetConnectionType(char c) { default: { TypeOfConnection = ConnectionTypeUnknown; - ClientVersion_ = EQEmu::versions::ClientVersion::Unknown; + ClientVersion_ = EQ::versions::ClientVersion::Unknown; LogInfo("Connection type is unknown"); } } diff --git a/ucs/clientlist.h b/ucs/clientlist.h index 548fb170c..13d31784c 100644 --- a/ucs/clientlist.h +++ b/ucs/clientlist.h @@ -142,7 +142,7 @@ public: void SetConnectionType(char c); ConnectionType GetConnectionType() { return TypeOfConnection; } - EQEmu::versions::ClientVersion GetClientVersion() { return ClientVersion_; } + EQ::versions::ClientVersion GetClientVersion() { return ClientVersion_; } inline bool IsMailConnection() { return (TypeOfConnection == ConnectionTypeMail) || (TypeOfConnection == ConnectionTypeCombined); } void SendNotification(int MailBoxNumber, std::string From, std::string Subject, int MessageID); @@ -173,7 +173,7 @@ private: bool ForceDisconnect; ConnectionType TypeOfConnection; - EQEmu::versions::ClientVersion ClientVersion_; + EQ::versions::ClientVersion ClientVersion_; bool UnderfootOrLater; }; diff --git a/ucs/ucs.cpp b/ucs/ucs.cpp index 46bda530c..11f6ed103 100644 --- a/ucs/ucs.cpp +++ b/ucs/ucs.cpp @@ -117,7 +117,7 @@ int main() { } } - EQEmu::InitializeDynamicLookups(); + EQ::InitializeDynamicLookups(); LogInfo("Initialized dynamic dictionary entries"); database.ExpireMail(); diff --git a/ucs/worldserver.cpp b/ucs/worldserver.cpp index 107624a0d..88cff5afd 100644 --- a/ucs/worldserver.cpp +++ b/ucs/worldserver.cpp @@ -101,18 +101,18 @@ void WorldServer::ProcessMessage(uint16 opcode, EQ::Net::Packet &p) { std::string new_message; switch (c->GetClientVersion()) { - case EQEmu::versions::ClientVersion::Titanium: + case EQ::versions::ClientVersion::Titanium: Client45ToServerSayLink(new_message, Message.substr(1, std::string::npos)); break; - case EQEmu::versions::ClientVersion::SoF: - case EQEmu::versions::ClientVersion::SoD: - case EQEmu::versions::ClientVersion::UF: + case EQ::versions::ClientVersion::SoF: + case EQ::versions::ClientVersion::SoD: + case EQ::versions::ClientVersion::UF: Client50ToServerSayLink(new_message, Message.substr(1, std::string::npos)); break; - case EQEmu::versions::ClientVersion::RoF: + case EQ::versions::ClientVersion::RoF: Client55ToServerSayLink(new_message, Message.substr(1, std::string::npos)); break; - case EQEmu::versions::ClientVersion::RoF2: + case EQ::versions::ClientVersion::RoF2: default: new_message = Message.substr(1, std::string::npos); break; diff --git a/world/adventure.cpp b/world/adventure.cpp index 3b784cd6e..5ec088d73 100644 --- a/world/adventure.cpp +++ b/world/adventure.cpp @@ -15,7 +15,7 @@ extern ZSList zoneserver_list; extern ClientList client_list; extern AdventureManager adventure_manager; -extern EQEmu::Random emu_random; +extern EQ::Random emu_random; Adventure::Adventure(AdventureTemplate *t) { diff --git a/world/adventure_manager.cpp b/world/adventure_manager.cpp index c3e70b7ed..57c98cafb 100644 --- a/world/adventure_manager.cpp +++ b/world/adventure_manager.cpp @@ -15,7 +15,7 @@ extern ZSList zoneserver_list; extern ClientList client_list; -extern EQEmu::Random emu_random; +extern EQ::Random emu_random; AdventureManager::AdventureManager() { diff --git a/world/client.cpp b/world/client.cpp index 18f0aa776..383a31586 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -81,7 +81,7 @@ std::vector character_create_race_class_combos; extern ZSList zoneserver_list; extern LoginServerList loginserverlist; extern ClientList client_list; -extern EQEmu::Random emu_random; +extern EQ::Random emu_random; extern uint32 numclients; extern volatile bool RunLoops; extern volatile bool UCSServerAvailable_; @@ -108,7 +108,7 @@ Client::Client(EQStreamInterface* ieqs) StartInTutorial = false; m_ClientVersion = eqs->ClientVersion(); - m_ClientVersionBit = EQEmu::versions::ConvertClientVersionToClientVersionBit(m_ClientVersion); + m_ClientVersionBit = EQ::versions::ConvertClientVersionToClientVersionBit(m_ClientVersion); numclients++; } @@ -173,10 +173,10 @@ void Client::SendExpansionInfo() { ExpansionInfo_Struct *eis = (ExpansionInfo_Struct*)outapp->pBuffer; if (RuleB(World, UseClientBasedExpansionSettings)) { - eis->Expansions = EQEmu::expansions::ConvertClientVersionToExpansionsMask(eqs->ClientVersion()); + eis->Expansions = EQ::expansions::ConvertClientVersionToExpansionsMask(eqs->ClientVersion()); } else { - eis->Expansions = (RuleI(World, ExpansionSettings) & EQEmu::expansions::ConvertClientVersionToExpansionsMask(eqs->ClientVersion())); + eis->Expansions = (RuleI(World, ExpansionSettings) & EQ::expansions::ConvertClientVersionToExpansionsMask(eqs->ClientVersion())); } QueuePacket(outapp); @@ -188,7 +188,7 @@ void Client::SendCharInfo() { cle->SetOnline(CLE_Status::CharSelect); } - if (m_ClientVersionBit & EQEmu::versions::maskRoFAndLater) { + if (m_ClientVersionBit & EQ::versions::maskRoFAndLater) { SendMaxCharCreate(); SendMembership(); SendMembershipSettings(); @@ -213,9 +213,9 @@ void Client::SendMaxCharCreate() { auto outapp = new EQApplicationPacket(OP_SendMaxCharacters, sizeof(MaxCharacters_Struct)); MaxCharacters_Struct* mc = (MaxCharacters_Struct*)outapp->pBuffer; - mc->max_chars = EQEmu::constants::StaticLookup(m_ClientVersion)->CharacterCreationLimit; - if (mc->max_chars > EQEmu::constants::CHARACTER_CREATION_LIMIT) - mc->max_chars = EQEmu::constants::CHARACTER_CREATION_LIMIT; + mc->max_chars = EQ::constants::StaticLookup(m_ClientVersion)->CharacterCreationLimit; + if (mc->max_chars > EQ::constants::CHARACTER_CREATION_LIMIT) + mc->max_chars = EQ::constants::CHARACTER_CREATION_LIMIT; QueuePacket(outapp); safe_delete(outapp); @@ -682,7 +682,7 @@ bool Client::HandleCharacterCreatePacket(const EQApplicationPacket *app) { } else { - if (m_ClientVersionBit & EQEmu::versions::maskTitaniumAndEarlier) + if (m_ClientVersionBit & EQ::versions::maskTitaniumAndEarlier) StartInTutorial = true; SendCharInfo(); } @@ -730,9 +730,9 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) { // This can probably be moved outside and have another method return requested info (don't forget to remove the #include "../common/shareddb.h" above) // (This is a literal translation of the original process..I don't see why it can't be changed to a single-target query over account iteration) if (!is_player_zoning) { - size_t character_limit = EQEmu::constants::StaticLookup(eqs->ClientVersion())->CharacterCreationLimit; - if (character_limit > EQEmu::constants::CHARACTER_CREATION_LIMIT) { character_limit = EQEmu::constants::CHARACTER_CREATION_LIMIT; } - if (eqs->ClientVersion() == EQEmu::versions::ClientVersion::Titanium) { character_limit = Titanium::constants::CHARACTER_CREATION_LIMIT; } + size_t character_limit = EQ::constants::StaticLookup(eqs->ClientVersion())->CharacterCreationLimit; + if (character_limit > EQ::constants::CHARACTER_CREATION_LIMIT) { character_limit = EQ::constants::CHARACTER_CREATION_LIMIT; } + if (eqs->ClientVersion() == EQ::versions::ClientVersion::Titanium) { character_limit = Titanium::constants::CHARACTER_CREATION_LIMIT; } std::string tgh_query = StringFormat( "SELECT " @@ -865,30 +865,30 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) { const WorldConfig *Config = WorldConfig::get(); std::string buffer; - EQEmu::versions::UCSVersion ConnectionType = EQEmu::versions::ucsUnknown; + EQ::versions::UCSVersion ConnectionType = EQ::versions::ucsUnknown; // chat server packet switch (GetClientVersion()) { - case EQEmu::versions::ClientVersion::Titanium: - ConnectionType = EQEmu::versions::ucsTitaniumChat; + case EQ::versions::ClientVersion::Titanium: + ConnectionType = EQ::versions::ucsTitaniumChat; break; - case EQEmu::versions::ClientVersion::SoF: - ConnectionType = EQEmu::versions::ucsSoFCombined; + case EQ::versions::ClientVersion::SoF: + ConnectionType = EQ::versions::ucsSoFCombined; break; - case EQEmu::versions::ClientVersion::SoD: - ConnectionType = EQEmu::versions::ucsSoDCombined; + case EQ::versions::ClientVersion::SoD: + ConnectionType = EQ::versions::ucsSoDCombined; break; - case EQEmu::versions::ClientVersion::UF: - ConnectionType = EQEmu::versions::ucsUFCombined; + case EQ::versions::ClientVersion::UF: + ConnectionType = EQ::versions::ucsUFCombined; break; - case EQEmu::versions::ClientVersion::RoF: - ConnectionType = EQEmu::versions::ucsRoFCombined; + case EQ::versions::ClientVersion::RoF: + ConnectionType = EQ::versions::ucsRoFCombined; break; - case EQEmu::versions::ClientVersion::RoF2: - ConnectionType = EQEmu::versions::ucsRoF2Combined; + case EQ::versions::ClientVersion::RoF2: + ConnectionType = EQ::versions::ucsRoF2Combined; break; default: - ConnectionType = EQEmu::versions::ucsUnknown; + ConnectionType = EQ::versions::ucsUnknown; break; } @@ -910,8 +910,8 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) { // mail server packet switch (GetClientVersion()) { - case EQEmu::versions::ClientVersion::Titanium: - ConnectionType = EQEmu::versions::ucsTitaniumMail; + case EQ::versions::ClientVersion::Titanium: + ConnectionType = EQ::versions::ucsTitaniumMail; break; default: // retain value from previous switch @@ -954,7 +954,7 @@ bool Client::HandleDeleteCharacterPacket(const EQApplicationPacket *app) { bool Client::HandleZoneChangePacket(const EQApplicationPacket *app) { // HoT sends this to world while zoning and wants it echoed back. - if (m_ClientVersionBit & EQEmu::versions::maskRoFAndLater) + if (m_ClientVersionBit & EQ::versions::maskRoFAndLater) { QueuePacket(app); } @@ -1416,10 +1416,10 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) { PlayerProfile_Struct pp; ExtendedProfile_Struct ext; - EQEmu::InventoryProfile inv; + EQ::InventoryProfile inv; - pp.SetPlayerProfileVersion(EQEmu::versions::ConvertClientVersionToMobVersion(EQEmu::versions::ConvertClientVersionBitToClientVersion(m_ClientVersionBit))); - inv.SetInventoryVersion(EQEmu::versions::ConvertClientVersionBitToClientVersion(m_ClientVersionBit)); + pp.SetPlayerProfileVersion(EQ::versions::ConvertClientVersionToMobVersion(EQ::versions::ConvertClientVersionBitToClientVersion(m_ClientVersionBit))); + inv.SetInventoryVersion(EQ::versions::ConvertClientVersionBitToClientVersion(m_ClientVersionBit)); inv.SetGMInventory(false); // character cannot have gm flag at this point time_t bday = time(nullptr); @@ -1444,7 +1444,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) LogInfo("Beard: [{}] Beardcolor: [{}]", cc->beard, cc->beardcolor); /* Validate the char creation struct */ - if (m_ClientVersionBit & EQEmu::versions::maskSoFAndLater) { + if (m_ClientVersionBit & EQ::versions::maskSoFAndLater) { if (!CheckCharCreateInfoSoF(cc)) { LogInfo("CheckCharCreateInfo did not validate the request (bad race/class/stats)"); return false; @@ -1496,14 +1496,14 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) SetClassStartingSkills(&pp); SetClassLanguages(&pp); - pp.skills[EQEmu::skills::SkillSwimming] = RuleI(Skills, SwimmingStartValue); - pp.skills[EQEmu::skills::SkillSenseHeading] = RuleI(Skills, SenseHeadingStartValue); + pp.skills[EQ::skills::SkillSwimming] = RuleI(Skills, SwimmingStartValue); + pp.skills[EQ::skills::SkillSenseHeading] = RuleI(Skills, SenseHeadingStartValue); // strcpy(pp.servername, WorldConfig::get()->ShortName.c_str()); - memset(pp.spell_book, 0xFF, (sizeof(uint32) * EQEmu::spells::SPELLBOOK_SIZE)); + memset(pp.spell_book, 0xFF, (sizeof(uint32) * EQ::spells::SPELLBOOK_SIZE)); - memset(pp.mem_spells, 0xFF, (sizeof(uint32) * EQEmu::spells::SPELL_GEM_COUNT)); + memset(pp.mem_spells, 0xFF, (sizeof(uint32) * EQ::spells::SPELL_GEM_COUNT)); for(i = 0; i < BUFF_COUNT; i++) pp.buffs[i].spellid = 0xFFFF; @@ -1512,7 +1512,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) pp.pvp = database.GetServerType() == 1 ? 1 : 0; /* If it is an SoF Client and the SoF Start Zone rule is set, send new chars there */ - if (m_ClientVersionBit & EQEmu::versions::maskSoFAndLater) { + if (m_ClientVersionBit & EQ::versions::maskSoFAndLater) { LogInfo("Found 'SoFStartZoneID' rule setting: [{}]", RuleI(World, SoFStartZoneID)); if (RuleI(World, SoFStartZoneID) > 0) { pp.zone_id = RuleI(World, SoFStartZoneID); @@ -1528,7 +1528,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) } } /* use normal starting zone logic to either get defaults, or if startzone was set, load that from the db table.*/ - bool ValidStartZone = database.GetStartZone(&pp, cc, m_ClientVersionBit & EQEmu::versions::maskTitaniumAndEarlier); + bool ValidStartZone = database.GetStartZone(&pp, cc, m_ClientVersionBit & EQ::versions::maskTitaniumAndEarlier); if (!ValidStartZone){ return false; @@ -1870,21 +1870,21 @@ bool CheckCharCreateInfoTitanium(CharCreate_Struct *cc) void Client::SetClassStartingSkills(PlayerProfile_Struct *pp) { - for (uint32 i = 0; i <= EQEmu::skills::HIGHEST_SKILL; ++i) { + for (uint32 i = 0; i <= EQ::skills::HIGHEST_SKILL; ++i) { if (pp->skills[i] == 0) { // Skip specialized, tradeskills (fishing excluded), Alcohol Tolerance, and Bind Wound - if (EQEmu::skills::IsSpecializedSkill((EQEmu::skills::SkillType)i) || - (EQEmu::skills::IsTradeskill((EQEmu::skills::SkillType)i) && i != EQEmu::skills::SkillFishing) || - i == EQEmu::skills::SkillAlcoholTolerance || i == EQEmu::skills::SkillBindWound) + if (EQ::skills::IsSpecializedSkill((EQ::skills::SkillType)i) || + (EQ::skills::IsTradeskill((EQ::skills::SkillType)i) && i != EQ::skills::SkillFishing) || + i == EQ::skills::SkillAlcoholTolerance || i == EQ::skills::SkillBindWound) continue; - pp->skills[i] = database.GetSkillCap(pp->class_, (EQEmu::skills::SkillType)i, 1); + pp->skills[i] = database.GetSkillCap(pp->class_, (EQ::skills::SkillType)i, 1); } } - if (cle->GetClientVersion() < static_cast(EQEmu::versions::ClientVersion::RoF2) && pp->class_ == BERSERKER) { - pp->skills[EQEmu::skills::Skill1HPiercing] = pp->skills[EQEmu::skills::Skill2HPiercing]; - pp->skills[EQEmu::skills::Skill2HPiercing] = 0; + if (cle->GetClientVersion() < static_cast(EQ::versions::ClientVersion::RoF2) && pp->class_ == BERSERKER) { + pp->skills[EQ::skills::Skill1HPiercing] = pp->skills[EQ::skills::Skill2HPiercing]; + pp->skills[EQ::skills::Skill2HPiercing] = 0; } } @@ -1907,41 +1907,41 @@ void Client::SetRaceStartingSkills( PlayerProfile_Struct *pp ) } case DARK_ELF: { - pp->skills[EQEmu::skills::SkillHide] = 50; + pp->skills[EQ::skills::SkillHide] = 50; break; } case FROGLOK: { - pp->skills[EQEmu::skills::SkillSwimming] = 125; + pp->skills[EQ::skills::SkillSwimming] = 125; break; } case GNOME: { - pp->skills[EQEmu::skills::SkillTinkering] = 50; + pp->skills[EQ::skills::SkillTinkering] = 50; break; } case HALFLING: { - pp->skills[EQEmu::skills::SkillHide] = 50; - pp->skills[EQEmu::skills::SkillSneak] = 50; + pp->skills[EQ::skills::SkillHide] = 50; + pp->skills[EQ::skills::SkillSneak] = 50; break; } case IKSAR: { - pp->skills[EQEmu::skills::SkillForage] = 50; - pp->skills[EQEmu::skills::SkillSwimming] = 100; + pp->skills[EQ::skills::SkillForage] = 50; + pp->skills[EQ::skills::SkillSwimming] = 100; break; } case WOOD_ELF: { - pp->skills[EQEmu::skills::SkillForage] = 50; - pp->skills[EQEmu::skills::SkillHide] = 50; + pp->skills[EQ::skills::SkillForage] = 50; + pp->skills[EQ::skills::SkillHide] = 50; break; } case VAHSHIR: { - pp->skills[EQEmu::skills::SkillSafeFall] = 50; - pp->skills[EQEmu::skills::SkillSneak] = 50; + pp->skills[EQ::skills::SkillSafeFall] = 50; + pp->skills[EQ::skills::SkillSneak] = 50; break; } } diff --git a/world/client.h b/world/client.h index 4dbad85c5..289cf63af 100644 --- a/world/client.h +++ b/world/client.h @@ -68,7 +68,7 @@ public: inline const char* GetLSKey() { if (cle) { return cle->GetLSKey(); } return "NOKEY"; } inline uint32 GetCharID() { return charid; } inline const char* GetCharName() { return char_name; } - inline EQEmu::versions::ClientVersion GetClientVersion() { return m_ClientVersion; } + inline EQ::versions::ClientVersion GetClientVersion() { return m_ClientVersion; } inline ClientListEntry* GetCLE() { return cle; } inline void SetCLE(ClientListEntry* iCLE) { cle = iCLE; } private: @@ -85,7 +85,7 @@ private: bool enter_world_triggered; bool StartInTutorial; - EQEmu::versions::ClientVersion m_ClientVersion; + EQ::versions::ClientVersion m_ClientVersion; uint32 m_ClientVersionBit; bool OPCharCreate(char *name, CharCreate_Struct *cc); diff --git a/world/main.cpp b/world/main.cpp index 9aac1a903..526f839e5 100644 --- a/world/main.cpp +++ b/world/main.cpp @@ -99,7 +99,7 @@ UCSConnection UCSLink; QueryServConnection QSLink; LauncherList launcher_list; AdventureManager adventure_manager; -EQEmu::Random emu_random; +EQ::Random emu_random; volatile bool RunLoops = true; uint32 numclients = 0; uint32 numzones = 0; @@ -364,7 +364,7 @@ int main(int argc, char** argv) { } } - EQEmu::InitializeDynamicLookups(); + EQ::InitializeDynamicLookups(); LogInfo("Initialized dynamic dictionary entries"); if (RuleB(World, ClearTempMerchantlist)) { diff --git a/world/worlddb.cpp b/world/worlddb.cpp index f45207273..f42c04964 100644 --- a/world/worlddb.cpp +++ b/world/worlddb.cpp @@ -38,16 +38,16 @@ extern std::vector character_create_race_class_combos; */ void WorldDatabase::GetCharSelectInfo(uint32 account_id, EQApplicationPacket **out_app, uint32 client_version_bit) { - EQEmu::versions::ClientVersion - client_version = EQEmu::versions::ConvertClientVersionBitToClientVersion(client_version_bit); - size_t character_limit = EQEmu::constants::StaticLookup(client_version)->CharacterCreationLimit; + EQ::versions::ClientVersion + client_version = EQ::versions::ConvertClientVersionBitToClientVersion(client_version_bit); + size_t character_limit = EQ::constants::StaticLookup(client_version)->CharacterCreationLimit; - if (character_limit > EQEmu::constants::CHARACTER_CREATION_LIMIT) { - character_limit = EQEmu::constants::CHARACTER_CREATION_LIMIT; + if (character_limit > EQ::constants::CHARACTER_CREATION_LIMIT) { + character_limit = EQ::constants::CHARACTER_CREATION_LIMIT; } // Force Titanium clients to use '8' - if (client_version == EQEmu::versions::ClientVersion::Titanium) { + if (client_version == EQ::versions::ClientVersion::Titanium) { character_limit = 8; } @@ -104,9 +104,9 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, EQApplicationPacket **o for (auto row = results.begin(); row != results.end(); ++row) { CharacterSelectEntry_Struct *p_character_select_entry_struct = (CharacterSelectEntry_Struct *) buff_ptr; PlayerProfile_Struct player_profile_struct; - EQEmu::InventoryProfile inventory_profile; + EQ::InventoryProfile inventory_profile; - player_profile_struct.SetPlayerProfileVersion(EQEmu::versions::ConvertClientVersionToMobVersion(client_version)); + player_profile_struct.SetPlayerProfileVersion(EQ::versions::ConvertClientVersionToMobVersion(client_version)); inventory_profile.SetInventoryVersion(client_version); inventory_profile.SetGMInventory(true); // charsel can not interact with items..but, no harm in setting to full expansion support @@ -128,7 +128,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, EQApplicationPacket **o p_character_select_entry_struct->Gender = (uint8) atoi(row[2]); p_character_select_entry_struct->Face = (uint8) atoi(row[15]); - for (uint32 material_slot = 0; material_slot < EQEmu::textures::materialCount; material_slot++) { + for (uint32 material_slot = 0; material_slot < EQ::textures::materialCount; material_slot++) { p_character_select_entry_struct->Equip[material_slot].Material = 0; p_character_select_entry_struct->Equip[material_slot].Unknown1 = 0; p_character_select_entry_struct->Equip[material_slot].EliteModel = 0; @@ -294,12 +294,12 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, EQApplicationPacket **o } if (GetCharSelInventory(account_id, p_character_select_entry_struct->Name, &inventory_profile)) { - const EQEmu::ItemData *item = nullptr; - const EQEmu::ItemInstance *inst = nullptr; + const EQ::ItemData *item = nullptr; + const EQ::ItemInstance *inst = nullptr; int16 inventory_slot = 0; - for (uint32 matslot = EQEmu::textures::textureBegin; matslot < EQEmu::textures::materialCount; matslot++) { - inventory_slot = EQEmu::InventoryProfile::CalcSlotFromMaterial(matslot); + for (uint32 matslot = EQ::textures::textureBegin; matslot < EQ::textures::materialCount; matslot++) { + inventory_slot = EQ::InventoryProfile::CalcSlotFromMaterial(matslot); if (inventory_slot == INVALID_INDEX) { continue; } inst = inventory_profile.GetItem(inventory_slot); if (inst == nullptr) { @@ -323,7 +323,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, EQApplicationPacket **o p_character_select_entry_struct->Equip[matslot].Material = item_id_file; } } - if (matslot == EQEmu::textures::weaponPrimary) { + if (matslot == EQ::textures::weaponPrimary) { p_character_select_entry_struct->PrimaryIDFile = item_id_file; } else { @@ -645,7 +645,7 @@ bool WorldDatabase::LoadCharacterCreateCombos() } // this is a slightly modified version of SharedDatabase::GetInventory(...) for character select use-only -bool WorldDatabase::GetCharSelInventory(uint32 account_id, char *name, EQEmu::InventoryProfile *inv) +bool WorldDatabase::GetCharSelInventory(uint32 account_id, char *name, EQ::InventoryProfile *inv) { if (!account_id || !name || !inv) return false; @@ -683,8 +683,8 @@ bool WorldDatabase::GetCharSelInventory(uint32 account_id, char *name, EQEmu::In " slotid <= %i", name, account_id, - EQEmu::invslot::slotHead, - EQEmu::invslot::slotFeet + EQ::invslot::slotHead, + EQ::invslot::slotFeet ); auto results = QueryDatabase(query); if (!results.Success()) @@ -694,13 +694,13 @@ bool WorldDatabase::GetCharSelInventory(uint32 account_id, char *name, EQEmu::In int16 slot_id = atoi(row[0]); switch (slot_id) { - case EQEmu::invslot::slotFace: - case EQEmu::invslot::slotEar2: - case EQEmu::invslot::slotNeck: - case EQEmu::invslot::slotShoulders: - case EQEmu::invslot::slotBack: - case EQEmu::invslot::slotFinger1: - case EQEmu::invslot::slotFinger2: + case EQ::invslot::slotFace: + case EQ::invslot::slotEar2: + case EQ::invslot::slotNeck: + case EQ::invslot::slotShoulders: + case EQ::invslot::slotBack: + case EQ::invslot::slotFinger1: + case EQ::invslot::slotFinger2: continue; default: break; @@ -710,7 +710,7 @@ bool WorldDatabase::GetCharSelInventory(uint32 account_id, char *name, EQEmu::In int8 charges = atoi(row[2]); uint32 color = atoul(row[3]); - uint32 aug[EQEmu::invaug::SOCKET_COUNT]; + uint32 aug[EQ::invaug::SOCKET_COUNT]; aug[0] = (uint32)atoi(row[4]); aug[1] = (uint32)atoi(row[5]); aug[2] = (uint32)atoi(row[6]); @@ -723,11 +723,11 @@ bool WorldDatabase::GetCharSelInventory(uint32 account_id, char *name, EQEmu::In uint32 ornament_idfile = (uint32)atoul(row[13]); uint32 ornament_hero_model = (uint32)atoul(row[14]); - const EQEmu::ItemData *item = GetItem(item_id); + const EQ::ItemData *item = GetItem(item_id); if (!item) continue; - EQEmu::ItemInstance *inst = CreateBaseItem(item, charges); + EQ::ItemInstance *inst = CreateBaseItem(item, charges); if (inst == nullptr) continue; @@ -770,7 +770,7 @@ bool WorldDatabase::GetCharSelInventory(uint32 account_id, char *name, EQEmu::In inst->SetCharges(charges); if (item->IsClassCommon()) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { if (aug[i]) inst->PutAugment(this, i, aug[i]); } diff --git a/world/worlddb.h b/world/worlddb.h index e367803ec..2000f9bf0 100644 --- a/world/worlddb.h +++ b/world/worlddb.h @@ -42,7 +42,7 @@ private: void SetTitaniumDefaultStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc); void SetSoFDefaultStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc); - bool GetCharSelInventory(uint32 account_id, char* name, EQEmu::InventoryProfile* inv); + bool GetCharSelInventory(uint32 account_id, char* name, EQ::InventoryProfile* inv); }; extern WorldDatabase database; diff --git a/world/zonelist.cpp b/world/zonelist.cpp index 7f898f89c..7bcc2f177 100644 --- a/world/zonelist.cpp +++ b/world/zonelist.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA extern uint32 numzones; extern bool holdzones; -extern EQEmu::Random emu_random; +extern EQ::Random emu_random; extern WebInterfaceList web_interface; volatile bool UCSServerAvailable_ = false; void CatchSignal(int sig_num); diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index 3b1bfad38..282c5f6be 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -1078,7 +1078,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) { LogInfo("Unable to locate zone record for zone id [{}] or instance id [{}] in zoneserver list for ServerOP_Consent_Response operation", s->zone_id, s->instance_id); } - if (s->consent_type == EQEmu::consent::Normal) { + if (s->consent_type == EQ::consent::Normal) { // send the message to the client being granted or denied permission ClientListEntry* cle = client_list.FindCharacter(s->grantname); if (cle) { diff --git a/zone/aa.cpp b/zone/aa.cpp index 1ccc6f656..39df8d4bc 100644 --- a/zone/aa.cpp +++ b/zone/aa.cpp @@ -441,12 +441,12 @@ void Mob::WakeTheDead(uint16 spell_id, Mob *target, uint32 duration) //gear stuff, need to make sure there's //no situation where this stuff can be duped - for (int x = EQEmu::invslot::EQUIPMENT_BEGIN; x <= EQEmu::invslot::EQUIPMENT_END; x++) + for (int x = EQ::invslot::EQUIPMENT_BEGIN; x <= EQ::invslot::EQUIPMENT_END; x++) { uint32 sitem = 0; sitem = CorpseToUse->GetWornItem(x); if(sitem){ - const EQEmu::ItemData * itm = database.GetItem(sitem); + const EQ::ItemData * itm = database.GetItem(sitem); npca->AddLootDrop(itm, &npca->itemlist, 1, 1, 255, true, true); } } @@ -494,7 +494,7 @@ void Client::ResetAA() { database.DeleteCharacterLeadershipAAs(CharacterID()); // undefined for these clients - if (ClientVersionBit() & EQEmu::versions::maskTitaniumAndEarlier) + if (ClientVersionBit() & EQ::versions::maskTitaniumAndEarlier) Kick("AA Reset on client that doesn't support it"); } @@ -1245,12 +1245,12 @@ void Client::ActivateAlternateAdvancementAbility(int rank_id, int target_id) { // Bards can cast instant cast AAs while they are casting another song if(spells[rank->spell].cast_time == 0 && GetClass() == BARD && IsBardSong(casting_spell_id)) { - if(!SpellFinished(rank->spell, entity_list.GetMob(target_id), EQEmu::spells::CastingSlot::AltAbility, spells[rank->spell].mana, -1, spells[rank->spell].ResistDiff, false)) { + if(!SpellFinished(rank->spell, entity_list.GetMob(target_id), EQ::spells::CastingSlot::AltAbility, spells[rank->spell].mana, -1, spells[rank->spell].ResistDiff, false)) { return; } ExpendAlternateAdvancementCharge(ability->id); } else { - if(!CastSpell(rank->spell, target_id, EQEmu::spells::CastingSlot::AltAbility, -1, -1, 0, -1, rank->spell_type + pTimerAAStart, cooldown, nullptr, rank->id)) { + if(!CastSpell(rank->spell, target_id, EQ::spells::CastingSlot::AltAbility, -1, -1, 0, -1, rank->spell_type + pTimerAAStart, cooldown, nullptr, rank->id)) { return; } } @@ -1479,7 +1479,7 @@ bool Mob::CanUseAlternateAdvancementRank(AA::Rank *rank) { //the one titanium hack i will allow //just to make sure we dont crash the client with newer aas //we'll exclude any expendable ones - if(IsClient() && CastToClient()->ClientVersionBit() & EQEmu::versions::maskTitaniumAndEarlier) { + if(IsClient() && CastToClient()->ClientVersionBit() & EQ::versions::maskTitaniumAndEarlier) { if(ability->charges > 0) { return false; } diff --git a/zone/attack.cpp b/zone/attack.cpp index 4da160608..4ac29fdc0 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -59,74 +59,74 @@ extern FastMath g_Math; extern EntityList entity_list; extern Zone* zone; -EQEmu::skills::SkillType Mob::AttackAnimation(int Hand, const EQEmu::ItemInstance* weapon, EQEmu::skills::SkillType skillinuse) +EQ::skills::SkillType Mob::AttackAnimation(int Hand, const EQ::ItemInstance* weapon, EQ::skills::SkillType skillinuse) { // Determine animation int type = 0; if (weapon && weapon->IsClassCommon()) { - const EQEmu::ItemData* item = weapon->GetItem(); + const EQ::ItemData* item = weapon->GetItem(); Log(Logs::Detail, Logs::Attack, "Weapon skill : %i", item->ItemType); switch (item->ItemType) { - case EQEmu::item::ItemType1HSlash: // 1H Slashing - skillinuse = EQEmu::skills::Skill1HSlashing; + case EQ::item::ItemType1HSlash: // 1H Slashing + skillinuse = EQ::skills::Skill1HSlashing; type = anim1HWeapon; break; - case EQEmu::item::ItemType2HSlash: // 2H Slashing - skillinuse = EQEmu::skills::Skill2HSlashing; + case EQ::item::ItemType2HSlash: // 2H Slashing + skillinuse = EQ::skills::Skill2HSlashing; type = anim2HSlashing; break; - case EQEmu::item::ItemType1HPiercing: // Piercing - skillinuse = EQEmu::skills::Skill1HPiercing; + case EQ::item::ItemType1HPiercing: // Piercing + skillinuse = EQ::skills::Skill1HPiercing; type = anim1HPiercing; break; - case EQEmu::item::ItemType1HBlunt: // 1H Blunt - skillinuse = EQEmu::skills::Skill1HBlunt; + case EQ::item::ItemType1HBlunt: // 1H Blunt + skillinuse = EQ::skills::Skill1HBlunt; type = anim1HWeapon; break; - case EQEmu::item::ItemType2HBlunt: // 2H Blunt - skillinuse = EQEmu::skills::Skill2HBlunt; + case EQ::item::ItemType2HBlunt: // 2H Blunt + skillinuse = EQ::skills::Skill2HBlunt; type = anim2HSlashing; //anim2HWeapon break; - case EQEmu::item::ItemType2HPiercing: // 2H Piercing - if (IsClient() && CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::RoF2) - skillinuse = EQEmu::skills::Skill1HPiercing; + case EQ::item::ItemType2HPiercing: // 2H Piercing + if (IsClient() && CastToClient()->ClientVersion() < EQ::versions::ClientVersion::RoF2) + skillinuse = EQ::skills::Skill1HPiercing; else - skillinuse = EQEmu::skills::Skill2HPiercing; + skillinuse = EQ::skills::Skill2HPiercing; type = anim2HWeapon; break; - case EQEmu::item::ItemTypeMartial: - skillinuse = EQEmu::skills::SkillHandtoHand; + case EQ::item::ItemTypeMartial: + skillinuse = EQ::skills::SkillHandtoHand; type = animHand2Hand; break; default: - skillinuse = EQEmu::skills::SkillHandtoHand; + skillinuse = EQ::skills::SkillHandtoHand; type = animHand2Hand; break; }// switch } else if (IsNPC()) { switch (skillinuse) { - case EQEmu::skills::Skill1HSlashing: // 1H Slashing + case EQ::skills::Skill1HSlashing: // 1H Slashing type = anim1HWeapon; break; - case EQEmu::skills::Skill2HSlashing: // 2H Slashing + case EQ::skills::Skill2HSlashing: // 2H Slashing type = anim2HSlashing; break; - case EQEmu::skills::Skill1HPiercing: // Piercing + case EQ::skills::Skill1HPiercing: // Piercing type = anim1HPiercing; break; - case EQEmu::skills::Skill1HBlunt: // 1H Blunt + case EQ::skills::Skill1HBlunt: // 1H Blunt type = anim1HWeapon; break; - case EQEmu::skills::Skill2HBlunt: // 2H Blunt + case EQ::skills::Skill2HBlunt: // 2H Blunt type = anim2HSlashing; //anim2HWeapon break; - case EQEmu::skills::Skill2HPiercing: // 2H Piercing + case EQ::skills::Skill2HPiercing: // 2H Piercing type = anim2HWeapon; break; - case EQEmu::skills::SkillHandtoHand: + case EQ::skills::SkillHandtoHand: type = animHand2Hand; break; default: @@ -135,12 +135,12 @@ EQEmu::skills::SkillType Mob::AttackAnimation(int Hand, const EQEmu::ItemInstanc }// switch } else { - skillinuse = EQEmu::skills::SkillHandtoHand; + skillinuse = EQ::skills::SkillHandtoHand; type = animHand2Hand; } // If we're attacking with the secondary hand, play the dual wield anim - if (Hand == EQEmu::invslot::slotSecondary) // DW anim + if (Hand == EQ::invslot::slotSecondary) // DW anim type = animDualWield; DoAnim(type, 0, false); @@ -148,9 +148,9 @@ EQEmu::skills::SkillType Mob::AttackAnimation(int Hand, const EQEmu::ItemInstanc return skillinuse; } -int Mob::compute_tohit(EQEmu::skills::SkillType skillinuse) +int Mob::compute_tohit(EQ::skills::SkillType skillinuse) { - int tohit = GetSkill(EQEmu::skills::SkillOffense) + 7; + int tohit = GetSkill(EQ::skills::SkillOffense) + 7; tohit += GetSkill(skillinuse); if (IsNPC()) tohit += CastToNPC()->GetAccuracyRating(); @@ -168,7 +168,7 @@ int Mob::compute_tohit(EQEmu::skills::SkillType skillinuse) } // return -1 in cases that always hit -int Mob::GetTotalToHit(EQEmu::skills::SkillType skill, int chance_mod) +int Mob::GetTotalToHit(EQ::skills::SkillType skill, int chance_mod) { if (chance_mod >= 10000) // override for stuff like SE_SkillAttack return -1; @@ -185,13 +185,13 @@ int Mob::GetTotalToHit(EQEmu::skills::SkillType skill, int chance_mod) // unsure on the stacking order of these effects, rather hard to parse // item mod2 accuracy isn't applied to range? Theory crafting and parses back it up I guess // mod2 accuracy -- flat bonus - if (skill != EQEmu::skills::SkillArchery && skill != EQEmu::skills::SkillThrowing) + if (skill != EQ::skills::SkillArchery && skill != EQ::skills::SkillThrowing) accuracy += itembonuses.HitChance; // 216 Melee Accuracy Amt aka SE_Accuracy -- flat bonus - accuracy += itembonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] + - aabonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] + - spellbonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] + + accuracy += itembonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1] + + aabonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1] + + spellbonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.Accuracy[skill] + aabonuses.Accuracy[skill] + spellbonuses.Accuracy[skill]; @@ -200,13 +200,13 @@ int Mob::GetTotalToHit(EQEmu::skills::SkillType skill, int chance_mod) if (spellbonuses.HitChanceEffect[skill] >= 10000 || aabonuses.HitChanceEffect[skill] >= 10000) return -1; - if (spellbonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] >= 10000) + if (spellbonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] >= 10000) return -1; // 184 Accuracy % aka SE_HitChance -- percentage increase - auto hit_bonus = itembonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] + - aabonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] + - spellbonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] + + auto hit_bonus = itembonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] + + aabonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] + + spellbonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.HitChanceEffect[skill] + aabonuses.HitChanceEffect[skill] + spellbonuses.HitChanceEffect[skill]; @@ -228,7 +228,7 @@ int Mob::GetTotalToHit(EQEmu::skills::SkillType skill, int chance_mod) // the AGI bonus has actually drastically changed from classic int Mob::compute_defense() { - int defense = GetSkill(EQEmu::skills::SkillDefense) * 400 / 225; + int defense = GetSkill(EQ::skills::SkillDefense) * 400 / 225; defense += (8000 * (GetAGI() - 40)) / 36000; if (IsClient()) defense += CastToClient()->GetHeroicAGI() / 10; @@ -390,20 +390,20 @@ bool Mob::AvoidDamage(Mob *other, DamageHitInfo &hit) // riposte -- it may seem crazy, but if the attacker has SPA 173 on them, they are immune to Ripo bool ImmuneRipo = attacker->aabonuses.RiposteChance || attacker->spellbonuses.RiposteChance || attacker->itembonuses.RiposteChance || attacker->IsEnraged(); // Need to check if we have something in MainHand to actually attack with (or fists) - if (hit.hand != EQEmu::invslot::slotRange && (CanThisClassRiposte() || IsEnraged()) && InFront && !ImmuneRipo) { + if (hit.hand != EQ::invslot::slotRange && (CanThisClassRiposte() || IsEnraged()) && InFront && !ImmuneRipo) { if (IsEnraged()) { hit.damage_done = DMG_RIPOSTED; LogCombat("I am enraged, riposting frontal attack"); return true; } if (IsClient()) - CastToClient()->CheckIncreaseSkill(EQEmu::skills::SkillRiposte, other, -10); + CastToClient()->CheckIncreaseSkill(EQ::skills::SkillRiposte, other, -10); // check auto discs ... I guess aa/items too :P if (spellbonuses.RiposteChance == 10000 || aabonuses.RiposteChance == 10000 || itembonuses.RiposteChance == 10000) { hit.damage_done = DMG_RIPOSTED; return true; } - int chance = GetSkill(EQEmu::skills::SkillRiposte) + 100; + int chance = GetSkill(EQ::skills::SkillRiposte) + 100; chance += (chance * (aabonuses.RiposteChance + spellbonuses.RiposteChance + itembonuses.RiposteChance)) / 100; chance /= 50; chance += itembonuses.HeroicDEX / 25; // live has "heroic strickthrough" here to counter @@ -412,7 +412,7 @@ bool Mob::AvoidDamage(Mob *other, DamageHitInfo &hit) chance -= chance * counter; } // AA Slippery Attacks - if (hit.hand == EQEmu::invslot::slotSecondary) { + if (hit.hand == EQ::invslot::slotSecondary) { int slip = aabonuses.OffhandRiposteFail + itembonuses.OffhandRiposteFail + spellbonuses.OffhandRiposteFail; chance += chance * slip / 100; } @@ -435,14 +435,14 @@ bool Mob::AvoidDamage(Mob *other, DamageHitInfo &hit) if (CanThisClassBlock() && (InFront || bBlockFromRear)) { if (IsClient()) - CastToClient()->CheckIncreaseSkill(EQEmu::skills::SkillBlock, other, -10); + CastToClient()->CheckIncreaseSkill(EQ::skills::SkillBlock, other, -10); // check auto discs ... I guess aa/items too :P if (spellbonuses.IncreaseBlockChance == 10000 || aabonuses.IncreaseBlockChance == 10000 || itembonuses.IncreaseBlockChance == 10000) { hit.damage_done = DMG_BLOCKED; return true; } - int chance = GetSkill(EQEmu::skills::SkillBlock) + 100; + int chance = GetSkill(EQ::skills::SkillBlock) + 100; chance += (chance * (aabonuses.IncreaseBlockChance + spellbonuses.IncreaseBlockChance + itembonuses.IncreaseBlockChance)) / 100; chance /= 25; chance += itembonuses.HeroicDEX / 25; // live has "heroic strickthrough" here to counter @@ -457,15 +457,15 @@ bool Mob::AvoidDamage(Mob *other, DamageHitInfo &hit) } // parry - if (CanThisClassParry() && InFront && hit.hand != EQEmu::invslot::slotRange) { + if (CanThisClassParry() && InFront && hit.hand != EQ::invslot::slotRange) { if (IsClient()) - CastToClient()->CheckIncreaseSkill(EQEmu::skills::SkillParry, other, -10); + CastToClient()->CheckIncreaseSkill(EQ::skills::SkillParry, other, -10); // check auto discs ... I guess aa/items too :P if (spellbonuses.ParryChance == 10000 || aabonuses.ParryChance == 10000 || itembonuses.ParryChance == 10000) { hit.damage_done = DMG_PARRIED; return true; } - int chance = GetSkill(EQEmu::skills::SkillParry) + 100; + int chance = GetSkill(EQ::skills::SkillParry) + 100; chance += (chance * (aabonuses.ParryChance + spellbonuses.ParryChance + itembonuses.ParryChance)) / 100; chance /= 45; chance += itembonuses.HeroicDEX / 25; // live has "heroic strickthrough" here to counter @@ -482,13 +482,13 @@ bool Mob::AvoidDamage(Mob *other, DamageHitInfo &hit) // dodge if (CanThisClassDodge() && (InFront || GetClass() == MONK)) { if (IsClient()) - CastToClient()->CheckIncreaseSkill(EQEmu::skills::SkillDodge, other, -10); + CastToClient()->CheckIncreaseSkill(EQ::skills::SkillDodge, other, -10); // check auto discs ... I guess aa/items too :P if (spellbonuses.DodgeChance == 10000 || aabonuses.DodgeChance == 10000 || itembonuses.DodgeChance == 10000) { hit.damage_done = DMG_DODGED; return true; } - int chance = GetSkill(EQEmu::skills::SkillDodge) + 100; + int chance = GetSkill(EQ::skills::SkillDodge) + 100; chance += (chance * (aabonuses.DodgeChance + spellbonuses.DodgeChance + itembonuses.DodgeChance)) / 100; chance /= 45; chance += itembonuses.HeroicAGI / 25; // live has "heroic strickthrough" here to counter @@ -775,7 +775,7 @@ int Mob::GetClassRaceACBonus() } if (GetRace() == IKSAR) - ac_bonus += EQEmu::Clamp(static_cast(level), 10, 35); + ac_bonus += EQ::Clamp(static_cast(level), 10, 35); return ac_bonus; } @@ -787,7 +787,7 @@ int Mob::ACSum() int shield_ac = 0; if (HasShieldEquiped() && IsClient()) { auto client = CastToClient(); - auto inst = client->GetInv().GetItem(EQEmu::invslot::slotSecondary); + auto inst = client->GetInv().GetItem(EQ::invslot::slotSecondary); if (inst) { if (inst->GetItemRecommendedLevel(true) <= GetLevel()) shield_ac = inst->GetItemArmorClass(true); @@ -816,18 +816,18 @@ int Mob::ACSum() if (owner) ac += owner->aabonuses.PetAvoidance + owner->spellbonuses.PetAvoidance + owner->itembonuses.PetAvoidance; auto spell_aa_ac = aabonuses.AC + spellbonuses.AC; - ac += GetSkill(EQEmu::skills::SkillDefense) / 5; - if (EQEmu::ValueWithin(static_cast(GetClass()), NECROMANCER, ENCHANTER)) + ac += GetSkill(EQ::skills::SkillDefense) / 5; + if (EQ::ValueWithin(static_cast(GetClass()), NECROMANCER, ENCHANTER)) ac += spell_aa_ac / 3; else ac += spell_aa_ac / 4; } else { // TODO: so we can't set NPC skills ... so the skill bonus ends up being HUGE so lets nerf them a bit auto spell_aa_ac = aabonuses.AC + spellbonuses.AC; - if (EQEmu::ValueWithin(static_cast(GetClass()), NECROMANCER, ENCHANTER)) - ac += GetSkill(EQEmu::skills::SkillDefense) / 2 + spell_aa_ac / 3; + if (EQ::ValueWithin(static_cast(GetClass()), NECROMANCER, ENCHANTER)) + ac += GetSkill(EQ::skills::SkillDefense) / 2 + spell_aa_ac / 3; else - ac += GetSkill(EQEmu::skills::SkillDefense) / 3 + spell_aa_ac / 4; + ac += GetSkill(EQ::skills::SkillDefense) / 3 + spell_aa_ac / 4; } if (GetAGI() > 70) @@ -862,19 +862,19 @@ int Mob::ACSum() int Mob::GetBestMeleeSkill() { int bestSkill=0; - EQEmu::skills::SkillType meleeSkills[]= - { EQEmu::skills::Skill1HBlunt, - EQEmu::skills::Skill1HSlashing, - EQEmu::skills::Skill2HBlunt, - EQEmu::skills::Skill2HSlashing, - EQEmu::skills::SkillHandtoHand, - EQEmu::skills::Skill1HPiercing, - EQEmu::skills::Skill2HPiercing, - EQEmu::skills::SkillCount + EQ::skills::SkillType meleeSkills[]= + { EQ::skills::Skill1HBlunt, + EQ::skills::Skill1HSlashing, + EQ::skills::Skill2HBlunt, + EQ::skills::Skill2HSlashing, + EQ::skills::SkillHandtoHand, + EQ::skills::Skill1HPiercing, + EQ::skills::Skill2HPiercing, + EQ::skills::SkillCount }; int i; - for (i=0; meleeSkills[i] != EQEmu::skills::SkillCount; ++i) { + for (i=0; meleeSkills[i] != EQ::skills::SkillCount; ++i) { int value; value = GetSkill(meleeSkills[i]); bestSkill = std::max(value, bestSkill); @@ -883,14 +883,14 @@ int Mob::GetBestMeleeSkill() return bestSkill; } -int Mob::offense(EQEmu::skills::SkillType skill) +int Mob::offense(EQ::skills::SkillType skill) { int offense = GetSkill(skill); int stat_bonus = GetSTR(); switch (skill) { - case EQEmu::skills::SkillArchery: - case EQEmu::skills::SkillThrowing: + case EQ::skills::SkillArchery: + case EQ::skills::SkillThrowing: stat_bonus = GetDEX(); break; @@ -901,7 +901,7 @@ int Mob::offense(EQEmu::skills::SkillType skill) // // Maybe we tweak this if Disarm is actually implemented. - case EQEmu::skills::SkillHandtoHand: + case EQ::skills::SkillHandtoHand: offense = GetBestMeleeSkill(); break; } @@ -933,7 +933,7 @@ double Mob::RollD20(int offense, int mitigation) int avg = (offense + mitigation + 10) / 2; int index = std::max(0, (atk_roll - def_roll) + (avg / 2)); - index = EQEmu::Clamp((index * 20) / avg, 0, 19); + index = EQ::Clamp((index * 20) / avg, 0, 19); return mods[index]; } @@ -973,9 +973,9 @@ void Mob::MeleeMitigation(Mob *attacker, DamageHitInfo &hit, ExtraAttackOptions //Returns the weapon damage against the input mob //if we cannot hit the mob with the current weapon we will get a value less than or equal to zero //Else we know we can hit. -//GetWeaponDamage(mob*, const EQEmu::ItemData*) is intended to be used for mobs or any other situation where we do not have a client inventory item -//GetWeaponDamage(mob*, const EQEmu::ItemInstance*) is intended to be used for situations where we have a client inventory item -int Mob::GetWeaponDamage(Mob *against, const EQEmu::ItemData *weapon_item) { +//GetWeaponDamage(mob*, const EQ::ItemData*) is intended to be used for mobs or any other situation where we do not have a client inventory item +//GetWeaponDamage(mob*, const EQ::ItemInstance*) is intended to be used for situations where we have a client inventory item +int Mob::GetWeaponDamage(Mob *against, const EQ::ItemData *weapon_item) { int dmg = 0; int banedmg = 0; @@ -1075,7 +1075,7 @@ int Mob::GetWeaponDamage(Mob *against, const EQEmu::ItemData *weapon_item) { return dmg; } -int Mob::GetWeaponDamage(Mob *against, const EQEmu::ItemInstance *weapon_item, uint32 *hate) +int Mob::GetWeaponDamage(Mob *against, const EQ::ItemInstance *weapon_item, uint32 *hate) { int dmg = 0; int banedmg = 0; @@ -1116,7 +1116,7 @@ int Mob::GetWeaponDamage(Mob *against, const EQEmu::ItemInstance *weapon_item, u else { bool MagicGloves = false; if (IsClient()) { - const EQEmu::ItemInstance *gloves = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotHands); + const EQ::ItemInstance *gloves = CastToClient()->GetInv().GetItem(EQ::invslot::slotHands); if (gloves) MagicGloves = gloves->GetItemMagical(true); } @@ -1401,13 +1401,13 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b if (GetFeigned()) return false; // Rogean: How can you attack while feigned? Moved up from Aggro Code. - EQEmu::ItemInstance* weapon = nullptr; - if (Hand == EQEmu::invslot::slotSecondary) { // Kaiyodo - Pick weapon from the attacking hand - weapon = GetInv().GetItem(EQEmu::invslot::slotSecondary); + EQ::ItemInstance* weapon = nullptr; + if (Hand == EQ::invslot::slotSecondary) { // Kaiyodo - Pick weapon from the attacking hand + weapon = GetInv().GetItem(EQ::invslot::slotSecondary); OffHandAtk(true); } else { - weapon = GetInv().GetItem(EQEmu::invslot::slotPrimary); + weapon = GetInv().GetItem(EQ::invslot::slotPrimary); OffHandAtk(false); } @@ -1445,16 +1445,16 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b if (my_hit.base_damage > 0) { // if we revamp this function be more general, we will have to make sure this isn't // executed for anything BUT normal melee damage weapons from auto attack - if (Hand == EQEmu::invslot::slotPrimary || Hand == EQEmu::invslot::slotSecondary) + if (Hand == EQ::invslot::slotPrimary || Hand == EQ::invslot::slotSecondary) my_hit.base_damage = DoDamageCaps(my_hit.base_damage); auto shield_inc = spellbonuses.ShieldEquipDmgMod + itembonuses.ShieldEquipDmgMod + aabonuses.ShieldEquipDmgMod; - if (shield_inc > 0 && HasShieldEquiped() && Hand == EQEmu::invslot::slotPrimary) { + if (shield_inc > 0 && HasShieldEquiped() && Hand == EQ::invslot::slotPrimary) { my_hit.base_damage = my_hit.base_damage * (100 + shield_inc) / 100; hate = hate * (100 + shield_inc) / 100; } CheckIncreaseSkill(my_hit.skill, other, -15); - CheckIncreaseSkill(EQEmu::skills::SkillOffense, other, -15); + CheckIncreaseSkill(EQ::skills::SkillOffense, other, -15); // *************************************************************** // *** Calculate the damage bonus, if applicable, for this hit *** @@ -1470,22 +1470,22 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b int ucDamageBonus = 0; - if (Hand == EQEmu::invslot::slotPrimary && GetLevel() >= 28 && IsWarriorClass()) + if (Hand == EQ::invslot::slotPrimary && GetLevel() >= 28 && IsWarriorClass()) { // Damage bonuses apply only to hits from the main hand (Hand == MainPrimary) by characters level 28 and above // who belong to a melee class. If we're here, then all of these conditions apply. - ucDamageBonus = GetWeaponDamageBonus(weapon ? weapon->GetItem() : (const EQEmu::ItemData*) nullptr); + ucDamageBonus = GetWeaponDamageBonus(weapon ? weapon->GetItem() : (const EQ::ItemData*) nullptr); my_hit.min_damage = ucDamageBonus; hate += ucDamageBonus; } #endif //Live AA - Sinister Strikes *Adds weapon damage bonus to offhand weapon. - if (Hand == EQEmu::invslot::slotSecondary) { + if (Hand == EQ::invslot::slotSecondary) { if (aabonuses.SecondaryDmgInc || itembonuses.SecondaryDmgInc || spellbonuses.SecondaryDmgInc) { - ucDamageBonus = GetWeaponDamageBonus(weapon ? weapon->GetItem() : (const EQEmu::ItemData*) nullptr, true); + ucDamageBonus = GetWeaponDamageBonus(weapon ? weapon->GetItem() : (const EQ::ItemData*) nullptr, true); my_hit.min_damage = ucDamageBonus; hate += ucDamageBonus; @@ -1528,7 +1528,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b IsValidSpell(aabonuses.SkillAttackProc[2])) { float chance = aabonuses.SkillAttackProc[0] / 1000.0f; if (zone->random.Roll(chance)) - SpellFinished(aabonuses.SkillAttackProc[2], other, EQEmu::spells::CastingSlot::Item, 0, -1, + SpellFinished(aabonuses.SkillAttackProc[2], other, EQ::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SkillAttackProc[2]].ResistDiff); } other->Damage(this, my_hit.damage_done, SPELL_UNKNOWN, my_hit.skill, true, -1, false, m_specialattacks); @@ -1559,7 +1559,7 @@ void Mob::Heal() SendHPUpdate(); } -void Client::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) +void Client::Damage(Mob* other, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) { if (dead || IsCorpse()) return; @@ -1574,7 +1574,7 @@ void Client::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::Sk //patch notes on PVP reductions only mention archery/throwing ... not normal dmg if (other && other->IsClient() && (other != this) && damage > 0) { int PvPMitigation = 100; - if (attack_skill == EQEmu::skills::SkillArchery || attack_skill == EQEmu::skills::SkillThrowing) + if (attack_skill == EQ::skills::SkillArchery || attack_skill == EQ::skills::SkillThrowing) PvPMitigation = 80; else PvPMitigation = 67; @@ -1590,11 +1590,11 @@ void Client::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::Sk if (damage > 0) { if (spell_id == SPELL_UNKNOWN) - CheckIncreaseSkill(EQEmu::skills::SkillDefense, other, -15); + CheckIncreaseSkill(EQ::skills::SkillDefense, other, -15); } } -bool Client::Death(Mob* killerMob, int32 damage, uint16 spell, EQEmu::skills::SkillType attack_skill) +bool Client::Death(Mob* killerMob, int32 damage, uint16 spell, EQ::skills::SkillType attack_skill) { if (!ClientFinishedLoading()) return false; @@ -1796,7 +1796,7 @@ bool Client::Death(Mob* killerMob, int32 damage, uint16 spell, EQEmu::skills::Sk //this generates a lot of 'updates' to the client that the client does not need BuffFadeNonPersistDeath(); if (RuleB(Character, UnmemSpellsOnDeath)) { - if ((ClientVersionBit() & EQEmu::versions::maskSoFAndLater) && RuleB(Character, RespawnFromHover)) + if ((ClientVersionBit() & EQ::versions::maskSoFAndLater) && RuleB(Character, RespawnFromHover)) UnmemSpellAll(true); else UnmemSpellAll(false); @@ -1870,7 +1870,7 @@ bool Client::Death(Mob* killerMob, int32 damage, uint16 spell, EQEmu::skills::Sk from these and overwrite what we set in pp anyway */ - if (LeftCorpse && (ClientVersionBit() & EQEmu::versions::maskSoFAndLater) && RuleB(Character, RespawnFromHover)) + if (LeftCorpse && (ClientVersionBit() & EQ::versions::maskSoFAndLater) && RuleB(Character, RespawnFromHover)) { ClearDraggedCorpses(); RespawnFromHoverTimer.Start(RuleI(Character, RespawnFromHoverTimer) * 1000); @@ -1940,63 +1940,63 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool FaceTarget(GetTarget()); DamageHitInfo my_hit; - my_hit.skill = EQEmu::skills::SkillHandtoHand; + my_hit.skill = EQ::skills::SkillHandtoHand; my_hit.hand = Hand; my_hit.damage_done = 1; - if (Hand == EQEmu::invslot::slotPrimary) { - my_hit.skill = static_cast(GetPrimSkill()); + if (Hand == EQ::invslot::slotPrimary) { + my_hit.skill = static_cast(GetPrimSkill()); OffHandAtk(false); } - if (Hand == EQEmu::invslot::slotSecondary) { - my_hit.skill = static_cast(GetSecSkill()); + if (Hand == EQ::invslot::slotSecondary) { + my_hit.skill = static_cast(GetSecSkill()); OffHandAtk(true); } //figure out what weapon they are using, if any - const EQEmu::ItemData* weapon = nullptr; - if (Hand == EQEmu::invslot::slotPrimary && equipment[EQEmu::invslot::slotPrimary] > 0) - weapon = database.GetItem(equipment[EQEmu::invslot::slotPrimary]); - else if (equipment[EQEmu::invslot::slotSecondary]) - weapon = database.GetItem(equipment[EQEmu::invslot::slotSecondary]); + const EQ::ItemData* weapon = nullptr; + if (Hand == EQ::invslot::slotPrimary && equipment[EQ::invslot::slotPrimary] > 0) + weapon = database.GetItem(equipment[EQ::invslot::slotPrimary]); + else if (equipment[EQ::invslot::slotSecondary]) + weapon = database.GetItem(equipment[EQ::invslot::slotSecondary]); //We dont factor much from the weapon into the attack. //Just the skill type so it doesn't look silly using punching animations and stuff while wielding weapons if (weapon) { LogCombat("Attacking with weapon: [{}] ([{}]) (too bad im not using it for much)", weapon->Name, weapon->ID); - if (Hand == EQEmu::invslot::slotSecondary && !weapon->IsType1HWeapon()) { + if (Hand == EQ::invslot::slotSecondary && !weapon->IsType1HWeapon()) { LogCombat("Attack with non-weapon cancelled"); return false; } switch (weapon->ItemType) { - case EQEmu::item::ItemType1HSlash: - my_hit.skill = EQEmu::skills::Skill1HSlashing; + case EQ::item::ItemType1HSlash: + my_hit.skill = EQ::skills::Skill1HSlashing; break; - case EQEmu::item::ItemType2HSlash: - my_hit.skill = EQEmu::skills::Skill2HSlashing; + case EQ::item::ItemType2HSlash: + my_hit.skill = EQ::skills::Skill2HSlashing; break; - case EQEmu::item::ItemType1HPiercing: - my_hit.skill = EQEmu::skills::Skill1HPiercing; + case EQ::item::ItemType1HPiercing: + my_hit.skill = EQ::skills::Skill1HPiercing; break; - case EQEmu::item::ItemType2HPiercing: - my_hit.skill = EQEmu::skills::Skill2HPiercing; + case EQ::item::ItemType2HPiercing: + my_hit.skill = EQ::skills::Skill2HPiercing; break; - case EQEmu::item::ItemType1HBlunt: - my_hit.skill = EQEmu::skills::Skill1HBlunt; + case EQ::item::ItemType1HBlunt: + my_hit.skill = EQ::skills::Skill1HBlunt; break; - case EQEmu::item::ItemType2HBlunt: - my_hit.skill = EQEmu::skills::Skill2HBlunt; + case EQ::item::ItemType2HBlunt: + my_hit.skill = EQ::skills::Skill2HBlunt; break; - case EQEmu::item::ItemTypeBow: - my_hit.skill = EQEmu::skills::SkillArchery; + case EQ::item::ItemTypeBow: + my_hit.skill = EQ::skills::SkillArchery; break; - case EQEmu::item::ItemTypeLargeThrowing: - case EQEmu::item::ItemTypeSmallThrowing: - my_hit.skill = EQEmu::skills::SkillThrowing; + case EQ::item::ItemTypeLargeThrowing: + case EQ::item::ItemTypeSmallThrowing: + my_hit.skill = EQ::skills::SkillThrowing; break; default: - my_hit.skill = EQEmu::skills::SkillHandtoHand; + my_hit.skill = EQ::skills::SkillHandtoHand; break; } } @@ -2005,7 +2005,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool //do attack animation regardless of whether or not we can hit below int16 charges = 0; - EQEmu::ItemInstance weapon_inst(weapon, charges); + EQ::ItemInstance weapon_inst(weapon, charges); my_hit.skill = AttackAnimation(Hand, &weapon_inst, my_hit.skill); //basically "if not immune" then do the attack @@ -2117,7 +2117,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool return false; } -void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) { +void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) { if (spell_id == 0) spell_id = SPELL_UNKNOWN; @@ -2143,7 +2143,7 @@ void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::Skill if (IsLDoNTrapped()) { MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2); - SpellFinished(GetLDoNTrapSpellID(), other, EQEmu::spells::CastingSlot::Item, 0, -1, spells[GetLDoNTrapSpellID()].ResistDiff, false); + SpellFinished(GetLDoNTrapSpellID(), other, EQ::spells::CastingSlot::Item, 0, -1, spells[GetLDoNTrapSpellID()].ResistDiff, false); SetLDoNTrapSpellID(0); SetLDoNTrapped(false); SetLDoNTrapDetected(false); @@ -2160,7 +2160,7 @@ void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::Skill } } -bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, EQEmu::skills::SkillType attack_skill) +bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, EQ::skills::SkillType attack_skill) { LogCombat("Fatal blow dealt by [{}] with [{}] damage, spell [{}], skill [{}]", ((killer_mob) ? (killer_mob->GetName()) : ("[nullptr]")), damage, spell, attack_skill); @@ -2839,7 +2839,7 @@ void Mob::DamageShield(Mob* attacker, bool spell_ds) { } DS -= DS * attacker->itembonuses.DSMitigation / 100; } - attacker->Damage(this, -DS, spellid, EQEmu::skills::SkillAbjuration/*hackish*/, false); + attacker->Damage(this, -DS, spellid, EQ::skills::SkillAbjuration/*hackish*/, false); //we can assume there is a spell now auto outapp = new EQApplicationPacket(OP_Damage, sizeof(CombatDamage_Struct)); CombatDamage_Struct* cds = (CombatDamage_Struct*)outapp->pBuffer; @@ -2867,12 +2867,12 @@ void Mob::DamageShield(Mob* attacker, bool spell_ds) { if (rev_ds < 0) { LogCombat("Applying Reverse Damage Shield of value [{}] to [{}]", rev_ds, attacker->GetName()); - attacker->Damage(this, -rev_ds, rev_ds_spell_id, EQEmu::skills::SkillAbjuration/*hackish*/, false); //"this" (us) will get the hate, etc. not sure how this works on Live, but it'll works for now, and tanks will love us for this + attacker->Damage(this, -rev_ds, rev_ds_spell_id, EQ::skills::SkillAbjuration/*hackish*/, false); //"this" (us) will get the hate, etc. not sure how this works on Live, but it'll works for now, and tanks will love us for this //do we need to send a damage packet here also? } } -uint8 Mob::GetWeaponDamageBonus(const EQEmu::ItemData *weapon, bool offhand) +uint8 Mob::GetWeaponDamageBonus(const EQ::ItemData *weapon, bool offhand) { // dev quote with old and new formulas // https://forums.daybreakgames.com/eq/index.php?threads/test-update-09-17-15.226618/page-5#post-3326194 @@ -2884,7 +2884,7 @@ uint8 Mob::GetWeaponDamageBonus(const EQEmu::ItemData *weapon, bool offhand) return 1 + ((level - 28) / 3); // how does weaponless scale? auto delay = weapon->Delay; - if (weapon->IsType1HWeapon() || weapon->ItemType == EQEmu::item::ItemTypeMartial) { + if (weapon->IsType1HWeapon() || weapon->ItemType == EQ::item::ItemTypeMartial) { // we assume sinister strikes is checked before calling here if (!offhand) { if (delay <= 39) @@ -2943,7 +2943,7 @@ int Mob::GetHandToHandDamage(void) { if (RuleB(Combat, UseRevampHandToHand)) { // everyone uses this in the revamp! - int skill = GetSkill(EQEmu::skills::SkillHandtoHand); + int skill = GetSkill(EQ::skills::SkillHandtoHand); int epic = 0; if (IsClient() && CastToClient()->GetItemIDAt(12) == 10652 && GetLevel() > 46) epic = 280; @@ -2985,7 +2985,7 @@ int Mob::GetHandToHandDelay(void) { if (RuleB(Combat, UseRevampHandToHand)) { // everyone uses this in the revamp! - int skill = GetSkill(EQEmu::skills::SkillHandtoHand); + int skill = GetSkill(EQ::skills::SkillHandtoHand); int epic = 0; int iksar = 0; if (IsClient() && CastToClient()->GetItemIDAt(12) == 10652 && GetLevel() > 46) @@ -3323,7 +3323,7 @@ bool Mob::HasRangedProcs() const bool Client::CheckDoubleAttack() { int chance = 0; - int skill = GetSkill(EQEmu::skills::SkillDoubleAttack); + int skill = GetSkill(EQ::skills::SkillDoubleAttack); //Check for bonuses that give you a double attack chance regardless of skill (ie Bestial Frenzy/Harmonious Attack AA) int bonusGiveDA = aabonuses.GiveDoubleAttack + spellbonuses.GiveDoubleAttack + itembonuses.GiveDoubleAttack; if (skill > 0) @@ -3344,7 +3344,7 @@ bool Client::CheckDoubleAttack() // with varying triple attack skill (1-3% error at least) bool Client::CheckTripleAttack() { - int chance = GetSkill(EQEmu::skills::SkillTripleAttack); + int chance = GetSkill(EQ::skills::SkillTripleAttack); if (chance < 1) return false; @@ -3368,7 +3368,7 @@ bool Mob::CheckDoubleAttack() { // Not 100% certain pets follow this or if it's just from pets not always // having the same skills as most mobs - int chance = GetSkill(EQEmu::skills::SkillDoubleAttack); + int chance = GetSkill(EQ::skills::SkillDoubleAttack); if (GetLevel() > 35) chance += GetLevel(); @@ -3379,9 +3379,9 @@ bool Mob::CheckDoubleAttack() return zone->random.Int(1, 500) <= chance; } -void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const EQEmu::skills::SkillType skill_used, bool &avoidable, const int8 buffslot, const bool iBuffTic, eSpecialAttacks special) { +void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const EQ::skills::SkillType skill_used, bool &avoidable, const int8 buffslot, const bool iBuffTic, eSpecialAttacks special) { // This method is called with skill_used=ABJURE for Damage Shield damage. - bool FromDamageShield = (skill_used == EQEmu::skills::SkillAbjuration); + bool FromDamageShield = (skill_used == EQ::skills::SkillAbjuration); bool ignore_invul = false; if (IsValidSpell(spell_id)) ignore_invul = spell_id == 982 || spells[spell_id].cast_not_standing; // cazic touch @@ -3392,7 +3392,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const } // this should actually happen MUCH sooner, need to investigate though -- good enough for now - if ((skill_used == EQEmu::skills::SkillArchery || skill_used == EQEmu::skills::SkillThrowing) && GetSpecialAbility(IMMUNE_RANGED_ATTACKS)) { + if ((skill_used == EQ::skills::SkillArchery || skill_used == EQ::skills::SkillThrowing) && GetSpecialAbility(IMMUNE_RANGED_ATTACKS)) { LogCombat("Avoiding [{}] damage due to IMMUNE_RANGED_ATTACKS", damage); damage = DMG_INVULNERABLE; } @@ -3402,7 +3402,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const // only apply DS if physical damage (no spell damage) // damage shield calls this function with spell_id set, so its unavoidable - if (attacker && damage > 0 && spell_id == SPELL_UNKNOWN && skill_used != EQEmu::skills::SkillArchery && skill_used != EQEmu::skills::SkillThrowing) { + if (attacker && damage > 0 && spell_id == SPELL_UNKNOWN && skill_used != EQ::skills::SkillArchery && skill_used != EQ::skills::SkillThrowing) { DamageShield(attacker); } @@ -3543,14 +3543,14 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const bool can_stun = false; int stunbash_chance = 0; // bonus if (attacker) { - if (skill_used == EQEmu::skills::SkillBash) { + if (skill_used == EQ::skills::SkillBash) { can_stun = true; if (attacker->IsClient()) stunbash_chance = attacker->spellbonuses.StunBashChance + attacker->itembonuses.StunBashChance + attacker->aabonuses.StunBashChance; } - else if (skill_used == EQEmu::skills::SkillKick && + else if (skill_used == EQ::skills::SkillKick && (attacker->GetLevel() > 55 || attacker->IsNPC()) && GetClass() == WARRIOR) { can_stun = true; } @@ -3593,7 +3593,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const else { // main stun failed -- extra interrupt roll if (IsCasting() && - !EQEmu::ValueWithin(casting_spell_id, 859, 1023)) // these spells are excluded + !EQ::ValueWithin(casting_spell_id, 859, 1023)) // these spells are excluded // 90% chance >< -- stun immune won't reach this branch though :( if (zone->random.Int(0, 9) > 1) InterruptSpell(); @@ -3642,7 +3642,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const a->hit_heading = attacker ? attacker->GetHeading() : 0.0f; if (RuleB(Combat, MeleePush) && damage > 0 && !IsRooted() && (IsClient() || zone->random.Roll(RuleI(Combat, MeleePushChance)))) { - a->force = EQEmu::skills::GetSkillMeleePushForce(skill_used); + a->force = EQ::skills::GetSkillMeleePushForce(skill_used); if (IsNPC()) { if (attacker->IsNPC()) a->force = 0.0f; // 2013 change that disabled NPC vs NPC push @@ -3808,7 +3808,7 @@ void Mob::HealDamage(uint32 amount, Mob *caster, uint16 spell_id) if (IsBuffSpell(spell_id)) { // hots // message to caster if (caster->IsClient() && caster == this) { - if (caster->CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater) + if (caster->CastToClient()->ClientVersionBit() & EQ::versions::maskSoFAndLater) FilteredMessageString(caster, Chat::NonMelee, FilterHealOverTime, HOT_HEAL_SELF, itoa(acthealed), spells[spell_id].name); else @@ -3816,7 +3816,7 @@ void Mob::HealDamage(uint32 amount, Mob *caster, uint16 spell_id) YOU_HEALED, GetCleanName(), itoa(acthealed)); } else if (caster->IsClient() && caster != this) { - if (caster->CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater) + if (caster->CastToClient()->ClientVersionBit() & EQ::versions::maskSoFAndLater) caster->FilteredMessageString(caster, Chat::NonMelee, FilterHealOverTime, HOT_HEAL_OTHER, GetCleanName(), itoa(acthealed), spells[spell_id].name); @@ -3826,7 +3826,7 @@ void Mob::HealDamage(uint32 amount, Mob *caster, uint16 spell_id) } // message to target if (IsClient() && caster != this) { - if (CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater) + if (CastToClient()->ClientVersionBit() & EQ::versions::maskSoFAndLater) FilteredMessageString(this, Chat::NonMelee, FilterHealOverTime, HOT_HEALED_OTHER, caster->GetCleanName(), itoa(acthealed), spells[spell_id].name); @@ -3919,7 +3919,7 @@ void Mob::TryDefensiveProc(Mob *on, uint16 hand) { float ProcChance, ProcBonus; on->GetDefensiveProcChances(ProcBonus, ProcChance, hand, this); - if (hand != EQEmu::invslot::slotPrimary) + if (hand != EQ::invslot::slotPrimary) ProcChance /= 2; int level_penalty = 0; @@ -3944,7 +3944,7 @@ void Mob::TryDefensiveProc(Mob *on, uint16 hand) { } } -void Mob::TryWeaponProc(const EQEmu::ItemInstance* weapon_g, Mob *on, uint16 hand) { +void Mob::TryWeaponProc(const EQ::ItemInstance* weapon_g, Mob *on, uint16 hand) { if (!on) { SetTarget(nullptr); LogError("A null Mob object was passed to Mob::TryWeaponProc for evaluation!"); @@ -3962,12 +3962,12 @@ void Mob::TryWeaponProc(const EQEmu::ItemInstance* weapon_g, Mob *on, uint16 han } if (!weapon_g) { - TrySpellProc(nullptr, (const EQEmu::ItemData*)nullptr, on); + TrySpellProc(nullptr, (const EQ::ItemData*)nullptr, on); return; } if (!weapon_g->IsClassCommon()) { - TrySpellProc(nullptr, (const EQEmu::ItemData*)nullptr, on); + TrySpellProc(nullptr, (const EQ::ItemData*)nullptr, on); return; } @@ -3980,7 +3980,7 @@ void Mob::TryWeaponProc(const EQEmu::ItemInstance* weapon_g, Mob *on, uint16 han return; } -void Mob::TryWeaponProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData *weapon, Mob *on, uint16 hand) +void Mob::TryWeaponProc(const EQ::ItemInstance *inst, const EQ::ItemData *weapon, Mob *on, uint16 hand) { if (!weapon) @@ -3992,14 +3992,14 @@ void Mob::TryWeaponProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData * ProcBonus += static_cast(itembonuses.ProcChance) / 10.0f; // Combat Effects float ProcChance = GetProcChances(ProcBonus, hand); - if (hand != EQEmu::invslot::slotPrimary) //Is Archery intened to proc at 50% rate? + if (hand != EQ::invslot::slotPrimary) //Is Archery intened to proc at 50% rate? ProcChance /= 2; // Try innate proc on weapon // We can proc once here, either weapon or one aug bool proced = false; // silly bool to prevent augs from going if weapon does skillinuse = GetSkillByItemType(weapon->ItemType); - if (weapon->Proc.Type == EQEmu::item::ItemEffectCombatProc && IsValidSpell(weapon->Proc.Effect)) { + if (weapon->Proc.Type == EQ::item::ItemEffectCombatProc && IsValidSpell(weapon->Proc.Effect)) { float WPC = ProcChance * (100.0f + // Proc chance for this weapon static_cast(weapon->ProcRate)) / 100.0f; if (zone->random.Roll(WPC)) { // 255 dex = 0.084 chance of proc. No idea what this number should be really. @@ -4028,15 +4028,15 @@ void Mob::TryWeaponProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData * proced = false; if (!proced && inst) { - for (int r = EQEmu::invaug::SOCKET_BEGIN; r <= EQEmu::invaug::SOCKET_END; r++) { - const EQEmu::ItemInstance *aug_i = inst->GetAugment(r); + for (int r = EQ::invaug::SOCKET_BEGIN; r <= EQ::invaug::SOCKET_END; r++) { + const EQ::ItemInstance *aug_i = inst->GetAugment(r); if (!aug_i) // no aug, try next slot! continue; - const EQEmu::ItemData *aug = aug_i->GetItem(); + const EQ::ItemData *aug = aug_i->GetItem(); if (!aug) continue; - if (aug->Proc.Type == EQEmu::item::ItemEffectCombatProc && IsValidSpell(aug->Proc.Effect)) { + if (aug->Proc.Type == EQ::item::ItemEffectCombatProc && IsValidSpell(aug->Proc.Effect)) { float APC = ProcChance * (100.0f + // Proc chance for this aug static_cast(aug->ProcRate)) / 100.0f; if (zone->random.Roll(APC)) { @@ -4064,37 +4064,37 @@ void Mob::TryWeaponProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData * return; } -void Mob::TrySpellProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData *weapon, Mob *on, uint16 hand) +void Mob::TrySpellProc(const EQ::ItemInstance *inst, const EQ::ItemData *weapon, Mob *on, uint16 hand) { float ProcBonus = static_cast(spellbonuses.SpellProcChance + itembonuses.SpellProcChance + aabonuses.SpellProcChance); float ProcChance = 0.0f; ProcChance = GetProcChances(ProcBonus, hand); - if (hand != EQEmu::invslot::slotPrimary) //Is Archery intened to proc at 50% rate? + if (hand != EQ::invslot::slotPrimary) //Is Archery intened to proc at 50% rate? ProcChance /= 2; bool rangedattk = false; - if (weapon && hand == EQEmu::invslot::slotRange) { - if (weapon->ItemType == EQEmu::item::ItemTypeArrow || - weapon->ItemType == EQEmu::item::ItemTypeLargeThrowing || - weapon->ItemType == EQEmu::item::ItemTypeSmallThrowing || - weapon->ItemType == EQEmu::item::ItemTypeBow) { + if (weapon && hand == EQ::invslot::slotRange) { + if (weapon->ItemType == EQ::item::ItemTypeArrow || + weapon->ItemType == EQ::item::ItemTypeLargeThrowing || + weapon->ItemType == EQ::item::ItemTypeSmallThrowing || + weapon->ItemType == EQ::item::ItemTypeBow) { rangedattk = true; } } - if (!weapon && hand == EQEmu::invslot::slotRange && GetSpecialAbility(SPECATK_RANGED_ATK)) + if (!weapon && hand == EQ::invslot::slotRange && GetSpecialAbility(SPECATK_RANGED_ATK)) rangedattk = true; int16 poison_slot=-1; for (uint32 i = 0; i < MAX_PROCS; i++) { - if (IsPet() && hand != EQEmu::invslot::slotPrimary) //Pets can only proc spell procs from their primay hand (ie; beastlord pets) + if (IsPet() && hand != EQ::invslot::slotPrimary) //Pets can only proc spell procs from their primay hand (ie; beastlord pets) continue; // If pets ever can proc from off hand, this will need to change if (SpellProcs[i].base_spellID == POISON_PROC && - (!weapon || weapon->ItemType != EQEmu::item::ItemType1HPiercing)) + (!weapon || weapon->ItemType != EQ::item::ItemType1HPiercing)) continue; // Old school poison will only proc with 1HP equipped. // Not ranged @@ -4162,7 +4162,7 @@ void Mob::TrySpellProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData *w } } - if (HasSkillProcs() && hand != EQEmu::invslot::slotRange) { //We check ranged skill procs within the attack functions. + if (HasSkillProcs() && hand != EQ::invslot::slotRange) { //We check ranged skill procs within the attack functions. uint16 skillinuse = 28; if (weapon) skillinuse = GetSkillByItemType(weapon->ItemType); @@ -4308,17 +4308,17 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions * int crit_chance = GetCriticalChanceBonus(hit.skill); if ((GetClass() == WARRIOR || GetClass() == BERSERKER) && GetLevel() >= 12) innate_crit = true; - else if (GetClass() == RANGER && GetLevel() >= 12 && hit.skill == EQEmu::skills::SkillArchery) + else if (GetClass() == RANGER && GetLevel() >= 12 && hit.skill == EQ::skills::SkillArchery) innate_crit = true; - else if (GetClass() == ROGUE && GetLevel() >= 12 && hit.skill == EQEmu::skills::SkillThrowing) + else if (GetClass() == ROGUE && GetLevel() >= 12 && hit.skill == EQ::skills::SkillThrowing) innate_crit = true; // we have a chance to crit! if (innate_crit || crit_chance) { int difficulty = 0; - if (hit.skill == EQEmu::skills::SkillArchery) + if (hit.skill == EQ::skills::SkillArchery) difficulty = RuleI(Combat, ArcheryCritDifficulty); - else if (hit.skill == EQEmu::skills::SkillThrowing) + else if (hit.skill == EQ::skills::SkillThrowing) difficulty = RuleI(Combat, ThrowingCritDifficulty); else difficulty = RuleI(Combat, MeleeCritDifficulty); @@ -4330,7 +4330,7 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions * dex_bonus += 45; // chances did not match live without a small boost // so if we have an innate crit we have a better chance, except for ber throwing - if (!innate_crit || (GetClass() == BERSERKER && hit.skill == EQEmu::skills::SkillThrowing)) + if (!innate_crit || (GetClass() == BERSERKER && hit.skill == EQ::skills::SkillThrowing)) dex_bonus = dex_bonus * 3 / 5; if (crit_chance) @@ -4354,7 +4354,7 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions * LogCombat("Crit success roll [{}] dex chance [{}] og dmg [{}] crit_mod [{}] new dmg [{}]", roll, dex_bonus, og_damage, crit_mod, hit.damage_done); // step 3: check deadly strike - if (GetClass() == ROGUE && hit.skill == EQEmu::skills::SkillThrowing) { + if (GetClass() == ROGUE && hit.skill == EQ::skills::SkillThrowing) { if (BehindMob(defender, GetX(), GetY())) { int chance = GetLevel() * 12; if (zone->random.Int(1, 1000) < chance) { @@ -4483,7 +4483,7 @@ void Mob::DoRiposte(Mob *defender) return; } - defender->Attack(this, EQEmu::invslot::slotPrimary, true); + defender->Attack(this, EQ::invslot::slotPrimary, true); if (HasDied()) return; @@ -4493,7 +4493,7 @@ void Mob::DoRiposte(Mob *defender) if (DoubleRipChance && zone->random.Roll(DoubleRipChance)) { LogCombat("Preforming a double riposted from SE_DoubleRiposte ([{}] percent chance)", DoubleRipChance); - defender->Attack(this, EQEmu::invslot::slotPrimary, true); + defender->Attack(this, EQ::invslot::slotPrimary, true); if (HasDied()) return; } @@ -4504,7 +4504,7 @@ void Mob::DoRiposte(Mob *defender) // Live AA - Double Riposte if (DoubleRipChance && zone->random.Roll(DoubleRipChance)) { LogCombat("Preforming a double riposted from SE_GiveDoubleRiposte base1 == 0 ([{}] percent chance)", DoubleRipChance); - defender->Attack(this, EQEmu::invslot::slotPrimary, true); + defender->Attack(this, EQ::invslot::slotPrimary, true); if (HasDied()) return; } @@ -4782,7 +4782,7 @@ void Mob::TrySkillProc(Mob *on, uint16 skill, uint16 ReuseTime, bool Success, ui ProcMod = static_cast(spells[base_spell_id].base2[i]); } - else if (spells[base_spell_id].effectid[i] == SE_LimitToSkill && spells[base_spell_id].base[i] <= EQEmu::skills::HIGHEST_SKILL) { + else if (spells[base_spell_id].effectid[i] == SE_LimitToSkill && spells[base_spell_id].base[i] <= EQ::skills::HIGHEST_SKILL) { if (CanProc && spells[base_spell_id].base[i] == skill && IsValidSpell(proc_spell_id)) { float final_chance = chance * (ProcMod / 100.0f); @@ -4826,7 +4826,7 @@ void Mob::TrySkillProc(Mob *on, uint16 skill, uint16 ReuseTime, bool Success, ui ProcMod = static_cast(spells[base_spell_id].base2[i]); } - else if (spells[base_spell_id].effectid[i] == SE_LimitToSkill && spells[base_spell_id].base[i] <= EQEmu::skills::HIGHEST_SKILL) { + else if (spells[base_spell_id].effectid[i] == SE_LimitToSkill && spells[base_spell_id].base[i] <= EQ::skills::HIGHEST_SKILL) { if (CanProc && spells[base_spell_id].base[i] == skill && IsValidSpell(proc_spell_id)) { float final_chance = chance * (ProcMod / 100.0f); @@ -4887,7 +4887,7 @@ void Mob::TrySkillProc(Mob *on, uint16 skill, uint16 ReuseTime, bool Success, ui proc_spell_id = base1; ProcMod = static_cast(base2); } - else if (effect_id == SE_LimitToSkill && base1 <= EQEmu::skills::HIGHEST_SKILL) { + else if (effect_id == SE_LimitToSkill && base1 <= EQ::skills::HIGHEST_SKILL) { if (CanProc && base1 == skill && IsValidSpell(proc_spell_id)) { float final_chance = chance * (ProcMod / 100.0f); @@ -4918,7 +4918,7 @@ float Mob::GetSkillProcChances(uint16 ReuseTime, uint16 hand) { if (!ReuseTime && hand) { weapon_speed = GetWeaponSpeedbyHand(hand); ProcChance = static_cast(weapon_speed) * (RuleR(Combat, AvgProcsPerMinute) / 60000.0f); - if (hand != EQEmu::invslot::slotPrimary) + if (hand != EQ::invslot::slotPrimary) ProcChance /= 2; } @@ -5047,14 +5047,14 @@ void Mob::CommonOutgoingHitSuccess(Mob* defender, DamageHitInfo &hit, ExtraAttac #endif // BER weren't parsing the halving - if (hit.skill == EQEmu::skills::SkillArchery || - (hit.skill == EQEmu::skills::SkillThrowing && GetClass() != BERSERKER)) + if (hit.skill == EQ::skills::SkillArchery || + (hit.skill == EQ::skills::SkillThrowing && GetClass() != BERSERKER)) hit.damage_done /= 2; if (hit.damage_done < 1) hit.damage_done = 1; - if (hit.skill == EQEmu::skills::SkillArchery) { + if (hit.skill == EQ::skills::SkillArchery) { int bonus = aabonuses.ArcheryDamageModifier + itembonuses.ArcheryDamageModifier + spellbonuses.ArcheryDamageModifier; hit.damage_done += hit.damage_done * bonus / 100; int headshot = TryHeadShot(defender, hit.skill); @@ -5071,7 +5071,7 @@ void Mob::CommonOutgoingHitSuccess(Mob* defender, DamageHitInfo &hit, ExtraAttac int extra_mincap = 0; int min_mod = hit.base_damage * GetMeleeMinDamageMod_SE(hit.skill) / 100; - if (hit.skill == EQEmu::skills::SkillBackstab) { + if (hit.skill == EQ::skills::SkillBackstab) { extra_mincap = GetLevel() < 7 ? 7 : GetLevel(); if (GetLevel() >= 60) extra_mincap = GetLevel() * 2; @@ -5086,7 +5086,7 @@ void Mob::CommonOutgoingHitSuccess(Mob* defender, DamageHitInfo &hit, ExtraAttac hit.damage_done = ass; } } - else if (hit.skill == EQEmu::skills::SkillFrenzy && GetClass() == BERSERKER && GetLevel() > 50) { + else if (hit.skill == EQ::skills::SkillFrenzy && GetClass() == BERSERKER && GetLevel() > 50) { extra_mincap = 4 * GetLevel() / 5; } @@ -5111,8 +5111,8 @@ void Mob::CommonOutgoingHitSuccess(Mob* defender, DamageHitInfo &hit, ExtraAttac if (IsClient()) { int extra = 0; switch (hit.skill) { - case EQEmu::skills::SkillThrowing: - case EQEmu::skills::SkillArchery: + case EQ::skills::SkillThrowing: + case EQ::skills::SkillArchery: extra = CastToClient()->GetHeroicDEX() / 10; break; default: @@ -5212,26 +5212,26 @@ void Client::SetAttackTimer() Timer *TimerToUse = nullptr; - for (int i = EQEmu::invslot::slotRange; i <= EQEmu::invslot::slotSecondary; i++) { + for (int i = EQ::invslot::slotRange; i <= EQ::invslot::slotSecondary; i++) { //pick a timer - if (i == EQEmu::invslot::slotPrimary) + if (i == EQ::invslot::slotPrimary) TimerToUse = &attack_timer; - else if (i == EQEmu::invslot::slotRange) + else if (i == EQ::invslot::slotRange) TimerToUse = &ranged_timer; - else if (i == EQEmu::invslot::slotSecondary) + else if (i == EQ::invslot::slotSecondary) TimerToUse = &attack_dw_timer; else //invalid slot (hands will always hit this) continue; - const EQEmu::ItemData *ItemToUse = nullptr; + const EQ::ItemData *ItemToUse = nullptr; //find our item - EQEmu::ItemInstance *ci = GetInv().GetItem(i); + EQ::ItemInstance *ci = GetInv().GetItem(i); if (ci) ItemToUse = ci->GetItem(); //special offhand stuff - if (i == EQEmu::invslot::slotSecondary) { + if (i == EQ::invslot::slotSecondary) { //if we cant dual wield, skip it if (!CanThisClassDualWield() || HasTwoHanderEquipped()) { attack_dw_timer.Disable(); @@ -5249,9 +5249,9 @@ void Client::SetAttackTimer() ItemToUse = nullptr; } // Check to see if skill is valid - else if ((ItemToUse->ItemType > EQEmu::item::ItemTypeLargeThrowing) && - (ItemToUse->ItemType != EQEmu::item::ItemTypeMartial) && - (ItemToUse->ItemType != EQEmu::item::ItemType2HPiercing)) { + else if ((ItemToUse->ItemType > EQ::item::ItemTypeLargeThrowing) && + (ItemToUse->ItemType != EQ::item::ItemTypeMartial) && + (ItemToUse->ItemType != EQ::item::ItemType2HPiercing)) { //no weapon ItemToUse = nullptr; } @@ -5270,7 +5270,7 @@ void Client::SetAttackTimer() speed = delay / haste_mod; - if (ItemToUse && ItemToUse->ItemType == EQEmu::item::ItemTypeBow) { + if (ItemToUse && ItemToUse->ItemType == EQ::item::ItemTypeBow) { // Live actually had a bug here where they would return the non-modified attack speed // rather than the cap ... speed = std::max(speed - GetQuiverHaste(speed), RuleI(Combat, QuiverHasteCap)); @@ -5306,19 +5306,19 @@ void NPC::SetAttackTimer() else speed = static_cast((attack_delay / haste_mod) + ((hhe / 100.0f) * attack_delay)); - for (int i = EQEmu::invslot::slotRange; i <= EQEmu::invslot::slotSecondary; i++) { + for (int i = EQ::invslot::slotRange; i <= EQ::invslot::slotSecondary; i++) { //pick a timer - if (i == EQEmu::invslot::slotPrimary) + if (i == EQ::invslot::slotPrimary) TimerToUse = &attack_timer; - else if (i == EQEmu::invslot::slotRange) + else if (i == EQ::invslot::slotRange) TimerToUse = &ranged_timer; - else if (i == EQEmu::invslot::slotSecondary) + else if (i == EQ::invslot::slotSecondary) TimerToUse = &attack_dw_timer; else //invalid slot (hands will always hit this) continue; //special offhand stuff - if (i == EQEmu::invslot::slotSecondary) { + if (i == EQ::invslot::slotSecondary) { // SPECATK_QUAD is uncheesable if (!CanThisClassDualWield() || (HasTwoHanderEquipped() && !GetSpecialAbility(SPECATK_QUAD))) { attack_dw_timer.Disable(); @@ -5340,18 +5340,18 @@ void Client::DoAttackRounds(Mob *target, int hand, bool IsFromSpell) bool candouble = CanThisClassDoubleAttack(); // extra off hand non-sense, can only double with skill of 150 or above // or you have any amount of GiveDoubleAttack - if (candouble && hand == EQEmu::invslot::slotSecondary) + if (candouble && hand == EQ::invslot::slotSecondary) candouble = - GetSkill(EQEmu::skills::SkillDoubleAttack) > 149 || + GetSkill(EQ::skills::SkillDoubleAttack) > 149 || (aabonuses.GiveDoubleAttack + spellbonuses.GiveDoubleAttack + itembonuses.GiveDoubleAttack) > 0; if (candouble) { - CheckIncreaseSkill(EQEmu::skills::SkillDoubleAttack, target, -10); + CheckIncreaseSkill(EQ::skills::SkillDoubleAttack, target, -10); if (CheckDoubleAttack()) { Attack(target, hand, false, false, IsFromSpell); // Modern AA description: Increases your chance of ... performing one additional hit with a 2-handed weapon when double attacking by 2%. - if (hand == EQEmu::invslot::slotPrimary) { + if (hand == EQ::invslot::slotPrimary) { auto extraattackchance = aabonuses.ExtraAttackChance + spellbonuses.ExtraAttackChance + itembonuses.ExtraAttackChance; if (extraattackchance && HasTwoHanderEquipped() && zone->random.Roll(extraattackchance)) @@ -5359,8 +5359,8 @@ void Client::DoAttackRounds(Mob *target, int hand, bool IsFromSpell) } // you can only triple from the main hand - if (hand == EQEmu::invslot::slotPrimary && CanThisClassTripleAttack()) { - CheckIncreaseSkill(EQEmu::skills::SkillTripleAttack, target, -10); + if (hand == EQ::invslot::slotPrimary && CanThisClassTripleAttack()) { + CheckIncreaseSkill(EQ::skills::SkillTripleAttack, target, -10); if (CheckTripleAttack()) { Attack(target, hand, false, false, IsFromSpell); auto flurrychance = aabonuses.FlurryChance + spellbonuses.FlurryChance + @@ -5381,7 +5381,7 @@ bool Mob::CheckDualWield() { // Pets /might/ follow a slightly different progression // although it could all be from pets having different skills than most mobs - int chance = GetSkill(EQEmu::skills::SkillDualWield); + int chance = GetSkill(EQ::skills::SkillDualWield); if (GetLevel() > 35) chance += GetLevel(); @@ -5395,7 +5395,7 @@ bool Mob::CheckDualWield() bool Client::CheckDualWield() { - int chance = GetSkill(EQEmu::skills::SkillDualWield) + GetLevel(); + int chance = GetSkill(EQ::skills::SkillDualWield) + GetLevel(); chance += aabonuses.Ambidexterity + spellbonuses.Ambidexterity + itembonuses.Ambidexterity; int per_inc = spellbonuses.DualWieldChance + aabonuses.DualWieldChance + itembonuses.DualWieldChance; @@ -5413,9 +5413,9 @@ void Mob::DoMainHandAttackRounds(Mob *target, ExtraAttackOptions *opts) if (RuleB(Combat, UseLiveCombatRounds)) { // A "quad" on live really is just a successful dual wield where both double attack // The mobs that could triple lost the ability to when the triple attack skill was added in - Attack(target, EQEmu::invslot::slotPrimary, false, false, false, opts); + Attack(target, EQ::invslot::slotPrimary, false, false, false, opts); if (CanThisClassDoubleAttack() && CheckDoubleAttack()) { - Attack(target, EQEmu::invslot::slotPrimary, false, false, false, opts); + Attack(target, EQ::invslot::slotPrimary, false, false, false, opts); if ((IsPet() || IsTempPet()) && IsPetOwnerClient()) { int chance = spellbonuses.PC_Pet_Flurry + itembonuses.PC_Pet_Flurry + aabonuses.PC_Pet_Flurry; if (chance && zone->random.Roll(chance)) @@ -5428,16 +5428,16 @@ void Mob::DoMainHandAttackRounds(Mob *target, ExtraAttackOptions *opts) if (IsNPC()) { int16 n_atk = CastToNPC()->GetNumberOfAttacks(); if (n_atk <= 1) { - Attack(target, EQEmu::invslot::slotPrimary, false, false, false, opts); + Attack(target, EQ::invslot::slotPrimary, false, false, false, opts); } else { for (int i = 0; i < n_atk; ++i) { - Attack(target, EQEmu::invslot::slotPrimary, false, false, false, opts); + Attack(target, EQ::invslot::slotPrimary, false, false, false, opts); } } } else { - Attack(target, EQEmu::invslot::slotPrimary, false, false, false, opts); + Attack(target, EQ::invslot::slotPrimary, false, false, false, opts); } // we use this random value in three comparisons with different @@ -5448,15 +5448,15 @@ void Mob::DoMainHandAttackRounds(Mob *target, ExtraAttackOptions *opts) // check double attack, this is NOT the same rules that clients use... && RandRoll < (GetLevel() + NPCDualAttackModifier)) { - Attack(target, EQEmu::invslot::slotPrimary, false, false, false, opts); + Attack(target, EQ::invslot::slotPrimary, false, false, false, opts); // lets see if we can do a triple attack with the main hand // pets are excluded from triple and quads... if ((GetSpecialAbility(SPECATK_TRIPLE) || GetSpecialAbility(SPECATK_QUAD)) && !IsPet() && RandRoll < (GetLevel() + NPCTripleAttackModifier)) { - Attack(target, EQEmu::invslot::slotPrimary, false, false, false, opts); + Attack(target, EQ::invslot::slotPrimary, false, false, false, opts); // now lets check the quad attack if (GetSpecialAbility(SPECATK_QUAD) && RandRoll < (GetLevel() + NPCQuadAttackModifier)) { - Attack(target, EQEmu::invslot::slotPrimary, false, false, false, opts); + Attack(target, EQ::invslot::slotPrimary, false, false, false, opts); } } } @@ -5470,11 +5470,11 @@ void Mob::DoOffHandAttackRounds(Mob *target, ExtraAttackOptions *opts) // For now, SPECATK_QUAD means innate DW when Combat:UseLiveCombatRounds is true if ((GetSpecialAbility(SPECATK_INNATE_DW) || (RuleB(Combat, UseLiveCombatRounds) && GetSpecialAbility(SPECATK_QUAD))) || - GetEquippedItemFromTextureSlot(EQEmu::textures::weaponSecondary) != 0) { + GetEquippedItemFromTextureSlot(EQ::textures::weaponSecondary) != 0) { if (CheckDualWield()) { - Attack(target, EQEmu::invslot::slotSecondary, false, false, false, opts); + Attack(target, EQ::invslot::slotSecondary, false, false, false, opts); if (CanThisClassDoubleAttack() && GetLevel() > 35 && CheckDoubleAttack()) { - Attack(target, EQEmu::invslot::slotSecondary, false, false, false, opts); + Attack(target, EQ::invslot::slotSecondary, false, false, false, opts); if ((IsPet() || IsTempPet()) && IsPetOwnerClient()) { int chance = spellbonuses.PC_Pet_Flurry + itembonuses.PC_Pet_Flurry + aabonuses.PC_Pet_Flurry; diff --git a/zone/beacon.cpp b/zone/beacon.cpp index ac4beaacc..11b0de0fd 100644 --- a/zone/beacon.cpp +++ b/zone/beacon.cpp @@ -56,7 +56,7 @@ Beacon::Beacon(Mob *at_mob, int lifetime) :Mob ( nullptr, nullptr, 0, 0, 0, INVISIBLE_MAN, 0, BT_NoTarget, 0, 0, 0, 0, 0, at_mob->GetPosition(), 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, EQEmu::TintProfile(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, false + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, EQ::TintProfile(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, false ), remove_timer(lifetime), spell_timer(0) diff --git a/zone/beacon.h b/zone/beacon.h index 3e8f6edcc..e5880c981 100644 --- a/zone/beacon.h +++ b/zone/beacon.h @@ -34,9 +34,9 @@ public: ~Beacon(); //abstract virtual function implementations requird by base abstract class - virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill) { return true; } - virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; } - virtual bool Attack(Mob* other, int Hand = EQEmu::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, + virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill) { return true; } + virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; } + virtual bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) { return false; } virtual bool HasRaid() { return false; } virtual bool HasGroup() { return false; } diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index ad314d214..fc513577d 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -157,36 +157,36 @@ void Client::CalcItemBonuses(StatBonuses* newbon) { unsigned int i; // Update: MainAmmo should only calc skill mods (TODO: Check for other cases) - for (i = EQEmu::invslot::BONUS_BEGIN; i <= EQEmu::invslot::BONUS_SKILL_END; i++) { - const EQEmu::ItemInstance* inst = m_inv[i]; + for (i = EQ::invslot::BONUS_BEGIN; i <= EQ::invslot::BONUS_SKILL_END; i++) { + const EQ::ItemInstance* inst = m_inv[i]; if(inst == 0) continue; - AddItemBonuses(inst, newbon, false, false, 0, (i == EQEmu::invslot::slotAmmo)); + AddItemBonuses(inst, newbon, false, false, 0, (i == EQ::invslot::slotAmmo)); //These are given special flags due to how often they are checked for various spell effects. - const EQEmu::ItemData *item = inst->GetItem(); - if (i == EQEmu::invslot::slotSecondary && (item && item->ItemType == EQEmu::item::ItemTypeShield)) + const EQ::ItemData *item = inst->GetItem(); + if (i == EQ::invslot::slotSecondary && (item && item->ItemType == EQ::item::ItemTypeShield)) SetShieldEquiped(true); - else if (i == EQEmu::invslot::slotPrimary && (item && item->ItemType == EQEmu::item::ItemType2HBlunt)) { + else if (i == EQ::invslot::slotPrimary && (item && item->ItemType == EQ::item::ItemType2HBlunt)) { SetTwoHandBluntEquiped(true); SetTwoHanderEquipped(true); } - else if (i == EQEmu::invslot::slotPrimary && (item && (item->ItemType == EQEmu::item::ItemType2HSlash || item->ItemType == EQEmu::item::ItemType2HPiercing))) + else if (i == EQ::invslot::slotPrimary && (item && (item->ItemType == EQ::item::ItemType2HSlash || item->ItemType == EQ::item::ItemType2HPiercing))) SetTwoHanderEquipped(true); } //tribute items - for (i = EQEmu::invslot::TRIBUTE_BEGIN; i <= EQEmu::invslot::TRIBUTE_END; i++) { - const EQEmu::ItemInstance* inst = m_inv[i]; + for (i = EQ::invslot::TRIBUTE_BEGIN; i <= EQ::invslot::TRIBUTE_END; i++) { + const EQ::ItemInstance* inst = m_inv[i]; if(inst == 0) continue; AddItemBonuses(inst, newbon, false, true); } //Optional ability to have worn effects calculate as an addititive bonus instead of highest value - if (RuleI(Spells, AdditiveBonusWornType) && RuleI(Spells, AdditiveBonusWornType) != EQEmu::item::ItemEffectWorn){ - for (i = EQEmu::invslot::BONUS_BEGIN; i <= EQEmu::invslot::BONUS_STAT_END; i++) { - const EQEmu::ItemInstance* inst = m_inv[i]; + if (RuleI(Spells, AdditiveBonusWornType) && RuleI(Spells, AdditiveBonusWornType) != EQ::item::ItemEffectWorn){ + for (i = EQ::invslot::BONUS_BEGIN; i <= EQ::invslot::BONUS_STAT_END; i++) { + const EQ::ItemInstance* inst = m_inv[i]; if(inst == 0) continue; AdditiveWornBonuses(inst, newbon); @@ -212,7 +212,7 @@ void Client::ProcessItemCaps() itembonuses.ATK = std::min(itembonuses.ATK, CalcItemATKCap()); } -void Client::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses *newbon, bool isAug, bool isTribute, int rec_override, bool ammo_slot_item) +void Client::AddItemBonuses(const EQ::ItemInstance *inst, StatBonuses *newbon, bool isAug, bool isTribute, int rec_override, bool ammo_slot_item) { if (!inst || !inst->IsClassCommon()) { return; @@ -222,10 +222,10 @@ void Client::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses *newbon return; } - const EQEmu::ItemData *item = inst->GetItem(); + const EQ::ItemData *item = inst->GetItem(); if (!isTribute && !inst->IsEquipable(GetBaseRace(), GetClass())) { - if (item->ItemType != EQEmu::item::ItemTypeFood && item->ItemType != EQEmu::item::ItemTypeDrink) + if (item->ItemType != EQ::item::ItemTypeFood && item->ItemType != EQ::item::ItemTypeDrink) return; } @@ -434,11 +434,11 @@ void Client::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses *newbon else newbon->DSMitigation += item->DSMitigation; } - if (item->Worn.Effect > 0 && item->Worn.Type == EQEmu::item::ItemEffectWorn) { // latent effects + if (item->Worn.Effect > 0 && item->Worn.Type == EQ::item::ItemEffectWorn) { // latent effects ApplySpellsBonuses(item->Worn.Effect, item->Worn.Level, newbon, 0, item->Worn.Type); } - if (item->Focus.Effect > 0 && (item->Focus.Type == EQEmu::item::ItemEffectFocus)) { // focus effects + if (item->Focus.Effect > 0 && (item->Focus.Type == EQ::item::ItemEffectFocus)) { // focus effects ApplySpellsBonuses(item->Focus.Effect, item->Focus.Level, newbon, 0); } @@ -511,7 +511,7 @@ void Client::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses *newbon } } - if (item->ExtraDmgSkill != 0 && item->ExtraDmgSkill <= EQEmu::skills::HIGHEST_SKILL) { + if (item->ExtraDmgSkill != 0 && item->ExtraDmgSkill <= EQ::skills::HIGHEST_SKILL) { if ((newbon->SkillDamageAmount[item->ExtraDmgSkill] + item->ExtraDmgAmt) > RuleI(Character, ItemExtraDmgCap)) newbon->SkillDamageAmount[item->ExtraDmgSkill] = RuleI(Character, ItemExtraDmgCap); @@ -521,7 +521,7 @@ void Client::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses *newbon } // Process when ammo_slot_item = true or false - if (item->SkillModValue != 0 && item->SkillModType <= EQEmu::skills::HIGHEST_SKILL) { + if (item->SkillModValue != 0 && item->SkillModType <= EQ::skills::HIGHEST_SKILL) { if ((item->SkillModValue > 0 && newbon->skillmod[item->SkillModType] < item->SkillModValue) || (item->SkillModValue < 0 && newbon->skillmod[item->SkillModType] > item->SkillModValue)) { @@ -531,12 +531,12 @@ void Client::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses *newbon } if (!isAug) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) AddItemBonuses(inst->GetAugment(i), newbon, true, false, rec_level, ammo_slot_item); } } -void Client::AdditiveWornBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, bool isAug) { +void Client::AdditiveWornBonuses(const EQ::ItemInstance *inst, StatBonuses* newbon, bool isAug) { /* Powerful Non-live like option allows developers to add worn effects on items that @@ -554,7 +554,7 @@ void Client::AdditiveWornBonuses(const EQEmu::ItemInstance *inst, StatBonuses* n if(inst->GetAugmentType()==0 && isAug == true) return; - const EQEmu::ItemData *item = inst->GetItem(); + const EQ::ItemData *item = inst->GetItem(); if(!inst->IsEquipable(GetBaseRace(),GetClass())) return; @@ -569,7 +569,7 @@ void Client::AdditiveWornBonuses(const EQEmu::ItemInstance *inst, StatBonuses* n if (!isAug) { int i; - for (i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { + for (i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { AdditiveWornBonuses(inst->GetAugment(i),newbon,true); } } @@ -580,32 +580,32 @@ void Client::CalcEdibleBonuses(StatBonuses* newbon) { bool food = false; bool drink = false; - for (i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::GENERAL_END; i++) + for (i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::GENERAL_END; i++) { if (food && drink) break; - const EQEmu::ItemInstance* inst = GetInv().GetItem(i); + const EQ::ItemInstance* inst = GetInv().GetItem(i); if (inst && inst->GetItem() && inst->IsClassCommon()) { - const EQEmu::ItemData *item = inst->GetItem(); - if (!food && item->ItemType == EQEmu::item::ItemTypeFood) + const EQ::ItemData *item = inst->GetItem(); + if (!food && item->ItemType == EQ::item::ItemTypeFood) food = true; - else if (!drink && item->ItemType == EQEmu::item::ItemTypeDrink) + else if (!drink && item->ItemType == EQ::item::ItemTypeDrink) drink = true; else continue; AddItemBonuses(inst, newbon); } } - for (i = EQEmu::invbag::GENERAL_BAGS_BEGIN; i <= EQEmu::invbag::GENERAL_BAGS_END; i++) + for (i = EQ::invbag::GENERAL_BAGS_BEGIN; i <= EQ::invbag::GENERAL_BAGS_END; i++) { if (food && drink) break; - const EQEmu::ItemInstance* inst = GetInv().GetItem(i); + const EQ::ItemInstance* inst = GetInv().GetItem(i); if (inst && inst->GetItem() && inst->IsClassCommon()) { - const EQEmu::ItemData *item = inst->GetItem(); - if (!food && item->ItemType == EQEmu::item::ItemTypeFood) + const EQ::ItemData *item = inst->GetItem(); + if (!food && item->ItemType == EQ::item::ItemTypeFood) food = true; - else if (!drink && item->ItemType == EQEmu::item::ItemTypeDrink) + else if (!drink && item->ItemType == EQ::item::ItemTypeDrink) drink = true; else continue; @@ -680,10 +680,10 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) // Note: AA effects that use accuracy are skill limited, while spell effect is not. case SE_Accuracy: // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; - if ((base2 == ALL_SKILLS) && (newbon->Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] < base1)) - newbon->Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] = base1; + if ((base2 == ALL_SKILLS) && (newbon->Accuracy[EQ::skills::HIGHEST_SKILL + 1] < base1)) + newbon->Accuracy[EQ::skills::HIGHEST_SKILL + 1] = base1; else if (newbon->Accuracy[base2] < base1) newbon->Accuracy[base2] += base1; break; @@ -919,19 +919,19 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) break; case SE_AddSingingMod: switch (base2) { - case EQEmu::item::ItemTypeWindInstrument: + case EQ::item::ItemTypeWindInstrument: newbon->windMod += base1; break; - case EQEmu::item::ItemTypeStringedInstrument: + case EQ::item::ItemTypeStringedInstrument: newbon->stringedMod += base1; break; - case EQEmu::item::ItemTypeBrassInstrument: + case EQ::item::ItemTypeBrassInstrument: newbon->brassMod += base1; break; - case EQEmu::item::ItemTypePercussionInstrument: + case EQ::item::ItemTypePercussionInstrument: newbon->percussionMod += base1; break; - case EQEmu::item::ItemTypeSinging: + case EQ::item::ItemTypeSinging: newbon->singingMod += base1; break; } @@ -1028,10 +1028,10 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) case SE_HitChance: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if (base2 == ALL_SKILLS) - newbon->HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] += base1; + newbon->HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] += base1; else newbon->HitChanceEffect[base2] += base1; } @@ -1082,21 +1082,21 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) case SE_CriticalHitChance: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if (base2 == ALL_SKILLS) - newbon->CriticalHitChance[EQEmu::skills::HIGHEST_SKILL + 1] += base1; + newbon->CriticalHitChance[EQ::skills::HIGHEST_SKILL + 1] += base1; else newbon->CriticalHitChance[base2] += base1; } break; case SE_CriticalDamageMob: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; // base1 = effect value, base2 = skill restrictions(-1 for all) if (base2 == ALL_SKILLS) - newbon->CritDmgMod[EQEmu::skills::HIGHEST_SKILL + 1] += base1; + newbon->CritDmgMod[EQ::skills::HIGHEST_SKILL + 1] += base1; else newbon->CritDmgMod[base2] += base1; break; @@ -1122,10 +1122,10 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) case SE_SkillDamageAmount: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if (base2 == ALL_SKILLS) - newbon->SkillDamageAmount[EQEmu::skills::HIGHEST_SKILL + 1] += base1; + newbon->SkillDamageAmount[EQ::skills::HIGHEST_SKILL + 1] += base1; else newbon->SkillDamageAmount[base2] += base1; break; @@ -1141,10 +1141,10 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) case SE_DamageModifier: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if (base2 == ALL_SKILLS) - newbon->DamageModifier[EQEmu::skills::HIGHEST_SKILL + 1] += base1; + newbon->DamageModifier[EQ::skills::HIGHEST_SKILL + 1] += base1; else newbon->DamageModifier[base2] += base1; break; @@ -1152,10 +1152,10 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) case SE_DamageModifier2: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if (base2 == ALL_SKILLS) - newbon->DamageModifier2[EQEmu::skills::HIGHEST_SKILL + 1] += base1; + newbon->DamageModifier2[EQ::skills::HIGHEST_SKILL + 1] += base1; else newbon->DamageModifier2[base2] += base1; break; @@ -1191,7 +1191,7 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) // Physically raises skill cap ie if 55/55 it will raise to 55/60 case SE_RaiseSkillCap: { - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if (newbon->RaiseSkillCap[base2] < base1) @@ -1370,9 +1370,9 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) case SE_LimitToSkill: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; - if (base1 <= EQEmu::skills::HIGHEST_SKILL) + if (base1 <= EQ::skills::HIGHEST_SKILL) newbon->LimitToSkill[base1] = true; break; } @@ -1436,7 +1436,7 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) case SE_ReduceTradeskillFail:{ - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; newbon->ReduceTradeskillFail[base2] += base1; @@ -1482,8 +1482,8 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon) // I'd rather not do this here, but whatever, probably fine if (IsClient()) { auto client = CastToClient(); - if (client->GetRawSkill(EQEmu::skills::SkillType::SkillForage) == 0) - client->SetSkill(EQEmu::skills::SkillType::SkillForage, 1); + if (client->GetRawSkill(EQ::skills::SkillType::SkillForage) == 0) + client->SetSkill(EQ::skills::SkillType::SkillForage, 1); } break; @@ -1983,26 +1983,26 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_CriticalHitChance: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if (AdditiveWornBonus) { if(base2 == ALL_SKILLS) - new_bonus->CriticalHitChance[EQEmu::skills::HIGHEST_SKILL + 1] += effect_value; + new_bonus->CriticalHitChance[EQ::skills::HIGHEST_SKILL + 1] += effect_value; else new_bonus->CriticalHitChance[base2] += effect_value; } else if(effect_value < 0) { - if (base2 == ALL_SKILLS && new_bonus->CriticalHitChance[EQEmu::skills::HIGHEST_SKILL + 1] > effect_value) - new_bonus->CriticalHitChance[EQEmu::skills::HIGHEST_SKILL + 1] = effect_value; + if (base2 == ALL_SKILLS && new_bonus->CriticalHitChance[EQ::skills::HIGHEST_SKILL + 1] > effect_value) + new_bonus->CriticalHitChance[EQ::skills::HIGHEST_SKILL + 1] = effect_value; else if(base2 != ALL_SKILLS && new_bonus->CriticalHitChance[base2] > effect_value) new_bonus->CriticalHitChance[base2] = effect_value; } - else if (base2 == ALL_SKILLS && new_bonus->CriticalHitChance[EQEmu::skills::HIGHEST_SKILL + 1] < effect_value) - new_bonus->CriticalHitChance[EQEmu::skills::HIGHEST_SKILL + 1] = effect_value; + else if (base2 == ALL_SKILLS && new_bonus->CriticalHitChance[EQ::skills::HIGHEST_SKILL + 1] < effect_value) + new_bonus->CriticalHitChance[EQ::skills::HIGHEST_SKILL + 1] = effect_value; else if(base2 != ALL_SKILLS && new_bonus->CriticalHitChance[base2] < effect_value) new_bonus->CriticalHitChance[base2] = effect_value; @@ -2189,24 +2189,24 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_HitChance: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if (AdditiveWornBonus){ if(base2 == ALL_SKILLS) - new_bonus->HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] += effect_value; + new_bonus->HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] += effect_value; else new_bonus->HitChanceEffect[base2] += effect_value; } else if(base2 == ALL_SKILLS){ - if ((effect_value < 0) && (new_bonus->HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] > effect_value)) - new_bonus->HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] = effect_value; + if ((effect_value < 0) && (new_bonus->HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] > effect_value)) + new_bonus->HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] = effect_value; - else if (!new_bonus->HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] || - ((new_bonus->HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] > 0) && (new_bonus->HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] < effect_value))) - new_bonus->HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] = effect_value; + else if (!new_bonus->HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] || + ((new_bonus->HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] > 0) && (new_bonus->HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] < effect_value))) + new_bonus->HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] = effect_value; } else { @@ -2226,9 +2226,9 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_DamageModifier: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; - int skill = base2 == ALL_SKILLS ? EQEmu::skills::HIGHEST_SKILL + 1 : base2; + int skill = base2 == ALL_SKILLS ? EQ::skills::HIGHEST_SKILL + 1 : base2; if (effect_value < 0 && new_bonus->DamageModifier[skill] > effect_value) new_bonus->DamageModifier[skill] = effect_value; else if (effect_value > 0 && new_bonus->DamageModifier[skill] < effect_value) @@ -2239,9 +2239,9 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_DamageModifier2: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; - int skill = base2 == ALL_SKILLS ? EQEmu::skills::HIGHEST_SKILL + 1 : base2; + int skill = base2 == ALL_SKILLS ? EQ::skills::HIGHEST_SKILL + 1 : base2; if (effect_value < 0 && new_bonus->DamageModifier2[skill] > effect_value) new_bonus->DamageModifier2[skill] = effect_value; else if (effect_value > 0 && new_bonus->DamageModifier2[skill] < effect_value) @@ -2252,9 +2252,9 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_MinDamageModifier: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; - int skill = base2 == ALL_SKILLS ? EQEmu::skills::HIGHEST_SKILL + 1 : base2; + int skill = base2 == ALL_SKILLS ? EQ::skills::HIGHEST_SKILL + 1 : base2; if (effect_value < 0 && new_bonus->MinDamageModifier[skill] > effect_value) new_bonus->MinDamageModifier[skill] = effect_value; else if (effect_value > 0 && new_bonus->MinDamageModifier[skill] < effect_value) @@ -2329,14 +2329,14 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_Accuracy: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; - if ((effect_value < 0) && (new_bonus->Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] > effect_value)) - new_bonus->Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] = effect_value; + if ((effect_value < 0) && (new_bonus->Accuracy[EQ::skills::HIGHEST_SKILL + 1] > effect_value)) + new_bonus->Accuracy[EQ::skills::HIGHEST_SKILL + 1] = effect_value; - else if (!new_bonus->Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] || - ((new_bonus->Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] > 0) && (new_bonus->Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] < effect_value))) - new_bonus->Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] = effect_value; + else if (!new_bonus->Accuracy[EQ::skills::HIGHEST_SKILL + 1] || + ((new_bonus->Accuracy[EQ::skills::HIGHEST_SKILL + 1] > 0) && (new_bonus->Accuracy[EQ::skills::HIGHEST_SKILL + 1] < effect_value))) + new_bonus->Accuracy[EQ::skills::HIGHEST_SKILL + 1] = effect_value; break; } @@ -2355,19 +2355,19 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_SkillDamageTaken: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; //When using npc_spells_effects if MAX value set, use stackable quest based modifier. if (IsAISpellEffect && max){ if(base2 == ALL_SKILLS) - SkillDmgTaken_Mod[EQEmu::skills::HIGHEST_SKILL + 1] = effect_value; + SkillDmgTaken_Mod[EQ::skills::HIGHEST_SKILL + 1] = effect_value; else SkillDmgTaken_Mod[base2] = effect_value; } else { if(base2 == ALL_SKILLS) - new_bonus->SkillDmgTaken[EQEmu::skills::HIGHEST_SKILL + 1] += effect_value; + new_bonus->SkillDmgTaken[EQ::skills::HIGHEST_SKILL + 1] += effect_value; else new_bonus->SkillDmgTaken[base2] += effect_value; @@ -2476,10 +2476,10 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_CriticalDamageMob: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if(base2 == ALL_SKILLS) - new_bonus->CritDmgMod[EQEmu::skills::HIGHEST_SKILL + 1] += effect_value; + new_bonus->CritDmgMod[EQ::skills::HIGHEST_SKILL + 1] += effect_value; else new_bonus->CritDmgMod[base2] += effect_value; break; @@ -2495,10 +2495,10 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_SkillDamageAmount: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if(base2 == ALL_SKILLS) - new_bonus->SkillDamageAmount[EQEmu::skills::HIGHEST_SKILL + 1] += effect_value; + new_bonus->SkillDamageAmount[EQ::skills::HIGHEST_SKILL + 1] += effect_value; else new_bonus->SkillDamageAmount[base2] += effect_value; break; @@ -2614,10 +2614,10 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_SkillDamageAmount2: { // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if(base2 == ALL_SKILLS) - new_bonus->SkillDamageAmount2[EQEmu::skills::HIGHEST_SKILL + 1] += effect_value; + new_bonus->SkillDamageAmount2[EQ::skills::HIGHEST_SKILL + 1] += effect_value; else new_bonus->SkillDamageAmount2[base2] += effect_value; break; @@ -2805,19 +2805,19 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_AddSingingMod: switch (base2) { - case EQEmu::item::ItemTypeWindInstrument: + case EQ::item::ItemTypeWindInstrument: new_bonus->windMod += effect_value; break; - case EQEmu::item::ItemTypeStringedInstrument: + case EQ::item::ItemTypeStringedInstrument: new_bonus->stringedMod += effect_value; break; - case EQEmu::item::ItemTypeBrassInstrument: + case EQ::item::ItemTypeBrassInstrument: new_bonus->brassMod += effect_value; break; - case EQEmu::item::ItemTypePercussionInstrument: + case EQ::item::ItemTypePercussionInstrument: new_bonus->percussionMod += effect_value; break; - case EQEmu::item::ItemTypeSinging: + case EQ::item::ItemTypeSinging: new_bonus->singingMod += effect_value; break; default: @@ -3151,9 +3151,9 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_LimitToSkill:{ // Bad data or unsupported new skill - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; - if (effect_value <= EQEmu::skills::HIGHEST_SKILL){ + if (effect_value <= EQ::skills::HIGHEST_SKILL){ new_bonus->LimitToSkill[effect_value] = true; } break; @@ -3210,7 +3210,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne case SE_ReduceTradeskillFail:{ - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; new_bonus->ReduceTradeskillFail[base2] += effect_value; @@ -3223,7 +3223,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne break; case SE_RaiseSkillCap: { - if (base2 > EQEmu::skills::HIGHEST_SKILL) + if (base2 > EQ::skills::HIGHEST_SKILL) break; if (new_bonus->RaiseSkillCap[base2] < effect_value) @@ -3267,8 +3267,8 @@ void NPC::CalcItemBonuses(StatBonuses *newbon) { if(newbon){ - for (int i = EQEmu::invslot::BONUS_BEGIN; i <= EQEmu::invslot::BONUS_STAT_END; i++){ - const EQEmu::ItemData *cur = database.GetItem(equipment[i]); + for (int i = EQ::invslot::BONUS_BEGIN; i <= EQ::invslot::BONUS_STAT_END; i++){ + const EQ::ItemData *cur = database.GetItem(equipment[i]); if(cur){ //basic stats newbon->AC += cur->AC; @@ -3323,12 +3323,12 @@ void NPC::CalcItemBonuses(StatBonuses *newbon) if(cur->CombatEffects > 0) { newbon->ProcChance += cur->CombatEffects; } - if (cur->Worn.Effect>0 && (cur->Worn.Type == EQEmu::item::ItemEffectWorn)) { // latent effects + if (cur->Worn.Effect>0 && (cur->Worn.Type == EQ::item::ItemEffectWorn)) { // latent effects ApplySpellsBonuses(cur->Worn.Effect, cur->Worn.Level, newbon, 0, cur->Worn.Type); } if (RuleB(Spells, NPC_UseFocusFromItems)){ - if (cur->Focus.Effect>0 && (cur->Focus.Type == EQEmu::item::ItemEffectFocus)){ // focus effects + if (cur->Focus.Effect>0 && (cur->Focus.Type == EQ::item::ItemEffectFocus)){ // focus effects ApplySpellsBonuses(cur->Focus.Effect, cur->Focus.Level, newbon); } } @@ -3345,18 +3345,18 @@ void Client::CalcItemScale() { bool changed = false; // MainAmmo excluded in helper function below - if (CalcItemScale(EQEmu::invslot::EQUIPMENT_BEGIN, EQEmu::invslot::EQUIPMENT_END)) // original coding excluded MainAmmo (< 21) + if (CalcItemScale(EQ::invslot::EQUIPMENT_BEGIN, EQ::invslot::EQUIPMENT_END)) // original coding excluded MainAmmo (< 21) changed = true; - if (CalcItemScale(EQEmu::invslot::GENERAL_BEGIN, EQEmu::invslot::GENERAL_END)) // original coding excluded MainCursor (< 30) + if (CalcItemScale(EQ::invslot::GENERAL_BEGIN, EQ::invslot::GENERAL_END)) // original coding excluded MainCursor (< 30) changed = true; // I excluded cursor bag slots here because cursor was excluded above..if this is incorrect, change 'slot_y' here to CURSOR_BAG_END // and 'slot_y' above to CURSOR from GENERAL_END above - or however it is supposed to be... - if (CalcItemScale(EQEmu::invbag::GENERAL_BAGS_BEGIN, EQEmu::invbag::GENERAL_BAGS_END)) // (< 341) + if (CalcItemScale(EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END)) // (< 341) changed = true; - if (CalcItemScale(EQEmu::invslot::TRIBUTE_BEGIN, EQEmu::invslot::TRIBUTE_END)) // (< 405) + if (CalcItemScale(EQ::invslot::TRIBUTE_BEGIN, EQ::invslot::TRIBUTE_END)) // (< 405) changed = true; if(changed) @@ -3370,18 +3370,18 @@ bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y) { bool changed = false; uint32 i; for (i = slot_x; i <= slot_y; i++) { - if (i == EQEmu::invslot::slotAmmo) // moved here from calling procedure to facilitate future range changes where MainAmmo may not be the last slot + if (i == EQ::invslot::slotAmmo) // moved here from calling procedure to facilitate future range changes where MainAmmo may not be the last slot continue; - EQEmu::ItemInstance* inst = m_inv.GetItem(i); + EQ::ItemInstance* inst = m_inv.GetItem(i); if(inst == nullptr) continue; // TEST CODE: test for bazaar trader crashing with charm items if (Trader) - if (i >= EQEmu::invbag::GENERAL_BAGS_BEGIN && i <= EQEmu::invbag::GENERAL_BAGS_END) { - EQEmu::ItemInstance* parent_item = m_inv.GetItem(EQEmu::InventoryProfile::CalcSlotId(i)); + if (i >= EQ::invbag::GENERAL_BAGS_BEGIN && i <= EQ::invbag::GENERAL_BAGS_END) { + EQ::ItemInstance* parent_item = m_inv.GetItem(EQ::InventoryProfile::CalcSlotId(i)); if (parent_item && parent_item->GetItem()->ID == 17899) // trader satchel continue; } @@ -3400,9 +3400,9 @@ bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y) { } //iterate all augments - for (int x = EQEmu::invaug::SOCKET_BEGIN; x <= EQEmu::invaug::SOCKET_END; ++x) + for (int x = EQ::invaug::SOCKET_BEGIN; x <= EQ::invaug::SOCKET_END; ++x) { - EQEmu::ItemInstance * a_inst = inst->GetAugment(x); + EQ::ItemInstance * a_inst = inst->GetAugment(x); if(!a_inst) continue; @@ -3432,18 +3432,18 @@ void Client::DoItemEnterZone() { bool changed = false; // MainAmmo excluded in helper function below - if (DoItemEnterZone(EQEmu::invslot::EQUIPMENT_BEGIN, EQEmu::invslot::EQUIPMENT_END)) // original coding excluded MainAmmo (< 21) + if (DoItemEnterZone(EQ::invslot::EQUIPMENT_BEGIN, EQ::invslot::EQUIPMENT_END)) // original coding excluded MainAmmo (< 21) changed = true; - if (DoItemEnterZone(EQEmu::invslot::GENERAL_BEGIN, EQEmu::invslot::GENERAL_END)) // original coding excluded MainCursor (< 30) + if (DoItemEnterZone(EQ::invslot::GENERAL_BEGIN, EQ::invslot::GENERAL_END)) // original coding excluded MainCursor (< 30) changed = true; // I excluded cursor bag slots here because cursor was excluded above..if this is incorrect, change 'slot_y' here to CURSOR_BAG_END // and 'slot_y' above to CURSOR from GENERAL_END above - or however it is supposed to be... - if (DoItemEnterZone(EQEmu::invbag::GENERAL_BAGS_BEGIN, EQEmu::invbag::GENERAL_BAGS_END)) // (< 341) + if (DoItemEnterZone(EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END)) // (< 341) changed = true; - if (DoItemEnterZone(EQEmu::invslot::TRIBUTE_BEGIN, EQEmu::invslot::TRIBUTE_END)) // (< 405) + if (DoItemEnterZone(EQ::invslot::TRIBUTE_BEGIN, EQ::invslot::TRIBUTE_END)) // (< 405) changed = true; if(changed) @@ -3456,18 +3456,18 @@ bool Client::DoItemEnterZone(uint32 slot_x, uint32 slot_y) { // behavior change: 'slot_y' is now [RANGE]_END and not [RANGE]_END + 1 bool changed = false; for(uint32 i = slot_x; i <= slot_y; i++) { - if (i == EQEmu::invslot::slotAmmo) // moved here from calling procedure to facilitate future range changes where MainAmmo may not be the last slot + if (i == EQ::invslot::slotAmmo) // moved here from calling procedure to facilitate future range changes where MainAmmo may not be the last slot continue; - EQEmu::ItemInstance* inst = m_inv.GetItem(i); + EQ::ItemInstance* inst = m_inv.GetItem(i); if(!inst) continue; // TEST CODE: test for bazaar trader crashing with charm items if (Trader) - if (i >= EQEmu::invbag::GENERAL_BAGS_BEGIN && i <= EQEmu::invbag::GENERAL_BAGS_END) { - EQEmu::ItemInstance* parent_item = m_inv.GetItem(EQEmu::InventoryProfile::CalcSlotId(i)); + if (i >= EQ::invbag::GENERAL_BAGS_BEGIN && i <= EQ::invbag::GENERAL_BAGS_END) { + EQ::ItemInstance* parent_item = m_inv.GetItem(EQ::InventoryProfile::CalcSlotId(i)); if (parent_item && parent_item->GetItem()->ID == 17899) // trader satchel continue; } @@ -3478,7 +3478,7 @@ bool Client::DoItemEnterZone(uint32 slot_x, uint32 slot_y) { uint16 oldexp = inst->GetExp(); parse->EventItem(EVENT_ITEM_ENTER_ZONE, this, inst, nullptr, "", 0); - if (i <= EQEmu::invslot::EQUIPMENT_END) { + if (i <= EQ::invslot::EQUIPMENT_END) { parse->EventItem(EVENT_EQUIP_ITEM, this, inst, nullptr, "", i); } @@ -3488,7 +3488,7 @@ bool Client::DoItemEnterZone(uint32 slot_x, uint32 slot_y) { update_slot = true; } } else { - if (i <= EQEmu::invslot::EQUIPMENT_END) { + if (i <= EQ::invslot::EQUIPMENT_END) { parse->EventItem(EVENT_EQUIP_ITEM, this, inst, nullptr, "", i); } @@ -3496,9 +3496,9 @@ bool Client::DoItemEnterZone(uint32 slot_x, uint32 slot_y) { } //iterate all augments - for (int x = EQEmu::invaug::SOCKET_BEGIN; x <= EQEmu::invaug::SOCKET_END; ++x) + for (int x = EQ::invaug::SOCKET_BEGIN; x <= EQ::invaug::SOCKET_END; ++x) { - EQEmu::ItemInstance *a_inst = inst->GetAugment(x); + EQ::ItemInstance *a_inst = inst->GetAugment(x); if(!a_inst) continue; @@ -3922,7 +3922,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_CriticalHitChance: { - for (int e = 0; e < EQEmu::skills::HIGHEST_SKILL + 1; e++) + for (int e = 0; e < EQ::skills::HIGHEST_SKILL + 1; e++) { spellbonuses.CriticalHitChance[e] = effect_value; aabonuses.CriticalHitChance[e] = effect_value; @@ -4040,7 +4040,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_HitChance: { - for (int e = 0; e < EQEmu::skills::HIGHEST_SKILL + 1; e++) + for (int e = 0; e < EQ::skills::HIGHEST_SKILL + 1; e++) { spellbonuses.HitChanceEffect[e] = effect_value; aabonuses.HitChanceEffect[e] = effect_value; @@ -4051,7 +4051,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_DamageModifier: { - for (int e = 0; e < EQEmu::skills::HIGHEST_SKILL + 1; e++) + for (int e = 0; e < EQ::skills::HIGHEST_SKILL + 1; e++) { spellbonuses.DamageModifier[e] = effect_value; aabonuses.DamageModifier[e] = effect_value; @@ -4062,7 +4062,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_DamageModifier2: { - for (int e = 0; e < EQEmu::skills::HIGHEST_SKILL + 1; e++) + for (int e = 0; e < EQ::skills::HIGHEST_SKILL + 1; e++) { spellbonuses.DamageModifier2[e] = effect_value; aabonuses.DamageModifier2[e] = effect_value; @@ -4073,7 +4073,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_MinDamageModifier: { - for (int e = 0; e < EQEmu::skills::HIGHEST_SKILL + 1; e++) + for (int e = 0; e < EQ::skills::HIGHEST_SKILL + 1; e++) { spellbonuses.MinDamageModifier[e] = effect_value; aabonuses.MinDamageModifier[e] = effect_value; @@ -4114,10 +4114,10 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_Accuracy: { - spellbonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] = effect_value; - itembonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] = effect_value; + spellbonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1] = effect_value; + itembonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1] = effect_value; - for (int e = 0; e < EQEmu::skills::HIGHEST_SKILL + 1; e++) + for (int e = 0; e < EQ::skills::HIGHEST_SKILL + 1; e++) { aabonuses.Accuracy[e] = effect_value; } @@ -4144,7 +4144,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_SkillDamageTaken: { - for (int e = 0; e < EQEmu::skills::HIGHEST_SKILL + 1; e++) + for (int e = 0; e < EQ::skills::HIGHEST_SKILL + 1; e++) { spellbonuses.SkillDmgTaken[e] = effect_value; aabonuses.SkillDmgTaken[e] = effect_value; @@ -4249,7 +4249,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_CriticalDamageMob: { - for (int e = 0; e < EQEmu::skills::HIGHEST_SKILL + 1; e++) + for (int e = 0; e < EQ::skills::HIGHEST_SKILL + 1; e++) { spellbonuses.CritDmgMod[e] = effect_value; aabonuses.CritDmgMod[e] = effect_value; @@ -4260,7 +4260,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_SkillDamageAmount: { - for (int e = 0; e < EQEmu::skills::HIGHEST_SKILL + 1; e++) + for (int e = 0; e < EQ::skills::HIGHEST_SKILL + 1; e++) { spellbonuses.SkillDamageAmount[e] = effect_value; aabonuses.SkillDamageAmount[e] = effect_value; @@ -4311,7 +4311,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_SkillDamageAmount2: { - for (int e = 0; e < EQEmu::skills::HIGHEST_SKILL + 1; e++) + for (int e = 0; e < EQ::skills::HIGHEST_SKILL + 1; e++) { spellbonuses.SkillDamageAmount2[e] = effect_value; aabonuses.SkillDamageAmount2[e] = effect_value; diff --git a/zone/bot.cpp b/zone/bot.cpp index 6d14ce740..48e468a05 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -40,7 +40,7 @@ Bot::Bot(NPCType *npcTypeData, Client* botOwner) : NPC(npcTypeData, nullptr, glm this->_botOwnerCharacterID = 0; } - m_inv.SetInventoryVersion(EQEmu::versions::MobVersion::Bot); + m_inv.SetInventoryVersion(EQ::versions::MobVersion::Bot); m_inv.SetGMInventory(false); // bot expansions are not currently implemented (defaults to static) _guildRank = 0; @@ -132,7 +132,7 @@ Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double to auto bot_owner = GetBotOwner(); - m_inv.SetInventoryVersion(EQEmu::versions::MobVersion::Bot); + m_inv.SetInventoryVersion(EQ::versions::MobVersion::Bot); m_inv.SetGMInventory(false); // bot expansions are not currently implemented (defaults to static) _guildRank = 0; @@ -177,7 +177,7 @@ Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double to if (!stance_flag && bot_owner) bot_owner->Message(Chat::Red, "Could not locate stance for '%s'", GetCleanName()); - SetTaunting((GetClass() == WARRIOR || GetClass() == PALADIN || GetClass() == SHADOWKNIGHT) && (GetBotStance() == EQEmu::constants::stanceAggressive)); + SetTaunting((GetClass() == WARRIOR || GetClass() == PALADIN || GetClass() == SHADOWKNIGHT) && (GetBotStance() == EQ::constants::stanceAggressive)); SetPauseAI(false); m_alt_combat_hate_timer.Start(250); @@ -491,14 +491,14 @@ void Bot::SetSuffix(std::string bot_suffix) { } uint32 Bot::GetBotArcheryRange() { - const EQEmu::ItemInstance *range_inst = GetBotItem(EQEmu::invslot::slotRange); - const EQEmu::ItemInstance *ammo_inst = GetBotItem(EQEmu::invslot::slotAmmo); + const EQ::ItemInstance *range_inst = GetBotItem(EQ::invslot::slotRange); + const EQ::ItemInstance *ammo_inst = GetBotItem(EQ::invslot::slotAmmo); if (!range_inst || !ammo_inst) return 0; - const EQEmu::ItemData *range_item = range_inst->GetItem(); - const EQEmu::ItemData *ammo_item = ammo_inst->GetItem(); - if (!range_item || !ammo_item || range_item->ItemType != EQEmu::item::ItemTypeBow || ammo_item->ItemType != EQEmu::item::ItemTypeArrow) + const EQ::ItemData *range_item = range_inst->GetItem(); + const EQ::ItemData *ammo_item = ammo_inst->GetItem(); + if (!range_item || !ammo_item || range_item->ItemType != EQ::item::ItemTypeBow || ammo_item->ItemType != EQ::item::ItemTypeArrow) return 0; // everything is good! @@ -508,15 +508,15 @@ uint32 Bot::GetBotArcheryRange() { void Bot::ChangeBotArcherWeapons(bool isArcher) { if((GetClass()==WARRIOR) || (GetClass()==PALADIN) || (GetClass()==RANGER) || (GetClass()==SHADOWKNIGHT) || (GetClass()==ROGUE)) { if(!isArcher) { - BotAddEquipItem(EQEmu::invslot::slotPrimary, GetBotItemBySlot(EQEmu::invslot::slotPrimary)); - BotAddEquipItem(EQEmu::invslot::slotSecondary, GetBotItemBySlot(EQEmu::invslot::slotSecondary)); + BotAddEquipItem(EQ::invslot::slotPrimary, GetBotItemBySlot(EQ::invslot::slotPrimary)); + BotAddEquipItem(EQ::invslot::slotSecondary, GetBotItemBySlot(EQ::invslot::slotSecondary)); SetAttackTimer(); BotGroupSay(this, "My blade is ready"); } else { - BotRemoveEquipItem(EQEmu::invslot::slotPrimary); - BotRemoveEquipItem(EQEmu::invslot::slotSecondary); - BotAddEquipItem(EQEmu::invslot::slotAmmo, GetBotItemBySlot(EQEmu::invslot::slotAmmo)); - BotAddEquipItem(EQEmu::invslot::slotSecondary, GetBotItemBySlot(EQEmu::invslot::slotRange)); + BotRemoveEquipItem(EQ::invslot::slotPrimary); + BotRemoveEquipItem(EQ::invslot::slotSecondary); + BotAddEquipItem(EQ::invslot::slotAmmo, GetBotItemBySlot(EQ::invslot::slotAmmo)); + BotAddEquipItem(EQ::invslot::slotSecondary, GetBotItemBySlot(EQ::invslot::slotRange)); SetAttackTimer(); BotGroupSay(this, "My bow is true and ready"); } @@ -574,7 +574,7 @@ NPCType *Bot::FillNPCTypeStruct(uint32 botSpellsID, std::string botName, std::st bot_npc_type->race = botRace; bot_npc_type->class_ = botClass; bot_npc_type->bodytype = 1; - bot_npc_type->deity = EQEmu::deity::DeityAgnostic; + bot_npc_type->deity = EQ::deity::DeityAgnostic; bot_npc_type->level = botLevel; //bot_npc_type->npc_id = 0; //bot_npc_type->texture = 0; @@ -699,7 +699,7 @@ NPCType *Bot::CreateDefaultNPCTypeStructForBot(std::string botName, std::string bot_npc_type->race = botRace; bot_npc_type->class_ = botClass; bot_npc_type->bodytype = 1; - bot_npc_type->deity = EQEmu::deity::DeityAgnostic; + bot_npc_type->deity = EQ::deity::DeityAgnostic; bot_npc_type->level = botLevel; //bot_npc_type->npc_id = 0; //bot_npc_type->texture = 0; @@ -1553,36 +1553,36 @@ int32 Bot::acmod() { } uint16 Bot::GetPrimarySkillValue() { - EQEmu::skills::SkillType skill = EQEmu::skills::HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill - bool equiped = m_inv.GetItem(EQEmu::invslot::slotPrimary); + EQ::skills::SkillType skill = EQ::skills::HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill + bool equiped = m_inv.GetItem(EQ::invslot::slotPrimary); if(!equiped) - skill = EQEmu::skills::SkillHandtoHand; + skill = EQ::skills::SkillHandtoHand; else { - uint8 type = m_inv.GetItem(EQEmu::invslot::slotPrimary)->GetItem()->ItemType; //is this the best way to do this? + uint8 type = m_inv.GetItem(EQ::invslot::slotPrimary)->GetItem()->ItemType; //is this the best way to do this? switch(type) { - case EQEmu::item::ItemType1HSlash: - skill = EQEmu::skills::Skill1HSlashing; + case EQ::item::ItemType1HSlash: + skill = EQ::skills::Skill1HSlashing; break; - case EQEmu::item::ItemType2HSlash: - skill = EQEmu::skills::Skill2HSlashing; + case EQ::item::ItemType2HSlash: + skill = EQ::skills::Skill2HSlashing; break; - case EQEmu::item::ItemType1HPiercing: - skill = EQEmu::skills::Skill1HPiercing; + case EQ::item::ItemType1HPiercing: + skill = EQ::skills::Skill1HPiercing; break; - case EQEmu::item::ItemType1HBlunt: - skill = EQEmu::skills::Skill1HBlunt; + case EQ::item::ItemType1HBlunt: + skill = EQ::skills::Skill1HBlunt; break; - case EQEmu::item::ItemType2HBlunt: - skill = EQEmu::skills::Skill2HBlunt; + case EQ::item::ItemType2HBlunt: + skill = EQ::skills::Skill2HBlunt; break; - case EQEmu::item::ItemType2HPiercing: - skill = EQEmu::skills::Skill2HPiercing; + case EQ::item::ItemType2HPiercing: + skill = EQ::skills::Skill2HPiercing; break; - case EQEmu::item::ItemTypeMartial: - skill = EQEmu::skills::SkillHandtoHand; + case EQ::item::ItemTypeMartial: + skill = EQ::skills::SkillHandtoHand; break; default: - skill = EQEmu::skills::SkillHandtoHand; + skill = EQ::skills::SkillHandtoHand; break; } } @@ -1590,7 +1590,7 @@ uint16 Bot::GetPrimarySkillValue() { return GetSkill(skill); } -uint16 Bot::MaxSkill(EQEmu::skills::SkillType skillid, uint16 class_, uint16 level) const { +uint16 Bot::MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const { return(database.GetSkillCap(class_, skillid, level)); } @@ -1598,7 +1598,7 @@ uint32 Bot::GetTotalATK() { uint32 AttackRating = 0; uint32 WornCap = itembonuses.ATK; if(IsBot()) { - AttackRating = ((WornCap * 1.342) + (GetSkill(EQEmu::skills::SkillOffense) * 1.345) + ((GetSTR() - 66) * 0.9) + (GetPrimarySkillValue() * 2.69)); + AttackRating = ((WornCap * 1.342) + (GetSkill(EQ::skills::SkillOffense) * 1.345) + ((GetSTR() - 66) * 0.9) + (GetPrimarySkillValue() * 2.69)); AttackRating += aabonuses.ATK + GroupLeadershipAAOffenseEnhancement(); if (AttackRating < 10) AttackRating = 10; @@ -1613,7 +1613,7 @@ uint32 Bot::GetTotalATK() { uint32 Bot::GetATKRating() { uint32 AttackRating = 0; if(IsBot()) { - AttackRating = (GetSkill(EQEmu::skills::SkillOffense) * 1.345) + ((GetSTR() - 66) * 0.9) + (GetPrimarySkillValue() * 2.69); + AttackRating = (GetSkill(EQ::skills::SkillOffense) * 1.345) + ((GetSTR() - 66) * 0.9) + (GetPrimarySkillValue() * 2.69); if (AttackRating < 10) AttackRating = 10; } @@ -1626,7 +1626,7 @@ int32 Bot::GenerateBaseHitPoints() { uint32 lm = GetClassLevelFactor(); int32 Post255; int32 NormalSTA = GetSTA(); - if (GetOwner() && GetOwner()->CastToClient() && GetOwner()->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoD && RuleB(Character, SoDClientUseSoDHPManaEnd)) { + if (GetOwner() && GetOwner()->CastToClient() && GetOwner()->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoD && RuleB(Character, SoDClientUseSoDHPManaEnd)) { float SoDPost255; if(((NormalSTA - 255) / 2) > 0) SoDPost255 = ((NormalSTA - 255) / 2); @@ -2106,8 +2106,8 @@ bool Bot::LoadPet() if (!database.botdb.LoadPetBuffs(GetBotID(), pet_buffs)) bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetBuffs(), GetCleanName()); - uint32 pet_items[EQEmu::invslot::EQUIPMENT_COUNT]; - memset(pet_items, 0, (sizeof(uint32) * EQEmu::invslot::EQUIPMENT_COUNT)); + uint32 pet_items[EQ::invslot::EQUIPMENT_COUNT]; + memset(pet_items, 0, (sizeof(uint32) * EQ::invslot::EQUIPMENT_COUNT)); if (!database.botdb.LoadPetItems(GetBotID(), pet_items)) bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetItems(), GetCleanName()); @@ -2134,11 +2134,11 @@ bool Bot::SavePet() char* pet_name = new char[64]; SpellBuff_Struct pet_buffs[PET_BUFF_COUNT]; - uint32 pet_items[EQEmu::invslot::EQUIPMENT_COUNT]; + uint32 pet_items[EQ::invslot::EQUIPMENT_COUNT]; memset(pet_name, 0, 64); memset(pet_buffs, 0, (sizeof(SpellBuff_Struct) * PET_BUFF_COUNT)); - memset(pet_items, 0, (sizeof(uint32) * EQEmu::invslot::EQUIPMENT_COUNT)); + memset(pet_items, 0, (sizeof(uint32) * EQ::invslot::EQUIPMENT_COUNT)); pet_inst->GetPetState(pet_buffs, pet_items, pet_name); @@ -2344,13 +2344,13 @@ void Bot::BotRangedAttack(Mob* other) { return; } - EQEmu::ItemInstance* rangedItem = GetBotItem(EQEmu::invslot::slotRange); - const EQEmu::ItemData* RangeWeapon = nullptr; + EQ::ItemInstance* rangedItem = GetBotItem(EQ::invslot::slotRange); + const EQ::ItemData* RangeWeapon = nullptr; if(rangedItem) RangeWeapon = rangedItem->GetItem(); - EQEmu::ItemInstance* ammoItem = GetBotItem(EQEmu::invslot::slotAmmo); - const EQEmu::ItemData* Ammo = nullptr; + EQ::ItemInstance* ammoItem = GetBotItem(EQ::invslot::slotAmmo); + const EQ::ItemData* Ammo = nullptr; if(ammoItem) Ammo = ammoItem->GetItem(); @@ -2361,7 +2361,7 @@ void Bot::BotRangedAttack(Mob* other) { if(!IsAttackAllowed(other) || IsCasting() || DivineAura() || IsStunned() || IsMezzed() || (GetAppearance() == eaDead)) return; - SendItemAnimation(other, Ammo, EQEmu::skills::SkillArchery); + SendItemAnimation(other, Ammo, EQ::skills::SkillArchery); //DoArcheryAttackDmg(GetTarget(), rangedItem, ammoItem); DoArcheryAttackDmg(other, rangedItem, ammoItem); // watch @@ -2406,12 +2406,12 @@ bool Bot::CheckBotDoubleAttack(bool tripleAttack) { //Check for bonuses that give you a double attack chance regardless of skill (ie Bestial Frenzy/Harmonious Attack AA) uint32 bonusGiveDA = (aabonuses.GiveDoubleAttack + spellbonuses.GiveDoubleAttack + itembonuses.GiveDoubleAttack); // If you don't have the double attack skill, return - if (!GetSkill(EQEmu::skills::SkillDoubleAttack) && !(GetClass() == BARD || GetClass() == BEASTLORD)) + if (!GetSkill(EQ::skills::SkillDoubleAttack) && !(GetClass() == BARD || GetClass() == BEASTLORD)) return false; // You start with no chance of double attacking float chance = 0.0f; - uint16 skill = GetSkill(EQEmu::skills::SkillDoubleAttack); + uint16 skill = GetSkill(EQ::skills::SkillDoubleAttack); int32 bonusDA = (aabonuses.DoubleAttackChance + spellbonuses.DoubleAttackChance + itembonuses.DoubleAttackChance); //Use skill calculations otherwise, if you only have AA applied GiveDoubleAttack chance then use that value as the base. if (skill) @@ -2436,28 +2436,28 @@ bool Bot::CheckBotDoubleAttack(bool tripleAttack) { return false; } -void Bot::ApplySpecialAttackMod(EQEmu::skills::SkillType skill, int32 &dmg, int32 &mindmg) { +void Bot::ApplySpecialAttackMod(EQ::skills::SkillType skill, int32 &dmg, int32 &mindmg) { int item_slot = -1; //1: Apply bonus from AC (BOOT/SHIELD/HANDS) est. 40AC=6dmg switch (skill) { - case EQEmu::skills::SkillFlyingKick: - case EQEmu::skills::SkillRoundKick: - case EQEmu::skills::SkillKick: - item_slot = EQEmu::invslot::slotFeet; + case EQ::skills::SkillFlyingKick: + case EQ::skills::SkillRoundKick: + case EQ::skills::SkillKick: + item_slot = EQ::invslot::slotFeet; break; - case EQEmu::skills::SkillBash: - item_slot = EQEmu::invslot::slotSecondary; + case EQ::skills::SkillBash: + item_slot = EQ::invslot::slotSecondary; break; - case EQEmu::skills::SkillDragonPunch: - case EQEmu::skills::SkillEagleStrike: - case EQEmu::skills::SkillTigerClaw: - item_slot = EQEmu::invslot::slotHands; + case EQ::skills::SkillDragonPunch: + case EQ::skills::SkillEagleStrike: + case EQ::skills::SkillTigerClaw: + item_slot = EQ::invslot::slotHands; break; } - if (item_slot >= EQEmu::invslot::EQUIPMENT_BEGIN){ - const EQEmu::ItemInstance* inst = GetBotItem(item_slot); - const EQEmu::ItemData* botweapon = nullptr; + if (item_slot >= EQ::invslot::EQUIPMENT_BEGIN){ + const EQ::ItemInstance* inst = GetBotItem(item_slot); + const EQ::ItemData* botweapon = nullptr; if(inst) botweapon = inst->GetItem(); @@ -2532,8 +2532,8 @@ void Bot::AI_Process() #define NOT_GUARDING (!GetGuardFlag()) #define HOLDING (GetHoldFlag()) #define NOT_HOLDING (!GetHoldFlag()) -#define PASSIVE (GetBotStance() == EQEmu::constants::stancePassive) -#define NOT_PASSIVE (GetBotStance() != EQEmu::constants::stancePassive) +#define PASSIVE (GetBotStance() == EQ::constants::stancePassive) +#define NOT_PASSIVE (GetBotStance() != EQ::constants::stancePassive) Client* bot_owner = (GetBotOwner() && GetBotOwner()->IsClient() ? GetBotOwner()->CastToClient() : nullptr); Group* bot_group = GetGroup(); @@ -3068,8 +3068,8 @@ void Bot::AI_Process() bool atCombatRange = false; - const auto* p_item = GetBotItem(EQEmu::invslot::slotPrimary); - const auto* s_item = GetBotItem(EQEmu::invslot::slotSecondary); + const auto* p_item = GetBotItem(EQ::invslot::slotPrimary); + const auto* s_item = GetBotItem(EQ::invslot::slotSecondary); bool behind_mob = false; bool backstab_weapon = false; @@ -3257,13 +3257,13 @@ void Bot::AI_Process() if (m_evade_timer.Check(false)) { // Attempt to evade - int timer_duration = (HideReuseTime - GetSkillReuseTime(EQEmu::skills::SkillHide)) * 1000; + int timer_duration = (HideReuseTime - GetSkillReuseTime(EQ::skills::SkillHide)) * 1000; if (timer_duration < 0) { timer_duration = 0; } m_evade_timer.Start(timer_duration); - if (zone->random.Int(0, 260) < (int)GetSkill(EQEmu::skills::SkillHide)) { + if (zone->random.Int(0, 260) < (int)GetSkill(EQ::skills::SkillHide)) { RogueEvade(tar); } @@ -3417,13 +3417,13 @@ void Bot::AI_Process() TEST_COMBATANTS(); if (attack_timer.Check()) { // Process primary weapon attacks - Attack(tar, EQEmu::invslot::slotPrimary); + Attack(tar, EQ::invslot::slotPrimary); TEST_COMBATANTS(); - TriggerDefensiveProcs(tar, EQEmu::invslot::slotPrimary, false); + TriggerDefensiveProcs(tar, EQ::invslot::slotPrimary, false); TEST_COMBATANTS(); - TryWeaponProc(p_item, tar, EQEmu::invslot::slotPrimary); + TryWeaponProc(p_item, tar, EQ::invslot::slotPrimary); // bool tripleSuccess = false; @@ -3431,19 +3431,19 @@ void Bot::AI_Process() if (CanThisClassDoubleAttack()) { if (CheckBotDoubleAttack()) { - Attack(tar, EQEmu::invslot::slotPrimary, true); + Attack(tar, EQ::invslot::slotPrimary, true); } TEST_COMBATANTS(); if (GetSpecialAbility(SPECATK_TRIPLE) && CheckBotDoubleAttack(true)) { // tripleSuccess = true; - Attack(tar, EQEmu::invslot::slotPrimary, true); + Attack(tar, EQ::invslot::slotPrimary, true); } TEST_COMBATANTS(); // quad attack, does this belong here?? if (GetSpecialAbility(SPECATK_QUAD) && CheckBotDoubleAttack(true)) { - Attack(tar, EQEmu::invslot::slotPrimary, true); + Attack(tar, EQ::invslot::slotPrimary, true); } } @@ -3455,10 +3455,10 @@ void Bot::AI_Process() if (zone->random.Int(0, 100) < flurrychance) { MessageString(Chat::NPCFlurry, YOU_FLURRY); - Attack(tar, EQEmu::invslot::slotPrimary, false); + Attack(tar, EQ::invslot::slotPrimary, false); TEST_COMBATANTS(); - Attack(tar, EQEmu::invslot::slotPrimary, false); + Attack(tar, EQ::invslot::slotPrimary, false); } } @@ -3469,7 +3469,7 @@ void Bot::AI_Process() if (p_item && p_item->GetItem()->IsType2HWeapon()) { if (zone->random.Int(0, 100) < ExtraAttackChanceBonus) { - Attack(tar, EQEmu::invslot::slotPrimary, false); + Attack(tar, EQ::invslot::slotPrimary, false); } } } @@ -3478,7 +3478,7 @@ void Bot::AI_Process() TEST_COMBATANTS(); if (attack_dw_timer.Check() && CanThisClassDualWield()) { // Process secondary weapon attacks - const EQEmu::ItemData* s_itemdata = nullptr; + const EQ::ItemData* s_itemdata = nullptr; // Can only dual wield without a weapon if you're a monk if (s_item || (GetClass() == MONK)) { @@ -3499,7 +3499,7 @@ void Bot::AI_Process() float DualWieldProbability = 0.0f; int32 Ambidexterity = (aabonuses.Ambidexterity + spellbonuses.Ambidexterity + itembonuses.Ambidexterity); - DualWieldProbability = ((GetSkill(EQEmu::skills::SkillDualWield) + GetLevel() + Ambidexterity) / 400.0f); // 78.0 max + DualWieldProbability = ((GetSkill(EQ::skills::SkillDualWield) + GetLevel() + Ambidexterity) / 400.0f); // 78.0 max int32 DWBonus = (spellbonuses.DualWieldChance + itembonuses.DualWieldChance); DualWieldProbability += (DualWieldProbability * float(DWBonus) / 100.0f); @@ -3507,16 +3507,16 @@ void Bot::AI_Process() float random = zone->random.Real(0, 1); if (random < DualWieldProbability) { // Max 78% of DW - Attack(tar, EQEmu::invslot::slotSecondary); // Single attack with offhand + Attack(tar, EQ::invslot::slotSecondary); // Single attack with offhand TEST_COMBATANTS(); - TryWeaponProc(s_item, tar, EQEmu::invslot::slotSecondary); + TryWeaponProc(s_item, tar, EQ::invslot::slotSecondary); TEST_COMBATANTS(); if (CanThisClassDoubleAttack() && CheckBotDoubleAttack()) { if (tar->GetHP() > -10) { - Attack(tar, EQEmu::invslot::slotSecondary); // Single attack with offhand + Attack(tar, EQ::invslot::slotSecondary); // Single attack with offhand } } } @@ -3859,12 +3859,12 @@ void Bot::PetAIProcess() { if(!botPet->BehindMob(botPet->GetTarget(), botPet->GetX(), botPet->GetY()) && botPet->GetTarget()->IsEnraged()) return; - if (botPet->Attack(GetTarget(), EQEmu::invslot::slotPrimary)) // try the main hand + if (botPet->Attack(GetTarget(), EQ::invslot::slotPrimary)) // try the main hand if (botPet->GetTarget()) { // We're a pet so we re able to dual attack int32 RandRoll = zone->random.Int(0, 99); if (botPet->CanThisClassDoubleAttack() && (RandRoll < (botPet->GetLevel() + NPCDualAttackModifier))) { - if (botPet->Attack(botPet->GetTarget(), EQEmu::invslot::slotPrimary)) {} + if (botPet->Attack(botPet->GetTarget(), EQ::invslot::slotPrimary)) {} } } @@ -3899,14 +3899,14 @@ void Bot::PetAIProcess() { // Ok now, let's check pet's offhand. if (botPet->GetAttackDWTimer().Check() && botPet->GetOwnerID() && botPet->GetOwner() && ((botPet->GetOwner()->GetClass() == MAGICIAN) || (botPet->GetOwner()->GetClass() == NECROMANCER) || (botPet->GetOwner()->GetClass() == SHADOWKNIGHT) || (botPet->GetOwner()->GetClass() == BEASTLORD))) { if(botPet->GetOwner()->GetLevel() >= 24) { - float DualWieldProbability = ((botPet->GetSkill(EQEmu::skills::SkillDualWield) + botPet->GetLevel()) / 400.0f); + float DualWieldProbability = ((botPet->GetSkill(EQ::skills::SkillDualWield) + botPet->GetLevel()) / 400.0f); DualWieldProbability -= zone->random.Real(0, 1); if(DualWieldProbability < 0) { - botPet->Attack(botPet->GetTarget(), EQEmu::invslot::slotSecondary); + botPet->Attack(botPet->GetTarget(), EQ::invslot::slotSecondary); if (botPet->CanThisClassDoubleAttack()) { int32 RandRoll = zone->random.Int(0, 99); if (RandRoll < (botPet->GetLevel() + 20)) - botPet->Attack(botPet->GetTarget(), EQEmu::invslot::slotSecondary); + botPet->Attack(botPet->GetTarget(), EQ::invslot::slotSecondary); } } } @@ -4030,10 +4030,10 @@ bool Bot::Spawn(Client* botCharacterOwner) { // I re-enabled this until I can sort it out uint32 itemID = 0; uint8 materialFromSlot = 0xFF; - for (int i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; ++i) { + for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; ++i) { itemID = GetBotItemBySlot(i); if(itemID != 0) { - materialFromSlot = EQEmu::InventoryProfile::CalcMaterialFromSlot(i); + materialFromSlot = EQ::InventoryProfile::CalcMaterialFromSlot(i); if(materialFromSlot != 0xFF) this->SendWearChange(materialFromSlot); } @@ -4059,7 +4059,7 @@ void Bot::RemoveBotItemBySlot(uint32 slotID, std::string *errorMessage) } // Retrieves all the inventory records from the database for this bot. -void Bot::GetBotItems(EQEmu::InventoryProfile &inv, std::string* errorMessage) +void Bot::GetBotItems(EQ::InventoryProfile &inv, std::string* errorMessage) { if(!GetBotID()) return; @@ -4111,18 +4111,18 @@ void Bot::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) { ns->spawn.size = 0; ns->spawn.NPC = 0; // 0=player,1=npc,2=pc corpse,3=npc corpse UpdateActiveLight(); - ns->spawn.light = m_Light.Type[EQEmu::lightsource::LightActive]; + ns->spawn.light = m_Light.Type[EQ::lightsource::LightActive]; ns->spawn.helm = helmtexture; //(GetShowHelm() ? helmtexture : 0); //0xFF; ns->spawn.equip_chest2 = texture; //0xFF; ns->spawn.show_name = true; strcpy(ns->spawn.lastName, GetSurname().c_str()); strcpy(ns->spawn.title, GetTitle().c_str()); strcpy(ns->spawn.suffix, GetSuffix().c_str()); - const EQEmu::ItemData* item = nullptr; - const EQEmu::ItemInstance* inst = nullptr; + const EQ::ItemData* item = nullptr; + const EQ::ItemInstance* inst = nullptr; uint32 spawnedbotid = 0; spawnedbotid = this->GetBotID(); - for (int i = EQEmu::textures::textureBegin; i < EQEmu::textures::weaponPrimary; i++) { + for (int i = EQ::textures::textureBegin; i < EQ::textures::weaponPrimary; i++) { inst = GetBotItem(i); if (inst) { item = inst->GetItem(); @@ -4141,25 +4141,25 @@ void Bot::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) { } } - inst = GetBotItem(EQEmu::invslot::slotPrimary); + inst = GetBotItem(EQ::invslot::slotPrimary); if(inst) { item = inst->GetItem(); if(item) { if(strlen(item->IDFile) > 2) ns->spawn.equipment.Primary.Material = atoi(&item->IDFile[2]); - ns->spawn.equipment_tint.Primary.Color = GetEquipmentColor(EQEmu::textures::weaponPrimary); + ns->spawn.equipment_tint.Primary.Color = GetEquipmentColor(EQ::textures::weaponPrimary); } } - inst = GetBotItem(EQEmu::invslot::slotSecondary); + inst = GetBotItem(EQ::invslot::slotSecondary); if(inst) { item = inst->GetItem(); if(item) { if(strlen(item->IDFile) > 2) ns->spawn.equipment.Secondary.Material = atoi(&item->IDFile[2]); - ns->spawn.equipment_tint.Secondary.Color = GetEquipmentColor(EQEmu::textures::weaponSecondary); + ns->spawn.equipment_tint.Secondary.Color = GetEquipmentColor(EQ::textures::weaponSecondary); } } } @@ -4396,8 +4396,8 @@ void Bot::SendBotArcheryWearChange(uint8 material_slot, uint32 material, uint32 } // Returns the item id that is in the bot inventory collection for the specified slot. -EQEmu::ItemInstance* Bot::GetBotItem(uint32 slotID) { - EQEmu::ItemInstance* item = m_inv.GetItem(slotID); +EQ::ItemInstance* Bot::GetBotItem(uint32 slotID) { + EQ::ItemInstance* item = m_inv.GetItem(slotID); if(item) return item; @@ -4409,9 +4409,9 @@ void Bot::BotAddEquipItem(int slot, uint32 id) { // this is being called before bot is assigned an entity id.. // ..causing packets to be sent out to zone with an id of '0' if(slot > 0 && id > 0) { - uint8 materialFromSlot = EQEmu::InventoryProfile::CalcMaterialFromSlot(slot); + uint8 materialFromSlot = EQ::InventoryProfile::CalcMaterialFromSlot(slot); - if (materialFromSlot != EQEmu::textures::materialInvalid) { + if (materialFromSlot != EQ::textures::materialInvalid) { equipment[slot] = id; // npc has more than just material slots. Valid material should mean valid inventory index if (GetID()) // temp hack fix SendWearChange(materialFromSlot); @@ -4427,13 +4427,13 @@ void Bot::BotAddEquipItem(int slot, uint32 id) { // Erases the specified item from bot the NPC equipment array and from the bot inventory collection. void Bot::BotRemoveEquipItem(int16 slot) { - uint8 material_slot = EQEmu::InventoryProfile::CalcMaterialFromSlot(slot); + uint8 material_slot = EQ::InventoryProfile::CalcMaterialFromSlot(slot); - if (material_slot != EQEmu::textures::materialInvalid) { + if (material_slot != EQ::textures::materialInvalid) { equipment[slot] = 0; // npc has more than just material slots. Valid material should mean valid inventory index SendWearChange(material_slot); - if (material_slot == EQEmu::textures::armorChest) - SendWearChange(EQEmu::textures::armorArms); + if (material_slot == EQ::textures::armorChest) + SendWearChange(EQ::textures::armorArms); } UpdateEquipmentLight(); @@ -4441,7 +4441,7 @@ void Bot::BotRemoveEquipItem(int16 slot) SendAppearancePacket(AT_Light, GetActiveLightType()); } -void Bot::BotTradeSwapItem(Client* client, int16 lootSlot, const EQEmu::ItemInstance* inst, const EQEmu::ItemInstance* inst_swap, uint32 equipableSlots, std::string* errorMessage, bool swap) { +void Bot::BotTradeSwapItem(Client* client, int16 lootSlot, const EQ::ItemInstance* inst, const EQ::ItemInstance* inst_swap, uint32 equipableSlots, std::string* errorMessage, bool swap) { if(!errorMessage->empty()) return; @@ -4464,7 +4464,7 @@ void Bot::BotTradeSwapItem(Client* client, int16 lootSlot, const EQEmu::ItemInst } } -void Bot::BotTradeAddItem(uint32 id, const EQEmu::ItemInstance* inst, int16 charges, uint32 equipableSlots, uint16 lootSlot, std::string* errorMessage, bool addToDb) +void Bot::BotTradeAddItem(uint32 id, const EQ::ItemInstance* inst, int16 charges, uint32 equipableSlots, uint16 lootSlot, std::string* errorMessage, bool addToDb) { if(addToDb) { if (!database.botdb.SaveItemBySlot(this, lootSlot, inst)) { @@ -4537,12 +4537,12 @@ void Bot::FinishTrade(Client* client, BotTradeType tradeType) if (tradeType == BotTradeClientNormal) { // Items being traded are found in the normal trade window used to trade between a Client and a Client or NPC // Items in this mode are found in slot ids 3000 thru 3003 - thought bots used the full 8-slot window..? - PerformTradeWithClient(EQEmu::invslot::TRADE_BEGIN, EQEmu::invslot::TRADE_END, client); // {3000..3007} + PerformTradeWithClient(EQ::invslot::TRADE_BEGIN, EQ::invslot::TRADE_END, client); // {3000..3007} } else if (tradeType == BotTradeClientNoDropNoTrade) { // Items being traded are found on the Client's cursor slot, slot id 30. This item can be either a single item or it can be a bag. // If it is a bag, then we have to search for items in slots 331 thru 340 - PerformTradeWithClient(EQEmu::invslot::slotCursor, EQEmu::invslot::slotCursor, client); + PerformTradeWithClient(EQ::invslot::slotCursor, EQ::invslot::slotCursor, client); // TODO: Add logic here to test if the item in SLOT_CURSOR is a container type, if it is then we need to call the following: // PerformTradeWithClient(331, 340, client); @@ -4552,7 +4552,7 @@ void Bot::FinishTrade(Client* client, BotTradeType tradeType) // Perfoms the actual trade action with a client bot owner void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* client) { - using namespace EQEmu; + using namespace EQ; struct ClientTrade { const ItemInstance* tradeItemInstance; @@ -4692,7 +4692,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli } // find equipment slots - const bool can_dual_wield = (GetSkill(EQEmu::skills::SkillDualWield) > 0); + const bool can_dual_wield = (GetSkill(EQ::skills::SkillDualWield) > 0); bool melee_2h_weapon = false; bool melee_secondary = false; @@ -4904,7 +4904,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli this->BotAddEquipItem(trade_iterator.toBotSlot, (trade_iterator.tradeItemInstance ? trade_iterator.tradeItemInstance->GetID() : 0)); trade_iterator.tradeItemInstance = nullptr; // actual deletion occurs in client delete below - client->DeleteItemInInventory(trade_iterator.fromClientSlot, 0, (trade_iterator.fromClientSlot == EQEmu::invslot::slotCursor)); + client->DeleteItemInInventory(trade_iterator.fromClientSlot, 0, (trade_iterator.fromClientSlot == EQ::invslot::slotCursor)); // database currently has unattuned item saved in inventory..it will be attuned on next bot load // this prevents unattuned item returns in the mean time (TODO: re-work process) @@ -4934,7 +4934,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli CalcBotStats(client->GetBotOption(Client::booStatsUpdate)); } -bool Bot::Death(Mob *killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill) { +bool Bot::Death(Mob *killerMob, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill) { if(!NPC::Death(killerMob, damage, spell_id, attack_skill)) return false; @@ -5022,7 +5022,7 @@ bool Bot::Death(Mob *killerMob, int32 damage, uint16 spell_id, EQEmu::skills::Sk return true; } -void Bot::Damage(Mob *from, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) { +void Bot::Damage(Mob *from, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) { if(spell_id == 0) spell_id = SPELL_UNKNOWN; @@ -5108,14 +5108,14 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b } FaceTarget(GetTarget()); - EQEmu::ItemInstance* weapon = nullptr; - if (Hand == EQEmu::invslot::slotPrimary) { - weapon = GetBotItem(EQEmu::invslot::slotPrimary); + EQ::ItemInstance* weapon = nullptr; + if (Hand == EQ::invslot::slotPrimary) { + weapon = GetBotItem(EQ::invslot::slotPrimary); OffHandAtk(false); } - if (Hand == EQEmu::invslot::slotSecondary) { - weapon = GetBotItem(EQEmu::invslot::slotSecondary); + if (Hand == EQ::invslot::slotSecondary) { + weapon = GetBotItem(EQ::invslot::slotSecondary); OffHandAtk(true); } @@ -5164,18 +5164,18 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b // This is not recommended for normal usage, as the damage bonus represents a non-trivial component of the DPS output // of weapons wielded by higher-level melee characters (especially for two-handed weapons). int ucDamageBonus = 0; - if (Hand == EQEmu::invslot::slotPrimary && GetLevel() >= 28 && IsWarriorClass()) { + if (Hand == EQ::invslot::slotPrimary && GetLevel() >= 28 && IsWarriorClass()) { // Damage bonuses apply only to hits from the main hand (Hand == MainPrimary) by characters level 28 and above // who belong to a melee class. If we're here, then all of these conditions apply. - ucDamageBonus = GetWeaponDamageBonus(weapon ? weapon->GetItem() : (const EQEmu::ItemData*) nullptr); + ucDamageBonus = GetWeaponDamageBonus(weapon ? weapon->GetItem() : (const EQ::ItemData*) nullptr); my_hit.min_damage = ucDamageBonus; hate += ucDamageBonus; } #endif //Live AA - Sinister Strikes *Adds weapon damage bonus to offhand weapon. - if (Hand == EQEmu::invslot::slotSecondary) { + if (Hand == EQ::invslot::slotSecondary) { if (aabonuses.SecondaryDmgInc || itembonuses.SecondaryDmgInc || spellbonuses.SecondaryDmgInc){ - ucDamageBonus = GetWeaponDamageBonus(weapon ? weapon->GetItem() : (const EQEmu::ItemData*) nullptr); + ucDamageBonus = GetWeaponDamageBonus(weapon ? weapon->GetItem() : (const EQ::ItemData*) nullptr); my_hit.min_damage = ucDamageBonus; hate += ucDamageBonus; } @@ -5581,18 +5581,18 @@ int32 Bot::GetBotFocusEffect(focusType bottype, uint16 spell_id) { //Check if item focus effect exists for the client. if (itembonuses.FocusEffects[bottype]) { - const EQEmu::ItemData* TempItem = nullptr; - const EQEmu::ItemData* UsedItem = nullptr; - const EQEmu::ItemInstance* TempInst = nullptr; + const EQ::ItemData* TempItem = nullptr; + const EQ::ItemData* UsedItem = nullptr; + const EQ::ItemInstance* TempInst = nullptr; uint16 UsedFocusID = 0; int32 Total = 0; int32 focus_max = 0; int32 focus_max_real = 0; //item focus // are focus effects the same as bonus? (slotAmmo-excluded) - for (int x = EQEmu::invslot::EQUIPMENT_BEGIN; x <= EQEmu::invslot::EQUIPMENT_END; x++) { + for (int x = EQ::invslot::EQUIPMENT_BEGIN; x <= EQ::invslot::EQUIPMENT_END; x++) { TempItem = nullptr; - EQEmu::ItemInstance* ins = GetBotItem(x); + EQ::ItemInstance* ins = GetBotItem(x); if (!ins) continue; @@ -5615,11 +5615,11 @@ int32 Bot::GetBotFocusEffect(focusType bottype, uint16 spell_id) { } } - for (int y = EQEmu::invaug::SOCKET_BEGIN; y <= EQEmu::invaug::SOCKET_END; ++y) { - EQEmu::ItemInstance *aug = nullptr; + for (int y = EQ::invaug::SOCKET_BEGIN; y <= EQ::invaug::SOCKET_END; ++y) { + EQ::ItemInstance *aug = nullptr; aug = ins->GetAugment(y); if(aug) { - const EQEmu::ItemData* TempItemAug = aug->GetItem(); + const EQ::ItemData* TempItemAug = aug->GetItem(); if (TempItemAug && TempItemAug->Focus.Effect > 0 && TempItemAug->Focus.Effect != SPELL_UNKNOWN) { if(rand_effectiveness) { focus_max = CalcBotFocusEffect(bottype, TempItemAug->Focus.Effect, spell_id, true); @@ -6070,13 +6070,13 @@ float Bot::GetProcChances(float ProcBonus, uint16 hand) { float ProcChance = 0.0f; uint32 weapon_speed = 0; switch (hand) { - case EQEmu::invslot::slotPrimary: + case EQ::invslot::slotPrimary: weapon_speed = attack_timer.GetDuration(); break; - case EQEmu::invslot::slotSecondary: + case EQ::invslot::slotSecondary: weapon_speed = attack_dw_timer.GetDuration(); break; - case EQEmu::invslot::slotRange: + case EQ::invslot::slotRange: weapon_speed = ranged_timer.GetDuration(); break; } @@ -6100,9 +6100,9 @@ float Bot::GetProcChances(float ProcBonus, uint16 hand) { int Bot::GetHandToHandDamage(void) { if (RuleB(Combat, UseRevampHandToHand)) { // everyone uses this in the revamp! - int skill = GetSkill(EQEmu::skills::SkillHandtoHand); + int skill = GetSkill(EQ::skills::SkillHandtoHand); int epic = 0; - if (CastToNPC()->GetEquippedItemFromTextureSlot(EQEmu::textures::armorHands) == 10652 && GetLevel() > 46) + if (CastToNPC()->GetEquippedItemFromTextureSlot(EQ::textures::armorHands) == 10652 && GetLevel() > 46) epic = 280; if (epic > skill) skill = epic; @@ -6124,7 +6124,7 @@ int Bot::GetHandToHandDamage(void) { 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, // 31-40 10, 11, 11, 11, 11, 11, 11, 12, 12}; // 41-49 if (GetClass() == MONK) { - if (CastToNPC()->GetEquippedItemFromTextureSlot(EQEmu::textures::armorHands) == 10652 && GetLevel() > 50) + if (CastToNPC()->GetEquippedItemFromTextureSlot(EQ::textures::armorHands) == 10652 && GetLevel() > 50) return 9; if (level > 62) return 15; @@ -6166,11 +6166,11 @@ void Bot::DoRiposte(Mob* defender) { if (!defender) return; - defender->Attack(this, EQEmu::invslot::slotPrimary, true); + defender->Attack(this, EQ::invslot::slotPrimary, true); int32 DoubleRipChance = (defender->GetAABonuses().GiveDoubleRiposte[0] + defender->GetSpellBonuses().GiveDoubleRiposte[0] + defender->GetItemBonuses().GiveDoubleRiposte[0]); if(DoubleRipChance && (DoubleRipChance >= zone->random.Int(0, 100))) { LogCombat("Preforming a double riposte ([{}] percent chance)", DoubleRipChance); - defender->Attack(this, EQEmu::invslot::slotPrimary, true); + defender->Attack(this, EQ::invslot::slotPrimary, true); } DoubleRipChance = defender->GetAABonuses().GiveDoubleRiposte[1]; @@ -6182,14 +6182,14 @@ void Bot::DoRiposte(Mob* defender) { } } -int Bot::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) +int Bot::GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target) { - int base = EQEmu::skills::GetBaseDamage(skill); + int base = EQ::skills::GetBaseDamage(skill); auto skill_level = GetSkill(skill); switch (skill) { - case EQEmu::skills::SkillDragonPunch: - case EQEmu::skills::SkillEagleStrike: - case EQEmu::skills::SkillTigerClaw: + case EQ::skills::SkillDragonPunch: + case EQ::skills::SkillEagleStrike: + case EQ::skills::SkillTigerClaw: if (skill_level >= 25) base++; if (skill_level >= 75) @@ -6199,8 +6199,8 @@ int Bot::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) if (skill_level >= 175) base++; return base; - case EQEmu::skills::SkillFrenzy: - if (GetBotItem(EQEmu::invslot::slotPrimary)) { + case EQ::skills::SkillFrenzy: + if (GetBotItem(EQ::invslot::slotPrimary)) { if (GetLevel() > 15) base += GetLevel() - 15; if (base > 23) @@ -6213,44 +6213,44 @@ int Bot::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) base++; } return base; - case EQEmu::skills::SkillFlyingKick: { + case EQ::skills::SkillFlyingKick: { float skill_bonus = skill_level / 9.0f; float ac_bonus = 0.0f; - auto inst = GetBotItem(EQEmu::invslot::slotFeet); + auto inst = GetBotItem(EQ::invslot::slotFeet); if (inst) ac_bonus = inst->GetItemArmorClass(true) / 25.0f; if (ac_bonus > skill_bonus) ac_bonus = skill_bonus; return static_cast(ac_bonus + skill_bonus); } - case EQEmu::skills::SkillKick: { + case EQ::skills::SkillKick: { float skill_bonus = skill_level / 10.0f; float ac_bonus = 0.0f; - auto inst = GetBotItem(EQEmu::invslot::slotFeet); + auto inst = GetBotItem(EQ::invslot::slotFeet); if (inst) ac_bonus = inst->GetItemArmorClass(true) / 25.0f; if (ac_bonus > skill_bonus) ac_bonus = skill_bonus; return static_cast(ac_bonus + skill_bonus); } - case EQEmu::skills::SkillBash: { + case EQ::skills::SkillBash: { float skill_bonus = skill_level / 10.0f; float ac_bonus = 0.0f; - const EQEmu::ItemInstance *inst = nullptr; + const EQ::ItemInstance *inst = nullptr; if (HasShieldEquiped()) - inst = GetBotItem(EQEmu::invslot::slotSecondary); + inst = GetBotItem(EQ::invslot::slotSecondary); else if (HasTwoHanderEquipped()) - inst = GetBotItem(EQEmu::invslot::slotPrimary); + inst = GetBotItem(EQ::invslot::slotPrimary); if (inst) ac_bonus = inst->GetItemArmorClass(true) / 25.0f; if (ac_bonus > skill_bonus) ac_bonus = skill_bonus; return static_cast(ac_bonus + skill_bonus); } - case EQEmu::skills::SkillBackstab: { + case EQ::skills::SkillBackstab: { float skill_bonus = static_cast(skill_level) * 0.02f; - auto inst = GetBotItem(EQEmu::invslot::slotPrimary); - if (inst && inst->GetItem() && inst->GetItem()->ItemType == EQEmu::item::ItemType1HPiercing) { + auto inst = GetBotItem(EQ::invslot::slotPrimary); + if (inst && inst->GetItem() && inst->GetItem()->ItemType == EQ::item::ItemType1HPiercing) { base = inst->GetItemBackstabDamage(true); if (!inst->GetItemBackstabDamage()) base += inst->GetItemWeaponDamage(true); @@ -6268,19 +6268,19 @@ int Bot::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) } } -void Bot::DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32 max_damage, int32 min_damage, int32 hate_override, int ReuseTime, bool HitChance) { +void Bot::DoSpecialAttackDamage(Mob *who, EQ::skills::SkillType skill, int32 max_damage, int32 min_damage, int32 hate_override, int ReuseTime, bool HitChance) { int32 hate = max_damage; if(hate_override > -1) hate = hate_override; - if (skill == EQEmu::skills::SkillBash) { - const EQEmu::ItemInstance* inst = GetBotItem(EQEmu::invslot::slotSecondary); - const EQEmu::ItemData* botweapon = nullptr; + if (skill == EQ::skills::SkillBash) { + const EQ::ItemInstance* inst = GetBotItem(EQ::invslot::slotSecondary); + const EQ::ItemData* botweapon = nullptr; if(inst) botweapon = inst->GetItem(); if(botweapon) { - if (botweapon->ItemType == EQEmu::item::ItemTypeShield) + if (botweapon->ItemType == EQ::item::ItemTypeShield) hate += botweapon->AC; hate = (hate * (100 + GetFuriousBash(botweapon->Focus.Effect)) / 100); @@ -6295,10 +6295,10 @@ void Bot::DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32 my_hit.skill = skill; my_hit.offense = offense(my_hit.skill); my_hit.tohit = GetTotalToHit(my_hit.skill, 0); - my_hit.hand = EQEmu::invslot::slotPrimary; + my_hit.hand = EQ::invslot::slotPrimary; - if (skill == EQEmu::skills::SkillThrowing || skill == EQEmu::skills::SkillArchery) - my_hit.hand = EQEmu::invslot::slotRange; + if (skill == EQ::skills::SkillThrowing || skill == EQ::skills::SkillArchery) + my_hit.hand = EQ::invslot::slotRange; DoAttack(who, my_hit); @@ -6335,12 +6335,12 @@ void Bot::TryBackstab(Mob *other, int ReuseTime) { bool bIsBehind = false; bool bCanFrontalBS = false; - const EQEmu::ItemInstance* inst = GetBotItem(EQEmu::invslot::slotPrimary); - const EQEmu::ItemData* botpiercer = nullptr; + const EQ::ItemInstance* inst = GetBotItem(EQ::invslot::slotPrimary); + const EQ::ItemData* botpiercer = nullptr; if(inst) botpiercer = inst->GetItem(); - if (!botpiercer || (botpiercer->ItemType != EQEmu::item::ItemType1HPiercing)) { + if (!botpiercer || (botpiercer->ItemType != EQ::item::ItemType1HPiercing)) { BotGroupSay(this, "I can't backstab with this weapon!"); return; } @@ -6362,7 +6362,7 @@ void Bot::TryBackstab(Mob *other, int ReuseTime) { } else { RogueBackstab(other); if (level > 54) { - float DoubleAttackProbability = ((GetSkill(EQEmu::skills::SkillDoubleAttack) + GetLevel()) / 500.0f); + float DoubleAttackProbability = ((GetSkill(EQ::skills::SkillDoubleAttack) + GetLevel()) / 500.0f); if(zone->random.Real(0, 1) < DoubleAttackProbability) { if(other->GetHP() > 0) RogueBackstab(other,false,ReuseTime); @@ -6378,7 +6378,7 @@ void Bot::TryBackstab(Mob *other, int ReuseTime) { m_specialattacks = eSpecialAttacks::None; } else - Attack(other, EQEmu::invslot::slotPrimary); + Attack(other, EQ::invslot::slotPrimary); } void Bot::RogueBackstab(Mob *other, bool min_damage, int ReuseTime) @@ -6386,30 +6386,30 @@ void Bot::RogueBackstab(Mob *other, bool min_damage, int ReuseTime) if (!other) return; - EQEmu::ItemInstance *botweaponInst = GetBotItem(EQEmu::invslot::slotPrimary); + EQ::ItemInstance *botweaponInst = GetBotItem(EQ::invslot::slotPrimary); if (botweaponInst) { if (!GetWeaponDamage(other, botweaponInst)) return; - } else if (!GetWeaponDamage(other, (const EQEmu::ItemData *)nullptr)) { + } else if (!GetWeaponDamage(other, (const EQ::ItemData *)nullptr)) { return; } uint32 hate = 0; - int base_damage = GetBaseSkillDamage(EQEmu::skills::SkillBackstab, other); + int base_damage = GetBaseSkillDamage(EQ::skills::SkillBackstab, other); hate = base_damage; - DoSpecialAttackDamage(other, EQEmu::skills::SkillBackstab, base_damage, 0, hate, ReuseTime); + DoSpecialAttackDamage(other, EQ::skills::SkillBackstab, base_damage, 0, hate, ReuseTime); DoAnim(anim1HPiercing); } void Bot::RogueAssassinate(Mob* other) { - EQEmu::ItemInstance* botweaponInst = GetBotItem(EQEmu::invslot::slotPrimary); + EQ::ItemInstance* botweaponInst = GetBotItem(EQ::invslot::slotPrimary); if(botweaponInst) { if(GetWeaponDamage(other, botweaponInst)) - other->Damage(this, 32000, SPELL_UNKNOWN, EQEmu::skills::SkillBackstab); + other->Damage(this, 32000, SPELL_UNKNOWN, EQ::skills::SkillBackstab); else - other->Damage(this, -5, SPELL_UNKNOWN, EQEmu::skills::SkillBackstab); + other->Damage(this, -5, SPELL_UNKNOWN, EQ::skills::SkillBackstab); } DoAnim(anim1HPiercing); @@ -6428,7 +6428,7 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) { // Bots without this skill shouldn't be 'checking' on this timer..let's just disable it and avoid the extra IsAttackAllowed() checks // Note: this is done here instead of NPC::ctor() because taunt skill can be acquired during level ups (the timer is re-enabled in CalcBotStats()) - if (!GetSkill(EQEmu::skills::SkillTaunt)) { + if (!GetSkill(EQ::skills::SkillTaunt)) { taunt_timer.Disable(); return; @@ -6480,18 +6480,18 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) { if (ma_time) { switch (GetClass()) { case MONK: { - int reuse = (MonkSpecialAttack(target, EQEmu::skills::SkillTigerClaw) - 1); + int reuse = (MonkSpecialAttack(target, EQ::skills::SkillTigerClaw) - 1); // Live AA - Technique of Master Wu int wuchance = itembonuses.DoubleSpecialAttack + spellbonuses.DoubleSpecialAttack + aabonuses.DoubleSpecialAttack; if (wuchance) { const int MonkSPA[5] = { - EQEmu::skills::SkillFlyingKick, - EQEmu::skills::SkillDragonPunch, - EQEmu::skills::SkillEagleStrike, - EQEmu::skills::SkillTigerClaw, - EQEmu::skills::SkillRoundKick + EQ::skills::SkillFlyingKick, + EQ::skills::SkillDragonPunch, + EQ::skills::SkillEagleStrike, + EQ::skills::SkillTigerClaw, + EQ::skills::SkillRoundKick }; int extra = 0; // always 1/4 of the double attack chance, 25% at rank 5 (100/4) @@ -6519,7 +6519,7 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) { auto classic = RuleB(Combat, ClassicMasterWu); while (extra) { - MonkSpecialAttack(GetTarget(), (classic ? MonkSPA[zone->random.Int(0, 4)] : EQEmu::skills::SkillTigerClaw)); + MonkSpecialAttack(GetTarget(), (classic ? MonkSPA[zone->random.Int(0, 4)] : EQ::skills::SkillTigerClaw)); --extra; } } @@ -6547,70 +6547,70 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) { case WARRIOR: if(level >= RuleI(Combat, NPCBashKickLevel)){ bool canBash = false; - if ((GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN) || (m_inv.GetItem(EQEmu::invslot::slotSecondary) && m_inv.GetItem(EQEmu::invslot::slotSecondary)->GetItem()->ItemType == EQEmu::item::ItemTypeShield) || (m_inv.GetItem(EQEmu::invslot::slotPrimary) && m_inv.GetItem(EQEmu::invslot::slotPrimary)->GetItem()->IsType2HWeapon() && GetAA(aa2HandBash) >= 1)) + if ((GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN) || (m_inv.GetItem(EQ::invslot::slotSecondary) && m_inv.GetItem(EQ::invslot::slotSecondary)->GetItem()->ItemType == EQ::item::ItemTypeShield) || (m_inv.GetItem(EQ::invslot::slotPrimary) && m_inv.GetItem(EQ::invslot::slotPrimary)->GetItem()->IsType2HWeapon() && GetAA(aa2HandBash) >= 1)) canBash = true; if(!canBash || zone->random.Int(0, 100) > 25) - skill_to_use = EQEmu::skills::SkillKick; + skill_to_use = EQ::skills::SkillKick; else - skill_to_use = EQEmu::skills::SkillBash; + skill_to_use = EQ::skills::SkillBash; } case RANGER: case BEASTLORD: - skill_to_use = EQEmu::skills::SkillKick; + skill_to_use = EQ::skills::SkillKick; break; case BERSERKER: - skill_to_use = EQEmu::skills::SkillFrenzy; + skill_to_use = EQ::skills::SkillFrenzy; break; case CLERIC: case SHADOWKNIGHT: case PALADIN: if(level >= RuleI(Combat, NPCBashKickLevel)){ - if ((GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN) || (m_inv.GetItem(EQEmu::invslot::slotSecondary) && m_inv.GetItem(EQEmu::invslot::slotSecondary)->GetItem()->ItemType == EQEmu::item::ItemTypeShield) || (m_inv.GetItem(EQEmu::invslot::slotPrimary) && m_inv.GetItem(EQEmu::invslot::slotPrimary)->GetItem()->IsType2HWeapon() && GetAA(aa2HandBash) >= 1)) - skill_to_use = EQEmu::skills::SkillBash; + if ((GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN) || (m_inv.GetItem(EQ::invslot::slotSecondary) && m_inv.GetItem(EQ::invslot::slotSecondary)->GetItem()->ItemType == EQ::item::ItemTypeShield) || (m_inv.GetItem(EQ::invslot::slotPrimary) && m_inv.GetItem(EQ::invslot::slotPrimary)->GetItem()->IsType2HWeapon() && GetAA(aa2HandBash) >= 1)) + skill_to_use = EQ::skills::SkillBash; } break; case MONK: if (GetLevel() >= 30) { - skill_to_use = EQEmu::skills::SkillFlyingKick; + skill_to_use = EQ::skills::SkillFlyingKick; } else if (GetLevel() >= 25) { - skill_to_use = EQEmu::skills::SkillDragonPunch; + skill_to_use = EQ::skills::SkillDragonPunch; } else if (GetLevel() >= 20) { - skill_to_use = EQEmu::skills::SkillEagleStrike; + skill_to_use = EQ::skills::SkillEagleStrike; } else if (GetLevel() >= 5) { - skill_to_use = EQEmu::skills::SkillRoundKick; + skill_to_use = EQ::skills::SkillRoundKick; } else { - skill_to_use = EQEmu::skills::SkillKick; + skill_to_use = EQ::skills::SkillKick; } break; case ROGUE: - skill_to_use = EQEmu::skills::SkillBackstab; + skill_to_use = EQ::skills::SkillBackstab; break; } if(skill_to_use == -1) return; - int dmg = GetBaseSkillDamage(static_cast(skill_to_use), GetTarget()); + int dmg = GetBaseSkillDamage(static_cast(skill_to_use), GetTarget()); - if (skill_to_use == EQEmu::skills::SkillBash) { + if (skill_to_use == EQ::skills::SkillBash) { if (target != this) { DoAnim(animTailRake); - if (GetWeaponDamage(target, GetBotItem(EQEmu::invslot::slotSecondary)) <= 0 && GetWeaponDamage(target, GetBotItem(EQEmu::invslot::slotShoulders)) <= 0) + if (GetWeaponDamage(target, GetBotItem(EQ::invslot::slotSecondary)) <= 0 && GetWeaponDamage(target, GetBotItem(EQ::invslot::slotShoulders)) <= 0) dmg = DMG_INVULNERABLE; reuse = (BashReuseTime * 1000); - DoSpecialAttackDamage(target, EQEmu::skills::SkillBash, dmg, 0, -1, reuse); + DoSpecialAttackDamage(target, EQ::skills::SkillBash, dmg, 0, -1, reuse); did_attack = true; } } - if (skill_to_use == EQEmu::skills::SkillFrenzy) { + if (skill_to_use == EQ::skills::SkillFrenzy) { int AtkRounds = 3; DoAnim(anim2HSlashing); @@ -6618,30 +6618,30 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) { did_attack = true; while(AtkRounds > 0) { if (GetTarget() && (AtkRounds == 1 || zone->random.Int(0, 100) < 75)) { - DoSpecialAttackDamage(GetTarget(), EQEmu::skills::SkillFrenzy, dmg, 0, dmg, reuse, true); + DoSpecialAttackDamage(GetTarget(), EQ::skills::SkillFrenzy, dmg, 0, dmg, reuse, true); } AtkRounds--; } } - if (skill_to_use == EQEmu::skills::SkillKick) { + if (skill_to_use == EQ::skills::SkillKick) { if(target != this) { DoAnim(animKick); - if (GetWeaponDamage(target, GetBotItem(EQEmu::invslot::slotFeet)) <= 0) + if (GetWeaponDamage(target, GetBotItem(EQ::invslot::slotFeet)) <= 0) dmg = DMG_INVULNERABLE; reuse = (KickReuseTime * 1000); - DoSpecialAttackDamage(target, EQEmu::skills::SkillKick, dmg, 0, -1, reuse); + DoSpecialAttackDamage(target, EQ::skills::SkillKick, dmg, 0, -1, reuse); did_attack = true; } } if ( - skill_to_use == EQEmu::skills::SkillFlyingKick || - skill_to_use == EQEmu::skills::SkillDragonPunch || - skill_to_use == EQEmu::skills::SkillEagleStrike || - skill_to_use == EQEmu::skills::SkillRoundKick + skill_to_use == EQ::skills::SkillFlyingKick || + skill_to_use == EQ::skills::SkillDragonPunch || + skill_to_use == EQ::skills::SkillEagleStrike || + skill_to_use == EQ::skills::SkillRoundKick ) { reuse = (MonkSpecialAttack(target, skill_to_use) - 1); @@ -6650,11 +6650,11 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) { if (wuchance) { const int MonkSPA[5] = { - EQEmu::skills::SkillFlyingKick, - EQEmu::skills::SkillDragonPunch, - EQEmu::skills::SkillEagleStrike, - EQEmu::skills::SkillTigerClaw, - EQEmu::skills::SkillRoundKick + EQ::skills::SkillFlyingKick, + EQ::skills::SkillDragonPunch, + EQ::skills::SkillEagleStrike, + EQ::skills::SkillTigerClaw, + EQ::skills::SkillRoundKick }; int extra = 0; // always 1/4 of the double attack chance, 25% at rank 5 (100/4) @@ -6691,7 +6691,7 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) { did_attack = true; } - if (skill_to_use == EQEmu::skills::SkillBackstab) { + if (skill_to_use == EQ::skills::SkillBackstab) { reuse = (BackstabReuseTime * 1000); did_attack = true; if (IsRiposte) @@ -6799,9 +6799,9 @@ bool Bot::IsBotAttackAllowed(Mob* attacker, Mob* target, bool& hasRuleDefined) { void Bot::EquipBot(std::string* errorMessage) { GetBotItems(m_inv, errorMessage); - const EQEmu::ItemInstance* inst = nullptr; - const EQEmu::ItemData* item = nullptr; - for (int i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; ++i) { + const EQ::ItemInstance* inst = nullptr; + const EQ::ItemData* item = nullptr; + for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; ++i) { inst = GetBotItem(i); if(inst) { item = inst->GetItem(); @@ -6927,23 +6927,23 @@ void Bot::SetAttackTimer() { float haste_mod = (GetHaste() * 0.01f); attack_timer.SetAtTrigger(4000, true); Timer* TimerToUse = nullptr; - const EQEmu::ItemData* PrimaryWeapon = nullptr; - for (int i = EQEmu::invslot::slotRange; i <= EQEmu::invslot::slotSecondary; i++) { - if (i == EQEmu::invslot::slotPrimary) + const EQ::ItemData* PrimaryWeapon = nullptr; + for (int i = EQ::invslot::slotRange; i <= EQ::invslot::slotSecondary; i++) { + if (i == EQ::invslot::slotPrimary) TimerToUse = &attack_timer; - else if (i == EQEmu::invslot::slotRange) + else if (i == EQ::invslot::slotRange) TimerToUse = &ranged_timer; - else if (i == EQEmu::invslot::slotSecondary) + else if (i == EQ::invslot::slotSecondary) TimerToUse = &attack_dw_timer; else continue; - const EQEmu::ItemData* ItemToUse = nullptr; - EQEmu::ItemInstance* ci = GetBotItem(i); + const EQ::ItemData* ItemToUse = nullptr; + EQ::ItemInstance* ci = GetBotItem(i); if (ci) ItemToUse = ci->GetItem(); - if (i == EQEmu::invslot::slotSecondary) { + if (i == EQ::invslot::slotSecondary) { if (PrimaryWeapon != nullptr) { if (PrimaryWeapon->IsClassCommon() && PrimaryWeapon->IsType2HWeapon()) { attack_dw_timer.Disable(); @@ -6951,14 +6951,14 @@ void Bot::SetAttackTimer() { } } - if (!GetSkill(EQEmu::skills::SkillDualWield)) { + if (!GetSkill(EQ::skills::SkillDualWield)) { attack_dw_timer.Disable(); continue; } } if (ItemToUse != nullptr) { - if (!ItemToUse->IsClassCommon() || ItemToUse->Damage == 0 || ItemToUse->Delay == 0 || ((ItemToUse->ItemType > EQEmu::item::ItemTypeLargeThrowing) && (ItemToUse->ItemType != EQEmu::item::ItemTypeMartial) && (ItemToUse->ItemType != EQEmu::item::ItemType2HPiercing))) + if (!ItemToUse->IsClassCommon() || ItemToUse->Damage == 0 || ItemToUse->Delay == 0 || ((ItemToUse->ItemType > EQ::item::ItemTypeLargeThrowing) && (ItemToUse->ItemType != EQ::item::ItemTypeMartial) && (ItemToUse->ItemType != EQ::item::ItemType2HPiercing))) ItemToUse = nullptr; } @@ -6974,7 +6974,7 @@ void Bot::SetAttackTimer() { speed = (RuleB(Spells, Jun182014HundredHandsRevamp) ? static_cast(((delay / haste_mod) + ((hhe / 1000.0f) * (delay / haste_mod))) * 100) : static_cast(((delay / haste_mod) + ((hhe / 100.0f) * delay)) * 100)); TimerToUse->SetAtTrigger(std::max(RuleI(Combat, MinHastedDelay), speed), true, true); - if (i == EQEmu::invslot::slotPrimary) + if (i == EQ::invslot::slotPrimary) PrimaryWeapon = ItemToUse; } } @@ -7337,7 +7337,7 @@ void Bot::DoBuffTic(const Buffs_Struct &buff, int slot, Mob* caster) { Mob::DoBuffTic(buff, slot, caster); } -bool Bot::CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlot slot, int32 cast_time, int32 mana_cost, +bool Bot::CastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot, int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, int16 *resist_adjust, uint32 aa_id) { bool Result = false; if(zone && !zone->IsSpellBlocked(spell_id, glm::vec3(GetPosition()))) { @@ -7377,7 +7377,7 @@ bool Bot::CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlo return false; } - if(slot < EQEmu::spells::CastingSlot::MaxGems && !CheckFizzle(spell_id)) { + if(slot < EQ::spells::CastingSlot::MaxGems && !CheckFizzle(spell_id)) { int fizzle_msg = IsBardSong(spell_id) ? MISS_NOTE : SPELL_FIZZLE; InterruptSpell(fizzle_msg, 0x121, spell_id); @@ -7391,7 +7391,7 @@ bool Bot::CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlo LogSpells("Casting a new spell/song while singing a song. Killing old song [{}]", bardsong); bardsong = 0; bardsong_target_id = 0; - bardsong_slot = EQEmu::spells::CastingSlot::Gem1; + bardsong_slot = EQ::spells::CastingSlot::Gem1; bardsong_timer.Disable(); } @@ -7521,7 +7521,7 @@ bool Bot::IsImmuneToSpell(uint16 spell_id, Mob *caster) { return Result; } -bool Bot::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQEmu::spells::CastingSlot slot) { +bool Bot::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQ::spells::CastingSlot slot) { bool Result = false; SpellTargetType targetType = spells[spell_id].targettype; if(targetType == ST_GroupClientAndPet) { @@ -7534,7 +7534,7 @@ bool Bot::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce return Result; } -bool Bot::DoCastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlot slot, int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, uint32 aa_id) { +bool Bot::DoCastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot, int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, uint32 aa_id) { bool Result = false; if(GetClass() == BARD) cast_time = 0; @@ -7558,7 +7558,7 @@ int32 Bot::GenerateBaseManaPoints() { switch(GetCasterClass()) { case 'I': WisInt = INT; - if (GetOwner() && GetOwner()->CastToClient() && GetOwner()->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoD && RuleB(Character, SoDClientUseSoDHPManaEnd)) { + if (GetOwner() && GetOwner()->CastToClient() && GetOwner()->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoD && RuleB(Character, SoDClientUseSoDHPManaEnd)) { if(WisInt > 100) { ConvertedWisInt = (((WisInt - 100) * 5 / 2) + 100); if(WisInt > 201) @@ -7593,7 +7593,7 @@ int32 Bot::GenerateBaseManaPoints() { break; case 'W': WisInt = WIS; - if (GetOwner() && GetOwner()->CastToClient() && GetOwner()->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoD && RuleB(Character, SoDClientUseSoDHPManaEnd)) { + if (GetOwner() && GetOwner()->CastToClient() && GetOwner()->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoD && RuleB(Character, SoDClientUseSoDHPManaEnd)) { if(WisInt > 100) { ConvertedWisInt = (((WisInt - 100) * 5 / 2) + 100); if(WisInt > 201) @@ -7638,7 +7638,7 @@ void Bot::GenerateSpecialAttacks() { SetSpecialAbility(SPECATK_TRIPLE, 1); } -bool Bot::DoFinishedSpellAETarget(uint16 spell_id, Mob* spellTarget, EQEmu::spells::CastingSlot slot, bool& stopLogic) { +bool Bot::DoFinishedSpellAETarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) { if(GetClass() == BARD) { if(!ApplyNextBardPulse(bardsong, this, bardsong_slot)) InterruptSpell(SONG_ENDS_ABRUPTLY, 0x121, bardsong); @@ -7648,7 +7648,7 @@ bool Bot::DoFinishedSpellAETarget(uint16 spell_id, Mob* spellTarget, EQEmu::spel return true; } -bool Bot::DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQEmu::spells::CastingSlot slot, bool& stopLogic) { +bool Bot::DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) { if(spellTarget) { if(IsGrouped() && (spellTarget->IsBot() || spellTarget->IsClient()) && RuleB(Bots, GroupBuffing)) { bool noGroupSpell = false; @@ -7660,7 +7660,7 @@ bool Bot::DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQEmu:: bool spelltypeequal = ((spelltype == 2) || (spelltype == 16) || (spelltype == 32)); bool spelltypetargetequal = ((spelltype == 8) && (spells[thespell].targettype == ST_Self)); bool spelltypeclassequal = ((spelltype == 1024) && (GetClass() == SHAMAN)); - bool slotequal = (slot == EQEmu::spells::CastingSlot::Item); + bool slotequal = (slot == EQ::spells::CastingSlot::Item); if(spellequal || slotequal) { if((spelltypeequal || spelltypetargetequal) || spelltypeclassequal || slotequal) { if(((spells[thespell].effectid[0] == 0) && (spells[thespell].base[0] < 0)) && @@ -7699,7 +7699,7 @@ bool Bot::DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQEmu:: return true; } -bool Bot::DoFinishedSpellGroupTarget(uint16 spell_id, Mob* spellTarget, EQEmu::spells::CastingSlot slot, bool& stopLogic) { +bool Bot::DoFinishedSpellGroupTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) { bool isMainGroupMGB = false; if(isMainGroupMGB && (GetClass() != BARD)) { BotGroupSay(this, "MGB %s", spells[spell_id].name); @@ -7777,7 +7777,7 @@ int32 Bot::GetMaxStat() { int32 base = 0; if (level < 61) base = 255; - else if (GetOwner() && GetOwner()->CastToClient() && GetOwner()->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoF) + else if (GetOwner() && GetOwner()->CastToClient() && GetOwner()->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoF) base = (255 + 5 * (level - 60)); else if (level < 71) base = (255 + 5 * (level - 60)); @@ -8170,7 +8170,7 @@ int32 Bot::CalcManaRegen() { if (IsSitting()) { BuffFadeBySitModifier(); if(botclass != WARRIOR && botclass != MONK && botclass != ROGUE && botclass != BERSERKER) { - regen = ((((GetSkill(EQEmu::skills::SkillMeditate) / 10) + (level - (level / 4))) / 4) + 4); + regen = ((((GetSkill(EQ::skills::SkillMeditate) / 10) + (level - (level / 4))) / 4) + 4); regen += (spellbonuses.ManaRegen + itembonuses.ManaRegen); } else regen = (2 + spellbonuses.ManaRegen + itembonuses.ManaRegen); @@ -8271,7 +8271,7 @@ int32 Bot::CalcBaseEndurance() { int32 ConvertedStats = 0; int32 sta_end = 0; int Stats = 0; - if (GetOwner() && GetOwner()->CastToClient() && GetOwner()->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoD && RuleB(Character, SoDClientUseSoDHPManaEnd)) { + if (GetOwner() && GetOwner()->CastToClient() && GetOwner()->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoD && RuleB(Character, SoDClientUseSoDHPManaEnd)) { int HeroicStats = 0; Stats = ((GetSTR() + GetSTA() + GetDEX() + GetAGI()) / 4); HeroicStats = ((GetHeroicSTR() + GetHeroicSTA() + GetHeroicDEX() + GetHeroicAGI()) / 4); @@ -8687,10 +8687,10 @@ void Bot::ProcessBotInspectionRequest(Bot* inspectedBot, Client* client) { insr->TargetID = inspectedBot->GetNPCTypeID(); insr->playerid = inspectedBot->GetID(); - const EQEmu::ItemData* item = nullptr; - const EQEmu::ItemInstance* inst = nullptr; + const EQ::ItemData* item = nullptr; + const EQ::ItemInstance* inst = nullptr; - for (int16 L = EQEmu::invslot::EQUIPMENT_BEGIN; L <= EQEmu::invslot::EQUIPMENT_END; L++) { + for (int16 L = EQ::invslot::EQUIPMENT_BEGIN; L <= EQ::invslot::EQUIPMENT_END; L++) { inst = inspectedBot->GetBotItem(L); if(inst) { @@ -8718,10 +8718,10 @@ void Bot::ProcessBotInspectionRequest(Bot* inspectedBot, Client* client) { void Bot::CalcItemBonuses(StatBonuses* newbon) { - const EQEmu::ItemData* itemtmp = nullptr; + const EQ::ItemData* itemtmp = nullptr; - for (int i = EQEmu::invslot::BONUS_BEGIN; i <= EQEmu::invslot::BONUS_STAT_END; ++i) { - const EQEmu::ItemInstance* item = GetBotItem(i); + for (int i = EQ::invslot::BONUS_BEGIN; i <= EQ::invslot::BONUS_STAT_END; ++i) { + const EQ::ItemInstance* item = GetBotItem(i); if(item) { AddItemBonuses(item, newbon); } @@ -8738,7 +8738,7 @@ void Bot::CalcItemBonuses(StatBonuses* newbon) newbon->EnduranceRegen = CalcEnduranceRegenCap(); } -void Bot::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, bool isAug, bool isTribute, int rec_override) { +void Bot::AddItemBonuses(const EQ::ItemInstance *inst, StatBonuses* newbon, bool isAug, bool isTribute, int rec_override) { if (!inst || !inst->IsClassCommon()) { return; @@ -8749,11 +8749,11 @@ void Bot::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, b return; } - const EQEmu::ItemData *item = inst->GetItem(); + const EQ::ItemData *item = inst->GetItem(); if(!isTribute && !inst->IsEquipable(GetBaseRace(),GetClass())) { - if (item->ItemType != EQEmu::item::ItemTypeFood && item->ItemType != EQEmu::item::ItemTypeDrink) + if (item->ItemType != EQ::item::ItemTypeFood && item->ItemType != EQ::item::ItemTypeDrink) return; } @@ -8960,17 +8960,17 @@ void Bot::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, b else newbon->DSMitigation += item->DSMitigation; } - if (item->Worn.Effect > 0 && item->Worn.Type == EQEmu::item::ItemEffectWorn) {// latent effects + if (item->Worn.Effect > 0 && item->Worn.Type == EQ::item::ItemEffectWorn) {// latent effects ApplySpellsBonuses(item->Worn.Effect, item->Worn.Level, newbon, 0, item->Worn.Type); } - if (item->Focus.Effect>0 && (item->Focus.Type == EQEmu::item::ItemEffectFocus)) { // focus effects + if (item->Focus.Effect>0 && (item->Focus.Type == EQ::item::ItemEffectFocus)) { // focus effects ApplySpellsBonuses(item->Focus.Effect, item->Focus.Level, newbon, 0); } switch(item->BardType) { - case EQEmu::item::ItemTypeAllInstrumentTypes: // (e.g. Singing Short Sword) + case EQ::item::ItemTypeAllInstrumentTypes: // (e.g. Singing Short Sword) { if(item->BardValue > newbon->singingMod) newbon->singingMod = item->BardValue; @@ -8984,31 +8984,31 @@ void Bot::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, b newbon->windMod = item->BardValue; break; } - case EQEmu::item::ItemTypeSinging: + case EQ::item::ItemTypeSinging: { if(item->BardValue > newbon->singingMod) newbon->singingMod = item->BardValue; break; } - case EQEmu::item::ItemTypeWindInstrument: + case EQ::item::ItemTypeWindInstrument: { if(item->BardValue > newbon->windMod) newbon->windMod = item->BardValue; break; } - case EQEmu::item::ItemTypeStringedInstrument: + case EQ::item::ItemTypeStringedInstrument: { if(item->BardValue > newbon->stringedMod) newbon->stringedMod = item->BardValue; break; } - case EQEmu::item::ItemTypeBrassInstrument: + case EQ::item::ItemTypeBrassInstrument: { if(item->BardValue > newbon->brassMod) newbon->brassMod = item->BardValue; break; } - case EQEmu::item::ItemTypePercussionInstrument: + case EQ::item::ItemTypePercussionInstrument: { if(item->BardValue > newbon->percussionMod) newbon->percussionMod = item->BardValue; @@ -9016,7 +9016,7 @@ void Bot::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, b } } - if (item->SkillModValue != 0 && item->SkillModType <= EQEmu::skills::HIGHEST_SKILL){ + if (item->SkillModValue != 0 && item->SkillModType <= EQ::skills::HIGHEST_SKILL){ if ((item->SkillModValue > 0 && newbon->skillmod[item->SkillModType] < item->SkillModValue) || (item->SkillModValue < 0 && newbon->skillmod[item->SkillModType] > item->SkillModValue)) { @@ -9024,7 +9024,7 @@ void Bot::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, b } } - if (item->ExtraDmgSkill != 0 && item->ExtraDmgSkill <= EQEmu::skills::HIGHEST_SKILL) { + if (item->ExtraDmgSkill != 0 && item->ExtraDmgSkill <= EQ::skills::HIGHEST_SKILL) { if((newbon->SkillDamageAmount[item->ExtraDmgSkill] + item->ExtraDmgAmt) > RuleI(Character, ItemExtraDmgCap)) newbon->SkillDamageAmount[item->ExtraDmgSkill] = RuleI(Character, ItemExtraDmgCap); else @@ -9033,7 +9033,7 @@ void Bot::AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, b if (!isAug) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) AddItemBonuses(inst->GetAugment(i),newbon,true, false, rec_level); } @@ -9079,8 +9079,8 @@ void Bot::CalcBotStats(bool showtext) { if(GetBotOwner()->GetLevel() != GetLevel()) SetLevel(GetBotOwner()->GetLevel()); - for (int sindex = 0; sindex <= EQEmu::skills::HIGHEST_SKILL; ++sindex) { - skills[sindex] = database.GetSkillCap(GetClass(), (EQEmu::skills::SkillType)sindex, GetLevel()); + for (int sindex = 0; sindex <= EQ::skills::HIGHEST_SKILL; ++sindex) { + skills[sindex] = database.GetSkillCap(GetClass(), (EQ::skills::SkillType)sindex, GetLevel()); } taunt_timer.Start(1000); @@ -9099,7 +9099,7 @@ void Bot::CalcBotStats(bool showtext) { // Test Code if(GetClass() == BARD) GetBotOwner()->Message(Chat::Yellow, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i", - GetSkill(EQEmu::skills::SkillBrassInstruments), GetSkill(EQEmu::skills::SkillPercussionInstruments), GetSkill(EQEmu::skills::SkillSinging), GetSkill(EQEmu::skills::SkillStringedInstruments), GetSkill(EQEmu::skills::SkillWindInstruments)); + GetSkill(EQ::skills::SkillBrassInstruments), GetSkill(EQ::skills::SkillPercussionInstruments), GetSkill(EQ::skills::SkillSinging), GetSkill(EQ::skills::SkillStringedInstruments), GetSkill(EQ::skills::SkillWindInstruments)); } //if(this->Save()) @@ -9118,17 +9118,17 @@ void Bot::CalcBotStats(bool showtext) { // Test Code if(GetClass() == BARD) { GetBotOwner()->Message(Chat::Yellow, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i", - GetSkill(EQEmu::skills::SkillBrassInstruments) + GetBrassMod(), - GetSkill(EQEmu::skills::SkillPercussionInstruments) + GetPercMod(), - GetSkill(EQEmu::skills::SkillSinging) + GetSingMod(), - GetSkill(EQEmu::skills::SkillStringedInstruments) + GetStringMod(), - GetSkill(EQEmu::skills::SkillWindInstruments) + GetWindMod()); + GetSkill(EQ::skills::SkillBrassInstruments) + GetBrassMod(), + GetSkill(EQ::skills::SkillPercussionInstruments) + GetPercMod(), + GetSkill(EQ::skills::SkillSinging) + GetSingMod(), + GetSkill(EQ::skills::SkillStringedInstruments) + GetStringMod(), + GetSkill(EQ::skills::SkillWindInstruments) + GetWindMod()); GetBotOwner()->Message(Chat::Yellow, "Bard Skill Mods-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i", GetBrassMod(), GetPercMod(), GetSingMod(), GetStringMod(), GetWindMod()); } } } -bool Bot::CheckLoreConflict(const EQEmu::ItemData* item) { +bool Bot::CheckLoreConflict(const EQ::ItemData* item) { if (!item || !(item->LoreFlag)) return false; @@ -9195,16 +9195,16 @@ bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, fl Group *g = caster->GetGroup(); float hpRatioToHeal = 25.0f; switch(caster->GetBotStance()) { - case EQEmu::constants::stanceReactive: - case EQEmu::constants::stanceBalanced: + case EQ::constants::stanceReactive: + case EQ::constants::stanceBalanced: hpRatioToHeal = 50.0f; break; - case EQEmu::constants::stanceBurn: - case EQEmu::constants::stanceBurnAE: + case EQ::constants::stanceBurn: + case EQ::constants::stanceBurnAE: hpRatioToHeal = 20.0f; break; - case EQEmu::constants::stanceAggressive: - case EQEmu::constants::stanceEfficient: + case EQ::constants::stanceAggressive: + case EQ::constants::stanceEfficient: default: hpRatioToHeal = 25.0f; break; @@ -9601,12 +9601,12 @@ uint8 Bot::GetNumberNeedingHealedInGroup(uint8 hpr, bool includePets) { int Bot::GetRawACNoShield(int &shield_ac) { int ac = itembonuses.AC + spellbonuses.AC; shield_ac = 0; - EQEmu::ItemInstance* inst = GetBotItem(EQEmu::invslot::slotSecondary); + EQ::ItemInstance* inst = GetBotItem(EQ::invslot::slotSecondary); if(inst) { - if (inst->GetItem()->ItemType == EQEmu::item::ItemTypeShield) { + if (inst->GetItem()->ItemType == EQ::item::ItemTypeShield) { ac -= inst->GetItem()->AC; shield_ac = inst->GetItem()->AC; - for (uint8 i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { + for (uint8 i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { if(inst->GetAugment(i)) { ac -= inst->GetAugment(i)->GetItem()->AC; shield_ac += inst->GetAugment(i)->GetItem()->AC; @@ -9618,10 +9618,10 @@ int Bot::GetRawACNoShield(int &shield_ac) { } uint32 Bot::CalcCurrentWeight() { - const EQEmu::ItemData* TempItem = nullptr; - EQEmu::ItemInstance* inst = nullptr; + const EQ::ItemData* TempItem = nullptr; + EQ::ItemInstance* inst = nullptr; uint32 Total = 0; - for (int i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; ++i) { + for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; ++i) { inst = GetBotItem(i); if(inst) { TempItem = inst->GetItem(); @@ -9794,11 +9794,11 @@ bool Bot::HasOrMayGetAggro() { } void Bot::SetDefaultBotStance() { - EQEmu::constants::StanceType defaultStance = EQEmu::constants::stanceBalanced; + EQ::constants::StanceType defaultStance = EQ::constants::stanceBalanced; if (GetClass() == WARRIOR) - defaultStance = EQEmu::constants::stanceAggressive; + defaultStance = EQ::constants::stanceAggressive; - _baseBotStance = EQEmu::constants::stancePassive; + _baseBotStance = EQ::constants::stancePassive; _botStance = defaultStance; } @@ -9847,7 +9847,7 @@ bool Bot::UseDiscipline(uint32 spell_id, uint32 target) { if(IsCasting()) InterruptSpell(); - CastSpell(spell_id, target, EQEmu::spells::CastingSlot::Discipline); + CastSpell(spell_id, target, EQ::spells::CastingSlot::Discipline); return true; } @@ -10011,9 +10011,9 @@ bool Bot::DyeArmor(int16 slot_id, uint32 rgb, bool all_flag, bool save_flag) if (slot_id != INVALID_INDEX) return false; - for (uint8 i = EQEmu::textures::textureBegin; i < EQEmu::textures::weaponPrimary; ++i) { - uint8 inv_slot = EQEmu::InventoryProfile::CalcSlotFromMaterial(i); - EQEmu::ItemInstance* inst = m_inv.GetItem(inv_slot); + for (uint8 i = EQ::textures::textureBegin; i < EQ::textures::weaponPrimary; ++i) { + uint8 inv_slot = EQ::InventoryProfile::CalcSlotFromMaterial(i); + EQ::ItemInstance* inst = m_inv.GetItem(inv_slot); if (!inst) continue; @@ -10022,11 +10022,11 @@ bool Bot::DyeArmor(int16 slot_id, uint32 rgb, bool all_flag, bool save_flag) } } else { - uint8 mat_slot = EQEmu::InventoryProfile::CalcMaterialFromSlot(slot_id); - if (mat_slot == EQEmu::textures::materialInvalid || mat_slot >= EQEmu::textures::weaponPrimary) + uint8 mat_slot = EQ::InventoryProfile::CalcMaterialFromSlot(slot_id); + if (mat_slot == EQ::textures::materialInvalid || mat_slot >= EQ::textures::weaponPrimary) return false; - EQEmu::ItemInstance* inst = m_inv.GetItem(slot_id); + EQ::ItemInstance* inst = m_inv.GetItem(slot_id); if (!inst) return false; @@ -10061,8 +10061,8 @@ std::string Bot::CreateSayLink(Client* c, const char* message, const char* name) uint32 saylink_id = database.LoadSaylinkID(escaped_string); safe_delete_array(escaped_string); - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkItemData); + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkItemData); linker.SetProxyItemID(SAYLINK_ITEM_ID); linker.SetProxyAugment1ID(saylink_id); linker.SetProxyText(name); @@ -10087,6 +10087,6 @@ void Bot::StopMoving(float new_heading) Mob::StopMoving(new_heading); } -uint8 Bot::spell_casting_chances[SPELL_TYPE_COUNT][PLAYER_CLASS_COUNT][EQEmu::constants::STANCE_TYPE_COUNT][cntHSND] = { 0 }; +uint8 Bot::spell_casting_chances[SPELL_TYPE_COUNT][PLAYER_CLASS_COUNT][EQ::constants::STANCE_TYPE_COUNT][cntHSND] = { 0 }; #endif diff --git a/zone/bot.h b/zone/bot.h index b456fd77f..f81a3abdf 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -144,9 +144,9 @@ public: Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double totalPlayTime, uint32 lastZoneId, NPCType *npcTypeData); //abstract virtual function implementations requird by base abstract class - virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill); - virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None); - virtual bool Attack(Mob* other, int Hand = EQEmu::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, + virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill); + virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None); + virtual bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr); virtual bool HasRaid() { return (GetRaid() ? true : false); } virtual bool HasGroup() { return (GetGroup() ? true : false); } @@ -180,25 +180,25 @@ public: virtual int GetHandToHandDamage(void); virtual bool TryFinishingBlow(Mob *defender, int &damage); virtual void DoRiposte(Mob* defender); - inline virtual int32 GetATK() const { return ATK + itembonuses.ATK + spellbonuses.ATK + ((GetSTR() + GetSkill(EQEmu::skills::SkillOffense)) * 9 / 10); } + inline virtual int32 GetATK() const { return ATK + itembonuses.ATK + spellbonuses.ATK + ((GetSTR() + GetSkill(EQ::skills::SkillOffense)) * 9 / 10); } inline virtual int32 GetATKBonus() const { return itembonuses.ATK + spellbonuses.ATK; } uint32 GetTotalATK(); uint32 GetATKRating(); uint16 GetPrimarySkillValue(); - uint16 MaxSkill(EQEmu::skills::SkillType skillid, uint16 class_, uint16 level) const; - inline uint16 MaxSkill(EQEmu::skills::SkillType skillid) const { return MaxSkill(skillid, GetClass(), GetLevel()); } - virtual int GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target = nullptr); - virtual void DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32 max_damage, int32 min_damage = 1, int32 hate_override = -1, int ReuseTime = 10, bool HitChance = false); + uint16 MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const; + inline uint16 MaxSkill(EQ::skills::SkillType skillid) const { return MaxSkill(skillid, GetClass(), GetLevel()); } + virtual int GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target = nullptr); + virtual void DoSpecialAttackDamage(Mob *who, EQ::skills::SkillType skill, int32 max_damage, int32 min_damage = 1, int32 hate_override = -1, int ReuseTime = 10, bool HitChance = false); virtual void TryBackstab(Mob *other,int ReuseTime = 10); virtual void RogueBackstab(Mob* other, bool min_damage = false, int ReuseTime = 10); virtual void RogueAssassinate(Mob* other); virtual void DoClassAttacks(Mob *target, bool IsRiposte=false); - virtual void ApplySpecialAttackMod(EQEmu::skills::SkillType skill, int32 &dmg, int32 &mindmg); + virtual void ApplySpecialAttackMod(EQ::skills::SkillType skill, int32 &dmg, int32 &mindmg); bool CanDoSpecialAttack(Mob *other); virtual int32 CheckAggroAmount(uint16 spellid); virtual void CalcBonuses(); void CalcItemBonuses(StatBonuses* newbon); - void AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, bool isAug = false, bool isTribute = false, int rec_override = 0); + void AddItemBonuses(const EQ::ItemInstance *inst, StatBonuses* newbon, bool isAug = false, bool isTribute = false, int rec_override = 0); int CalcRecommendedLevelBonus(uint8 level, uint8 reclevel, int basestat); virtual void MakePet(uint16 spell_id, const char* pettype, const char *petname = nullptr); virtual FACTION_VALUE GetReverseFactionCon(Mob* iOther); @@ -212,9 +212,9 @@ public: virtual void SetAttackTimer(); uint32 GetClassHPFactor(); virtual int32 CalcMaxHP(); - bool DoFinishedSpellAETarget(uint16 spell_id, Mob* spellTarget, EQEmu::spells::CastingSlot slot, bool &stopLogic); - bool DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQEmu::spells::CastingSlot slot, bool &stopLogic); - bool DoFinishedSpellGroupTarget(uint16 spell_id, Mob* spellTarget, EQEmu::spells::CastingSlot slot, bool &stopLogic); + bool DoFinishedSpellAETarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic); + bool DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic); + bool DoFinishedSpellGroupTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic); void SendBotArcheryWearChange(uint8 material_slot, uint32 material, uint32 color); void Camp(bool databaseSave = true); virtual void AddToHateList(Mob* other, uint32 hate = 0, int32 damage = 0, bool iYellForHelp = true, bool bFrenzy = false, bool iBuffTic = false, bool pet_command = false); @@ -336,20 +336,20 @@ public: virtual float GetAOERange(uint16 spell_id); virtual bool SpellEffect(Mob* caster, uint16 spell_id, float partial = 100); virtual void DoBuffTic(const Buffs_Struct &buff, int slot, Mob* caster = nullptr); - virtual bool CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlot slot = EQEmu::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1, uint32* oSpellWillFinish = 0, + virtual bool CastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, int16 *resist_adjust = nullptr, uint32 aa_id = 0); virtual bool SpellOnTarget(uint16 spell_id, Mob* spelltar); virtual bool IsImmuneToSpell(uint16 spell_id, Mob *caster); - virtual bool DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQEmu::spells::CastingSlot slot); - virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlot slot = EQEmu::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, uint32 aa_id = 0); + virtual bool DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQ::spells::CastingSlot slot); + virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, uint32 aa_id = 0); // Bot Equipment & Inventory Class Methods - void BotTradeSwapItem(Client* client, int16 lootSlot, const EQEmu::ItemInstance* inst, const EQEmu::ItemInstance* inst_swap, uint32 equipableSlots, std::string* errorMessage, bool swap = true); - void BotTradeAddItem(uint32 id, const EQEmu::ItemInstance* inst, int16 charges, uint32 equipableSlots, uint16 lootSlot, std::string* errorMessage, bool addToDb = true); + void BotTradeSwapItem(Client* client, int16 lootSlot, const EQ::ItemInstance* inst, const EQ::ItemInstance* inst_swap, uint32 equipableSlots, std::string* errorMessage, bool swap = true); + void BotTradeAddItem(uint32 id, const EQ::ItemInstance* inst, int16 charges, uint32 equipableSlots, uint16 lootSlot, std::string* errorMessage, bool addToDb = true); void EquipBot(std::string* errorMessage); - bool CheckLoreConflict(const EQEmu::ItemData* item); - virtual void UpdateEquipmentLight() { m_Light.Type[EQEmu::lightsource::LightEquipment] = m_inv.FindBrightestLightType(); m_Light.Level[EQEmu::lightsource::LightEquipment] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightEquipment]); } - const EQEmu::InventoryProfile& GetBotInv() const { return m_inv; } + bool CheckLoreConflict(const EQ::ItemData* item); + virtual void UpdateEquipmentLight() { m_Light.Type[EQ::lightsource::LightEquipment] = m_inv.FindBrightestLightType(); m_Light.Level[EQ::lightsource::LightEquipment] = EQ::lightsource::TypeToLevel(m_Light.Type[EQ::lightsource::LightEquipment]); } + const EQ::InventoryProfile& GetBotInv() const { return m_inv; } // Static Class Methods //static void DestroyBotRaidObjects(Client* client); // Can be removed after bot raids are dumped @@ -419,7 +419,7 @@ public: uint32 GetBotSpellID() { return npc_spells_id; } Mob* GetBotOwner() { return this->_botOwner; } uint32 GetBotArcheryRange(); - EQEmu::ItemInstance* GetBotItem(uint32 slotID); + EQ::ItemInstance* GetBotItem(uint32 slotID); virtual bool GetSpawnStatus() { return _spawnStatus; } uint8 GetPetChooserID() { return _petChooserID; } bool IsPetChooser() { return _petChooser; } @@ -428,7 +428,7 @@ public: virtual bool IsBot() const { return true; } bool GetRangerAutoWeaponSelect() { return _rangerAutoWeaponSelect; } BotRoleType GetBotRole() { return _botRole; } - EQEmu::constants::StanceType GetBotStance() { return _botStance; } + EQ::constants::StanceType GetBotStance() { return _botStance; } uint8 GetChanceToCastBySpellType(uint32 spellType); bool IsGroupHealer() { return m_CastingRoles.GroupHealer; } @@ -542,11 +542,11 @@ public: // void SetBotOwnerCharacterID(uint32 botOwnerCharacterID) { _botOwnerCharacterID = botOwnerCharacterID; } void SetRangerAutoWeaponSelect(bool enable) { GetClass() == RANGER ? _rangerAutoWeaponSelect = enable : _rangerAutoWeaponSelect = false; } void SetBotRole(BotRoleType botRole) { _botRole = botRole; } - void SetBotStance(EQEmu::constants::StanceType botStance) { - if (botStance >= EQEmu::constants::stancePassive && botStance <= EQEmu::constants::stanceBurnAE) + void SetBotStance(EQ::constants::StanceType botStance) { + if (botStance >= EQ::constants::stancePassive && botStance <= EQ::constants::stanceBurnAE) _botStance = botStance; else - _botStance = EQEmu::constants::stancePassive; + _botStance = EQ::constants::stancePassive; } void SetSpellRecastTimer(int timer_index, int32 recast_delay); void SetDisciplineRecastTimer(int timer_index, int32 recast_delay); @@ -631,7 +631,7 @@ private: bool _petChooser; uint8 _petChooserID; bool berserk; - EQEmu::InventoryProfile m_inv; + EQ::InventoryProfile m_inv; double _lastTotalPlayTime; time_t _startTotalPlayTime; Mob* _previousTarget; @@ -644,8 +644,8 @@ private: uint32 _lastZoneId; bool _rangerAutoWeaponSelect; BotRoleType _botRole; - EQEmu::constants::StanceType _botStance; - EQEmu::constants::StanceType _baseBotStance; + EQ::constants::StanceType _botStance; + EQ::constants::StanceType _baseBotStance; unsigned int RestRegenHP; unsigned int RestRegenMana; unsigned int RestRegenEndurance; @@ -717,7 +717,7 @@ private: void SetReturningFlag(bool flag = true) { m_returning_flag = flag; } // Private "Inventory" Methods - void GetBotItems(EQEmu::InventoryProfile &inv, std::string* errorMessage); + void GetBotItems(EQ::InventoryProfile &inv, std::string* errorMessage); void BotAddEquipItem(int slot, uint32 id); uint32 GetBotItemBySlot(uint32 slotID); @@ -727,7 +727,7 @@ private: bool DeletePet(); public: - static uint8 spell_casting_chances[SPELL_TYPE_COUNT][PLAYER_CLASS_COUNT][EQEmu::constants::STANCE_TYPE_COUNT][cntHSND]; + static uint8 spell_casting_chances[SPELL_TYPE_COUNT][PLAYER_CLASS_COUNT][EQ::constants::STANCE_TYPE_COUNT][cntHSND]; }; #endif // BOTS diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp index 9c202fed8..7d5f918fd 100644 --- a/zone/bot_command.cpp +++ b/zone/bot_command.cpp @@ -338,11 +338,11 @@ public: while (spells[spell_id].typedescnum == 27) { if (!spells[spell_id].goodEffect) break; - if (spells[spell_id].skill != EQEmu::skills::SkillOffense && spells[spell_id].skill != EQEmu::skills::SkillDefense) + if (spells[spell_id].skill != EQ::skills::SkillOffense && spells[spell_id].skill != EQ::skills::SkillDefense) break; entry_prototype = new STStanceEntry(); - if (spells[spell_id].skill == EQEmu::skills::SkillOffense) + if (spells[spell_id].skill == EQ::skills::SkillOffense) entry_prototype->SafeCastToStance()->stance_type = BCEnum::StT_Aggressive; else entry_prototype->SafeCastToStance()->stance_type = BCEnum::StT_Defensive; @@ -2462,7 +2462,7 @@ namespace ActionableBots sbl.remove_if([bot_owner](Bot* l) { return (!l->IsBotArcher()); }); } - static void Filter_ByHighestSkill(Client* bot_owner, std::list& sbl, EQEmu::skills::SkillType skill_type, float& skill_value) { + static void Filter_ByHighestSkill(Client* bot_owner, std::list& sbl, EQ::skills::SkillType skill_type, float& skill_value) { sbl.remove_if([bot_owner](Bot* l) { return (!MyBots::IsMyBot(bot_owner, l)); }); skill_value = 0.0f; @@ -2474,8 +2474,8 @@ namespace ActionableBots continue; mod_skill_value = base_skill_value; - for (int16 index = EQEmu::invslot::EQUIPMENT_BEGIN; index <= EQEmu::invslot::EQUIPMENT_END; ++index) { - const EQEmu::ItemInstance* indexed_item = bot_iter->GetBotItem(index); + for (int16 index = EQ::invslot::EQUIPMENT_BEGIN; index <= EQ::invslot::EQUIPMENT_END; ++index) { + const EQ::ItemInstance* indexed_item = bot_iter->GetBotItem(index); if (indexed_item && indexed_item->GetItem()->SkillModType == skill_type) mod_skill_value += (base_skill_value * (((float)indexed_item->GetItem()->SkillModValue) / 100.0f)); } @@ -2499,7 +2499,7 @@ namespace ActionableBots sbl.remove_if([bot_owner](const Bot* l) { return (l->GetClass() == ROGUE && l->GetLevel() < 5); }); sbl.remove_if([bot_owner](const Bot* l) { return (l->GetClass() == BARD && l->GetLevel() < 40); }); - ActionableBots::Filter_ByHighestSkill(bot_owner, sbl, EQEmu::skills::SkillPickLock, pick_lock_value); + ActionableBots::Filter_ByHighestSkill(bot_owner, sbl, EQ::skills::SkillPickLock, pick_lock_value); } }; @@ -2611,7 +2611,7 @@ void bot_command_apply_poison(Client *c, const Seperator *sep) return; } - const auto poison_instance = c->GetInv().GetItem(EQEmu::invslot::slotCursor); + const auto poison_instance = c->GetInv().GetItem(EQ::invslot::slotCursor); if (!poison_instance) { c->Message(m_fail, "No item found on cursor!"); @@ -2625,7 +2625,7 @@ void bot_command_apply_poison(Client *c, const Seperator *sep) return; } - if (poison_data->ItemType == EQEmu::item::ItemTypePoison) { + if (poison_data->ItemType == EQ::item::ItemTypePoison) { if ((~poison_data->Races) & GetPlayerRaceBit(my_rogue_bot->GetRace())) { @@ -2654,7 +2654,7 @@ void bot_command_apply_poison(Client *c, const Seperator *sep) c->Message(m_fail, "Failed to apply %s to %s's weapon.", poison_data->Name, my_rogue_bot->GetCleanName()); } - c->DeleteItemInInventory(EQEmu::invslot::slotCursor, 1, true); + c->DeleteItemInInventory(EQ::invslot::slotCursor, 1, true); } else { @@ -2687,7 +2687,7 @@ void bot_command_apply_potion(Client* c, const Seperator* sep) return; } - const auto potion_instance = c->GetInv().GetItem(EQEmu::invslot::slotCursor); + const auto potion_instance = c->GetInv().GetItem(EQ::invslot::slotCursor); if (!potion_instance) { c->Message(m_fail, "No item found on cursor!"); @@ -2701,7 +2701,7 @@ void bot_command_apply_potion(Client* c, const Seperator* sep) return; } - if (potion_data->ItemType == EQEmu::item::ItemTypePotion && potion_data->Click.Effect > 0) { + if (potion_data->ItemType == EQ::item::ItemTypePotion && potion_data->Click.Effect > 0) { if (RuleB(Bots, RestrictApplyPotionToRogue) && potion_data->Classes != PLAYER_CLASS_ROGUE_BIT) { @@ -2726,14 +2726,14 @@ void bot_command_apply_potion(Client* c, const Seperator* sep) } // TODO: figure out best way to handle casting time/animation - if (my_bot->SpellFinished(potion_data->Click.Effect, my_bot, EQEmu::spells::CastingSlot::Item, 0)) { + if (my_bot->SpellFinished(potion_data->Click.Effect, my_bot, EQ::spells::CastingSlot::Item, 0)) { c->Message(m_action, "Successfully applied %s to %s's buff effects.", potion_data->Name, my_bot->GetCleanName()); } else { c->Message(m_fail, "Failed to apply %s to %s's buff effects.", potion_data->Name, my_bot->GetCleanName()); } - c->DeleteItemInInventory(EQEmu::invslot::slotCursor, 1, true); + c->DeleteItemInInventory(EQ::invslot::slotCursor, 1, true); } else { @@ -2776,7 +2776,7 @@ void bot_command_attack(Client *c, const Seperator *sep) sbl.remove(nullptr); for (auto bot_iter : sbl) { - if (bot_iter->GetAppearance() != eaDead && bot_iter->GetBotStance() != EQEmu::constants::stancePassive) { + if (bot_iter->GetAppearance() != eaDead && bot_iter->GetBotStance() != EQ::constants::stancePassive) { if (!first_attacker) { first_attacker = bot_iter; @@ -3599,7 +3599,7 @@ void bot_command_item_use(Client* c, const Seperator* sep) empty_only = true; } - const auto item_instance = c->GetInv().GetItem(EQEmu::invslot::slotCursor); + const auto item_instance = c->GetInv().GetItem(EQ::invslot::slotCursor); if (!item_instance) { c->Message(m_fail, "No item found on cursor!"); @@ -3613,14 +3613,14 @@ void bot_command_item_use(Client* c, const Seperator* sep) return; } - if (item_data->ItemClass != EQEmu::item::ItemClassCommon || item_data->Slots == 0) { + if (item_data->ItemClass != EQ::item::ItemClassCommon || item_data->Slots == 0) { c->Message(m_fail, "'%s' is not an equipable item!", item_data->Name); return; } std::list equipable_slot_list; - for (int16 equipable_slot = EQEmu::invslot::EQUIPMENT_BEGIN; equipable_slot <= EQEmu::invslot::EQUIPMENT_END; ++equipable_slot) { + for (int16 equipable_slot = EQ::invslot::EQUIPMENT_BEGIN; equipable_slot <= EQ::invslot::EQUIPMENT_END; ++equipable_slot) { if (item_data->Slots & (1 << equipable_slot)) { equipable_slot_list.push_back(equipable_slot); } @@ -3629,8 +3629,8 @@ void bot_command_item_use(Client* c, const Seperator* sep) std::string msg; std::string text_link; - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkItemInst); + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkItemInst); std::list sbl; MyBots::PopulateSBL_BySpawnedBots(c, sbl); @@ -3651,7 +3651,7 @@ void bot_command_item_use(Client* c, const Seperator* sep) for (auto slot_iter : equipable_slot_list) { // needs more failure criteria - this should cover the bulk for now - if (slot_iter == EQEmu::invslot::slotSecondary && item_data->Damage && !bot_iter->CanThisClassDualWield()) { + if (slot_iter == EQ::invslot::slotSecondary && item_data->Damage && !bot_iter->CanThisClassDualWield()) { continue; } @@ -3665,7 +3665,7 @@ void bot_command_item_use(Client* c, const Seperator* sep) Chat::Say, "[%s] says, 'I can use that for my %s! (replaces: [%s])'", text_link.c_str(), - EQEmu::invslot::GetInvPossessionsSlotName(slot_iter), + EQ::invslot::GetInvPossessionsSlotName(slot_iter), linker.GenerateLink().c_str() ); bot_iter->DoAnim(29); @@ -3676,7 +3676,7 @@ void bot_command_item_use(Client* c, const Seperator* sep) Chat::Say, "[%s] says, 'I can use that for my %s!'", text_link.c_str(), - EQEmu::invslot::GetInvPossessionsSlotName(slot_iter) + EQ::invslot::GetInvPossessionsSlotName(slot_iter) ); bot_iter->DoAnim(29); } @@ -4307,7 +4307,7 @@ void bot_command_pull(Client *c, const Seperator *sep) Bot* bot_puller = nullptr; for (auto bot_iter : sbl) { - if (bot_iter->GetAppearance() == eaDead || bot_iter->GetBotStance() == EQEmu::constants::stancePassive) { + if (bot_iter->GetAppearance() == eaDead || bot_iter->GetBotStance() == EQ::constants::stancePassive) { continue; } @@ -4774,7 +4774,7 @@ void bot_command_taunt(Client *c, const Seperator *sep) int taunting_count = 0; for (auto bot_iter : sbl) { - if (!bot_iter->GetSkill(EQEmu::skills::SkillTaunt)) + if (!bot_iter->GetSkill(EQ::skills::SkillTaunt)) continue; if (toggle_taunt) @@ -5094,7 +5094,7 @@ void bot_subcommand_bot_clone(Client *c, const Seperator *sep) return; } - int clone_stance = EQEmu::constants::stancePassive; + int clone_stance = EQ::constants::stancePassive; if (!database.botdb.LoadStance(my_bot->GetBotID(), clone_stance)) c->Message(m_fail, "%s for bot '%s'", BotDatabase::fail::LoadStance(), my_bot->GetCleanName()); if (!database.botdb.SaveStance(clone_id, clone_stance)) @@ -5298,7 +5298,7 @@ void bot_subcommand_bot_dye_armor(Client *c, const Seperator *sep) // TODO: Trouble-shoot model update issue const std::string msg_matslot = StringFormat("mat_slot: %c(All), %i(Head), %i(Chest), %i(Arms), %i(Wrists), %i(Hands), %i(Legs), %i(Feet)", - '*', EQEmu::textures::armorHead, EQEmu::textures::armorChest, EQEmu::textures::armorArms, EQEmu::textures::armorWrist, EQEmu::textures::armorHands, EQEmu::textures::armorLegs, EQEmu::textures::armorFeet); + '*', EQ::textures::armorHead, EQ::textures::armorChest, EQ::textures::armorArms, EQ::textures::armorWrist, EQ::textures::armorHands, EQ::textures::armorLegs, EQ::textures::armorFeet); if (helper_command_alias_fail(c, "bot_subcommand_bot_dye_armor", sep->arg[0], "botdyearmor")) return; @@ -5309,15 +5309,15 @@ void bot_subcommand_bot_dye_armor(Client *c, const Seperator *sep) } const int ab_mask = ActionableBots::ABM_NoFilter; - uint8 material_slot = EQEmu::textures::materialInvalid; + uint8 material_slot = EQ::textures::materialInvalid; int16 slot_id = INVALID_INDEX; bool dye_all = (sep->arg[1][0] == '*'); if (!dye_all) { material_slot = atoi(sep->arg[1]); - slot_id = EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot); + slot_id = EQ::InventoryProfile::CalcSlotFromMaterial(material_slot); - if (!sep->IsNumber(1) || slot_id == INVALID_INDEX || material_slot > EQEmu::textures::LastTintableTexture) { + if (!sep->IsNumber(1) || slot_id == INVALID_INDEX || material_slot > EQ::textures::LastTintableTexture) { c->Message(m_fail, "Valid [mat_slot]s for this command are:"); c->Message(m_fail, msg_matslot.c_str()); return; @@ -5654,7 +5654,7 @@ void bot_subcommand_bot_inspect_message(Client *c, const Seperator *sep) if (helper_is_help_or_usage(sep->arg[1])) { c->Message(m_usage, "usage: %s [set | clear] ([actionable: target | byname | ownergroup | botgroup | targetgroup | namesgroup | healrotation | spawned] ([actionable_name]))", sep->arg[0]); c->Message(m_note, "Notes:"); - if (c->ClientVersion() >= EQEmu::versions::ClientVersion::SoF) { + if (c->ClientVersion() >= EQ::versions::ClientVersion::SoF) { c->Message(m_message, "- Self-inspect and type your bot's inspect message"); c->Message(m_message, "- Close the self-inspect window to update the server"); c->Message(m_message, "- Type '%s set' to set the bot's inspect message", sep->arg[0]); @@ -5799,7 +5799,7 @@ void bot_subcommand_bot_list(Client *c, const Seperator *sep) Bot * botCheckNotOnline = entity_list.GetBotByBotName(bots_iter.Name); std::string botspawn_saylink = StringFormat("^botspawn %s", bots_iter.Name); c->Message(Chat::White, "[%s] is a level %u %s %s %s who is owned by %s", - ((c->CharacterID() == bots_iter.Owner_ID) && (!botCheckNotOnline) ? (EQEmu::SayLinkEngine::GenerateQuestSaylink(botspawn_saylink, false, bots_iter.Name).c_str()) : (bots_iter.Name)), + ((c->CharacterID() == bots_iter.Owner_ID) && (!botCheckNotOnline) ? (EQ::SayLinkEngine::GenerateQuestSaylink(botspawn_saylink, false, bots_iter.Name).c_str()) : (bots_iter.Name)), bots_iter.Level, Bot::RaceIdToString(bots_iter.Race).c_str(), ((bots_iter.Gender == FEMALE) ? ("Female") : ((bots_iter.Gender == MALE) ? ("Male") : ("Neuter"))), @@ -6127,32 +6127,32 @@ void bot_subcommand_bot_stance(Client *c, const Seperator *sep) if (helper_is_help_or_usage(sep->arg[1])) { c->Message(m_usage, "usage: %s [current | value: 1-9] ([actionable: target | byname] ([actionable_name]))", sep->arg[0]); c->Message(m_note, "value: %u(%s), %u(%s), %u(%s), %u(%s), %u(%s), %u(%s), %u(%s)", - EQEmu::constants::stancePassive, EQEmu::constants::GetStanceName(EQEmu::constants::stancePassive), - EQEmu::constants::stanceBalanced, EQEmu::constants::GetStanceName(EQEmu::constants::stanceBalanced), - EQEmu::constants::stanceEfficient, EQEmu::constants::GetStanceName(EQEmu::constants::stanceEfficient), - EQEmu::constants::stanceReactive, EQEmu::constants::GetStanceName(EQEmu::constants::stanceReactive), - EQEmu::constants::stanceAggressive, EQEmu::constants::GetStanceName(EQEmu::constants::stanceAggressive), - EQEmu::constants::stanceAssist, EQEmu::constants::GetStanceName(EQEmu::constants::stanceAssist), - EQEmu::constants::stanceBurn, EQEmu::constants::GetStanceName(EQEmu::constants::stanceBurn), - EQEmu::constants::stanceEfficient2, EQEmu::constants::GetStanceName(EQEmu::constants::stanceEfficient2), - EQEmu::constants::stanceBurnAE, EQEmu::constants::GetStanceName(EQEmu::constants::stanceBurnAE) + EQ::constants::stancePassive, EQ::constants::GetStanceName(EQ::constants::stancePassive), + EQ::constants::stanceBalanced, EQ::constants::GetStanceName(EQ::constants::stanceBalanced), + EQ::constants::stanceEfficient, EQ::constants::GetStanceName(EQ::constants::stanceEfficient), + EQ::constants::stanceReactive, EQ::constants::GetStanceName(EQ::constants::stanceReactive), + EQ::constants::stanceAggressive, EQ::constants::GetStanceName(EQ::constants::stanceAggressive), + EQ::constants::stanceAssist, EQ::constants::GetStanceName(EQ::constants::stanceAssist), + EQ::constants::stanceBurn, EQ::constants::GetStanceName(EQ::constants::stanceBurn), + EQ::constants::stanceEfficient2, EQ::constants::GetStanceName(EQ::constants::stanceEfficient2), + EQ::constants::stanceBurnAE, EQ::constants::GetStanceName(EQ::constants::stanceBurnAE) ); return; } int ab_mask = (ActionableBots::ABM_Target | ActionableBots::ABM_ByName); bool current_flag = false; - auto bst = EQEmu::constants::stanceUnknown; + auto bst = EQ::constants::stanceUnknown; if (!strcasecmp(sep->arg[1], "current")) current_flag = true; else if (sep->IsNumber(1)) { - bst = (EQEmu::constants::StanceType)atoi(sep->arg[1]); - if (bst < EQEmu::constants::stanceUnknown || bst > EQEmu::constants::stanceBurnAE) - bst = EQEmu::constants::stanceUnknown; + bst = (EQ::constants::StanceType)atoi(sep->arg[1]); + if (bst < EQ::constants::stanceUnknown || bst > EQ::constants::stanceBurnAE) + bst = EQ::constants::stanceUnknown; } - if (!current_flag && bst == EQEmu::constants::stanceUnknown) { + if (!current_flag && bst == EQ::constants::stanceUnknown) { c->Message(m_fail, "A [current] argument or valid numeric [value] is required to use this command"); return; } @@ -6173,7 +6173,7 @@ void bot_subcommand_bot_stance(Client *c, const Seperator *sep) Bot::BotGroupSay( bot_iter, "My current stance is '%s' (%i)", - EQEmu::constants::GetStanceName(bot_iter->GetBotStance()), + EQ::constants::GetStanceName(bot_iter->GetBotStance()), bot_iter->GetBotStance() ); } @@ -8181,31 +8181,31 @@ void bot_subcommand_inventory_list(Client *c, const Seperator *sep) return; } - const EQEmu::ItemInstance* inst = nullptr; - const EQEmu::ItemData* item = nullptr; + const EQ::ItemInstance* inst = nullptr; + const EQ::ItemData* item = nullptr; bool is2Hweapon = false; - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkItemInst); + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkItemInst); uint32 inventory_count = 0; - for (int i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; ++i) { - if ((i == EQEmu::invslot::slotSecondary) && is2Hweapon) + for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; ++i) { + if ((i == EQ::invslot::slotSecondary) && is2Hweapon) continue; inst = my_bot->CastToBot()->GetBotItem(i); if (!inst || !inst->GetItem()) { - c->Message(m_message, "I need something for my %s (slot %i)", EQEmu::invslot::GetInvPossessionsSlotName(i), i); + c->Message(m_message, "I need something for my %s (slot %i)", EQ::invslot::GetInvPossessionsSlotName(i), i); continue; } item = inst->GetItem(); - if ((i == EQEmu::invslot::slotPrimary) && item->IsType2HWeapon()) { + if ((i == EQ::invslot::slotPrimary) && item->IsType2HWeapon()) { is2Hweapon = true; } linker.SetItemInst(inst); - c->Message(m_message, "Using %s in my %s (slot %i)", linker.GenerateLink().c_str(), EQEmu::invslot::GetInvPossessionsSlotName(i), i); + c->Message(m_message, "Using %s in my %s (slot %i)", linker.GenerateLink().c_str(), EQ::invslot::GetInvPossessionsSlotName(i), i); ++inventory_count; } @@ -8244,13 +8244,13 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep) } int slotId = atoi(sep->arg[1]); - if (!sep->IsNumber(1) || (slotId > EQEmu::invslot::EQUIPMENT_END || slotId < EQEmu::invslot::EQUIPMENT_BEGIN)) { + if (!sep->IsNumber(1) || (slotId > EQ::invslot::EQUIPMENT_END || slotId < EQ::invslot::EQUIPMENT_BEGIN)) { c->Message(m_fail, "Valid slots are 0-22"); return; } - const EQEmu::ItemData* itm = nullptr; - const EQEmu::ItemInstance* itminst = my_bot->GetBotItem(slotId); + const EQ::ItemData* itm = nullptr; + const EQ::ItemInstance* itminst = my_bot->GetBotItem(slotId); if (itminst) itm = itminst->GetItem(); @@ -8259,11 +8259,11 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep) return; } - for (int m = EQEmu::invaug::SOCKET_BEGIN; m <= EQEmu::invaug::SOCKET_END; ++m) { + for (int m = EQ::invaug::SOCKET_BEGIN; m <= EQ::invaug::SOCKET_END; ++m) { if (!itminst) break; - EQEmu::ItemInstance *itma = itminst->GetAugment(m); + EQ::ItemInstance *itma = itminst->GetAugment(m); if (!itma) continue; if (!c->CheckLoreConflict(itma->GetItem())) @@ -8276,7 +8276,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep) std::string error_message; if (itm) { c->PushItemOnCursor(*itminst, true); - if ((slotId == EQEmu::invslot::slotRange) || (slotId == EQEmu::invslot::slotAmmo) || (slotId == EQEmu::invslot::slotPrimary) || (slotId == EQEmu::invslot::slotSecondary)) + if ((slotId == EQ::invslot::slotRange) || (slotId == EQ::invslot::slotAmmo) || (slotId == EQ::invslot::slotPrimary) || (slotId == EQ::invslot::slotSecondary)) my_bot->SetBotArcher(false); my_bot->RemoveBotItemBySlot(slotId, &error_message); @@ -8290,32 +8290,32 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep) } switch (slotId) { - case EQEmu::invslot::slotCharm: - case EQEmu::invslot::slotEar1: - case EQEmu::invslot::slotHead: - case EQEmu::invslot::slotFace: - case EQEmu::invslot::slotEar2: - case EQEmu::invslot::slotNeck: - case EQEmu::invslot::slotBack: - case EQEmu::invslot::slotWrist1: - case EQEmu::invslot::slotWrist2: - case EQEmu::invslot::slotRange: - case EQEmu::invslot::slotPrimary: - case EQEmu::invslot::slotSecondary: - case EQEmu::invslot::slotFinger1: - case EQEmu::invslot::slotFinger2: - case EQEmu::invslot::slotChest: - case EQEmu::invslot::slotWaist: - case EQEmu::invslot::slotPowerSource: - case EQEmu::invslot::slotAmmo: - c->Message(m_message, "My %s is %s unequipped", EQEmu::invslot::GetInvPossessionsSlotName(slotId), ((itm) ? ("now") : ("already"))); + case EQ::invslot::slotCharm: + case EQ::invslot::slotEar1: + case EQ::invslot::slotHead: + case EQ::invslot::slotFace: + case EQ::invslot::slotEar2: + case EQ::invslot::slotNeck: + case EQ::invslot::slotBack: + case EQ::invslot::slotWrist1: + case EQ::invslot::slotWrist2: + case EQ::invslot::slotRange: + case EQ::invslot::slotPrimary: + case EQ::invslot::slotSecondary: + case EQ::invslot::slotFinger1: + case EQ::invslot::slotFinger2: + case EQ::invslot::slotChest: + case EQ::invslot::slotWaist: + case EQ::invslot::slotPowerSource: + case EQ::invslot::slotAmmo: + c->Message(m_message, "My %s is %s unequipped", EQ::invslot::GetInvPossessionsSlotName(slotId), ((itm) ? ("now") : ("already"))); break; - case EQEmu::invslot::slotShoulders: - case EQEmu::invslot::slotArms: - case EQEmu::invslot::slotHands: - case EQEmu::invslot::slotLegs: - case EQEmu::invslot::slotFeet: - c->Message(m_message, "My %s are %s unequipped", EQEmu::invslot::GetInvPossessionsSlotName(slotId), ((itm) ? ("now") : ("already"))); + case EQ::invslot::slotShoulders: + case EQ::invslot::slotArms: + case EQ::invslot::slotHands: + case EQ::invslot::slotLegs: + case EQ::invslot::slotFeet: + c->Message(m_message, "My %s are %s unequipped", EQ::invslot::GetInvPossessionsSlotName(slotId), ((itm) ? ("now") : ("already"))); break; default: c->Message(m_fail, "I'm soo confused..."); @@ -8348,17 +8348,17 @@ void bot_subcommand_inventory_window(Client *c, const Seperator *sep) std::string window_text; //std::string item_link; - //EQEmu::SayLinkEngine linker; - //linker.SetLinkType(EQEmu::saylink::SayLinkItemInst); + //EQ::SayLinkEngine linker; + //linker.SetLinkType(EQ::saylink::SayLinkItemInst); - for (int i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; ++i) { - const EQEmu::ItemData* item = nullptr; - const EQEmu::ItemInstance* inst = my_bot->CastToBot()->GetBotItem(i); + for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; ++i) { + const EQ::ItemData* item = nullptr; + const EQ::ItemInstance* inst = my_bot->CastToBot()->GetBotItem(i); if (inst) item = inst->GetItem(); window_text.append(""); - window_text.append(EQEmu::invslot::GetInvPossessionsSlotName(i)); + window_text.append(EQ::invslot::GetInvPossessionsSlotName(i)); window_text.append(": "); if (item) { //window_text.append(""); @@ -8840,7 +8840,7 @@ bool helper_cast_standard_spell(Bot* casting_bot, Mob* target_mob, int spell_id, if (annouce_cast) Bot::BotGroupSay(casting_bot, "Attempting to cast '%s' on %s", spells[spell_id].name, target_mob->GetCleanName()); - return casting_bot->CastSpell(spell_id, target_mob->GetID(), EQEmu::spells::CastingSlot::Gem2, -1, -1, dont_root_before); + return casting_bot->CastSpell(spell_id, target_mob->GetID(), EQ::spells::CastingSlot::Gem2, -1, -1, dont_root_before); } bool helper_command_disabled(Client* bot_owner, bool rule_value, const char* command) diff --git a/zone/bot_database.cpp b/zone/bot_database.cpp index 28b5288e0..3f893dc17 100644 --- a/zone/bot_database.cpp +++ b/zone/bot_database.cpp @@ -145,7 +145,7 @@ bool BotDatabase::LoadBotSpellCastingChances() continue; --class_index; uint8 stance_index = atoi(row[2]); - if (stance_index >= EQEmu::constants::STANCE_TYPE_COUNT) + if (stance_index >= EQ::constants::STANCE_TYPE_COUNT) continue; for (uint8 conditional_index = nHSND; conditional_index < cntHSND; ++conditional_index) { @@ -914,7 +914,7 @@ bool BotDatabase::LoadStance(Bot* bot_inst, bool& stance_flag) return true; auto row = results.begin(); - bot_inst->SetBotStance((EQEmu::constants::StanceType)atoi(row[0])); + bot_inst->SetBotStance((EQ::constants::StanceType)atoi(row[0])); stance_flag = true; return true; @@ -1141,7 +1141,7 @@ bool BotDatabase::QueryInventoryCount(const uint32 bot_id, uint32& item_count) return true; } -bool BotDatabase::LoadItems(const uint32 bot_id, EQEmu::InventoryProfile& inventory_inst) +bool BotDatabase::LoadItems(const uint32 bot_id, EQ::InventoryProfile& inventory_inst) { if (!bot_id) return false; @@ -1176,13 +1176,13 @@ bool BotDatabase::LoadItems(const uint32 bot_id, EQEmu::InventoryProfile& invent for (auto row = results.begin(); row != results.end(); ++row) { int16 slot_id = atoi(row[0]); - if (slot_id < EQEmu::invslot::EQUIPMENT_BEGIN || slot_id > EQEmu::invslot::EQUIPMENT_END) + if (slot_id < EQ::invslot::EQUIPMENT_BEGIN || slot_id > EQ::invslot::EQUIPMENT_END) continue; uint32 item_id = atoi(row[1]); uint16 item_charges = (uint16)atoi(row[2]); - EQEmu::ItemInstance* item_inst = database.CreateItem( + EQ::ItemInstance* item_inst = database.CreateItem( item_id, item_charges, (uint32)atoul(row[9]), @@ -1211,7 +1211,7 @@ bool BotDatabase::LoadItems(const uint32 bot_id, EQEmu::InventoryProfile& invent if (item_inst->GetItem()->Attuneable) { if (atoi(row[4])) item_inst->SetAttuned(true); - else if (slot_id >= EQEmu::invslot::EQUIPMENT_BEGIN && slot_id <= EQEmu::invslot::EQUIPMENT_END) + else if (slot_id >= EQ::invslot::EQUIPMENT_BEGIN && slot_id <= EQ::invslot::EQUIPMENT_END) item_inst->SetAttuned(true); } @@ -1279,7 +1279,7 @@ bool BotDatabase::LoadItemBySlot(Bot* bot_inst) bool BotDatabase::LoadItemBySlot(const uint32 bot_id, const uint32 slot_id, uint32& item_id) { - if (!bot_id || slot_id > EQEmu::invslot::EQUIPMENT_END) + if (!bot_id || slot_id > EQ::invslot::EQUIPMENT_END) return false; query = StringFormat("SELECT `item_id` FROM `bot_inventories` WHERE `bot_id` = '%i' AND `slot_id` = '%i' LIMIT 1", bot_id, slot_id); @@ -1295,9 +1295,9 @@ bool BotDatabase::LoadItemBySlot(const uint32 bot_id, const uint32 slot_id, uint return true; } -bool BotDatabase::SaveItemBySlot(Bot* bot_inst, const uint32 slot_id, const EQEmu::ItemInstance* item_inst) +bool BotDatabase::SaveItemBySlot(Bot* bot_inst, const uint32 slot_id, const EQ::ItemInstance* item_inst) { - if (!bot_inst || !bot_inst->GetBotID() || slot_id > EQEmu::invslot::EQUIPMENT_END) + if (!bot_inst || !bot_inst->GetBotID() || slot_id > EQ::invslot::EQUIPMENT_END) return false; if (!DeleteItemBySlot(bot_inst->GetBotID(), slot_id)) @@ -1306,8 +1306,8 @@ bool BotDatabase::SaveItemBySlot(Bot* bot_inst, const uint32 slot_id, const EQEm if (!item_inst || !item_inst->GetID()) return true; - uint32 augment_id[EQEmu::invaug::SOCKET_COUNT] = { 0, 0, 0, 0, 0, 0 }; - for (int augment_iter = EQEmu::invaug::SOCKET_BEGIN; augment_iter <= EQEmu::invaug::SOCKET_END; ++augment_iter) + uint32 augment_id[EQ::invaug::SOCKET_COUNT] = { 0, 0, 0, 0, 0, 0 }; + for (int augment_iter = EQ::invaug::SOCKET_BEGIN; augment_iter <= EQ::invaug::SOCKET_END; ++augment_iter) augment_id[augment_iter] = item_inst->GetAugmentItemID(augment_iter); uint16 item_charges = 0; @@ -1381,7 +1381,7 @@ bool BotDatabase::SaveItemBySlot(Bot* bot_inst, const uint32 slot_id, const EQEm bool BotDatabase::DeleteItemBySlot(const uint32 bot_id, const uint32 slot_id) { - if (!bot_id || slot_id > EQEmu::invslot::EQUIPMENT_END) + if (!bot_id || slot_id > EQ::invslot::EQUIPMENT_END) return false; query = StringFormat("DELETE FROM `bot_inventories` WHERE `bot_id` = '%u' AND `slot_id` = '%u'", bot_id, slot_id); @@ -1397,7 +1397,7 @@ bool BotDatabase::LoadEquipmentColor(const uint32 bot_id, const uint8 material_s if (!bot_id) return false; - int16 slot_id = EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot_id); + int16 slot_id = EQ::InventoryProfile::CalcSlotFromMaterial(material_slot_id); if (slot_id == INVALID_INDEX) return false; @@ -1420,12 +1420,12 @@ bool BotDatabase::SaveEquipmentColor(const uint32 bot_id, const int16 slot_id, c return false; bool all_flag = (slot_id == -2); - if ((slot_id < EQEmu::invslot::EQUIPMENT_BEGIN || slot_id > EQEmu::invslot::EQUIPMENT_END) && !all_flag) + if ((slot_id < EQ::invslot::EQUIPMENT_BEGIN || slot_id > EQ::invslot::EQUIPMENT_END) && !all_flag) return false; std::string where_clause; if (all_flag) - where_clause = StringFormat(" AND `slot_id` IN ('%u', '%u', '%u', '%u', '%u', '%u', '%u')", EQEmu::invslot::slotHead, EQEmu::invslot::slotArms, EQEmu::invslot::slotWrist1, EQEmu::invslot::slotHands, EQEmu::invslot::slotChest, EQEmu::invslot::slotLegs, EQEmu::invslot::slotFeet); + where_clause = StringFormat(" AND `slot_id` IN ('%u', '%u', '%u', '%u', '%u', '%u', '%u')", EQ::invslot::slotHead, EQ::invslot::slotArms, EQ::invslot::slotWrist1, EQ::invslot::slotHands, EQ::invslot::slotChest, EQ::invslot::slotLegs, EQ::invslot::slotFeet); else where_clause = StringFormat(" AND `slot_id` = '%u'", slot_id); @@ -1696,8 +1696,8 @@ bool BotDatabase::LoadPetItems(const uint32 bot_id, uint32* pet_items) if (!results.RowCount()) return true; - int item_index = EQEmu::invslot::EQUIPMENT_BEGIN; - for (auto row = results.begin(); row != results.end() && (item_index >= EQEmu::invslot::EQUIPMENT_BEGIN && item_index <= EQEmu::invslot::EQUIPMENT_END); ++row) { + int item_index = EQ::invslot::EQUIPMENT_BEGIN; + for (auto row = results.begin(); row != results.end() && (item_index >= EQ::invslot::EQUIPMENT_BEGIN && item_index <= EQ::invslot::EQUIPMENT_END); ++row) { pet_items[item_index] = atoi(row[0]); ++item_index; } @@ -1721,7 +1721,7 @@ bool BotDatabase::SavePetItems(const uint32 bot_id, const uint32* pet_items, boo if (!saved_pet_index) return true; - for (int item_index = EQEmu::invslot::EQUIPMENT_BEGIN; item_index <= EQEmu::invslot::EQUIPMENT_END; ++item_index) { + for (int item_index = EQ::invslot::EQUIPMENT_BEGIN; item_index <= EQ::invslot::EQUIPMENT_END; ++item_index) { if (!pet_items[item_index]) continue; @@ -1870,7 +1870,7 @@ bool BotDatabase::SaveAllArmorColorBySlot(const uint32 owner_id, const int16 slo " AND bi.`slot_id` = '%i'", owner_id, rgb_value, - EQEmu::invslot::slotHead, EQEmu::invslot::slotChest, EQEmu::invslot::slotArms, EQEmu::invslot::slotWrist1, EQEmu::invslot::slotWrist2, EQEmu::invslot::slotHands, EQEmu::invslot::slotLegs, EQEmu::invslot::slotFeet, + EQ::invslot::slotHead, EQ::invslot::slotChest, EQ::invslot::slotArms, EQ::invslot::slotWrist1, EQ::invslot::slotWrist2, EQ::invslot::slotHands, EQ::invslot::slotLegs, EQ::invslot::slotFeet, slot_id ); auto results = database.QueryDatabase(query); @@ -1894,7 +1894,7 @@ bool BotDatabase::SaveAllArmorColors(const uint32 owner_id, const uint32 rgb_val " AND bi.`slot_id` IN ('%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')", owner_id, rgb_value, - EQEmu::invslot::slotHead, EQEmu::invslot::slotChest, EQEmu::invslot::slotArms, EQEmu::invslot::slotWrist1, EQEmu::invslot::slotWrist2, EQEmu::invslot::slotHands, EQEmu::invslot::slotLegs, EQEmu::invslot::slotFeet + EQ::invslot::slotHead, EQ::invslot::slotChest, EQ::invslot::slotArms, EQ::invslot::slotWrist1, EQ::invslot::slotWrist2, EQ::invslot::slotHands, EQ::invslot::slotLegs, EQ::invslot::slotFeet ); auto results = database.QueryDatabase(query); if (!results.Success()) @@ -2944,7 +2944,7 @@ uint8 BotDatabase::GetSpellCastingChance(uint8 spell_type_index, uint8 class_ind return 0; if (class_index >= PLAYER_CLASS_COUNT) return 0; - if (stance_index >= EQEmu::constants::STANCE_TYPE_COUNT) + if (stance_index >= EQ::constants::STANCE_TYPE_COUNT) return 0; if (conditional_index >= cntHSND) return 0; diff --git a/zone/bot_database.h b/zone/bot_database.h index 82cf68f09..57cf185ce 100644 --- a/zone/bot_database.h +++ b/zone/bot_database.h @@ -32,7 +32,7 @@ class Client; struct BotsAvailableList; struct InspectMessage_Struct; -namespace EQEmu +namespace EQ { class ItemInstance; class InventoryProfile; @@ -85,13 +85,13 @@ public: /* Bot inventory functions */ bool QueryInventoryCount(const uint32 bot_id, uint32& item_count); - bool LoadItems(const uint32 bot_id, EQEmu::InventoryProfile &inventory_inst); + bool LoadItems(const uint32 bot_id, EQ::InventoryProfile &inventory_inst); bool SaveItems(Bot* bot_inst); bool DeleteItems(const uint32 bot_id); bool LoadItemBySlot(Bot* bot_inst); bool LoadItemBySlot(const uint32 bot_id, const uint32 slot_id, uint32& item_id); - bool SaveItemBySlot(Bot* bot_inst, const uint32 slot_id, const EQEmu::ItemInstance* item_inst); + bool SaveItemBySlot(Bot* bot_inst, const uint32 slot_id, const EQ::ItemInstance* item_inst); bool DeleteItemBySlot(const uint32 bot_id, const uint32 slot_id); bool LoadEquipmentColor(const uint32 bot_id, const uint8 material_slot_id, uint32& rgb); diff --git a/zone/botspellsai.cpp b/zone/botspellsai.cpp index 9acc8ac8b..e03c996fd 100644 --- a/zone/botspellsai.cpp +++ b/zone/botspellsai.cpp @@ -193,18 +193,18 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint32 iSpellTypes) { float hpRatioToCast = 0.0f; switch(this->GetBotStance()) { - case EQEmu::constants::stanceEfficient: - case EQEmu::constants::stanceAggressive: + case EQ::constants::stanceEfficient: + case EQ::constants::stanceAggressive: hpRatioToCast = isPrimaryHealer?90.0f:50.0f; break; - case EQEmu::constants::stanceBalanced: + case EQ::constants::stanceBalanced: hpRatioToCast = isPrimaryHealer?95.0f:75.0f; break; - case EQEmu::constants::stanceReactive: + case EQ::constants::stanceReactive: hpRatioToCast = isPrimaryHealer?100.0f:90.0f; break; - case EQEmu::constants::stanceBurn: - case EQEmu::constants::stanceBurnAE: + case EQ::constants::stanceBurn: + case EQ::constants::stanceBurnAE: hpRatioToCast = isPrimaryHealer?75.0f:25.0f; break; default: @@ -381,16 +381,16 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint32 iSpellTypes) { float manaRatioToCast = 75.0f; switch(this->GetBotStance()) { - case EQEmu::constants::stanceEfficient: + case EQ::constants::stanceEfficient: manaRatioToCast = 90.0f; break; - case EQEmu::constants::stanceBalanced: - case EQEmu::constants::stanceAggressive: + case EQ::constants::stanceBalanced: + case EQ::constants::stanceAggressive: manaRatioToCast = 75.0f; break; - case EQEmu::constants::stanceReactive: - case EQEmu::constants::stanceBurn: - case EQEmu::constants::stanceBurnAE: + case EQ::constants::stanceReactive: + case EQ::constants::stanceBurn: + case EQ::constants::stanceBurnAE: manaRatioToCast = 50.0f; break; default: @@ -460,18 +460,18 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint32 iSpellTypes) { float manaRatioToCast = 75.0f; switch(this->GetBotStance()) { - case EQEmu::constants::stanceEfficient: + case EQ::constants::stanceEfficient: manaRatioToCast = 90.0f; break; - case EQEmu::constants::stanceBalanced: + case EQ::constants::stanceBalanced: manaRatioToCast = 75.0f; break; - case EQEmu::constants::stanceReactive: - case EQEmu::constants::stanceAggressive: + case EQ::constants::stanceReactive: + case EQ::constants::stanceAggressive: manaRatioToCast = 50.0f; break; - case EQEmu::constants::stanceBurn: - case EQEmu::constants::stanceBurnAE: + case EQ::constants::stanceBurn: + case EQ::constants::stanceBurnAE: manaRatioToCast = 25.0f; break; default: @@ -1310,7 +1310,7 @@ bool Bot::AI_EngagedCastCheck() { AIautocastspell_timer->Disable(); //prevent the timer from going off AGAIN while we are casting. uint8 botClass = GetClass(); - EQEmu::constants::StanceType botStance = GetBotStance(); + EQ::constants::StanceType botStance = GetBotStance(); bool mayGetAggro = HasOrMayGetAggro(); LogAI("Engaged autocast check triggered (BOTS). Trying to cast healing spells then maybe offensive spells"); @@ -2653,11 +2653,11 @@ uint8 Bot::GetChanceToCastBySpellType(uint32 spellType) return 0; --class_index; - EQEmu::constants::StanceType stance_type = GetBotStance(); - if (stance_type < EQEmu::constants::stancePassive || stance_type > EQEmu::constants::stanceBurnAE) + EQ::constants::StanceType stance_type = GetBotStance(); + if (stance_type < EQ::constants::stancePassive || stance_type > EQ::constants::stanceBurnAE) return 0; - uint8 stance_index = EQEmu::constants::ConvertStanceTypeToIndex(stance_type); + uint8 stance_index = EQ::constants::ConvertStanceTypeToIndex(stance_type); uint8 type_index = nHSND; if (HasGroup()) { diff --git a/zone/client.cpp b/zone/client.cpp index e730b32ee..7b03fa4cb 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -105,7 +105,7 @@ Client::Client(EQStreamInterface* ieqs) 0, // Drakkin Heritage 0, // Drakkin Tattoo 0, // Drakkin Details - EQEmu::TintProfile(), // Armor Tint + EQ::TintProfile(), // Armor Tint 0xff, // AA Title 0, // see_invis 0, // see_invis_undead @@ -285,7 +285,7 @@ Client::Client(EQStreamInterface* ieqs) GlobalChatLimiterTimer = new Timer(RuleI(Chat, IntervalDurationMS)); AttemptedMessages = 0; TotalKarma = 0; - m_ClientVersion = EQEmu::versions::ClientVersion::Unknown; + m_ClientVersion = EQ::versions::ClientVersion::Unknown; m_ClientVersionBit = 0; AggroCount = 0; ooc_regen = false; @@ -923,8 +923,8 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } // Censor the message - if (EQEmu::ProfanityManager::IsCensorshipActive() && (chan_num != ChatChannel_Say)) - EQEmu::ProfanityManager::RedactMessage(message); + if (EQ::ProfanityManager::IsCensorshipActive() && (chan_num != ChatChannel_Say)) + EQ::ProfanityManager::RedactMessage(message); switch(chan_num) { @@ -1156,8 +1156,8 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } #endif - if (EQEmu::ProfanityManager::IsCensorshipActive()) { - EQEmu::ProfanityManager::RedactMessage(message); + if (EQ::ProfanityManager::IsCensorshipActive()) { + EQ::ProfanityManager::RedactMessage(message); } Mob* sender = this; @@ -1507,8 +1507,8 @@ bool Client::UpdateLDoNPoints(int32 points, uint32 theme) return(false); } -void Client::SetSkill(EQEmu::skills::SkillType skillid, uint16 value) { - if (skillid > EQEmu::skills::HIGHEST_SKILL) +void Client::SetSkill(EQ::skills::SkillType skillid, uint16 value) { + if (skillid > EQ::skills::HIGHEST_SKILL) return; m_pp.skills[skillid] = value; // We need to be able to #setskill 254 and 255 to reset skills @@ -1544,8 +1544,8 @@ void Client::IncreaseLanguageSkill(int skill_id, int value) { MessageString( Chat::Skills, LANG_SKILL_IMPROVED ); //Notify client } -void Client::AddSkill(EQEmu::skills::SkillType skillid, uint16 value) { - if (skillid > EQEmu::skills::HIGHEST_SKILL) +void Client::AddSkill(EQ::skills::SkillType skillid, uint16 value) { + if (skillid > EQ::skills::HIGHEST_SKILL) return; value = GetRawSkill(skillid) + value; uint16 max = GetMaxSkillAfterSpecializationRules(skillid, MaxSkill(skillid)); @@ -1865,7 +1865,7 @@ void Client::CheckManaEndUpdate() { if (last_reported_mana != current_mana || last_reported_endurance != current_endurance) { - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoD) { SendManaUpdate(); SendEnduranceUpdate(); } @@ -1900,9 +1900,9 @@ void Client::CheckManaEndUpdate() { mana_update->cur_mana = GetMana(); mana_update->max_mana = GetMaxMana(); mana_update->spawn_id = GetID(); - if ((ClientVersionBit() & EQEmu::versions::ClientVersionBitmask::maskSoDAndLater) != 0) + if ((ClientVersionBit() & EQ::versions::ClientVersionBitmask::maskSoDAndLater) != 0) QueuePacket(mana_packet); // do we need this with the OP_ManaChange packet above? - entity_list.QueueClientsByXTarget(this, mana_packet, false, EQEmu::versions::ClientVersionBitmask::maskSoDAndLater); + entity_list.QueueClientsByXTarget(this, mana_packet, false, EQ::versions::ClientVersionBitmask::maskSoDAndLater); safe_delete(mana_packet); last_reported_mana_percent = this->GetManaPercent(); @@ -1925,9 +1925,9 @@ void Client::CheckManaEndUpdate() { endurance_update->cur_end = GetEndurance(); endurance_update->max_end = GetMaxEndurance(); endurance_update->spawn_id = GetID(); - if ((ClientVersionBit() & EQEmu::versions::ClientVersionBitmask::maskSoDAndLater) != 0) + if ((ClientVersionBit() & EQ::versions::ClientVersionBitmask::maskSoDAndLater) != 0) QueuePacket(endurance_packet); // do we need this with the OP_ManaChange packet above? - entity_list.QueueClientsByXTarget(this, endurance_packet, false, EQEmu::versions::ClientVersionBitmask::maskSoDAndLater); + entity_list.QueueClientsByXTarget(this, endurance_packet, false, EQ::versions::ClientVersionBitmask::maskSoDAndLater); safe_delete(endurance_packet); last_reported_endurance_percent = this->GetEndurancePercent(); @@ -1998,7 +1998,7 @@ void Client::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) UpdateEquipmentLight(); UpdateActiveLight(); - ns->spawn.light = m_Light.Type[EQEmu::lightsource::LightActive]; + ns->spawn.light = m_Light.Type[EQ::lightsource::LightActive]; } bool Client::GMHideMe(Client* client) { @@ -2107,7 +2107,7 @@ void Client::ReadBook(BookRequest_Struct *book) { out->window = book->window; - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoF) { // Find out what slot the book was read from. // SoF+ need to look up book type for the output message. int16 read_from_slot; @@ -2121,9 +2121,9 @@ void Client::ReadBook(BookRequest_Struct *book) { read_from_slot = book->invslot -1; } - const EQEmu::ItemInstance *inst = nullptr; + const EQ::ItemInstance *inst = nullptr; - if (read_from_slot <= EQEmu::invbag::GENERAL_BAGS_END) + if (read_from_slot <= EQ::invbag::GENERAL_BAGS_END) { inst = m_inv[read_from_slot]; } @@ -2413,12 +2413,12 @@ uint64 Client::GetAllMoney() { (static_cast(m_pp.platinum_shared) * 1000))))); } -bool Client::CheckIncreaseSkill(EQEmu::skills::SkillType skillid, Mob *against_who, int chancemodi) { +bool Client::CheckIncreaseSkill(EQ::skills::SkillType skillid, Mob *against_who, int chancemodi) { if (IsDead() || IsUnconscious()) return false; if (IsAIControlled()) // no skillups while chamred =p return false; - if (skillid > EQEmu::skills::HIGHEST_SKILL) + if (skillid > EQ::skills::HIGHEST_SKILL) return false; int skillval = GetRawSkill(skillid); int maxskill = GetMaxSkillAfterSpecializationRules(skillid, MaxSkill(skillid)); @@ -2485,34 +2485,34 @@ void Client::CheckLanguageSkillIncrease(uint8 langid, uint8 TeacherSkill) { } } -bool Client::HasSkill(EQEmu::skills::SkillType skill_id) const { +bool Client::HasSkill(EQ::skills::SkillType skill_id) const { return((GetSkill(skill_id) > 0) && CanHaveSkill(skill_id)); } -bool Client::CanHaveSkill(EQEmu::skills::SkillType skill_id) const { - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF2 && class_ == BERSERKER && skill_id == EQEmu::skills::Skill1HPiercing) - skill_id = EQEmu::skills::Skill2HPiercing; +bool Client::CanHaveSkill(EQ::skills::SkillType skill_id) const { + if (ClientVersion() < EQ::versions::ClientVersion::RoF2 && class_ == BERSERKER && skill_id == EQ::skills::Skill1HPiercing) + skill_id = EQ::skills::Skill2HPiercing; return(database.GetSkillCap(GetClass(), skill_id, RuleI(Character, MaxLevel)) > 0); //if you don't have it by max level, then odds are you never will? } -uint16 Client::MaxSkill(EQEmu::skills::SkillType skillid, uint16 class_, uint16 level) const { - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF2 && class_ == BERSERKER && skillid == EQEmu::skills::Skill1HPiercing) - skillid = EQEmu::skills::Skill2HPiercing; +uint16 Client::MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const { + if (ClientVersion() < EQ::versions::ClientVersion::RoF2 && class_ == BERSERKER && skillid == EQ::skills::Skill1HPiercing) + skillid = EQ::skills::Skill2HPiercing; return(database.GetSkillCap(class_, skillid, level)); } -uint8 Client::SkillTrainLevel(EQEmu::skills::SkillType skillid, uint16 class_) +uint8 Client::SkillTrainLevel(EQ::skills::SkillType skillid, uint16 class_) { - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF2 && class_ == BERSERKER && skillid == EQEmu::skills::Skill1HPiercing) - skillid = EQEmu::skills::Skill2HPiercing; + if (ClientVersion() < EQ::versions::ClientVersion::RoF2 && class_ == BERSERKER && skillid == EQ::skills::Skill1HPiercing) + skillid = EQ::skills::Skill2HPiercing; return(database.GetTrainLevel(class_, skillid, RuleI(Character, MaxLevel))); } -uint16 Client::GetMaxSkillAfterSpecializationRules(EQEmu::skills::SkillType skillid, uint16 maxSkill) +uint16 Client::GetMaxSkillAfterSpecializationRules(EQ::skills::SkillType skillid, uint16 maxSkill) { uint16 Result = maxSkill; @@ -2522,13 +2522,13 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(EQEmu::skills::SkillType skil uint16 MaxSpecializations = GetAA(aaSecondaryForte) ? 2 : 1; - if (skillid >= EQEmu::skills::SkillSpecializeAbjure && skillid <= EQEmu::skills::SkillSpecializeEvocation) + if (skillid >= EQ::skills::SkillSpecializeAbjure && skillid <= EQ::skills::SkillSpecializeEvocation) { bool HasPrimarySpecSkill = false; int NumberOfPrimarySpecSkills = 0; - for (int i = EQEmu::skills::SkillSpecializeAbjure; i <= EQEmu::skills::SkillSpecializeEvocation; ++i) + for (int i = EQ::skills::SkillSpecializeAbjure; i <= EQ::skills::SkillSpecializeEvocation; ++i) { if(m_pp.skills[i] > 50) { @@ -2585,8 +2585,8 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(EQEmu::skills::SkillType skil Message(Chat::Red, "Your spell casting specializations skills have been reset. " "Only %i primary specialization skill is allowed.", MaxSpecializations); - for (int i = EQEmu::skills::SkillSpecializeAbjure; i <= EQEmu::skills::SkillSpecializeEvocation; ++i) - SetSkill((EQEmu::skills::SkillType)i, 1); + for (int i = EQ::skills::SkillSpecializeAbjure; i <= EQ::skills::SkillSpecializeEvocation; ++i) + SetSkill((EQ::skills::SkillType)i, 1); Save(); @@ -2599,7 +2599,7 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(EQEmu::skills::SkillType skil Result += spellbonuses.RaiseSkillCap[skillid] + itembonuses.RaiseSkillCap[skillid] + aabonuses.RaiseSkillCap[skillid]; - if (skillid == EQEmu::skills::SkillType::SkillForage) + if (skillid == EQ::skills::SkillType::SkillForage) Result += aabonuses.GrantForage; return Result; @@ -2650,9 +2650,9 @@ bool Client::CheckAccess(int16 iDBLevel, int16 iDefaultLevel) { } void Client::MemorizeSpell(uint32 slot,uint32 spellid,uint32 scribing){ - if (slot < 0 || slot >= EQEmu::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize) + if (slot < 0 || slot >= EQ::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize) return; - if ((spellid < 3 || spellid > EQEmu::spells::DynamicLookup(ClientVersion(), GetGM())->SpellIdMax) && spellid != 0xFFFFFFFF) + if ((spellid < 3 || spellid > EQ::spells::DynamicLookup(ClientVersion(), GetGM())->SpellIdMax) && spellid != 0xFFFFFFFF) return; auto outapp = new EQApplicationPacket(OP_MemorizeSpell, sizeof(MemorizeSpell_Struct)); @@ -2681,7 +2681,7 @@ void Client::SetFeigned(bool in_feigned) { feigned=in_feigned; } -void Client::LogMerchant(Client* player, Mob* merchant, uint32 quantity, uint32 price, const EQEmu::ItemData* item, bool buying) +void Client::LogMerchant(Client* player, Mob* merchant, uint32 quantity, uint32 price, const EQ::ItemData* item, bool buying) { if(!player || !merchant || !item) return; @@ -2711,25 +2711,25 @@ void Client::LogMerchant(Client* player, Mob* merchant, uint32 quantity, uint32 } void Client::Disarm(Client* disarmer, int chance) { - int16 slot = EQEmu::invslot::SLOT_INVALID; - const EQEmu::ItemInstance *inst = this->GetInv().GetItem(EQEmu::invslot::slotPrimary); + int16 slot = EQ::invslot::SLOT_INVALID; + const EQ::ItemInstance *inst = this->GetInv().GetItem(EQ::invslot::slotPrimary); if (inst && inst->IsWeapon()) { - slot = EQEmu::invslot::slotPrimary; + slot = EQ::invslot::slotPrimary; } else { - inst = this->GetInv().GetItem(EQEmu::invslot::slotSecondary); + inst = this->GetInv().GetItem(EQ::invslot::slotSecondary); if (inst && inst->IsWeapon()) - slot = EQEmu::invslot::slotSecondary; + slot = EQ::invslot::slotSecondary; } - if (slot != EQEmu::invslot::SLOT_INVALID && inst->IsClassCommon()) { + if (slot != EQ::invslot::SLOT_INVALID && inst->IsClassCommon()) { // We have an item that can be disarmed. if (zone->random.Int(0, 1000) <= chance) { // Find a free inventory slot - int16 slot_id = EQEmu::invslot::SLOT_INVALID; - slot_id = m_inv.FindFreeSlot(false, true, inst->GetItem()->Size, (inst->GetItem()->ItemType == EQEmu::item::ItemTypeArrow)); - if (slot_id != EQEmu::invslot::SLOT_INVALID) + int16 slot_id = EQ::invslot::SLOT_INVALID; + slot_id = m_inv.FindFreeSlot(false, true, inst->GetItem()->Size, (inst->GetItem()->ItemType == EQ::item::ItemTypeArrow)); + if (slot_id != EQ::invslot::SLOT_INVALID) { - EQEmu::ItemInstance *InvItem = m_inv.PopItem(slot); + EQ::ItemInstance *InvItem = m_inv.PopItem(slot); if (InvItem) { // there should be no way it is not there, but check anyway EQApplicationPacket* outapp = new EQApplicationPacket(OP_MoveItem, sizeof(MoveItem_Struct)); MoveItem_Struct* mi = (MoveItem_Struct*)outapp->pBuffer; @@ -2742,22 +2742,22 @@ void Client::Disarm(Client* disarmer, int chance) { FastQueuePacket(&outapp); // this deletes item from the weapon slot on the client if (PutItemInInventory(slot_id, *InvItem, true)) database.SaveInventory(this->CharacterID(), NULL, slot); - auto matslot = (slot == EQEmu::invslot::slotPrimary ? EQEmu::textures::weaponPrimary : EQEmu::textures::weaponSecondary); - if (matslot != EQEmu::textures::materialInvalid) + auto matslot = (slot == EQ::invslot::slotPrimary ? EQ::textures::weaponPrimary : EQ::textures::weaponSecondary); + if (matslot != EQ::textures::materialInvalid) SendWearChange(matslot); } MessageString(Chat::Skills, DISARMED); if (disarmer != this) disarmer->MessageString(Chat::Skills, DISARM_SUCCESS, this->GetCleanName()); if (chance != 1000) - disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4); + disarmer->CheckIncreaseSkill(EQ::skills::SkillDisarm, nullptr, 4); CalcBonuses(); // CalcEnduranceWeightFactor(); return; } disarmer->MessageString(Chat::Skills, DISARM_FAILED); if (chance != 1000) - disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2); + disarmer->CheckIncreaseSkill(EQ::skills::SkillDisarm, nullptr, 2); return; } } @@ -2773,7 +2773,7 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail) // Start bind if (!bindwound_timer.Enabled()) { // make sure we actually have a bandage... and consume it. - int16 bslot = m_inv.HasItemByUse(EQEmu::item::ItemTypeBandage, 1, invWhereWorn | invWherePersonal); + int16 bslot = m_inv.HasItemByUse(EQ::item::ItemTypeBandage, 1, invWhereWorn | invWherePersonal); if (bslot == INVALID_INDEX) { bind_out->type = 3; QueuePacket(outapp); @@ -2839,7 +2839,7 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail) bind_out->type = 1; // Done QueuePacket(outapp); bind_out->type = 0; - CheckIncreaseSkill(EQEmu::skills::SkillBindWound, nullptr, 5); + CheckIncreaseSkill(EQ::skills::SkillBindWound, nullptr, 5); if (RuleB(Character, UseOldBindWound)) { int maxHPBonus = spellbonuses.MaxBindWound + itembonuses.MaxBindWound + @@ -2847,7 +2847,7 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail) int max_percent = 50 + maxHPBonus; - if (GetClass() == MONK && GetSkill(EQEmu::skills::SkillBindWound) > 200) { + if (GetClass() == MONK && GetSkill(EQ::skills::SkillBindWound) > 200) { max_percent = 70 + maxHPBonus; } @@ -2860,11 +2860,11 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail) // 0.120 per skill point, 0.60 per skill level, minimum 3 max 30 int bindhps = 3; - if (GetSkill(EQEmu::skills::SkillBindWound) > 200) { - bindhps += GetSkill(EQEmu::skills::SkillBindWound) * 4 / 10; + if (GetSkill(EQ::skills::SkillBindWound) > 200) { + bindhps += GetSkill(EQ::skills::SkillBindWound) * 4 / 10; } - else if (GetSkill(EQEmu::skills::SkillBindWound) >= 10) { - bindhps += GetSkill(EQEmu::skills::SkillBindWound) / 4; + else if (GetSkill(EQ::skills::SkillBindWound) >= 10) { + bindhps += GetSkill(EQ::skills::SkillBindWound) / 4; } // Implementation of aaMithanielsBinding is a guess (the multiplier) @@ -2899,7 +2899,7 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail) } else { int percent_base = 50; - if (GetRawSkill(EQEmu::skills::SkillBindWound) > 200) { + if (GetRawSkill(EQ::skills::SkillBindWound) > 200) { if ((GetClass() == MONK) || (GetClass() == BEASTLORD)) percent_base = 70; else if ((GetLevel() > 50) && ((GetClass() == WARRIOR) || (GetClass() == ROGUE) || (GetClass() == CLERIC))) @@ -2925,9 +2925,9 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail) if (bindmob->GetHP() < bindmob->GetMaxHP() && bindmob->GetHP() < max_hp) { int bindhps = 3; // base bind hp if (percent_base >= 70) - bindhps = (GetSkill(EQEmu::skills::SkillBindWound) * 4) / 10; // 8:5 skill-to-hp ratio - else if (GetSkill(EQEmu::skills::SkillBindWound) >= 12) - bindhps = GetSkill(EQEmu::skills::SkillBindWound) / 4; // 4:1 skill-to-hp ratio + bindhps = (GetSkill(EQ::skills::SkillBindWound) * 4) / 10; // 8:5 skill-to-hp ratio + else if (GetSkill(EQ::skills::SkillBindWound) >= 12) + bindhps = GetSkill(EQ::skills::SkillBindWound) / 4; // 4:1 skill-to-hp ratio int bonus_hp_percent = 0; if (percent_base >= 70) @@ -2983,10 +2983,10 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail) void Client::SetMaterial(int16 in_slot, uint32 item_id) { - const EQEmu::ItemData *item = database.GetItem(item_id); + const EQ::ItemData *item = database.GetItem(item_id); if (item && item->IsClassCommon()) { - uint8 matslot = EQEmu::InventoryProfile::CalcMaterialFromSlot(in_slot); - if (matslot != EQEmu::textures::materialInvalid) { + uint8 matslot = EQ::InventoryProfile::CalcMaterialFromSlot(in_slot); + if (matslot != EQ::textures::materialInvalid) { m_pp.item_material.Slot[matslot].Material = GetEquipmentMaterial(matslot); } } @@ -3070,7 +3070,7 @@ void Client::ServerFilter(SetServerFilter_Struct* filter){ Filter0(FilterMissedMe); Filter1(FilterDamageShields); - if (ClientVersionBit() & EQEmu::versions::maskSoDAndLater) { + if (ClientVersionBit() & EQ::versions::maskSoDAndLater) { if (filter->filters[FilterDOT] == 0) ClientFilters[FilterDOT] = FilterShow; else if (filter->filters[FilterDOT] == 1) @@ -3091,7 +3091,7 @@ void Client::ServerFilter(SetServerFilter_Struct* filter){ Filter1(FilterFocusEffects); Filter1(FilterPetSpells); - if (ClientVersionBit() & EQEmu::versions::maskSoDAndLater) { + if (ClientVersionBit() & EQ::versions::maskSoDAndLater) { if (filter->filters[FilterHealOverTime] == 0) ClientFilters[FilterHealOverTime] = FilterShow; // This is called 'Show Mine Only' in the clients, but functions the same as show @@ -3317,17 +3317,17 @@ void Client::Tell_StringID(uint32 string_id, const char *who, const char *messag } void Client::SetTint(int16 in_slot, uint32 color) { - EQEmu::textures::Tint_Struct new_color; + EQ::textures::Tint_Struct new_color; new_color.Color = color; SetTint(in_slot, new_color); database.SaveCharacterMaterialColor(this->CharacterID(), in_slot, color); } // Still need to reconcile bracer01 versus bracer02 -void Client::SetTint(int16 in_slot, EQEmu::textures::Tint_Struct& color) { +void Client::SetTint(int16 in_slot, EQ::textures::Tint_Struct& color) { - uint8 matslot = EQEmu::InventoryProfile::CalcMaterialFromSlot(in_slot); - if (matslot != EQEmu::textures::materialInvalid) + uint8 matslot = EQ::InventoryProfile::CalcMaterialFromSlot(in_slot); + if (matslot != EQ::textures::materialInvalid) { m_pp.item_tint.Slot[matslot].Color = color.Color; database.SaveCharacterMaterialColor(this->CharacterID(), in_slot, color.Color); @@ -3404,28 +3404,28 @@ void Client::LinkDead() uint8 Client::SlotConvert(uint8 slot,bool bracer){ uint8 slot2 = 0; // why are we returning MainCharm instead of INVALID_INDEX? (must be a pre-charm segment...) if(bracer) - return EQEmu::invslot::slotWrist2; + return EQ::invslot::slotWrist2; switch(slot) { - case EQEmu::textures::armorHead: - slot2 = EQEmu::invslot::slotHead; + case EQ::textures::armorHead: + slot2 = EQ::invslot::slotHead; break; - case EQEmu::textures::armorChest: - slot2 = EQEmu::invslot::slotChest; + case EQ::textures::armorChest: + slot2 = EQ::invslot::slotChest; break; - case EQEmu::textures::armorArms: - slot2 = EQEmu::invslot::slotArms; + case EQ::textures::armorArms: + slot2 = EQ::invslot::slotArms; break; - case EQEmu::textures::armorWrist: - slot2 = EQEmu::invslot::slotWrist1; + case EQ::textures::armorWrist: + slot2 = EQ::invslot::slotWrist1; break; - case EQEmu::textures::armorHands: - slot2 = EQEmu::invslot::slotHands; + case EQ::textures::armorHands: + slot2 = EQ::invslot::slotHands; break; - case EQEmu::textures::armorLegs: - slot2 = EQEmu::invslot::slotLegs; + case EQ::textures::armorLegs: + slot2 = EQ::invslot::slotLegs; break; - case EQEmu::textures::armorFeet: - slot2 = EQEmu::invslot::slotFeet; + case EQ::textures::armorFeet: + slot2 = EQ::invslot::slotFeet; break; } return slot2; @@ -3434,26 +3434,26 @@ uint8 Client::SlotConvert(uint8 slot,bool bracer){ uint8 Client::SlotConvert2(uint8 slot){ uint8 slot2 = 0; // same as above... switch(slot){ - case EQEmu::invslot::slotHead: - slot2 = EQEmu::textures::armorHead; + case EQ::invslot::slotHead: + slot2 = EQ::textures::armorHead; break; - case EQEmu::invslot::slotChest: - slot2 = EQEmu::textures::armorChest; + case EQ::invslot::slotChest: + slot2 = EQ::textures::armorChest; break; - case EQEmu::invslot::slotArms: - slot2 = EQEmu::textures::armorArms; + case EQ::invslot::slotArms: + slot2 = EQ::textures::armorArms; break; - case EQEmu::invslot::slotWrist1: - slot2 = EQEmu::textures::armorWrist; + case EQ::invslot::slotWrist1: + slot2 = EQ::textures::armorWrist; break; - case EQEmu::invslot::slotHands: - slot2 = EQEmu::textures::armorHands; + case EQ::invslot::slotHands: + slot2 = EQ::textures::armorHands; break; - case EQEmu::invslot::slotLegs: - slot2 = EQEmu::textures::armorLegs; + case EQ::invslot::slotLegs: + slot2 = EQ::textures::armorLegs; break; - case EQEmu::invslot::slotFeet: - slot2 = EQEmu::textures::armorFeet; + case EQ::invslot::slotFeet: + slot2 = EQ::textures::armorFeet; break; } return slot2; @@ -4024,13 +4024,13 @@ void Client::SendOPTranslocateConfirm(Mob *Caster, uint16 SpellID) { return; } -void Client::SendPickPocketResponse(Mob *from, uint32 amt, int type, const EQEmu::ItemData* item){ +void Client::SendPickPocketResponse(Mob *from, uint32 amt, int type, const EQ::ItemData* item){ auto outapp = new EQApplicationPacket(OP_PickPocket, sizeof(sPickPocket_Struct)); sPickPocket_Struct *pick_out = (sPickPocket_Struct *)outapp->pBuffer; pick_out->coin = amt; pick_out->from = GetID(); pick_out->to = from->GetID(); - pick_out->myskill = GetSkill(EQEmu::skills::SkillPickPockets); + pick_out->myskill = GetSkill(EQ::skills::SkillPickPockets); if ((type >= PickPocketPlatinum) && (type <= PickPocketCopper) && (amt == 0)) type = PickPocketFailed; @@ -4271,7 +4271,7 @@ bool Client::KeyRingCheck(uint32 item_id) void Client::KeyRingList() { Message(Chat::LightBlue,"Keys on Keyring:"); - const EQEmu::ItemData *item = nullptr; + const EQ::ItemData *item = nullptr; for (auto iter = keyring.begin(); iter != keyring.end(); ++iter) { if ((item = database.GetItem(*iter))!=nullptr) { Message(Chat::LightBlue,item->Name); @@ -4457,7 +4457,7 @@ bool Client::GroupFollow(Client* inviter) { group->UpdateGroupAAs(); //Invite the inviter into the group first.....dont ask - if (inviter->ClientVersion() < EQEmu::versions::ClientVersion::SoD) + if (inviter->ClientVersion() < EQ::versions::ClientVersion::SoD) { auto outapp = new EQApplicationPacket(OP_GroupUpdate, sizeof(GroupJoin_Struct)); GroupJoin_Struct* outgj = (GroupJoin_Struct*)outapp->pBuffer; @@ -4505,13 +4505,13 @@ bool Client::GroupFollow(Client* inviter) { return false; } - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD) + if (ClientVersion() >= EQ::versions::ClientVersion::SoD) { SendGroupJoinAcknowledge(); } // Temporary hack for SoD, as things seem to work quite differently - if (inviter->IsClient() && inviter->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) + if (inviter->IsClient() && inviter->ClientVersion() >= EQ::versions::ClientVersion::SoD) { database.RefreshGroupFromDB(inviter); } @@ -4539,43 +4539,43 @@ bool Client::GroupFollow(Client* inviter) { uint16 Client::GetPrimarySkillValue() { - EQEmu::skills::SkillType skill = EQEmu::skills::HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill - bool equiped = m_inv.GetItem(EQEmu::invslot::slotPrimary); + EQ::skills::SkillType skill = EQ::skills::HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill + bool equiped = m_inv.GetItem(EQ::invslot::slotPrimary); if (!equiped) - skill = EQEmu::skills::SkillHandtoHand; + skill = EQ::skills::SkillHandtoHand; else { - uint8 type = m_inv.GetItem(EQEmu::invslot::slotPrimary)->GetItem()->ItemType; //is this the best way to do this? + uint8 type = m_inv.GetItem(EQ::invslot::slotPrimary)->GetItem()->ItemType; //is this the best way to do this? switch (type) { - case EQEmu::item::ItemType1HSlash: // 1H Slashing - skill = EQEmu::skills::Skill1HSlashing; + case EQ::item::ItemType1HSlash: // 1H Slashing + skill = EQ::skills::Skill1HSlashing; break; - case EQEmu::item::ItemType2HSlash: // 2H Slashing - skill = EQEmu::skills::Skill2HSlashing; + case EQ::item::ItemType2HSlash: // 2H Slashing + skill = EQ::skills::Skill2HSlashing; break; - case EQEmu::item::ItemType1HPiercing: // Piercing - skill = EQEmu::skills::Skill1HPiercing; + case EQ::item::ItemType1HPiercing: // Piercing + skill = EQ::skills::Skill1HPiercing; break; - case EQEmu::item::ItemType1HBlunt: // 1H Blunt - skill = EQEmu::skills::Skill1HBlunt; + case EQ::item::ItemType1HBlunt: // 1H Blunt + skill = EQ::skills::Skill1HBlunt; break; - case EQEmu::item::ItemType2HBlunt: // 2H Blunt - skill = EQEmu::skills::Skill2HBlunt; + case EQ::item::ItemType2HBlunt: // 2H Blunt + skill = EQ::skills::Skill2HBlunt; break; - case EQEmu::item::ItemType2HPiercing: // 2H Piercing - if (IsClient() && CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::RoF2) - skill = EQEmu::skills::Skill1HPiercing; + case EQ::item::ItemType2HPiercing: // 2H Piercing + if (IsClient() && CastToClient()->ClientVersion() < EQ::versions::ClientVersion::RoF2) + skill = EQ::skills::Skill1HPiercing; else - skill = EQEmu::skills::Skill2HPiercing; + skill = EQ::skills::Skill2HPiercing; break; - case EQEmu::item::ItemTypeMartial: // Hand to Hand - skill = EQEmu::skills::SkillHandtoHand; + case EQ::item::ItemTypeMartial: // Hand to Hand + skill = EQ::skills::SkillHandtoHand; break; default: // All other types default to Hand to Hand - skill = EQEmu::skills::SkillHandtoHand; + skill = EQ::skills::SkillHandtoHand; break; } } @@ -4589,7 +4589,7 @@ uint32 Client::GetTotalATK() uint32 WornCap = itembonuses.ATK; if(IsClient()) { - AttackRating = ((WornCap * 1.342) + (GetSkill(EQEmu::skills::SkillOffense) * 1.345) + ((GetSTR() - 66) * 0.9) + (GetPrimarySkillValue() * 2.69)); + AttackRating = ((WornCap * 1.342) + (GetSkill(EQ::skills::SkillOffense) * 1.345) + ((GetSTR() - 66) * 0.9) + (GetPrimarySkillValue() * 2.69)); AttackRating += aabonuses.ATK + GroupLeadershipAAOffenseEnhancement(); if (AttackRating < 10) @@ -4607,7 +4607,7 @@ uint32 Client::GetATKRating() { uint32 AttackRating = 0; if(IsClient()) { - AttackRating = (GetSkill(EQEmu::skills::SkillOffense) * 1.345) + ((GetSTR() - 66) * 0.9) + (GetPrimarySkillValue() * 2.69); + AttackRating = (GetSkill(EQ::skills::SkillOffense) * 1.345) + ((GetSTR() - 66) * 0.9) + (GetPrimarySkillValue() * 2.69); if (AttackRating < 10) AttackRating = 10; @@ -4735,7 +4735,7 @@ void Client::IncrementAggroCount(bool raid_target) if (AggroCount == 1) m_pp.RestTimer = std::max(m_pp.RestTimer, rest_timer.GetRemainingTime() / 1000); - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoF) { auto outapp = new EQApplicationPacket(OP_RestState, 1); char *Buffer = (char *)outapp->pBuffer; VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0x01); @@ -4766,7 +4766,7 @@ void Client::DecrementAggroCount() rest_timer.Start(m_pp.RestTimer * 1000); - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoF) { auto outapp = new EQApplicationPacket(OP_RestState, 5); char *Buffer = (char *)outapp->pBuffer; VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0x00); @@ -4794,7 +4794,7 @@ void Client::UpdateRestTimer(uint32 new_timer) } else { // if we're not aggro, we need to check if current timer needs updating if (rest_timer.GetRemainingTime() / 1000 < new_timer) { rest_timer.Start(new_timer * 1000); - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoF) { auto outapp = new EQApplicationPacket(OP_RestState, 5); char *Buffer = (char *)outapp->pBuffer; VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0x00); @@ -4965,7 +4965,7 @@ void Client::HandleLDoNOpen(NPC *target) if(target->GetLDoNTrapSpellID() != 0) { MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2); - target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff); + target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQ::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff); target->SetLDoNTrapSpellID(0); target->SetLDoNTrapped(false); target->SetLDoNTrapDetected(false); @@ -5001,7 +5001,7 @@ void Client::HandleLDoNOpen(NPC *target) AddEXP(target->GetLevel()*target->GetLevel()*2625/10, GetLevelCon(target->GetLevel())); } } - target->Death(this, 0, SPELL_UNKNOWN, EQEmu::skills::SkillHandtoHand); + target->Death(this, 0, SPELL_UNKNOWN, EQ::skills::SkillHandtoHand); } } } @@ -5087,7 +5087,7 @@ void Client::HandleLDoNDisarm(NPC *target, uint16 skill, uint8 type) break; case -1: MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2); - target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff); + target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQ::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff); target->SetLDoNTrapSpellID(0); target->SetLDoNTrapped(false); target->SetLDoNTrapDetected(false); @@ -5106,7 +5106,7 @@ void Client::HandleLDoNPickLock(NPC *target, uint16 skill, uint8 type) if(target->IsLDoNTrapped()) { MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2); - target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff); + target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQ::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff); target->SetLDoNTrapSpellID(0); target->SetLDoNTrapped(false); target->SetLDoNTrapDetected(false); @@ -5314,14 +5314,14 @@ void Client::ShowSkillsWindow() { const char *WindowTitle = "Skills"; std::string WindowText; - std::map Skills = EQEmu::skills::GetSkillTypeMap(); + std::map Skills = EQ::skills::GetSkillTypeMap(); - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF2) - Skills[EQEmu::skills::Skill1HPiercing] = "Piercing"; + if (ClientVersion() < EQ::versions::ClientVersion::RoF2) + Skills[EQ::skills::Skill1HPiercing] = "Piercing"; // print out all available skills for (auto skills_iter : Skills) { - if (skills_iter.first == EQEmu::skills::Skill2HPiercing && ClientVersion() < EQEmu::versions::ClientVersion::RoF2) + if (skills_iter.first == EQ::skills::Skill2HPiercing && ClientVersion() < EQ::versions::ClientVersion::RoF2) continue; if (!GetSkill(skills_iter.first) && !MaxSkill(skills_iter.first)) continue; @@ -5407,8 +5407,8 @@ bool Client::TryReward(uint32 claim_id) // save uint32 free_slot = 0xFFFFFFFF; - for (int i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::GENERAL_END; ++i) { - EQEmu::ItemInstance *item = GetInv().GetItem(i); + for (int i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::GENERAL_END; ++i) { + EQ::ItemInstance *item = GetInv().GetItem(i); if (!item) { free_slot = i; break; @@ -5454,7 +5454,7 @@ bool Client::TryReward(uint32 claim_id) } auto &ivr = (*iter); - EQEmu::ItemInstance *claim = database.CreateItem(ivr.items[0].item_id, ivr.items[0].charges); + EQ::ItemInstance *claim = database.CreateItem(ivr.items[0].item_id, ivr.items[0].charges); if (!claim) { Save(); return true; @@ -5464,7 +5464,7 @@ bool Client::TryReward(uint32 claim_id) for (int y = 1; y < 8; y++) if (ivr.items[y].item_id && claim->GetItem()->ItemClass == 1) { - EQEmu::ItemInstance *item_temp = database.CreateItem(ivr.items[y].item_id, ivr.items[y].charges); + EQ::ItemInstance *item_temp = database.CreateItem(ivr.items[y].item_id, ivr.items[y].charges); if (item_temp) { if (CheckLoreConflict(item_temp->GetItem())) { lore_conflict = true; @@ -5644,7 +5644,7 @@ void Client::SuspendMinion() memset(&m_suspendedminion, 0, sizeof(struct PetInfo)); // TODO: These pet command states need to be synced ... // Will just fix them for now - if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) { + if (m_ClientVersionBit & EQ::versions::maskUFAndLater) { SetPetCommandState(PET_BUTTON_SIT, 0); SetPetCommandState(PET_BUTTON_STOP, 0); SetPetCommandState(PET_BUTTON_REGROUP, 0); @@ -5744,10 +5744,10 @@ void Client::ProcessInspectRequest(Client* requestee, Client* requester) { insr->TargetID = requester->GetID(); insr->playerid = requestee->GetID(); - const EQEmu::ItemData* item = nullptr; - const EQEmu::ItemInstance* inst = nullptr; + const EQ::ItemData* item = nullptr; + const EQ::ItemInstance* inst = nullptr; int ornamentationAugtype = RuleI(Character, OrnamentationAugmentType); - for(int16 L = EQEmu::invslot::EQUIPMENT_BEGIN; L <= EQEmu::invslot::EQUIPMENT_END; L++) { + for(int16 L = EQ::invslot::EQUIPMENT_BEGIN; L <= EQ::invslot::EQUIPMENT_END; L++) { inst = requestee->GetInv().GetItem(L); if(inst) { @@ -5755,7 +5755,7 @@ void Client::ProcessInspectRequest(Client* requestee, Client* requester) { if(item) { strcpy(insr->itemnames[L], item->Name); - const EQEmu::ItemData *aug_item = nullptr; + const EQ::ItemData *aug_item = nullptr; if (inst->GetOrnamentationAug(ornamentationAugtype)) inst->GetOrnamentationAug(ornamentationAugtype)->GetItem(); @@ -6275,27 +6275,27 @@ void Client::ConsentCorpses(std::string consent_name, bool deny) scs->permission = deny ? 0 : 1; scs->zone_id = zone->GetZoneID(); scs->instance_id = zone->GetInstanceID(); - scs->consent_type = EQEmu::consent::Normal; + scs->consent_type = EQ::consent::Normal; scs->consent_id = 0; if (strcasecmp(scs->grantname, "group") == 0) { if (!deny) { Group* grp = GetGroup(); scs->consent_id = grp ? grp->GetID() : 0; } - scs->consent_type = EQEmu::consent::Group; + scs->consent_type = EQ::consent::Group; } else if (strcasecmp(scs->grantname, "raid") == 0) { if (!deny) { Raid* raid = GetRaid(); scs->consent_id = raid ? raid->GetID() : 0; } - scs->consent_type = EQEmu::consent::Raid; + scs->consent_type = EQ::consent::Raid; } else if (strcasecmp(scs->grantname, "guild") == 0) { if (!deny) { scs->consent_id = GuildID(); } - scs->consent_type = EQEmu::consent::Guild; + scs->consent_type = EQ::consent::Guild; // update all corpses in db so buried/unloaded corpses see new consent id database.UpdateCharacterCorpseConsent(CharacterID(), scs->consent_id); } @@ -6352,8 +6352,8 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid made_npc->Corrup = GetCorrup(); made_npc->PhR = GetPhR(); // looks - made_npc->texture = GetEquipmentMaterial(EQEmu::textures::armorChest); - made_npc->helmtexture = GetEquipmentMaterial(EQEmu::textures::armorHead); + made_npc->texture = GetEquipmentMaterial(EQ::textures::armorChest); + made_npc->helmtexture = GetEquipmentMaterial(EQ::textures::armorHead); made_npc->haircolor = GetHairColor(); made_npc->beardcolor = GetBeardColor(); made_npc->eyecolor1 = GetEyeColor1(); @@ -6364,9 +6364,9 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid made_npc->drakkin_heritage = GetDrakkinHeritage(); made_npc->drakkin_tattoo = GetDrakkinTattoo(); made_npc->drakkin_details = GetDrakkinDetails(); - made_npc->d_melee_texture1 = GetEquipmentMaterial(EQEmu::textures::weaponPrimary); - made_npc->d_melee_texture2 = GetEquipmentMaterial(EQEmu::textures::weaponSecondary); - for (int i = EQEmu::textures::textureBegin; i <= EQEmu::textures::LastTexture; i++) { + made_npc->d_melee_texture1 = GetEquipmentMaterial(EQ::textures::weaponPrimary); + made_npc->d_melee_texture2 = GetEquipmentMaterial(EQ::textures::weaponSecondary); + for (int i = EQ::textures::textureBegin; i <= EQ::textures::LastTexture; i++) { made_npc->armor_tint.Slot[i].Color = GetEquipmentColor(i); } made_npc->loottable_id = 0; @@ -6828,7 +6828,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) }; std::string skill_mods = ""; - for (int j = 0; j <= EQEmu::skills::HIGHEST_SKILL; j++) { + for (int j = 0; j <= EQ::skills::HIGHEST_SKILL; j++) { if(itembonuses.skillmod[j] > 0) skill_mods += indP + skill_list[j] + " : +" + itoa(itembonuses.skillmod[j]) + "%
"; else if(itembonuses.skillmod[j] < 0) @@ -6836,7 +6836,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) } std::string skill_dmgs = ""; - for (int j = 0; j <= EQEmu::skills::HIGHEST_SKILL; j++) { + for (int j = 0; j <= EQ::skills::HIGHEST_SKILL; j++) { if((itembonuses.SkillDamageAmount[j] + spellbonuses.SkillDamageAmount[j]) > 0) skill_dmgs += indP + skill_list[j] + " : +" + itoa(itembonuses.SkillDamageAmount[j] + spellbonuses.SkillDamageAmount[j]) + "
"; else if((itembonuses.SkillDamageAmount[j] + spellbonuses.SkillDamageAmount[j]) < 0) @@ -6869,30 +6869,30 @@ void Client::SendStatsWindow(Client* client, bool use_window) indP + "Wind: " + itoa(GetWindMod()) + "
"; } - EQEmu::skills::SkillType skill = EQEmu::skills::SkillHandtoHand; - auto *inst = GetInv().GetItem(EQEmu::invslot::slotPrimary); + EQ::skills::SkillType skill = EQ::skills::SkillHandtoHand; + auto *inst = GetInv().GetItem(EQ::invslot::slotPrimary); if (inst && inst->IsClassCommon()) { switch (inst->GetItem()->ItemType) { - case EQEmu::item::ItemType1HSlash: - skill = EQEmu::skills::Skill1HSlashing; + case EQ::item::ItemType1HSlash: + skill = EQ::skills::Skill1HSlashing; break; - case EQEmu::item::ItemType2HSlash: - skill = EQEmu::skills::Skill2HSlashing; + case EQ::item::ItemType2HSlash: + skill = EQ::skills::Skill2HSlashing; break; - case EQEmu::item::ItemType1HPiercing: - skill = EQEmu::skills::Skill1HPiercing; + case EQ::item::ItemType1HPiercing: + skill = EQ::skills::Skill1HPiercing; break; - case EQEmu::item::ItemType1HBlunt: - skill = EQEmu::skills::Skill1HBlunt; + case EQ::item::ItemType1HBlunt: + skill = EQ::skills::Skill1HBlunt; break; - case EQEmu::item::ItemType2HBlunt: - skill = EQEmu::skills::Skill2HBlunt; + case EQ::item::ItemType2HBlunt: + skill = EQ::skills::Skill2HBlunt; break; - case EQEmu::item::ItemType2HPiercing: - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF2) - skill = EQEmu::skills::Skill1HPiercing; + case EQ::item::ItemType2HPiercing: + if (ClientVersion() < EQ::versions::ClientVersion::RoF2) + skill = EQ::skills::Skill1HPiercing; else - skill = EQEmu::skills::Skill2HPiercing; + skill = EQ::skills::Skill2HPiercing; break; default: break; @@ -6934,7 +6934,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) if(use_window) { if(final_stats.size() < 4096) { - uint32 Buttons = (client->ClientVersion() < EQEmu::versions::ClientVersion::SoD) ? 0 : 1; + uint32 Buttons = (client->ClientVersion() < EQ::versions::ClientVersion::SoD) ? 0 : 1; client->SendWindow(0, POPUPID_UPDATE_SHOWSTATSWINDOW, Buttons, "Cancel", "Update", 0, 1, this, "", "%s", final_stats.c_str()); goto Extra_Info; } @@ -6972,7 +6972,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) } void Client::SendAltCurrencies() { - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoF) { uint32 count = zone->AlternateCurrencies.size(); if(count == 0) { return; @@ -6988,7 +6988,7 @@ void Client::SendAltCurrencies() { uint32 i = 0; auto iter = zone->AlternateCurrencies.begin(); while(iter != zone->AlternateCurrencies.end()) { - const EQEmu::ItemData* item = database.GetItem((*iter).item_id); + const EQ::ItemData* item = database.GetItem((*iter).item_id); altc->entries[i].currency_number = (*iter).id; altc->entries[i].unknown00 = 1; altc->entries[i].currency_number2 = (*iter).id; @@ -7597,7 +7597,7 @@ void Client::SendMercPersonalInfo() if(mercData) { - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { if (mercCount > 0) { @@ -7710,13 +7710,13 @@ void Client::SendClearMercInfo() void Client::DuplicateLoreMessage(uint32 ItemID) { - if (!(m_ClientVersionBit & EQEmu::versions::maskRoFAndLater)) + if (!(m_ClientVersionBit & EQ::versions::maskRoFAndLater)) { MessageString(Chat::White, PICK_LORE); return; } - const EQEmu::ItemData *item = database.GetItem(ItemID); + const EQ::ItemData *item = database.GetItem(ItemID); if(!item) return; @@ -7743,7 +7743,7 @@ void Client::GarbleMessage(char *message, uint8 variance) for (size_t i = 0; i < strlen(message); i++) { // Client expects hex values inside of a text link body if (message[i] == delimiter) { - if (!(delimiter_count & 1)) { i += EQEmu::constants::SAY_LINK_BODY_SIZE; } + if (!(delimiter_count & 1)) { i += EQ::constants::SAY_LINK_BODY_SIZE; } ++delimiter_count; continue; } @@ -8184,12 +8184,12 @@ void Client::TickItemCheck() if(zone->tick_items.empty()) { return; } //Scan equip, general, cursor slots for items - for (i = EQEmu::invslot::POSSESSIONS_BEGIN; i <= EQEmu::invslot::POSSESSIONS_END; i++) + for (i = EQ::invslot::POSSESSIONS_BEGIN; i <= EQ::invslot::POSSESSIONS_END; i++) { TryItemTick(i); } //Scan bags - for (i = EQEmu::invbag::GENERAL_BAGS_BEGIN; i <= EQEmu::invbag::CURSOR_BAG_END; i++) + for (i = EQ::invbag::GENERAL_BAGS_BEGIN; i <= EQ::invbag::CURSOR_BAG_END; i++) { TryItemTick(i); } @@ -8198,26 +8198,26 @@ void Client::TickItemCheck() void Client::TryItemTick(int slot) { int iid = 0; - const EQEmu::ItemInstance* inst = m_inv[slot]; + const EQ::ItemInstance* inst = m_inv[slot]; if(inst == 0) { return; } iid = inst->GetID(); if(zone->tick_items.count(iid) > 0) { - if (GetLevel() >= zone->tick_items[iid].level && zone->random.Int(0, 100) >= (100 - zone->tick_items[iid].chance) && (zone->tick_items[iid].bagslot || slot <= EQEmu::invslot::EQUIPMENT_END)) + if (GetLevel() >= zone->tick_items[iid].level && zone->random.Int(0, 100) >= (100 - zone->tick_items[iid].chance) && (zone->tick_items[iid].bagslot || slot <= EQ::invslot::EQUIPMENT_END)) { - EQEmu::ItemInstance* e_inst = (EQEmu::ItemInstance*)inst; + EQ::ItemInstance* e_inst = (EQ::ItemInstance*)inst; parse->EventItem(EVENT_ITEM_TICK, this, e_inst, nullptr, "", slot); } } //Only look at augs in main inventory - if (slot > EQEmu::invslot::EQUIPMENT_END) { return; } + if (slot > EQ::invslot::EQUIPMENT_END) { return; } - for (int x = EQEmu::invaug::SOCKET_BEGIN; x <= EQEmu::invaug::SOCKET_END; ++x) + for (int x = EQ::invaug::SOCKET_BEGIN; x <= EQ::invaug::SOCKET_END; ++x) { - EQEmu::ItemInstance * a_inst = inst->GetAugment(x); + EQ::ItemInstance * a_inst = inst->GetAugment(x); if(!a_inst) { continue; } iid = a_inst->GetID(); @@ -8226,7 +8226,7 @@ void Client::TryItemTick(int slot) { if( GetLevel() >= zone->tick_items[iid].level && zone->random.Int(0, 100) >= (100 - zone->tick_items[iid].chance) ) { - EQEmu::ItemInstance* e_inst = (EQEmu::ItemInstance*)a_inst; + EQ::ItemInstance* e_inst = (EQ::ItemInstance*)a_inst; parse->EventItem(EVENT_ITEM_TICK, this, e_inst, nullptr, "", slot); } } @@ -8236,11 +8236,11 @@ void Client::TryItemTick(int slot) void Client::ItemTimerCheck() { int i; - for (i = EQEmu::invslot::POSSESSIONS_BEGIN; i <= EQEmu::invslot::POSSESSIONS_END; i++) + for (i = EQ::invslot::POSSESSIONS_BEGIN; i <= EQ::invslot::POSSESSIONS_END; i++) { TryItemTimer(i); } - for (i = EQEmu::invbag::GENERAL_BAGS_BEGIN; i <= EQEmu::invbag::CURSOR_BAG_END; i++) + for (i = EQ::invbag::GENERAL_BAGS_BEGIN; i <= EQ::invbag::CURSOR_BAG_END; i++) { TryItemTimer(i); } @@ -8248,7 +8248,7 @@ void Client::ItemTimerCheck() void Client::TryItemTimer(int slot) { - EQEmu::ItemInstance* inst = m_inv.GetItem(slot); + EQ::ItemInstance* inst = m_inv.GetItem(slot); if(!inst) { return; } @@ -8262,13 +8262,13 @@ void Client::TryItemTimer(int slot) ++it_iter; } - if (slot > EQEmu::invslot::EQUIPMENT_END) { + if (slot > EQ::invslot::EQUIPMENT_END) { return; } - for (int x = EQEmu::invaug::SOCKET_BEGIN; x <= EQEmu::invaug::SOCKET_END; ++x) + for (int x = EQ::invaug::SOCKET_BEGIN; x <= EQ::invaug::SOCKET_END; ++x) { - EQEmu::ItemInstance * a_inst = inst->GetAugment(x); + EQ::ItemInstance * a_inst = inst->GetAugment(x); if(!a_inst) { continue; } @@ -8284,7 +8284,7 @@ void Client::TryItemTimer(int slot) } } -void Client::SendItemScale(EQEmu::ItemInstance *inst) { +void Client::SendItemScale(EQ::ItemInstance *inst) { int slot = m_inv.GetSlotByItemInst(inst); if(slot != -1) { inst->ScaleItem(); @@ -8438,7 +8438,7 @@ void Client::SetConsumption(int32 in_hunger, int32 in_thirst) safe_delete(outapp); } -void Client::Consume(const EQEmu::ItemData *item, uint8 type, int16 slot, bool auto_consume) +void Client::Consume(const EQ::ItemData *item, uint8 type, int16 slot, bool auto_consume) { if (!item) return; @@ -8450,7 +8450,7 @@ void Client::Consume(const EQEmu::ItemData *item, uint8 type, int16 slot, bool a if (increase < 0) // wasn't food? oh well return; - if (type == EQEmu::item::ItemTypeFood) { + if (type == EQ::item::ItemTypeFood) { increase = mod_food_value(item, increase); if (increase < 0) @@ -8552,13 +8552,13 @@ void Client::ShowNumHits() int Client::GetQuiverHaste(int delay) { - const EQEmu::ItemInstance *pi = nullptr; - for (int r = EQEmu::invslot::GENERAL_BEGIN; r <= EQEmu::invslot::GENERAL_END; r++) { + const EQ::ItemInstance *pi = nullptr; + for (int r = EQ::invslot::GENERAL_BEGIN; r <= EQ::invslot::GENERAL_END; r++) { pi = GetInv().GetItem(r); - if (pi && pi->IsClassBag() && pi->GetItem()->BagType == EQEmu::item::BagTypeQuiver && + if (pi && pi->IsClassBag() && pi->GetItem()->BagType == EQ::item::BagTypeQuiver && pi->GetItem()->BagWR > 0) break; - if (r == EQEmu::invslot::GENERAL_END) + if (r == EQ::invslot::GENERAL_END) // we will get here if we don't find a valid quiver return 0; } @@ -8598,7 +8598,7 @@ void Client::QuestReward(Mob* target, uint32 copper, uint32 silver, uint32 gold, AddMoneyToPP(copper, silver, gold, platinum, false); if (itemid > 0) - SummonItem(itemid, 0, 0, 0, 0, 0, 0, false, EQEmu::invslot::slotCursor); + SummonItem(itemid, 0, 0, 0, 0, 0, 0, false, EQ::invslot::slotCursor); if (faction) { @@ -8634,7 +8634,7 @@ void Client::QuestReward(Mob* target, const QuestReward_Struct &reward, bool fac for (int i = 0; i < QUESTREWARD_COUNT; ++i) if (reward.item_id[i] > 0) - SummonItem(reward.item_id[i], 0, 0, 0, 0, 0, 0, false, EQEmu::invslot::slotCursor); + SummonItem(reward.item_id[i], 0, 0, 0, 0, 0, 0, false, EQ::invslot::slotCursor); if (faction) { @@ -9168,19 +9168,19 @@ void Client::SetDevToolsWindowEnabled(bool in_dev_tools_window_enabled) */ void Client::SetPrimaryWeaponOrnamentation(uint32 model_id) { - auto primary_item = m_inv.GetItem(EQEmu::invslot::slotPrimary); + auto primary_item = m_inv.GetItem(EQ::invslot::slotPrimary); if (primary_item) { database.QueryDatabase( StringFormat( "UPDATE `inventory` SET `ornamentidfile` = %i WHERE `charid` = %i AND `slotid` = %i", model_id, character_id, - EQEmu::invslot::slotPrimary + EQ::invslot::slotPrimary )); primary_item->SetOrnamentationIDFile(model_id); - SendItemPacket(EQEmu::invslot::slotPrimary, primary_item, ItemPacketTrade); - WearChange(EQEmu::textures::weaponPrimary, static_cast(model_id), 0); + SendItemPacket(EQ::invslot::slotPrimary, primary_item, ItemPacketTrade); + WearChange(EQ::textures::weaponPrimary, static_cast(model_id), 0); Message(Chat::Yellow, "Your primary weapon appearance has been modified"); } @@ -9191,19 +9191,19 @@ void Client::SetPrimaryWeaponOrnamentation(uint32 model_id) */ void Client::SetSecondaryWeaponOrnamentation(uint32 model_id) { - auto secondary_item = m_inv.GetItem(EQEmu::invslot::slotSecondary); + auto secondary_item = m_inv.GetItem(EQ::invslot::slotSecondary); if (secondary_item) { database.QueryDatabase( StringFormat( "UPDATE `inventory` SET `ornamentidfile` = %i WHERE `charid` = %i AND `slotid` = %i", model_id, character_id, - EQEmu::invslot::slotSecondary + EQ::invslot::slotSecondary )); secondary_item->SetOrnamentationIDFile(model_id); - SendItemPacket(EQEmu::invslot::slotSecondary, secondary_item, ItemPacketTrade); - WearChange(EQEmu::textures::weaponSecondary, static_cast(model_id), 0); + SendItemPacket(EQ::invslot::slotSecondary, secondary_item, ItemPacketTrade); + WearChange(EQ::textures::weaponSecondary, static_cast(model_id), 0); Message(Chat::Yellow, "Your secondary weapon appearance has been modified"); } diff --git a/zone/client.h b/zone/client.h index be842ff50..4253e6643 100644 --- a/zone/client.h +++ b/zone/client.h @@ -29,7 +29,7 @@ class Seperator; class ServerPacket; enum WaterRegionType : int; -namespace EQEmu +namespace EQ { struct ItemData; } @@ -240,9 +240,9 @@ public: bool GotoPlayer(std::string player_name); //abstract virtual function implementations required by base abstract class - virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill); - virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None); - virtual bool Attack(Mob* other, int Hand = EQEmu::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, + virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill); + virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None); + virtual bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr); virtual bool HasRaid() { return (GetRaid() ? true : false); } virtual bool HasGroup() { return (GetGroup() ? true : false); } @@ -270,12 +270,12 @@ public: void KeyRingList(); virtual bool IsClient() const { return true; } void CompleteConnect(); - bool TryStacking(EQEmu::ItemInstance* item, uint8 type = ItemPacketTrade, bool try_worn = true, bool try_cursor = true); + bool TryStacking(EQ::ItemInstance* item, uint8 type = ItemPacketTrade, bool try_worn = true, bool try_cursor = true); void SendTraderPacket(Client* trader, uint32 Unknown72 = 51); void SendBuyerPacket(Client* Buyer); GetItems_Struct* GetTraderItems(); void SendBazaarWelcome(); - void DyeArmor(EQEmu::TintProfile* dye); + void DyeArmor(EQ::TintProfile* dye); uint8 SlotConvert(uint8 slot,bool bracer=false); void MessageString(uint32 type, uint32 string_id, uint32 distance = 0); void MessageString(uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0); @@ -293,7 +293,7 @@ public: void SendTraderItem(uint32 item_id,uint16 quantity); uint16 FindTraderItem(int32 SerialNumber,uint16 Quantity); uint32 FindTraderItemSerialNumber(int32 ItemID); - EQEmu::ItemInstance* FindTraderItemBySerialNumber(int32 SerialNumber); + EQ::ItemInstance* FindTraderItemBySerialNumber(int32 SerialNumber); void FindAndNukeTraderItem(int32 item_id,uint16 quantity,Client* customer,uint16 traderslot); void NukeTraderItem(uint16 slot, int16 charges, uint16 quantity, Client* customer, uint16 traderslot, int32 uniqueid, int32 itemid = 0); void ReturnTraderReq(const EQApplicationPacket* app,int16 traderitemcharges, uint32 itemid = 0); @@ -316,7 +316,7 @@ public: bool ShouldISpawnFor(Client *c) { return !GMHideMe(c) && !IsHoveringForRespawn(); } virtual bool Process(); void ProcessPackets(); - void LogMerchant(Client* player, Mob* merchant, uint32 quantity, uint32 price, const EQEmu::ItemData* item, bool buying); + void LogMerchant(Client* player, Mob* merchant, uint32 quantity, uint32 price, const EQ::ItemData* item, bool buying); void QueuePacket(const EQApplicationPacket* app, bool ack_req = true, CLIENT_CONN_STATUS = CLIENT_CONNECTINGALL, eqFilterType filter=FilterNone); void FastQueuePacket(EQApplicationPacket** app, bool ack_req = true, CLIENT_CONN_STATUS = CLIENT_CONNECTINGALL); void ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_skill, const char* orig_message, const char* targetname=nullptr); @@ -326,9 +326,9 @@ public: void VoiceMacroReceived(uint32 Type, char *Target, uint32 MacroNumber); void SendSound(); void LearnRecipe(uint32 recipeID); - bool CanIncreaseTradeskill(EQEmu::skills::SkillType tradeskill); + bool CanIncreaseTradeskill(EQ::skills::SkillType tradeskill); - EQApplicationPacket* ReturnItemPacket(int16 slot_id, const EQEmu::ItemInstance* inst, ItemPacketType packet_type); + EQApplicationPacket* ReturnItemPacket(int16 slot_id, const EQ::ItemInstance* inst, ItemPacketType packet_type); bool GetRevoked() const { return revoked; } void SetRevoked(bool rev) { revoked = rev; } @@ -360,8 +360,8 @@ public: inline uint8 GetAnon() const { return m_pp.anon; } inline PlayerProfile_Struct& GetPP() { return m_pp; } inline ExtendedProfile_Struct& GetEPP() { return m_epp; } - inline EQEmu::InventoryProfile& GetInv() { return m_inv; } - inline const EQEmu::InventoryProfile& GetInv() const { return m_inv; } + inline EQ::InventoryProfile& GetInv() { return m_inv; } + inline const EQ::InventoryProfile& GetInv() const { return m_inv; } inline PetInfo* GetPetInfo(uint16 pet) { return (pet==1)?&m_suspendedminion:&m_petinfo; } inline InspectMessage_Struct& GetInspectMessage() { return m_inspect_message; } inline const InspectMessage_Struct& GetInspectMessage() const { return m_inspect_message; } @@ -435,7 +435,7 @@ public: inline uint8 GetLanguageSkill(uint16 n) const { return m_pp.languages[n]; } - void SendPickPocketResponse(Mob *from, uint32 amt, int type, const EQEmu::ItemData* item = nullptr); + void SendPickPocketResponse(Mob *from, uint32 amt, int type, const EQ::ItemData* item = nullptr); inline const char* GetLastName() const { return lastname; } @@ -539,10 +539,10 @@ public: virtual int GetCurrentBuffSlots() const; virtual int GetCurrentSongSlots() const; virtual int GetCurrentDiscSlots() const { return 1; } - virtual int GetMaxBuffSlots() const { return EQEmu::spells::LONG_BUFFS; } - virtual int GetMaxSongSlots() const { return EQEmu::spells::SHORT_BUFFS; } - virtual int GetMaxDiscSlots() const { return EQEmu::spells::DISC_BUFFS; } - virtual int GetMaxTotalSlots() const { return EQEmu::spells::TOTAL_BUFFS; } + virtual int GetMaxBuffSlots() const { return EQ::spells::LONG_BUFFS; } + virtual int GetMaxSongSlots() const { return EQ::spells::SHORT_BUFFS; } + virtual int GetMaxDiscSlots() const { return EQ::spells::DISC_BUFFS; } + virtual int GetMaxTotalSlots() const { return EQ::spells::TOTAL_BUFFS; } virtual uint32 GetFirstBuffSlot(bool disc, bool song); virtual uint32 GetLastBuffSlot(bool disc, bool song); virtual void InitializeBuffSlots(); @@ -637,7 +637,7 @@ public: void AssignToInstance(uint16 instance_id); void RemoveFromInstance(uint16 instance_id); void WhoAll(); - bool CheckLoreConflict(const EQEmu::ItemData* item); + bool CheckLoreConflict(const EQ::ItemData* item); void ChangeLastName(const char* in_lastname); void GetGroupAAs(GroupLeadershipAA_Struct *into) const; void GetRaidAAs(RaidLeadershipAA_Struct *into) const; @@ -725,31 +725,31 @@ public: uint16 GetSkillPoints() { return m_pp.points;} void SetSkillPoints(int inp) { m_pp.points = inp;} - void IncreaseSkill(int skill_id, int value = 1) { if (skill_id <= EQEmu::skills::HIGHEST_SKILL) { m_pp.skills[skill_id] += value; } } + void IncreaseSkill(int skill_id, int value = 1) { if (skill_id <= EQ::skills::HIGHEST_SKILL) { m_pp.skills[skill_id] += value; } } void IncreaseLanguageSkill(int skill_id, int value = 1); - virtual uint16 GetSkill(EQEmu::skills::SkillType skill_id) const { if (skill_id <= EQEmu::skills::HIGHEST_SKILL) { return(itembonuses.skillmod[skill_id] > 0 ? (itembonuses.skillmodmax[skill_id] > 0 ? std::min(m_pp.skills[skill_id] + itembonuses.skillmodmax[skill_id], m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100) : m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100) : m_pp.skills[skill_id]); } return 0; } - uint32 GetRawSkill(EQEmu::skills::SkillType skill_id) const { if (skill_id <= EQEmu::skills::HIGHEST_SKILL) { return(m_pp.skills[skill_id]); } return 0; } - bool HasSkill(EQEmu::skills::SkillType skill_id) const; - bool CanHaveSkill(EQEmu::skills::SkillType skill_id) const; - void SetSkill(EQEmu::skills::SkillType skill_num, uint16 value); - void AddSkill(EQEmu::skills::SkillType skillid, uint16 value); + virtual uint16 GetSkill(EQ::skills::SkillType skill_id) const { if (skill_id <= EQ::skills::HIGHEST_SKILL) { return(itembonuses.skillmod[skill_id] > 0 ? (itembonuses.skillmodmax[skill_id] > 0 ? std::min(m_pp.skills[skill_id] + itembonuses.skillmodmax[skill_id], m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100) : m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100) : m_pp.skills[skill_id]); } return 0; } + uint32 GetRawSkill(EQ::skills::SkillType skill_id) const { if (skill_id <= EQ::skills::HIGHEST_SKILL) { return(m_pp.skills[skill_id]); } return 0; } + bool HasSkill(EQ::skills::SkillType skill_id) const; + bool CanHaveSkill(EQ::skills::SkillType skill_id) const; + void SetSkill(EQ::skills::SkillType skill_num, uint16 value); + void AddSkill(EQ::skills::SkillType skillid, uint16 value); void CheckSpecializeIncrease(uint16 spell_id); void CheckSongSkillIncrease(uint16 spell_id); - bool CheckIncreaseSkill(EQEmu::skills::SkillType skillid, Mob *against_who, int chancemodi = 0); + bool CheckIncreaseSkill(EQ::skills::SkillType skillid, Mob *against_who, int chancemodi = 0); void CheckLanguageSkillIncrease(uint8 langid, uint8 TeacherSkill); void SetLanguageSkill(int langid, int value); void SetHoTT(uint32 mobid); void ShowSkillsWindow(); void SendStatsWindow(Client* client, bool use_window); - uint16 MaxSkill(EQEmu::skills::SkillType skillid, uint16 class_, uint16 level) const; - inline uint16 MaxSkill(EQEmu::skills::SkillType skillid) const { return MaxSkill(skillid, GetClass(), GetLevel()); } - uint8 SkillTrainLevel(EQEmu::skills::SkillType skillid, uint16 class_); + uint16 MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const; + inline uint16 MaxSkill(EQ::skills::SkillType skillid) const { return MaxSkill(skillid, GetClass(), GetLevel()); } + uint8 SkillTrainLevel(EQ::skills::SkillType skillid, uint16 class_); void TradeskillSearchResults(const std::string &query, unsigned long objtype, unsigned long someid); void SendTradeskillDetails(uint32 recipe_id); bool TradeskillExecute(DBTradeskillRecipe_Struct *spec); - void CheckIncreaseTradeskill(int16 bonusstat, int16 stat_modifier, float skillup_modifier, uint16 success_modifier, EQEmu::skills::SkillType tradeskill); + void CheckIncreaseTradeskill(int16 bonusstat, int16 stat_modifier, float skillup_modifier, uint16 success_modifier, EQ::skills::SkillType tradeskill); void InitInnates(); void GMKill(); @@ -791,7 +791,7 @@ public: #endif uint32 GetEquippedItemFromTextureSlot(uint8 material_slot) const; // returns item id uint32 GetEquipmentColor(uint8 material_slot) const; - virtual void UpdateEquipmentLight() { m_Light.Type[EQEmu::lightsource::LightEquipment] = m_inv.FindBrightestLightType(); m_Light.Level[EQEmu::lightsource::LightEquipment] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightEquipment]); } + virtual void UpdateEquipmentLight() { m_Light.Type[EQ::lightsource::LightEquipment] = m_inv.FindBrightestLightType(); m_Light.Level[EQ::lightsource::LightEquipment] = EQ::lightsource::TypeToLevel(m_Light.Type[EQ::lightsource::LightEquipment]); } inline bool AutoSplitEnabled() { return m_pp.autosplit != 0; } inline bool AutoConsentGroupEnabled() const { return m_pp.groupAutoconsent != 0; } @@ -863,31 +863,31 @@ public: uint32 NukeItem(uint32 itemnum, uint8 where_to_check = (invWhereWorn | invWherePersonal | invWhereBank | invWhereSharedBank | invWhereTrading | invWhereCursor)); void SetTint(int16 slot_id, uint32 color); - void SetTint(int16 slot_id, EQEmu::textures::Tint_Struct& color); + void SetTint(int16 slot_id, EQ::textures::Tint_Struct& color); void SetMaterial(int16 slot_id, uint32 item_id); void Undye(); int32 GetItemIDAt(int16 slot_id); int32 GetAugmentIDAt(int16 slot_id, uint8 augslot); - bool PutItemInInventory(int16 slot_id, const EQEmu::ItemInstance& inst, bool client_update = false); - bool PushItemOnCursor(const EQEmu::ItemInstance& inst, bool client_update = false); + bool PutItemInInventory(int16 slot_id, const EQ::ItemInstance& inst, bool client_update = false); + bool PushItemOnCursor(const EQ::ItemInstance& inst, bool client_update = false); void SendCursorBuffer(); void DeleteItemInInventory(int16 slot_id, int8 quantity = 0, bool client_update = false, bool update_db = true); bool SwapItem(MoveItem_Struct* move_in); void SwapItemResync(MoveItem_Struct* move_slots); void QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call = false); - void PutLootInInventory(int16 slot_id, const EQEmu::ItemInstance &inst, ServerLootItem_Struct** bag_item_data = 0); - bool AutoPutLootInInventory(EQEmu::ItemInstance& inst, bool try_worn = false, bool try_cursor = true, ServerLootItem_Struct** bag_item_data = 0); - bool SummonItem(uint32 item_id, int16 charges = -1, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0, bool attuned = false, uint16 to_slot = EQEmu::invslot::slotCursor, uint32 ornament_icon = 0, uint32 ornament_idfile = 0, uint32 ornament_hero_model = 0); + void PutLootInInventory(int16 slot_id, const EQ::ItemInstance &inst, ServerLootItem_Struct** bag_item_data = 0); + bool AutoPutLootInInventory(EQ::ItemInstance& inst, bool try_worn = false, bool try_cursor = true, ServerLootItem_Struct** bag_item_data = 0); + bool SummonItem(uint32 item_id, int16 charges = -1, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0, bool attuned = false, uint16 to_slot = EQ::invslot::slotCursor, uint32 ornament_icon = 0, uint32 ornament_idfile = 0, uint32 ornament_hero_model = 0); void SetStats(uint8 type,int16 set_val); void IncStats(uint8 type,int16 increase_val); void DropItem(int16 slot_id, bool recurse = true); - void DropItemQS(EQEmu::ItemInstance* inst, bool pickup); + void DropItemQS(EQ::ItemInstance* inst, bool pickup); - int GetItemLinkHash(const EQEmu::ItemInstance* inst); // move to ItemData..or make use of the pre-calculated database field + int GetItemLinkHash(const EQ::ItemInstance* inst); // move to ItemData..or make use of the pre-calculated database field - void SendItemLink(const EQEmu::ItemInstance* inst, bool sendtoall=false); - void SendLootItemInPacket(const EQEmu::ItemInstance* inst, int16 slot_id); - void SendItemPacket(int16 slot_id, const EQEmu::ItemInstance* inst, ItemPacketType packet_type); + void SendItemLink(const EQ::ItemInstance* inst, bool sendtoall=false); + void SendLootItemInPacket(const EQ::ItemInstance* inst, int16 slot_id); + void SendItemPacket(int16 slot_id, const EQ::ItemInstance* inst, ItemPacketType packet_type); bool IsValidSlot(uint32 slot); bool IsBankSlot(uint32 slot); @@ -945,7 +945,7 @@ public: //Calculate vendor price modifier based on CHA: (reverse==selling) float CalcPriceMod(Mob* other = 0, bool reverse = false); void ResetTrade(); - void DropInst(const EQEmu::ItemInstance* inst); + void DropInst(const EQ::ItemInstance* inst); bool TrainDiscipline(uint32 itemid); void TrainDiscBySpellID(int32 spell_id); int GetDiscSlotBySpellID(int32 spellid); @@ -977,7 +977,7 @@ public: int GetNextAvailableSpellBookSlot(int starting_slot = 0); inline uint32 GetSpellByBookSlot(int book_slot) { return m_pp.spell_book[book_slot]; } inline bool HasSpellScribed(int spellid) { return (FindSpellBookSlotBySpellID(spellid) != -1 ? true : false); } - uint16 GetMaxSkillAfterSpecializationRules(EQEmu::skills::SkillType skillid, uint16 maxSkill); + uint16 GetMaxSkillAfterSpecializationRules(EQ::skills::SkillType skillid, uint16 maxSkill); void SendPopupToClient(const char *Title, const char *Text, uint32 PopupID = 0, uint32 Buttons = 0, uint32 Duration = 0); void SendFullPopup(const char *Title, const char *Text, uint32 PopupID = 0, uint32 NegativeID = 0, uint32 Buttons = 0, uint32 Duration = 0, const char *ButtonName0 = 0, const char *ButtonName1 = 0, uint32 SoundControls = 0); void SendWindow(uint32 PopupID, uint32 NegativeID, uint32 Buttons, const char *ButtonName0, const char *ButtonName1, uint32 Duration, int title_type, Client* target, const char *Title, const char *Text, ...); @@ -1008,7 +1008,7 @@ public: inline void UpdateTasksForItem(ActivityType Type, int ItemID, int Count=1) { if(taskstate) taskstate->UpdateTasksForItem(this, Type, ItemID, Count); } inline void UpdateTasksOnExplore(int ExploreID) { if(taskstate) taskstate->UpdateTasksOnExplore(this, ExploreID); } inline bool UpdateTasksOnSpeakWith(int NPCTypeID) { if(taskstate) return taskstate->UpdateTasksOnSpeakWith(this, NPCTypeID); else return false; } - inline bool UpdateTasksOnDeliver(std::list& Items, int Cash, int NPCTypeID) { if (taskstate) return taskstate->UpdateTasksOnDeliver(this, Items, Cash, NPCTypeID); else return false; } + inline bool UpdateTasksOnDeliver(std::list& Items, int Cash, int NPCTypeID) { if (taskstate) return taskstate->UpdateTasksOnDeliver(this, Items, Cash, NPCTypeID); else return false; } inline void TaskSetSelector(Mob *mob, int TaskSetID) { if(taskmanager) taskmanager->TaskSetSelector(this, taskstate, mob, TaskSetID); } inline void TaskQuestSetSelector(Mob *mob, int count, int *tasks) { if(taskmanager) taskmanager->TaskQuestSetSelector(this, taskstate, mob, count, tasks); } inline void EnableTask(int TaskCount, int *TaskList) { if(taskstate) taskstate->EnableTask(CharacterID(), TaskCount, TaskList); } @@ -1033,9 +1033,9 @@ public: inline int ActiveTasksInSet(int TaskSet) { return (taskstate ? taskstate->ActiveTasksInSet(TaskSet) :0); } inline int CompletedTasksInSet(int TaskSet) { return (taskstate ? taskstate->CompletedTasksInSet(TaskSet) :0); } - inline const EQEmu::versions::ClientVersion ClientVersion() const { return m_ClientVersion; } + inline const EQ::versions::ClientVersion ClientVersion() const { return m_ClientVersion; } inline const uint32 ClientVersionBit() const { return m_ClientVersionBit; } - inline void SetClientVersion(EQEmu::versions::ClientVersion client_version) { m_ClientVersion = client_version; } + inline void SetClientVersion(EQ::versions::ClientVersion client_version) { m_ClientVersion = client_version; } /** Adventure Stuff **/ void SendAdventureError(const char *error); @@ -1124,7 +1124,7 @@ public: inline bool GetPendingGuildInvitation() { return PendingGuildInvitation; } void LocateCorpse(); void SendTargetCommand(uint32 EntityID); - bool MoveItemToInventory(EQEmu::ItemInstance *BInst, bool UpdateClient = false); + bool MoveItemToInventory(EQ::ItemInstance *BInst, bool UpdateClient = false); void HandleRespawnFromHover(uint32 Option); bool IsHoveringForRespawn() { return RespawnFromHoverTimer.Enabled(); } std::list respawn_options; @@ -1153,7 +1153,7 @@ public: void HandleLFGuildResponse(ServerPacket *pack); void SendLFGuildStatus(); void SendGuildLFGuildStatus(); - inline bool XTargettingAvailable() const { return ((m_ClientVersionBit & EQEmu::versions::maskUFAndLater) && RuleB(Character, EnableXTargetting)); } + inline bool XTargettingAvailable() const { return ((m_ClientVersionBit & EQ::versions::maskUFAndLater) && RuleB(Character, EnableXTargetting)); } inline uint8 GetMaxXTargets() const { return MaxXTargets; } void SetMaxXTargets(uint8 NewMax); bool IsXTarget(const Mob *m) const; @@ -1177,7 +1177,7 @@ public: bool GroupFollow(Client* inviter); inline bool GetRunMode() const { return runmode; } - inline bool AggroMeterAvailable() const { return ((m_ClientVersionBit & EQEmu::versions::maskRoF2AndLater)) && RuleB(Character, EnableAggroMeter); } // RoF untested + inline bool AggroMeterAvailable() const { return ((m_ClientVersionBit & EQ::versions::maskRoF2AndLater)) && RuleB(Character, EnableAggroMeter); } // RoF untested inline void SetAggroMeterLock(int in) { m_aggrometer.set_lock_id(in); } void ProcessAggroMeter(); // builds packet and sends @@ -1229,7 +1229,7 @@ public: void TryItemTick(int slot); void ItemTimerCheck(); void TryItemTimer(int slot); - void SendItemScale(EQEmu::ItemInstance *inst); + void SendItemScale(EQ::ItemInstance *inst); int32 GetActSTR() { return( std::min(GetMaxSTR(), GetSTR()) ); } int32 GetActSTA() { return( std::min(GetMaxSTA(), GetSTA()) ); } @@ -1241,13 +1241,13 @@ public: void LoadAccountFlags(); void SetAccountFlag(std::string flag, std::string val); std::string GetAccountFlag(std::string flag); - float GetDamageMultiplier(EQEmu::skills::SkillType how_long_has_this_been_missing); - void Consume(const EQEmu::ItemData *item, uint8 type, int16 slot, bool auto_consume); + float GetDamageMultiplier(EQ::skills::SkillType how_long_has_this_been_missing); + void Consume(const EQ::ItemData *item, uint8 type, int16 slot, bool auto_consume); void PlayMP3(const char* fname); void ExpeditionSay(const char *str, int ExpID); - int mod_client_damage(int damage, EQEmu::skills::SkillType skillinuse, int hand, const EQEmu::ItemInstance* weapon, Mob* other); + int mod_client_damage(int damage, EQ::skills::SkillType skillinuse, int hand, const EQ::ItemInstance* weapon, Mob* other); bool mod_client_message(char* message, uint8 chan_num); - bool mod_can_increase_skill(EQEmu::skills::SkillType skillid, Mob* against_who); + bool mod_can_increase_skill(EQ::skills::SkillType skillid, Mob* against_who); int16 mod_increase_skill_chance(int16 chance, Mob* against_who); int mod_bindwound_percent(int max_percent, Mob* bindmob); int mod_bindwound_hp(int bindhps, Mob* bindmob); @@ -1257,16 +1257,16 @@ public: int16 mod_pet_power(int16 act_power, uint16 spell_id); float mod_tradeskill_chance(float chance, DBTradeskillRecipe_Struct *spec); float mod_tradeskill_skillup(float chance_stage2); - int32 mod_tribute_item_value(int32 pts, const EQEmu::ItemInstance* item); + int32 mod_tribute_item_value(int32 pts, const EQ::ItemInstance* item); void mod_client_death_npc(Mob* killerMob); void mod_client_death_duel(Mob* killerMob); void mod_client_death_env(); int32 mod_client_xp(int32 in_exp, NPC *npc); uint32 mod_client_xp_for_level(uint32 xp, uint16 check_level); int mod_client_haste_cap(int cap); - int mod_consume(EQEmu::ItemData *item, EQEmu::item::ItemType type, int change); - int mod_food_value(const EQEmu::ItemData *item, int change); - int mod_drink_value(const EQEmu::ItemData *item, int change); + int mod_consume(EQ::ItemData *item, EQ::item::ItemType type, int change); + int mod_food_value(const EQ::ItemData *item, int change); + int mod_drink_value(const EQ::ItemData *item, int change); void ShowNumHits(); // work around function for numhits not showing on buffs @@ -1309,8 +1309,8 @@ public: protected: friend class Mob; void CalcItemBonuses(StatBonuses* newbon); - void AddItemBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, bool isAug = false, bool isTribute = false, int rec_override = 0, bool ammo_slot_item = false); - void AdditiveWornBonuses(const EQEmu::ItemInstance *inst, StatBonuses* newbon, bool isAug = false); + void AddItemBonuses(const EQ::ItemInstance *inst, StatBonuses* newbon, bool isAug = false, bool isTribute = false, int rec_override = 0, bool ammo_slot_item = false); + void AdditiveWornBonuses(const EQ::ItemInstance *inst, StatBonuses* newbon, bool isAug = false); int CalcRecommendedLevelBonus(uint8 level, uint8 reclevel, int basestat); void CalcEdibleBonuses(StatBonuses* newbon); void ProcessItemCaps(); @@ -1352,7 +1352,7 @@ private: void OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 InstanceID, float x, float y, float z); void OPMemorizeSpell(const EQApplicationPacket *app); void OPMoveCoin(const EQApplicationPacket* app); - void MoveItemCharges(EQEmu::ItemInstance &from, int16 to_slot, uint8 type); + void MoveItemCharges(EQ::ItemInstance &from, int16 to_slot, uint8 type); void OPGMTraining(const EQApplicationPacket *app); void OPGMEndTraining(const EQApplicationPacket *app); void OPGMTrainSkill(const EQApplicationPacket *app); @@ -1466,7 +1466,7 @@ private: PlayerProfile_Struct m_pp; ExtendedProfile_Struct m_epp; - EQEmu::InventoryProfile m_inv; + EQ::InventoryProfile m_inv; Object* m_tradeskill_object; PetInfo m_petinfo; // current pet data, used while loading from and saving to DB PetInfo m_suspendedminion; // pet data for our suspended minion. @@ -1580,7 +1580,7 @@ private: Timer *GlobalChatLimiterTimer; //60 seconds uint32 AttemptedMessages; - EQEmu::versions::ClientVersion m_ClientVersion; + EQ::versions::ClientVersion m_ClientVersion; uint32 m_ClientVersionBit; int XPRate; @@ -1635,8 +1635,8 @@ private: bool interrogateinv_flag; // used to minimize log spamming by players - void InterrogateInventory_(bool errorcheck, Client* requester, int16 head, int16 index, const EQEmu::ItemInstance* inst, const EQEmu::ItemInstance* parent, bool log, bool silent, bool &error, int depth); - bool InterrogateInventory_error(int16 head, int16 index, const EQEmu::ItemInstance* inst, const EQEmu::ItemInstance* parent, int depth); + void InterrogateInventory_(bool errorcheck, Client* requester, int16 head, int16 index, const EQ::ItemInstance* inst, const EQ::ItemInstance* parent, bool log, bool silent, bool &error, int depth); + bool InterrogateInventory_error(int16 head, int16 index, const EQ::ItemInstance* inst, const EQ::ItemInstance* parent, int depth); int client_max_level; diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp index 255201090..ec01a00b5 100644 --- a/zone/client_mods.cpp +++ b/zone/client_mods.cpp @@ -44,7 +44,7 @@ int32 Client::GetMaxStat() const if (level < 61) { base = 255; } - else if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF) { + else if (ClientVersion() >= EQ::versions::ClientVersion::SoF) { base = 255 + 5 * (level - 60); } else if (level < 71) { @@ -482,7 +482,7 @@ uint32 Mob::GetClassLevelFactor() int32 Client::CalcBaseHP() { - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF && RuleB(Character, SoDClientUseSoDHPManaEnd)) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoF && RuleB(Character, SoDClientUseSoDHPManaEnd)) { int stats = GetSTA(); if (stats > 255) { stats = (stats - 255) / 2; @@ -558,8 +558,8 @@ int32 Client::GetRawItemAC() { int32 Total = 0; // this skips MainAmmo..add an '=' conditional if that slot is required (original behavior) - for (int16 slot_id = EQEmu::invslot::BONUS_BEGIN; slot_id <= EQEmu::invslot::BONUS_STAT_END; slot_id++) { - const EQEmu::ItemInstance* inst = m_inv[slot_id]; + for (int16 slot_id = EQ::invslot::BONUS_BEGIN; slot_id <= EQ::invslot::BONUS_STAT_END; slot_id++) { + const EQ::ItemInstance* inst = m_inv[slot_id]; if (inst && inst->IsClassCommon()) { Total += inst->GetItem()->AC; } @@ -613,7 +613,7 @@ int32 Client::CalcBaseMana() switch (GetCasterClass()) { case 'I': WisInt = GetINT(); - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF && RuleB(Character, SoDClientUseSoDHPManaEnd)) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoF && RuleB(Character, SoDClientUseSoDHPManaEnd)) { ConvertedWisInt = WisInt; int over200 = WisInt; if (WisInt > 100) { @@ -645,7 +645,7 @@ int32 Client::CalcBaseMana() break; case 'W': WisInt = GetWIS(); - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF && RuleB(Character, SoDClientUseSoDHPManaEnd)) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoF && RuleB(Character, SoDClientUseSoDHPManaEnd)) { ConvertedWisInt = WisInt; int over200 = WisInt; if (WisInt > 100) { @@ -696,8 +696,8 @@ int32 Client::CalcBaseManaRegen() uint8 clevel = GetLevel(); int32 regen = 0; if (IsSitting() || (GetHorseId() != 0)) { - if (HasSkill(EQEmu::skills::SkillMeditate)) { - regen = (((GetSkill(EQEmu::skills::SkillMeditate) / 10) + (clevel - (clevel / 4))) / 4) + 4; + if (HasSkill(EQ::skills::SkillMeditate)) { + regen = (((GetSkill(EQ::skills::SkillMeditate) / 10) + (clevel - (clevel / 4))) / 4) + 4; } else { regen = 2; @@ -723,7 +723,7 @@ int32 Client::CalcManaRegen(bool bCombat) // kind of weird to do it here w/e // client does some base medding regen for shrouds here if (GetClass() != BARD) { - auto skill = GetSkill(EQEmu::skills::SkillMeditate); + auto skill = GetSkill(EQ::skills::SkillMeditate); if (skill > 0) { regen++; if (skill > 1) @@ -787,11 +787,11 @@ int32 Client::CalcManaRegenCap() uint32 Client::CalcCurrentWeight() { - const EQEmu::ItemData* TempItem = nullptr; - EQEmu::ItemInstance* ins = nullptr; + const EQ::ItemData* TempItem = nullptr; + EQ::ItemInstance* ins = nullptr; uint32 Total = 0; int x; - for (x = EQEmu::invslot::POSSESSIONS_BEGIN; x <= EQEmu::invslot::POSSESSIONS_END; x++) { + for (x = EQ::invslot::POSSESSIONS_BEGIN; x <= EQ::invslot::POSSESSIONS_END; x++) { TempItem = 0; ins = GetInv().GetItem(x); if (ins) { @@ -801,7 +801,7 @@ uint32 Client::CalcCurrentWeight() Total += TempItem->Weight; } } - for (x = EQEmu::invbag::GENERAL_BAGS_BEGIN; x <= EQEmu::invbag::CURSOR_BAG_END; x++) { + for (x = EQ::invbag::GENERAL_BAGS_BEGIN; x <= EQ::invbag::CURSOR_BAG_END; x++) { int TmpWeight = 0; TempItem = 0; ins = GetInv().GetItem(x); @@ -814,14 +814,14 @@ uint32 Client::CalcCurrentWeight() if (TmpWeight > 0) { // this code indicates that weight redux bags can only be in the first general inventory slot to be effective... // is this correct? or can we scan for the highest weight redux and use that? (need client verifications) - int bagslot = EQEmu::invslot::slotGeneral1; + int bagslot = EQ::invslot::slotGeneral1; int reduction = 0; - for (int m = EQEmu::invbag::GENERAL_BAGS_BEGIN + EQEmu::invbag::SLOT_COUNT; m <= EQEmu::invbag::CURSOR_BAG_END; m += EQEmu::invbag::SLOT_COUNT) { + for (int m = EQ::invbag::GENERAL_BAGS_BEGIN + EQ::invbag::SLOT_COUNT; m <= EQ::invbag::CURSOR_BAG_END; m += EQ::invbag::SLOT_COUNT) { if (x >= m) { bagslot += 1; } } - EQEmu::ItemInstance* baginst = GetInv().GetItem(bagslot); + EQ::ItemInstance* baginst = GetInv().GetItem(bagslot); if (baginst && baginst->GetItem() && baginst->IsClassBag()) { reduction = baginst->GetItem()->BagWR; } @@ -840,7 +840,7 @@ uint32 Client::CalcCurrentWeight() This is the ONLY instance I have seen where the client is hard coded to particular Item IDs to set a certain property for an item. It is very odd. */ // SoD+ client has no weight for coin - if (EQEmu::behavior::StaticLookup(EQEmu::versions::ConvertClientVersionToMobVersion(ClientVersion()))->CoinHasWeight) { + if (EQ::behavior::StaticLookup(EQ::versions::ConvertClientVersionToMobVersion(ClientVersion()))->CoinHasWeight) { Total += (m_pp.platinum + m_pp.gold + m_pp.silver + m_pp.copper) / 4; } float Packrat = (float)spellbonuses.Packrat + (float)aabonuses.Packrat + (float)itembonuses.Packrat; @@ -1531,10 +1531,10 @@ uint32 Mob::GetInstrumentMod(uint16 spell_id) const // clickies (Symphony of Battle) that have a song skill don't get AA bonus for some reason // but clickies that are songs (selo's on Composers Greaves) do get AA mod as well switch (spells[spell_id].skill) { - case EQEmu::skills::SkillPercussionInstruments: + case EQ::skills::SkillPercussionInstruments: if (itembonuses.percussionMod == 0 && spellbonuses.percussionMod == 0) effectmod = 10; - else if (GetSkill(EQEmu::skills::SkillPercussionInstruments) == 0) + else if (GetSkill(EQ::skills::SkillPercussionInstruments) == 0) effectmod = 10; else if (itembonuses.percussionMod > spellbonuses.percussionMod) effectmod = itembonuses.percussionMod; @@ -1543,10 +1543,10 @@ uint32 Mob::GetInstrumentMod(uint16 spell_id) const if (IsBardSong(spell_id)) effectmod += aabonuses.percussionMod; break; - case EQEmu::skills::SkillStringedInstruments: + case EQ::skills::SkillStringedInstruments: if (itembonuses.stringedMod == 0 && spellbonuses.stringedMod == 0) effectmod = 10; - else if (GetSkill(EQEmu::skills::SkillStringedInstruments) == 0) + else if (GetSkill(EQ::skills::SkillStringedInstruments) == 0) effectmod = 10; else if (itembonuses.stringedMod > spellbonuses.stringedMod) effectmod = itembonuses.stringedMod; @@ -1555,10 +1555,10 @@ uint32 Mob::GetInstrumentMod(uint16 spell_id) const if (IsBardSong(spell_id)) effectmod += aabonuses.stringedMod; break; - case EQEmu::skills::SkillWindInstruments: + case EQ::skills::SkillWindInstruments: if (itembonuses.windMod == 0 && spellbonuses.windMod == 0) effectmod = 10; - else if (GetSkill(EQEmu::skills::SkillWindInstruments) == 0) + else if (GetSkill(EQ::skills::SkillWindInstruments) == 0) effectmod = 10; else if (itembonuses.windMod > spellbonuses.windMod) effectmod = itembonuses.windMod; @@ -1567,10 +1567,10 @@ uint32 Mob::GetInstrumentMod(uint16 spell_id) const if (IsBardSong(spell_id)) effectmod += aabonuses.windMod; break; - case EQEmu::skills::SkillBrassInstruments: + case EQ::skills::SkillBrassInstruments: if (itembonuses.brassMod == 0 && spellbonuses.brassMod == 0) effectmod = 10; - else if (GetSkill(EQEmu::skills::SkillBrassInstruments) == 0) + else if (GetSkill(EQ::skills::SkillBrassInstruments) == 0) effectmod = 10; else if (itembonuses.brassMod > spellbonuses.brassMod) effectmod = itembonuses.brassMod; @@ -1579,7 +1579,7 @@ uint32 Mob::GetInstrumentMod(uint16 spell_id) const if (IsBardSong(spell_id)) effectmod += aabonuses.brassMod; break; - case EQEmu::skills::SkillSinging: + case EQ::skills::SkillSinging: if (itembonuses.singingMod == 0 && spellbonuses.singingMod == 0) effectmod = 10; else if (itembonuses.singingMod > spellbonuses.singingMod) @@ -1626,7 +1626,7 @@ void Client::CalcMaxEndurance() int32 Client::CalcBaseEndurance() { int32 base_end = 0; - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF && RuleB(Character, SoDClientUseSoDHPManaEnd)) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoF && RuleB(Character, SoDClientUseSoDHPManaEnd)) { double heroic_stats = (GetHeroicSTR() + GetHeroicSTA() + GetHeroicDEX() + GetHeroicAGI()) / 4.0f; double stats = (GetSTR() + GetSTA() + GetDEX() + GetAGI()) / 4.0f; if (stats > 201.0f) { @@ -1765,12 +1765,12 @@ int Client::GetRawACNoShield(int &shield_ac) const { int ac = itembonuses.AC + spellbonuses.AC + aabonuses.AC; shield_ac = 0; - const EQEmu::ItemInstance *inst = m_inv.GetItem(EQEmu::invslot::slotSecondary); + const EQ::ItemInstance *inst = m_inv.GetItem(EQ::invslot::slotSecondary); if (inst) { - if (inst->GetItem()->ItemType == EQEmu::item::ItemTypeShield) { + if (inst->GetItem()->ItemType == EQ::item::ItemTypeShield) { ac -= inst->GetItem()->AC; shield_ac = inst->GetItem()->AC; - for (uint8 i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { + for (uint8 i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { if (inst->GetAugment(i)) { ac -= inst->GetAugment(i)->GetItem()->AC; shield_ac += inst->GetAugment(i)->GetItem()->AC; diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 1267386eb..1bdf3d0d0 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -442,7 +442,7 @@ int Client::HandlePacket(const EQApplicationPacket *app) case CLIENT_CONNECTING: { if (ConnectingOpcodes.count(opcode) != 1) { //Hate const cast but everything in lua needs to be non-const even if i make it non-mutable - std::vector args; + std::vector args; args.push_back(const_cast(app)); parse->EventPlayer(EVENT_UNHANDLED_OPCODE, this, "", 1, &args); @@ -466,7 +466,7 @@ int Client::HandlePacket(const EQApplicationPacket *app) ClientPacketProc p; p = ConnectedOpcodes[opcode]; if (p == nullptr) { - std::vector args; + std::vector args; args.push_back(const_cast(app)); parse->EventPlayer(EVENT_UNHANDLED_OPCODE, this, "", 0, &args); @@ -514,7 +514,7 @@ void Client::CompleteConnect() if (IsInAGuild()) { uint8 rank = GuildRank(); - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { switch (rank) { case 0: { rank = 5; break; } // GUILD_MEMBER 0 @@ -528,9 +528,9 @@ void Client::CompleteConnect() } // moved to dbload and translators since we iterate there also .. keep m_pp values whatever they are when they get here - /*const auto sbs = EQEmu::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize; + /*const auto sbs = EQ::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize; for (uint32 spellInt = 0; spellInt < sbs; ++spellInt) { - if (m_pp.spell_book[spellInt] < 3 || m_pp.spell_book[spellInt] > EQEmu::spells::SPELL_ID_MAX) + if (m_pp.spell_book[spellInt] < 3 || m_pp.spell_book[spellInt] > EQ::spells::SPELL_ID_MAX) m_pp.spell_book[spellInt] = 0xFFFFFFFF; }*/ @@ -753,7 +753,7 @@ void Client::CompleteConnect() entity_list.SendUntargetable(this); int x; - for (x = EQEmu::textures::textureBegin; x <= EQEmu::textures::LastTexture; x++) { + for (x = EQ::textures::textureBegin; x <= EQ::textures::LastTexture; x++) { SendWearChange(x); } // added due to wear change above @@ -762,7 +762,7 @@ void Client::CompleteConnect() Mob *pet = GetPet(); if (pet != nullptr) { - for (x = EQEmu::textures::textureBegin; x <= EQEmu::textures::LastTexture; x++) { + for (x = EQ::textures::textureBegin; x <= EQ::textures::LastTexture; x++) { pet->SendWearChange(x); } // added due to wear change above @@ -875,7 +875,7 @@ void Client::CompleteConnect() if (zone->GetZoneID() == RuleI(World, GuildBankZoneID) && GuildBanks) GuildBanks->SendGuildBank(this); - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD) + if (ClientVersion() >= EQ::versions::ClientVersion::SoD) entity_list.SendFindableNPCList(this); if (IsInAGuild()) { @@ -890,14 +890,14 @@ void Client::CompleteConnect() worldserver.SendPacket(pack); delete pack; - if (IsClient() && CastToClient()->ClientVersionBit() & EQEmu::versions::maskUFAndLater) { + if (IsClient() && CastToClient()->ClientVersionBit() & EQ::versions::maskUFAndLater) { EQApplicationPacket *outapp = MakeBuffsPacket(false); CastToClient()->FastQueuePacket(&outapp); } // TODO: load these states // We at least will set them to the correct state for now - if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater && GetPet()) { + if (m_ClientVersionBit & EQ::versions::maskUFAndLater && GetPet()) { SetPetCommandState(PET_BUTTON_SIT, 0); SetPetCommandState(PET_BUTTON_STOP, 0); SetPetCommandState(PET_BUTTON_REGROUP, 0); @@ -1005,7 +1005,7 @@ void Client::Handle_Connect_OP_ReqClientSpawn(const EQApplicationPacket *app) outapp = new EQApplicationPacket(OP_SendExpZonein, 0); FastQueuePacket(&outapp); - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { outapp = new EQApplicationPacket(OP_ClientReady, 0); FastQueuePacket(&outapp); @@ -1069,7 +1069,7 @@ void Client::Handle_Connect_OP_SendExpZonein(const EQApplicationPacket *app) safe_delete(outapp); // SoF+ Gets Zone-In packets after sending OP_WorldObjectsSent - if (ClientVersion() < EQEmu::versions::ClientVersion::SoF) + if (ClientVersion() < EQ::versions::ClientVersion::SoF) { SendZoneInPackets(); } @@ -1166,7 +1166,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) conn_state = ReceivedZoneEntry; SetClientVersion(Connection()->ClientVersion()); - m_ClientVersionBit = EQEmu::versions::ConvertClientVersionToClientVersionBit(Connection()->ClientVersion()); + m_ClientVersionBit = EQ::versions::ConvertClientVersionToClientVersionBit(Connection()->ClientVersion()); m_pp.SetPlayerProfileVersion(m_ClientVersion); m_inv.SetInventoryVersion(m_ClientVersion); @@ -1281,7 +1281,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) } /* Set item material tint */ - for (int i = EQEmu::textures::textureBegin; i <= EQEmu::textures::LastTexture; i++) + for (int i = EQ::textures::textureBegin; i <= EQ::textures::LastTexture; i++) { if (m_pp.item_tint.Slot[i].UseTint == 1 || m_pp.item_tint.Slot[i].UseTint == 255) { @@ -1370,7 +1370,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) m_pp.guild_id = GuildID(); uint8 rank = guild_mgr.GetDisplayedRank(GuildID(), GuildRank(), CharacterID()); // FIXME: RoF guild rank - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) { + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { switch (rank) { case 0: rank = 5; @@ -1424,10 +1424,10 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) if (m_pp.ldon_points_available < 0 || m_pp.ldon_points_available > 2000000000) { m_pp.ldon_points_available = 0; } if (RuleB(World, UseClientBasedExpansionSettings)) { - m_pp.expansions = EQEmu::expansions::ConvertClientVersionToExpansionsMask(ClientVersion()); + m_pp.expansions = EQ::expansions::ConvertClientVersionToExpansionsMask(ClientVersion()); } else { - m_pp.expansions = (RuleI(World, ExpansionSettings) & EQEmu::expansions::ConvertClientVersionToExpansionsMask(ClientVersion())); + m_pp.expansions = (RuleI(World, ExpansionSettings) & EQ::expansions::ConvertClientVersionToExpansionsMask(ClientVersion())); } if (!database.LoadAlternateAdvancement(this)) { @@ -1435,7 +1435,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) } if (SPDAT_RECORDS > 0) { - for (uint32 z = 0; z < EQEmu::spells::SPELL_GEM_COUNT; z++) { + for (uint32 z = 0; z < EQ::spells::SPELL_GEM_COUNT; z++) { if (m_pp.mem_spells[z] >= (uint32)SPDAT_RECORDS) UnmemSpell(z, false); } @@ -1567,7 +1567,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) } /* Load Spell Slot Refresh from Currently Memoried Spells */ - for (unsigned int i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; ++i) + for (unsigned int i = 0; i < EQ::spells::SPELL_GEM_COUNT; ++i) if (IsValidSpell(m_pp.mem_spells[i])) m_pp.spellSlotRefresh[i] = p_timers.GetRemainingTime(pTimerSpellStart + m_pp.mem_spells[i]) * 1000; @@ -1676,8 +1676,8 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) /* First item cursor is sent in bulk inventory packet */ if (iter == m_inv.cursor_cbegin()) continue; - const EQEmu::ItemInstance *inst = *iter; - SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketLimbo); + const EQ::ItemInstance *inst = *iter; + SendItemPacket(EQ::invslot::slotCursor, inst, ItemPacketLimbo); } // this is kinda hackish atm..this process needs to be realigned to allow a contiguous flow @@ -1690,14 +1690,14 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) /** * DevTools Load Settings */ - if (Admin() >= EQEmu::DevTools::GM_ACCOUNT_STATUS_LEVEL) { + if (Admin() >= EQ::DevTools::GM_ACCOUNT_STATUS_LEVEL) { std::string dev_tools_window_key = StringFormat("%i-dev-tools-window-disabled", AccountID()); if (DataBucket::GetData(dev_tools_window_key) == "true") { dev_tools_window_enabled = false; } } - if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) { + if (m_ClientVersionBit & EQ::versions::maskUFAndLater) { outapp = new EQApplicationPacket(OP_XTargetResponse, 8); outapp->WriteUInt32(GetMaxXTargets()); outapp->WriteUInt32(0); @@ -1721,7 +1721,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) QueuePacket(outapp); safe_delete(outapp); - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) { + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { Handle_Connect_OP_ReqNewZone(nullptr); } @@ -1879,7 +1879,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app) merchantid = tmp->CastToNPC()->MerchantType; - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; bool found = false; std::list merlist = zone->merchanttable[merchantid]; std::list::const_iterator itr; @@ -2022,10 +2022,10 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app) if (item->MaxCharges != 0) charges = item->MaxCharges; - EQEmu::ItemInstance *inst = database.CreateItem(item, charges); + EQ::ItemInstance *inst = database.CreateItem(item, charges); if (!AutoPutLootInInventory(*inst, true, true)) { - PutLootInInventory(EQEmu::invslot::slotCursor, *inst); + PutLootInInventory(EQ::invslot::slotCursor, *inst); } Save(1); } @@ -2054,7 +2054,7 @@ void Client::Handle_OP_AdventureMerchantRequest(const EQApplicationPacket *app) merchantid = tmp->CastToNPC()->MerchantType; - const EQEmu::ItemData *item = nullptr; + const EQ::ItemData *item = nullptr; std::list merlist = zone->merchanttable[merchantid]; std::list::const_iterator itr; for (itr = merlist.begin(); itr != merlist.end() && count<255; ++itr) { @@ -2152,8 +2152,8 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app) return; } - const EQEmu::ItemData* item = database.GetItem(itemid); - EQEmu::ItemInstance* inst = GetInv().GetItem(ams_in->slot); + const EQ::ItemData* item = database.GetItem(itemid); + EQ::ItemInstance* inst = GetInv().GetItem(ams_in->slot); if (!item || !inst) { Message(Chat::Red, "You seemed to have misplaced that item..."); return; @@ -2439,7 +2439,7 @@ void Client::Handle_OP_AltCurrencyMerchantRequest(const EQApplicationPacket *app ss << alt_cur_id << "|1|" << alt_cur_id; uint32 count = 0; uint32 merchant_id = tar->MerchantType; - const EQEmu::ItemData *item = nullptr; + const EQ::ItemData *item = nullptr; std::list merlist = zone->merchanttable[merchant_id]; std::list::const_iterator itr; @@ -2499,7 +2499,7 @@ void Client::Handle_OP_AltCurrencyPurchase(const EQApplicationPacket *app) return; } - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; uint32 cost = 0; uint32 current_currency = GetAlternateCurrencyValue(alt_cur_id); uint32 merchant_id = tar->MerchantType; @@ -2555,10 +2555,10 @@ void Client::Handle_OP_AltCurrencyPurchase(const EQApplicationPacket *app) if (item->MaxCharges != 0) charges = item->MaxCharges; - EQEmu::ItemInstance *inst = database.CreateItem(item, charges); + EQ::ItemInstance *inst = database.CreateItem(item, charges); if (!AutoPutLootInInventory(*inst, true, true)) { - PutLootInInventory(EQEmu::invslot::slotCursor, *inst); + PutLootInInventory(EQ::invslot::slotCursor, *inst); } Save(1); @@ -2608,7 +2608,7 @@ void Client::Handle_OP_AltCurrencyReclaim(const EQApplicationPacket *app) SetAlternateCurrencyValue(reclaim->currency_id, 0); } else { - SummonItem(item_id, reclaim->count, 0, 0, 0, 0, 0, 0, false, EQEmu::invslot::slotCursor); + SummonItem(item_id, reclaim->count, 0, 0, 0, 0, 0, 0, false, EQ::invslot::slotCursor); AddAlternateCurrencyValue(reclaim->currency_id, -((int32)reclaim->count)); } /* QS: PlayerLogAlternateCurrencyTransactions :: Cursor to Item Storage */ @@ -2639,7 +2639,7 @@ void Client::Handle_OP_AltCurrencySell(const EQApplicationPacket *app) return; } - EQEmu::ItemInstance* inst = GetInv().GetItem(sell->slot_id); + EQ::ItemInstance* inst = GetInv().GetItem(sell->slot_id); if (!inst) { return; } @@ -2648,7 +2648,7 @@ void Client::Handle_OP_AltCurrencySell(const EQApplicationPacket *app) return; } - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; uint32 cost = 0; uint32 current_currency = GetAlternateCurrencyValue(alt_cur_id); uint32 merchant_id = tar->MerchantType; @@ -2736,12 +2736,12 @@ void Client::Handle_OP_AltCurrencySellSelection(const EQApplicationPacket *app) return; } - EQEmu::ItemInstance *inst = m_inv.GetItem(select->slot_id); + EQ::ItemInstance *inst = m_inv.GetItem(select->slot_id); if (!inst) { return; } - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; uint32 cost = 0; uint32 current_currency = GetAlternateCurrencyValue(alt_cur_id); uint32 merchant_id = tar->MerchantType; @@ -2821,16 +2821,16 @@ void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app) uint32 ApplyPoisonSuccessResult = 0; - const EQEmu::ItemInstance* PoisonItemInstance = GetInv().GetItem(ApplyPoisonData->inventorySlot); + const EQ::ItemInstance* PoisonItemInstance = GetInv().GetItem(ApplyPoisonData->inventorySlot); - const EQEmu::ItemData* poison = (PoisonItemInstance ? PoisonItemInstance->GetItem() : nullptr); + const EQ::ItemData* poison = (PoisonItemInstance ? PoisonItemInstance->GetItem() : nullptr); - bool IsPoison = (poison && poison->ItemType == EQEmu::item::ItemTypePoison); + bool IsPoison = (poison && poison->ItemType == EQ::item::ItemTypePoison); if (IsPoison && GetClass() == ROGUE) { // Live always checks for skillup, even when poison is too high - CheckIncreaseSkill(EQEmu::skills::SkillApplyPoison, nullptr, 10); + CheckIncreaseSkill(EQ::skills::SkillApplyPoison, nullptr, 10); if (poison->Proc.Level2 > GetLevel()) { // Poison is too high to apply. @@ -2849,7 +2849,7 @@ void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app) // Poisons that don't proc until a level higher than the // rogue simply won't apply at all, no skill check done. - uint16 poison_skill = GetSkill(EQEmu::skills::SkillApplyPoison); + uint16 poison_skill = GetSkill(EQ::skills::SkillApplyPoison); if (ChanceRoll < (.75 + poison_skill / 1000)) { ApplyPoisonSuccessResult = 1; @@ -2924,7 +2924,7 @@ void Client::Handle_OP_AugmentInfo(const EQApplicationPacket *app) } AugmentInfo_Struct* AugInfo = (AugmentInfo_Struct*)app->pBuffer; - const EQEmu::ItemData * item = database.GetItem(AugInfo->itemid); + const EQ::ItemData * item = database.GetItem(AugInfo->itemid); if (item) { strn0cpy(AugInfo->augment_info, item->Name, 64); @@ -2943,31 +2943,31 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) AugmentItem_Struct* in_augment = (AugmentItem_Struct*)app->pBuffer; bool deleteItems = false; - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { - if ((in_augment->container_slot < EQEmu::invslot::EQUIPMENT_BEGIN || in_augment->container_slot > EQEmu::invslot::GENERAL_END) && - (in_augment->container_slot < EQEmu::invbag::GENERAL_BAGS_BEGIN || in_augment->container_slot > EQEmu::invbag::GENERAL_BAGS_END)) + if ((in_augment->container_slot < EQ::invslot::EQUIPMENT_BEGIN || in_augment->container_slot > EQ::invslot::GENERAL_END) && + (in_augment->container_slot < EQ::invbag::GENERAL_BAGS_BEGIN || in_augment->container_slot > EQ::invbag::GENERAL_BAGS_END)) { Message(Chat::Red, "The server does not allow augmentation actions from this slot."); - auto cursor_item = m_inv[EQEmu::invslot::slotCursor]; + auto cursor_item = m_inv[EQ::invslot::slotCursor]; auto augmented_item = m_inv[in_augment->container_slot]; - SendItemPacket(EQEmu::invslot::slotCursor, cursor_item, ItemPacketCharInventory); + SendItemPacket(EQ::invslot::slotCursor, cursor_item, ItemPacketCharInventory); // this may crash clients on certain slots SendItemPacket(in_augment->container_slot, augmented_item, ItemPacketCharInventory); return; } - EQEmu::ItemInstance *itemOneToPush = nullptr, *itemTwoToPush = nullptr; + EQ::ItemInstance *itemOneToPush = nullptr, *itemTwoToPush = nullptr; //Log(Logs::DebugLevel::Moderate, Logs::Debug, "cslot: [{}] aslot: [{}] cidx: [{}] aidx: [{}] act: [{}] dest: [{}]", // in_augment->container_slot, in_augment->augment_slot, in_augment->container_index, in_augment->augment_index, in_augment->augment_action, in_augment->dest_inst_id); - EQEmu::ItemInstance *tobe_auged = nullptr, *old_aug = nullptr, *new_aug = nullptr, *aug = nullptr, *solvent = nullptr; - EQEmu::InventoryProfile& user_inv = GetInv(); + EQ::ItemInstance *tobe_auged = nullptr, *old_aug = nullptr, *new_aug = nullptr, *aug = nullptr, *solvent = nullptr; + EQ::InventoryProfile& user_inv = GetInv(); uint16 item_slot = in_augment->container_slot; uint16 solvent_slot = in_augment->augment_slot; - uint8 mat = EQEmu::InventoryProfile::CalcMaterialFromSlot(item_slot); // for when player is augging a piece of equipment while they're wearing it + uint8 mat = EQ::InventoryProfile::CalcMaterialFromSlot(item_slot); // for when player is augging a piece of equipment while they're wearing it if (item_slot == INVALID_INDEX || solvent_slot == INVALID_INDEX) { @@ -2997,7 +2997,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) return; } } - else if (solvent->GetItem()->ItemType == EQEmu::item::ItemTypeAugmentationDistiller) + else if (solvent->GetItem()->ItemType == EQ::item::ItemTypeAugmentationDistiller) { old_aug = tobe_auged->GetAugment(in_augment->augment_index); @@ -3014,7 +3014,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) return; } } - else if (solvent->GetItem()->ItemType != EQEmu::item::ItemTypePerfectedAugmentationDistiller) + else if (solvent->GetItem()->ItemType != EQ::item::ItemTypePerfectedAugmentationDistiller) { LogError("Player tried to safely remove an augment with a non-distiller item"); Message(Chat::Red, "Error: Invalid augmentation distiller for safely removing this augment."); @@ -3026,7 +3026,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) { case 0: // Adding an augment case 2: // Swapping augment - new_aug = user_inv.GetItem(EQEmu::invslot::slotCursor); + new_aug = user_inv.GetItem(EQ::invslot::slotCursor); if (!new_aug) // Shouldn't get the OP code without the augment on the user's cursor, but maybe it's h4x. { @@ -3046,7 +3046,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) CalcBonuses(); - std::vector args; + std::vector args; args.push_back(old_aug); parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); @@ -3061,7 +3061,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) aug = tobe_auged->GetAugment(in_augment->augment_index); if (aug) { - std::vector args; + std::vector args; args.push_back(aug); parse->EventItem(EVENT_AUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); @@ -3084,7 +3084,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) if (itemOneToPush) { DeleteItemInInventory(item_slot, 0, true); - DeleteItemInInventory(EQEmu::invslot::slotCursor, new_aug->IsStackable() ? 1 : 0, true); + DeleteItemInInventory(EQ::invslot::slotCursor, new_aug->IsStackable() ? 1 : 0, true); if (solvent) { @@ -3095,7 +3095,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) if (itemTwoToPush) { // This is a swap. Return the old aug to the player's cursor. - if (!PutItemInInventory(EQEmu::invslot::slotCursor, *itemTwoToPush, true)) + if (!PutItemInInventory(EQ::invslot::slotCursor, *itemTwoToPush, true)) { LogError("Problem returning old augment to player's cursor after augmentation swap"); Message(Chat::Yellow, "Error: Failed to retrieve old augment after augmentation swap!"); @@ -3108,7 +3108,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) CalcBonuses(); - if (mat != EQEmu::textures::materialInvalid) + if (mat != EQ::textures::materialInvalid) { SendWearChange(mat); // Visible item augged while equipped. Send WC in case ornamentation changed. } @@ -3133,7 +3133,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) aug = tobe_auged->GetAugment(in_augment->augment_index); if (aug) { - std::vector args; + std::vector args; args.push_back(aug); parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); @@ -3174,13 +3174,13 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) CalcBonuses(); - if (mat != EQEmu::textures::materialInvalid) + if (mat != EQ::textures::materialInvalid) { SendWearChange(mat); // Visible item augged while equipped. Send WC in case ornamentation changed. } // Drop the removed augment on the player's cursor - if (!PutItemInInventory(EQEmu::invslot::slotCursor, *itemTwoToPush, true)) + if (!PutItemInInventory(EQ::invslot::slotCursor, *itemTwoToPush, true)) { LogError("Problem returning augment to player's cursor after safe removal"); Message(Chat::Yellow, "Error: Failed to return augment after removal from item!"); @@ -3196,7 +3196,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) aug = tobe_auged->GetAugment(in_augment->augment_index); if (aug) { - std::vector args; + std::vector args; args.push_back(aug); parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); @@ -3229,7 +3229,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) CalcBonuses(); - if (mat != EQEmu::textures::materialInvalid) + if (mat != EQ::textures::materialInvalid) { SendWearChange(mat); } @@ -3519,13 +3519,13 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app) { BarterItemSearchLinkRequest_Struct* bislr = (BarterItemSearchLinkRequest_Struct*)app->pBuffer; - const EQEmu::ItemData* item = database.GetItem(bislr->ItemID); + const EQ::ItemData* item = database.GetItem(bislr->ItemID); if (!item) Message(Chat::Red, "Error: This item does not exist!"); else { - EQEmu::ItemInstance* inst = database.CreateItem(item); + EQ::ItemInstance* inst = database.CreateItem(item); if (inst) { SendItemPacket(0, inst, ItemPacketViewLink); @@ -3552,13 +3552,13 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app) { BuyerItemSearchLinkRequest_Struct* bislr = (BuyerItemSearchLinkRequest_Struct*)app->pBuffer; - const EQEmu::ItemData* item = database.GetItem(bislr->ItemID); + const EQ::ItemData* item = database.GetItem(bislr->ItemID); if (!item) Message(Chat::Red, "Error: This item does not exist!"); else { - EQEmu::ItemInstance* inst = database.CreateItem(item); + EQ::ItemInstance* inst = database.CreateItem(item); if (inst) { SendItemPacket(0, inst, ItemPacketViewLink); @@ -3591,14 +3591,14 @@ void Client::Handle_OP_BazaarInspect(const EQApplicationPacket *app) BazaarInspect_Struct* bis = (BazaarInspect_Struct*)app->pBuffer; - const EQEmu::ItemData* item = database.GetItem(bis->ItemID); + const EQ::ItemData* item = database.GetItem(bis->ItemID); if (!item) { Message(Chat::Red, "Error: This item does not exist!"); return; } - EQEmu::ItemInstance* inst = database.CreateItem(item); + EQ::ItemInstance* inst = database.CreateItem(item); if (inst) { SendItemPacket(0, inst, ItemPacketViewLink); @@ -3631,7 +3631,7 @@ void Client::Handle_OP_BazaarSearch(const EQApplicationPacket *app) Client *c = entity_list.GetClientByName(nbis->Name); if (c) { - EQEmu::ItemInstance* inst = c->FindTraderItemBySerialNumber(nbis->SerialNumber); + EQ::ItemInstance* inst = c->FindTraderItemBySerialNumber(nbis->SerialNumber); if (inst) SendItemPacket(0, inst, ItemPacketViewLink); } @@ -3658,7 +3658,7 @@ void Client::Handle_OP_Begging(const EQApplicationPacket *app) return; } - if (!HasSkill(EQEmu::skills::SkillBegging) || !GetTarget()) + if (!HasSkill(EQ::skills::SkillBegging) || !GetTarget()) return; if (GetTarget()->GetClass() == LDON_TREASURE) @@ -3696,7 +3696,7 @@ void Client::Handle_OP_Begging(const EQApplicationPacket *app) return; } - uint16 CurrentSkill = GetSkill(EQEmu::skills::SkillBegging); + uint16 CurrentSkill = GetSkill(EQ::skills::SkillBegging); float ChanceToBeg = ((float)(CurrentSkill / 700.0f) + 0.15f) * 100; @@ -3718,7 +3718,7 @@ void Client::Handle_OP_Begging(const EQApplicationPacket *app) } QueuePacket(outapp); safe_delete(outapp); - CheckIncreaseSkill(EQEmu::skills::SkillBegging, nullptr, -10); + CheckIncreaseSkill(EQ::skills::SkillBegging, nullptr, -10); } void Client::Handle_OP_Bind_Wound(const EQApplicationPacket *app) @@ -4017,7 +4017,7 @@ void Client::Handle_OP_CancelTrade(const EQApplicationPacket *app) void Client::Handle_OP_CastSpell(const EQApplicationPacket *app) { - using EQEmu::spells::CastingSlot; + using EQ::spells::CastingSlot; if (app->size != sizeof(CastSpell_Struct)) { std::cout << "Wrong size: OP_CastSpell, size=" << app->size << ", expected " << sizeof(CastSpell_Struct) << std::endl; return; @@ -4046,14 +4046,14 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app) /* Memorized Spell */ if (m_pp.mem_spells[castspell->slot] && m_pp.mem_spells[castspell->slot] == castspell->spell_id) { uint16 spell_to_cast = 0; - if (castspell->slot < EQEmu::spells::SPELL_GEM_COUNT) { + if (castspell->slot < EQ::spells::SPELL_GEM_COUNT) { spell_to_cast = m_pp.mem_spells[castspell->slot]; if (spell_to_cast != castspell->spell_id) { InterruptSpell(castspell->spell_id); //CHEATER!!! return; } } - else if (castspell->slot >= EQEmu::spells::SPELL_GEM_COUNT) { + else if (castspell->slot >= EQ::spells::SPELL_GEM_COUNT) { InterruptSpell(); return; } @@ -4066,11 +4066,11 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app) if (m_inv.SupportsClickCasting(castspell->inventoryslot) || slot == CastingSlot::PotionBelt) // sanity check { // packet field types will be reviewed as packet transistions occur - const EQEmu::ItemInstance* inst = m_inv[castspell->inventoryslot]; //slot values are int16, need to check packet on this field + const EQ::ItemInstance* inst = m_inv[castspell->inventoryslot]; //slot values are int16, need to check packet on this field //bool cancast = true; if (inst && inst->IsClassCommon()) { - const EQEmu::ItemData* item = inst->GetItem(); + const EQ::ItemData* item = inst->GetItem(); if (item->Click.Effect != (uint32)castspell->spell_id) { database.SetMQDetectionFlag(account_name, name, "OP_CastSpell with item, tried to cast a different spell.", zone->GetShortName()); @@ -4078,13 +4078,13 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app) return; } - if ((item->Click.Type == EQEmu::item::ItemEffectClick) || (item->Click.Type == EQEmu::item::ItemEffectExpendable) || (item->Click.Type == EQEmu::item::ItemEffectEquipClick) || (item->Click.Type == EQEmu::item::ItemEffectClick2)) + if ((item->Click.Type == EQ::item::ItemEffectClick) || (item->Click.Type == EQ::item::ItemEffectExpendable) || (item->Click.Type == EQ::item::ItemEffectEquipClick) || (item->Click.Type == EQ::item::ItemEffectClick2)) { if (item->Click.Level2 > 0) { if (GetLevel() >= item->Click.Level2) { - EQEmu::ItemInstance* p_inst = (EQEmu::ItemInstance*)inst; + EQ::ItemInstance* p_inst = (EQ::ItemInstance*)inst; int i = parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, nullptr, "", castspell->inventoryslot); if (i == 0) { @@ -4104,7 +4104,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app) } else { - EQEmu::ItemInstance* p_inst = (EQEmu::ItemInstance*)inst; + EQ::ItemInstance* p_inst = (EQ::ItemInstance*)inst; int i = parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, nullptr, "", castspell->inventoryslot); if (i == 0) { @@ -4129,7 +4129,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app) } else { - Message(0, "Error: castspell->inventoryslot >= %i (0x%04x)", EQEmu::invslot::slotCursor, castspell->inventoryslot); + Message(0, "Error: castspell->inventoryslot >= %i (0x%04x)", EQ::invslot::slotCursor, castspell->inventoryslot); InterruptSpell(castspell->spell_id); } } @@ -4263,7 +4263,7 @@ void Client::Handle_OP_ClickDoor(const EQApplicationPacket *app) char buf[20]; snprintf(buf, 19, "%u", cd->doorid); buf[19] = '\0'; - std::vector args; + std::vector args; args.push_back(currentdoor); parse->EventPlayer(EVENT_CLICK_DOOR, this, buf, 0, &args); @@ -4286,7 +4286,7 @@ void Client::Handle_OP_ClickObject(const EQApplicationPacket *app) object->HandleClick(this, click_object); - std::vector args; + std::vector args; args.push_back(object); char buf[10]; @@ -4313,7 +4313,7 @@ void Client::Handle_OP_ClickObjectAction(const EQApplicationPacket *app) QueuePacket(&end_trade2); // RoF sends a 0 sized packet for closing objects - if (GetTradeskillObject() && ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (GetTradeskillObject() && ClientVersion() >= EQ::versions::ClientVersion::RoF) GetTradeskillObject()->CastToObject()->Close(); return; @@ -4497,7 +4497,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) { if (IsTracking() && ((m_Position.x != cx) || (m_Position.y != cy))) { if (zone->random.Real(0, 100) < 70)//should be good - CheckIncreaseSkill(EQEmu::skills::SkillTracking, nullptr, -20); + CheckIncreaseSkill(EQ::skills::SkillTracking, nullptr, -20); } /* Break Hide if moving without sneaking and set rewind timer if moved */ @@ -4629,7 +4629,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) { if (zone->watermap) { if (zone->watermap->InLiquid(glm::vec3(m_Position))) { - CheckIncreaseSkill(EQEmu::skills::SkillSwimming, nullptr, -17); + CheckIncreaseSkill(EQ::skills::SkillSwimming, nullptr, -17); // Dismount horses when entering water if (GetHorseId() && RuleB(Character, DismountWater)) { @@ -4701,7 +4701,7 @@ void Client::Handle_OP_Consider(const EQApplicationPacket *app) con->faction = 1; con->level = GetLevelCon(tmob->GetLevel()); - if (ClientVersion() <= EQEmu::versions::ClientVersion::Titanium) { + if (ClientVersion() <= EQ::versions::ClientVersion::Titanium) { if (con->level == CON_GRAY) { con->level = CON_GREEN; } @@ -4776,7 +4776,7 @@ void Client::Handle_OP_Consider(const EQApplicationPacket *app) break; } - if (ClientVersion() <= EQEmu::versions::ClientVersion::Titanium) { + if (ClientVersion() <= EQ::versions::ClientVersion::Titanium) { if (color == 6) { color = 2; } @@ -4897,18 +4897,18 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app) } } - EQEmu::ItemInstance *myitem = GetInv().GetItem(pcs->slot); + EQ::ItemInstance *myitem = GetInv().GetItem(pcs->slot); if (myitem == nullptr) { LogError("Consuming from empty slot [{}]", pcs->slot); return; } - const EQEmu::ItemData* eat_item = myitem->GetItem(); + const EQ::ItemData* eat_item = myitem->GetItem(); if (pcs->type == 0x01) { - Consume(eat_item, EQEmu::item::ItemTypeFood, pcs->slot, (pcs->auto_consumed == 0xffffffff)); + Consume(eat_item, EQ::item::ItemTypeFood, pcs->slot, (pcs->auto_consumed == 0xffffffff)); } else if (pcs->type == 0x02) { - Consume(eat_item, EQEmu::item::ItemTypeDrink, pcs->slot, (pcs->auto_consumed == 0xffffffff)); + Consume(eat_item, EQ::item::ItemTypeDrink, pcs->slot, (pcs->auto_consumed == 0xffffffff)); } else { LogError("OP_Consume: unknown type, type:[{}]", (int)pcs->type); @@ -5044,7 +5044,7 @@ void Client::Handle_OP_CreateObject(const EQApplicationPacket *app) if (LogSys.log_settings[Logs::Inventory].is_category_enabled) LogInventory("Handle_OP_CreateObject() [psize: [{}]] [{}]", app->size, DumpPacketToString(app).c_str()); - DropItem(EQEmu::invslot::slotCursor); + DropItem(EQ::invslot::slotCursor); return; } @@ -5074,7 +5074,7 @@ void Client::Handle_OP_CrystalCreate(const EQApplicationPacket *app) } // Prevent the client from creating more than they have. - const uint32 amount = EQEmu::ClampUpper(requestQty, currentQty); + const uint32 amount = EQ::ClampUpper(requestQty, currentQty); const uint32 itemID = isRadiant ? RuleI(Zone, RadiantCrystalItemID) : RuleI(Zone, EbonCrystalItemID); // Summon crystals for player. @@ -5130,7 +5130,7 @@ void Client::Handle_OP_Death(const EQApplicationPacket *app) Death_Struct* ds = (Death_Struct*)app->pBuffer; //I think this attack_skill value is really a value from SkillDamageTypes... - if (ds->attack_skill > EQEmu::skills::HIGHEST_SKILL) { + if (ds->attack_skill > EQ::skills::HIGHEST_SKILL) { return; } @@ -5138,7 +5138,7 @@ void Client::Handle_OP_Death(const EQApplicationPacket *app) return; Mob* killer = entity_list.GetMob(ds->killer_id); - Death(killer, ds->damage, ds->spell_id, (EQEmu::skills::SkillType)ds->attack_skill); + Death(killer, ds->damage, ds->spell_id, (EQ::skills::SkillType)ds->attack_skill); return; } @@ -5195,15 +5195,15 @@ void Client::Handle_OP_DeleteItem(const EQApplicationPacket *app) } DeleteItem_Struct* alc = (DeleteItem_Struct*)app->pBuffer; - const EQEmu::ItemInstance *inst = GetInv().GetItem(alc->from_slot); - if (inst && inst->GetItem()->ItemType == EQEmu::item::ItemTypeAlcohol) { + const EQ::ItemInstance *inst = GetInv().GetItem(alc->from_slot); + if (inst && inst->GetItem()->ItemType == EQ::item::ItemTypeAlcohol) { entity_list.MessageCloseString(this, true, 50, 0, DRINKING_MESSAGE, GetName(), inst->GetItem()->Name); - CheckIncreaseSkill(EQEmu::skills::SkillAlcoholTolerance, nullptr, 25); + CheckIncreaseSkill(EQ::skills::SkillAlcoholTolerance, nullptr, 25); - int16 AlcoholTolerance = GetSkill(EQEmu::skills::SkillAlcoholTolerance); + int16 AlcoholTolerance = GetSkill(EQ::skills::SkillAlcoholTolerance); int16 IntoxicationIncrease; - if (ClientVersion() < EQEmu::versions::ClientVersion::SoD) + if (ClientVersion() < EQ::versions::ClientVersion::SoD) IntoxicationIncrease = (200 - AlcoholTolerance) * 30 / 200 + 10; else IntoxicationIncrease = (270 - AlcoholTolerance) * 0.111111108 + 10; @@ -5245,7 +5245,7 @@ void Client::Handle_OP_DeleteSpawn(const EQApplicationPacket *app) void Client::Handle_OP_Disarm(const EQApplicationPacket *app) { if (dead || bZoning) return; - if (!HasSkill(EQEmu::skills::SkillDisarm)) + if (!HasSkill(EQ::skills::SkillDisarm)) return; if (app->size != sizeof(Disarm_Struct)) { @@ -5299,7 +5299,7 @@ void Client::Handle_OP_Disarm(const EQApplicationPacket *app) { if (tmob->IsClient() && tmob->CastToClient()->GetFeigned()) return; if (GetTarget() == tmob && pmob == this->CastToMob() && - disarm->skill == GetSkill(EQEmu::skills::SkillDisarm) && IsAttackAllowed(tmob)) { + disarm->skill == GetSkill(EQ::skills::SkillDisarm) && IsAttackAllowed(tmob)) { int p_level = pmob->GetLevel() ? pmob->GetLevel() : 1; int t_level = tmob->GetLevel() ? tmob->GetLevel() : 1; // We have a disarmable target - sucess or fail, we always aggro the mob @@ -5312,7 +5312,7 @@ void Client::Handle_OP_Disarm(const EQApplicationPacket *app) { tmob->AddToHateList(pmob, p_level / 3); } } - int chance = GetSkill(EQEmu::skills::SkillDisarm); // (1% @ 0 skill) (11% @ 200 skill) - against even con + int chance = GetSkill(EQ::skills::SkillDisarm); // (1% @ 0 skill) (11% @ 200 skill) - against even con chance /= 2; chance += 10; // Modify chance based on level difference @@ -5342,7 +5342,7 @@ void Client::Handle_OP_DeleteSpell(const EQApplicationPacket *app) EQApplicationPacket* outapp = app->Copy(); DeleteSpell_Struct* dss = (DeleteSpell_Struct*)outapp->pBuffer; - if (dss->spell_slot < 0 || dss->spell_slot >= EQEmu::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize) + if (dss->spell_slot < 0 || dss->spell_slot >= EQ::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize) return; if (m_pp.spell_book[dss->spell_slot] != SPELLBOOK_UNKNOWN) { @@ -5359,7 +5359,7 @@ void Client::Handle_OP_DeleteSpell(const EQApplicationPacket *app) void Client::Handle_OP_DisarmTraps(const EQApplicationPacket *app) { - if (!HasSkill(EQEmu::skills::SkillDisarmTraps)) + if (!HasSkill(EQ::skills::SkillDisarmTraps)) return; if (!p_timers.Expired(&database, pTimerDisarmTraps, false)) { @@ -5367,7 +5367,7 @@ void Client::Handle_OP_DisarmTraps(const EQApplicationPacket *app) return; } - int reuse = DisarmTrapsReuseTime - GetSkillReuseTime(EQEmu::skills::SkillDisarmTraps); + int reuse = DisarmTrapsReuseTime - GetSkillReuseTime(EQ::skills::SkillDisarmTraps); if (reuse < 1) reuse = 1; @@ -5383,7 +5383,7 @@ void Client::Handle_OP_DisarmTraps(const EQApplicationPacket *app) Log(Logs::General, Logs::Traps, "%s is attempting to disarm trap %d. Curdist is %0.2f maxdist is %0.2f", GetName(), trap->trap_id, curdist, max_radius); if (curdist <= max_radius) { - int uskill = GetSkill(EQEmu::skills::SkillDisarmTraps); + int uskill = GetSkill(EQ::skills::SkillDisarmTraps); if ((zone->random.Int(0, 49) + uskill) >= (zone->random.Int(0, 49) + trap->skill)) { success = SKILLUP_SUCCESS; @@ -5399,7 +5399,7 @@ void Client::Handle_OP_DisarmTraps(const EQApplicationPacket *app) trap->Trigger(this); } } - CheckIncreaseSkill(EQEmu::skills::SkillDisarmTraps, nullptr); + CheckIncreaseSkill(EQ::skills::SkillDisarmTraps, nullptr); return; } else @@ -5540,10 +5540,10 @@ void Client::Handle_OP_DumpName(const EQApplicationPacket *app) void Client::Handle_OP_Dye(const EQApplicationPacket *app) { - if (app->size != sizeof(EQEmu::TintProfile)) - printf("Wrong size of DyeStruct, Got: %i, Expected: %zu\n", app->size, sizeof(EQEmu::TintProfile)); + if (app->size != sizeof(EQ::TintProfile)) + printf("Wrong size of DyeStruct, Got: %i, Expected: %zu\n", app->size, sizeof(EQ::TintProfile)); else { - EQEmu::TintProfile* dye = (EQEmu::TintProfile*)app->pBuffer; + EQ::TintProfile* dye = (EQ::TintProfile*)app->pBuffer; DyeArmor(dye); } return; @@ -5615,7 +5615,7 @@ void Client::Handle_OP_EndLootRequest(const EQApplicationPacket *app) Entity* entity = entity_list.GetID(*((uint16*)app->pBuffer)); if (entity == 0) { Message(Chat::Red, "Error: OP_EndLootRequest: Corpse not found (ent = 0)"); - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD) + if (ClientVersion() >= EQ::versions::ClientVersion::SoD) Corpse::SendEndLootErrorPacket(this); else Corpse::SendLootReqErrorPacket(this); @@ -5685,7 +5685,7 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app) if (GetHP() <= 0) { mod_client_death_env(); - Death(0, 32000, SPELL_UNKNOWN, EQEmu::skills::SkillHandtoHand); + Death(0, 32000, SPELL_UNKNOWN, EQ::skills::SkillHandtoHand); } SendHPUpdate(); return; @@ -5729,7 +5729,7 @@ void Client::Handle_OP_FeignDeath(const EQApplicationPacket *app) } int reuse = FeignDeathReuseTime; - reuse -= GetSkillReuseTime(EQEmu::skills::SkillFeignDeath); + reuse -= GetSkillReuseTime(EQ::skills::SkillFeignDeath); if (reuse < 1) reuse = 1; @@ -5738,8 +5738,8 @@ void Client::Handle_OP_FeignDeath(const EQApplicationPacket *app) //BreakInvis(); - uint16 primfeign = GetSkill(EQEmu::skills::SkillFeignDeath); - uint16 secfeign = GetSkill(EQEmu::skills::SkillFeignDeath); + uint16 primfeign = GetSkill(EQ::skills::SkillFeignDeath); + uint16 secfeign = GetSkill(EQ::skills::SkillFeignDeath); if (primfeign > 100) { primfeign = 100; secfeign = secfeign - 100; @@ -5757,7 +5757,7 @@ void Client::Handle_OP_FeignDeath(const EQApplicationPacket *app) SetFeigned(true); } - CheckIncreaseSkill(EQEmu::skills::SkillFeignDeath, nullptr, 5); + CheckIncreaseSkill(EQ::skills::SkillFeignDeath, nullptr, 5); return; } @@ -7009,7 +7009,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app) if (Slot >= 0) { - EQEmu::ItemInstance* inst = GuildBanks->GetItem(GuildID(), GuildBankMainArea, Slot, 1); + EQ::ItemInstance* inst = GuildBanks->GetItem(GuildID(), GuildBankMainArea, Slot, 1); if (inst) { @@ -7029,7 +7029,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app) { GuildBankViewItem_Struct *gbvis = (GuildBankViewItem_Struct*)app->pBuffer; - EQEmu::ItemInstance* inst = GuildBanks->GetItem(GuildID(), gbvis->Area, gbvis->SlotID, 1); + EQ::ItemInstance* inst = GuildBanks->GetItem(GuildID(), gbvis->Area, gbvis->SlotID, 1); if (!inst) break; @@ -7052,7 +7052,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app) return; } - EQEmu::ItemInstance *CursorItemInst = GetInv().GetItem(EQEmu::invslot::slotCursor); + EQ::ItemInstance *CursorItemInst = GetInv().GetItem(EQ::invslot::slotCursor); bool Allowed = true; @@ -7065,7 +7065,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app) return; } - const EQEmu::ItemData* CursorItem = CursorItemInst->GetItem(); + const EQ::ItemData* CursorItem = CursorItemInst->GetItem(); if (!CursorItem->NoDrop || CursorItemInst->IsAttuned()) { @@ -7100,7 +7100,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app) { GuildBankDepositAck(false, sentAction); - DeleteItemInInventory(EQEmu::invslot::slotCursor, 0, false); + DeleteItemInInventory(EQ::invslot::slotCursor, 0, false); } break; @@ -7121,7 +7121,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app) case GuildBankWithdraw: { - if (GetInv()[EQEmu::invslot::slotCursor]) + if (GetInv()[EQ::invslot::slotCursor]) { MessageString(Chat::Red, GUILD_BANK_EMPTY_HANDS); @@ -7132,7 +7132,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app) GuildBankWithdrawItem_Struct *gbwis = (GuildBankWithdrawItem_Struct*)app->pBuffer; - EQEmu::ItemInstance* inst = GuildBanks->GetItem(GuildID(), gbwis->Area, gbwis->SlotID, gbwis->Quantity); + EQ::ItemInstance* inst = GuildBanks->GetItem(GuildID(), gbwis->Area, gbwis->SlotID, gbwis->Quantity); if (!inst) { @@ -7167,7 +7167,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app) { PushItemOnCursor(*inst); - SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketLimbo); + SendItemPacket(EQ::invslot::slotCursor, inst, ItemPacketLimbo); GuildBanks->DeleteItem(GuildID(), gbwis->Area, gbwis->SlotID, gbwis->Quantity); } @@ -7480,11 +7480,11 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app) gc->guildeqid = GuildID(); // Convert Membership Level between RoF and previous clients. - if (client->ClientVersion() < EQEmu::versions::ClientVersion::RoF && ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (client->ClientVersion() < EQ::versions::ClientVersion::RoF && ClientVersion() >= EQ::versions::ClientVersion::RoF) { gc->officer = 0; } - if (client->ClientVersion() >= EQEmu::versions::ClientVersion::RoF && ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (client->ClientVersion() >= EQ::versions::ClientVersion::RoF && ClientVersion() < EQ::versions::ClientVersion::RoF) { gc->officer = 8; } @@ -7525,7 +7525,7 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app) uint32 guildrank = gj->response; - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { if (gj->response > 9) { @@ -7560,11 +7560,11 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app) { Client* client = inviter->CastToClient(); // Convert Membership Level between RoF and previous clients. - if (client->ClientVersion() < EQEmu::versions::ClientVersion::RoF && ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (client->ClientVersion() < EQ::versions::ClientVersion::RoF && ClientVersion() >= EQ::versions::ClientVersion::RoF) { guildrank = 0; } - if (client->ClientVersion() >= EQEmu::versions::ClientVersion::RoF && ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (client->ClientVersion() >= EQ::versions::ClientVersion::RoF && ClientVersion() < EQ::versions::ClientVersion::RoF) { guildrank = 8; } @@ -7601,7 +7601,7 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app) guildrank = gj->response; - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { if (gj->response == 8) { @@ -8008,7 +8008,7 @@ void Client::Handle_OP_Hide(const EQApplicationPacket *app) return; } - if (!HasSkill(EQEmu::skills::SkillHide) && GetSkill(EQEmu::skills::SkillHide) == 0) + if (!HasSkill(EQ::skills::SkillHide) && GetSkill(EQ::skills::SkillHide) == 0) { //Can not be able to train hide but still have it from racial though return; //You cannot hide if you do not have hide @@ -8018,16 +8018,16 @@ void Client::Handle_OP_Hide(const EQApplicationPacket *app) Message(Chat::Red, "Ability recovery time not yet met."); return; } - int reuse = HideReuseTime - GetSkillReuseTime(EQEmu::skills::SkillHide); + int reuse = HideReuseTime - GetSkillReuseTime(EQ::skills::SkillHide); if (reuse < 1) reuse = 1; p_timers.Start(pTimerHide, reuse - 1); - float hidechance = ((GetSkill(EQEmu::skills::SkillHide) / 250.0f) + .25) * 100; + float hidechance = ((GetSkill(EQ::skills::SkillHide) / 250.0f) + .25) * 100; float random = zone->random.Real(0, 100); - CheckIncreaseSkill(EQEmu::skills::SkillHide, nullptr, 5); + CheckIncreaseSkill(EQ::skills::SkillHide, nullptr, 5); if (random < hidechance) { auto outapp = new EQApplicationPacket(OP_SpawnAppearance, sizeof(SpawnAppearance_Struct)); SpawnAppearance_Struct* sa_out = (SpawnAppearance_Struct*)outapp->pBuffer; @@ -8051,7 +8051,7 @@ void Client::Handle_OP_Hide(const EQApplicationPacket *app) Mob *evadetar = GetTarget(); if (!auto_attack && (evadetar && evadetar->CheckAggro(this) && evadetar->IsNPC())) { - if (zone->random.Int(0, 260) < (int)GetSkill(EQEmu::skills::SkillHide)) { + if (zone->random.Int(0, 260) < (int)GetSkill(EQ::skills::SkillHide)) { msg->string_id = EVADE_SUCCESS; RogueEvade(evadetar); } @@ -8143,17 +8143,17 @@ void Client::Handle_OP_InspectAnswer(const EQApplicationPacket *app) EQApplicationPacket* outapp = app->Copy(); InspectResponse_Struct* insr = (InspectResponse_Struct*)outapp->pBuffer; Mob* tmp = entity_list.GetMob(insr->TargetID); - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; int ornamentationAugtype = RuleI(Character, OrnamentationAugmentType); - for (int16 L = EQEmu::invslot::EQUIPMENT_BEGIN; L <= EQEmu::invslot::EQUIPMENT_END; L++) { - const EQEmu::ItemInstance* inst = GetInv().GetItem(L); + for (int16 L = EQ::invslot::EQUIPMENT_BEGIN; L <= EQ::invslot::EQUIPMENT_END; L++) { + const EQ::ItemInstance* inst = GetInv().GetItem(L); item = inst ? inst->GetItem() : nullptr; if (item) { strcpy(insr->itemnames[L], item->Name); if (inst && inst->GetOrnamentationAug(ornamentationAugtype)) { - const EQEmu::ItemData *aug_item = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem(); + const EQ::ItemData *aug_item = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem(); insr->itemicons[L] = aug_item->Icon; } else if (inst->GetOrnamentationIcon()) { @@ -8202,7 +8202,7 @@ void Client::Handle_OP_InspectRequest(const EQApplicationPacket *app) Mob* tmp = entity_list.GetMob(ins->TargetID); if (tmp != 0 && tmp->IsClient()) { - if (tmp->CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::SoF) { tmp->CastToClient()->QueuePacket(app); } // Send request to target + if (tmp->CastToClient()->ClientVersion() < EQ::versions::ClientVersion::SoF) { tmp->CastToClient()->QueuePacket(app); } // Send request to target // Inspecting an SoF or later client will make the server handle the request else { ProcessInspectRequest(tmp->CastToClient(), this); } } @@ -8242,7 +8242,7 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app) // todo: verify ivrs->link_hash based on a rule, in case we don't care about people being able to sniff data // from the item DB - const EQEmu::ItemData *item = database.GetItem(ivrs->item_id); + const EQ::ItemData *item = database.GetItem(ivrs->item_id); if (!item) { if (ivrs->item_id != SAYLINK_ITEM_ID) { Message(Chat::Red, "Error: The item for the link you have clicked on does not exist!"); @@ -8325,7 +8325,7 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app) } } - EQEmu::ItemInstance *inst = + EQ::ItemInstance *inst = database.CreateItem(item, item->MaxCharges, ivrs->augments[0], ivrs->augments[1], ivrs->augments[2], ivrs->augments[3], ivrs->augments[4], ivrs->augments[5]); if (inst) { @@ -8342,7 +8342,7 @@ void Client::Handle_OP_ItemLinkResponse(const EQApplicationPacket *app) return; } LDONItemViewRequest_Struct* item = (LDONItemViewRequest_Struct*)app->pBuffer; - EQEmu::ItemInstance* inst = database.CreateItem(item->item_id); + EQ::ItemInstance* inst = database.CreateItem(item->item_id); if (inst) { SendItemPacket(0, inst, ItemPacketViewLink); safe_delete(inst); @@ -8358,7 +8358,7 @@ void Client::Handle_OP_ItemName(const EQApplicationPacket *app) return; } ItemNamePacket_Struct *p = (ItemNamePacket_Struct*)app->pBuffer; - const EQEmu::ItemData *item = nullptr; + const EQ::ItemData *item = nullptr; if ((item = database.GetItem(p->item_id)) != nullptr) { auto outapp = new EQApplicationPacket(OP_ItemName, sizeof(ItemNamePacket_Struct)); p = (ItemNamePacket_Struct*)outapp->pBuffer; @@ -8374,7 +8374,7 @@ void Client::Handle_OP_ItemPreview(const EQApplicationPacket *app) VERIFY_PACKET_LENGTH(OP_ItemPreview, app, ItemPreview_Struct); ItemPreview_Struct *ips = (ItemPreview_Struct *)app->pBuffer; - const EQEmu::ItemData* item = database.GetItem(ips->itemid); + const EQ::ItemData* item = database.GetItem(ips->itemid); if (item) { auto outapp = new EQApplicationPacket(OP_ItemPreview, strlen(item->Name) + strlen(item->Lore) + @@ -8550,7 +8550,7 @@ void Client::Handle_OP_ItemPreview(const EQApplicationPacket *app) void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) { - using EQEmu::spells::CastingSlot; + using EQ::spells::CastingSlot; if (app->size != sizeof(ItemVerifyRequest_Struct)) { LogError("OP size error: OP_ItemVerifyRequest expected:[{}] got:[{}]", sizeof(ItemVerifyRequest_Struct), app->size); @@ -8585,14 +8585,14 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) return; } - const EQEmu::ItemInstance* inst = m_inv[slot_id]; + const EQ::ItemInstance* inst = m_inv[slot_id]; if (!inst) { Message(0, "Error: item not found in inventory slot #%i", slot_id); DeleteItemInInventory(slot_id, 0, true); return; } - const EQEmu::ItemData* item = inst->GetItem(); + const EQ::ItemData* item = inst->GetItem(); if (!item) { Message(0, "Error: item not found in inventory slot #%i", slot_id); DeleteItemInInventory(slot_id, 0, true); @@ -8631,9 +8631,9 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) LogDebug("OP ItemVerifyRequest: spell=[{}], target=[{}], inv=[{}]", spell_id, target_id, slot_id); - if (m_inv.SupportsClickCasting(slot_id) || ((item->ItemType == EQEmu::item::ItemTypePotion || item->PotionBelt) && m_inv.SupportsPotionBeltCasting(slot_id))) // sanity check + if (m_inv.SupportsClickCasting(slot_id) || ((item->ItemType == EQ::item::ItemTypePotion || item->PotionBelt) && m_inv.SupportsPotionBeltCasting(slot_id))) // sanity check { - EQEmu::ItemInstance* p_inst = (EQEmu::ItemInstance*)inst; + EQ::ItemInstance* p_inst = (EQ::ItemInstance*)inst; parse->EventItem(EVENT_ITEM_CLICK, this, p_inst, nullptr, "", slot_id); inst = m_inv[slot_id]; @@ -8644,43 +8644,43 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) int r; bool tryaug = false; - EQEmu::ItemInstance* clickaug = nullptr; - EQEmu::ItemData* augitem = nullptr; + EQ::ItemInstance* clickaug = nullptr; + EQ::ItemData* augitem = nullptr; - for (r = EQEmu::invaug::SOCKET_BEGIN; r <= EQEmu::invaug::SOCKET_END; r++) { - const EQEmu::ItemInstance* aug_i = inst->GetAugment(r); + for (r = EQ::invaug::SOCKET_BEGIN; r <= EQ::invaug::SOCKET_END; r++) { + const EQ::ItemInstance* aug_i = inst->GetAugment(r); if (!aug_i) continue; - const EQEmu::ItemData* aug = aug_i->GetItem(); + const EQ::ItemData* aug = aug_i->GetItem(); if (!aug) continue; - if ((aug->Click.Type == EQEmu::item::ItemEffectClick) || (aug->Click.Type == EQEmu::item::ItemEffectExpendable) || (aug->Click.Type == EQEmu::item::ItemEffectEquipClick) || (aug->Click.Type == EQEmu::item::ItemEffectClick2)) + if ((aug->Click.Type == EQ::item::ItemEffectClick) || (aug->Click.Type == EQ::item::ItemEffectExpendable) || (aug->Click.Type == EQ::item::ItemEffectEquipClick) || (aug->Click.Type == EQ::item::ItemEffectClick2)) { tryaug = true; - clickaug = (EQEmu::ItemInstance*)aug_i; - augitem = (EQEmu::ItemData*)aug; + clickaug = (EQ::ItemInstance*)aug_i; + augitem = (EQ::ItemData*)aug; spell_id = aug->Click.Effect; break; } } - if ((spell_id <= 0) && (item->ItemType != EQEmu::item::ItemTypeFood && item->ItemType != EQEmu::item::ItemTypeDrink && item->ItemType != EQEmu::item::ItemTypeAlcohol && item->ItemType != EQEmu::item::ItemTypeSpell)) + if ((spell_id <= 0) && (item->ItemType != EQ::item::ItemTypeFood && item->ItemType != EQ::item::ItemTypeDrink && item->ItemType != EQ::item::ItemTypeAlcohol && item->ItemType != EQ::item::ItemTypeSpell)) { LogDebug("Item with no effect right clicked by [{}]", GetName()); } else if (inst->IsClassCommon()) { - if (!RuleB(Skills, RequireTomeHandin) && item->ItemType == EQEmu::item::ItemTypeSpell && (strstr((const char*)item->Name, "Tome of ") || strstr((const char*)item->Name, "Skill: "))) + if (!RuleB(Skills, RequireTomeHandin) && item->ItemType == EQ::item::ItemTypeSpell && (strstr((const char*)item->Name, "Tome of ") || strstr((const char*)item->Name, "Skill: "))) { DeleteItemInInventory(slot_id, 1, true); TrainDiscipline(item->ID); } - else if (item->ItemType == EQEmu::item::ItemTypeSpell) + else if (item->ItemType == EQ::item::ItemTypeSpell) { return; } - else if ((item->Click.Type == EQEmu::item::ItemEffectClick) || (item->Click.Type == EQEmu::item::ItemEffectExpendable) || (item->Click.Type == EQEmu::item::ItemEffectEquipClick) || (item->Click.Type == EQEmu::item::ItemEffectClick2)) + else if ((item->Click.Type == EQ::item::ItemEffectClick) || (item->Click.Type == EQ::item::ItemEffectExpendable) || (item->Click.Type == EQ::item::ItemEffectEquipClick) || (item->Click.Type == EQ::item::ItemEffectClick2)) { if (inst->GetCharges() == 0) { @@ -8740,9 +8740,9 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) } else { - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD && !inst->IsEquipable(GetBaseRace(), GetClass())) + if (ClientVersion() >= EQ::versions::ClientVersion::SoD && !inst->IsEquipable(GetBaseRace(), GetClass())) { - if (item->ItemType != EQEmu::item::ItemTypeFood && item->ItemType != EQEmu::item::ItemTypeDrink && item->ItemType != EQEmu::item::ItemTypeAlcohol) + if (item->ItemType != EQ::item::ItemTypeFood && item->ItemType != EQ::item::ItemTypeDrink && item->ItemType != EQ::item::ItemTypeAlcohol) { LogDebug("Error: unknown item->Click.Type ([{}])", item->Click.Type); } @@ -8751,15 +8751,15 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) /* //This is food/drink - consume it - if (item->ItemType == EQEmu::item::ItemTypeFood && m_pp.hunger_level < 5000) + if (item->ItemType == EQ::item::ItemTypeFood && m_pp.hunger_level < 5000) { Consume(item, item->ItemType, slot_id, false); } - else if (item->ItemType == EQEmu::item::ItemTypeDrink && m_pp.thirst_level < 5000) + else if (item->ItemType == EQ::item::ItemTypeDrink && m_pp.thirst_level < 5000) { Consume(item, item->ItemType, slot_id, false); } - else if (item->ItemType == EQEmu::item::ItemTypeAlcohol) + else if (item->ItemType == EQ::item::ItemTypeAlcohol) { #if EQDEBUG >= 1 LogDebug("Drinking Alcohol from slot:[{}]", slot_id); @@ -8864,14 +8864,14 @@ void Client::Handle_OP_LDoNDisarmTraps(const EQApplicationPacket *app) Mob * target = GetTarget(); if (target->IsNPC()) { - if (HasSkill(EQEmu::skills::SkillDisarmTraps)) + if (HasSkill(EQ::skills::SkillDisarmTraps)) { if (DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) { Message(Chat::Red, "%s is too far away.", target->GetCleanName()); return; } - HandleLDoNDisarm(target->CastToNPC(), GetSkill(EQEmu::skills::SkillDisarmTraps), LDoNTypeMechanical); + HandleLDoNDisarm(target->CastToNPC(), GetSkill(EQ::skills::SkillDisarmTraps), LDoNTypeMechanical); } else Message(Chat::Red, "You do not have the disarm trap skill."); @@ -8897,14 +8897,14 @@ void Client::Handle_OP_LDoNPickLock(const EQApplicationPacket *app) Mob * target = GetTarget(); if (target->IsNPC()) { - if (HasSkill(EQEmu::skills::SkillPickLock)) + if (HasSkill(EQ::skills::SkillPickLock)) { if (DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) { Message(Chat::Red, "%s is too far away.", target->GetCleanName()); return; } - HandleLDoNPickLock(target->CastToNPC(), GetSkill(EQEmu::skills::SkillPickLock), LDoNTypeMechanical); + HandleLDoNPickLock(target->CastToNPC(), GetSkill(EQ::skills::SkillPickLock), LDoNTypeMechanical); } else Message(Chat::Red, "You do not have the pick locks skill."); @@ -8916,14 +8916,14 @@ void Client::Handle_OP_LDoNSenseTraps(const EQApplicationPacket *app) Mob * target = GetTarget(); if (target->IsNPC()) { - if (HasSkill(EQEmu::skills::SkillSenseTraps)) + if (HasSkill(EQ::skills::SkillSenseTraps)) { if (DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) { Message(Chat::Red, "%s is too far away.", target->GetCleanName()); return; } - HandleLDoNSenseTraps(target->CastToNPC(), GetSkill(EQEmu::skills::SkillSenseTraps), LDoNTypeMechanical); + HandleLDoNSenseTraps(target->CastToNPC(), GetSkill(EQ::skills::SkillSenseTraps), LDoNTypeMechanical); } else Message(Chat::Red, "You do not have the sense traps skill."); @@ -9279,7 +9279,7 @@ void Client::Handle_OP_LoadSpellSet(const EQApplicationPacket *app) } int i; LoadSpellSet_Struct* ss = (LoadSpellSet_Struct*)app->pBuffer; - for (i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; i++) { + for (i = 0; i < EQ::spells::SPELL_GEM_COUNT; i++) { if (ss->spell[i] != 0xFFFFFFFF) UnmemSpell(i, true); } @@ -9397,7 +9397,7 @@ void Client::Handle_OP_MemorizeSpell(const EQApplicationPacket *app) void Client::Handle_OP_Mend(const EQApplicationPacket *app) { - if (!HasSkill(EQEmu::skills::SkillMend)) + if (!HasSkill(EQ::skills::SkillMend)) return; if (!p_timers.Expired(&database, pTimerMend, false)) { @@ -9408,7 +9408,7 @@ void Client::Handle_OP_Mend(const EQApplicationPacket *app) int mendhp = GetMaxHP() / 4; int currenthp = GetHP(); - if (zone->random.Int(0, 199) < (int)GetSkill(EQEmu::skills::SkillMend)) { + if (zone->random.Int(0, 199) < (int)GetSkill(EQ::skills::SkillMend)) { int criticalchance = spellbonuses.CriticalMend + itembonuses.CriticalMend + aabonuses.CriticalMend; @@ -9427,7 +9427,7 @@ void Client::Handle_OP_Mend(const EQApplicationPacket *app) 0 skill - 25% chance to worsen 20 skill - 23% chance to worsen 50 skill - 16% chance to worsen */ - if ((GetSkill(EQEmu::skills::SkillMend) <= 75) && (zone->random.Int(GetSkill(EQEmu::skills::SkillMend), 100) < 75) && (zone->random.Int(1, 3) == 1)) + if ((GetSkill(EQ::skills::SkillMend) <= 75) && (zone->random.Int(GetSkill(EQ::skills::SkillMend), 100) < 75) && (zone->random.Int(1, 3) == 1)) { SetHP(currenthp > mendhp ? (GetHP() - mendhp) : 1); SendHPUpdate(); @@ -9437,7 +9437,7 @@ void Client::Handle_OP_Mend(const EQApplicationPacket *app) MessageString(Chat::LightBlue, MEND_FAIL); } - CheckIncreaseSkill(EQEmu::skills::SkillMend, nullptr, 10); + CheckIncreaseSkill(EQ::skills::SkillMend, nullptr, 10); return; } @@ -9486,7 +9486,7 @@ void Client::Handle_OP_MercenaryCommand(const EQApplicationPacket *app) //check to see if selected option is a valid stance slot (option is the slot the stance is in, not the actual stance) if (option >= 0 && option < numStances) { - merc->SetStance((EQEmu::constants::StanceType)mercTemplate->Stances[option]); + merc->SetStance((EQ::constants::StanceType)mercTemplate->Stances[option]); GetMercInfo().Stance = mercTemplate->Stances[option]; Log(Logs::General, Logs::Mercenaries, "Set Stance: %u for %s (%s)", merc->GetStance(), merc->GetName(), GetName()); @@ -9830,11 +9830,11 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app) MoveItem_Struct* mi = (MoveItem_Struct*)app->pBuffer; if (spellend_timer.Enabled() && casting_spell_id && !IsBardSong(casting_spell_id)) { - if (mi->from_slot != mi->to_slot && (mi->from_slot <= EQEmu::invslot::GENERAL_END || mi->from_slot > 39) && IsValidSlot(mi->from_slot) && IsValidSlot(mi->to_slot)) + if (mi->from_slot != mi->to_slot && (mi->from_slot <= EQ::invslot::GENERAL_END || mi->from_slot > 39) && IsValidSlot(mi->from_slot) && IsValidSlot(mi->to_slot)) { char *detect = nullptr; - const EQEmu::ItemInstance *itm_from = GetInv().GetItem(mi->from_slot); - const EQEmu::ItemInstance *itm_to = GetInv().GetItem(mi->to_slot); + const EQ::ItemInstance *itm_from = GetInv().GetItem(mi->from_slot); + const EQ::ItemInstance *itm_to = GetInv().GetItem(mi->to_slot); MakeAnyLenString(&detect, "Player issued a move item from %u(item id %u) to %u(item id %u) while casting %u.", mi->from_slot, itm_from ? itm_from->GetID() : 0, @@ -9851,8 +9851,8 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app) // Illegal bagslot usage checks. Currently, user only receives a message if this check is triggered. bool mi_hack = false; - if (mi->from_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN && mi->from_slot <= EQEmu::invbag::CURSOR_BAG_END) { - if (mi->from_slot >= EQEmu::invbag::CURSOR_BAG_BEGIN) { mi_hack = true; } + if (mi->from_slot >= EQ::invbag::GENERAL_BAGS_BEGIN && mi->from_slot <= EQ::invbag::CURSOR_BAG_END) { + if (mi->from_slot >= EQ::invbag::CURSOR_BAG_BEGIN) { mi_hack = true; } else { int16 from_parent = m_inv.CalcSlotId(mi->from_slot); if (!m_inv[from_parent]) { mi_hack = true; } @@ -9861,8 +9861,8 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app) } } - if (mi->to_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN && mi->to_slot <= EQEmu::invbag::CURSOR_BAG_END) { - if (mi->to_slot >= EQEmu::invbag::CURSOR_BAG_BEGIN) { mi_hack = true; } + if (mi->to_slot >= EQ::invbag::GENERAL_BAGS_BEGIN && mi->to_slot <= EQ::invbag::CURSOR_BAG_END) { + if (mi->to_slot >= EQ::invbag::CURSOR_BAG_BEGIN) { mi_hack = true; } else { int16 to_parent = m_inv.CalcSlotId(mi->to_slot); if (!m_inv[to_parent]) { mi_hack = true; } @@ -10280,16 +10280,16 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) { if (mypet->IsHeld()) { - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_HOLD_SET_OFF); mypet->SetHeld(false); } else { - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_HOLD_SET_ON); - if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) + if (m_ClientVersionBit & EQ::versions::maskUFAndLater) mypet->SayString(this, Chat::PetResponse, PET_NOW_HOLDING); else mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD); @@ -10303,10 +10303,10 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) } case PET_HOLD_ON: { if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && !mypet->IsHeld()) { - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_HOLD_SET_ON); - if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) + if (m_ClientVersionBit & EQ::versions::maskUFAndLater) mypet->SayString(this, Chat::PetResponse, PET_NOW_HOLDING); else mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD); @@ -10318,7 +10318,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) } case PET_HOLD_OFF: { if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && mypet->IsHeld()) { - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_HOLD_SET_OFF); mypet->SetHeld(false); } @@ -10328,13 +10328,13 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) { if (mypet->IsGHeld()) { - if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) + if (m_ClientVersionBit & EQ::versions::maskUFAndLater) MessageString(Chat::PetResponse, PET_OFF_GHOLD); mypet->SetGHeld(false); } else { - if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) { + if (m_ClientVersionBit & EQ::versions::maskUFAndLater) { MessageString(Chat::PetResponse, PET_ON_GHOLD); mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG); } else { @@ -10349,7 +10349,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) } case PET_GHOLD_ON: { if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) { - if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) { + if (m_ClientVersionBit & EQ::versions::maskUFAndLater) { MessageString(Chat::PetResponse, PET_ON_GHOLD); mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG); } else { @@ -10363,7 +10363,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) } case PET_GHOLD_OFF: { if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && mypet->IsGHeld()) { - if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) + if (m_ClientVersionBit & EQ::versions::maskUFAndLater) MessageString(Chat::PetResponse, PET_OFF_GHOLD); mypet->SetGHeld(false); } @@ -10375,13 +10375,13 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) break; if (mypet->IsNoCast()) { MessageString(Chat::PetResponse, PET_CASTING); - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_OFF); mypet->SetNoCast(false); } else { MessageString(Chat::PetResponse, PET_NOT_CASTING); - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_ON); mypet->SetNoCast(true); } @@ -10394,7 +10394,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) break; if (!mypet->IsNoCast()) { MessageString(Chat::PetResponse, PET_NOT_CASTING); - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_ON); mypet->SetNoCast(true); } @@ -10407,7 +10407,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) break; if (mypet->IsNoCast()) { MessageString(Chat::PetResponse, PET_CASTING); - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_OFF); mypet->SetNoCast(false); } @@ -10420,13 +10420,13 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) break; if (mypet->IsFocused()) { MessageString(Chat::PetResponse, PET_NOT_FOCUSING); - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_FOCUS_SET_OFF); mypet->SetFocused(false); } else { MessageString(Chat::PetResponse, PET_NOW_FOCUSING); - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_FOCUS_SET_ON); mypet->SetFocused(true); } @@ -10439,7 +10439,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) break; if (!mypet->IsFocused()) { MessageString(Chat::PetResponse, PET_NOW_FOCUSING); - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_FOCUS_SET_ON); mypet->SetFocused(true); } @@ -10452,7 +10452,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) break; if (mypet->IsFocused()) { MessageString(Chat::PetResponse, PET_NOT_FOCUSING); - if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater) + if (m_ClientVersionBit & EQ::versions::maskSoDAndLater) MessageString(Chat::PetResponse, PET_FOCUS_SET_OFF); mypet->SetFocused(false); } @@ -10741,7 +10741,7 @@ void Client::Handle_OP_PickPocket(const EQApplicationPacket *app) DumpPacket(app); } - if (!HasSkill(EQEmu::skills::SkillPickPockets)) + if (!HasSkill(EQ::skills::SkillPickPockets)) { return; } @@ -10766,7 +10766,7 @@ void Client::Handle_OP_PickPocket(const EQApplicationPacket *app) pick_out->coin = 0; pick_out->from = victim->GetID(); pick_out->to = GetID(); - pick_out->myskill = GetSkill(EQEmu::skills::SkillPickPockets); + pick_out->myskill = GetSkill(EQ::skills::SkillPickPockets); pick_out->type = 0; //if we do not send this packet the client will lock up and require the player to relog. QueuePacket(outapp); @@ -10779,7 +10779,7 @@ void Client::Handle_OP_PickPocket(const EQApplicationPacket *app) pick_out->coin = 0; pick_out->from = victim->GetID(); pick_out->to = GetID(); - pick_out->myskill = GetSkill(EQEmu::skills::SkillPickPockets); + pick_out->myskill = GetSkill(EQ::skills::SkillPickPockets); pick_out->type = 0; //if we do not send this packet the client will lock up and require the player to relog. QueuePacket(outapp); @@ -10795,7 +10795,7 @@ void Client::Handle_OP_PickPocket(const EQApplicationPacket *app) pick_out->coin = 0; pick_out->from = victim->GetID(); pick_out->to = GetID(); - pick_out->myskill = GetSkill(EQEmu::skills::SkillPickPockets); + pick_out->myskill = GetSkill(EQ::skills::SkillPickPockets); pick_out->type = 0; //if we do not send this packet the client will lock up and require the player to relog. QueuePacket(outapp); @@ -10829,7 +10829,7 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app) return; break; - case EQEmu::popupresponse::MOB_INFO_DISMISS: + case EQ::popupresponse::MOB_INFO_DISMISS: this->SetDisplayMobInfoWindow(false); this->Message(Chat::Yellow, "[DevTools] Window snoozed in this zone..."); break; @@ -10857,13 +10857,13 @@ void Client::Handle_OP_PotionBelt(const EQApplicationPacket *app) } MovePotionToBelt_Struct *mptbs = (MovePotionToBelt_Struct*)app->pBuffer; - if (!EQEmu::ValueWithin(mptbs->SlotNumber, 0U, 3U)) { + if (!EQ::ValueWithin(mptbs->SlotNumber, 0U, 3U)) { LogDebug("Client::Handle_OP_PotionBelt mptbs->SlotNumber out of range"); return; } if (mptbs->Action == 0) { - const EQEmu::ItemData *BaseItem = database.GetItem(mptbs->ItemID); + const EQ::ItemData *BaseItem = database.GetItem(mptbs->ItemID); if (BaseItem) { m_pp.potionbelt.Items[mptbs->SlotNumber].ID = BaseItem->ID; m_pp.potionbelt.Items[mptbs->SlotNumber].Icon = BaseItem->Icon; @@ -11024,30 +11024,30 @@ void Client::Handle_OP_QueryUCSServerStatus(const EQApplicationPacket *app) std::string buffer; std::string MailKey = database.GetMailKey(CharacterID(), true); - EQEmu::versions::UCSVersion ConnectionType = EQEmu::versions::ucsUnknown; + EQ::versions::UCSVersion ConnectionType = EQ::versions::ucsUnknown; // chat server packet switch (ClientVersion()) { - case EQEmu::versions::ClientVersion::Titanium: - ConnectionType = EQEmu::versions::ucsTitaniumChat; + case EQ::versions::ClientVersion::Titanium: + ConnectionType = EQ::versions::ucsTitaniumChat; break; - case EQEmu::versions::ClientVersion::SoF: - ConnectionType = EQEmu::versions::ucsSoFCombined; + case EQ::versions::ClientVersion::SoF: + ConnectionType = EQ::versions::ucsSoFCombined; break; - case EQEmu::versions::ClientVersion::SoD: - ConnectionType = EQEmu::versions::ucsSoDCombined; + case EQ::versions::ClientVersion::SoD: + ConnectionType = EQ::versions::ucsSoDCombined; break; - case EQEmu::versions::ClientVersion::UF: - ConnectionType = EQEmu::versions::ucsUFCombined; + case EQ::versions::ClientVersion::UF: + ConnectionType = EQ::versions::ucsUFCombined; break; - case EQEmu::versions::ClientVersion::RoF: - ConnectionType = EQEmu::versions::ucsRoFCombined; + case EQ::versions::ClientVersion::RoF: + ConnectionType = EQ::versions::ucsRoFCombined; break; - case EQEmu::versions::ClientVersion::RoF2: - ConnectionType = EQEmu::versions::ucsRoF2Combined; + case EQ::versions::ClientVersion::RoF2: + ConnectionType = EQ::versions::ucsRoF2Combined; break; default: - ConnectionType = EQEmu::versions::ucsUnknown; + ConnectionType = EQ::versions::ucsUnknown; break; } @@ -11069,8 +11069,8 @@ void Client::Handle_OP_QueryUCSServerStatus(const EQApplicationPacket *app) // mail server packet switch (ClientVersion()) { - case EQEmu::versions::ClientVersion::Titanium: - ConnectionType = EQEmu::versions::ucsTitaniumMail; + case EQ::versions::ClientVersion::Titanium: + ConnectionType = EQ::versions::ucsTitaniumMail; break; default: // retain value from previous switch @@ -11756,7 +11756,7 @@ void Client::Handle_OP_ReadBook(const EQApplicationPacket *app) } BookRequest_Struct* book = (BookRequest_Struct*)app->pBuffer; ReadBook(book); - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF) + if (ClientVersion() >= EQ::versions::ClientVersion::SoF) { EQApplicationPacket EndOfBook(OP_FinishWindow, 0); QueuePacket(&EndOfBook); @@ -12204,8 +12204,8 @@ void Client::Handle_OP_Sacrifice(const EQApplicationPacket *app) void Client::Handle_OP_SafeFallSuccess(const EQApplicationPacket *app) // bit of a misnomer, sent whenever safe fall is used (success of fail) { - if (HasSkill(EQEmu::skills::SkillSafeFall)) //this should only get called if the client has safe fall, but just in case... - CheckIncreaseSkill(EQEmu::skills::SkillSafeFall, nullptr); //check for skill up + if (HasSkill(EQ::skills::SkillSafeFall)) //this should only get called if the client has safe fall, but just in case... + CheckIncreaseSkill(EQ::skills::SkillSafeFall, nullptr); //check for skill up } void Client::Handle_OP_SafePoint(const EQApplicationPacket *app) @@ -12242,19 +12242,19 @@ void Client::Handle_OP_SelectTribute(const EQApplicationPacket *app) void Client::Handle_OP_SenseHeading(const EQApplicationPacket *app) { - if (!HasSkill(EQEmu::skills::SkillSenseHeading)) + if (!HasSkill(EQ::skills::SkillSenseHeading)) return; int chancemod = 0; - CheckIncreaseSkill(EQEmu::skills::SkillSenseHeading, nullptr, chancemod); + CheckIncreaseSkill(EQ::skills::SkillSenseHeading, nullptr, chancemod); return; } void Client::Handle_OP_SenseTraps(const EQApplicationPacket *app) { - if (!HasSkill(EQEmu::skills::SkillSenseTraps)) + if (!HasSkill(EQ::skills::SkillSenseTraps)) return; if (!p_timers.Expired(&database, pTimerSenseTraps, false)) { @@ -12262,7 +12262,7 @@ void Client::Handle_OP_SenseTraps(const EQApplicationPacket *app) return; } - int reuse = SenseTrapsReuseTime - GetSkillReuseTime(EQEmu::skills::SkillSenseTraps); + int reuse = SenseTrapsReuseTime - GetSkillReuseTime(EQ::skills::SkillSenseTraps); if (reuse < 1) reuse = 1; @@ -12272,10 +12272,10 @@ void Client::Handle_OP_SenseTraps(const EQApplicationPacket *app) float trap_curdist = 0; Trap* trap = entity_list.FindNearbyTrap(this, 800, trap_curdist); - CheckIncreaseSkill(EQEmu::skills::SkillSenseTraps, nullptr); + CheckIncreaseSkill(EQ::skills::SkillSenseTraps, nullptr); if (trap && trap->skill > 0) { - int uskill = GetSkill(EQEmu::skills::SkillSenseTraps); + int uskill = GetSkill(EQ::skills::SkillSenseTraps); if ((zone->random.Int(0, 99) + uskill) >= (zone->random.Int(0, 99) + trap->skill*0.75)) { auto diff = trap->m_Position - glm::vec3(GetPosition()); @@ -12494,13 +12494,13 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app) Shielding_Struct* shield = (Shielding_Struct*)app->pBuffer; shield_target = entity_list.GetMob(shield->target_id); bool ack = false; - EQEmu::ItemInstance* inst = GetInv().GetItem(EQEmu::invslot::slotSecondary); + EQ::ItemInstance* inst = GetInv().GetItem(EQ::invslot::slotSecondary); if (!shield_target) return; if (inst) { - const EQEmu::ItemData* shield = inst->GetItem(); - if (shield && shield->ItemType == EQEmu::item::ItemTypeShield) + const EQ::ItemData* shield = inst->GetItem(); + if (shield && shield->ItemType == EQ::item::ItemTypeShield) { for (int x = 0; x < 2; x++) { @@ -12603,7 +12603,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app) break; } } - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; uint32 prevcharges = 0; if (item_id == 0) { //check to see if its on the temporary table std::list tmp_merlist = zone->tmpmerchanttable[tmp->GetNPCTypeID()]; @@ -12664,7 +12664,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app) else charges = item->MaxCharges; - EQEmu::ItemInstance* inst = database.CreateItem(item, charges); + EQ::ItemInstance* inst = database.CreateItem(item, charges); int SinglePrice = 0; if (RuleB(Merchant, UsePriceMod)) @@ -12707,8 +12707,8 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app) // shouldn't we be reimbursing if these two fail? //make sure we are not completely full... - if (freeslotid == EQEmu::invslot::slotCursor) { - if (m_inv.GetItem(EQEmu::invslot::slotCursor) != nullptr) { + if (freeslotid == EQ::invslot::slotCursor) { + if (m_inv.GetItem(EQ::invslot::slotCursor) != nullptr) { Message(Chat::Red, "You do not have room for any more items."); safe_delete(outapp); safe_delete(inst); @@ -12785,7 +12785,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app) qsaudit->items[0].item_id = item->ID; qsaudit->items[0].charges = mpo->quantity; - const EQEmu::ItemInstance* audit_inst = m_inv[freeslotid]; + const EQ::ItemInstance* audit_inst = m_inv[freeslotid]; if (audit_inst) { qsaudit->items[0].aug_1 = audit_inst->GetAugmentItemID(0); @@ -12850,8 +12850,8 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app) uint32 itemid = GetItemIDAt(mp->itemslot); if (itemid == 0) return; - const EQEmu::ItemData* item = database.GetItem(itemid); - EQEmu::ItemInstance* inst = GetInv().GetItem(mp->itemslot); + const EQ::ItemData* item = database.GetItem(itemid); + EQ::ItemInstance* inst = GetInv().GetItem(mp->itemslot); if (!item || !inst) { Message(Chat::Red, "You seemed to have misplaced that item.."); return; @@ -12915,7 +12915,7 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app) int freeslot = 0; if (charges > 0 && (freeslot = zone->SaveTempItem(vendor->CastToNPC()->MerchantType, vendor->GetNPCTypeID(), itemid, charges, true)) > 0) { - EQEmu::ItemInstance* inst2 = inst->Clone(); + EQ::ItemInstance* inst2 = inst->Clone(); while (true) { if (inst2 == nullptr) @@ -13105,7 +13105,7 @@ void Client::Handle_OP_ShopRequest(const EQApplicationPacket *app) void Client::Handle_OP_Sneak(const EQApplicationPacket *app) { - if (!HasSkill(EQEmu::skills::SkillSneak) && GetSkill(EQEmu::skills::SkillSneak) == 0) { + if (!HasSkill(EQ::skills::SkillSneak) && GetSkill(EQ::skills::SkillSneak) == 0) { return; //You cannot sneak if you do not have sneak } @@ -13129,9 +13129,9 @@ void Client::Handle_OP_Sneak(const EQApplicationPacket *app) safe_delete(outapp); } else { - CheckIncreaseSkill(EQEmu::skills::SkillSneak, nullptr, 5); + CheckIncreaseSkill(EQ::skills::SkillSneak, nullptr, 5); } - float hidechance = ((GetSkill(EQEmu::skills::SkillSneak) / 300.0f) + .25) * 100; + float hidechance = ((GetSkill(EQ::skills::SkillSneak) / 300.0f) + .25) * 100; float random = zone->random.Real(0, 99); if (!was && random < hidechance) { sneaking = true; @@ -13172,9 +13172,9 @@ void Client::Handle_OP_SpawnAppearance(const EQApplicationPacket *app) if (sa->type == AT_Invis) { if (sa->parameter != 0) { - if (!HasSkill(EQEmu::skills::SkillHide) && GetSkill(EQEmu::skills::SkillHide) == 0) + if (!HasSkill(EQ::skills::SkillHide) && GetSkill(EQ::skills::SkillHide) == 0) { - if (ClientVersion() < EQEmu::versions::ClientVersion::SoF) + if (ClientVersion() < EQ::versions::ClientVersion::SoF) { char *hack_str = nullptr; MakeAnyLenString(&hack_str, "Player sent OP_SpawnAppearance with AT_Invis: %i", sa->parameter); @@ -13276,7 +13276,7 @@ void Client::Handle_OP_SpawnAppearance(const EQApplicationPacket *app) if (sa->parameter != 0) { - if (!HasSkill(EQEmu::skills::SkillSneak)) + if (!HasSkill(EQ::skills::SkillSneak)) { char *hack_str = nullptr; MakeAnyLenString(&hack_str, "Player sent OP_SpawnAppearance with AT_Sneak: %i", sa->parameter); @@ -13446,7 +13446,7 @@ void Client::Handle_OP_SwapSpell(const EQApplicationPacket *app) const SwapSpell_Struct* swapspell = (const SwapSpell_Struct*)app->pBuffer; int swapspelltemp; - const auto sbs = EQEmu::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize; + const auto sbs = EQ::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize; if (swapspell->from_slot < 0 || swapspell->from_slot >= sbs) return; if (swapspell->to_slot < 0 || swapspell->to_slot >= sbs) @@ -13748,10 +13748,10 @@ void Client::Handle_OP_Track(const EQApplicationPacket *app) if (GetClass() != RANGER && GetClass() != DRUID && GetClass() != BARD) return; - if (GetSkill(EQEmu::skills::SkillTracking) == 0) - SetSkill(EQEmu::skills::SkillTracking, 1); + if (GetSkill(EQ::skills::SkillTracking) == 0) + SetSkill(EQ::skills::SkillTracking, 1); else - CheckIncreaseSkill(EQEmu::skills::SkillTracking, nullptr, 15); + CheckIncreaseSkill(EQ::skills::SkillTracking, nullptr, 15); if (!entity_list.MakeTrackPacket(this)) LogError("Unable to generate OP_Track packet requested by client"); @@ -14036,7 +14036,7 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app) TradeItemsValid = false; break; } - const EQEmu::ItemData *Item = database.GetItem(gis->Items[i]); + const EQ::ItemData *Item = database.GetItem(gis->Items[i]); if (!Item) { Message(Chat::Red, "Unexpected error. Unable to start trader mode"); @@ -14076,7 +14076,7 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app) this->Trader_StartTrader(); // This refreshes the Trader window to display the End Trader button - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { auto outapp = new EQApplicationPacket(OP_Trader, sizeof(TraderStatus_Struct)); TraderStatus_Struct* tss = (TraderStatus_Struct*)outapp->pBuffer; @@ -14572,7 +14572,7 @@ void Client::Handle_OP_WearChange(const EQApplicationPacket *app) return; // Hero Forge ID needs to be fixed here as RoF2 appears to send an incorrect value. - if (wc->hero_forge_model != 0 && wc->wear_slot_id >= 0 && wc->wear_slot_id < EQEmu::textures::weaponPrimary) + if (wc->hero_forge_model != 0 && wc->wear_slot_id >= 0 && wc->wear_slot_id < EQ::textures::weaponPrimary) wc->hero_forge_model = GetHerosForgeModel(wc->wear_slot_id); // we could maybe ignore this and just send our own from moveitem diff --git a/zone/client_process.cpp b/zone/client_process.cpp index d8ec451a9..29a826f0e 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -112,7 +112,7 @@ bool Client::Process() { HandleRespawnFromHover(0); } - if (IsTracking() && (ClientVersion() >= EQEmu::versions::ClientVersion::SoD) && TrackingTimer.Check()) + if (IsTracking() && (ClientVersion() >= EQ::versions::ClientVersion::SoD) && TrackingTimer.Check()) DoTracking(); // SendHPUpdate calls hpupdate_timer.Start so it can delay this timer, so lets not reset with the check @@ -286,10 +286,10 @@ bool Client::Process() { } if (AutoFireEnabled()) { - EQEmu::ItemInstance *ranged = GetInv().GetItem(EQEmu::invslot::slotRange); + EQ::ItemInstance *ranged = GetInv().GetItem(EQ::invslot::slotRange); if (ranged) { - if (ranged->GetItem() && ranged->GetItem()->ItemType == EQEmu::item::ItemTypeBow) { + if (ranged->GetItem() && ranged->GetItem()->ItemType == EQ::item::ItemTypeBow) { if (ranged_timer.Check(false)) { if (GetTarget() && (GetTarget()->IsNPC() || GetTarget()->IsClient())) { if (GetTarget()->InFrontMob(this, GetTarget()->GetX(), GetTarget()->GetY())) { @@ -309,7 +309,7 @@ bool Client::Process() { ranged_timer.Start(); } } - else if (ranged->GetItem() && (ranged->GetItem()->ItemType == EQEmu::item::ItemTypeLargeThrowing || ranged->GetItem()->ItemType == EQEmu::item::ItemTypeSmallThrowing)) { + else if (ranged->GetItem() && (ranged->GetItem()->ItemType == EQ::item::ItemTypeLargeThrowing || ranged->GetItem()->ItemType == EQ::item::ItemTypeSmallThrowing)) { if (ranged_timer.Check(false)) { if (GetTarget() && (GetTarget()->IsNPC() || GetTarget()->IsClient())) { if (GetTarget()->InFrontMob(this, GetTarget()->GetX(), GetTarget()->GetY())) { @@ -374,11 +374,11 @@ bool Client::Process() { } else if (auto_attack_target->GetHP() > -10) // -10 so we can watch people bleed in PvP { - EQEmu::ItemInstance *wpn = GetInv().GetItem(EQEmu::invslot::slotPrimary); - TryWeaponProc(wpn, auto_attack_target, EQEmu::invslot::slotPrimary); - TriggerDefensiveProcs(auto_attack_target, EQEmu::invslot::slotPrimary, false); + EQ::ItemInstance *wpn = GetInv().GetItem(EQ::invslot::slotPrimary); + TryWeaponProc(wpn, auto_attack_target, EQ::invslot::slotPrimary); + TriggerDefensiveProcs(auto_attack_target, EQ::invslot::slotPrimary, false); - DoAttackRounds(auto_attack_target, EQEmu::invslot::slotPrimary); + DoAttackRounds(auto_attack_target, EQ::invslot::slotPrimary); if (CheckAATimer(aaTimerRampage)) { entity_list.AEAttack(this, 30); } @@ -413,12 +413,12 @@ bool Client::Process() { //you can't see your target } else if (auto_attack_target->GetHP() > -10) { - CheckIncreaseSkill(EQEmu::skills::SkillDualWield, auto_attack_target, -10); + CheckIncreaseSkill(EQ::skills::SkillDualWield, auto_attack_target, -10); if (CheckDualWield()) { - EQEmu::ItemInstance *wpn = GetInv().GetItem(EQEmu::invslot::slotSecondary); - TryWeaponProc(wpn, auto_attack_target, EQEmu::invslot::slotSecondary); + EQ::ItemInstance *wpn = GetInv().GetItem(EQ::invslot::slotSecondary); + TryWeaponProc(wpn, auto_attack_target, EQ::invslot::slotSecondary); - DoAttackRounds(auto_attack_target, EQEmu::invslot::slotSecondary); + DoAttackRounds(auto_attack_target, EQ::invslot::slotSecondary); } } } @@ -722,10 +722,10 @@ void Client::BulkSendInventoryItems() { // LINKDEAD TRADE ITEMS // Move trade slot items back into normal inventory..need them there now for the proceeding validity checks - for (int16 slot_id = EQEmu::invslot::TRADE_BEGIN; slot_id <= EQEmu::invslot::TRADE_END; slot_id++) { - EQEmu::ItemInstance* inst = m_inv.PopItem(slot_id); + for (int16 slot_id = EQ::invslot::TRADE_BEGIN; slot_id <= EQ::invslot::TRADE_END; slot_id++) { + EQ::ItemInstance* inst = m_inv.PopItem(slot_id); if(inst) { - bool is_arrow = (inst->GetItem()->ItemType == EQEmu::item::ItemTypeArrow) ? true : false; + bool is_arrow = (inst->GetItem()->ItemType == EQ::item::ItemTypeArrow) ? true : false; int16 free_slot_id = m_inv.FindFreeSlot(inst->IsClassBag(), true, inst->GetItem()->Size, is_arrow); LogInventory("Incomplete Trade Transaction: Moving [{}] from slot [{}] to [{}]", inst->GetItem()->Name, slot_id, free_slot_id); PutItemInInventory(free_slot_id, *inst, false); @@ -744,12 +744,12 @@ void Client::BulkSendInventoryItems() RemoveDuplicateLore(false); MoveSlotNotAllowed(false); - EQEmu::OutBuffer ob; - EQEmu::OutBuffer::pos_type last_pos = ob.tellp(); + EQ::OutBuffer ob; + EQ::OutBuffer::pos_type last_pos = ob.tellp(); // Possessions items - for (int16 slot_id = EQEmu::invslot::POSSESSIONS_BEGIN; slot_id <= EQEmu::invslot::POSSESSIONS_END; slot_id++) { - const EQEmu::ItemInstance* inst = m_inv[slot_id]; + for (int16 slot_id = EQ::invslot::POSSESSIONS_BEGIN; slot_id <= EQ::invslot::POSSESSIONS_END; slot_id++) { + const EQ::ItemInstance* inst = m_inv[slot_id]; if (!inst) continue; @@ -762,8 +762,8 @@ void Client::BulkSendInventoryItems() } // Bank items - for (int16 slot_id = EQEmu::invslot::BANK_BEGIN; slot_id <= EQEmu::invslot::BANK_END; slot_id++) { - const EQEmu::ItemInstance* inst = m_inv[slot_id]; + for (int16 slot_id = EQ::invslot::BANK_BEGIN; slot_id <= EQ::invslot::BANK_END; slot_id++) { + const EQ::ItemInstance* inst = m_inv[slot_id]; if (!inst) continue; @@ -776,8 +776,8 @@ void Client::BulkSendInventoryItems() } // SharedBank items - for (int16 slot_id = EQEmu::invslot::SHARED_BANK_BEGIN; slot_id <= EQEmu::invslot::SHARED_BANK_END; slot_id++) { - const EQEmu::ItemInstance* inst = m_inv[slot_id]; + for (int16 slot_id = EQ::invslot::SHARED_BANK_BEGIN; slot_id <= EQ::invslot::SHARED_BANK_END; slot_id++) { + const EQ::ItemInstance* inst = m_inv[slot_id]; if (!inst) continue; @@ -797,12 +797,12 @@ void Client::BulkSendInventoryItems() } void Client::BulkSendMerchantInventory(int merchant_id, int npcid) { - const EQEmu::ItemData* handyitem = nullptr; + const EQ::ItemData* handyitem = nullptr; uint32 numItemSlots = 80; //The max number of items passed in the transaction. - if (m_ClientVersionBit & EQEmu::versions::maskRoFAndLater) { // RoF+ can send 200 items + if (m_ClientVersionBit & EQ::versions::maskRoFAndLater) { // RoF+ can send 200 items numItemSlots = 200; } - const EQEmu::ItemData *item = nullptr; + const EQ::ItemData *item = nullptr; std::list merlist = zone->merchanttable[merchant_id]; std::list::const_iterator itr; Mob* merch = entity_list.GetMobByNpcTypeID(npcid); @@ -851,7 +851,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) { int charges = 1; if (item->IsClassCommon()) charges = item->MaxCharges; - EQEmu::ItemInstance* inst = database.CreateItem(item, charges); + EQ::ItemInstance* inst = database.CreateItem(item, charges); if (inst) { if (RuleB(Merchant, UsePriceMod)) { inst->SetPrice((item->Price * (RuleR(Merchant, SellCostMod)) * item->SellRate * Client::CalcPriceMod(merch, false))); @@ -892,7 +892,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) { // charges=ml.charges; //else charges = item->MaxCharges; - EQEmu::ItemInstance* inst = database.CreateItem(item, charges); + EQ::ItemInstance* inst = database.CreateItem(item, charges); if (inst) { if (RuleB(Merchant, UsePriceMod)) { inst->SetPrice((item->Price * (RuleR(Merchant, SellCostMod)) * item->SellRate * Client::CalcPriceMod(merch, false))); @@ -1066,11 +1066,11 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app) switch(memspell->scribing) { case memSpellScribing: { // scribing spell to book - const EQEmu::ItemInstance* inst = m_inv[EQEmu::invslot::slotCursor]; + const EQ::ItemInstance* inst = m_inv[EQ::invslot::slotCursor]; if (inst && inst->IsClassCommon()) { - const EQEmu::ItemData* item = inst->GetItem(); + const EQ::ItemData* item = inst->GetItem(); if (RuleB(Character, RestrictSpellScribing) && !item->IsEquipable(GetRace(), GetClass())) { MessageString(Chat::Red, CANNOT_USE_ITEM); @@ -1080,7 +1080,7 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app) if(item && item->Scroll.Effect == (int32)(memspell->spell_id)) { ScribeSpell(memspell->spell_id, memspell->slot); - DeleteItemInInventory(EQEmu::invslot::slotCursor, 1, true); + DeleteItemInInventory(EQ::invslot::slotCursor, 1, true); } else Message(0,"Scribing spell: inst exists but item does not or spell ids do not match."); @@ -1119,7 +1119,7 @@ void Client::CancelSneakHide() // The later clients send back a OP_Hide (this has a size but data is 0) // as well as OP_SpawnAppearance with AT_Invis and one with AT_Sneak // So we don't have to handle any of those flags - if (ClientVersionBit() & EQEmu::versions::maskSoFAndEarlier) + if (ClientVersionBit() & EQ::versions::maskSoFAndEarlier) sneaking = false; } } @@ -1486,19 +1486,19 @@ void Client::OPGMTraining(const EQApplicationPacket *app) // if this for-loop acts up again (crashes linux), try enabling the before and after #pragmas //#pragma GCC push_options //#pragma GCC optimize ("O0") - for (int sk = EQEmu::skills::Skill1HBlunt; sk <= EQEmu::skills::HIGHEST_SKILL; ++sk) { - if (sk == EQEmu::skills::SkillTinkering && GetRace() != GNOME) { + for (int sk = EQ::skills::Skill1HBlunt; sk <= EQ::skills::HIGHEST_SKILL; ++sk) { + if (sk == EQ::skills::SkillTinkering && GetRace() != GNOME) { gmtrain->skills[sk] = 0; //Non gnomes can't tinker! } else { - gmtrain->skills[sk] = GetMaxSkillAfterSpecializationRules((EQEmu::skills::SkillType)sk, MaxSkill((EQEmu::skills::SkillType)sk, GetClass(), RuleI(Character, MaxLevel))); + gmtrain->skills[sk] = GetMaxSkillAfterSpecializationRules((EQ::skills::SkillType)sk, MaxSkill((EQ::skills::SkillType)sk, GetClass(), RuleI(Character, MaxLevel))); //this is the highest level that the trainer can train you to, this is enforced clientside so we can't just //Set it to 1 with CanHaveSkill or you wont be able to train past 1. } } - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF2 && GetClass() == BERSERKER) { - gmtrain->skills[EQEmu::skills::Skill1HPiercing] = gmtrain->skills[EQEmu::skills::Skill2HPiercing]; - gmtrain->skills[EQEmu::skills::Skill2HPiercing] = 0; + if (ClientVersion() < EQ::versions::ClientVersion::RoF2 && GetClass() == BERSERKER) { + gmtrain->skills[EQ::skills::Skill1HPiercing] = gmtrain->skills[EQ::skills::Skill2HPiercing]; + gmtrain->skills[EQ::skills::Skill2HPiercing] = 0; } //#pragma GCC pop_options @@ -1587,14 +1587,14 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app) else if (gmskill->skillbank == 0x00) { // normal skills go here - if (gmskill->skill_id > EQEmu::skills::HIGHEST_SKILL) + if (gmskill->skill_id > EQ::skills::HIGHEST_SKILL) { std::cout << "Wrong Training Skill (abilities)" << std::endl; DumpPacket(app); return; } - EQEmu::skills::SkillType skill = (EQEmu::skills::SkillType)gmskill->skill_id; + EQ::skills::SkillType skill = (EQ::skills::SkillType)gmskill->skill_id; if(!CanHaveSkill(skill)) { LogSkills("Tried to train skill [{}], which is not allowed", skill); @@ -1619,27 +1619,27 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app) SetSkill(skill, t_level); } else { switch(skill) { - case EQEmu::skills::SkillBrewing: - case EQEmu::skills::SkillMakePoison: - case EQEmu::skills::SkillTinkering: - case EQEmu::skills::SkillResearch: - case EQEmu::skills::SkillAlchemy: - case EQEmu::skills::SkillBaking: - case EQEmu::skills::SkillTailoring: - case EQEmu::skills::SkillBlacksmithing: - case EQEmu::skills::SkillFletching: - case EQEmu::skills::SkillJewelryMaking: - case EQEmu::skills::SkillPottery: + case EQ::skills::SkillBrewing: + case EQ::skills::SkillMakePoison: + case EQ::skills::SkillTinkering: + case EQ::skills::SkillResearch: + case EQ::skills::SkillAlchemy: + case EQ::skills::SkillBaking: + case EQ::skills::SkillTailoring: + case EQ::skills::SkillBlacksmithing: + case EQ::skills::SkillFletching: + case EQ::skills::SkillJewelryMaking: + case EQ::skills::SkillPottery: if(skilllevel >= RuleI(Skills, MaxTrainTradeskills)) { MessageString(Chat::Red, MORE_SKILLED_THAN_I, pTrainer->GetCleanName()); return; } break; - case EQEmu::skills::SkillSpecializeAbjure: - case EQEmu::skills::SkillSpecializeAlteration: - case EQEmu::skills::SkillSpecializeConjuration: - case EQEmu::skills::SkillSpecializeDivination: - case EQEmu::skills::SkillSpecializeEvocation: + case EQ::skills::SkillSpecializeAbjure: + case EQ::skills::SkillSpecializeAlteration: + case EQ::skills::SkillSpecializeConjuration: + case EQ::skills::SkillSpecializeDivination: + case EQ::skills::SkillSpecializeEvocation: if(skilllevel >= RuleI(Skills, MaxTrainSpecializations)) { MessageString(Chat::Red, MORE_SKILLED_THAN_I, pTrainer->GetCleanName()); return; @@ -1656,7 +1656,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app) return; } - if (gmskill->skill_id >= EQEmu::skills::SkillSpecializeAbjure && gmskill->skill_id <= EQEmu::skills::SkillSpecializeEvocation) + if (gmskill->skill_id >= EQ::skills::SkillSpecializeAbjure && gmskill->skill_id <= EQ::skills::SkillSpecializeEvocation) { int MaxSpecSkill = GetMaxSkillAfterSpecializationRules(skill, MaxSkillValue); if (skilllevel >= MaxSpecSkill) @@ -1680,7 +1680,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app) } } - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF) { + if (ClientVersion() >= EQ::versions::ClientVersion::SoF) { // The following packet decreases the skill points left in the Training Window and // produces the 'You have increased your skill / learned the basics of' message. // @@ -1694,7 +1694,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app) gmtsc->SkillID += 100; } else - gmtsc->NewSkill = (GetRawSkill((EQEmu::skills::SkillType)gmtsc->SkillID) == 1); + gmtsc->NewSkill = (GetRawSkill((EQ::skills::SkillType)gmtsc->SkillID) == 1); gmtsc->Cost = Cost; @@ -1775,8 +1775,8 @@ void Client::DoManaRegen() { if (GetMana() >= max_mana && spellbonuses.ManaRegen >= 0) return; - if (GetMana() < max_mana && (IsSitting() || CanMedOnHorse()) && HasSkill(EQEmu::skills::SkillMeditate)) - CheckIncreaseSkill(EQEmu::skills::SkillMeditate, nullptr, -5); + if (GetMana() < max_mana && (IsSitting() || CanMedOnHorse()) && HasSkill(EQ::skills::SkillMeditate)) + CheckIncreaseSkill(EQ::skills::SkillMeditate, nullptr, -5); SetMana(GetMana() + CalcManaRegen()); CheckManaEndUpdate(); @@ -1794,11 +1794,11 @@ void Client::DoStaminaHungerUpdate() if (GetHorseId() != 0) loss *= 3; - m_pp.hunger_level = EQEmu::Clamp(m_pp.hunger_level - loss, 0, 6000); - m_pp.thirst_level = EQEmu::Clamp(m_pp.thirst_level - loss, 0, 6000); + m_pp.hunger_level = EQ::Clamp(m_pp.hunger_level - loss, 0, 6000); + m_pp.thirst_level = EQ::Clamp(m_pp.thirst_level - loss, 0, 6000); if (spellbonuses.hunger) { - m_pp.hunger_level = EQEmu::ClampLower(m_pp.hunger_level, 3500); - m_pp.thirst_level = EQEmu::ClampLower(m_pp.thirst_level, 3500); + m_pp.hunger_level = EQ::ClampLower(m_pp.hunger_level, 3500); + m_pp.thirst_level = EQ::ClampLower(m_pp.thirst_level, 3500); } sta->food = m_pp.hunger_level; sta->water = m_pp.thirst_level; @@ -2113,7 +2113,7 @@ void Client::ClearHover() entity_list.QueueClients(this, outapp, false); safe_delete(outapp); - if (IsClient() && CastToClient()->ClientVersionBit() & EQEmu::versions::maskUFAndLater) + if (IsClient() && CastToClient()->ClientVersionBit() & EQ::versions::maskUFAndLater) { EQApplicationPacket *outapp = MakeBuffsPacket(false); CastToClient()->FastQueuePacket(&outapp); diff --git a/zone/command.cpp b/zone/command.cpp index 7157434c9..09aa704b1 100755 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -1569,7 +1569,7 @@ void command_list(Client *c, const Seperator *sep) c->Message( 0, "| %s | ID %5d | %s | x %.0f | y %0.f | z %.0f", - EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), entity->GetID(), entity->GetName(), entity->GetX(), @@ -1610,7 +1610,7 @@ void command_list(Client *c, const Seperator *sep) c->Message( 0, "| %s | ID %5d | %s | x %.0f | y %0.f | z %.0f", - EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), entity->GetID(), entity->GetName(), entity->GetX(), @@ -1651,7 +1651,7 @@ void command_list(Client *c, const Seperator *sep) c->Message( 0, "| %s | ID %5d | %s | x %.0f | y %0.f | z %.0f", - EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), entity->GetID(), entity->GetName(), entity->GetX(), @@ -1692,7 +1692,7 @@ void command_list(Client *c, const Seperator *sep) c->Message( 0, "| %s | Entity ID %5d | Door ID %i | %s | x %.0f | y %0.f | z %.0f", - EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), entity->GetID(), entity->GetDoorID(), entity->GetDoorName(), @@ -1734,7 +1734,7 @@ void command_list(Client *c, const Seperator *sep) c->Message( 0, "| %s | Entity ID %5d | Object DBID %i | %s | x %.0f | y %0.f | z %.0f", - EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), entity->GetID(), entity->GetDBID(), entity->GetModelName(), @@ -2624,7 +2624,7 @@ void command_showskills(Client *c, const Seperator *sep) t=c->GetTarget()->CastToClient(); c->Message(Chat::White, "Skills for %s", t->GetName()); - for (EQEmu::skills::SkillType i = EQEmu::skills::Skill1HBlunt; i <= EQEmu::skills::HIGHEST_SKILL; i = (EQEmu::skills::SkillType)(i + 1)) + for (EQ::skills::SkillType i = EQ::skills::Skill1HBlunt; i <= EQ::skills::HIGHEST_SKILL; i = (EQ::skills::SkillType)(i + 1)) c->Message(Chat::White, "Skill [%d] is at [%d] - %u", i, t->GetSkill(i), t->GetRawSkill(i)); } @@ -2693,14 +2693,14 @@ void command_castspell(Client *c, const Seperator *sep) else if (c->GetTarget() == 0) if(c->Admin() >= commandInstacast) - c->SpellFinished(spellid, 0, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spellid].ResistDiff); + c->SpellFinished(spellid, 0, EQ::spells::CastingSlot::Item, 0, -1, spells[spellid].ResistDiff); else - c->CastSpell(spellid, 0, EQEmu::spells::CastingSlot::Item, 0); + c->CastSpell(spellid, 0, EQ::spells::CastingSlot::Item, 0); else if(c->Admin() >= commandInstacast) - c->SpellFinished(spellid, c->GetTarget(), EQEmu::spells::CastingSlot::Item, 0, -1, spells[spellid].ResistDiff); + c->SpellFinished(spellid, c->GetTarget(), EQ::spells::CastingSlot::Item, 0, -1, spells[spellid].ResistDiff); else - c->CastSpell(spellid, c->GetTarget()->GetID(), EQEmu::spells::CastingSlot::Item, 0); + c->CastSpell(spellid, c->GetTarget()->GetID(), EQ::spells::CastingSlot::Item, 0); } } @@ -2772,20 +2772,20 @@ void command_setskill(Client *c, const Seperator *sep) c->Message(Chat::White, "Error: #setskill: Target must be a client."); } else if ( - !sep->IsNumber(1) || atoi(sep->arg[1]) < 0 || atoi(sep->arg[1]) > EQEmu::skills::HIGHEST_SKILL || + !sep->IsNumber(1) || atoi(sep->arg[1]) < 0 || atoi(sep->arg[1]) > EQ::skills::HIGHEST_SKILL || !sep->IsNumber(2) || atoi(sep->arg[2]) < 0 || atoi(sep->arg[2]) > HIGHEST_CAN_SET_SKILL ) { c->Message(Chat::White, "Usage: #setskill skill x "); - c->Message(Chat::White, " skill = 0 to %d", EQEmu::skills::HIGHEST_SKILL); + c->Message(Chat::White, " skill = 0 to %d", EQ::skills::HIGHEST_SKILL); c->Message(Chat::White, " x = 0 to %d", HIGHEST_CAN_SET_SKILL); } else { LogInfo("Set skill request from [{}], target:[{}] skill_id:[{}] value:[{}]", c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) ); int skill_num = atoi(sep->arg[1]); uint16 skill_value = atoi(sep->arg[2]); - if (skill_num <= EQEmu::skills::HIGHEST_SKILL) - c->GetTarget()->CastToClient()->SetSkill((EQEmu::skills::SkillType)skill_num, skill_value); + if (skill_num <= EQ::skills::HIGHEST_SKILL) + c->GetTarget()->CastToClient()->SetSkill((EQ::skills::SkillType)skill_num, skill_value); } } @@ -2803,7 +2803,7 @@ void command_setskillall(Client *c, const Seperator *sep) if (c->Admin() >= commandSetSkillsOther || c->GetTarget()==c || c->GetTarget()==0) { LogInfo("Set ALL skill request from [{}], target:[{}]", c->GetName(), c->GetTarget()->GetName()); uint16 level = atoi(sep->arg[1]); - for (EQEmu::skills::SkillType skill_num = EQEmu::skills::Skill1HBlunt; skill_num <= EQEmu::skills::HIGHEST_SKILL; skill_num = (EQEmu::skills::SkillType)(skill_num + 1)) { + for (EQ::skills::SkillType skill_num = EQ::skills::Skill1HBlunt; skill_num <= EQ::skills::HIGHEST_SKILL; skill_num = (EQ::skills::SkillType)(skill_num + 1)) { c->GetTarget()->CastToClient()->SetSkill(skill_num, level); } } @@ -2992,7 +2992,7 @@ void command_spawneditmass(Client *c, const Seperator *sep) if (found_count > 0) { c->Message( Chat::Yellow, "To apply these changes, click <%s> or type [%s]", - EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(), saylink.c_str() ); } @@ -3060,14 +3060,14 @@ void command_texture(Client *c, const Seperator *sep) // Player Races Wear Armor, so Wearchange is sent instead int i; if (!c->GetTarget()) - for (i = EQEmu::textures::textureBegin; i <= EQEmu::textures::LastTintableTexture; i++) + for (i = EQ::textures::textureBegin; i <= EQ::textures::LastTintableTexture; i++) { c->SendTextureWC(i, texture); } else if ((c->GetTarget()->GetModel() > 0 && c->GetTarget()->GetModel() <= 12) || c->GetTarget()->GetModel() == 128 || c->GetTarget()->GetModel() == 130 || c->GetTarget()->GetModel() == 330 || c->GetTarget()->GetModel() == 522) { - for (i = EQEmu::textures::textureBegin; i <= EQEmu::textures::LastTintableTexture; i++) + for (i = EQ::textures::textureBegin; i <= EQ::textures::LastTintableTexture; i++) { c->GetTarget()->SendTextureWC(i, texture); } @@ -3249,15 +3249,15 @@ void command_peekinv(Client *c, const Seperator *sep) static const char* scope_prefix[] = { "equip", "gen", "cursor", "limbo", "trib", "bank", "shbank", "trade", "world" }; static const int16 scope_range[][2] = { - { EQEmu::invslot::EQUIPMENT_BEGIN, EQEmu::invslot::EQUIPMENT_END }, - { EQEmu::invslot::GENERAL_BEGIN, EQEmu::invslot::GENERAL_END }, - { EQEmu::invslot::slotCursor, EQEmu::invslot::slotCursor }, - { EQEmu::invslot::SLOT_INVALID, EQEmu::invslot::SLOT_INVALID }, - { EQEmu::invslot::TRIBUTE_BEGIN, EQEmu::invslot::TRIBUTE_END }, - { EQEmu::invslot::BANK_BEGIN, EQEmu::invslot::BANK_END }, - { EQEmu::invslot::SHARED_BANK_BEGIN, EQEmu::invslot::SHARED_BANK_END }, - { EQEmu::invslot::TRADE_BEGIN, EQEmu::invslot::TRADE_END }, - { EQEmu::invslot::SLOT_BEGIN, (EQEmu::invtype::WORLD_SIZE - 1) } + { EQ::invslot::EQUIPMENT_BEGIN, EQ::invslot::EQUIPMENT_END }, + { EQ::invslot::GENERAL_BEGIN, EQ::invslot::GENERAL_END }, + { EQ::invslot::slotCursor, EQ::invslot::slotCursor }, + { EQ::invslot::SLOT_INVALID, EQ::invslot::SLOT_INVALID }, + { EQ::invslot::TRIBUTE_BEGIN, EQ::invslot::TRIBUTE_END }, + { EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END }, + { EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END }, + { EQ::invslot::TRADE_BEGIN, EQ::invslot::TRADE_END }, + { EQ::invslot::SLOT_BEGIN, (EQ::invtype::WORLD_SIZE - 1) } }; static const bool scope_bag[] = { false, true, true, true, false, true, true, true, true }; @@ -3297,13 +3297,13 @@ void command_peekinv(Client *c, const Seperator *sep) if (c->GetTarget()) targetClient = c->GetTarget()->CastToClient(); - const EQEmu::ItemInstance* inst_main = nullptr; - const EQEmu::ItemInstance* inst_sub = nullptr; - const EQEmu::ItemInstance* inst_aug = nullptr; - const EQEmu::ItemData* item_data = nullptr; + const EQ::ItemInstance* inst_main = nullptr; + const EQ::ItemInstance* inst_sub = nullptr; + const EQ::ItemInstance* inst_aug = nullptr; + const EQ::ItemData* item_data = nullptr; - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkItemInst); + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkItemInst); c->Message(Chat::White, "Displaying inventory for %s...", targetClient->GetName()); @@ -3326,7 +3326,7 @@ void command_peekinv(Client *c, const Seperator *sep) } for (int16 indexMain = scope_range[scopeIndex][0]; indexMain <= scope_range[scopeIndex][1]; ++indexMain) { - if (indexMain == EQEmu::invslot::SLOT_INVALID) + if (indexMain == EQ::invslot::SLOT_INVALID) continue; inst_main = ((scopeBit & peekWorld) ? objectTradeskill->GetItem(indexMain) : targetClient->GetInv().GetItem(indexMain)); @@ -3344,14 +3344,14 @@ void command_peekinv(Client *c, const Seperator *sep) (item_data == nullptr), "%sSlot: %i, Item: %i (%s), Charges: %i", scope_prefix[scopeIndex], - ((scopeBit & peekWorld) ? (EQEmu::invslot::WORLD_BEGIN + indexMain) : indexMain), + ((scopeBit & peekWorld) ? (EQ::invslot::WORLD_BEGIN + indexMain) : indexMain), ((item_data == nullptr) ? 0 : item_data->ID), linker.GenerateLink().c_str(), ((inst_main == nullptr) ? 0 : inst_main->GetCharges()) ); if (inst_main && inst_main->IsClassCommon()) { - for (uint8 indexAug = EQEmu::invaug::SOCKET_BEGIN; indexAug <= EQEmu::invaug::SOCKET_END; ++indexAug) { + for (uint8 indexAug = EQ::invaug::SOCKET_BEGIN; indexAug <= EQ::invaug::SOCKET_END; ++indexAug) { inst_aug = inst_main->GetItem(indexAug); if (!inst_aug) // extant only continue; @@ -3364,7 +3364,7 @@ void command_peekinv(Client *c, const Seperator *sep) ".%sAugSlot: %i (Slot #%i, Aug idx #%i), Item: %i (%s), Charges: %i", scope_prefix[scopeIndex], INVALID_INDEX, - ((scopeBit & peekWorld) ? (EQEmu::invslot::WORLD_BEGIN + indexMain) : indexMain), + ((scopeBit & peekWorld) ? (EQ::invslot::WORLD_BEGIN + indexMain) : indexMain), indexAug, ((item_data == nullptr) ? 0 : item_data->ID), linker.GenerateLink().c_str(), @@ -3376,7 +3376,7 @@ void command_peekinv(Client *c, const Seperator *sep) if (!scope_bag[scopeIndex] || !(inst_main && inst_main->IsClassBag())) continue; - for (uint8 indexSub = EQEmu::invbag::SLOT_BEGIN; indexSub <= EQEmu::invbag::SLOT_END; ++indexSub) { + for (uint8 indexSub = EQ::invbag::SLOT_BEGIN; indexSub <= EQ::invbag::SLOT_END; ++indexSub) { inst_sub = inst_main->GetItem(indexSub); if (!inst_sub) // extant only continue; @@ -3388,8 +3388,8 @@ void command_peekinv(Client *c, const Seperator *sep) (item_data == nullptr), "..%sBagSlot: %i (Slot #%i, Bag idx #%i), Item: %i (%s), Charges: %i", scope_prefix[scopeIndex], - ((scopeBit & peekWorld) ? INVALID_INDEX : EQEmu::InventoryProfile::CalcSlotId(indexMain, indexSub)), - ((scopeBit & peekWorld) ? (EQEmu::invslot::WORLD_BEGIN + indexMain) : indexMain), + ((scopeBit & peekWorld) ? INVALID_INDEX : EQ::InventoryProfile::CalcSlotId(indexMain, indexSub)), + ((scopeBit & peekWorld) ? (EQ::invslot::WORLD_BEGIN + indexMain) : indexMain), indexSub, ((item_data == nullptr) ? 0 : item_data->ID), linker.GenerateLink().c_str(), @@ -3397,7 +3397,7 @@ void command_peekinv(Client *c, const Seperator *sep) ); if (inst_sub->IsClassCommon()) { - for (uint8 indexAug = EQEmu::invaug::SOCKET_BEGIN; indexAug <= EQEmu::invaug::SOCKET_END; ++indexAug) { + for (uint8 indexAug = EQ::invaug::SOCKET_BEGIN; indexAug <= EQ::invaug::SOCKET_END; ++indexAug) { inst_aug = inst_sub->GetItem(indexAug); if (!inst_aug) // extant only continue; @@ -3410,7 +3410,7 @@ void command_peekinv(Client *c, const Seperator *sep) "...%sAugSlot: %i (Slot #%i, Sub idx #%i, Aug idx #%i), Item: %i (%s), Charges: %i", scope_prefix[scopeIndex], INVALID_INDEX, - ((scopeBit & peekWorld) ? INVALID_INDEX : EQEmu::InventoryProfile::CalcSlotId(indexMain, indexSub)), + ((scopeBit & peekWorld) ? INVALID_INDEX : EQ::InventoryProfile::CalcSlotId(indexMain, indexSub)), indexSub, indexAug, ((item_data == nullptr) ? 0 : item_data->ID), @@ -3450,7 +3450,7 @@ void command_peekinv(Client *c, const Seperator *sep) ); if (inst_main && inst_main->IsClassCommon()) { - for (uint8 indexAug = EQEmu::invaug::SOCKET_BEGIN; indexAug <= EQEmu::invaug::SOCKET_END; ++indexAug) { + for (uint8 indexAug = EQ::invaug::SOCKET_BEGIN; indexAug <= EQ::invaug::SOCKET_END; ++indexAug) { inst_aug = inst_main->GetItem(indexAug); if (!inst_aug) // extant only continue; @@ -3475,7 +3475,7 @@ void command_peekinv(Client *c, const Seperator *sep) if (!scope_bag[scopeIndex] || !(inst_main && inst_main->IsClassBag())) continue; - for (uint8 indexSub = EQEmu::invbag::SLOT_BEGIN; indexSub <= EQEmu::invbag::SLOT_END; ++indexSub) { + for (uint8 indexSub = EQ::invbag::SLOT_BEGIN; indexSub <= EQ::invbag::SLOT_END; ++indexSub) { inst_sub = inst_main->GetItem(indexSub); if (!inst_sub) continue; @@ -3497,7 +3497,7 @@ void command_peekinv(Client *c, const Seperator *sep) ); if (inst_sub->IsClassCommon()) { - for (uint8 indexAug = EQEmu::invaug::SOCKET_BEGIN; indexAug <= EQEmu::invaug::SOCKET_END; ++indexAug) { + for (uint8 indexAug = EQ::invaug::SOCKET_BEGIN; indexAug <= EQ::invaug::SOCKET_END; ++indexAug) { inst_aug = inst_sub->GetItem(indexAug); if (!inst_aug) // extant only continue; @@ -3557,7 +3557,7 @@ void command_interrogateinv(Client *c, const Seperator *sep) } Client* target = nullptr; - std::map instmap; + std::map instmap; bool log = false; bool silent = false; bool error = false; @@ -4063,7 +4063,7 @@ void command_faction(Client *c, const Seperator *sep) std::string fvalue = rrow[2]; _ctr2++; std::string resetlink = fmt::format("#faction reset {}", f_id); - c->Message(Chat::Yellow, "Reset: %s id: %s (%s)", EQEmu::SayLinkEngine::GenerateQuestSaylink(resetlink, false, cname.c_str()).c_str(), std::to_string(f_id).c_str(), fvalue.c_str()); + c->Message(Chat::Yellow, "Reset: %s id: %s (%s)", EQ::SayLinkEngine::GenerateQuestSaylink(resetlink, false, cname.c_str()).c_str(), std::to_string(f_id).c_str(), fvalue.c_str()); } std::string response = _ctr2 > 0 ? fmt::format("Found {} matching factions", _ctr2).c_str() : "No faction hits found."; c->Message(Chat::Yellow, response.c_str()); @@ -4159,8 +4159,8 @@ void command_findzone(Client *c, const Seperator *sep) break; } - std::string command_zone = EQEmu::SayLinkEngine::GenerateQuestSaylink("#zone " + short_name, false, "zone"); - std::string command_gmzone = EQEmu::SayLinkEngine::GenerateQuestSaylink( + std::string command_zone = EQ::SayLinkEngine::GenerateQuestSaylink("#zone " + short_name, false, "zone"); + std::string command_gmzone = EQ::SayLinkEngine::GenerateQuestSaylink( fmt::format("#gmzone {} {}", short_name, version), false, "gmzone" @@ -4410,16 +4410,16 @@ void command_listpetition(Client *c, const Seperator *sep) void command_equipitem(Client *c, const Seperator *sep) { uint32 slot_id = atoi(sep->arg[1]); - if (sep->IsNumber(1) && (slot_id >= EQEmu::invslot::EQUIPMENT_BEGIN && slot_id <= EQEmu::invslot::EQUIPMENT_END)) { - const EQEmu::ItemInstance* from_inst = c->GetInv().GetItem(EQEmu::invslot::slotCursor); - const EQEmu::ItemInstance* to_inst = c->GetInv().GetItem(slot_id); // added (desync issue when forcing stack to stack) + if (sep->IsNumber(1) && (slot_id >= EQ::invslot::EQUIPMENT_BEGIN && slot_id <= EQ::invslot::EQUIPMENT_END)) { + const EQ::ItemInstance* from_inst = c->GetInv().GetItem(EQ::invslot::slotCursor); + const EQ::ItemInstance* to_inst = c->GetInv().GetItem(slot_id); // added (desync issue when forcing stack to stack) bool partialmove = false; int16 movecount; if (from_inst && from_inst->IsClassCommon()) { auto outapp = new EQApplicationPacket(OP_MoveItem, sizeof(MoveItem_Struct)); MoveItem_Struct* mi = (MoveItem_Struct*)outapp->pBuffer; - mi->from_slot = EQEmu::invslot::slotCursor; + mi->from_slot = EQ::invslot::slotCursor; mi->to_slot = slot_id; // mi->number_in_stack = from_inst->GetCharges(); // replaced with con check for stacking @@ -5151,7 +5151,7 @@ void command_memspell(Client *c, const Seperator *sep) { slot = atoi(sep->arg[1]) - 1; spell_id = atoi(sep->arg[2]); - if (slot > EQEmu::spells::SPELL_GEM_COUNT || spell_id >= SPDAT_RECORDS) + if (slot > EQ::spells::SPELL_GEM_COUNT || spell_id >= SPDAT_RECORDS) { c->Message(Chat::White, "Error: #MemSpell: Arguement out of range"); } @@ -5249,11 +5249,11 @@ void command_devtools(Client *c, const Seperator *sep) /** * Search entity commands */ - menu_commands_search += "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#list npcs", false, "NPC") + "] "; - menu_commands_search += "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#list players", false, "Players") + "] "; - menu_commands_search += "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#list corpses", false, "Corpses") + "] "; - menu_commands_search += "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#list doors", false, "Doors") + "] "; - menu_commands_search += "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#list objects", false, "Objects") + "] "; + menu_commands_search += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#list npcs", false, "NPC") + "] "; + menu_commands_search += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#list players", false, "Players") + "] "; + menu_commands_search += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#list corpses", false, "Corpses") + "] "; + menu_commands_search += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#list doors", false, "Doors") + "] "; + menu_commands_search += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#list objects", false, "Objects") + "] "; std::string dev_tools_window_key = StringFormat("%i-dev-tools-window-disabled", c->AccountID()); @@ -5272,9 +5272,9 @@ void command_devtools(Client *c, const Seperator *sep) /** * Show window status */ - window_toggle_command = "Disabled [" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#devtools enable_window", false, "Enable") + "] "; + window_toggle_command = "Disabled [" + EQ::SayLinkEngine::GenerateQuestSaylink("#devtools enable_window", false, "Enable") + "] "; if (c->IsDevToolsWindowEnabled()) { - window_toggle_command = "Enabled [" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#devtools disable_window", false, "Disable") + "] "; + window_toggle_command = "Enabled [" + EQ::SayLinkEngine::GenerateQuestSaylink("#devtools disable_window", false, "Disable") + "] "; } /** @@ -5546,7 +5546,7 @@ void command_proximity(Client *c, const Seperator *sep) points.push_back(p); } - if (c->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) { + if (c->ClientVersion() >= EQ::versions::ClientVersion::RoF) { c->SendPathPacket(points); } } @@ -5723,7 +5723,7 @@ void command_killallnpcs(Client *c, const Seperator *sep) continue; } - entity->Damage(c, 1000000000, 0, EQEmu::skills::SkillDragonPunch); + entity->Damage(c, 1000000000, 0, EQ::skills::SkillDragonPunch); count++; } @@ -5759,7 +5759,7 @@ void command_damage(Client *c, const Seperator *sep) if (nkdmg > 2100000000) c->Message(Chat::White, "Enter a value less then 2,100,000,000."); else - c->GetTarget()->Damage(c, nkdmg, SPELL_UNKNOWN, EQEmu::skills::SkillHandtoHand, false); + c->GetTarget()->Damage(c, nkdmg, SPELL_UNKNOWN, EQ::skills::SkillHandtoHand, false); } } @@ -5949,7 +5949,7 @@ void command_goto(Client *c, const Seperator *sep) void command_iteminfo(Client *c, const Seperator *sep) { - auto inst = c->GetInv()[EQEmu::invslot::slotCursor]; + auto inst = c->GetInv()[EQ::invslot::slotCursor]; if (!inst) { c->Message(Chat::Red, "Error: You need an item on your cursor for this command"); return; @@ -5961,8 +5961,8 @@ void command_iteminfo(Client *c, const Seperator *sep) return; } - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkItemInst); + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkItemInst); linker.SetItemInst(inst); c->Message(Chat::White, "*** Item Info for [%s] ***", linker.GenerateLink().c_str()); @@ -6653,7 +6653,7 @@ void command_editmassrespawn(Client* c, const Seperator* sep) c->Message( Chat::Yellow, "To apply these changes, click <%s> or type [%s]", - EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(), saylink.c_str() ); } @@ -7027,7 +7027,7 @@ void command_scribespells(Client *c, const Seperator *sep) int spell_id = 0; int count = 0; - for ( ; spell_id < SPDAT_RECORDS && book_slot < EQEmu::spells::SPELLBOOK_SIZE; ++spell_id) { + for ( ; spell_id < SPDAT_RECORDS && book_slot < EQ::spells::SPELLBOOK_SIZE; ++spell_id) { if (book_slot == -1) { t->Message( 13, @@ -7050,8 +7050,8 @@ void command_scribespells(Client *c, const Seperator *sep) c->Message(Chat::Red, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS); return; } - if (book_slot < 0 || book_slot >= EQEmu::spells::SPELLBOOK_SIZE) { - c->Message(Chat::Red, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQEmu::spells::SPELLBOOK_SIZE); + if (book_slot < 0 || book_slot >= EQ::spells::SPELLBOOK_SIZE) { + c->Message(Chat::Red, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQ::spells::SPELLBOOK_SIZE); return; } @@ -7286,9 +7286,9 @@ void command_summonitem(Client *c, const Seperator *sep) std::string cmd_msg = sep->msg; size_t link_open = cmd_msg.find('\x12'); size_t link_close = cmd_msg.find_last_of('\x12'); - if (link_open != link_close && (cmd_msg.length() - link_open) > EQEmu::constants::SAY_LINK_BODY_SIZE) { - EQEmu::SayLinkBody_Struct link_body; - EQEmu::saylink::DegenerateLinkBody(link_body, cmd_msg.substr(link_open + 1, EQEmu::constants::SAY_LINK_BODY_SIZE)); + if (link_open != link_close && (cmd_msg.length() - link_open) > EQ::constants::SAY_LINK_BODY_SIZE) { + EQ::SayLinkBody_Struct link_body; + EQ::saylink::DegenerateLinkBody(link_body, cmd_msg.substr(link_open + 1, EQ::constants::SAY_LINK_BODY_SIZE)); itemid = link_body.item_id; } else if (!sep->IsNumber(1)) { @@ -7304,7 +7304,7 @@ void command_summonitem(Client *c, const Seperator *sep) } int16 item_status = 0; - const EQEmu::ItemData* item = database.GetItem(itemid); + const EQ::ItemData* item = database.GetItem(itemid); if (item) { item_status = static_cast(item->MinStatus); } @@ -7343,7 +7343,7 @@ void command_giveitem(Client *c, const Seperator *sep) Client *t = c->GetTarget()->CastToClient(); uint32 itemid = atoi(sep->arg[1]); int16 item_status = 0; - const EQEmu::ItemData* item = database.GetItem(itemid); + const EQ::ItemData* item = database.GetItem(itemid); if(item) { item_status = static_cast(item->MinStatus); } @@ -7396,9 +7396,9 @@ void command_itemsearch(Client *c, const Seperator *sep) { const char *search_criteria=sep->argplus[1]; - const EQEmu::ItemData* item = nullptr; - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkItemData); + const EQ::ItemData* item = nullptr; + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkItemData); if (Seperator::IsNumber(search_criteria)) { item = database.GetItem(atoi(search_criteria)); @@ -8101,7 +8101,7 @@ void command_npceditmass(Client *c, const Seperator *sep) if (found_count > 0) { c->Message( Chat::Yellow, "To apply these changes, click <%s> or type [%s]", - EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(), saylink.c_str() ); } @@ -8889,9 +8889,9 @@ void command_path(Client *c, const Seperator *sep) } void Client::Undye() { - for (int cur_slot = EQEmu::textures::textureBegin; cur_slot <= EQEmu::textures::LastTexture; cur_slot++) { + for (int cur_slot = EQ::textures::textureBegin; cur_slot <= EQ::textures::LastTexture; cur_slot++) { uint8 slot2=SlotConvert(cur_slot); - EQEmu::ItemInstance* inst = m_inv.GetItem(slot2); + EQ::ItemInstance* inst = m_inv.GetItem(slot2); if(inst != nullptr) { inst->SetColor(inst->GetItem()->Color); @@ -8930,30 +8930,30 @@ void command_ucs(Client *c, const Seperator *sep) std::string buffer; std::string MailKey = database.GetMailKey(c->CharacterID(), true); - EQEmu::versions::UCSVersion ConnectionType = EQEmu::versions::ucsUnknown; + EQ::versions::UCSVersion ConnectionType = EQ::versions::ucsUnknown; // chat server packet switch (c->ClientVersion()) { - case EQEmu::versions::ClientVersion::Titanium: - ConnectionType = EQEmu::versions::ucsTitaniumChat; + case EQ::versions::ClientVersion::Titanium: + ConnectionType = EQ::versions::ucsTitaniumChat; break; - case EQEmu::versions::ClientVersion::SoF: - ConnectionType = EQEmu::versions::ucsSoFCombined; + case EQ::versions::ClientVersion::SoF: + ConnectionType = EQ::versions::ucsSoFCombined; break; - case EQEmu::versions::ClientVersion::SoD: - ConnectionType = EQEmu::versions::ucsSoDCombined; + case EQ::versions::ClientVersion::SoD: + ConnectionType = EQ::versions::ucsSoDCombined; break; - case EQEmu::versions::ClientVersion::UF: - ConnectionType = EQEmu::versions::ucsUFCombined; + case EQ::versions::ClientVersion::UF: + ConnectionType = EQ::versions::ucsUFCombined; break; - case EQEmu::versions::ClientVersion::RoF: - ConnectionType = EQEmu::versions::ucsRoFCombined; + case EQ::versions::ClientVersion::RoF: + ConnectionType = EQ::versions::ucsRoFCombined; break; - case EQEmu::versions::ClientVersion::RoF2: - ConnectionType = EQEmu::versions::ucsRoF2Combined; + case EQ::versions::ClientVersion::RoF2: + ConnectionType = EQ::versions::ucsRoF2Combined; break; default: - ConnectionType = EQEmu::versions::ucsUnknown; + ConnectionType = EQ::versions::ucsUnknown; break; } @@ -8975,8 +8975,8 @@ void command_ucs(Client *c, const Seperator *sep) // mail server packet switch (c->ClientVersion()) { - case EQEmu::versions::ClientVersion::Titanium: - ConnectionType = EQEmu::versions::ucsTitaniumMail; + case EQ::versions::ClientVersion::Titanium: + ConnectionType = EQ::versions::ucsTitaniumMail; break; default: // retain value from previous switch @@ -11864,16 +11864,16 @@ void command_max_all_skills(Client *c, const Seperator *sep) { if(c) { - for (int i = 0; i <= EQEmu::skills::HIGHEST_SKILL; ++i) + for (int i = 0; i <= EQ::skills::HIGHEST_SKILL; ++i) { - if (i >= EQEmu::skills::SkillSpecializeAbjure && i <= EQEmu::skills::SkillSpecializeEvocation) + if (i >= EQ::skills::SkillSpecializeAbjure && i <= EQ::skills::SkillSpecializeEvocation) { - c->SetSkill((EQEmu::skills::SkillType)i, 50); + c->SetSkill((EQ::skills::SkillType)i, 50); } else { - int max_skill_level = database.GetSkillCap(c->GetClass(), (EQEmu::skills::SkillType)i, c->GetLevel()); - c->SetSkill((EQEmu::skills::SkillType)i, max_skill_level); + int max_skill_level = database.GetSkillCap(c->GetClass(), (EQ::skills::SkillType)i, c->GetLevel()); + c->SetSkill((EQ::skills::SkillType)i, max_skill_level); } } } @@ -11959,14 +11959,14 @@ void command_disarmtrap(Client *c, const Seperator *sep) if(target->IsNPC()) { - if (c->HasSkill(EQEmu::skills::SkillDisarmTraps)) + if (c->HasSkill(EQ::skills::SkillDisarmTraps)) { if(DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) { c->Message(Chat::Red, "%s is too far away.", target->GetCleanName()); return; } - c->HandleLDoNDisarm(target->CastToNPC(), c->GetSkill(EQEmu::skills::SkillDisarmTraps), LDoNTypeMechanical); + c->HandleLDoNDisarm(target->CastToNPC(), c->GetSkill(EQ::skills::SkillDisarmTraps), LDoNTypeMechanical); } else c->Message(Chat::Red, "You do not have the disarm trap skill."); @@ -11984,14 +11984,14 @@ void command_sensetrap(Client *c, const Seperator *sep) if(target->IsNPC()) { - if (c->HasSkill(EQEmu::skills::SkillSenseTraps)) + if (c->HasSkill(EQ::skills::SkillSenseTraps)) { if(DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) { c->Message(Chat::Red, "%s is too far away.", target->GetCleanName()); return; } - c->HandleLDoNSenseTraps(target->CastToNPC(), c->GetSkill(EQEmu::skills::SkillSenseTraps), LDoNTypeMechanical); + c->HandleLDoNSenseTraps(target->CastToNPC(), c->GetSkill(EQ::skills::SkillSenseTraps), LDoNTypeMechanical); } else c->Message(Chat::Red, "You do not have the sense traps skill."); @@ -12009,14 +12009,14 @@ void command_picklock(Client *c, const Seperator *sep) if(target->IsNPC()) { - if (c->HasSkill(EQEmu::skills::SkillPickLock)) + if (c->HasSkill(EQ::skills::SkillPickLock)) { if(DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) { c->Message(Chat::Red, "%s is too far away.", target->GetCleanName()); return; } - c->HandleLDoNPickLock(target->CastToNPC(), c->GetSkill(EQEmu::skills::SkillPickLock), LDoNTypeMechanical); + c->HandleLDoNPickLock(target->CastToNPC(), c->GetSkill(EQ::skills::SkillPickLock), LDoNTypeMechanical); } else c->Message(Chat::Red, "You do not have the pick locks skill."); @@ -12032,27 +12032,27 @@ void command_profanity(Client *c, const Seperator *sep) // do nothing } else if (arg1.compare("clear") == 0) { - EQEmu::ProfanityManager::DeleteProfanityList(&database); + EQ::ProfanityManager::DeleteProfanityList(&database); auto pack = new ServerPacket(ServerOP_RefreshCensorship); worldserver.SendPacket(pack); safe_delete(pack); } else if (arg1.compare("add") == 0) { - if (!EQEmu::ProfanityManager::AddProfanity(&database, sep->arg[2])) + if (!EQ::ProfanityManager::AddProfanity(&database, sep->arg[2])) c->Message(Chat::Red, "Could not add '%s' to the profanity list.", sep->arg[2]); auto pack = new ServerPacket(ServerOP_RefreshCensorship); worldserver.SendPacket(pack); safe_delete(pack); } else if (arg1.compare("del") == 0) { - if (!EQEmu::ProfanityManager::RemoveProfanity(&database, sep->arg[2])) + if (!EQ::ProfanityManager::RemoveProfanity(&database, sep->arg[2])) c->Message(Chat::Red, "Could not delete '%s' from the profanity list.", sep->arg[2]); auto pack = new ServerPacket(ServerOP_RefreshCensorship); worldserver.SendPacket(pack); safe_delete(pack); } else if (arg1.compare("reload") == 0) { - if (!EQEmu::ProfanityManager::UpdateProfanityList(&database)) + if (!EQ::ProfanityManager::UpdateProfanityList(&database)) c->Message(Chat::Red, "Could not reload the profanity list."); auto pack = new ServerPacket(ServerOP_RefreshCensorship); worldserver.SendPacket(pack); @@ -12063,7 +12063,7 @@ void command_profanity(Client *c, const Seperator *sep) } std::string popup; - const auto &list = EQEmu::ProfanityManager::GetProfanityList(); + const auto &list = EQ::ProfanityManager::GetProfanityList(); for (const auto &iter : list) { popup.append(iter); popup.append("
"); @@ -12213,7 +12213,7 @@ void command_zopp(Client *c, const Seperator *sep) uint32 itemid = atoi(sep->arg[3]); int16 charges = sep->argnum == 4 ? atoi(sep->arg[4]) : 1; // defaults to 1 charge if not specified - const EQEmu::ItemData* FakeItem = database.GetItem(itemid); + const EQ::ItemData* FakeItem = database.GetItem(itemid); if (!FakeItem) { c->Message(Chat::Red, "Error: Item [%u] is not a valid item id.", itemid); @@ -12221,7 +12221,7 @@ void command_zopp(Client *c, const Seperator *sep) } int16 item_status = 0; - const EQEmu::ItemData* item = database.GetItem(itemid); + const EQ::ItemData* item = database.GetItem(itemid); if(item) { item_status = static_cast(item->MinStatus); } @@ -12235,7 +12235,7 @@ void command_zopp(Client *c, const Seperator *sep) c->Message(Chat::White, "Processing request..results may cause unpredictable behavior."); } - EQEmu::ItemInstance* FakeItemInst = database.CreateItem(FakeItem, charges); + EQ::ItemInstance* FakeItemInst = database.CreateItem(FakeItem, charges); c->SendItemPacket(slotid, FakeItemInst, packettype); c->Message(Chat::White, "Sending zephyr op packet to client - [%s] %s (%u) with %i %s to slot %i.", packettype == ItemPacketTrade ? "Trade" : "Summon", FakeItem->Name, itemid, charges, @@ -12993,7 +12993,7 @@ void command_scale(Client *c, const Seperator *sep) c->Message(Chat::Yellow, "Found (%i) NPC's that match this search...", found_count); c->Message( Chat::Yellow, "To apply these changes, click <%s> or type %s", - EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(), saylink.c_str() ); } @@ -13062,7 +13062,7 @@ void command_databuckets(Client *c, const Seperator *sep) _ctr++; std::string del_saylink = StringFormat("#databuckets delete %s", key.c_str()); c->Message(Chat::White, "%s : %s", - EQEmu::SayLinkEngine::GenerateQuestSaylink(del_saylink, false, "Delete").c_str(), key.c_str(), " Value: ", value.c_str()); + EQ::SayLinkEngine::GenerateQuestSaylink(del_saylink, false, "Delete").c_str(), key.c_str(), " Value: ", value.c_str()); } window_text.append(""); c->SendPopupToClient(window_title.c_str(), window_text.c_str()); @@ -13157,7 +13157,7 @@ void command_who(Client *c, const Seperator *sep) std::string displayed_guild_name; if (guild_name.length() > 0) { - displayed_guild_name = EQEmu::SayLinkEngine::GenerateQuestSaylink( + displayed_guild_name = EQ::SayLinkEngine::GenerateQuestSaylink( StringFormat( "#who \"%s\"", guild_name.c_str()), @@ -13166,7 +13166,7 @@ void command_who(Client *c, const Seperator *sep) ); } - std::string goto_saylink = EQEmu::SayLinkEngine::GenerateQuestSaylink( + std::string goto_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( StringFormat("#goto %s", player_name.c_str()), false, "Goto" ); @@ -13176,15 +13176,15 @@ void command_who(Client *c, const Seperator *sep) 5, "%s[%u %s] %s (%s) %s ZONE: %s (%u) (%s) (%s) (%s)", (account_status > 0 ? "* GM * " : ""), player_level, - EQEmu::SayLinkEngine::GenerateQuestSaylink(StringFormat("#who %s", base_class_name.c_str()), false, display_class_name).c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(StringFormat("#who %s", base_class_name.c_str()), false, display_class_name).c_str(), player_name.c_str(), - EQEmu::SayLinkEngine::GenerateQuestSaylink(StringFormat("#who %s", displayed_race_name.c_str()), false, displayed_race_name).c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(StringFormat("#who %s", displayed_race_name.c_str()), false, displayed_race_name).c_str(), displayed_guild_name.c_str(), - EQEmu::SayLinkEngine::GenerateQuestSaylink(StringFormat("#who %s", zone_short_name.c_str()), false, zone_short_name).c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(StringFormat("#who %s", zone_short_name.c_str()), false, zone_short_name).c_str(), zone_instance, goto_saylink.c_str(), - EQEmu::SayLinkEngine::GenerateQuestSaylink(StringFormat("#who %s", account_name.c_str()), false, account_name).c_str(), - EQEmu::SayLinkEngine::GenerateQuestSaylink(StringFormat("#who %s", account_ip.c_str()), false, account_ip).c_str() + EQ::SayLinkEngine::GenerateQuestSaylink(StringFormat("#who %s", account_name.c_str()), false, account_name).c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink(StringFormat("#who %s", account_ip.c_str()), false, account_ip).c_str() ); found_count++; diff --git a/zone/common.h b/zone/common.h index 2d97527fc..19df1a576 100644 --- a/zone/common.h +++ b/zone/common.h @@ -268,7 +268,7 @@ enum class LootRequestType : uint8 { Self, AllowedPVE, AllowedPVPAll, - AllowedPVPSingle, // can make this 'AllowedPVPVariable' and allow values between 1 and EQEmu::invtype::POSSESSIONS_SIZE + AllowedPVPSingle, // can make this 'AllowedPVPVariable' and allow values between 1 and EQ::invtype::POSSESSIONS_SIZE AllowedPVPDefined, }; @@ -385,8 +385,8 @@ struct StatBonuses { int32 inhibitmelee; float AggroRange; // when calculate just replace original value with this float AssistRange; - int32 skillmod[EQEmu::skills::HIGHEST_SKILL + 1]; - int32 skillmodmax[EQEmu::skills::HIGHEST_SKILL + 1]; + int32 skillmod[EQ::skills::HIGHEST_SKILL + 1]; + int32 skillmodmax[EQ::skills::HIGHEST_SKILL + 1]; int effective_casting_level; int adjusted_casting_skill; // SPA 112 for fizzles int reflect_chance; // chance to reflect incoming spell @@ -403,7 +403,7 @@ struct StatBonuses { int32 StrikeThrough; // PoP: Strike Through % int32 MeleeMitigation; //i = Shielding int32 MeleeMitigationEffect; //i = Spell Effect Melee Mitigation - int32 CriticalHitChance[EQEmu::skills::HIGHEST_SKILL + 2]; //i + int32 CriticalHitChance[EQ::skills::HIGHEST_SKILL + 2]; //i int32 CriticalSpellChance; //i int32 SpellCritDmgIncrease; //i int32 SpellCritDmgIncNoStack; // increase @@ -430,10 +430,10 @@ struct StatBonuses { int32 MeleeSkillCheck; //i uint8 MeleeSkillCheckSkill; int32 HitChance; //HitChance/15 == % increase i = Accuracy (Item: Accuracy) - int32 HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 2]; //Spell effect Chance to Hit, straight percent increase - int32 DamageModifier[EQEmu::skills::HIGHEST_SKILL + 2]; //i - int32 DamageModifier2[EQEmu::skills::HIGHEST_SKILL + 2]; //i - int32 MinDamageModifier[EQEmu::skills::HIGHEST_SKILL + 2]; //i + int32 HitChanceEffect[EQ::skills::HIGHEST_SKILL + 2]; //Spell effect Chance to Hit, straight percent increase + int32 DamageModifier[EQ::skills::HIGHEST_SKILL + 2]; //i + int32 DamageModifier2[EQ::skills::HIGHEST_SKILL + 2]; //i + int32 MinDamageModifier[EQ::skills::HIGHEST_SKILL + 2]; //i int32 ProcChance; // ProcChance/10 == % increase i = CombatEffects int32 ProcChanceSPA; // ProcChance from spell effects int32 ExtraAttackChance; @@ -441,13 +441,13 @@ struct StatBonuses { int32 DivineSaveChance[2]; // Second Chance (base1 = chance, base2 = spell on trigger) uint32 DeathSave[4]; // Death Pact [0](value = 1 partial 2 = full) [1]=slot [2]=LvLimit [3]=HealAmt int32 FlurryChance; - int32 Accuracy[EQEmu::skills::HIGHEST_SKILL + 2]; //Accuracy/15 == % increase [Spell Effect: Accuracy) + int32 Accuracy[EQ::skills::HIGHEST_SKILL + 2]; //Accuracy/15 == % increase [Spell Effect: Accuracy) int32 HundredHands; //extra haste, stacks with all other haste i int32 MeleeLifetap; //i int32 Vampirism; //i int32 HealRate; // Spell effect that influences effectiveness of heals int32 MaxHPChange; // Spell Effect - int16 SkillDmgTaken[EQEmu::skills::HIGHEST_SKILL + 2]; // All Skills + -1 + int16 SkillDmgTaken[EQ::skills::HIGHEST_SKILL + 2]; // All Skills + -1 int32 HealAmt; // Item Effect int32 SpellDmg; // Item Effect int32 Clairvoyance; // Item Effect @@ -456,9 +456,9 @@ struct StatBonuses { uint32 SpellTriggers[MAX_SPELL_TRIGGER]; // Innate/Spell/Item Spells that trigger when you cast uint32 SpellOnKill[MAX_SPELL_TRIGGER*3]; // Chance to proc after killing a mob uint32 SpellOnDeath[MAX_SPELL_TRIGGER*2]; // Chance to have effect cast when you die - int32 CritDmgMod[EQEmu::skills::HIGHEST_SKILL + 2]; // All Skills + -1 - int32 SkillReuseTime[EQEmu::skills::HIGHEST_SKILL + 1]; // Reduces skill timers - int32 SkillDamageAmount[EQEmu::skills::HIGHEST_SKILL + 2]; // All Skills + -1 + int32 CritDmgMod[EQ::skills::HIGHEST_SKILL + 2]; // All Skills + -1 + int32 SkillReuseTime[EQ::skills::HIGHEST_SKILL + 1]; // Reduces skill timers + int32 SkillDamageAmount[EQ::skills::HIGHEST_SKILL + 2]; // All Skills + -1 int32 TwoHandBluntBlock; // chance to block when wielding two hand blunt weapon uint32 ItemManaRegenCap; // Increases the amount of mana you have can over the cap(aa effect) int32 GravityEffect; // Indictor of spell effect @@ -481,7 +481,7 @@ struct StatBonuses { uint8 FocusEffects[HIGHEST_FOCUS+1]; // Stores the focus effectid for each focustype you have. int16 FocusEffectsWorn[HIGHEST_FOCUS+1]; // Optional to allow focus effects to be applied additively from worn slot bool NegateEffects; // Check if you contain a buff with negate effect. (only spellbonuses) - int32 SkillDamageAmount2[EQEmu::skills::HIGHEST_SKILL + 2]; // Adds skill specific damage + int32 SkillDamageAmount2[EQ::skills::HIGHEST_SKILL + 2]; // Adds skill specific damage uint32 NegateAttacks[3]; // 0 = bool HasEffect 1 = Buff Slot 2 = Max damage absorbed per hit uint32 MitigateMeleeRune[4]; // 0 = Mitigation value 1 = Buff Slot 2 = Max mitigation per hit 3 = Rune Amt uint32 MeleeThresholdGuard[3]; // 0 = Mitigation value 1 = Buff Slot 2 = Min damage to trigger. @@ -514,7 +514,7 @@ struct StatBonuses { int32 Metabolism; // Food/drink consumption rates. bool Sanctuary; // Sanctuary effect, lowers place on hate list until cast on others. int32 FactionModPct; // Modifies amount of faction gained. - bool LimitToSkill[EQEmu::skills::HIGHEST_SKILL + 2]; // Determines if we need to search for a skill proc. + bool LimitToSkill[EQ::skills::HIGHEST_SKILL + 2]; // Determines if we need to search for a skill proc. uint32 SkillProc[MAX_SKILL_PROCS]; // Max number of spells containing skill_procs. uint32 SkillProcSuccess[MAX_SKILL_PROCS]; // Max number of spells containing skill_procs_success. uint32 PC_Pet_Rampage[2]; // 0= % chance to rampage, 1=damage modifier @@ -549,7 +549,7 @@ struct StatBonuses { int32 CombatStability; // Melee damage mitigation. int32 DoubleRiposte; // Chance to double riposte int32 GiveDoubleRiposte[3]; // 0=Regular Chance, 1=Skill Attack Chance, 2=Skill - uint32 RaiseSkillCap[EQEmu::skills::HIGHEST_SKILL + 1]; // Raise a specific skill cap (base1= value, base2=skill) + uint32 RaiseSkillCap[EQ::skills::HIGHEST_SKILL + 1]; // Raise a specific skill cap (base1= value, base2=skill) int32 Ambidexterity; // Increase chance to duel wield by adding bonus 'skill'. int32 PetMaxHP; // Increase the max hp of your pet. int32 PetFlurry; // Chance for pet to flurry. @@ -578,7 +578,7 @@ struct StatBonuses { uint16 extra_xtargets; // extra xtarget entries bool ShroudofStealth; // rogue improved invisiblity uint16 ReduceFallDamage; // reduce fall damage by percent - int32 ReduceTradeskillFail[EQEmu::skills::HIGHEST_SKILL + 1]; // Reduces chance for trade skills to fail by percent. + int32 ReduceTradeskillFail[EQ::skills::HIGHEST_SKILL + 1]; // Reduces chance for trade skills to fail by percent. uint8 TradeSkillMastery; // Allow number of tradeskills to exceed 200 skill. int16 NoBreakAESneak; // Percent value int16 FeignedCastOnChance; // Percent Value @@ -697,7 +697,7 @@ struct MercData { uint32 NPCID; }; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -739,7 +739,7 @@ public: private: // Send item data for trade item to other person involved in trade - void SendItemData(const EQEmu::ItemInstance* inst, int16 dest_slot_id); + void SendItemData(const EQ::ItemInstance* inst, int16 dest_slot_id); uint32 with_id; Mob* owner; @@ -783,7 +783,7 @@ struct DamageHitInfo { int offense; int tohit; int hand; - EQEmu::skills::SkillType skill; + EQ::skills::SkillType skill; }; #endif diff --git a/zone/corpse.cpp b/zone/corpse.cpp index fd4174868..9bccf6eec 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -153,7 +153,7 @@ Corpse::Corpse(NPC* in_npc, ItemList* in_itemlist, uint32 in_npctypeid, const NP in_npc->GetDeity(),in_npc->GetLevel(),in_npc->GetNPCTypeID(),in_npc->GetSize(),0, in_npc->GetPosition(), in_npc->GetInnateLightType(), in_npc->GetTexture(),in_npc->GetHelmTexture(), 0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,EQEmu::TintProfile(),0xff,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,EQ::TintProfile(),0xff,0,0,0,0,0,0,0,0,0,0,0,0,0,0, (*in_npctypedata)->use_model, false), corpse_decay_timer(in_decaytime), corpse_rez_timer(0), @@ -245,7 +245,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) : Mob ( client->GetPP().drakkin_heritage, // uint32 in_drakkin_heritage, client->GetPP().drakkin_tattoo, // uint32 in_drakkin_tattoo, client->GetPP().drakkin_details, // uint32 in_drakkin_details, - EQEmu::TintProfile(), // uint32 in_armor_tint[_MaterialCount], + EQ::TintProfile(), // uint32 in_armor_tint[_MaterialCount], 0xff, // uint8 in_aa_title, 0, // uint8 in_see_invis, // see through invis 0, // uint8 in_see_invis_undead, // see through invis vs. undead @@ -273,7 +273,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) : Mob ( int i; PlayerProfile_Struct *pp = &client->GetPP(); - EQEmu::ItemInstance *item = nullptr; + EQ::ItemInstance *item = nullptr; /* Check if Zone has Graveyard First */ if(!zone->HasGraveyard()) { @@ -325,7 +325,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) : Mob ( // cash // Let's not move the cash when 'RespawnFromHover = true' && 'client->GetClientVersion() < EQClientSoF' since the client doesn't. // (change to first client that supports 'death hover' mode, if not SoF.) - if (!RuleB(Character, RespawnFromHover) || client->ClientVersion() < EQEmu::versions::ClientVersion::SoF) { + if (!RuleB(Character, RespawnFromHover) || client->ClientVersion() < EQ::versions::ClientVersion::SoF) { SetCash(pp->copper, pp->silver, pp->gold, pp->platinum); pp->copper = 0; pp->silver = 0; @@ -344,7 +344,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) : Mob ( // ..then regress and process invslot::EQUIPMENT_BEGIN through invslot::EQUIPMENT_END... // without additional work to database loading of player corpses, this order is not // currently preserved and a re-work of this processing loop is not warranted. - for (i = EQEmu::invslot::POSSESSIONS_BEGIN; i <= EQEmu::invslot::POSSESSIONS_END; ++i) { + for (i = EQ::invslot::POSSESSIONS_BEGIN; i <= EQ::invslot::POSSESSIONS_END; ++i) { item = client->GetInv().GetItem(i); if (item == nullptr) { continue; } @@ -402,7 +402,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) : Mob ( Save(); } -void Corpse::MoveItemToCorpse(Client *client, EQEmu::ItemInstance *inst, int16 equipSlot, std::list &removedList) +void Corpse::MoveItemToCorpse(Client *client, EQ::ItemInstance *inst, int16 equipSlot, std::list &removedList) { AddItem( inst->GetItem()->ID, @@ -420,10 +420,10 @@ void Corpse::MoveItemToCorpse(Client *client, EQEmu::ItemInstance *inst, int16 e while (true) { if (!inst->IsClassBag()) { break; } - if (equipSlot < EQEmu::invslot::GENERAL_BEGIN || equipSlot > EQEmu::invslot::slotCursor) { break; } + if (equipSlot < EQ::invslot::GENERAL_BEGIN || equipSlot > EQ::invslot::slotCursor) { break; } - for (int16 sub_index = EQEmu::invbag::SLOT_BEGIN; sub_index <= EQEmu::invbag::SLOT_END; ++sub_index) { - int16 real_bag_slot = EQEmu::InventoryProfile::CalcSlotId(equipSlot, sub_index); + for (int16 sub_index = EQ::invbag::SLOT_BEGIN; sub_index <= EQ::invbag::SLOT_END; ++sub_index) { + int16 real_bag_slot = EQ::InventoryProfile::CalcSlotId(equipSlot, sub_index); auto bag_inst = client->GetInv().GetItem(real_bag_slot); if (bag_inst == nullptr) { continue; } @@ -485,7 +485,7 @@ in_helmtexture, 0, 0, 0, -EQEmu::TintProfile(), +EQ::TintProfile(), 0xff, 0, 0, @@ -722,8 +722,8 @@ ServerLootItem_Struct* Corpse::GetItem(uint16 lootslot, ServerLootItem_Struct** } } - if (sitem && bag_item_data && EQEmu::InventoryProfile::SupportsContainers(sitem->equip_slot)) { - int16 bagstart = EQEmu::InventoryProfile::CalcSlotId(sitem->equip_slot, EQEmu::invbag::SLOT_BEGIN); + if (sitem && bag_item_data && EQ::InventoryProfile::SupportsContainers(sitem->equip_slot)) { + int16 bagstart = EQ::InventoryProfile::CalcSlotId(sitem->equip_slot, EQ::invbag::SLOT_BEGIN); cur = itemlist.begin(); end = itemlist.end(); @@ -777,8 +777,8 @@ void Corpse::RemoveItem(ServerLootItem_Struct* item_data) is_corpse_changed = true; itemlist.erase(iter); - uint8 material = EQEmu::InventoryProfile::CalcMaterialFromSlot(sitem->equip_slot); // autos to unsigned char - if (material != EQEmu::textures::materialInvalid) + uint8 material = EQ::InventoryProfile::CalcMaterialFromSlot(sitem->equip_slot); // autos to unsigned char + if (material != EQ::textures::materialInvalid) SendWearChange(material); UpdateEquipmentLight(); @@ -1061,9 +1061,9 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a if (pkitem->RecastDelay) pkinst->SetRecastTimestamp(timestamps.count(pkitem->RecastType) ? timestamps.at(pkitem->RecastType) : 0); - LogInventory("MakeLootRequestPackets() Slot [{}], Item [{}]", EQEmu::invslot::CORPSE_BEGIN, pkitem->Name); + LogInventory("MakeLootRequestPackets() Slot [{}], Item [{}]", EQ::invslot::CORPSE_BEGIN, pkitem->Name); - client->SendItemPacket(EQEmu::invslot::CORPSE_BEGIN, pkinst, ItemPacketLoot); + client->SendItemPacket(EQ::invslot::CORPSE_BEGIN, pkinst, ItemPacketLoot); safe_delete(pkinst); } else { @@ -1076,7 +1076,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a return; } - auto loot_slot = EQEmu::invslot::CORPSE_BEGIN; + auto loot_slot = EQ::invslot::CORPSE_BEGIN; auto corpse_mask = client->GetInv().GetLookup()->CorpseBitmask; for (auto item_data : itemlist) { @@ -1085,17 +1085,17 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a item_data->lootslot = 0xFFFF; // align server and client corpse slot mappings so translators can function properly - while (loot_slot <= EQEmu::invslot::CORPSE_END && (((uint64)1 << loot_slot) & corpse_mask) == 0) + while (loot_slot <= EQ::invslot::CORPSE_END && (((uint64)1 << loot_slot) & corpse_mask) == 0) ++loot_slot; - if (loot_slot > EQEmu::invslot::CORPSE_END) + if (loot_slot > EQ::invslot::CORPSE_END) continue; if (IsPlayerCorpse()) { - if (loot_request_type == LootRequestType::AllowedPVPSingle && loot_slot != EQEmu::invslot::CORPSE_BEGIN) + if (loot_request_type == LootRequestType::AllowedPVPSingle && loot_slot != EQ::invslot::CORPSE_BEGIN) continue; - if (item_data->equip_slot < EQEmu::invslot::POSSESSIONS_BEGIN || item_data->equip_slot > EQEmu::invslot::POSSESSIONS_END) + if (item_data->equip_slot < EQ::invslot::POSSESSIONS_BEGIN || item_data->equip_slot > EQ::invslot::POSSESSIONS_END) continue; } @@ -1130,7 +1130,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a // This is required for the 'Loot All' feature to work for SoD clients. I expect it is to tell the client that the // server has now sent all the items on the corpse. - if (client->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) + if (client->ClientVersion() >= EQ::versions::ClientVersion::SoD) SendLootReqErrorPacket(client, LootResponse::LootAll); } @@ -1202,8 +1202,8 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app) return; } - const EQEmu::ItemData *item = nullptr; - EQEmu::ItemInstance *inst = nullptr; + const EQ::ItemData *item = nullptr; + EQ::ItemInstance *inst = nullptr; ServerLootItem_Struct *item_data = nullptr, *bag_item_data[10] = {}; memset(bag_item_data, 0, sizeof(bag_item_data)); @@ -1244,8 +1244,8 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app) } if (inst->IsAugmented()) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { - EQEmu::ItemInstance *itm = inst->GetAugment(i); + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { + EQ::ItemInstance *itm = inst->GetAugment(i); if (itm) { if (client->CheckLoreConflict(itm->GetItem())) { client->MessageString(Chat::White, LOOT_LORE_ERROR); @@ -1265,7 +1265,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app) snprintf(buf, 87, "%d %d %s", inst->GetItem()->ID, inst->GetCharges(), EntityList::RemoveNumbers(q_corpse_name)); buf[87] = '\0'; - std::vector args; + std::vector args; args.push_back(inst); args.push_back(this); if (parse->EventPlayer(EVENT_LOOT, client, buf, 0, &args) != 0) { @@ -1300,10 +1300,10 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app) /* First add it to the looter - this will do the bag contents too */ if (lootitem->auto_loot > 0) { if (!client->AutoPutLootInInventory(*inst, true, true, bag_item_data)) - client->PutLootInInventory(EQEmu::invslot::slotCursor, *inst, bag_item_data); + client->PutLootInInventory(EQ::invslot::slotCursor, *inst, bag_item_data); } else { - client->PutLootInInventory(EQEmu::invslot::slotCursor, *inst, bag_item_data); + client->PutLootInInventory(EQ::invslot::slotCursor, *inst, bag_item_data); } /* Update any tasks that have an activity to loot this item */ @@ -1322,7 +1322,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app) /* Remove Bag Contents */ if (item->IsClassBag() && (GetPlayerKillItem() != -1 || GetPlayerKillItem() != 1)) { - for (int i = EQEmu::invbag::SLOT_BEGIN; i <= EQEmu::invbag::SLOT_END; i++) { + for (int i = EQ::invbag::SLOT_BEGIN; i <= EQ::invbag::SLOT_END; i++) { if (bag_item_data[i]) { /* Delete needs to be before RemoveItem because its deletes the pointer for * item_data/bag_item_data */ @@ -1340,8 +1340,8 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app) } /* Send message with item link to groups and such */ - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkItemInst); + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkItemInst); linker.SetItemInst(inst); linker.GenerateLink(); @@ -1400,7 +1400,7 @@ void Corpse::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) { ns->spawn.NPC = 2; UpdateActiveLight(); - ns->spawn.light = m_Light.Type[EQEmu::lightsource::LightActive]; + ns->spawn.light = m_Light.Type[EQ::lightsource::LightActive]; } void Corpse::QueryLoot(Client* to) { @@ -1417,12 +1417,12 @@ void Corpse::QueryLoot(Client* to) { ServerLootItem_Struct* sitem = *cur; if (IsPlayerCorpse()) { - if (sitem->equip_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN && sitem->equip_slot <= EQEmu::invbag::CURSOR_BAG_END) + if (sitem->equip_slot >= EQ::invbag::GENERAL_BAGS_BEGIN && sitem->equip_slot <= EQ::invbag::CURSOR_BAG_END) sitem->lootslot = 0xFFFF; else x < corpselootlimit ? sitem->lootslot = x : sitem->lootslot = 0xFFFF; - const EQEmu::ItemData* item = database.GetItem(sitem->item_id); + const EQ::ItemData* item = database.GetItem(sitem->item_id); if (item) to->Message((sitem->lootslot == 0xFFFF), "LootSlot: %i (EquipSlot: %i) Item: %s (%d), Count: %i", static_cast(sitem->lootslot), sitem->equip_slot, item->Name, item->ID, sitem->charges); @@ -1436,7 +1436,7 @@ void Corpse::QueryLoot(Client* to) { } else { sitem->lootslot=y; - const EQEmu::ItemData* item = database.GetItem(sitem->item_id); + const EQ::ItemData* item = database.GetItem(sitem->item_id); if (item) to->Message(Chat::White, "LootSlot: %i Item: %s (%d), Count: %i", sitem->lootslot, item->Name, item->ID, sitem->charges); @@ -1540,11 +1540,11 @@ void Corpse::Spawn() { uint32 Corpse::GetEquippedItemFromTextureSlot(uint8 material_slot) const { int16 invslot; - if (material_slot > EQEmu::textures::LastTexture) { + if (material_slot > EQ::textures::LastTexture) { return 0; } - invslot = EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot); + invslot = EQ::InventoryProfile::CalcSlotFromMaterial(material_slot); if(invslot == INVALID_INDEX) // GetWornItem() should be returning a 0 for any invalid index... return 0; @@ -1552,9 +1552,9 @@ uint32 Corpse::GetEquippedItemFromTextureSlot(uint8 material_slot) const { } uint32 Corpse::GetEquipmentColor(uint8 material_slot) const { - const EQEmu::ItemData *item = nullptr; + const EQ::ItemData *item = nullptr; - if (material_slot > EQEmu::textures::LastTexture) { + if (material_slot > EQ::textures::LastTexture) { return 0; } @@ -1568,23 +1568,23 @@ uint32 Corpse::GetEquipmentColor(uint8 material_slot) const { void Corpse::UpdateEquipmentLight() { - m_Light.Type[EQEmu::lightsource::LightEquipment] = 0; - m_Light.Level[EQEmu::lightsource::LightEquipment] = 0; + m_Light.Type[EQ::lightsource::LightEquipment] = 0; + m_Light.Level[EQ::lightsource::LightEquipment] = 0; for (auto iter = itemlist.begin(); iter != itemlist.end(); ++iter) { - if ((*iter)->equip_slot < EQEmu::invslot::EQUIPMENT_BEGIN || (*iter)->equip_slot > EQEmu::invslot::EQUIPMENT_END) { continue; } - if ((*iter)->equip_slot == EQEmu::invslot::slotAmmo) { continue; } + if ((*iter)->equip_slot < EQ::invslot::EQUIPMENT_BEGIN || (*iter)->equip_slot > EQ::invslot::EQUIPMENT_END) { continue; } + if ((*iter)->equip_slot == EQ::invslot::slotAmmo) { continue; } auto item = database.GetItem((*iter)->item_id); if (item == nullptr) { continue; } - if (EQEmu::lightsource::IsLevelGreater(item->Light, m_Light.Type[EQEmu::lightsource::LightEquipment])) - m_Light.Type[EQEmu::lightsource::LightEquipment] = item->Light; + if (EQ::lightsource::IsLevelGreater(item->Light, m_Light.Type[EQ::lightsource::LightEquipment])) + m_Light.Type[EQ::lightsource::LightEquipment] = item->Light; } uint8 general_light_type = 0; for (auto iter = itemlist.begin(); iter != itemlist.end(); ++iter) { - if ((*iter)->equip_slot < EQEmu::invslot::GENERAL_BEGIN || (*iter)->equip_slot > EQEmu::invslot::GENERAL_END) { continue; } + if ((*iter)->equip_slot < EQ::invslot::GENERAL_BEGIN || (*iter)->equip_slot > EQ::invslot::GENERAL_END) { continue; } auto item = database.GetItem((*iter)->item_id); if (item == nullptr) { continue; } @@ -1592,14 +1592,14 @@ void Corpse::UpdateEquipmentLight() if (!item->IsClassCommon()) { continue; } if (item->Light < 9 || item->Light > 13) { continue; } - if (EQEmu::lightsource::TypeToLevel(item->Light)) + if (EQ::lightsource::TypeToLevel(item->Light)) general_light_type = item->Light; } - if (EQEmu::lightsource::IsLevelGreater(general_light_type, m_Light.Type[EQEmu::lightsource::LightEquipment])) - m_Light.Type[EQEmu::lightsource::LightEquipment] = general_light_type; + if (EQ::lightsource::IsLevelGreater(general_light_type, m_Light.Type[EQ::lightsource::LightEquipment])) + m_Light.Type[EQ::lightsource::LightEquipment] = general_light_type; - m_Light.Level[EQEmu::lightsource::LightEquipment] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightEquipment]); + m_Light.Level[EQ::lightsource::LightEquipment] = EQ::lightsource::TypeToLevel(m_Light.Type[EQ::lightsource::LightEquipment]); } void Corpse::AddLooter(Mob* who) { diff --git a/zone/corpse.h b/zone/corpse.h index d453c7e9e..300569f89 100644 --- a/zone/corpse.h +++ b/zone/corpse.h @@ -30,7 +30,7 @@ class Raid; struct ExtraAttackOptions; struct NPCType; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -51,9 +51,9 @@ class Corpse : public Mob { static Corpse* LoadCharacterCorpseEntity(uint32 in_dbid, uint32 in_charid, std::string in_charname, const glm::vec4& position, std::string time_of_death, bool rezzed, bool was_at_graveyard, uint32 guild_consent_id); /* Corpse: General */ - virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill) { return true; } - virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; } - virtual bool Attack(Mob* other, int Hand = EQEmu::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = true, bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) { return false; } + virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill) { return true; } + virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; } + virtual bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = true, bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) { return false; } virtual bool HasRaid() { return false; } virtual bool HasGroup() { return false; } virtual Raid* GetRaid() { return 0; } @@ -138,7 +138,7 @@ class Corpse : public Mob { virtual void UpdateEquipmentLight(); protected: - void MoveItemToCorpse(Client *client, EQEmu::ItemInstance *inst, int16 equipSlot, std::list &removedList); + void MoveItemToCorpse(Client *client, EQ::ItemInstance *inst, int16 equipSlot, std::list &removedList); private: bool is_player_corpse; /* Determines if Player Corpse or not */ @@ -167,7 +167,7 @@ private: Timer corpse_delay_timer; Timer corpse_graveyard_timer; Timer loot_cooldown_timer; /* Delay between loot actions on the corpse entity */ - EQEmu::TintProfile item_tint; + EQ::TintProfile item_tint; std::vector consented_player_names; LootRequestType loot_request_type; diff --git a/zone/doors.cpp b/zone/doors.cpp index 92e83f06d..00c17c668 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -210,7 +210,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) { uint32 player_has_key = 0; uint32 player_key = 0; - const EQEmu::ItemInstance *lock_pick_item = sender->GetInv().GetItem(EQEmu::invslot::slotCursor); + const EQ::ItemInstance *lock_pick_item = sender->GetInv().GetItem(EQ::invslot::slotCursor); player_has_key = static_cast(sender->GetInv().HasItem(required_key_item, 1)); if (player_has_key != INVALID_INDEX) { @@ -320,10 +320,10 @@ void Doors::HandleClick(Client* sender, uint8 trigger) { * Try Lock pick */ else if (lock_pick_item != nullptr) { - if (sender->GetSkill(EQEmu::skills::SkillPickLock)) { - if (lock_pick_item->GetItem()->ItemType == EQEmu::item::ItemTypeLockPick) { - float player_pick_lock_skill = sender->GetSkill(EQEmu::skills::SkillPickLock); - sender->CheckIncreaseSkill(EQEmu::skills::SkillPickLock, nullptr, 1); + if (sender->GetSkill(EQ::skills::SkillPickLock)) { + if (lock_pick_item->GetItem()->ItemType == EQ::item::ItemTypeLockPick) { + float player_pick_lock_skill = sender->GetSkill(EQ::skills::SkillPickLock); + sender->CheckIncreaseSkill(EQ::skills::SkillPickLock, nullptr, 1); LogSkills("Client has lockpicks: skill=[{}]", player_pick_lock_skill); diff --git a/zone/effects.cpp b/zone/effects.cpp index 7e2ecdbc7..b82f74a4d 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -432,14 +432,14 @@ int32 Client::GetActSpellCasttime(uint16 spell_id, int32 casttime) bool Client::TrainDiscipline(uint32 itemid) { //get the item info - const EQEmu::ItemData *item = database.GetItem(itemid); + const EQ::ItemData *item = database.GetItem(itemid); if(item == nullptr) { Message(Chat::Red, "Unable to find the tome you turned in!"); LogError("Unable to find turned in tome id [{}]\n", (unsigned long)itemid); return(false); } - if (!item->IsClassCommon() || item->ItemType != EQEmu::item::ItemTypeSpell) { + if (!item->IsClassCommon() || item->ItemType != EQ::item::ItemTypeSpell) { Message(Chat::Red, "Invalid item type, you cannot learn from this item."); //summon them the item back... SummonItem(itemid); @@ -645,9 +645,9 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) { } if (reduced_recast > 0) - CastSpell(spell_id, target, EQEmu::spells::CastingSlot::Discipline, -1, -1, 0, -1, (uint32)DiscTimer, reduced_recast); + CastSpell(spell_id, target, EQ::spells::CastingSlot::Discipline, -1, -1, 0, -1, (uint32)DiscTimer, reduced_recast); else{ - CastSpell(spell_id, target, EQEmu::spells::CastingSlot::Discipline); + CastSpell(spell_id, target, EQ::spells::CastingSlot::Discipline); return true; } @@ -655,7 +655,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) { } else { - CastSpell(spell_id, target, EQEmu::spells::CastingSlot::Discipline); + CastSpell(spell_id, target, EQ::spells::CastingSlot::Discipline); } return(true); } diff --git a/zone/embparser.cpp b/zone/embparser.cpp index f89c09ad4..671a26d9c 100644 --- a/zone/embparser.cpp +++ b/zone/embparser.cpp @@ -165,8 +165,8 @@ void PerlembParser::ReloadQuests() } int PerlembParser::EventCommon( - QuestEventID event, uint32 objid, const char *data, NPC *npcmob, EQEmu::ItemInstance *item_inst, Mob *mob, - uint32 extradata, bool global, std::vector *extra_pointers + QuestEventID event, uint32 objid, const char *data, NPC *npcmob, EQ::ItemInstance *item_inst, Mob *mob, + uint32 extradata, bool global, std::vector *extra_pointers ) { if (!perl) { @@ -266,7 +266,7 @@ int PerlembParser::EventCommon( int PerlembParser::EventNPC( QuestEventID evt, NPC *npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers + std::vector *extra_pointers ) { return EventCommon(evt, npc->GetNPCTypeID(), data.c_str(), npc, nullptr, init, extra_data, false, extra_pointers); @@ -274,7 +274,7 @@ int PerlembParser::EventNPC( int PerlembParser::EventGlobalNPC( QuestEventID evt, NPC *npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers + std::vector *extra_pointers ) { return EventCommon(evt, npc->GetNPCTypeID(), data.c_str(), npc, nullptr, init, extra_data, true, extra_pointers); @@ -282,7 +282,7 @@ int PerlembParser::EventGlobalNPC( int PerlembParser::EventPlayer( QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers + std::vector *extra_pointers ) { return EventCommon(evt, 0, data.c_str(), nullptr, nullptr, client, extra_data, false, extra_pointers); @@ -290,15 +290,15 @@ int PerlembParser::EventPlayer( int PerlembParser::EventGlobalPlayer( QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers + std::vector *extra_pointers ) { return EventCommon(evt, 0, data.c_str(), nullptr, nullptr, client, extra_data, true, extra_pointers); } int PerlembParser::EventItem( - QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers + QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers ) { // needs pointer validation on 'item' argument @@ -307,7 +307,7 @@ int PerlembParser::EventItem( int PerlembParser::EventSpell( QuestEventID evt, NPC *npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers + std::vector *extra_pointers ) { return EventCommon(evt, 0, itoa(spell_id), npc, nullptr, client, extra_data, false, extra_pointers); @@ -416,7 +416,7 @@ bool PerlembParser::SpellHasQuestSub(uint32 spell_id, QuestEventID evt) return (perl->SubExists(package_name.str().c_str(), subname)); } -bool PerlembParser::ItemHasQuestSub(EQEmu::ItemInstance *itm, QuestEventID evt) +bool PerlembParser::ItemHasQuestSub(EQ::ItemInstance *itm, QuestEventID evt) { std::stringstream package_name; package_name << "qst_item_" << itm->GetID(); @@ -564,7 +564,7 @@ void PerlembParser::LoadGlobalPlayerScript(std::string filename) global_player_quest_status_ = questLoaded; } -void PerlembParser::LoadItemScript(std::string filename, EQEmu::ItemInstance *item) +void PerlembParser::LoadItemScript(std::string filename, EQ::ItemInstance *item) { if (item == nullptr) { return; @@ -776,7 +776,7 @@ int PerlembParser::SendCommands( uint32 npcid, Mob *other, Mob *mob, - EQEmu::ItemInstance *item_inst + EQ::ItemInstance *item_inst ) { if (!perl) { @@ -852,7 +852,7 @@ int PerlembParser::SendCommands( //only export QuestItem if it's an item quest if (item_inst) { - EQEmu::ItemInstance *curi = quest_manager.GetQuestItem(); + EQ::ItemInstance *curi = quest_manager.GetQuestItem(); snprintf(namebuf, 64, "%s::questitem", pkgprefix); SV *questitem = get_sv(namebuf, true); sv_setref_pv(questitem, "QuestItem", curi); @@ -979,7 +979,7 @@ void PerlembParser::MapFunctions() void PerlembParser::GetQuestTypes( bool &isPlayerQuest, bool &isGlobalPlayerQuest, bool &isGlobalNPC, bool &isItemQuest, - bool &isSpellQuest, QuestEventID event, NPC *npcmob, EQEmu::ItemInstance *item_inst, Mob *mob, bool global + bool &isSpellQuest, QuestEventID event, NPC *npcmob, EQ::ItemInstance *item_inst, Mob *mob, bool global ) { if (event == EVENT_SPELL_EFFECT_CLIENT || @@ -1018,7 +1018,7 @@ void PerlembParser::GetQuestPackageName( uint32 objid, const char *data, NPC *npcmob, - EQEmu::ItemInstance *item_inst, + EQ::ItemInstance *item_inst, bool global ) { @@ -1033,8 +1033,8 @@ void PerlembParser::GetQuestPackageName( } } else if (isItemQuest) { - // need a valid EQEmu::ItemInstance pointer check here..unsure how to cancel this process - const EQEmu::ItemData *item = item_inst->GetItem(); + // need a valid EQ::ItemInstance pointer check here..unsure how to cancel this process + const EQ::ItemData *item = item_inst->GetItem(); package_name = "qst_item_"; package_name += itoa(item->ID); } @@ -1263,7 +1263,7 @@ void PerlembParser::ExportItemVariables(std::string &package_name, Mob *mob) //start with an empty hash perl->eval(std::string("%").append(hashname).append(" = ();").c_str()); - for (int slot = EQEmu::invslot::EQUIPMENT_BEGIN; slot <= EQEmu::invslot::GENERAL_END; slot++) { + for (int slot = EQ::invslot::EQUIPMENT_BEGIN; slot <= EQ::invslot::GENERAL_END; slot++) { char *hi_decl = nullptr; int itemid = mob->CastToClient()->GetItemIDAt(slot); if (itemid != -1 && itemid != 0) { @@ -1278,9 +1278,9 @@ void PerlembParser::ExportItemVariables(std::string &package_name, Mob *mob) std::string hashname = package_name + std::string("::oncursor"); perl->eval(std::string("%").append(hashname).append(" = ();").c_str()); char *hi_decl = nullptr; - int itemid = mob->CastToClient()->GetItemIDAt(EQEmu::invslot::slotCursor); + int itemid = mob->CastToClient()->GetItemIDAt(EQ::invslot::slotCursor); if (itemid != -1 && itemid != 0) { - MakeAnyLenString(&hi_decl, "push (@{$%s{%d}},%d);", hashname.c_str(), itemid, EQEmu::invslot::slotCursor); + MakeAnyLenString(&hi_decl, "push (@{$%s{%d}},%d);", hashname.c_str(), itemid, EQ::invslot::slotCursor); perl->eval(hi_decl); safe_delete_array(hi_decl); } @@ -1289,7 +1289,7 @@ void PerlembParser::ExportItemVariables(std::string &package_name, Mob *mob) void PerlembParser::ExportEventVariables( std::string &package_name, QuestEventID event, uint32 objid, const char *data, - NPC *npcmob, EQEmu::ItemInstance *item_inst, Mob *mob, uint32 extradata, std::vector *extra_pointers + NPC *npcmob, EQ::ItemInstance *item_inst, Mob *mob, uint32 extradata, std::vector *extra_pointers ) { switch (event) { @@ -1308,7 +1308,7 @@ void PerlembParser::ExportEventVariables( if (extra_pointers) { size_t sz = extra_pointers->size(); for (size_t i = 0; i < sz; ++i) { - EQEmu::ItemInstance *inst = EQEmu::any_cast(extra_pointers->at(i)); + EQ::ItemInstance *inst = EQ::any_cast(extra_pointers->at(i)); std::string var_name = "item"; var_name += std::to_string(i + 1); @@ -1476,7 +1476,7 @@ void PerlembParser::ExportEventVariables( case EVENT_SCALE_CALC: case EVENT_ITEM_ENTER_ZONE: { - // need a valid EQEmu::ItemInstance pointer check here..unsure how to cancel this process + // need a valid EQ::ItemInstance pointer check here..unsure how to cancel this process ExportVar(package_name.c_str(), "itemid", objid); ExportVar(package_name.c_str(), "itemname", item_inst->GetItem()->Name); break; @@ -1484,7 +1484,7 @@ void PerlembParser::ExportEventVariables( case EVENT_ITEM_CLICK_CAST: case EVENT_ITEM_CLICK: { - // need a valid EQEmu::ItemInstance pointer check here..unsure how to cancel this process + // need a valid EQ::ItemInstance pointer check here..unsure how to cancel this process ExportVar(package_name.c_str(), "itemid", objid); ExportVar(package_name.c_str(), "itemname", item_inst->GetItem()->Name); ExportVar(package_name.c_str(), "slotid", extradata); diff --git a/zone/embparser.h b/zone/embparser.h index 1e4c9c391..ed7989a99 100644 --- a/zone/embparser.h +++ b/zone/embparser.h @@ -31,7 +31,7 @@ class Mob; class Client; class NPC; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -49,30 +49,30 @@ public: ~PerlembParser(); virtual int EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); virtual int EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); virtual int EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); virtual int EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers); - virtual int EventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); + virtual int EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); virtual int EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); virtual bool HasQuestSub(uint32 npcid, QuestEventID evt); virtual bool HasGlobalQuestSub(QuestEventID evt); virtual bool PlayerHasQuestSub(QuestEventID evt); virtual bool GlobalPlayerHasQuestSub(QuestEventID evt); virtual bool SpellHasQuestSub(uint32 spell_id, QuestEventID evt); - virtual bool ItemHasQuestSub(EQEmu::ItemInstance *itm, QuestEventID evt); + virtual bool ItemHasQuestSub(EQ::ItemInstance *itm, QuestEventID evt); virtual void LoadNPCScript(std::string filename, int npc_id); virtual void LoadGlobalNPCScript(std::string filename); virtual void LoadPlayerScript(std::string filename); virtual void LoadGlobalPlayerScript(std::string filename); - virtual void LoadItemScript(std::string filename, EQEmu::ItemInstance *item); + virtual void LoadItemScript(std::string filename, EQ::ItemInstance *item); virtual void LoadSpellScript(std::string filename, uint32 spell_id); virtual void AddVar(std::string name, std::string val); @@ -90,16 +90,16 @@ private: void ExportVar(const char *pkgprefix, const char *varname, float value); void ExportVarComplex(const char *pkgprefix, const char *varname, const char *value); - int EventCommon(QuestEventID event, uint32 objid, const char * data, NPC* npcmob, EQEmu::ItemInstance* item_inst, Mob* mob, - uint32 extradata, bool global, std::vector *extra_pointers); - int SendCommands(const char *pkgprefix, const char *event, uint32 npcid, Mob* other, Mob* mob, EQEmu::ItemInstance *item_inst); + int EventCommon(QuestEventID event, uint32 objid, const char * data, NPC* npcmob, EQ::ItemInstance* item_inst, Mob* mob, + uint32 extradata, bool global, std::vector *extra_pointers); + int SendCommands(const char *pkgprefix, const char *event, uint32 npcid, Mob* other, Mob* mob, EQ::ItemInstance *item_inst); void MapFunctions(); void GetQuestTypes(bool &isPlayerQuest, bool &isGlobalPlayerQuest, bool &isGlobalNPC, bool &isItemQuest, - bool &isSpellQuest, QuestEventID event, NPC* npcmob, EQEmu::ItemInstance* item_inst, Mob* mob, bool global); + bool &isSpellQuest, QuestEventID event, NPC* npcmob, EQ::ItemInstance* item_inst, Mob* mob, bool global); void GetQuestPackageName(bool &isPlayerQuest, bool &isGlobalPlayerQuest, bool &isGlobalNPC, bool &isItemQuest, bool &isSpellQuest, std::string &package_name, QuestEventID event, uint32 objid, const char * data, - NPC* npcmob, EQEmu::ItemInstance* item_inst, bool global); + NPC* npcmob, EQ::ItemInstance* item_inst, bool global); void ExportCharID(const std::string &package_name, int &char_id, NPC *npcmob, Mob *mob); void ExportQGlobals(bool isPlayerQuest, bool isGlobalPlayerQuest, bool isGlobalNPC, bool isItemQuest, bool isSpellQuest, std::string &package_name, NPC *npcmob, Mob *mob, int char_id); @@ -108,7 +108,7 @@ private: void ExportZoneVariables(std::string &package_name); void ExportItemVariables(std::string &package_name, Mob *mob); void ExportEventVariables(std::string &package_name, QuestEventID event, uint32 objid, const char * data, - NPC* npcmob, EQEmu::ItemInstance* item_inst, Mob* mob, uint32 extradata, std::vector *extra_pointers); + NPC* npcmob, EQ::ItemInstance* item_inst, Mob* mob, uint32 extradata, std::vector *extra_pointers); std::map npc_quest_status_; PerlQuestStatus global_npc_quest_status_; diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp index f926bc6fe..6b4d75719 100644 --- a/zone/embparser_api.cpp +++ b/zone/embparser_api.cpp @@ -109,7 +109,7 @@ XS(XS_QuestItem_new) { if (items != 1) Perl_croak(aTHX_ "Usage: quest::QuestItem::new()"); - EQEmu::ItemInstance *RETVAL; + EQ::ItemInstance *RETVAL; RETVAL = quest_manager.GetQuestItem(); ST(0) = sv_newmortal(); @@ -372,7 +372,7 @@ XS(XS__getinventoryslotid) { if (items != 1) Perl_croak(aTHX_ "Usage: quest::getinventoryslotid(string identifier)"); - int16 RETVAL = EQEmu::invslot::SLOT_INVALID; + int16 RETVAL = EQ::invslot::SLOT_INVALID; dXSTARG; std::string identifier = (Const_char *)SvPV_nolen(ST(0)); @@ -380,89 +380,89 @@ XS(XS__getinventoryslotid) { identifier[i] = std::tolower(identifier[i]); if (identifier.find('.') == std::string::npos) { - if (identifier == "invalid") RETVAL = EQEmu::invslot::SLOT_INVALID; - else if (identifier == "charm") RETVAL = EQEmu::invslot::slotCharm; - else if (identifier == "ear1") RETVAL = EQEmu::invslot::slotEar1; - else if (identifier == "head") RETVAL = EQEmu::invslot::slotHead; - else if (identifier == "face") RETVAL = EQEmu::invslot::slotFace; - else if (identifier == "ear2") RETVAL = EQEmu::invslot::slotEar2; - else if (identifier == "neck") RETVAL = EQEmu::invslot::slotNeck; - else if (identifier == "shoulders") RETVAL = EQEmu::invslot::slotShoulders; - else if (identifier == "arms") RETVAL = EQEmu::invslot::slotArms; - else if (identifier == "back") RETVAL = EQEmu::invslot::slotBack; - else if (identifier == "wrist1") RETVAL = EQEmu::invslot::slotWrist1; - else if (identifier == "wrist2") RETVAL = EQEmu::invslot::slotWrist2; - else if (identifier == "range") RETVAL = EQEmu::invslot::slotRange; - else if (identifier == "hands") RETVAL = EQEmu::invslot::slotHands; - else if (identifier == "primary") RETVAL = EQEmu::invslot::slotPrimary; - else if (identifier == "secondary") RETVAL = EQEmu::invslot::slotSecondary; - else if (identifier == "finger1") RETVAL = EQEmu::invslot::slotFinger1; - else if (identifier == "finger2") RETVAL = EQEmu::invslot::slotFinger2; - else if (identifier == "chest") RETVAL = EQEmu::invslot::slotChest; - else if (identifier == "legs") RETVAL = EQEmu::invslot::slotLegs; - else if (identifier == "feet") RETVAL = EQEmu::invslot::slotFeet; - else if (identifier == "waist") RETVAL = EQEmu::invslot::slotWaist; - else if (identifier == "powersource") RETVAL = EQEmu::invslot::slotPowerSource; - else if (identifier == "ammo") RETVAL = EQEmu::invslot::slotAmmo; - else if (identifier == "general1") RETVAL = EQEmu::invslot::slotGeneral1; - else if (identifier == "general2") RETVAL = EQEmu::invslot::slotGeneral2; - else if (identifier == "general3") RETVAL = EQEmu::invslot::slotGeneral3; - else if (identifier == "general4") RETVAL = EQEmu::invslot::slotGeneral4; - else if (identifier == "general5") RETVAL = EQEmu::invslot::slotGeneral5; - else if (identifier == "general6") RETVAL = EQEmu::invslot::slotGeneral6; - else if (identifier == "general7") RETVAL = EQEmu::invslot::slotGeneral7; - else if (identifier == "general8") RETVAL = EQEmu::invslot::slotGeneral8; - else if (identifier == "general9") RETVAL = EQEmu::invslot::slotGeneral9; - else if (identifier == "general10") RETVAL = EQEmu::invslot::slotGeneral10; - else if (identifier == "cursor") RETVAL = EQEmu::invslot::slotCursor; - else if (identifier == "tradeskill") RETVAL = EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE; - else if (identifier == "augment") RETVAL = EQEmu::invslot::SLOT_AUGMENT_GENERIC_RETURN; + if (identifier == "invalid") RETVAL = EQ::invslot::SLOT_INVALID; + else if (identifier == "charm") RETVAL = EQ::invslot::slotCharm; + else if (identifier == "ear1") RETVAL = EQ::invslot::slotEar1; + else if (identifier == "head") RETVAL = EQ::invslot::slotHead; + else if (identifier == "face") RETVAL = EQ::invslot::slotFace; + else if (identifier == "ear2") RETVAL = EQ::invslot::slotEar2; + else if (identifier == "neck") RETVAL = EQ::invslot::slotNeck; + else if (identifier == "shoulders") RETVAL = EQ::invslot::slotShoulders; + else if (identifier == "arms") RETVAL = EQ::invslot::slotArms; + else if (identifier == "back") RETVAL = EQ::invslot::slotBack; + else if (identifier == "wrist1") RETVAL = EQ::invslot::slotWrist1; + else if (identifier == "wrist2") RETVAL = EQ::invslot::slotWrist2; + else if (identifier == "range") RETVAL = EQ::invslot::slotRange; + else if (identifier == "hands") RETVAL = EQ::invslot::slotHands; + else if (identifier == "primary") RETVAL = EQ::invslot::slotPrimary; + else if (identifier == "secondary") RETVAL = EQ::invslot::slotSecondary; + else if (identifier == "finger1") RETVAL = EQ::invslot::slotFinger1; + else if (identifier == "finger2") RETVAL = EQ::invslot::slotFinger2; + else if (identifier == "chest") RETVAL = EQ::invslot::slotChest; + else if (identifier == "legs") RETVAL = EQ::invslot::slotLegs; + else if (identifier == "feet") RETVAL = EQ::invslot::slotFeet; + else if (identifier == "waist") RETVAL = EQ::invslot::slotWaist; + else if (identifier == "powersource") RETVAL = EQ::invslot::slotPowerSource; + else if (identifier == "ammo") RETVAL = EQ::invslot::slotAmmo; + else if (identifier == "general1") RETVAL = EQ::invslot::slotGeneral1; + else if (identifier == "general2") RETVAL = EQ::invslot::slotGeneral2; + else if (identifier == "general3") RETVAL = EQ::invslot::slotGeneral3; + else if (identifier == "general4") RETVAL = EQ::invslot::slotGeneral4; + else if (identifier == "general5") RETVAL = EQ::invslot::slotGeneral5; + else if (identifier == "general6") RETVAL = EQ::invslot::slotGeneral6; + else if (identifier == "general7") RETVAL = EQ::invslot::slotGeneral7; + else if (identifier == "general8") RETVAL = EQ::invslot::slotGeneral8; + else if (identifier == "general9") RETVAL = EQ::invslot::slotGeneral9; + else if (identifier == "general10") RETVAL = EQ::invslot::slotGeneral10; + else if (identifier == "cursor") RETVAL = EQ::invslot::slotCursor; + else if (identifier == "tradeskill") RETVAL = EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE; + else if (identifier == "augment") RETVAL = EQ::invslot::SLOT_AUGMENT_GENERIC_RETURN; } else { - if (identifier == "possessions.begin") RETVAL = EQEmu::invslot::POSSESSIONS_BEGIN; - else if (identifier == "possessions.end") RETVAL = EQEmu::invslot::POSSESSIONS_END; - else if (identifier == "equipment.begin") RETVAL = EQEmu::invslot::EQUIPMENT_BEGIN; - else if (identifier == "equipment.end") RETVAL = EQEmu::invslot::EQUIPMENT_END; - else if (identifier == "general.begin") RETVAL = EQEmu::invslot::GENERAL_BEGIN; - else if (identifier == "general.end") RETVAL = EQEmu::invslot::GENERAL_END; - else if (identifier == "possessionsbags.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN; - else if (identifier == "possessionsbags.end") RETVAL = EQEmu::invbag::CURSOR_BAG_END; - else if (identifier == "generalbags.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN; - else if (identifier == "generalbags.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_END; - else if (identifier == "general1bag.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN; - else if (identifier == "general1bag.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 9; - else if (identifier == "general2bag.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 10; - else if (identifier == "general2bag.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 19; - else if (identifier == "general3bag.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 20; - else if (identifier == "general3bag.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 29; - else if (identifier == "general4bag.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 30; - else if (identifier == "general4bag.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 39; - else if (identifier == "general5bag.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 40; - else if (identifier == "general5bag.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 49; - else if (identifier == "general6bag.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 50; - else if (identifier == "general6bag.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 59; - else if (identifier == "general7bag.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 60; - else if (identifier == "general7bag.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 69; - else if (identifier == "general8bag.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 70; - else if (identifier == "general8bag.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 79; - else if (identifier == "general9bag.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 80; - else if (identifier == "general9bag.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 89; - else if (identifier == "general10bag.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 90; - else if (identifier == "general10bag.end") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 99; - else if (identifier == "cursorbag.begin") RETVAL = EQEmu::invbag::CURSOR_BAG_BEGIN; - else if (identifier == "cursorbag.end") RETVAL = EQEmu::invbag::CURSOR_BAG_END; - else if (identifier == "bank.begin") RETVAL = EQEmu::invslot::BANK_BEGIN; - else if (identifier == "bank.end") RETVAL = EQEmu::invslot::BANK_END; - else if (identifier == "bankbags.begin") RETVAL = EQEmu::invbag::BANK_BAGS_BEGIN; - else if (identifier == "bankbags.end") RETVAL = EQEmu::invbag::BANK_BAGS_END; - else if (identifier == "sharedbank.begin") RETVAL = EQEmu::invslot::SHARED_BANK_BEGIN; - else if (identifier == "sharedbank.end") RETVAL = EQEmu::invslot::SHARED_BANK_END; - else if (identifier == "sharedbankbags.begin") RETVAL = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN; - else if (identifier == "sharedbankbags.end") RETVAL = EQEmu::invbag::SHARED_BANK_BAGS_END; - else if (identifier == "bagslot.begin") RETVAL = EQEmu::invbag::SLOT_BEGIN; - else if (identifier == "bagslot.end") RETVAL = EQEmu::invbag::SLOT_END; - else if (identifier == "augsocket.begin") RETVAL = EQEmu::invaug::SOCKET_BEGIN; - else if (identifier == "augsocket.end") RETVAL = EQEmu::invaug::SOCKET_END; + if (identifier == "possessions.begin") RETVAL = EQ::invslot::POSSESSIONS_BEGIN; + else if (identifier == "possessions.end") RETVAL = EQ::invslot::POSSESSIONS_END; + else if (identifier == "equipment.begin") RETVAL = EQ::invslot::EQUIPMENT_BEGIN; + else if (identifier == "equipment.end") RETVAL = EQ::invslot::EQUIPMENT_END; + else if (identifier == "general.begin") RETVAL = EQ::invslot::GENERAL_BEGIN; + else if (identifier == "general.end") RETVAL = EQ::invslot::GENERAL_END; + else if (identifier == "possessionsbags.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN; + else if (identifier == "possessionsbags.end") RETVAL = EQ::invbag::CURSOR_BAG_END; + else if (identifier == "generalbags.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN; + else if (identifier == "generalbags.end") RETVAL = EQ::invbag::GENERAL_BAGS_END; + else if (identifier == "general1bag.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN; + else if (identifier == "general1bag.end") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 9; + else if (identifier == "general2bag.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 10; + else if (identifier == "general2bag.end") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 19; + else if (identifier == "general3bag.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 20; + else if (identifier == "general3bag.end") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 29; + else if (identifier == "general4bag.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 30; + else if (identifier == "general4bag.end") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 39; + else if (identifier == "general5bag.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 40; + else if (identifier == "general5bag.end") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 49; + else if (identifier == "general6bag.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 50; + else if (identifier == "general6bag.end") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 59; + else if (identifier == "general7bag.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 60; + else if (identifier == "general7bag.end") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 69; + else if (identifier == "general8bag.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 70; + else if (identifier == "general8bag.end") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 79; + else if (identifier == "general9bag.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 80; + else if (identifier == "general9bag.end") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 89; + else if (identifier == "general10bag.begin") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 90; + else if (identifier == "general10bag.end") RETVAL = EQ::invbag::GENERAL_BAGS_BEGIN + 99; + else if (identifier == "cursorbag.begin") RETVAL = EQ::invbag::CURSOR_BAG_BEGIN; + else if (identifier == "cursorbag.end") RETVAL = EQ::invbag::CURSOR_BAG_END; + else if (identifier == "bank.begin") RETVAL = EQ::invslot::BANK_BEGIN; + else if (identifier == "bank.end") RETVAL = EQ::invslot::BANK_END; + else if (identifier == "bankbags.begin") RETVAL = EQ::invbag::BANK_BAGS_BEGIN; + else if (identifier == "bankbags.end") RETVAL = EQ::invbag::BANK_BAGS_END; + else if (identifier == "sharedbank.begin") RETVAL = EQ::invslot::SHARED_BANK_BEGIN; + else if (identifier == "sharedbank.end") RETVAL = EQ::invslot::SHARED_BANK_END; + else if (identifier == "sharedbankbags.begin") RETVAL = EQ::invbag::SHARED_BANK_BAGS_BEGIN; + else if (identifier == "sharedbankbags.end") RETVAL = EQ::invbag::SHARED_BANK_BAGS_END; + else if (identifier == "bagslot.begin") RETVAL = EQ::invbag::SLOT_BEGIN; + else if (identifier == "bagslot.end") RETVAL = EQ::invbag::SLOT_END; + else if (identifier == "augsocket.begin") RETVAL = EQ::invaug::SOCKET_BEGIN; + else if (identifier == "augsocket.end") RETVAL = EQ::invaug::SOCKET_END; } XSprePUSH; PUSHu((IV)RETVAL); diff --git a/zone/embxs.cpp b/zone/embxs.cpp index 4571a8f8f..d22f3ecac 100644 --- a/zone/embxs.cpp +++ b/zone/embxs.cpp @@ -33,7 +33,7 @@ const char *getItemName(unsigned itemid) { - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; item = database.GetItem(itemid); if (item) diff --git a/zone/encounter.cpp b/zone/encounter.cpp index 7d37844b6..5eba3b028 100644 --- a/zone/encounter.cpp +++ b/zone/encounter.cpp @@ -36,7 +36,7 @@ Encounter::Encounter(const char* enc_name) :Mob ( nullptr, nullptr, 0, 0, 0, INVISIBLE_MAN, 0, BT_NoTarget, 0, 0, 0, 0, 0, glm::vec4(0,0,0,0), 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, EQEmu::TintProfile(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, false + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, EQ::TintProfile(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, false ) { encounter_name[0] = 0; diff --git a/zone/encounter.h b/zone/encounter.h index eeeba8e0f..026da2e79 100644 --- a/zone/encounter.h +++ b/zone/encounter.h @@ -34,9 +34,9 @@ public: ~Encounter(); //abstract virtual function implementations required by base abstract class - virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill) { return true; } - virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; } - virtual bool Attack(Mob* other, int Hand = EQEmu::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, + virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill) { return true; } + virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; } + virtual bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) { return false; } diff --git a/zone/entity.cpp b/zone/entity.cpp index 5290dde0d..92f2c6174 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -1598,7 +1598,7 @@ void EntityList::QueueClientsByTarget(Mob *sender, const EQApplicationPacket *ap } } -void EntityList::QueueClientsByXTarget(Mob *sender, const EQApplicationPacket *app, bool iSendToSender, EQEmu::versions::ClientVersionBitmask client_version_bits) +void EntityList::QueueClientsByXTarget(Mob *sender, const EQApplicationPacket *app, bool iSendToSender, EQ::versions::ClientVersionBitmask client_version_bits) { auto it = client_list.begin(); while (it != client_list.end()) { @@ -1728,7 +1728,7 @@ void EntityList::QueueClientsStatus(Mob *sender, const EQApplicationPacket *app, void EntityList::DuelMessage(Mob *winner, Mob *loser, bool flee) { if (winner->GetLevelCon(winner->GetLevel(), loser->GetLevel()) > 2) { - std::vector args; + std::vector args; args.push_back(winner); args.push_back(loser); @@ -2130,7 +2130,7 @@ void EntityList::QueueClientsGuildBankItemUpdate(const GuildBankItemUpdate_Struc memcpy(outgbius, gbius, sizeof(GuildBankItemUpdate_Struct)); - const EQEmu::ItemData *Item = database.GetItem(gbius->ItemID); + const EQ::ItemData *Item = database.GetItem(gbius->ItemID); auto it = client_list.begin(); while (it != client_list.end()) { @@ -3378,7 +3378,7 @@ void EntityList::ClearFeignAggro(Mob *targ) } if (targ->IsClient()) { - std::vector args; + std::vector args; args.push_back(it->second); int i = parse->EventPlayer(EVENT_FEIGN_DEATH, targ->CastToClient(), "", 0, &args); if (i != 0) { @@ -3445,11 +3445,11 @@ bool EntityList::MakeTrackPacket(Client *client) float MobDistance; if (client->GetClass() == DRUID) - distance = (client->GetSkill(EQEmu::skills::SkillTracking) * 10); + distance = (client->GetSkill(EQ::skills::SkillTracking) * 10); else if (client->GetClass() == RANGER) - distance = (client->GetSkill(EQEmu::skills::SkillTracking) * 12); + distance = (client->GetSkill(EQ::skills::SkillTracking) * 12); else if (client->GetClass() == BARD) - distance = (client->GetSkill(EQEmu::skills::SkillTracking) * 7); + distance = (client->GetSkill(EQ::skills::SkillTracking) * 7); if (distance <= 0) return false; if (distance < 300) @@ -3710,10 +3710,10 @@ void EntityList::ProcessMove(Client *c, const glm::vec3& location) for (auto iter = events.begin(); iter != events.end(); ++iter) { quest_proximity_event& evt = (*iter); if (evt.npc) { - std::vector args; + std::vector args; parse->EventNPC(evt.event_id, evt.npc, evt.client, "", 0, &args); } else { - std::vector args; + std::vector args; args.push_back(&evt.area_id); args.push_back(&evt.area_type); parse->EventPlayer(evt.event_id, evt.client, "", 0, &args); @@ -3769,7 +3769,7 @@ void EntityList::ProcessMove(NPC *n, float x, float y, float z) { for (auto iter = events.begin(); iter != events.end(); ++iter) { quest_proximity_event &evt = (*iter); - std::vector args; + std::vector args; args.push_back(&evt.area_id); args.push_back(&evt.area_type); parse->EventNPC(evt.event_id, evt.npc, evt.client, "", 0, &args); @@ -4262,11 +4262,11 @@ void EntityList::GroupMessage(uint32 gid, const char *from, const char *message) uint16 EntityList::CreateGroundObject(uint32 itemid, const glm::vec4& position, uint32 decay_time) { - const EQEmu::ItemData *is = database.GetItem(itemid); + const EQ::ItemData *is = database.GetItem(itemid); if (!is) return 0; - auto i = new EQEmu::ItemInstance(is, is->MaxCharges); + auto i = new EQ::ItemInstance(is, is->MaxCharges); if (!i) return 0; @@ -4848,7 +4848,7 @@ void EntityList::UpdateFindableNPCState(NPC *n, bool Remove) auto it = client_list.begin(); while (it != client_list.end()) { Client *c = it->second; - if (c && (c->ClientVersion() >= EQEmu::versions::ClientVersion::SoD)) + if (c && (c->ClientVersion() >= EQ::versions::ClientVersion::SoD)) c->QueuePacket(outapp); ++it; diff --git a/zone/entity.h b/zone/entity.h index 8c705897a..b6b187300 100644 --- a/zone/entity.h +++ b/zone/entity.h @@ -394,14 +394,14 @@ public: void QueueClientsByTarget(Mob* sender, const EQApplicationPacket* app, bool iSendToSender = true, Mob* SkipThisMob = 0, bool ackreq = true, bool HoTT = true, uint32 ClientVersionBits = 0xFFFFFFFF, bool inspect_buffs = false); - void QueueClientsByXTarget(Mob* sender, const EQApplicationPacket* app, bool iSendToSender = true, EQEmu::versions::ClientVersionBitmask client_version_bits = EQEmu::versions::ClientVersionBitmask::maskAllClients); + void QueueClientsByXTarget(Mob* sender, const EQApplicationPacket* app, bool iSendToSender = true, EQ::versions::ClientVersionBitmask client_version_bits = EQ::versions::ClientVersionBitmask::maskAllClients); void QueueToGroupsForNPCHealthAA(Mob* sender, const EQApplicationPacket* app); void QueueManaged(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, bool ackreq = true); void AEAttack( Mob *attacker, float distance, - int Hand = EQEmu::invslot::slotPrimary, + int Hand = EQ::invslot::slotPrimary, int count = 0, bool is_from_spell = false ); diff --git a/zone/forage.cpp b/zone/forage.cpp index 069f2be63..2119d699d 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -153,21 +153,21 @@ uint32 ZoneDatabase::GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, //we need this function to immediately determine, after we receive OP_Fishing, if we can even try to fish, otherwise we have to wait a while to get the failure bool Client::CanFish() { //make sure we still have a fishing pole on: - const EQEmu::ItemInstance* Pole = m_inv[EQEmu::invslot::slotPrimary]; - int32 bslot = m_inv.HasItemByUse(EQEmu::item::ItemTypeFishingBait, 1, invWhereWorn | invWherePersonal); - const EQEmu::ItemInstance* Bait = nullptr; + const EQ::ItemInstance* Pole = m_inv[EQ::invslot::slotPrimary]; + int32 bslot = m_inv.HasItemByUse(EQ::item::ItemTypeFishingBait, 1, invWhereWorn | invWherePersonal); + const EQ::ItemInstance* Bait = nullptr; if (bslot != INVALID_INDEX) Bait = m_inv.GetItem(bslot); - if (!Pole || !Pole->IsClassCommon() || Pole->GetItem()->ItemType != EQEmu::item::ItemTypeFishingPole) { - if (m_inv.HasItemByUse(EQEmu::item::ItemTypeFishingPole, 1, invWhereWorn | invWherePersonal | invWhereBank | invWhereSharedBank | invWhereTrading | invWhereCursor)) //We have a fishing pole somewhere, just not equipped + if (!Pole || !Pole->IsClassCommon() || Pole->GetItem()->ItemType != EQ::item::ItemTypeFishingPole) { + if (m_inv.HasItemByUse(EQ::item::ItemTypeFishingPole, 1, invWhereWorn | invWherePersonal | invWhereBank | invWhereSharedBank | invWhereTrading | invWhereCursor)) //We have a fishing pole somewhere, just not equipped MessageString(Chat::Skills, FISHING_EQUIP_POLE); //You need to put your fishing pole in your primary hand. else //We don't have a fishing pole anywhere MessageString(Chat::Skills, FISHING_NO_POLE); //You can't fish without a fishing pole, go buy one. return false; } - if (!Bait || !Bait->IsClassCommon() || Bait->GetItem()->ItemType != EQEmu::item::ItemTypeFishingBait) { + if (!Bait || !Bait->IsClassCommon() || Bait->GetItem()->ItemType != EQ::item::ItemTypeFishingBait) { MessageString(Chat::Skills, FISHING_NO_BAIT); //You can't fish without fishing bait, go buy some. return false; } @@ -249,16 +249,16 @@ void Client::GoFish() //success formula is not researched at all - int fishing_skill = GetSkill(EQEmu::skills::SkillFishing); //will take into account skill bonuses on pole & bait + int fishing_skill = GetSkill(EQ::skills::SkillFishing); //will take into account skill bonuses on pole & bait //make sure we still have a fishing pole on: - int32 bslot = m_inv.HasItemByUse(EQEmu::item::ItemTypeFishingBait, 1, invWhereWorn | invWherePersonal); - const EQEmu::ItemInstance* Bait = nullptr; + int32 bslot = m_inv.HasItemByUse(EQ::item::ItemTypeFishingBait, 1, invWhereWorn | invWherePersonal); + const EQ::ItemInstance* Bait = nullptr; if (bslot != INVALID_INDEX) Bait = m_inv.GetItem(bslot); //if the bait isnt equipped, need to add its skill bonus - if (bslot >= EQEmu::invslot::GENERAL_BEGIN && Bait != nullptr && Bait->GetItem()->SkillModType == EQEmu::skills::SkillFishing) { + if (bslot >= EQ::invslot::GENERAL_BEGIN && Bait != nullptr && Bait->GetItem()->SkillModType == EQ::skills::SkillFishing) { fishing_skill += Bait->GetItem()->SkillModValue; } @@ -312,17 +312,17 @@ void Client::GoFish() food_id = (RuleB(Character, UseNoJunkFishing) ? 13019 : common_fish_ids[index]); } - const EQEmu::ItemData* food_item = database.GetItem(food_id); + const EQ::ItemData* food_item = database.GetItem(food_id); if (food_item) { - if (food_item->ItemType != EQEmu::item::ItemTypeFood) { + if (food_item->ItemType != EQ::item::ItemTypeFood) { MessageString(Chat::Skills, FISHING_SUCCESS); } else { MessageString(Chat::Skills, FISHING_SUCCESS_FISH_NAME, food_item->Name); } - EQEmu::ItemInstance* inst = database.CreateItem(food_item, 1); + EQ::ItemInstance* inst = database.CreateItem(food_item, 1); if (inst != nullptr) { if (CheckLoreConflict(inst->GetItem())) { @@ -332,16 +332,16 @@ void Client::GoFish() else { PushItemOnCursor(*inst); - SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketLimbo); + SendItemPacket(EQ::invslot::slotCursor, inst, ItemPacketLimbo); if (RuleB(TaskSystem, EnableTaskSystem)) UpdateTasksForItem(ActivityFish, food_id); safe_delete(inst); - inst = m_inv.GetItem(EQEmu::invslot::slotCursor); + inst = m_inv.GetItem(EQ::invslot::slotCursor); } if (inst) { - std::vector args; + std::vector args; args.push_back(inst); parse->EventPlayer(EVENT_FISH_SUCCESS, this, "", inst->GetID(), &args); } @@ -368,26 +368,26 @@ void Client::GoFish() //chance to break fishing pole... //this is potentially exploitable in that they can fish //and then swap out items in primary slot... too lazy to fix right now - const EQEmu::ItemInstance* Pole = m_inv[EQEmu::invslot::slotPrimary]; + const EQ::ItemInstance* Pole = m_inv[EQ::invslot::slotPrimary]; if (Pole) { - const EQEmu::ItemData* fishing_item = Pole->GetItem(); + const EQ::ItemData* fishing_item = Pole->GetItem(); if (fishing_item && fishing_item->SubType == 0 && zone->random.Int(0, 49) == 1) { MessageString(Chat::Skills, FISHING_POLE_BROKE); //Your fishing pole broke! - DeleteItemInInventory(EQEmu::invslot::slotPrimary, 0, true); + DeleteItemInInventory(EQ::invslot::slotPrimary, 0, true); } } - if (CheckIncreaseSkill(EQEmu::skills::SkillFishing, nullptr, 5)) + if (CheckIncreaseSkill(EQ::skills::SkillFishing, nullptr, 5)) { - if (title_manager.IsNewTradeSkillTitleAvailable(EQEmu::skills::SkillFishing, GetRawSkill(EQEmu::skills::SkillFishing))) + if (title_manager.IsNewTradeSkillTitleAvailable(EQ::skills::SkillFishing, GetRawSkill(EQ::skills::SkillFishing))) NotifyNewTitlesAvailable(); } } void Client::ForageItem(bool guarantee) { - int skill_level = GetSkill(EQEmu::skills::SkillForage); + int skill_level = GetSkill(EQ::skills::SkillForage); //be wary of the string ids in switch below when changing this. uint32 common_food_ids[MAX_COMMON_FOOD_IDS] = { @@ -417,7 +417,7 @@ void Client::ForageItem(bool guarantee) { foragedfood = common_food_ids[index]; } - const EQEmu::ItemData* food_item = database.GetItem(foragedfood); + const EQ::ItemData* food_item = database.GetItem(foragedfood); if(!food_item) { LogError("nullptr returned from database.GetItem in ClientForageItem"); @@ -428,10 +428,10 @@ void Client::ForageItem(bool guarantee) { stringid = FORAGE_GRUBS; else switch(food_item->ItemType) { - case EQEmu::item::ItemTypeFood: + case EQ::item::ItemTypeFood: stringid = FORAGE_FOOD; break; - case EQEmu::item::ItemTypeDrink: + case EQ::item::ItemTypeDrink: if(strstr(food_item->Name, "ater")) stringid = FORAGE_WATER; else @@ -442,7 +442,7 @@ void Client::ForageItem(bool guarantee) { } MessageString(Chat::Skills, stringid); - EQEmu::ItemInstance* inst = database.CreateItem(food_item, 1); + EQ::ItemInstance* inst = database.CreateItem(food_item, 1); if(inst != nullptr) { // check to make sure it isn't a foraged lore item if(CheckLoreConflict(inst->GetItem())) @@ -452,16 +452,16 @@ void Client::ForageItem(bool guarantee) { } else { PushItemOnCursor(*inst); - SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketLimbo); + SendItemPacket(EQ::invslot::slotCursor, inst, ItemPacketLimbo); if(RuleB(TaskSystem, EnableTaskSystem)) UpdateTasksForItem(ActivityForage, foragedfood); safe_delete(inst); - inst = m_inv.GetItem(EQEmu::invslot::slotCursor); + inst = m_inv.GetItem(EQ::invslot::slotCursor); } if(inst) { - std::vector args; + std::vector args; args.push_back(inst); parse->EventPlayer(EVENT_FORAGE_SUCCESS, this, "", inst->GetID(), &args); } @@ -478,7 +478,7 @@ void Client::ForageItem(bool guarantee) { parse->EventPlayer(EVENT_FORAGE_FAILURE, this, "", 0); } - CheckIncreaseSkill(EQEmu::skills::SkillForage, nullptr, 5); + CheckIncreaseSkill(EQ::skills::SkillForage, nullptr, 5); } diff --git a/zone/groups.cpp b/zone/groups.cpp index e29deca43..5734d4672 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -407,7 +407,7 @@ void Group::SendHPManaEndPacketsTo(Mob *member) safe_delete_array(hpapp.pBuffer); hpapp.size = 0; - if (member->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (member->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoD) { outapp.SetOpcode(OP_MobManaUpdate); MobManaUpdate_Struct *mana_update = (MobManaUpdate_Struct *)outapp.pBuffer; @@ -438,7 +438,7 @@ void Group::SendHPPacketsFrom(Mob *member) for(i = 0; i < MAX_GROUP_MEMBERS; i++) { if(members[i] && members[i] != member && members[i]->IsClient()) { members[i]->CastToClient()->QueuePacket(&hp_app); - if (members[i]->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (members[i]->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoD) { outapp.SetOpcode(OP_MobManaUpdate); MobManaUpdate_Struct *mana_update = (MobManaUpdate_Struct *)outapp.pBuffer; mana_update->spawn_id = member->GetID(); @@ -463,7 +463,7 @@ void Group::SendManaPacketFrom(Mob *member) uint32 i; for (i = 0; i < MAX_GROUP_MEMBERS; i++) { if (members[i] && members[i] != member && members[i]->IsClient()) { - if (members[i]->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (members[i]->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoD) { outapp.SetOpcode(OP_MobManaUpdate); MobManaUpdate_Struct *mana_update = (MobManaUpdate_Struct *)outapp.pBuffer; mana_update->spawn_id = member->GetID(); @@ -484,7 +484,7 @@ void Group::SendEndurancePacketFrom(Mob* member) uint32 i; for (i = 0; i < MAX_GROUP_MEMBERS; i++) { if (members[i] && members[i] != member && members[i]->IsClient()) { - if (members[i]->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (members[i]->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoD) { MobEnduranceUpdate_Struct *endurance_update = (MobEnduranceUpdate_Struct *)outapp.pBuffer; endurance_update->spawn_id = member->GetID(); endurance_update->endurance = member->GetEndurancePercent(); @@ -621,7 +621,7 @@ bool Group::DelMemberOOZ(const char *Name) { if(GroupCount() < 3) { UnDelegateMarkNPC(NPCMarkerName.c_str()); - if (GetLeader() && GetLeader()->IsClient() && GetLeader()->CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::SoD) { + if (GetLeader() && GetLeader()->IsClient() && GetLeader()->CastToClient()->ClientVersion() < EQ::versions::ClientVersion::SoD) { UnDelegateMainAssist(MainAssistName.c_str()); } ClearAllNPCMarks(); @@ -786,7 +786,7 @@ bool Group::DelMember(Mob* oldmember, bool ignoresender) if(GroupCount() < 3) { UnDelegateMarkNPC(NPCMarkerName.c_str()); - if (GetLeader() && GetLeader()->IsClient() && GetLeader()->CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::SoD) { + if (GetLeader() && GetLeader()->IsClient() && GetLeader()->CastToClient()->ClientVersion() < EQ::versions::ClientVersion::SoD) { UnDelegateMainAssist(MainAssistName.c_str()); } ClearAllNPCMarks(); @@ -1682,7 +1682,7 @@ void Group::NotifyMainTank(Client *c, uint8 toggle) if(!MainTankName.size()) return; - if (c->ClientVersion() < EQEmu::versions::ClientVersion::SoD) + if (c->ClientVersion() < EQ::versions::ClientVersion::SoD) { if(toggle) c->Message(Chat::White, "%s is now Main Tank.", MainTankName.c_str()); @@ -1722,7 +1722,7 @@ void Group::NotifyMainAssist(Client *c, uint8 toggle) if(!MainAssistName.size()) return; - if (c->ClientVersion() < EQEmu::versions::ClientVersion::SoD) + if (c->ClientVersion() < EQ::versions::ClientVersion::SoD) { auto outapp = new EQApplicationPacket(OP_DelegateAbility, sizeof(DelegateAbility_Struct)); @@ -1777,7 +1777,7 @@ void Group::NotifyPuller(Client *c, uint8 toggle) if(!PullerName.size()) return; - if (c->ClientVersion() < EQEmu::versions::ClientVersion::SoD) + if (c->ClientVersion() < EQ::versions::ClientVersion::SoD) { if(toggle) c->Message(Chat::White, "%s is now Puller.", PullerName.c_str()); @@ -2343,7 +2343,7 @@ void Group::ChangeLeader(Mob* newleader) for (uint32 i = 0; i < MAX_GROUP_MEMBERS; i++) { if (members[i] && members[i]->IsClient()) { - if (members[i]->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) + if (members[i]->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoD) members[i]->CastToClient()->SendGroupLeaderChangePacket(newleader->GetName()); members[i]->CastToClient()->QueuePacket(outapp); diff --git a/zone/guild.cpp b/zone/guild.cpp index 166e6edfb..c4fada2b0 100644 --- a/zone/guild.cpp +++ b/zone/guild.cpp @@ -63,7 +63,7 @@ void Client::SendGuildMOTD(bool GetGuildMOTDReply) { void Client::SendGuildURL() { - if (ClientVersion() < EQEmu::versions::ClientVersion::SoF) + if (ClientVersion() < EQ::versions::ClientVersion::SoF) return; if(IsInAGuild()) @@ -85,7 +85,7 @@ void Client::SendGuildURL() void Client::SendGuildChannel() { - if (ClientVersion() < EQEmu::versions::ClientVersion::SoF) + if (ClientVersion() < EQ::versions::ClientVersion::SoF) return; if(IsInAGuild()) @@ -108,7 +108,7 @@ void Client::SendGuildChannel() void Client::SendGuildRanks() { - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) return; int permissions = 30 + 1; //Static number of permissions in all EQ clients as of May 2014 @@ -152,7 +152,7 @@ void Client::SendGuildSpawnAppearance() { uint8 rank = guild_mgr.GetDisplayedRank(GuildID(), GuildRank(), CharacterID()); LogGuilds("Sending spawn appearance for guild [{}] at rank [{}]", GuildID(), rank); SendAppearancePacket(AT_GuildID, GuildID()); - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { switch (rank) { case 0: { rank = 5; break; } // GUILD_MEMBER 0 @@ -253,7 +253,7 @@ void Client::RefreshGuildInfo() if((guild_id != OldGuildID) && GuildBanks) { // Unsure about this for RoF+ ... But they don't have that action anymore so fuck it - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) ClearGuildBank(); if(guild_id != GUILD_NONE) diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp index 200f67d90..882740a00 100644 --- a/zone/guild_mgr.cpp +++ b/zone/guild_mgr.cpp @@ -322,7 +322,7 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { else if(c != nullptr && s->guild_id != GUILD_NONE) { //char is in zone, and has changed into a new guild, send MOTD. c->SendGuildMOTD(); - if (c->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (c->ClientVersion() >= EQ::versions::ClientVersion::RoF) { c->SendGuildRanks(); } @@ -690,10 +690,10 @@ void GuildBankManager::SendGuildBank(Client *c) auto &guild_bank = *Iterator; // RoF+ uses a bulk list packet -- This is also how the Action 0 of older clients basically works - if (c->ClientVersionBit() & EQEmu::versions::maskRoFAndLater) { + if (c->ClientVersionBit() & EQ::versions::maskRoFAndLater) { auto outapp = new EQApplicationPacket(OP_GuildBankItemList, sizeof(GuildBankItemListEntry_Struct) * 240); for (int i = 0; i < GUILD_BANK_DEPOSIT_AREA_SIZE; ++i) { - const EQEmu::ItemData *Item = database.GetItem(guild_bank->Items.DepositArea[i].ItemID); + const EQ::ItemData *Item = database.GetItem(guild_bank->Items.DepositArea[i].ItemID); if (Item) { outapp->WriteUInt8(1); outapp->WriteUInt32(guild_bank->Items.DepositArea[i].Permissions); @@ -717,7 +717,7 @@ void GuildBankManager::SendGuildBank(Client *c) outapp->SetWritePosition(outapp->GetWritePosition() + 20); // newer clients have 40 deposit slots, keep them 0 for now for (int i = 0; i < GUILD_BANK_MAIN_AREA_SIZE; ++i) { - const EQEmu::ItemData *Item = database.GetItem(guild_bank->Items.MainArea[i].ItemID); + const EQ::ItemData *Item = database.GetItem(guild_bank->Items.MainArea[i].ItemID); if (Item) { outapp->WriteUInt8(1); outapp->WriteUInt32(guild_bank->Items.MainArea[i].Permissions); @@ -748,7 +748,7 @@ void GuildBankManager::SendGuildBank(Client *c) { if(guild_bank->Items.DepositArea[i].ItemID > 0) { - const EQEmu::ItemData *Item = database.GetItem(guild_bank->Items.DepositArea[i].ItemID); + const EQ::ItemData *Item = database.GetItem(guild_bank->Items.DepositArea[i].ItemID); if(!Item) continue; @@ -784,7 +784,7 @@ void GuildBankManager::SendGuildBank(Client *c) { if(guild_bank->Items.MainArea[i].ItemID > 0) { - const EQEmu::ItemData *Item = database.GetItem(guild_bank->Items.MainArea[i].ItemID); + const EQ::ItemData *Item = database.GetItem(guild_bank->Items.MainArea[i].ItemID); if(!Item) continue; @@ -915,7 +915,7 @@ bool GuildBankManager::AddItem(uint32 GuildID, uint8 Area, uint32 ItemID, int32 return false; } - const EQEmu::ItemData *Item = database.GetItem(ItemID); + const EQ::ItemData *Item = database.GetItem(ItemID); GuildBankItemUpdate_Struct gbius; @@ -981,7 +981,7 @@ int GuildBankManager::Promote(uint32 guildID, int slotID) (*iter)->Items.DepositArea[slotID].ItemID = 0; - const EQEmu::ItemData *Item = database.GetItem((*iter)->Items.MainArea[mainSlot].ItemID); + const EQ::ItemData *Item = database.GetItem((*iter)->Items.MainArea[mainSlot].ItemID); GuildBankItemUpdate_Struct gbius; @@ -1037,7 +1037,7 @@ void GuildBankManager::SetPermissions(uint32 guildID, uint16 slotID, uint32 perm else (*iter)->Items.MainArea[slotID].WhoFor[0] = '\0'; - const EQEmu::ItemData *Item = database.GetItem((*iter)->Items.MainArea[slotID].ItemID); + const EQ::ItemData *Item = database.GetItem((*iter)->Items.MainArea[slotID].ItemID); GuildBankItemUpdate_Struct gbius; @@ -1061,7 +1061,7 @@ void GuildBankManager::SetPermissions(uint32 guildID, uint16 slotID, uint32 perm entity_list.QueueClientsGuildBankItemUpdate(&gbius, guildID); } -EQEmu::ItemInstance* GuildBankManager::GetItem(uint32 GuildID, uint16 Area, uint16 SlotID, uint32 Quantity) +EQ::ItemInstance* GuildBankManager::GetItem(uint32 GuildID, uint16 Area, uint16 SlotID, uint32 Quantity) { auto Iterator = GetGuildBank(GuildID); @@ -1070,7 +1070,7 @@ EQEmu::ItemInstance* GuildBankManager::GetItem(uint32 GuildID, uint16 Area, uint GuildBankItem* BankArea = nullptr; - EQEmu::ItemInstance* inst = nullptr; + EQ::ItemInstance* inst = nullptr; if(Area == GuildBankDepositArea) { @@ -1168,7 +1168,7 @@ bool GuildBankManager::DeleteItem(uint32 guildID, uint16 area, uint16 slotID, ui bool deleted = true; - const EQEmu::ItemData *Item = database.GetItem(BankArea[slotID].ItemID); + const EQ::ItemData *Item = database.GetItem(BankArea[slotID].ItemID); if(!Item->Stackable || (quantity >= BankArea[slotID].Quantity)) { std::string query = StringFormat("DELETE FROM `guild_bank` WHERE `guildid` = %i " @@ -1229,7 +1229,7 @@ bool GuildBankManager::MergeStacks(uint32 GuildID, uint16 SlotID) if(BankArea[SlotID].ItemID == 0) return false; - const EQEmu::ItemData *Item = database.GetItem(BankArea[SlotID].ItemID); + const EQ::ItemData *Item = database.GetItem(BankArea[SlotID].ItemID); if(!Item->Stackable) return false; @@ -1327,7 +1327,7 @@ bool GuildBankManager::SplitStack(uint32 GuildID, uint16 SlotID, uint32 Quantity if(BankArea[SlotID].Quantity <= Quantity || Quantity == 0) return false; - const EQEmu::ItemData *Item = database.GetItem(BankArea[SlotID].ItemID); + const EQ::ItemData *Item = database.GetItem(BankArea[SlotID].ItemID); if(!Item->Stackable) return false; diff --git a/zone/guild_mgr.h b/zone/guild_mgr.h index abd11fd9f..60f9ba98f 100644 --- a/zone/guild_mgr.h +++ b/zone/guild_mgr.h @@ -117,7 +117,7 @@ public: bool AddItem(uint32 GuildID, uint8 Area, uint32 ItemID, int32 QtyOrCharges, const char *Donator, uint8 Permissions, const char *WhoFor); int Promote(uint32 GuildID, int SlotID); void SetPermissions(uint32 GuildID, uint16 SlotID, uint32 Permissions, const char *MemberName); - EQEmu::ItemInstance* GetItem(uint32 GuildID, uint16 Area, uint16 SlotID, uint32 Quantity); + EQ::ItemInstance* GetItem(uint32 GuildID, uint16 Area, uint16 SlotID, uint32 Quantity); bool DeleteItem(uint32 GuildID, uint16 Area, uint16 SlotID, uint32 Quantity); bool HasItem(uint32 GuildID, uint32 ItemID); bool IsAreaFull(uint32 GuildID, uint16 Area); diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp index 6b26cba8a..725918762 100644 --- a/zone/hate_list.cpp +++ b/zone/hate_list.cpp @@ -297,7 +297,7 @@ int HateList::GetHateRatio(Mob *top, Mob *other) if (!top_entry || top_entry->stored_hate_amount < 1) return 999; // shouldn't happen if you call it right :P - return EQEmu::Clamp(static_cast((other_entry->stored_hate_amount * 100) / top_entry->stored_hate_amount), 1, 999); + return EQ::Clamp(static_cast((other_entry->stored_hate_amount * 100) / top_entry->stored_hate_amount), 1, 999); } // skip is used to ignore a certain mob on the list diff --git a/zone/inventory.cpp b/zone/inventory.cpp index f9438b32c..993cdac8a 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -31,11 +31,11 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { if (itemnum == 0) return 0; uint32 x = 0; - EQEmu::ItemInstance *cur = nullptr; + EQ::ItemInstance *cur = nullptr; int i; if(where_to_check & invWhereWorn) { - for (i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; i++) { + for (i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; i++) { if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { cur = m_inv.GetItem(i); if(cur && cur->GetItem()->Stackable) { @@ -50,18 +50,18 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { } if(where_to_check & invWhereCursor) { - if (GetItemIDAt(EQEmu::invslot::slotCursor) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(EQEmu::invslot::slotCursor) != INVALID_ID)) { - cur = m_inv.GetItem(EQEmu::invslot::slotCursor); + if (GetItemIDAt(EQ::invslot::slotCursor) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(EQ::invslot::slotCursor) != INVALID_ID)) { + cur = m_inv.GetItem(EQ::invslot::slotCursor); if(cur && cur->GetItem()->Stackable) { x += cur->GetCharges(); } else { x++; } - DeleteItemInInventory(EQEmu::invslot::slotCursor, 0, true); + DeleteItemInInventory(EQ::invslot::slotCursor, 0, true); } - for (i = EQEmu::invbag::CURSOR_BAG_BEGIN; i <= EQEmu::invbag::CURSOR_BAG_END; i++) { + for (i = EQ::invbag::CURSOR_BAG_BEGIN; i <= EQ::invbag::CURSOR_BAG_END; i++) { if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { cur = m_inv.GetItem(i); if(cur && cur->GetItem()->Stackable) { @@ -76,7 +76,7 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { } if(where_to_check & invWherePersonal) { - for (i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::GENERAL_END; i++) { + for (i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::GENERAL_END; i++) { if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { cur = m_inv.GetItem(i); if(cur && cur->GetItem()->Stackable) { @@ -89,7 +89,7 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { } } - for (i = EQEmu::invbag::GENERAL_BAGS_BEGIN; i <= EQEmu::invbag::GENERAL_BAGS_END; i++) { + for (i = EQ::invbag::GENERAL_BAGS_BEGIN; i <= EQ::invbag::GENERAL_BAGS_END; i++) { if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { cur = m_inv.GetItem(i); if(cur && cur->GetItem()->Stackable) { @@ -98,13 +98,13 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { x++; } - DeleteItemInInventory(i, 0, ((((uint64)1 << (EQEmu::invslot::GENERAL_BEGIN + ((i - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT))) & GetInv().GetLookup()->PossessionsBitmask) != 0)); + DeleteItemInInventory(i, 0, ((((uint64)1 << (EQ::invslot::GENERAL_BEGIN + ((i - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT))) & GetInv().GetLookup()->PossessionsBitmask) != 0)); } } } if(where_to_check & invWhereBank) { - for (i = EQEmu::invslot::BANK_BEGIN; i <= EQEmu::invslot::BANK_END; i++) { + for (i = EQ::invslot::BANK_BEGIN; i <= EQ::invslot::BANK_END; i++) { if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { cur = m_inv.GetItem(i); if(cur && cur->GetItem()->Stackable) { @@ -113,11 +113,11 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { x++; } - DeleteItemInInventory(i, 0, ((i - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank)); + DeleteItemInInventory(i, 0, ((i - EQ::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank)); } } - for (i = EQEmu::invbag::BANK_BAGS_BEGIN; i <= EQEmu::invbag::BANK_BAGS_END; i++) { + for (i = EQ::invbag::BANK_BAGS_BEGIN; i <= EQ::invbag::BANK_BAGS_END; i++) { if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { cur = m_inv.GetItem(i); if(cur && cur->GetItem()->Stackable) { @@ -126,13 +126,13 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { x++; } - DeleteItemInInventory(i, 0, (((i - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT) >= GetInv().GetLookup()->InventoryTypeSize.Bank)); + DeleteItemInInventory(i, 0, (((i - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT) >= GetInv().GetLookup()->InventoryTypeSize.Bank)); } } } if(where_to_check & invWhereSharedBank) { - for (i = EQEmu::invslot::SHARED_BANK_BEGIN; i <= EQEmu::invslot::SHARED_BANK_END; i++) { + for (i = EQ::invslot::SHARED_BANK_BEGIN; i <= EQ::invslot::SHARED_BANK_END; i++) { if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { cur = m_inv.GetItem(i); if(cur && cur->GetItem()->Stackable) { @@ -145,7 +145,7 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { } } - for (i = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN; i <= EQEmu::invbag::SHARED_BANK_BAGS_END; i++) { + for (i = EQ::invbag::SHARED_BANK_BAGS_BEGIN; i <= EQ::invbag::SHARED_BANK_BAGS_END; i++) { if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { cur = m_inv.GetItem(i); if(cur && cur->GetItem()->Stackable) { @@ -163,7 +163,7 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { } -bool Client::CheckLoreConflict(const EQEmu::ItemData* item) +bool Client::CheckLoreConflict(const EQ::ItemData* item) { if (!item) { return false; } if (!item->LoreFlag) { return false; } @@ -181,7 +181,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, // TODO: update calling methods and script apis to handle a failure return - const EQEmu::ItemData* item = database.GetItem(item_id); + const EQ::ItemData* item = database.GetItem(item_id); // make sure the item exists if(item == nullptr) { @@ -222,7 +222,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, } */ - uint32 augments[EQEmu::invaug::SOCKET_COUNT] = { aug1, aug2, aug3, aug4, aug5, aug6 }; + uint32 augments[EQ::invaug::SOCKET_COUNT] = { aug1, aug2, aug3, aug4, aug5, aug6 }; uint32 classes = item->Classes; uint32 races = item->Races; @@ -232,8 +232,8 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, bool enforcerestr = RuleB(Inventory, EnforceAugmentRestriction); bool enforceusable = RuleB(Inventory, EnforceAugmentUsability); - for (int iter = EQEmu::invaug::SOCKET_BEGIN; iter <= EQEmu::invaug::SOCKET_END; ++iter) { - const EQEmu::ItemData* augtest = database.GetItem(augments[iter]); + for (int iter = EQ::invaug::SOCKET_BEGIN; iter <= EQ::invaug::SOCKET_END; ++iter) { + const EQ::ItemData* augtest = database.GetItem(augments[iter]); if(augtest == nullptr) { if(augments[iter]) { @@ -276,7 +276,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, // check for augment type allowance if(enforcewear) { - if ((item->AugSlotType[iter] == EQEmu::item::AugTypeNone) || !(((uint32)1 << (item->AugSlotType[iter] - 1)) & augtest->AugType)) { + if ((item->AugSlotType[iter] == EQ::item::AugTypeNone) || !(((uint32)1 << (item->AugSlotType[iter] - 1)) & augtest->AugType)) { Message(Chat::Red, "Augment %u (Aug%i) is not acceptable wear on Item %u.", augments[iter], iter + 1, item->ID); LogInventory("Player [{}] on account [{}] attempted to augment an item with an unacceptable augment type (Aug[{}]).\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n", GetName(), account_name, (iter + 1), item->ID, aug1, aug2, aug3, aug4, aug5, aug6); @@ -299,153 +299,153 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, uint8 it = item->ItemType; switch(augtest->AugRestrict) { - case EQEmu::item::AugRestrictionAny: + case EQ::item::AugRestrictionAny: break; - case EQEmu::item::AugRestrictionArmor: + case EQ::item::AugRestrictionArmor: switch(it) { - case EQEmu::item::ItemTypeArmor: + case EQ::item::ItemTypeArmor: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestrictionWeapons: + case EQ::item::AugRestrictionWeapons: switch(it) { - case EQEmu::item::ItemType1HSlash: - case EQEmu::item::ItemType1HBlunt: - case EQEmu::item::ItemType1HPiercing: - case EQEmu::item::ItemTypeMartial: - case EQEmu::item::ItemType2HSlash: - case EQEmu::item::ItemType2HBlunt: - case EQEmu::item::ItemType2HPiercing: - case EQEmu::item::ItemTypeBow: + case EQ::item::ItemType1HSlash: + case EQ::item::ItemType1HBlunt: + case EQ::item::ItemType1HPiercing: + case EQ::item::ItemTypeMartial: + case EQ::item::ItemType2HSlash: + case EQ::item::ItemType2HBlunt: + case EQ::item::ItemType2HPiercing: + case EQ::item::ItemTypeBow: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestriction1HWeapons: + case EQ::item::AugRestriction1HWeapons: switch(it) { - case EQEmu::item::ItemType1HSlash: - case EQEmu::item::ItemType1HBlunt: - case EQEmu::item::ItemType1HPiercing: - case EQEmu::item::ItemTypeMartial: + case EQ::item::ItemType1HSlash: + case EQ::item::ItemType1HBlunt: + case EQ::item::ItemType1HPiercing: + case EQ::item::ItemTypeMartial: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestriction2HWeapons: + case EQ::item::AugRestriction2HWeapons: switch(it) { - case EQEmu::item::ItemType2HSlash: - case EQEmu::item::ItemType2HBlunt: - case EQEmu::item::ItemType2HPiercing: - case EQEmu::item::ItemTypeBow: + case EQ::item::ItemType2HSlash: + case EQ::item::ItemType2HBlunt: + case EQ::item::ItemType2HPiercing: + case EQ::item::ItemTypeBow: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestriction1HSlash: + case EQ::item::AugRestriction1HSlash: switch(it) { - case EQEmu::item::ItemType1HSlash: + case EQ::item::ItemType1HSlash: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestriction1HBlunt: + case EQ::item::AugRestriction1HBlunt: switch(it) { - case EQEmu::item::ItemType1HBlunt: + case EQ::item::ItemType1HBlunt: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestrictionPiercing: + case EQ::item::AugRestrictionPiercing: switch(it) { - case EQEmu::item::ItemType1HPiercing: + case EQ::item::ItemType1HPiercing: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestrictionHandToHand: + case EQ::item::AugRestrictionHandToHand: switch(it) { - case EQEmu::item::ItemTypeMartial: + case EQ::item::ItemTypeMartial: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestriction2HSlash: + case EQ::item::AugRestriction2HSlash: switch(it) { - case EQEmu::item::ItemType2HSlash: + case EQ::item::ItemType2HSlash: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestriction2HBlunt: + case EQ::item::AugRestriction2HBlunt: switch(it) { - case EQEmu::item::ItemType2HBlunt: + case EQ::item::ItemType2HBlunt: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestriction2HPierce: + case EQ::item::AugRestriction2HPierce: switch(it) { - case EQEmu::item::ItemType2HPiercing: + case EQ::item::ItemType2HPiercing: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestrictionBows: + case EQ::item::AugRestrictionBows: switch(it) { - case EQEmu::item::ItemTypeBow: + case EQ::item::ItemTypeBow: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestrictionShields: + case EQ::item::AugRestrictionShields: switch(it) { - case EQEmu::item::ItemTypeShield: + case EQ::item::ItemTypeShield: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestriction1HSlash1HBluntOrHandToHand: + case EQ::item::AugRestriction1HSlash1HBluntOrHandToHand: switch(it) { - case EQEmu::item::ItemType1HSlash: - case EQEmu::item::ItemType1HBlunt: - case EQEmu::item::ItemTypeMartial: + case EQ::item::ItemType1HSlash: + case EQ::item::ItemType1HBlunt: + case EQ::item::ItemTypeMartial: break; default: restrictfail = true; break; } break; - case EQEmu::item::AugRestriction1HBluntOrHandToHand: + case EQ::item::AugRestriction1HBluntOrHandToHand: switch(it) { - case EQEmu::item::ItemType1HBlunt: - case EQEmu::item::ItemTypeMartial: + case EQ::item::ItemType1HBlunt: + case EQ::item::ItemTypeMartial: break; default: restrictfail = true; @@ -453,9 +453,9 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, } break; // These 3 are in-work - case EQEmu::item::AugRestrictionUnknown1: - case EQEmu::item::AugRestrictionUnknown2: - case EQEmu::item::AugRestrictionUnknown3: + case EQ::item::AugRestrictionUnknown1: + case EQ::item::AugRestrictionUnknown2: + case EQ::item::AugRestrictionUnknown3: default: restrictfail = true; break; @@ -514,7 +514,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, // in any other situation just use charges as passed - EQEmu::ItemInstance* inst = database.CreateItem(item, charges); + EQ::ItemInstance* inst = database.CreateItem(item, charges); if(inst == nullptr) { Message(Chat::Red, "An unknown server error has occurred and your item was not created."); @@ -526,7 +526,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, } // add any validated augments - for (int iter = EQEmu::invaug::SOCKET_BEGIN; iter <= EQEmu::invaug::SOCKET_END; ++iter) { + for (int iter = EQ::invaug::SOCKET_BEGIN; iter <= EQ::invaug::SOCKET_END; ++iter) { if(augments[iter]) inst->PutAugment(&database, iter, augments[iter]); } @@ -540,7 +540,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, inst->SetOrnamentHeroModel(ornament_hero_model); // check to see if item is usable in requested slot - if (enforceusable && (to_slot >= EQEmu::invslot::EQUIPMENT_BEGIN && to_slot <= EQEmu::invslot::EQUIPMENT_END)) { + if (enforceusable && (to_slot >= EQ::invslot::EQUIPMENT_BEGIN && to_slot <= EQ::invslot::EQUIPMENT_END)) { uint32 slottest = to_slot; if(!(slots & ((uint32)1 << slottest))) { @@ -548,14 +548,14 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, LogInventory("Player [{}] on account [{}] attempted to equip an item unusable in slot [{}] - moved to cursor.\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n", GetName(), account_name, to_slot, item->ID, aug1, aug2, aug3, aug4, aug5, aug6); - to_slot = EQEmu::invslot::slotCursor; + to_slot = EQ::invslot::slotCursor; } } // put item into inventory - if (to_slot == EQEmu::invslot::slotCursor) { + if (to_slot == EQ::invslot::slotCursor) { PushItemOnCursor(*inst); - SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketLimbo); + SendItemPacket(EQ::invslot::slotCursor, inst, ItemPacketLimbo); } else { PutItemInInventory(to_slot, *inst, true); @@ -569,7 +569,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, DiscoverItem(item_id); /* // Augments should have been discovered prior to being placed on an item. - for (int iter = AUG_BEGIN; iter < EQEmu::constants::ITEM_COMMON_SIZE; ++iter) { + for (int iter = AUG_BEGIN; iter < EQ::constants::ITEM_COMMON_SIZE; ++iter) { if(augments[iter] && !IsDiscovered(augments[iter])) DiscoverItem(augments[iter]); } @@ -617,7 +617,7 @@ void Client::DropItem(int16 slot_id, bool recurse) } // Take control of item in client inventory - EQEmu::ItemInstance *inst = m_inv.PopItem(slot_id); + EQ::ItemInstance *inst = m_inv.PopItem(slot_id); if(inst) { if (LogSys.log_settings[Logs::Inventory].is_category_enabled) { LogInventory("DropItem() Processing - full item parse:"); @@ -657,7 +657,7 @@ void Client::DropItem(int16 slot_id, bool recurse) } // Save client inventory change to database - if (slot_id == EQEmu::invslot::slotCursor) { + if (slot_id == EQ::invslot::slotCursor) { SendCursorBuffer(); auto s = m_inv.cursor_cbegin(), e = m_inv.cursor_cend(); database.SaveCursor(CharacterID(), s, e); @@ -679,7 +679,7 @@ void Client::DropItem(int16 slot_id, bool recurse) safe_delete(inst); } -void Client::DropItemQS(EQEmu::ItemInstance* inst, bool pickup) { +void Client::DropItemQS(EQ::ItemInstance* inst, bool pickup) { if (RuleB(QueryServ, PlayerDropItems)) { QSPlayerDropItem_Struct qs_audit; std::list event_details; @@ -704,8 +704,8 @@ void Client::DropItemQS(EQEmu::ItemInstance* inst, bool pickup) { event_details.push_back(detail); if (inst->IsClassBag()) { - for (uint8 sub_slot = EQEmu::invbag::SLOT_BEGIN; (sub_slot <= EQEmu::invbag::SLOT_END); ++sub_slot) { // this is to catch ALL items - const EQEmu::ItemInstance* bag_inst = inst->GetItem(sub_slot); + for (uint8 sub_slot = EQ::invbag::SLOT_BEGIN; (sub_slot <= EQ::invbag::SLOT_END); ++sub_slot) { // this is to catch ALL items + const EQ::ItemInstance* bag_inst = inst->GetItem(sub_slot); if (bag_inst) { detail = new QSDropItems_Struct; detail->item_id = bag_inst->GetID(); @@ -748,7 +748,7 @@ void Client::DropItemQS(EQEmu::ItemInstance* inst, bool pickup) { } // Drop inst -void Client::DropInst(const EQEmu::ItemInstance* inst) +void Client::DropInst(const EQ::ItemInstance* inst) { if (!inst) { // Item doesn't exist in inventory! @@ -771,26 +771,26 @@ void Client::DropInst(const EQEmu::ItemInstance* inst) // Returns a slot's item ID (returns INVALID_ID if not found) int32 Client::GetItemIDAt(int16 slot_id) { - if (slot_id <= EQEmu::invslot::POSSESSIONS_END && slot_id >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) { if ((((uint64)1 << slot_id) & GetInv().GetLookup()->PossessionsBitmask) == 0) return INVALID_ID; } - else if (slot_id <= EQEmu::invbag::GENERAL_BAGS_END && slot_id >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((slot_id - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); + else if (slot_id <= EQ::invbag::GENERAL_BAGS_END && slot_id >= EQ::invbag::GENERAL_BAGS_BEGIN) { + auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((slot_id - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); if ((((uint64)1 << temp_slot) & GetInv().GetLookup()->PossessionsBitmask) == 0) return INVALID_ID; } - else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) + else if (slot_id <= EQ::invslot::BANK_END && slot_id >= EQ::invslot::BANK_BEGIN) { + if ((slot_id - EQ::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) return INVALID_ID; } - else if (slot_id <= EQEmu::invbag::BANK_BAGS_END && slot_id >= EQEmu::invbag::BANK_BAGS_BEGIN) { - auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; + else if (slot_id <= EQ::invbag::BANK_BAGS_END && slot_id >= EQ::invbag::BANK_BAGS_BEGIN) { + auto temp_slot = (slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT; if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize.Bank) return INVALID_ID; } - const EQEmu::ItemInstance* inst = m_inv[slot_id]; + const EQ::ItemInstance* inst = m_inv[slot_id]; if (inst) return inst->GetItem()->ID; @@ -801,26 +801,26 @@ int32 Client::GetItemIDAt(int16 slot_id) { // Returns an augment's ID that's in an item (returns INVALID_ID if not found) // Pass in the slot ID of the item and which augslot you want to check (0-5) int32 Client::GetAugmentIDAt(int16 slot_id, uint8 augslot) { - if (slot_id <= EQEmu::invslot::POSSESSIONS_END && slot_id >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) { if ((((uint64)1 << slot_id) & GetInv().GetLookup()->PossessionsBitmask) == 0) return INVALID_ID; } - else if (slot_id <= EQEmu::invbag::GENERAL_BAGS_END && slot_id >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((slot_id - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); + else if (slot_id <= EQ::invbag::GENERAL_BAGS_END && slot_id >= EQ::invbag::GENERAL_BAGS_BEGIN) { + auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((slot_id - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); if ((((uint64)1 << temp_slot) & GetInv().GetLookup()->PossessionsBitmask) == 0) return INVALID_ID; } - else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) + else if (slot_id <= EQ::invslot::BANK_END && slot_id >= EQ::invslot::BANK_BEGIN) { + if ((slot_id - EQ::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) return INVALID_ID; } - else if (slot_id <= EQEmu::invbag::BANK_BAGS_END && slot_id >= EQEmu::invbag::BANK_BAGS_BEGIN) { - auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; + else if (slot_id <= EQ::invbag::BANK_BAGS_END && slot_id >= EQ::invbag::BANK_BAGS_BEGIN) { + auto temp_slot = (slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT; if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize.Bank) return INVALID_ID; } - const EQEmu::ItemInstance* inst = m_inv[slot_id]; + const EQ::ItemInstance* inst = m_inv[slot_id]; if (inst && inst->GetAugmentItemID(augslot)) { return inst->GetAugmentItemID(augslot); } @@ -834,7 +834,7 @@ void Client::SendCursorBuffer() // Temporary work-around for the RoF+ Client Buffer // Instead of dealing with client moving items in cursor buffer, // we can just send the next item in the cursor buffer to the cursor. - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) { return; } + if (ClientVersion() < EQ::versions::ClientVersion::RoF) { return; } if (GetInv().CursorEmpty()) { return; } auto test_inst = GetInv().GetCursorItem(); @@ -855,11 +855,11 @@ void Client::SendCursorBuffer() GetName(), test_item->Name, test_item->ID); MessageString(Chat::Loot, 290); parse->EventItem(EVENT_DESTROY_ITEM, this, test_inst, nullptr, "", 0); - DeleteItemInInventory(EQEmu::invslot::slotCursor); + DeleteItemInInventory(EQ::invslot::slotCursor); SendCursorBuffer(); } else { - SendItemPacket(EQEmu::invslot::slotCursor, test_inst, ItemPacketLimbo); + SendItemPacket(EQ::invslot::slotCursor, test_inst, ItemPacketLimbo); } } @@ -912,11 +912,11 @@ void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_upd qsaudit->items[parent_offset].aug_5 = m_inv[slot_id]->GetAugmentItemID(5); if (m_inv[slot_id]->IsClassBag()) { - for (uint8 bag_idx = EQEmu::invbag::SLOT_BEGIN; bag_idx < m_inv[slot_id]->GetItem()->BagSlots; bag_idx++) { - EQEmu::ItemInstance* bagitem = m_inv[slot_id]->GetItem(bag_idx); + for (uint8 bag_idx = EQ::invbag::SLOT_BEGIN; bag_idx < m_inv[slot_id]->GetItem()->BagSlots; bag_idx++) { + EQ::ItemInstance* bagitem = m_inv[slot_id]->GetItem(bag_idx); if(bagitem) { - int16 bagslot_id = EQEmu::InventoryProfile::CalcSlotId(slot_id, bag_idx); + int16 bagslot_id = EQ::InventoryProfile::CalcSlotId(slot_id, bag_idx); qsaudit->items[++parent_offset].char_slot = bagslot_id; qsaudit->items[parent_offset].item_id = bagitem->GetID(); @@ -937,8 +937,8 @@ void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_upd bool isDeleted = m_inv.DeleteItem(slot_id, quantity); - const EQEmu::ItemInstance* inst = nullptr; - if (slot_id == EQEmu::invslot::slotCursor) { + const EQ::ItemInstance* inst = nullptr; + if (slot_id == EQ::invslot::slotCursor) { auto s = m_inv.cursor_cbegin(), e = m_inv.cursor_cend(); if(update_db) database.SaveCursor(character_id, s, e); @@ -984,13 +984,13 @@ void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_upd } } -bool Client::PushItemOnCursor(const EQEmu::ItemInstance& inst, bool client_update) +bool Client::PushItemOnCursor(const EQ::ItemInstance& inst, bool client_update) { LogInventory("Putting item [{}] ([{}]) on the cursor", inst.GetItem()->Name, inst.GetItem()->ID); m_inv.PushCursor(inst); if (client_update) { - SendItemPacket(EQEmu::invslot::slotCursor, &inst, ItemPacketLimbo); + SendItemPacket(EQ::invslot::slotCursor, &inst, ItemPacketLimbo); } auto s = m_inv.cursor_cbegin(), e = m_inv.cursor_cend(); @@ -1001,10 +1001,10 @@ bool Client::PushItemOnCursor(const EQEmu::ItemInstance& inst, bool client_updat // Any items already there will be removed from user's inventory // (Also saves changes back to the database: this may be optimized in the future) // client_update: Sends packet to client -bool Client::PutItemInInventory(int16 slot_id, const EQEmu::ItemInstance& inst, bool client_update) { +bool Client::PutItemInInventory(int16 slot_id, const EQ::ItemInstance& inst, bool client_update) { LogInventory("Putting item [{}] ([{}]) into slot [{}]", inst.GetItem()->Name, inst.GetItem()->ID, slot_id); - if (slot_id == EQEmu::invslot::slotCursor) { // don't trust macros before conditional statements... + if (slot_id == EQ::invslot::slotCursor) { // don't trust macros before conditional statements... return PushItemOnCursor(inst, client_update); } else { @@ -1013,11 +1013,11 @@ bool Client::PutItemInInventory(int16 slot_id, const EQEmu::ItemInstance& inst, if (client_update) { - SendItemPacket(slot_id, &inst, ((slot_id == EQEmu::invslot::slotCursor) ? ItemPacketLimbo : ItemPacketTrade)); - //SendWearChange(EQEmu::InventoryProfile::CalcMaterialFromSlot(slot_id)); + SendItemPacket(slot_id, &inst, ((slot_id == EQ::invslot::slotCursor) ? ItemPacketLimbo : ItemPacketTrade)); + //SendWearChange(EQ::InventoryProfile::CalcMaterialFromSlot(slot_id)); } - if (slot_id == EQEmu::invslot::slotCursor) { + if (slot_id == EQ::invslot::slotCursor) { auto s = m_inv.cursor_cbegin(), e = m_inv.cursor_cend(); return database.SaveCursor(this->CharacterID(), s, e); } @@ -1029,13 +1029,13 @@ bool Client::PutItemInInventory(int16 slot_id, const EQEmu::ItemInstance& inst, // a lot of wasted checks and calls coded above... } -void Client::PutLootInInventory(int16 slot_id, const EQEmu::ItemInstance &inst, ServerLootItem_Struct** bag_item_data) +void Client::PutLootInInventory(int16 slot_id, const EQ::ItemInstance &inst, ServerLootItem_Struct** bag_item_data) { LogInventory("Putting loot item [{}] ([{}]) into slot [{}]", inst.GetItem()->Name, inst.GetItem()->ID, slot_id); bool cursor_empty = m_inv.CursorEmpty(); - if (slot_id == EQEmu::invslot::slotCursor) { + if (slot_id == EQ::invslot::slotCursor) { m_inv.PushCursor(inst); auto s = m_inv.cursor_cbegin(), e = m_inv.cursor_cend(); database.SaveCursor(this->CharacterID(), s, e); @@ -1046,9 +1046,9 @@ void Client::PutLootInInventory(int16 slot_id, const EQEmu::ItemInstance &inst, } // Subordinate items in cursor buffer must be sent via ItemPacketSummonItem or we just overwrite the visible cursor and desync the client - if (slot_id == EQEmu::invslot::slotCursor && !cursor_empty) { + if (slot_id == EQ::invslot::slotCursor && !cursor_empty) { // RoF+ currently has a specialized cursor handler - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendItemPacket(slot_id, &inst, ItemPacketLimbo); } else { @@ -1056,11 +1056,11 @@ void Client::PutLootInInventory(int16 slot_id, const EQEmu::ItemInstance &inst, } if (bag_item_data) { - for (int index = EQEmu::invbag::SLOT_BEGIN; index <= EQEmu::invbag::SLOT_END; ++index) { + for (int index = EQ::invbag::SLOT_BEGIN; index <= EQ::invbag::SLOT_END; ++index) { if (bag_item_data[index] == nullptr) continue; - const EQEmu::ItemInstance *bagitem = database.CreateItem( + const EQ::ItemInstance *bagitem = database.CreateItem( bag_item_data[index]->item_id, bag_item_data[index]->charges, bag_item_data[index]->aug_1, @@ -1074,14 +1074,14 @@ void Client::PutLootInInventory(int16 slot_id, const EQEmu::ItemInstance &inst, // Dump bag contents to cursor in the event that owning bag is not the first cursor item // (This assumes that the data passed is correctly associated..no safety checks are implemented) - if (slot_id == EQEmu::invslot::slotCursor && !cursor_empty) { + if (slot_id == EQ::invslot::slotCursor && !cursor_empty) { LogInventory("Putting bag loot item [{}] ([{}]) into slot [{}] (non-empty cursor override)", - inst.GetItem()->Name, inst.GetItem()->ID, EQEmu::invslot::slotCursor); + inst.GetItem()->Name, inst.GetItem()->ID, EQ::invslot::slotCursor); - PutLootInInventory(EQEmu::invslot::slotCursor, *bagitem); + PutLootInInventory(EQ::invslot::slotCursor, *bagitem); } else { - auto bag_slot = EQEmu::InventoryProfile::CalcSlotId(slot_id, index); + auto bag_slot = EQ::InventoryProfile::CalcSlotId(slot_id, index); LogInventory("Putting bag loot item [{}] ([{}]) into slot [{}] (bag slot [{}])", inst.GetItem()->Name, inst.GetItem()->ID, bag_slot, index); @@ -1094,16 +1094,16 @@ void Client::PutLootInInventory(int16 slot_id, const EQEmu::ItemInstance &inst, CalcBonuses(); } -bool Client::TryStacking(EQEmu::ItemInstance* item, uint8 type, bool try_worn, bool try_cursor) { +bool Client::TryStacking(EQ::ItemInstance* item, uint8 type, bool try_worn, bool try_cursor) { if(!item || !item->IsStackable() || item->GetCharges()>=item->GetItem()->StackSize) return false; int16 i; uint32 item_id = item->GetItem()->ID; - for (i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::GENERAL_END; i++) { + for (i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::GENERAL_END; i++) { if (((uint64)1 << i) & GetInv().GetLookup()->PossessionsBitmask == 0) continue; - EQEmu::ItemInstance* tmp_inst = m_inv.GetItem(i); + EQ::ItemInstance* tmp_inst = m_inv.GetItem(i); if(tmp_inst && tmp_inst->GetItem()->ID == item_id && tmp_inst->GetCharges() < tmp_inst->GetItem()->StackSize){ MoveItemCharges(*item, i, type); CalcBonuses(); @@ -1113,13 +1113,13 @@ bool Client::TryStacking(EQEmu::ItemInstance* item, uint8 type, bool try_worn, b return true; } } - for (i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::GENERAL_END; i++) { + for (i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::GENERAL_END; i++) { if (((uint64)1 << i) & GetInv().GetLookup()->PossessionsBitmask == 0) continue; - for (uint8 j = EQEmu::invbag::SLOT_BEGIN; j <= EQEmu::invbag::SLOT_END; j++) { - uint16 slotid = EQEmu::InventoryProfile::CalcSlotId(i, j); - EQEmu::ItemInstance* tmp_inst = m_inv.GetItem(slotid); + for (uint8 j = EQ::invbag::SLOT_BEGIN; j <= EQ::invbag::SLOT_END; j++) { + uint16 slotid = EQ::InventoryProfile::CalcSlotId(i, j); + EQ::ItemInstance* tmp_inst = m_inv.GetItem(slotid); if(tmp_inst && tmp_inst->GetItem()->ID == item_id && tmp_inst->GetCharges() < tmp_inst->GetItem()->StackSize) { MoveItemCharges(*item, slotid, type); @@ -1137,35 +1137,35 @@ bool Client::TryStacking(EQEmu::ItemInstance* item, uint8 type, bool try_worn, b // Locate an available space in inventory to place an item // and then put the item there // The change will be saved to the database -bool Client::AutoPutLootInInventory(EQEmu::ItemInstance& inst, bool try_worn, bool try_cursor, ServerLootItem_Struct** bag_item_data) +bool Client::AutoPutLootInInventory(EQ::ItemInstance& inst, bool try_worn, bool try_cursor, ServerLootItem_Struct** bag_item_data) { // #1: Try to auto equip - if (try_worn && inst.IsEquipable(GetBaseRace(), GetClass()) && inst.GetItem()->ReqLevel <= level && (!inst.GetItem()->Attuneable || inst.IsAttuned()) && inst.GetItem()->ItemType != EQEmu::item::ItemTypeAugmentation) { - for (int16 i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; i++) { + if (try_worn && inst.IsEquipable(GetBaseRace(), GetClass()) && inst.GetItem()->ReqLevel <= level && (!inst.GetItem()->Attuneable || inst.IsAttuned()) && inst.GetItem()->ItemType != EQ::item::ItemTypeAugmentation) { + for (int16 i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; i++) { if (((uint64)1 << i) & GetInv().GetLookup()->PossessionsBitmask == 0) continue; if (!m_inv[i]) { - if (i == EQEmu::invslot::slotPrimary && inst.IsWeapon()) { // If item is primary slot weapon + if (i == EQ::invslot::slotPrimary && inst.IsWeapon()) { // If item is primary slot weapon if (inst.GetItem()->IsType2HWeapon()) { // and uses 2hs \ 2hb \ 2hp - if (m_inv[EQEmu::invslot::slotSecondary]) { // and if secondary slot is not empty + if (m_inv[EQ::invslot::slotSecondary]) { // and if secondary slot is not empty continue; // Can't auto-equip } } } - if (i == EQEmu::invslot::slotSecondary && m_inv[EQEmu::invslot::slotPrimary]) { // check to see if primary slot is a two hander - if (m_inv[EQEmu::invslot::slotPrimary]->GetItem()->IsType2HWeapon()) + if (i == EQ::invslot::slotSecondary && m_inv[EQ::invslot::slotPrimary]) { // check to see if primary slot is a two hander + if (m_inv[EQ::invslot::slotPrimary]->GetItem()->IsType2HWeapon()) continue; } - if (i == EQEmu::invslot::slotSecondary && inst.IsWeapon() && !CanThisClassDualWield()) { + if (i == EQ::invslot::slotSecondary && inst.IsWeapon() && !CanThisClassDualWield()) { continue; } if (inst.IsEquipable(i)) { // Equippable at this slot? //send worn to everyone... PutLootInInventory(i, inst); - uint8 worn_slot_material = EQEmu::InventoryProfile::CalcMaterialFromSlot(i); - if (worn_slot_material != EQEmu::textures::materialInvalid) { + uint8 worn_slot_material = EQ::InventoryProfile::CalcMaterialFromSlot(i); + if (worn_slot_material != EQ::textures::materialInvalid) { SendWearChange(worn_slot_material); } @@ -1183,7 +1183,7 @@ bool Client::AutoPutLootInInventory(EQEmu::ItemInstance& inst, bool try_worn, bo } // #3: put it in inventory - bool is_arrow = (inst.GetItem()->ItemType == EQEmu::item::ItemTypeArrow) ? true : false; + bool is_arrow = (inst.GetItem()->ItemType == EQ::item::ItemTypeArrow) ? true : false; int16 slot_id = m_inv.FindFreeSlot(inst.IsClassBag(), try_cursor, inst.GetItem()->Size, is_arrow); if (slot_id != INVALID_INDEX) { PutLootInInventory(slot_id, inst, bag_item_data); @@ -1194,9 +1194,9 @@ bool Client::AutoPutLootInInventory(EQEmu::ItemInstance& inst, bool try_worn, bo } // helper function for AutoPutLootInInventory -void Client::MoveItemCharges(EQEmu::ItemInstance &from, int16 to_slot, uint8 type) +void Client::MoveItemCharges(EQ::ItemInstance &from, int16 to_slot, uint8 type) { - EQEmu::ItemInstance *tmp_inst = m_inv.GetItem(to_slot); + EQ::ItemInstance *tmp_inst = m_inv.GetItem(to_slot); if(tmp_inst && tmp_inst->GetCharges() < tmp_inst->GetItem()->StackSize) { // this is how much room is left on the item we're stacking onto @@ -1208,7 +1208,7 @@ void Client::MoveItemCharges(EQEmu::ItemInstance &from, int16 to_slot, uint8 typ tmp_inst->SetCharges(tmp_inst->GetCharges() + charges_to_move); from.SetCharges(from.GetCharges() - charges_to_move); SendLootItemInPacket(tmp_inst, to_slot); - if (to_slot == EQEmu::invslot::slotCursor) { + if (to_slot == EQ::invslot::slotCursor) { auto s = m_inv.cursor_cbegin(), e = m_inv.cursor_cend(); database.SaveCursor(this->CharacterID(), s, e); } @@ -1329,13 +1329,13 @@ bool MakeItemLink(char* &ret_link, const ItemData *item, uint32 aug0, uint32 aug } #endif -int Client::GetItemLinkHash(const EQEmu::ItemInstance* inst) { +int Client::GetItemLinkHash(const EQ::ItemInstance* inst) { //pre-Titanium: http://eqitems.13th-floor.org/phpBB2/viewtopic.php?t=70&postdays=0&postorder=asc //Titanium: http://eqitems.13th-floor.org/phpBB2/viewtopic.php?t=145 if (!inst) //have to have an item to make the hash return 0; - const EQEmu::ItemData* item = inst->GetItem(); + const EQ::ItemData* item = inst->GetItem(); char* hash_str = 0; /*register */int hash = 0; @@ -1417,8 +1417,8 @@ int Client::GetItemLinkHash(const EQEmu::ItemInstance* inst) { return hash; } -// This appears to still be in use... The core of this should be incorporated into class EQEmu::SayLinkEngine -void Client::SendItemLink(const EQEmu::ItemInstance* inst, bool send_to_all) +// This appears to still be in use... The core of this should be incorporated into class EQ::SayLinkEngine +void Client::SendItemLink(const EQ::ItemInstance* inst, bool send_to_all) { /* @@ -1429,7 +1429,7 @@ packet with the item number in it, but I cant seem to find it right now if (!inst) return; - const EQEmu::ItemData* item = inst->GetItem(); + const EQ::ItemData* item = inst->GetItem(); const char* name2 = &item->Name[0]; auto outapp = new EQApplicationPacket(OP_ItemLinkText, strlen(name2) + 68); char buffer2[135] = {0}; @@ -1458,35 +1458,35 @@ packet with the item number in it, but I cant seem to find it right now safe_delete(outapp); } -void Client::SendLootItemInPacket(const EQEmu::ItemInstance* inst, int16 slot_id) +void Client::SendLootItemInPacket(const EQ::ItemInstance* inst, int16 slot_id) { SendItemPacket(slot_id,inst, ItemPacketTrade); } bool Client::IsValidSlot(uint32 slot) { - if (slot <= EQEmu::invslot::POSSESSIONS_END && slot >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (slot <= EQ::invslot::POSSESSIONS_END && slot >= EQ::invslot::POSSESSIONS_BEGIN) { return ((((uint64)1 << slot) & GetInv().GetLookup()->PossessionsBitmask) != 0); } - else if (slot <= EQEmu::invbag::GENERAL_BAGS_END && slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((slot - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); + else if (slot <= EQ::invbag::GENERAL_BAGS_END && slot >= EQ::invbag::GENERAL_BAGS_BEGIN) { + auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((slot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); return ((((uint64)1 << temp_slot) & GetInv().GetLookup()->PossessionsBitmask) != 0); } - else if (slot <= EQEmu::invslot::BANK_END && slot >= EQEmu::invslot::BANK_BEGIN) { - return ((slot - EQEmu::invslot::BANK_BEGIN) < GetInv().GetLookup()->InventoryTypeSize.Bank); + else if (slot <= EQ::invslot::BANK_END && slot >= EQ::invslot::BANK_BEGIN) { + return ((slot - EQ::invslot::BANK_BEGIN) < GetInv().GetLookup()->InventoryTypeSize.Bank); } - else if (slot <= EQEmu::invbag::BANK_BAGS_END && slot >= EQEmu::invbag::BANK_BAGS_BEGIN) { - auto temp_slot = (slot - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; + else if (slot <= EQ::invbag::BANK_BAGS_END && slot >= EQ::invbag::BANK_BAGS_BEGIN) { + auto temp_slot = (slot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT; return (temp_slot < GetInv().GetLookup()->InventoryTypeSize.Bank); } else if ( (slot == (uint32)INVALID_INDEX) || - (slot == (uint32)EQEmu::invslot::slotCursor) || - (slot <= EQEmu::invbag::CURSOR_BAG_END && slot >= EQEmu::invbag::CURSOR_BAG_BEGIN) || - (slot <= EQEmu::invslot::TRIBUTE_END && slot >= EQEmu::invslot::TRIBUTE_BEGIN) || - (slot <= EQEmu::invslot::SHARED_BANK_END && slot >= EQEmu::invslot::SHARED_BANK_BEGIN) || - (slot <= EQEmu::invbag::SHARED_BANK_BAGS_END && slot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) || - (slot <= EQEmu::invslot::TRADE_END && slot >= EQEmu::invslot::TRADE_BEGIN) || - (slot <= EQEmu::invslot::WORLD_END && slot >= EQEmu::invslot::WORLD_BEGIN) + (slot == (uint32)EQ::invslot::slotCursor) || + (slot <= EQ::invbag::CURSOR_BAG_END && slot >= EQ::invbag::CURSOR_BAG_BEGIN) || + (slot <= EQ::invslot::TRIBUTE_END && slot >= EQ::invslot::TRIBUTE_BEGIN) || + (slot <= EQ::invslot::SHARED_BANK_END && slot >= EQ::invslot::SHARED_BANK_BEGIN) || + (slot <= EQ::invbag::SHARED_BANK_BAGS_END && slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) || + (slot <= EQ::invslot::TRADE_END && slot >= EQ::invslot::TRADE_BEGIN) || + (slot <= EQ::invslot::WORLD_END && slot >= EQ::invslot::WORLD_BEGIN) ) { return true; } @@ -1496,10 +1496,10 @@ bool Client::IsValidSlot(uint32 slot) { bool Client::IsBankSlot(uint32 slot) { - if ((slot >= EQEmu::invslot::BANK_BEGIN && slot <= EQEmu::invslot::BANK_END) || - (slot >= EQEmu::invbag::BANK_BAGS_BEGIN && slot <= EQEmu::invbag::BANK_BAGS_END) || - (slot >= EQEmu::invslot::SHARED_BANK_BEGIN && slot <= EQEmu::invslot::SHARED_BANK_END) || - (slot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN && slot <= EQEmu::invbag::SHARED_BANK_BAGS_END)) + if ((slot >= EQ::invslot::BANK_BEGIN && slot <= EQ::invslot::BANK_END) || + (slot >= EQ::invbag::BANK_BAGS_BEGIN && slot <= EQ::invbag::BANK_BAGS_END) || + (slot >= EQ::invslot::SHARED_BANK_BEGIN && slot <= EQ::invslot::SHARED_BANK_END) || + (slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN && slot <= EQ::invbag::SHARED_BANK_BAGS_END)) { return true; } @@ -1533,10 +1533,10 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { if (move_in->from_slot == move_in->to_slot) { // Item summon, no further processing needed if(RuleB(QueryServ, PlayerLogMoves)) { QSSwapItemAuditor(move_in); } // QS Audit - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) { return true; } // Can't do RoF+ + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { return true; } // Can't do RoF+ - if (move_in->to_slot == EQEmu::invslot::slotCursor) { - auto test_inst = m_inv.GetItem(EQEmu::invslot::slotCursor); + if (move_in->to_slot == EQ::invslot::slotCursor) { + auto test_inst = m_inv.GetItem(EQ::invslot::slotCursor); if (test_inst == nullptr) { return true; } auto test_item = test_inst->GetItem(); if (test_item == nullptr) { return true; } @@ -1555,18 +1555,18 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { GetName(), test_item->Name, test_item->ID); MessageString(Chat::Loot, 290); parse->EventItem(EVENT_DESTROY_ITEM, this, test_inst, nullptr, "", 0); - DeleteItemInInventory(EQEmu::invslot::slotCursor, 0, true); + DeleteItemInInventory(EQ::invslot::slotCursor, 0, true); } } return true; } if (move_in->to_slot == (uint32)INVALID_INDEX) { - if (move_in->from_slot == (uint32)EQEmu::invslot::slotCursor) { + if (move_in->from_slot == (uint32)EQ::invslot::slotCursor) { LogInventory("Client destroyed item from cursor slot [{}]", move_in->from_slot); if(RuleB(QueryServ, PlayerLogMoves)) { QSSwapItemAuditor(move_in); } // QS Audit - EQEmu::ItemInstance *inst = m_inv.GetItem(EQEmu::invslot::slotCursor); + EQ::ItemInstance *inst = m_inv.GetItem(EQ::invslot::slotCursor); if(inst) { parse->EventItem(EVENT_DESTROY_ITEM, this, inst, nullptr, "", 0); } @@ -1585,9 +1585,9 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } if (auto_attack) { - if (move_in->from_slot == EQEmu::invslot::slotPrimary || move_in->from_slot == EQEmu::invslot::slotSecondary || move_in->from_slot == EQEmu::invslot::slotRange) + if (move_in->from_slot == EQ::invslot::slotPrimary || move_in->from_slot == EQ::invslot::slotSecondary || move_in->from_slot == EQ::invslot::slotRange) SetAttackTimer(); - else if (move_in->to_slot == EQEmu::invslot::slotPrimary || move_in->to_slot == EQEmu::invslot::slotSecondary || move_in->to_slot == EQEmu::invslot::slotRange) + else if (move_in->to_slot == EQ::invslot::slotPrimary || move_in->to_slot == EQ::invslot::slotSecondary || move_in->to_slot == EQ::invslot::slotRange) SetAttackTimer(); } @@ -1614,8 +1614,8 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { //Setup uint32 srcitemid = 0; uint32 dstitemid = 0; - EQEmu::ItemInstance* src_inst = m_inv.GetItem(src_slot_id); - EQEmu::ItemInstance* dst_inst = m_inv.GetItem(dst_slot_id); + EQ::ItemInstance* src_inst = m_inv.GetItem(src_slot_id); + EQ::ItemInstance* dst_inst = m_inv.GetItem(dst_slot_id); if (src_inst){ LogInventory("Src slot [{}] has item [{}] ([{}]) with [{}] charges in it", src_slot_id, src_inst->GetItem()->Name, src_inst->GetItem()->ID, src_inst->GetCharges()); srcitemid = src_inst->GetItem()->ID; @@ -1631,17 +1631,17 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { dstitemid = dst_inst->GetItem()->ID; } if (Trader && srcitemid>0){ - EQEmu::ItemInstance* srcbag; - EQEmu::ItemInstance* dstbag; + EQ::ItemInstance* srcbag; + EQ::ItemInstance* dstbag; uint32 srcbagid =0; uint32 dstbagid = 0; - if (src_slot_id >= EQEmu::invbag::GENERAL_BAGS_BEGIN && src_slot_id <= EQEmu::invbag::GENERAL_BAGS_END) { + if (src_slot_id >= EQ::invbag::GENERAL_BAGS_BEGIN && src_slot_id <= EQ::invbag::GENERAL_BAGS_END) { srcbag = m_inv.GetItem(((int)(src_slot_id / 10)) - 3); if (srcbag) srcbagid = srcbag->GetItem()->ID; } - if (dst_slot_id >= EQEmu::invbag::GENERAL_BAGS_BEGIN && dst_slot_id <= EQEmu::invbag::GENERAL_BAGS_END) { + if (dst_slot_id >= EQ::invbag::GENERAL_BAGS_BEGIN && dst_slot_id <= EQ::invbag::GENERAL_BAGS_END) { dstbag = m_inv.GetItem(((int)(dst_slot_id / 10)) - 3); if (dstbag) dstbagid = dstbag->GetItem()->ID; @@ -1654,7 +1654,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { // Step 2: Validate item in from_slot // After this, we can assume src_inst is a valid ptr - if (!src_inst && (src_slot_id < EQEmu::invslot::WORLD_BEGIN || src_slot_id > EQEmu::invslot::WORLD_END)) { + if (!src_inst && (src_slot_id < EQ::invslot::WORLD_BEGIN || src_slot_id > EQ::invslot::WORLD_END)) { if (dst_inst) { // If there is no source item, but there is a destination item, // move the slots around before deleting the invalid source slot item, @@ -1668,32 +1668,32 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { return false; } //verify shared bank transactions in the database - if (src_inst && src_slot_id >= EQEmu::invslot::SHARED_BANK_BEGIN && src_slot_id <= EQEmu::invbag::SHARED_BANK_BAGS_END) { + if (src_inst && src_slot_id >= EQ::invslot::SHARED_BANK_BEGIN && src_slot_id <= EQ::invbag::SHARED_BANK_BAGS_END) { if(!database.VerifyInventory(account_id, src_slot_id, src_inst)) { LogError("Player [{}] on account [{}] was found exploiting the shared bank.\n", GetName(), account_name); DeleteItemInInventory(dst_slot_id,0,true); return(false); } - if (src_slot_id >= EQEmu::invslot::SHARED_BANK_BEGIN && src_slot_id <= EQEmu::invslot::SHARED_BANK_END && src_inst->IsClassBag()){ - for (uint8 idx = EQEmu::invbag::SLOT_BEGIN; idx <= EQEmu::invbag::SLOT_END; idx++) { - const EQEmu::ItemInstance* baginst = src_inst->GetItem(idx); - if (baginst && !database.VerifyInventory(account_id, EQEmu::InventoryProfile::CalcSlotId(src_slot_id, idx), baginst)){ - DeleteItemInInventory(EQEmu::InventoryProfile::CalcSlotId(src_slot_id, idx), 0, false); + if (src_slot_id >= EQ::invslot::SHARED_BANK_BEGIN && src_slot_id <= EQ::invslot::SHARED_BANK_END && src_inst->IsClassBag()){ + for (uint8 idx = EQ::invbag::SLOT_BEGIN; idx <= EQ::invbag::SLOT_END; idx++) { + const EQ::ItemInstance* baginst = src_inst->GetItem(idx); + if (baginst && !database.VerifyInventory(account_id, EQ::InventoryProfile::CalcSlotId(src_slot_id, idx), baginst)){ + DeleteItemInInventory(EQ::InventoryProfile::CalcSlotId(src_slot_id, idx), 0, false); } } } } - if (dst_inst && dst_slot_id >= EQEmu::invslot::SHARED_BANK_BEGIN && dst_slot_id <= EQEmu::invbag::SHARED_BANK_BAGS_END) { + if (dst_inst && dst_slot_id >= EQ::invslot::SHARED_BANK_BEGIN && dst_slot_id <= EQ::invbag::SHARED_BANK_BAGS_END) { if(!database.VerifyInventory(account_id, dst_slot_id, dst_inst)) { LogError("Player [{}] on account [{}] was found exploting the shared bank.\n", GetName(), account_name); DeleteItemInInventory(src_slot_id,0,true); return(false); } - if (dst_slot_id >= EQEmu::invslot::SHARED_BANK_BEGIN && dst_slot_id <= EQEmu::invslot::SHARED_BANK_END && dst_inst->IsClassBag()){ - for (uint8 idx = EQEmu::invbag::SLOT_BEGIN; idx <= EQEmu::invbag::SLOT_END; idx++) { - const EQEmu::ItemInstance* baginst = dst_inst->GetItem(idx); - if (baginst && !database.VerifyInventory(account_id, EQEmu::InventoryProfile::CalcSlotId(dst_slot_id, idx), baginst)){ - DeleteItemInInventory(EQEmu::InventoryProfile::CalcSlotId(dst_slot_id, idx), 0, false); + if (dst_slot_id >= EQ::invslot::SHARED_BANK_BEGIN && dst_slot_id <= EQ::invslot::SHARED_BANK_END && dst_inst->IsClassBag()){ + for (uint8 idx = EQ::invbag::SLOT_BEGIN; idx <= EQ::invbag::SLOT_END; idx++) { + const EQ::ItemInstance* baginst = dst_inst->GetItem(idx); + if (baginst && !database.VerifyInventory(account_id, EQ::InventoryProfile::CalcSlotId(dst_slot_id, idx), baginst)){ + DeleteItemInInventory(EQ::InventoryProfile::CalcSlotId(dst_slot_id, idx), 0, false); } } } @@ -1702,14 +1702,14 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { // Check for No Drop Hacks Mob* with = trade->With(); - if (((with && with->IsClient() && dst_slot_id >= EQEmu::invslot::TRADE_BEGIN && dst_slot_id <= EQEmu::invslot::TRADE_END) || - (dst_slot_id >= EQEmu::invslot::SHARED_BANK_BEGIN && dst_slot_id <= EQEmu::invbag::SHARED_BANK_BAGS_END)) + if (((with && with->IsClient() && dst_slot_id >= EQ::invslot::TRADE_BEGIN && dst_slot_id <= EQ::invslot::TRADE_END) || + (dst_slot_id >= EQ::invslot::SHARED_BANK_BEGIN && dst_slot_id <= EQ::invbag::SHARED_BANK_BAGS_END)) && GetInv().CheckNoDrop(src_slot_id) && RuleI(World, FVNoDropFlag) == 0 || RuleI(Character, MinStatusForNoDropExemptions) < Admin() && RuleI(World, FVNoDropFlag) == 2) { auto ndh_inst = m_inv[src_slot_id]; std::string ndh_item_data; if (ndh_inst == nullptr) { - ndh_item_data.append("[nullptr on EQEmu::ItemInstance*]"); + ndh_item_data.append("[nullptr on EQ::ItemInstance*]"); } else { auto ndh_item = ndh_inst->GetItem(); @@ -1733,9 +1733,9 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { // Step 3: Check for interaction with World Container (tradeskills) if(m_tradeskill_object != nullptr) { - if (src_slot_id >= EQEmu::invslot::WORLD_BEGIN && src_slot_id <= EQEmu::invslot::WORLD_END) { + if (src_slot_id >= EQ::invslot::WORLD_BEGIN && src_slot_id <= EQ::invslot::WORLD_END) { // Picking up item from world container - EQEmu::ItemInstance* inst = m_tradeskill_object->PopItem(EQEmu::InventoryProfile::CalcBagIdx(src_slot_id)); + EQ::ItemInstance* inst = m_tradeskill_object->PopItem(EQ::InventoryProfile::CalcBagIdx(src_slot_id)); if (inst) { PutItemInInventory(dst_slot_id, *inst, false); safe_delete(inst); @@ -1745,10 +1745,10 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { return true; } - else if (dst_slot_id >= EQEmu::invslot::WORLD_BEGIN && dst_slot_id <= EQEmu::invslot::WORLD_END) { + else if (dst_slot_id >= EQ::invslot::WORLD_BEGIN && dst_slot_id <= EQ::invslot::WORLD_END) { // Putting item into world container, which may swap (or pile onto) with existing item - uint8 world_idx = EQEmu::InventoryProfile::CalcBagIdx(dst_slot_id); - EQEmu::ItemInstance* world_inst = m_tradeskill_object->PopItem(world_idx); + uint8 world_idx = EQ::InventoryProfile::CalcBagIdx(dst_slot_id); + EQ::ItemInstance* world_inst = m_tradeskill_object->PopItem(world_idx); // Case 1: No item in container, unidirectional "Put" if (world_inst == nullptr) { @@ -1756,8 +1756,8 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { m_inv.DeleteItem(src_slot_id); } else { - const EQEmu::ItemData* world_item = world_inst->GetItem(); - const EQEmu::ItemData* src_item = src_inst->GetItem(); + const EQ::ItemData* world_item = world_inst->GetItem(); + const EQ::ItemData* src_item = src_inst->GetItem(); if (world_item && src_item) { // Case 2: Same item on cursor, stacks, transfer of charges needed if ((world_item->ID == src_item->ID) && src_inst->IsStackable()) { @@ -1788,7 +1788,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { else { // Case 3: Swap the item on user with item in world container // World containers don't follow normal rules for swapping - EQEmu::ItemInstance* inv_inst = m_inv.PopItem(src_slot_id); + EQ::ItemInstance* inv_inst = m_inv.PopItem(src_slot_id); m_tradeskill_object->PutItem(world_idx, inv_inst); m_inv.PutItem(src_slot_id, *world_inst); safe_delete(inv_inst); @@ -1797,7 +1797,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } safe_delete(world_inst); - if (src_slot_id == EQEmu::invslot::slotCursor) + if (src_slot_id == EQ::invslot::slotCursor) { if (dstitemid == 0) { @@ -1818,15 +1818,15 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } // Step 4: Check for entity trade - if (dst_slot_id >= EQEmu::invslot::TRADE_BEGIN && dst_slot_id <= EQEmu::invslot::TRADE_END) { - if (src_slot_id != EQEmu::invslot::slotCursor) { + if (dst_slot_id >= EQ::invslot::TRADE_BEGIN && dst_slot_id <= EQ::invslot::TRADE_END) { + if (src_slot_id != EQ::invslot::slotCursor) { Kick("Trade with non-cursor item"); return false; } if (with) { LogInventory("Trade item move from slot [{}] to slot [{}] (trade with [{}])", src_slot_id, dst_slot_id, with->GetName()); // Fill Trade list with items from cursor - if (!m_inv[EQEmu::invslot::slotCursor]) { + if (!m_inv[EQ::invslot::slotCursor]) { Message(Chat::Red, "Error: Cursor item not located on server!"); return false; } @@ -1846,7 +1846,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { if(RuleB(QueryServ, PlayerLogMoves)) { QSSwapItemAuditor(move_in); } // QS Audit SummonItem(src_inst->GetID(), src_inst->GetCharges()); - DeleteItemInInventory(EQEmu::invslot::slotCursor); + DeleteItemInInventory(EQ::invslot::slotCursor); return true; } @@ -1896,7 +1896,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { // Nothing in destination slot: split stack into two if ((int16)move_in->number_in_stack >= src_inst->GetCharges()) { // Move entire stack - EQEmu::InventoryProfile::SwapItemFailState fail_state = EQEmu::InventoryProfile::swapInvalid; + EQ::InventoryProfile::SwapItemFailState fail_state = EQ::InventoryProfile::swapInvalid; if (!m_inv.SwapItem(src_slot_id, dst_slot_id, fail_state)) { return false; } LogInventory("Move entire stack from [{}] to [{}] with stack size [{}]. Dest empty", src_slot_id, dst_slot_id, move_in->number_in_stack); } @@ -1904,7 +1904,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { // Split into two src_inst->SetCharges(src_inst->GetCharges() - move_in->number_in_stack); LogInventory("Split stack of [{}] ([{}]) from slot [{}] to [{}] with stack size [{}]. Src keeps [{}]", src_inst->GetItem()->Name, src_inst->GetItem()->ID, src_slot_id, dst_slot_id, move_in->number_in_stack, src_inst->GetCharges()); - EQEmu::ItemInstance* inst = database.CreateItem(src_inst->GetItem(), move_in->number_in_stack); + EQ::ItemInstance* inst = database.CreateItem(src_inst->GetItem(), move_in->number_in_stack); m_inv.PutItem(dst_slot_id, *inst); safe_delete(inst); } @@ -1912,12 +1912,12 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } else { // Not dealing with charges - just do direct swap - if (src_inst && (dst_slot_id <= EQEmu::invslot::EQUIPMENT_END) && dst_slot_id >= EQEmu::invslot::EQUIPMENT_BEGIN) { + if (src_inst && (dst_slot_id <= EQ::invslot::EQUIPMENT_END) && dst_slot_id >= EQ::invslot::EQUIPMENT_BEGIN) { if (src_inst->GetItem()->Attuneable) { src_inst->SetAttuned(true); } if (src_inst->IsAugmented()) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { if (src_inst->GetAugment(i)) { if (src_inst->GetAugment(i)->GetItem()->Attuneable) { src_inst->GetAugment(i)->SetAttuned(true); @@ -1928,12 +1928,12 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { SetMaterial(dst_slot_id,src_inst->GetItem()->ID); } - EQEmu::InventoryProfile::SwapItemFailState fail_state = EQEmu::InventoryProfile::swapInvalid; + EQ::InventoryProfile::SwapItemFailState fail_state = EQ::InventoryProfile::swapInvalid; 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."; - if (fail_state == EQEmu::InventoryProfile::swapRaceClass || fail_state == EQEmu::InventoryProfile::swapDeity) + if (fail_state == EQ::InventoryProfile::swapRaceClass || fail_state == EQ::InventoryProfile::swapDeity) fail_message = "Your class, deity and/or race may not equip that item."; - else if (fail_state == EQEmu::InventoryProfile::swapLevel) + else if (fail_state == EQ::InventoryProfile::swapLevel) fail_message = "You are not sufficient level to use this item."; if (fail_message) @@ -1944,7 +1944,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { LogInventory("Moving entire item from slot [{}] to slot [{}]", src_slot_id, dst_slot_id); - if (src_slot_id <= EQEmu::invslot::EQUIPMENT_END) { + if (src_slot_id <= EQ::invslot::EQUIPMENT_END) { if(src_inst) { parse->EventItem(EVENT_UNEQUIP_ITEM, this, src_inst, nullptr, "", src_slot_id); } @@ -1954,7 +1954,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } } - if (dst_slot_id <= EQEmu::invslot::EQUIPMENT_END) { + if (dst_slot_id <= EQ::invslot::EQUIPMENT_END) { if(dst_inst) { parse->EventItem(EVENT_UNEQUIP_ITEM, this, dst_inst, nullptr, "", dst_slot_id); } @@ -1966,12 +1966,12 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } int matslot = SlotConvert2(dst_slot_id); - if (dst_slot_id <= EQEmu::invslot::EQUIPMENT_END && matslot != EQEmu::textures::armorHead) { // think this is to allow the client to update with /showhelm + if (dst_slot_id <= EQ::invslot::EQUIPMENT_END && matslot != EQ::textures::armorHead) { // think this is to allow the client to update with /showhelm SendWearChange(matslot); } // Step 7: Save change to the database - if (src_slot_id == EQEmu::invslot::slotCursor) { + if (src_slot_id == EQ::invslot::slotCursor) { // If not swapping another item to cursor and stacking items were depleted if (dstitemid == 0 || all_to_stack == true) { @@ -1984,7 +1984,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { database.SaveInventory(character_id, m_inv.GetItem(src_slot_id), src_slot_id); } - if (dst_slot_id == EQEmu::invslot::slotCursor) { + if (dst_slot_id == EQ::invslot::slotCursor) { auto s = m_inv.cursor_cbegin(), e = m_inv.cursor_cend(); database.SaveCursor(character_id, s, e); } @@ -2008,12 +2008,12 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) { LogInventory("Inventory desyncronization. (charname: [{}], source: [{}], destination: [{}])", GetName(), move_slots->from_slot, move_slots->to_slot); Message(Chat::Yellow, "Inventory Desyncronization detected: Resending slot data..."); - if (move_slots->from_slot >= EQEmu::invslot::EQUIPMENT_BEGIN && move_slots->from_slot <= EQEmu::invbag::CURSOR_BAG_END) { - int16 resync_slot = (EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot) == INVALID_INDEX) ? move_slots->from_slot : EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot); + if (move_slots->from_slot >= EQ::invslot::EQUIPMENT_BEGIN && move_slots->from_slot <= EQ::invbag::CURSOR_BAG_END) { + int16 resync_slot = (EQ::InventoryProfile::CalcSlotId(move_slots->from_slot) == INVALID_INDEX) ? move_slots->from_slot : EQ::InventoryProfile::CalcSlotId(move_slots->from_slot); if (IsValidSlot(resync_slot) && resync_slot != INVALID_INDEX) { // This prevents the client from crashing when closing any 'phantom' bags - const EQEmu::ItemData* token_struct = database.GetItem(22292); // 'Copper Coin' - EQEmu::ItemInstance* token_inst = database.CreateItem(token_struct, 1); + const EQ::ItemData* token_struct = database.GetItem(22292); // 'Copper Coin' + EQ::ItemInstance* token_inst = database.CreateItem(token_struct, 1); SendItemPacket(resync_slot, token_inst, ItemPacketTrade); @@ -2034,11 +2034,11 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) { else { Message(Chat::Red, "Could not resyncronize source slot %i.", move_slots->from_slot); } } else { - int16 resync_slot = (EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot) == INVALID_INDEX) ? move_slots->from_slot : EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot); + int16 resync_slot = (EQ::InventoryProfile::CalcSlotId(move_slots->from_slot) == INVALID_INDEX) ? move_slots->from_slot : EQ::InventoryProfile::CalcSlotId(move_slots->from_slot); if (IsValidSlot(resync_slot) && resync_slot != INVALID_INDEX) { if(m_inv[resync_slot]) { - const EQEmu::ItemData* token_struct = database.GetItem(22292); // 'Copper Coin' - EQEmu::ItemInstance* token_inst = database.CreateItem(token_struct, 1); + const EQ::ItemData* token_struct = database.GetItem(22292); // 'Copper Coin' + EQ::ItemInstance* token_inst = database.CreateItem(token_struct, 1); SendItemPacket(resync_slot, token_inst, ItemPacketTrade); SendItemPacket(resync_slot, m_inv[resync_slot], ItemPacketTrade); @@ -2051,11 +2051,11 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) { else { Message(Chat::Red, "Could not resyncronize source slot %i.", move_slots->from_slot); } } - if (move_slots->to_slot >= EQEmu::invslot::EQUIPMENT_BEGIN && move_slots->to_slot <= EQEmu::invbag::CURSOR_BAG_END) { - int16 resync_slot = (EQEmu::InventoryProfile::CalcSlotId(move_slots->to_slot) == INVALID_INDEX) ? move_slots->to_slot : EQEmu::InventoryProfile::CalcSlotId(move_slots->to_slot); + if (move_slots->to_slot >= EQ::invslot::EQUIPMENT_BEGIN && move_slots->to_slot <= EQ::invbag::CURSOR_BAG_END) { + int16 resync_slot = (EQ::InventoryProfile::CalcSlotId(move_slots->to_slot) == INVALID_INDEX) ? move_slots->to_slot : EQ::InventoryProfile::CalcSlotId(move_slots->to_slot); if (IsValidSlot(resync_slot) && resync_slot != INVALID_INDEX) { - const EQEmu::ItemData* token_struct = database.GetItem(22292); // 'Copper Coin' - EQEmu::ItemInstance* token_inst = database.CreateItem(token_struct, 1); + const EQ::ItemData* token_struct = database.GetItem(22292); // 'Copper Coin' + EQ::ItemInstance* token_inst = database.CreateItem(token_struct, 1); SendItemPacket(resync_slot, token_inst, ItemPacketTrade); @@ -2076,11 +2076,11 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) { else { Message(Chat::Red, "Could not resyncronize destination slot %i.", move_slots->to_slot); } } else { - int16 resync_slot = (EQEmu::InventoryProfile::CalcSlotId(move_slots->to_slot) == INVALID_INDEX) ? move_slots->to_slot : EQEmu::InventoryProfile::CalcSlotId(move_slots->to_slot); + int16 resync_slot = (EQ::InventoryProfile::CalcSlotId(move_slots->to_slot) == INVALID_INDEX) ? move_slots->to_slot : EQ::InventoryProfile::CalcSlotId(move_slots->to_slot); if (IsValidSlot(resync_slot) && resync_slot != INVALID_INDEX) { if(m_inv[resync_slot]) { - const EQEmu::ItemData* token_struct = database.GetItem(22292); // 'Copper Coin' - EQEmu::ItemInstance* token_inst = database.CreateItem(token_struct, 1); + const EQ::ItemData* token_struct = database.GetItem(22292); // 'Copper Coin' + EQ::ItemInstance* token_inst = database.CreateItem(token_struct, 1); SendItemPacket(resync_slot, token_inst, ItemPacketTrade); SendItemPacket(resync_slot, m_inv[resync_slot], ItemPacketTrade); @@ -2119,7 +2119,7 @@ void Client::QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call) { move_count = 0; - const EQEmu::ItemInstance* from_inst = m_inv[postaction_call?to_slot_id:from_slot_id]; + const EQ::ItemInstance* from_inst = m_inv[postaction_call?to_slot_id:from_slot_id]; if(from_inst) { qsaudit->items[move_count].from_slot = from_slot_id; @@ -2132,13 +2132,13 @@ void Client::QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call) { qsaudit->items[move_count].aug_4 = from_inst->GetAugmentItemID(4); qsaudit->items[move_count++].aug_5 = from_inst->GetAugmentItemID(5); - if (from_inst->IsType(EQEmu::item::ItemClassBag)) { - for (uint8 bag_idx = EQEmu::invbag::SLOT_BEGIN; bag_idx < from_inst->GetItem()->BagSlots; bag_idx++) { - const EQEmu::ItemInstance* from_baginst = from_inst->GetItem(bag_idx); + if (from_inst->IsType(EQ::item::ItemClassBag)) { + for (uint8 bag_idx = EQ::invbag::SLOT_BEGIN; bag_idx < from_inst->GetItem()->BagSlots; bag_idx++) { + const EQ::ItemInstance* from_baginst = from_inst->GetItem(bag_idx); if(from_baginst) { - qsaudit->items[move_count].from_slot = EQEmu::InventoryProfile::CalcSlotId(from_slot_id, bag_idx); - qsaudit->items[move_count].to_slot = EQEmu::InventoryProfile::CalcSlotId(to_slot_id, bag_idx); + qsaudit->items[move_count].from_slot = EQ::InventoryProfile::CalcSlotId(from_slot_id, bag_idx); + qsaudit->items[move_count].to_slot = EQ::InventoryProfile::CalcSlotId(to_slot_id, bag_idx); qsaudit->items[move_count].item_id = from_baginst->GetID(); qsaudit->items[move_count].charges = from_baginst->GetCharges(); qsaudit->items[move_count].aug_1 = from_baginst->GetAugmentItemID(1); @@ -2152,7 +2152,7 @@ void Client::QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call) { } if(to_slot_id != from_slot_id) { - const EQEmu::ItemInstance* to_inst = m_inv[postaction_call?from_slot_id:to_slot_id]; + const EQ::ItemInstance* to_inst = m_inv[postaction_call?from_slot_id:to_slot_id]; if(to_inst) { qsaudit->items[move_count].from_slot = to_slot_id; @@ -2165,13 +2165,13 @@ void Client::QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call) { qsaudit->items[move_count].aug_4 = to_inst->GetAugmentItemID(4); qsaudit->items[move_count++].aug_5 = to_inst->GetAugmentItemID(5); - if (to_inst->IsType(EQEmu::item::ItemClassBag)) { - for (uint8 bag_idx = EQEmu::invbag::SLOT_BEGIN; bag_idx < to_inst->GetItem()->BagSlots; bag_idx++) { - const EQEmu::ItemInstance* to_baginst = to_inst->GetItem(bag_idx); + if (to_inst->IsType(EQ::item::ItemClassBag)) { + for (uint8 bag_idx = EQ::invbag::SLOT_BEGIN; bag_idx < to_inst->GetItem()->BagSlots; bag_idx++) { + const EQ::ItemInstance* to_baginst = to_inst->GetItem(bag_idx); if(to_baginst) { - qsaudit->items[move_count].from_slot = EQEmu::InventoryProfile::CalcSlotId(to_slot_id, bag_idx); - qsaudit->items[move_count].to_slot = EQEmu::InventoryProfile::CalcSlotId(from_slot_id, bag_idx); + qsaudit->items[move_count].from_slot = EQ::InventoryProfile::CalcSlotId(to_slot_id, bag_idx); + qsaudit->items[move_count].to_slot = EQ::InventoryProfile::CalcSlotId(from_slot_id, bag_idx); qsaudit->items[move_count].item_id = to_baginst->GetID(); qsaudit->items[move_count].charges = to_baginst->GetCharges(); qsaudit->items[move_count].aug_1 = to_baginst->GetAugmentItemID(1); @@ -2192,15 +2192,15 @@ void Client::QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call) { safe_delete(qspack); } -void Client::DyeArmor(EQEmu::TintProfile* dye){ +void Client::DyeArmor(EQ::TintProfile* dye){ int16 slot=0; - for (int i = EQEmu::textures::textureBegin; i <= EQEmu::textures::LastTintableTexture; i++) { + for (int i = EQ::textures::textureBegin; i <= EQ::textures::LastTintableTexture; i++) { if ((m_pp.item_tint.Slot[i].Color & 0x00FFFFFF) != (dye->Slot[i].Color & 0x00FFFFFF)) { slot = m_inv.HasItem(32557, 1, invWherePersonal); if (slot != INVALID_INDEX){ DeleteItemInInventory(slot,1,true); uint8 slot2=SlotConvert(i); - EQEmu::ItemInstance* inst = this->m_inv.GetItem(slot2); + EQ::ItemInstance* inst = this->m_inv.GetItem(slot2); if(inst){ uint32 armor_color = ((uint32)dye->Slot[i].Red << 16) | ((uint32)dye->Slot[i].Green << 8) | ((uint32)dye->Slot[i].Blue); inst->SetColor(armor_color); @@ -2231,9 +2231,9 @@ void Client::DyeArmor(EQEmu::TintProfile* dye){ #if 0 bool Client::DecreaseByItemType(uint32 type, uint8 amt) { const ItemData* TempItem = 0; - EQEmu::ItemInstance* ins; + EQ::ItemInstance* ins; int x; - for(x=EQEmu::legacy::POSSESSIONS_BEGIN; x <= EQEmu::legacy::POSSESSIONS_END; x++) + for(x=EQ::legacy::POSSESSIONS_BEGIN; x <= EQ::legacy::POSSESSIONS_END; x++) { TempItem = 0; ins = GetInv().GetItem(x); @@ -2255,7 +2255,7 @@ bool Client::DecreaseByItemType(uint32 type, uint8 amt) { return true; } } - for(x=EQEmu::legacy::GENERAL_BAGS_BEGIN; x <= EQEmu::legacy::GENERAL_BAGS_END; x++) + for(x=EQ::legacy::GENERAL_BAGS_BEGIN; x <= EQ::legacy::GENERAL_BAGS_END; x++) { TempItem = 0; ins = GetInv().GetItem(x); @@ -2282,12 +2282,12 @@ bool Client::DecreaseByItemType(uint32 type, uint8 amt) { #endif bool Client::DecreaseByID(uint32 type, uint8 amt) { - const EQEmu::ItemData* TempItem = nullptr; - EQEmu::ItemInstance* ins = nullptr; + const EQ::ItemData* TempItem = nullptr; + EQ::ItemInstance* ins = nullptr; int x; int num = 0; - for (x = EQEmu::invslot::POSSESSIONS_BEGIN; x <= EQEmu::invslot::POSSESSIONS_END; ++x) { + for (x = EQ::invslot::POSSESSIONS_BEGIN; x <= EQ::invslot::POSSESSIONS_END; ++x) { if (num >= amt) break; if (((uint64)1 << x) & GetInv().GetLookup()->PossessionsBitmask == 0) @@ -2301,10 +2301,10 @@ bool Client::DecreaseByID(uint32 type, uint8 amt) { num += ins->GetCharges(); } - for (x = EQEmu::invbag::GENERAL_BAGS_BEGIN; x <= EQEmu::invbag::GENERAL_BAGS_END; ++x) { + for (x = EQ::invbag::GENERAL_BAGS_BEGIN; x <= EQ::invbag::GENERAL_BAGS_END; ++x) { if (num >= amt) break; - if ((((uint64)1 << (EQEmu::invslot::GENERAL_BEGIN + ((x - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT))) & GetInv().GetLookup()->PossessionsBitmask) == 0) + if ((((uint64)1 << (EQ::invslot::GENERAL_BEGIN + ((x - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT))) & GetInv().GetLookup()->PossessionsBitmask) == 0) continue; TempItem = nullptr; @@ -2315,7 +2315,7 @@ bool Client::DecreaseByID(uint32 type, uint8 amt) { num += ins->GetCharges(); } - for (x = EQEmu::invbag::CURSOR_BAG_BEGIN; x <= EQEmu::invbag::CURSOR_BAG_END; ++x) { + for (x = EQ::invbag::CURSOR_BAG_BEGIN; x <= EQ::invbag::CURSOR_BAG_END; ++x) { if (num >= amt) break; @@ -2331,7 +2331,7 @@ bool Client::DecreaseByID(uint32 type, uint8 amt) { return false; - for (x = EQEmu::invslot::POSSESSIONS_BEGIN; x <= EQEmu::invslot::POSSESSIONS_END; ++x) { + for (x = EQ::invslot::POSSESSIONS_BEGIN; x <= EQ::invslot::POSSESSIONS_END; ++x) { if (amt < 1) break; if (((uint64)1 << x) & GetInv().GetLookup()->PossessionsBitmask == 0) @@ -2354,10 +2354,10 @@ bool Client::DecreaseByID(uint32 type, uint8 amt) { } } - for (x = EQEmu::invbag::GENERAL_BAGS_BEGIN; x <= EQEmu::invbag::GENERAL_BAGS_END; ++x) { + for (x = EQ::invbag::GENERAL_BAGS_BEGIN; x <= EQ::invbag::GENERAL_BAGS_END; ++x) { if (amt < 1) break; - if ((((uint64)1 << (EQEmu::invslot::GENERAL_BEGIN + ((x - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT))) & GetInv().GetLookup()->PossessionsBitmask) == 0) + if ((((uint64)1 << (EQ::invslot::GENERAL_BEGIN + ((x - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT))) & GetInv().GetLookup()->PossessionsBitmask) == 0) continue; TempItem = nullptr; @@ -2377,7 +2377,7 @@ bool Client::DecreaseByID(uint32 type, uint8 amt) { } } - for (x = EQEmu::invbag::CURSOR_BAG_BEGIN; x <= EQEmu::invbag::CURSOR_BAG_END; ++x) { + for (x = EQ::invbag::CURSOR_BAG_BEGIN; x <= EQ::invbag::CURSOR_BAG_END; ++x) { if (amt < 1) break; @@ -2448,7 +2448,7 @@ static uint32 GetDisenchantedBagID(uint8 bag_slots) } } -static bool CopyBagContents(EQEmu::ItemInstance* new_bag, const EQEmu::ItemInstance* old_bag) +static bool CopyBagContents(EQ::ItemInstance* new_bag, const EQ::ItemInstance* old_bag) { if (!new_bag || !old_bag) { return false; } if (new_bag->GetItem()->BagSlots < old_bag->GetItem()->BagSlots) { return false; } @@ -2473,7 +2473,7 @@ static bool CopyBagContents(EQEmu::ItemInstance* new_bag, const EQEmu::ItemInsta void Client::DisenchantSummonedBags(bool client_update) { - for (auto slot_id = EQEmu::invslot::GENERAL_BEGIN; slot_id <= EQEmu::invslot::GENERAL_END; ++slot_id) { + for (auto slot_id = EQ::invslot::GENERAL_BEGIN; slot_id <= EQ::invslot::GENERAL_END; ++slot_id) { if (((uint64)1 << slot_id) & GetInv().GetLookup()->PossessionsBitmask == 0) continue; // not useable this session - will be disenchanted once player logs in on client that doesn't exclude affected slots @@ -2497,8 +2497,8 @@ void Client::DisenchantSummonedBags(bool client_update) safe_delete(new_inst); } - for (auto slot_id = EQEmu::invslot::BANK_BEGIN; slot_id <= EQEmu::invslot::BANK_END; ++slot_id) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) + for (auto slot_id = EQ::invslot::BANK_BEGIN; slot_id <= EQ::invslot::BANK_END; ++slot_id) { + if ((slot_id - EQ::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) continue; auto inst = m_inv[slot_id]; @@ -2521,7 +2521,7 @@ void Client::DisenchantSummonedBags(bool client_update) safe_delete(new_inst); } - for (auto slot_id = EQEmu::invslot::SHARED_BANK_BEGIN; slot_id <= EQEmu::invslot::SHARED_BANK_END; ++slot_id) { + for (auto slot_id = EQ::invslot::SHARED_BANK_BEGIN; slot_id <= EQ::invslot::SHARED_BANK_END; ++slot_id) { auto inst = m_inv[slot_id]; if (!inst) { continue; } if (!IsSummonedBagID(inst->GetItem()->ID)) { continue; } @@ -2543,7 +2543,7 @@ void Client::DisenchantSummonedBags(bool client_update) } while (!m_inv.CursorEmpty()) { - auto inst = m_inv[EQEmu::invslot::slotCursor]; + auto inst = m_inv[EQ::invslot::slotCursor]; if (!inst) { break; } if (!IsSummonedBagID(inst->GetItem()->ID)) { break; } if (!inst->GetItem()->IsClassBag()) { break; } @@ -2557,14 +2557,14 @@ void Client::DisenchantSummonedBags(bool client_update) if (!new_inst) { break; } if (CopyBagContents(new_inst, inst)) { - LogInventory("Disenchant Summoned Bags: Replacing [{}] with [{}] in slot [{}]", inst->GetItem()->Name, new_inst->GetItem()->Name, EQEmu::invslot::slotCursor); - std::list local; + LogInventory("Disenchant Summoned Bags: Replacing [{}] with [{}] in slot [{}]", inst->GetItem()->Name, new_inst->GetItem()->Name, EQ::invslot::slotCursor); + std::list local; local.push_front(new_inst); - m_inv.PopItem(EQEmu::invslot::slotCursor); + m_inv.PopItem(EQ::invslot::slotCursor); safe_delete(inst); while (!m_inv.CursorEmpty()) { - auto limbo_inst = m_inv.PopItem(EQEmu::invslot::slotCursor); + auto limbo_inst = m_inv.PopItem(EQ::invslot::slotCursor); if (limbo_inst == nullptr) { continue; } local.push_back(limbo_inst); } @@ -2590,7 +2590,7 @@ void Client::DisenchantSummonedBags(bool client_update) void Client::RemoveNoRent(bool client_update) { - for (auto slot_id = EQEmu::invslot::EQUIPMENT_BEGIN; slot_id <= EQEmu::invslot::EQUIPMENT_END; ++slot_id) { + for (auto slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) { if (((uint64)1 << slot_id) & GetInv().GetLookup()->PossessionsBitmask == 0) continue; @@ -2601,7 +2601,7 @@ void Client::RemoveNoRent(bool client_update) } } - for (auto slot_id = EQEmu::invslot::GENERAL_BEGIN; slot_id <= EQEmu::invslot::GENERAL_END; ++slot_id) { + for (auto slot_id = EQ::invslot::GENERAL_BEGIN; slot_id <= EQ::invslot::GENERAL_END; ++slot_id) { if (((uint64)1 << slot_id) & GetInv().GetLookup()->PossessionsBitmask == 0) continue; @@ -2612,8 +2612,8 @@ void Client::RemoveNoRent(bool client_update) } } - for (auto slot_id = EQEmu::invbag::GENERAL_BAGS_BEGIN; slot_id <= EQEmu::invbag::CURSOR_BAG_END; ++slot_id) { - auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((slot_id - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); + for (auto slot_id = EQ::invbag::GENERAL_BAGS_BEGIN; slot_id <= EQ::invbag::CURSOR_BAG_END; ++slot_id) { + auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((slot_id - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); if ((((uint64)1 << temp_slot) & GetInv().GetLookup()->PossessionsBitmask) == 0) continue; @@ -2624,8 +2624,8 @@ void Client::RemoveNoRent(bool client_update) } } - for (auto slot_id = EQEmu::invslot::BANK_BEGIN; slot_id <= EQEmu::invslot::BANK_END; ++slot_id) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) + for (auto slot_id = EQ::invslot::BANK_BEGIN; slot_id <= EQ::invslot::BANK_END; ++slot_id) { + if ((slot_id - EQ::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) continue; auto inst = m_inv[slot_id]; @@ -2635,8 +2635,8 @@ void Client::RemoveNoRent(bool client_update) } } - for (auto slot_id = EQEmu::invbag::BANK_BAGS_BEGIN; slot_id <= EQEmu::invbag::BANK_BAGS_END; ++slot_id) { - auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; + for (auto slot_id = EQ::invbag::BANK_BAGS_BEGIN; slot_id <= EQ::invbag::BANK_BAGS_END; ++slot_id) { + auto temp_slot = (slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT; if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize.Bank) continue; @@ -2647,7 +2647,7 @@ void Client::RemoveNoRent(bool client_update) } } - for (auto slot_id = EQEmu::invslot::SHARED_BANK_BEGIN; slot_id <= EQEmu::invslot::SHARED_BANK_END; ++slot_id) { + for (auto slot_id = EQ::invslot::SHARED_BANK_BEGIN; slot_id <= EQ::invslot::SHARED_BANK_END; ++slot_id) { auto inst = m_inv[slot_id]; if(inst && !inst->GetItem()->NoRent) { LogInventory("NoRent Timer Lapse: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id); @@ -2655,7 +2655,7 @@ void Client::RemoveNoRent(bool client_update) } } - for (auto slot_id = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN; slot_id <= EQEmu::invbag::SHARED_BANK_BAGS_END; ++slot_id) { + for (auto slot_id = EQ::invbag::SHARED_BANK_BAGS_BEGIN; slot_id <= EQ::invbag::SHARED_BANK_BAGS_END; ++slot_id) { auto inst = m_inv[slot_id]; if(inst && !inst->GetItem()->NoRent) { LogInventory("NoRent Timer Lapse: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id); @@ -2664,10 +2664,10 @@ void Client::RemoveNoRent(bool client_update) } if (!m_inv.CursorEmpty()) { - std::list local; + std::list local; while (!m_inv.CursorEmpty()) { - auto inst = m_inv.PopItem(EQEmu::invslot::slotCursor); + auto inst = m_inv.PopItem(EQ::invslot::slotCursor); if (inst == nullptr) { continue; } local.push_back(inst); } @@ -2693,7 +2693,7 @@ void Client::RemoveNoRent(bool client_update) // Two new methods to alleviate perpetual login desyncs void Client::RemoveDuplicateLore(bool client_update) { - for (auto slot_id = EQEmu::invslot::EQUIPMENT_BEGIN; slot_id <= EQEmu::invslot::EQUIPMENT_END; ++slot_id) { + for (auto slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) { if (((uint64)1 << slot_id) & GetInv().GetLookup()->PossessionsBitmask == 0) continue; @@ -2709,7 +2709,7 @@ void Client::RemoveDuplicateLore(bool client_update) safe_delete(inst); } - for (auto slot_id = EQEmu::invslot::GENERAL_BEGIN; slot_id <= EQEmu::invslot::GENERAL_END; ++slot_id) { + for (auto slot_id = EQ::invslot::GENERAL_BEGIN; slot_id <= EQ::invslot::GENERAL_END; ++slot_id) { if (((uint64)1 << slot_id) & GetInv().GetLookup()->PossessionsBitmask == 0) continue; @@ -2725,8 +2725,8 @@ void Client::RemoveDuplicateLore(bool client_update) safe_delete(inst); } - for (auto slot_id = EQEmu::invbag::GENERAL_BAGS_BEGIN; slot_id <= EQEmu::invbag::CURSOR_BAG_END; ++slot_id) { - auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((slot_id - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); + for (auto slot_id = EQ::invbag::GENERAL_BAGS_BEGIN; slot_id <= EQ::invbag::CURSOR_BAG_END; ++slot_id) { + auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((slot_id - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); if ((((uint64)1 << temp_slot) & GetInv().GetLookup()->PossessionsBitmask) == 0) continue; @@ -2742,8 +2742,8 @@ void Client::RemoveDuplicateLore(bool client_update) safe_delete(inst); } - for (auto slot_id = EQEmu::invslot::BANK_BEGIN; slot_id <= EQEmu::invslot::BANK_END; ++slot_id) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) + for (auto slot_id = EQ::invslot::BANK_BEGIN; slot_id <= EQ::invslot::BANK_END; ++slot_id) { + if ((slot_id - EQ::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) continue; auto inst = m_inv.PopItem(slot_id); @@ -2758,8 +2758,8 @@ void Client::RemoveDuplicateLore(bool client_update) safe_delete(inst); } - for (auto slot_id = EQEmu::invbag::BANK_BAGS_BEGIN; slot_id <= EQEmu::invbag::BANK_BAGS_END; ++slot_id) { - auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; + for (auto slot_id = EQ::invbag::BANK_BAGS_BEGIN; slot_id <= EQ::invbag::BANK_BAGS_END; ++slot_id) { + auto temp_slot = (slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT; if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize.Bank) continue; @@ -2778,11 +2778,11 @@ void Client::RemoveDuplicateLore(bool client_update) // Shared Bank and Shared Bank Containers are not checked due to their allowing duplicate lore items if (!m_inv.CursorEmpty()) { - std::list local_1; - std::list local_2; + std::list local_1; + std::list local_2; while (!m_inv.CursorEmpty()) { - auto inst = m_inv.PopItem(EQEmu::invslot::slotCursor); + auto inst = m_inv.PopItem(EQ::invslot::slotCursor); if (inst == nullptr) { continue; } local_1.push_back(inst); } @@ -2823,10 +2823,10 @@ void Client::RemoveDuplicateLore(bool client_update) void Client::MoveSlotNotAllowed(bool client_update) { - for (auto slot_id = EQEmu::invslot::EQUIPMENT_BEGIN; slot_id <= EQEmu::invslot::EQUIPMENT_END; ++slot_id) { + for (auto slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) { if(m_inv[slot_id] && !m_inv[slot_id]->IsSlotAllowed(slot_id)) { auto inst = m_inv.PopItem(slot_id); - bool is_arrow = (inst->GetItem()->ItemType == EQEmu::item::ItemTypeArrow) ? true : false; + bool is_arrow = (inst->GetItem()->ItemType == EQ::item::ItemTypeArrow) ? true : false; int16 free_slot_id = m_inv.FindFreeSlot(inst->IsClassBag(), true, inst->GetItem()->Size, is_arrow); LogInventory("Slot Assignment Error: Moving [{}] from slot [{}] to [{}]", inst->GetItem()->Name, slot_id, free_slot_id); PutItemInInventory(free_slot_id, *inst, client_update); @@ -2836,13 +2836,13 @@ void Client::MoveSlotNotAllowed(bool client_update) } // added this check to move any client-based excluded slots - //for (auto slot_id = EQEmu::invslot::POSSESSIONS_BEGIN; slot_id <= EQEmu::invslot::POSSESSIONS_END; ++slot_id) { + //for (auto slot_id = EQ::invslot::POSSESSIONS_BEGIN; slot_id <= EQ::invslot::POSSESSIONS_END; ++slot_id) { // if (((uint64)1 << slot_id) & GetInv().GetLookup()->PossessionsBitmask != 0) // continue; // if (m_inv[slot_id]) { // this is currently dangerous for bag-based movements since limbo does not save bag slots // auto inst = m_inv.PopItem(slot_id); - // bool is_arrow = (inst->GetItem()->ItemType == EQEmu::item::ItemTypeArrow) ? true : false; + // bool is_arrow = (inst->GetItem()->ItemType == EQ::item::ItemTypeArrow) ? true : false; // int16 free_slot_id = m_inv.FindFreeSlot(inst->IsClassBag(), true, inst->GetItem()->Size, is_arrow); // LogInventory("Slot Assignment Error: Moving [{}] from slot [{}] to [{}]", inst->GetItem()->Name, slot_id, free_slot_id); // PutItemInInventory(free_slot_id, *inst, client_update); @@ -2860,13 +2860,13 @@ uint32 Client::GetEquippedItemFromTextureSlot(uint8 material_slot) const { int16 inventory_slot; - const EQEmu::ItemInstance *item; + const EQ::ItemInstance *item; - if (material_slot > EQEmu::textures::LastTexture) { + if (material_slot > EQ::textures::LastTexture) { return 0; } - inventory_slot = EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot); + inventory_slot = EQ::InventoryProfile::CalcSlotFromMaterial(material_slot); if (inventory_slot == INVALID_INDEX) { return 0; } @@ -2897,10 +2897,10 @@ int32 Client::GetEquipmentMaterial(uint8 material_slot) uint32 Client::GetEquipmentColor(uint8 material_slot) const { - if (material_slot > EQEmu::textures::LastTexture) + if (material_slot > EQ::textures::LastTexture) return 0; - const EQEmu::ItemData *item = database.GetItem(GetEquippedItemFromTextureSlot(material_slot)); + const EQ::ItemData *item = database.GetItem(GetEquippedItemFromTextureSlot(material_slot)); if(item != nullptr) return ((m_pp.item_tint.Slot[material_slot].UseTint) ? m_pp.item_tint.Slot[material_slot].Color : item->Color); @@ -2908,33 +2908,33 @@ uint32 Client::GetEquipmentColor(uint8 material_slot) const } // Send an item packet (including all subitems of the item) -void Client::SendItemPacket(int16 slot_id, const EQEmu::ItemInstance* inst, ItemPacketType packet_type) +void Client::SendItemPacket(int16 slot_id, const EQ::ItemInstance* inst, ItemPacketType packet_type) { if (!inst) return; if (packet_type != ItemPacketMerchant) { - if (slot_id <= EQEmu::invslot::POSSESSIONS_END && slot_id >= EQEmu::invslot::POSSESSIONS_BEGIN) { + if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) { if ((((uint64)1 << slot_id) & GetInv().GetLookup()->PossessionsBitmask) == 0) { LogError("Item not sent to merchant : slot [{}]", slot_id); return; } } - else if (slot_id <= EQEmu::invbag::GENERAL_BAGS_END && slot_id >= EQEmu::invbag::GENERAL_BAGS_BEGIN) { - auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((slot_id - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT); + else if (slot_id <= EQ::invbag::GENERAL_BAGS_END && slot_id >= EQ::invbag::GENERAL_BAGS_BEGIN) { + auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((slot_id - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT); if ((((uint64)1 << temp_slot) & GetInv().GetLookup()->PossessionsBitmask) == 0) { LogError("Item not sent to merchant2 : slot [{}]", slot_id); return; } } - else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) { + else if (slot_id <= EQ::invslot::BANK_END && slot_id >= EQ::invslot::BANK_BEGIN) { + if ((slot_id - EQ::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) { LogError("Item not sent to merchant3 : slot [{}]", slot_id); return; } } - else if (slot_id <= EQEmu::invbag::BANK_BAGS_END && slot_id >= EQEmu::invbag::BANK_BAGS_BEGIN) { - auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; + else if (slot_id <= EQ::invbag::BANK_BAGS_END && slot_id >= EQ::invbag::BANK_BAGS_BEGIN) { + auto temp_slot = (slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT; if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize.Bank) { LogError("Item not sent to merchant4 : slot [{}]", slot_id); return; @@ -2962,7 +2962,7 @@ void Client::SendItemPacket(int16 slot_id, const EQEmu::ItemInstance* inst, Item FastQueuePacket(&outapp); } -EQApplicationPacket* Client::ReturnItemPacket(int16 slot_id, const EQEmu::ItemInstance* inst, ItemPacketType packet_type) +EQApplicationPacket* Client::ReturnItemPacket(int16 slot_id, const EQ::ItemInstance* inst, ItemPacketType packet_type) { if (!inst) return nullptr; @@ -2992,13 +2992,13 @@ static int16 BandolierSlotToWeaponSlot(int BandolierSlot) switch (BandolierSlot) { case bandolierPrimary: - return EQEmu::invslot::slotPrimary; + return EQ::invslot::slotPrimary; case bandolierSecondary: - return EQEmu::invslot::slotSecondary; + return EQ::invslot::slotSecondary; case bandolierRange: - return EQEmu::invslot::slotRange; + return EQ::invslot::slotRange; default: - return EQEmu::invslot::slotAmmo; + return EQ::invslot::slotAmmo; } } @@ -3012,8 +3012,8 @@ void Client::CreateBandolier(const EQApplicationPacket *app) LogInventory("Char: [{}] Creating Bandolier Set [{}], Set Name: [{}]", GetName(), bs->Number, bs->Name); strcpy(m_pp.bandoliers[bs->Number].Name, bs->Name); - const EQEmu::ItemInstance* InvItem = nullptr; - const EQEmu::ItemData *BaseItem = nullptr; + const EQ::ItemInstance* InvItem = nullptr; + const EQ::ItemData *BaseItem = nullptr; int16 WeaponSlot = 0; database.DeleteCharacterBandolier(this->CharacterID(), bs->Number); @@ -3057,7 +3057,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) LogInventory("Char: [{}] activating set [{}]", GetName(), bss->Number); int16 slot = 0; int16 WeaponSlot = 0; - EQEmu::ItemInstance *BandolierItems[4]; // Temporary holding area for the weapons we pull out of their inventory + EQ::ItemInstance *BandolierItems[4]; // Temporary holding area for the weapons we pull out of their inventory // First we pull the items for this bandolier set out of their inventory, this makes space to put the // currently equipped items back. @@ -3073,13 +3073,13 @@ void Client::SetBandolier(const EQApplicationPacket *app) // removed 'invWhereCursor' argument from above and implemented slots 30, 331-340 checks here if (slot == INVALID_INDEX) { - if (m_inv.GetItem(EQEmu::invslot::slotCursor)) { - if (m_inv.GetItem(EQEmu::invslot::slotCursor)->GetItem()->ID == m_pp.bandoliers[bss->Number].Items[BandolierSlot].ID && - m_inv.GetItem(EQEmu::invslot::slotCursor)->GetCharges() >= 1) { // '> 0' the same, but this matches Inventory::_HasItem conditional check - slot = EQEmu::invslot::slotCursor; + if (m_inv.GetItem(EQ::invslot::slotCursor)) { + if (m_inv.GetItem(EQ::invslot::slotCursor)->GetItem()->ID == m_pp.bandoliers[bss->Number].Items[BandolierSlot].ID && + m_inv.GetItem(EQ::invslot::slotCursor)->GetCharges() >= 1) { // '> 0' the same, but this matches Inventory::_HasItem conditional check + slot = EQ::invslot::slotCursor; } - else if (m_inv.GetItem(EQEmu::invslot::slotCursor)->GetItem()->ItemClass == 1) { - for(int16 CursorBagSlot = EQEmu::invbag::CURSOR_BAG_BEGIN; CursorBagSlot <= EQEmu::invbag::CURSOR_BAG_END; CursorBagSlot++) { + else if (m_inv.GetItem(EQ::invslot::slotCursor)->GetItem()->ItemClass == 1) { + for(int16 CursorBagSlot = EQ::invbag::CURSOR_BAG_BEGIN; CursorBagSlot <= EQ::invbag::CURSOR_BAG_END; CursorBagSlot++) { if (m_inv.GetItem(CursorBagSlot)) { if (m_inv.GetItem(CursorBagSlot)->GetItem()->ID == m_pp.bandoliers[bss->Number].Items[BandolierSlot].ID && m_inv.GetItem(CursorBagSlot)->GetCharges() >= 1) { // ditto @@ -3122,7 +3122,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) BandolierItems[BandolierSlot] = 0; if (slot == INVALID_INDEX) { LogInventory("Character does not have required bandolier item for slot [{}]", WeaponSlot); - EQEmu::ItemInstance *InvItem = m_inv.PopItem(WeaponSlot); + EQ::ItemInstance *InvItem = m_inv.PopItem(WeaponSlot); if(InvItem) { // If there was an item in that weapon slot, put it in the inventory LogInventory("returning item [{}] in weapon slot [{}] to inventory", @@ -3156,7 +3156,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) // if the player has this item in their inventory, and it is not already where it needs to be if(BandolierItems[BandolierSlot]) { // Pull the item that we are going to replace - EQEmu::ItemInstance *InvItem = m_inv.PopItem(WeaponSlot); + EQ::ItemInstance *InvItem = m_inv.PopItem(WeaponSlot); // Put the item specified in the bandolier where it needs to be m_inv.PutItem(WeaponSlot, *BandolierItems[BandolierSlot]); @@ -3176,7 +3176,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) else { // This bandolier set has no item for this slot, so take whatever is in the weapon slot and // put it in the player's inventory. - EQEmu::ItemInstance *InvItem = m_inv.PopItem(WeaponSlot); + EQ::ItemInstance *InvItem = m_inv.PopItem(WeaponSlot); if(InvItem) { LogInventory("Bandolier has no item for slot [{}], returning item [{}] to inventory", WeaponSlot, InvItem->GetItem()->Name); // If there was an item in that weapon slot, put it in the inventory @@ -3194,7 +3194,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) CalcBonuses(); } -bool Client::MoveItemToInventory(EQEmu::ItemInstance *ItemToReturn, bool UpdateClient) { +bool Client::MoveItemToInventory(EQ::ItemInstance *ItemToReturn, bool UpdateClient) { // This is a support function for Client::SetBandolier, however it can be used anywhere it's functionality is required. // @@ -3225,11 +3225,11 @@ bool Client::MoveItemToInventory(EQEmu::ItemInstance *ItemToReturn, bool UpdateC // if(ItemToReturn->IsStackable()) { - for (int16 i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::slotCursor; i++) { // changed slot max to 30 from 29. client will stack into slot 30 (bags too) before moving. + for (int16 i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::slotCursor; i++) { // changed slot max to 30 from 29. client will stack into slot 30 (bags too) before moving. if (((uint64)1 << i) & GetInv().GetLookup()->PossessionsBitmask == 0) continue; - EQEmu::ItemInstance* InvItem = m_inv.GetItem(i); + EQ::ItemInstance* InvItem = m_inv.GetItem(i); if(InvItem && (InvItem->GetItem()->ID == ItemID) && (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { @@ -3253,12 +3253,12 @@ bool Client::MoveItemToInventory(EQEmu::ItemInstance *ItemToReturn, bool UpdateC // if (InvItem && InvItem->IsClassBag()) { - int16 BaseSlotID = EQEmu::InventoryProfile::CalcSlotId(i, EQEmu::invbag::SLOT_BEGIN); + int16 BaseSlotID = EQ::InventoryProfile::CalcSlotId(i, EQ::invbag::SLOT_BEGIN); uint8 BagSize=InvItem->GetItem()->BagSlots; uint8 BagSlot; - for (BagSlot = EQEmu::invbag::SLOT_BEGIN; BagSlot < BagSize; BagSlot++) { + for (BagSlot = EQ::invbag::SLOT_BEGIN; BagSlot < BagSize; BagSlot++) { InvItem = m_inv.GetItem(BaseSlotID + BagSlot); if (InvItem && (InvItem->GetItem()->ID == ItemID) && (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { @@ -3286,11 +3286,11 @@ bool Client::MoveItemToInventory(EQEmu::ItemInstance *ItemToReturn, bool UpdateC // We have tried stacking items, now just try and find an empty slot. - for (int16 i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::slotCursor; i++) { // changed slot max to 30 from 29. client will move into slot 30 (bags too) before pushing onto cursor. + for (int16 i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::slotCursor; i++) { // changed slot max to 30 from 29. client will move into slot 30 (bags too) before pushing onto cursor. if (((uint64)1 << i) & GetInv().GetLookup()->PossessionsBitmask == 0) continue; - EQEmu::ItemInstance* InvItem = m_inv.GetItem(i); + EQ::ItemInstance* InvItem = m_inv.GetItem(i); if (!InvItem) { // Found available slot in personal inventory @@ -3305,13 +3305,13 @@ bool Client::MoveItemToInventory(EQEmu::ItemInstance *ItemToReturn, bool UpdateC return true; } - if (InvItem->IsClassBag() && EQEmu::InventoryProfile::CanItemFitInContainer(ItemToReturn->GetItem(), InvItem->GetItem())) { + if (InvItem->IsClassBag() && EQ::InventoryProfile::CanItemFitInContainer(ItemToReturn->GetItem(), InvItem->GetItem())) { - int16 BaseSlotID = EQEmu::InventoryProfile::CalcSlotId(i, EQEmu::invbag::SLOT_BEGIN); + int16 BaseSlotID = EQ::InventoryProfile::CalcSlotId(i, EQ::invbag::SLOT_BEGIN); uint8 BagSize=InvItem->GetItem()->BagSlots; - for (uint8 BagSlot = EQEmu::invbag::SLOT_BEGIN; BagSlot < BagSize; BagSlot++) { + for (uint8 BagSlot = EQ::invbag::SLOT_BEGIN; BagSlot < BagSize; BagSlot++) { InvItem = m_inv.GetItem(BaseSlotID + BagSlot); @@ -3346,30 +3346,30 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool if (!requester) return false; - std::map instmap; + std::map instmap; // build reference map - for (int16 index = EQEmu::invslot::POSSESSIONS_BEGIN; index <= EQEmu::invslot::POSSESSIONS_END; ++index) { + for (int16 index = EQ::invslot::POSSESSIONS_BEGIN; index <= EQ::invslot::POSSESSIONS_END; ++index) { auto inst = m_inv[index]; if (inst == nullptr) { continue; } instmap[index] = inst; } - for (int16 index = EQEmu::invslot::TRIBUTE_BEGIN; index <= EQEmu::invslot::TRIBUTE_END; ++index) { + for (int16 index = EQ::invslot::TRIBUTE_BEGIN; index <= EQ::invslot::TRIBUTE_END; ++index) { auto inst = m_inv[index]; if (inst == nullptr) { continue; } instmap[index] = inst; } - for (int16 index = EQEmu::invslot::BANK_BEGIN; index <= EQEmu::invslot::BANK_END; ++index) { + for (int16 index = EQ::invslot::BANK_BEGIN; index <= EQ::invslot::BANK_END; ++index) { auto inst = m_inv[index]; if (inst == nullptr) { continue; } instmap[index] = inst; } - for (int16 index = EQEmu::invslot::SHARED_BANK_BEGIN; index <= EQEmu::invslot::SHARED_BANK_END; ++index) { + for (int16 index = EQ::invslot::SHARED_BANK_BEGIN; index <= EQ::invslot::SHARED_BANK_END; ++index) { auto inst = m_inv[index]; if (inst == nullptr) { continue; } instmap[index] = inst; } - for (int16 index = EQEmu::invslot::TRADE_BEGIN; index <= EQEmu::invslot::TRADE_END; ++index) { + for (int16 index = EQ::invslot::TRADE_BEGIN; index <= EQ::invslot::TRADE_END; ++index) { auto inst = m_inv[index]; if (inst == nullptr) { continue; } instmap[index] = inst; @@ -3377,10 +3377,10 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool auto tsobject = GetTradeskillObject(); if (tsobject != nullptr) { - for (int16 index = EQEmu::invslot::SLOT_BEGIN; index < EQEmu::invtype::WORLD_SIZE; ++index) { + for (int16 index = EQ::invslot::SLOT_BEGIN; index < EQ::invtype::WORLD_SIZE; ++index) { auto inst = tsobject->GetItem(index); if (inst == nullptr) { continue; } - instmap[EQEmu::invslot::WORLD_BEGIN + index] = inst; + instmap[EQ::invslot::WORLD_BEGIN + index] = inst; } } @@ -3436,7 +3436,7 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool return true; } -void Client::InterrogateInventory_(bool errorcheck, Client* requester, int16 head, int16 index, const EQEmu::ItemInstance* inst, const EQEmu::ItemInstance* parent, bool log, bool silent, bool &error, int depth) +void Client::InterrogateInventory_(bool errorcheck, Client* requester, int16 head, int16 index, const EQ::ItemInstance* inst, const EQ::ItemInstance* parent, bool log, bool silent, bool &error, int depth) { if (depth >= 10) { LogDebug("[CLIENT] Client::InterrogateInventory_() - Recursion count has exceeded the maximum allowable (You have a REALLY BIG PROBLEM!!)"); @@ -3449,7 +3449,7 @@ void Client::InterrogateInventory_(bool errorcheck, Client* requester, int16 hea } else { if (inst) { - for (int16 sub = EQEmu::invbag::SLOT_BEGIN; (sub <= EQEmu::invbag::SLOT_END) && (!error); ++sub) { // treat any EQEmu::ItemInstance as having the max internal slots available + for (int16 sub = EQ::invbag::SLOT_BEGIN; (sub <= EQ::invbag::SLOT_END) && (!error); ++sub) { // treat any EQ::ItemInstance as having the max internal slots available if (inst->GetItem(sub)) InterrogateInventory_(true, requester, head, sub, inst->GetItem(sub), inst, log, silent, error, depth + 1); } @@ -3479,7 +3479,7 @@ void Client::InterrogateInventory_(bool errorcheck, Client* requester, int16 hea } if (inst) { - for (int16 sub = EQEmu::invbag::SLOT_BEGIN; (sub <= EQEmu::invbag::SLOT_END); ++sub) { + for (int16 sub = EQ::invbag::SLOT_BEGIN; (sub <= EQ::invbag::SLOT_END); ++sub) { if (inst->GetItem(sub)) InterrogateInventory_(false, requester, head, sub, inst->GetItem(sub), inst, log, silent, error, depth + 1); } @@ -3489,14 +3489,14 @@ void Client::InterrogateInventory_(bool errorcheck, Client* requester, int16 hea return; } -bool Client::InterrogateInventory_error(int16 head, int16 index, const EQEmu::ItemInstance* inst, const EQEmu::ItemInstance* parent, int depth) +bool Client::InterrogateInventory_error(int16 head, int16 index, const EQ::ItemInstance* inst, const EQ::ItemInstance* parent, int depth) { // very basic error checking - can be elaborated upon if more in-depth testing is needed... if ( - (head >= EQEmu::invslot::EQUIPMENT_BEGIN && head <= EQEmu::invslot::EQUIPMENT_END) || - (head >= EQEmu::invslot::TRIBUTE_BEGIN && head <= EQEmu::invslot::TRIBUTE_END) || - (head >= EQEmu::invslot::WORLD_BEGIN && head <= EQEmu::invslot::WORLD_END) || + (head >= EQ::invslot::EQUIPMENT_BEGIN && head <= EQ::invslot::EQUIPMENT_END) || + (head >= EQ::invslot::TRIBUTE_BEGIN && head <= EQ::invslot::TRIBUTE_END) || + (head >= EQ::invslot::WORLD_BEGIN && head <= EQ::invslot::WORLD_END) || (head >= 8000 && head <= 8101)) { switch (depth) { @@ -3507,9 +3507,9 @@ bool Client::InterrogateInventory_error(int16 head, int16 index, const EQEmu::It case 1: // requirement: parent is common and inst is augment if ((!parent) || (!inst)) return true; - if (!parent->IsType(EQEmu::item::ItemClassCommon)) + if (!parent->IsType(EQ::item::ItemClassCommon)) return true; - if (index > EQEmu::invaug::SOCKET_END) + if (index > EQ::invaug::SOCKET_END) return true; break; default: // requirement: none (something bad happened...) @@ -3517,11 +3517,11 @@ bool Client::InterrogateInventory_error(int16 head, int16 index, const EQEmu::It } } else if ( - (head >= EQEmu::invslot::GENERAL_BEGIN && head <= EQEmu::invslot::GENERAL_END) || - (head == EQEmu::invslot::slotCursor) || - (head >= EQEmu::invslot::BANK_BEGIN && head <= EQEmu::invslot::BANK_END) || - (head >= EQEmu::invslot::SHARED_BANK_BEGIN && head <= EQEmu::invslot::SHARED_BANK_END) || - (head >= EQEmu::invslot::TRADE_BEGIN && head <= EQEmu::invslot::TRADE_END)) { + (head >= EQ::invslot::GENERAL_BEGIN && head <= EQ::invslot::GENERAL_END) || + (head == EQ::invslot::slotCursor) || + (head >= EQ::invslot::BANK_BEGIN && head <= EQ::invslot::BANK_END) || + (head >= EQ::invslot::SHARED_BANK_BEGIN && head <= EQ::invslot::SHARED_BANK_END) || + (head >= EQ::invslot::TRADE_BEGIN && head <= EQ::invslot::TRADE_END)) { switch (depth) { case 0: // requirement: inst is extant @@ -3531,28 +3531,28 @@ bool Client::InterrogateInventory_error(int16 head, int16 index, const EQEmu::It case 1: // requirement: parent is common and inst is augment ..or.. parent is container and inst is extant if ((!parent) || (!inst)) return true; - if (parent->IsType(EQEmu::item::ItemClassBag)) + if (parent->IsType(EQ::item::ItemClassBag)) break; if (parent->IsClassBook()) return true; if (parent->IsClassCommon()) { if (!(inst->GetItem()->AugType > 0)) return true; - if (index > EQEmu::invaug::SOCKET_END) + if (index > EQ::invaug::SOCKET_END) return true; } break; case 2: // requirement: parent is common and inst is augment if ((!parent) || (!inst)) return true; - if (parent->IsType(EQEmu::item::ItemClassBag)) + if (parent->IsType(EQ::item::ItemClassBag)) return true; if (parent->IsClassBook()) return true; if (parent->IsClassCommon()) { if (!(inst->GetItem()->AugType > 0)) return true; - if (index > EQEmu::invaug::SOCKET_END) + if (index > EQ::invaug::SOCKET_END) return true; } break; @@ -3567,40 +3567,40 @@ bool Client::InterrogateInventory_error(int16 head, int16 index, const EQEmu::It return false; } -void EQEmu::InventoryProfile::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value) { - EQEmu::ItemInstance *inst = GetItem(slot_id); +void EQ::InventoryProfile::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value) { + EQ::ItemInstance *inst = GetItem(slot_id); if(inst) { inst->SetCustomData(identifier, value); database.SaveInventory(character_id, inst, slot_id); } } -void EQEmu::InventoryProfile::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value) { - EQEmu::ItemInstance *inst = GetItem(slot_id); +void EQ::InventoryProfile::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value) { + EQ::ItemInstance *inst = GetItem(slot_id); if(inst) { inst->SetCustomData(identifier, value); database.SaveInventory(character_id, inst, slot_id); } } -void EQEmu::InventoryProfile::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value) { - EQEmu::ItemInstance *inst = GetItem(slot_id); +void EQ::InventoryProfile::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value) { + EQ::ItemInstance *inst = GetItem(slot_id); if(inst) { inst->SetCustomData(identifier, value); database.SaveInventory(character_id, inst, slot_id); } } -void EQEmu::InventoryProfile::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value) { - EQEmu::ItemInstance *inst = GetItem(slot_id); +void EQ::InventoryProfile::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value) { + EQ::ItemInstance *inst = GetItem(slot_id); if(inst) { inst->SetCustomData(identifier, value); database.SaveInventory(character_id, inst, slot_id); } } -std::string EQEmu::InventoryProfile::GetCustomItemData(int16 slot_id, std::string identifier) { - EQEmu::ItemInstance *inst = GetItem(slot_id); +std::string EQ::InventoryProfile::GetCustomItemData(int16 slot_id, std::string identifier) { + EQ::ItemInstance *inst = GetItem(slot_id); if(inst) { return inst->GetCustomData(identifier); } diff --git a/zone/loottables.cpp b/zone/loottables.cpp index 0e5ba8d60..dad24a32d 100644 --- a/zone/loottables.cpp +++ b/zone/loottables.cpp @@ -61,7 +61,7 @@ void ZoneDatabase::AddLootTableToNPC(NPC* npc,uint32 loottable_id, ItemList* ite uint32 cash = 0; if (!bGlobal) { - if(max_cash > 0 && lts->avgcoin > 0 && EQEmu::ValueWithin(lts->avgcoin, min_cash, max_cash)) { + if(max_cash > 0 && lts->avgcoin > 0 && EQ::ValueWithin(lts->avgcoin, min_cash, max_cash)) { float upper_chance = (float)(lts->avgcoin - min_cash) / (float)(max_cash - min_cash); float avg_cash_roll = (float)zone->random.Real(0.0, 1.0); @@ -128,7 +128,7 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml int charges = lds->Entries[i].multiplier; for(int j = 0; j < charges; ++j) { if(zone->random.Real(0.0, 100.0) <= lds->Entries[i].chance) { - const EQEmu::ItemData* dbitem = GetItem(lds->Entries[i].item_id); + const EQ::ItemData* dbitem = GetItem(lds->Entries[i].item_id); npc->AddLootDrop(dbitem, itemlist, lds->Entries[i].item_charges, lds->Entries[i].minlevel, lds->Entries[i].maxlevel, lds->Entries[i].equip_item > 0 ? true : false, false); } @@ -149,7 +149,7 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml float roll_t_min = 0.0f; bool active_item_list = false; for(uint32 i = 0; i < lds->NumEntries; ++i) { - const EQEmu::ItemData* db_item = GetItem(lds->Entries[i].item_id); + const EQ::ItemData* db_item = GetItem(lds->Entries[i].item_id); if(db_item) { roll_t += lds->Entries[i].chance; active_item_list = true; @@ -157,7 +157,7 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml } roll_t_min = roll_t; - roll_t = EQEmu::ClampLower(roll_t, 100.0f); + roll_t = EQ::ClampLower(roll_t, 100.0f); if(!active_item_list) { return; @@ -166,14 +166,14 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml for(int i = 0; i < mindrop; ++i) { float roll = (float)zone->random.Real(0.0, roll_t_min); for(uint32 j = 0; j < lds->NumEntries; ++j) { - const EQEmu::ItemData* db_item = GetItem(lds->Entries[j].item_id); + const EQ::ItemData* db_item = GetItem(lds->Entries[j].item_id); if(db_item) { if(roll < lds->Entries[j].chance) { npc->AddLootDrop(db_item, itemlist, lds->Entries[j].item_charges, lds->Entries[j].minlevel, lds->Entries[j].maxlevel, lds->Entries[j].equip_item > 0 ? true : false, false); int charges = (int)lds->Entries[i].multiplier; - charges = EQEmu::ClampLower(charges, 1); + charges = EQ::ClampLower(charges, 1); for(int k = 1; k < charges; ++k) { float c_roll = (float)zone->random.Real(0.0, 100.0); @@ -196,14 +196,14 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml for(int i = mindrop; i < droplimit; ++i) { float roll = (float)zone->random.Real(0.0, roll_t); for(uint32 j = 0; j < lds->NumEntries; ++j) { - const EQEmu::ItemData* db_item = GetItem(lds->Entries[j].item_id); + const EQ::ItemData* db_item = GetItem(lds->Entries[j].item_id); if(db_item) { if(roll < lds->Entries[j].chance) { npc->AddLootDrop(db_item, itemlist, lds->Entries[j].item_charges, lds->Entries[j].minlevel, lds->Entries[j].maxlevel, lds->Entries[j].equip_item > 0 ? true : false, false); int charges = (int)lds->Entries[i].multiplier; - charges = EQEmu::ClampLower(charges, 1); + charges = EQ::ClampLower(charges, 1); for(int k = 1; k < charges; ++k) { float c_roll = (float)zone->random.Real(0.0, 100.0); @@ -230,7 +230,7 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml } //if itemlist is null, just send wear changes -void NPC::AddLootDrop(const EQEmu::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) { +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) return; @@ -263,12 +263,12 @@ void NPC::AddLootDrop(const EQEmu::ItemData *item2, ItemList* itemlist, int16 ch item->attuned = 0; item->min_level = minlevel; item->max_level = maxlevel; - item->equip_slot = EQEmu::invslot::SLOT_INVALID; + item->equip_slot = EQ::invslot::SLOT_INVALID; if (equipit) { uint8 eslot = 0xFF; char newid[20]; - const EQEmu::ItemData* compitem = nullptr; + const EQ::ItemData* compitem = nullptr; bool found = false; // track if we found an empty slot we fit into int32 foundslot = -1; // for multi-slot items @@ -282,7 +282,7 @@ void NPC::AddLootDrop(const EQEmu::ItemData *item2, ItemList* itemlist, int16 ch // it is an improvement. if (!item2->NoPet) { - for (int i = EQEmu::invslot::EQUIPMENT_BEGIN; !found && i <= EQEmu::invslot::EQUIPMENT_END; i++) { + for (int i = EQ::invslot::EQUIPMENT_BEGIN; !found && i <= EQ::invslot::EQUIPMENT_END; i++) { uint32 slots = (1 << i); if (item2->Slots & slots) { if(equipment[i]) @@ -323,7 +323,7 @@ void NPC::AddLootDrop(const EQEmu::ItemData *item2, ItemList* itemlist, int16 ch // @merth: IDFile size has been increased, this needs to change uint16 emat; if(item2->Material <= 0 - || (item2->Slots & ((1 << EQEmu::invslot::slotPrimary) | (1 << EQEmu::invslot::slotSecondary)))) { + || (item2->Slots & ((1 << EQ::invslot::slotPrimary) | (1 << EQ::invslot::slotSecondary)))) { memset(newid, 0, sizeof(newid)); for(int i=0;i<7;i++){ if (!isalpha(item2->IDFile[i])){ @@ -337,11 +337,11 @@ void NPC::AddLootDrop(const EQEmu::ItemData *item2, ItemList* itemlist, int16 ch emat = item2->Material; } - if (foundslot == EQEmu::invslot::slotPrimary) { + if (foundslot == EQ::invslot::slotPrimary) { if (item2->Proc.Effect != 0) CastToMob()->AddProcToWeapon(item2->Proc.Effect, true); - eslot = EQEmu::textures::weaponPrimary; + eslot = EQ::textures::weaponPrimary; if (item2->Damage > 0) { SendAddPlayerState(PlayerState::PrimaryWeaponEquipped); if (!RuleB(Combat, ClassicNPCBackstab)) @@ -350,37 +350,37 @@ void NPC::AddLootDrop(const EQEmu::ItemData *item2, ItemList* itemlist, int16 ch if (item2->IsType2HWeapon()) SetTwoHanderEquipped(true); } - else if (foundslot == EQEmu::invslot::slotSecondary + else if (foundslot == EQ::invslot::slotSecondary && (GetOwner() != nullptr || (CanThisClassDualWield() && zone->random.Roll(NPC_DW_CHANCE)) || (item2->Damage==0)) && - (item2->IsType1HWeapon() || item2->ItemType == EQEmu::item::ItemTypeShield || item2->ItemType == EQEmu::item::ItemTypeLight)) + (item2->IsType1HWeapon() || item2->ItemType == EQ::item::ItemTypeShield || item2->ItemType == EQ::item::ItemTypeLight)) { if (item2->Proc.Effect!=0) CastToMob()->AddProcToWeapon(item2->Proc.Effect, true); - eslot = EQEmu::textures::weaponSecondary; + eslot = EQ::textures::weaponSecondary; if (item2->Damage > 0) SendAddPlayerState(PlayerState::SecondaryWeaponEquipped); } - else if (foundslot == EQEmu::invslot::slotHead) { - eslot = EQEmu::textures::armorHead; + else if (foundslot == EQ::invslot::slotHead) { + eslot = EQ::textures::armorHead; } - else if (foundslot == EQEmu::invslot::slotChest) { - eslot = EQEmu::textures::armorChest; + else if (foundslot == EQ::invslot::slotChest) { + eslot = EQ::textures::armorChest; } - else if (foundslot == EQEmu::invslot::slotArms) { - eslot = EQEmu::textures::armorArms; + else if (foundslot == EQ::invslot::slotArms) { + eslot = EQ::textures::armorArms; } - else if (foundslot == EQEmu::invslot::slotWrist1 || foundslot == EQEmu::invslot::slotWrist2) { - eslot = EQEmu::textures::armorWrist; + else if (foundslot == EQ::invslot::slotWrist1 || foundslot == EQ::invslot::slotWrist2) { + eslot = EQ::textures::armorWrist; } - else if (foundslot == EQEmu::invslot::slotHands) { - eslot = EQEmu::textures::armorHands; + else if (foundslot == EQ::invslot::slotHands) { + eslot = EQ::textures::armorHands; } - else if (foundslot == EQEmu::invslot::slotLegs) { - eslot = EQEmu::textures::armorLegs; + else if (foundslot == EQ::invslot::slotLegs) { + eslot = EQ::textures::armorLegs; } - else if (foundslot == EQEmu::invslot::slotFeet) { - eslot = EQEmu::textures::armorFeet; + else if (foundslot == EQ::invslot::slotFeet) { + eslot = EQ::textures::armorFeet; } /* @@ -428,14 +428,14 @@ void NPC::AddLootDrop(const EQEmu::ItemData *item2, ItemList* itemlist, int16 ch SendAppearancePacket(AT_Light, GetActiveLightType()); } -void NPC::AddItem(const EQEmu::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. AddLootDrop(item, &itemlist, charges, 1, 255, equipitem, equipitem); } void NPC::AddItem(uint32 itemid, uint16 charges, bool equipitem, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5, uint32 aug6) { //slot isnt needed, its determined from the item. - const EQEmu::ItemData * i = database.GetItem(itemid); + const EQ::ItemData * i = database.GetItem(itemid); if(i == nullptr) return; AddLootDrop(i, &itemlist, charges, 1, 255, equipitem, equipitem, aug1, aug2, aug3, aug4, aug5, aug6); diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp index e161c5e20..5898215f3 100644 --- a/zone/lua_client.cpp +++ b/zone/lua_client.cpp @@ -442,27 +442,27 @@ void Lua_Client::IncreaseLanguageSkill(int skill_id, int value) { int Lua_Client::GetRawSkill(int skill_id) { Lua_Safe_Call_Int(); - return self->GetRawSkill(static_cast(skill_id)); + return self->GetRawSkill(static_cast(skill_id)); } bool Lua_Client::HasSkill(int skill_id) { Lua_Safe_Call_Bool(); - return self->HasSkill(static_cast(skill_id)); + return self->HasSkill(static_cast(skill_id)); } bool Lua_Client::CanHaveSkill(int skill_id) { Lua_Safe_Call_Bool(); - return self->CanHaveSkill(static_cast(skill_id)); + return self->CanHaveSkill(static_cast(skill_id)); } void Lua_Client::SetSkill(int skill_id, int value) { Lua_Safe_Call_Void(); - self->SetSkill(static_cast(skill_id), value); + self->SetSkill(static_cast(skill_id), value); } void Lua_Client::AddSkill(int skill_id, int value) { Lua_Safe_Call_Void(); - self->AddSkill(static_cast(skill_id), value); + self->AddSkill(static_cast(skill_id), value); } void Lua_Client::CheckSpecializeIncrease(int spell_id) { @@ -472,12 +472,12 @@ void Lua_Client::CheckSpecializeIncrease(int spell_id) { void Lua_Client::CheckIncreaseSkill(int skill_id, Lua_Mob target) { Lua_Safe_Call_Void(); - self->CheckIncreaseSkill(static_cast(skill_id), target); + self->CheckIncreaseSkill(static_cast(skill_id), target); } void Lua_Client::CheckIncreaseSkill(int skill_id, Lua_Mob target, int chance_mod) { Lua_Safe_Call_Void(); - self->CheckIncreaseSkill(static_cast(skill_id), target, chance_mod); + self->CheckIncreaseSkill(static_cast(skill_id), target, chance_mod); } void Lua_Client::SetLanguageSkill(int language, int value) { @@ -487,7 +487,7 @@ void Lua_Client::SetLanguageSkill(int language, int value) { int Lua_Client::MaxSkill(int skill_id) { Lua_Safe_Call_Int(); - return self->MaxSkill(static_cast(skill_id)); + return self->MaxSkill(static_cast(skill_id)); } bool Lua_Client::IsMedding() { @@ -1267,13 +1267,13 @@ Lua_Raid Lua_Client::GetRaid() { bool Lua_Client::PutItemInInventory(int slot_id, Lua_ItemInst inst) { Lua_Safe_Call_Bool(); - EQEmu::ItemInstance *rinst = inst; + EQ::ItemInstance *rinst = inst; return self->PutItemInInventory(slot_id, *rinst, true); } bool Lua_Client::PushItemOnCursor(Lua_ItemInst inst) { Lua_Safe_Call_Bool(); - EQEmu::ItemInstance *rinst = inst; + EQ::ItemInstance *rinst = inst; return self->PushItemOnCursor(*rinst, true); } diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp index 6c3392f15..b7b9ca6bb 100644 --- a/zone/lua_general.cpp +++ b/zone/lua_general.cpp @@ -71,7 +71,7 @@ void load_encounter_with_data(std::string name, std::string info_str) { entity_list.AddEncounter(enc); lua_encounters[name] = enc; lua_encounters_loaded[name] = true; - std::vector info_ptrs; + std::vector info_ptrs; info_ptrs.push_back(&info_str); parse->EventEncounter(EVENT_ENCOUNTER_LOAD, name, "", 0, &info_ptrs); } @@ -133,7 +133,7 @@ void unload_encounter_with_data(std::string name, std::string info_str) { lua_encounters[name]->Depop(); lua_encounters.erase(name); lua_encounters_loaded.erase(name); - std::vector info_ptrs; + std::vector info_ptrs; info_ptrs.push_back(&info_str); parse->EventEncounter(EVENT_ENCOUNTER_UNLOAD, name, "", 0, &info_ptrs); } @@ -2047,95 +2047,95 @@ luabind::scope lua_register_slot() { return luabind::class_("Slot") .enum_("constants") [ - luabind::value("Charm", static_cast(EQEmu::invslot::slotCharm)), - luabind::value("Ear1", static_cast(EQEmu::invslot::slotEar1)), - luabind::value("Head", static_cast(EQEmu::invslot::slotHead)), - luabind::value("Face", static_cast(EQEmu::invslot::slotFace)), - luabind::value("Ear2", static_cast(EQEmu::invslot::slotEar2)), - luabind::value("Neck", static_cast(EQEmu::invslot::slotNeck)), - luabind::value("Shoulders", static_cast(EQEmu::invslot::slotShoulders)), - luabind::value("Arms", static_cast(EQEmu::invslot::slotArms)), - luabind::value("Back", static_cast(EQEmu::invslot::slotBack)), - luabind::value("Wrist1", static_cast(EQEmu::invslot::slotWrist1)), - luabind::value("Wrist2", static_cast(EQEmu::invslot::slotWrist2)), - luabind::value("Range", static_cast(EQEmu::invslot::slotRange)), - luabind::value("Hands", static_cast(EQEmu::invslot::slotHands)), - luabind::value("Primary", static_cast(EQEmu::invslot::slotPrimary)), - luabind::value("Secondary", static_cast(EQEmu::invslot::slotSecondary)), - luabind::value("Finger1", static_cast(EQEmu::invslot::slotFinger1)), - luabind::value("Finger2", static_cast(EQEmu::invslot::slotFinger2)), - luabind::value("Chest", static_cast(EQEmu::invslot::slotChest)), - luabind::value("Legs", static_cast(EQEmu::invslot::slotLegs)), - luabind::value("Feet", static_cast(EQEmu::invslot::slotFeet)), - luabind::value("Waist", static_cast(EQEmu::invslot::slotWaist)), - luabind::value("PowerSource", static_cast(EQEmu::invslot::slotPowerSource)), - luabind::value("Ammo", static_cast(EQEmu::invslot::slotAmmo)), - luabind::value("General1", static_cast(EQEmu::invslot::slotGeneral1)), - luabind::value("General2", static_cast(EQEmu::invslot::slotGeneral2)), - luabind::value("General3", static_cast(EQEmu::invslot::slotGeneral3)), - luabind::value("General4", static_cast(EQEmu::invslot::slotGeneral4)), - luabind::value("General5", static_cast(EQEmu::invslot::slotGeneral5)), - luabind::value("General6", static_cast(EQEmu::invslot::slotGeneral6)), - luabind::value("General7", static_cast(EQEmu::invslot::slotGeneral7)), - luabind::value("General8", static_cast(EQEmu::invslot::slotGeneral8)), - luabind::value("General9", static_cast(EQEmu::invslot::slotGeneral9)), - luabind::value("General10", static_cast(EQEmu::invslot::slotGeneral10)), - luabind::value("Cursor", static_cast(EQEmu::invslot::slotCursor)), - luabind::value("PossessionsBegin", static_cast(EQEmu::invslot::POSSESSIONS_BEGIN)), - luabind::value("PossessionsEnd", static_cast(EQEmu::invslot::POSSESSIONS_END)), - luabind::value("EquipmentBegin", static_cast(EQEmu::invslot::EQUIPMENT_BEGIN)), - luabind::value("EquipmentEnd", static_cast(EQEmu::invslot::EQUIPMENT_END)), - luabind::value("GeneralBegin", static_cast(EQEmu::invslot::GENERAL_BEGIN)), - luabind::value("GeneralEnd", static_cast(EQEmu::invslot::GENERAL_END)), - luabind::value("PossessionsBagsBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN)), - luabind::value("PossessionsBagsEnd", static_cast(EQEmu::invbag::CURSOR_BAG_END)), - luabind::value("GeneralBagsBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN)), - luabind::value("GeneralBagsEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_END)), - luabind::value("General1BagBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN)), - luabind::value("General1BagEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 9), - luabind::value("General2BagBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 10), - luabind::value("General2BagEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 19), - luabind::value("General3BagBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 20), - luabind::value("General3BagEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 29), - luabind::value("General4BagBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 30), - luabind::value("General4BagEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 39), - luabind::value("General5BagBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 40), - luabind::value("General5BagEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 49), - luabind::value("General6BagBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 50), - luabind::value("General6BagEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 59), - luabind::value("General7BagBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 60), - luabind::value("General7BagEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 69), - luabind::value("General8BagBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 70), - luabind::value("General8BagEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 79), - luabind::value("General9BagBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 80), - luabind::value("General9BagEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 89), - luabind::value("General10BagBegin", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 90), - luabind::value("General10BagEnd", static_cast(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 99), - luabind::value("CursorBagBegin", static_cast(EQEmu::invbag::CURSOR_BAG_BEGIN)), - luabind::value("CursorBagEnd", static_cast(EQEmu::invbag::CURSOR_BAG_END)), - luabind::value("Tradeskill", static_cast(EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE)), - luabind::value("Augment", static_cast(EQEmu::invslot::SLOT_AUGMENT_GENERIC_RETURN)), - luabind::value("BankBegin", static_cast(EQEmu::invslot::BANK_BEGIN)), - luabind::value("BankEnd", static_cast(EQEmu::invslot::BANK_END)), - luabind::value("BankBagsBegin", static_cast(EQEmu::invbag::BANK_BAGS_BEGIN)), - luabind::value("BankBagsEnd", static_cast(EQEmu::invbag::BANK_BAGS_END)), - luabind::value("SharedBankBegin", static_cast(EQEmu::invslot::SHARED_BANK_BEGIN)), - luabind::value("SharedBankEnd", static_cast(EQEmu::invslot::SHARED_BANK_END)), - luabind::value("SharedBankBagsBegin", static_cast(EQEmu::invbag::SHARED_BANK_BAGS_BEGIN)), - luabind::value("SharedBankBagsEnd", static_cast(EQEmu::invbag::SHARED_BANK_BAGS_END)), - luabind::value("BagSlotBegin", static_cast(EQEmu::invbag::SLOT_BEGIN)), - luabind::value("BagSlotEnd", static_cast(EQEmu::invbag::SLOT_END)), - luabind::value("AugSocketBegin", static_cast(EQEmu::invaug::SOCKET_BEGIN)), - luabind::value("AugSocketEnd", static_cast(EQEmu::invaug::SOCKET_END)), - luabind::value("Invalid", static_cast(EQEmu::invslot::SLOT_INVALID)), + luabind::value("Charm", static_cast(EQ::invslot::slotCharm)), + luabind::value("Ear1", static_cast(EQ::invslot::slotEar1)), + luabind::value("Head", static_cast(EQ::invslot::slotHead)), + luabind::value("Face", static_cast(EQ::invslot::slotFace)), + luabind::value("Ear2", static_cast(EQ::invslot::slotEar2)), + luabind::value("Neck", static_cast(EQ::invslot::slotNeck)), + luabind::value("Shoulders", static_cast(EQ::invslot::slotShoulders)), + luabind::value("Arms", static_cast(EQ::invslot::slotArms)), + luabind::value("Back", static_cast(EQ::invslot::slotBack)), + luabind::value("Wrist1", static_cast(EQ::invslot::slotWrist1)), + luabind::value("Wrist2", static_cast(EQ::invslot::slotWrist2)), + luabind::value("Range", static_cast(EQ::invslot::slotRange)), + luabind::value("Hands", static_cast(EQ::invslot::slotHands)), + luabind::value("Primary", static_cast(EQ::invslot::slotPrimary)), + luabind::value("Secondary", static_cast(EQ::invslot::slotSecondary)), + luabind::value("Finger1", static_cast(EQ::invslot::slotFinger1)), + luabind::value("Finger2", static_cast(EQ::invslot::slotFinger2)), + luabind::value("Chest", static_cast(EQ::invslot::slotChest)), + luabind::value("Legs", static_cast(EQ::invslot::slotLegs)), + luabind::value("Feet", static_cast(EQ::invslot::slotFeet)), + luabind::value("Waist", static_cast(EQ::invslot::slotWaist)), + luabind::value("PowerSource", static_cast(EQ::invslot::slotPowerSource)), + luabind::value("Ammo", static_cast(EQ::invslot::slotAmmo)), + luabind::value("General1", static_cast(EQ::invslot::slotGeneral1)), + luabind::value("General2", static_cast(EQ::invslot::slotGeneral2)), + luabind::value("General3", static_cast(EQ::invslot::slotGeneral3)), + luabind::value("General4", static_cast(EQ::invslot::slotGeneral4)), + luabind::value("General5", static_cast(EQ::invslot::slotGeneral5)), + luabind::value("General6", static_cast(EQ::invslot::slotGeneral6)), + luabind::value("General7", static_cast(EQ::invslot::slotGeneral7)), + luabind::value("General8", static_cast(EQ::invslot::slotGeneral8)), + luabind::value("General9", static_cast(EQ::invslot::slotGeneral9)), + luabind::value("General10", static_cast(EQ::invslot::slotGeneral10)), + luabind::value("Cursor", static_cast(EQ::invslot::slotCursor)), + luabind::value("PossessionsBegin", static_cast(EQ::invslot::POSSESSIONS_BEGIN)), + luabind::value("PossessionsEnd", static_cast(EQ::invslot::POSSESSIONS_END)), + luabind::value("EquipmentBegin", static_cast(EQ::invslot::EQUIPMENT_BEGIN)), + luabind::value("EquipmentEnd", static_cast(EQ::invslot::EQUIPMENT_END)), + luabind::value("GeneralBegin", static_cast(EQ::invslot::GENERAL_BEGIN)), + luabind::value("GeneralEnd", static_cast(EQ::invslot::GENERAL_END)), + luabind::value("PossessionsBagsBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN)), + luabind::value("PossessionsBagsEnd", static_cast(EQ::invbag::CURSOR_BAG_END)), + luabind::value("GeneralBagsBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN)), + luabind::value("GeneralBagsEnd", static_cast(EQ::invbag::GENERAL_BAGS_END)), + luabind::value("General1BagBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN)), + luabind::value("General1BagEnd", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 9), + luabind::value("General2BagBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 10), + luabind::value("General2BagEnd", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 19), + luabind::value("General3BagBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 20), + luabind::value("General3BagEnd", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 29), + luabind::value("General4BagBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 30), + luabind::value("General4BagEnd", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 39), + luabind::value("General5BagBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 40), + luabind::value("General5BagEnd", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 49), + luabind::value("General6BagBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 50), + luabind::value("General6BagEnd", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 59), + luabind::value("General7BagBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 60), + luabind::value("General7BagEnd", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 69), + luabind::value("General8BagBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 70), + luabind::value("General8BagEnd", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 79), + luabind::value("General9BagBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 80), + luabind::value("General9BagEnd", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 89), + luabind::value("General10BagBegin", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 90), + luabind::value("General10BagEnd", static_cast(EQ::invbag::GENERAL_BAGS_BEGIN) + 99), + luabind::value("CursorBagBegin", static_cast(EQ::invbag::CURSOR_BAG_BEGIN)), + luabind::value("CursorBagEnd", static_cast(EQ::invbag::CURSOR_BAG_END)), + luabind::value("Tradeskill", static_cast(EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE)), + luabind::value("Augment", static_cast(EQ::invslot::SLOT_AUGMENT_GENERIC_RETURN)), + luabind::value("BankBegin", static_cast(EQ::invslot::BANK_BEGIN)), + luabind::value("BankEnd", static_cast(EQ::invslot::BANK_END)), + luabind::value("BankBagsBegin", static_cast(EQ::invbag::BANK_BAGS_BEGIN)), + luabind::value("BankBagsEnd", static_cast(EQ::invbag::BANK_BAGS_END)), + luabind::value("SharedBankBegin", static_cast(EQ::invslot::SHARED_BANK_BEGIN)), + luabind::value("SharedBankEnd", static_cast(EQ::invslot::SHARED_BANK_END)), + luabind::value("SharedBankBagsBegin", static_cast(EQ::invbag::SHARED_BANK_BAGS_BEGIN)), + luabind::value("SharedBankBagsEnd", static_cast(EQ::invbag::SHARED_BANK_BAGS_END)), + luabind::value("BagSlotBegin", static_cast(EQ::invbag::SLOT_BEGIN)), + luabind::value("BagSlotEnd", static_cast(EQ::invbag::SLOT_END)), + luabind::value("AugSocketBegin", static_cast(EQ::invaug::SOCKET_BEGIN)), + luabind::value("AugSocketEnd", static_cast(EQ::invaug::SOCKET_END)), + luabind::value("Invalid", static_cast(EQ::invslot::SLOT_INVALID)), - luabind::value("Shoulder", static_cast(EQEmu::invslot::slotShoulders)), // deprecated - luabind::value("Bracer1", static_cast(EQEmu::invslot::slotWrist1)), // deprecated - luabind::value("Bracer2", static_cast(EQEmu::invslot::slotWrist2)), // deprecated - luabind::value("Ring1", static_cast(EQEmu::invslot::slotFinger1)), // deprecated - luabind::value("Ring2", static_cast(EQEmu::invslot::slotFinger2)), // deprecated - luabind::value("PersonalBegin", static_cast(EQEmu::invslot::GENERAL_BEGIN)), // deprecated - luabind::value("PersonalEnd", static_cast(EQEmu::invslot::GENERAL_END)), // deprecated + luabind::value("Shoulder", static_cast(EQ::invslot::slotShoulders)), // deprecated + luabind::value("Bracer1", static_cast(EQ::invslot::slotWrist1)), // deprecated + luabind::value("Bracer2", static_cast(EQ::invslot::slotWrist2)), // deprecated + luabind::value("Ring1", static_cast(EQ::invslot::slotFinger1)), // deprecated + luabind::value("Ring2", static_cast(EQ::invslot::slotFinger2)), // deprecated + luabind::value("PersonalBegin", static_cast(EQ::invslot::GENERAL_BEGIN)), // deprecated + luabind::value("PersonalEnd", static_cast(EQ::invslot::GENERAL_END)), // deprecated luabind::value("CursorEnd", 0xFFFE) // deprecated (not in use..and never valid vis-a-vis client behavior) ]; } @@ -2144,20 +2144,20 @@ luabind::scope lua_register_material() { return luabind::class_("Material") .enum_("constants") [ - luabind::value("Head", static_cast(EQEmu::textures::armorHead)), - luabind::value("Chest", static_cast(EQEmu::textures::armorChest)), - luabind::value("Arms", static_cast(EQEmu::textures::armorArms)), - luabind::value("Wrist", static_cast(EQEmu::textures::armorWrist)), - luabind::value("Hands", static_cast(EQEmu::textures::armorHands)), - luabind::value("Legs", static_cast(EQEmu::textures::armorLegs)), - luabind::value("Feet", static_cast(EQEmu::textures::armorFeet)), - luabind::value("Primary", static_cast(EQEmu::textures::weaponPrimary)), - luabind::value("Secondary", static_cast(EQEmu::textures::weaponSecondary)), - luabind::value("Count", static_cast(EQEmu::textures::materialCount)), - luabind::value("Invalid", static_cast(EQEmu::textures::materialInvalid)), + luabind::value("Head", static_cast(EQ::textures::armorHead)), + luabind::value("Chest", static_cast(EQ::textures::armorChest)), + luabind::value("Arms", static_cast(EQ::textures::armorArms)), + luabind::value("Wrist", static_cast(EQ::textures::armorWrist)), + luabind::value("Hands", static_cast(EQ::textures::armorHands)), + luabind::value("Legs", static_cast(EQ::textures::armorLegs)), + luabind::value("Feet", static_cast(EQ::textures::armorFeet)), + luabind::value("Primary", static_cast(EQ::textures::weaponPrimary)), + luabind::value("Secondary", static_cast(EQ::textures::weaponSecondary)), + luabind::value("Count", static_cast(EQ::textures::materialCount)), + luabind::value("Invalid", static_cast(EQ::textures::materialInvalid)), - luabind::value("Bracer", static_cast(EQEmu::textures::armorWrist)), // deprecated - luabind::value("Max", static_cast(EQEmu::textures::materialCount)) // deprecated + luabind::value("Bracer", static_cast(EQ::textures::armorWrist)), // deprecated + luabind::value("Max", static_cast(EQ::textures::materialCount)) // deprecated ]; } @@ -2165,14 +2165,14 @@ luabind::scope lua_register_client_version() { return luabind::class_("ClientVersion") .enum_("constants") [ - luabind::value("Unknown", static_cast(EQEmu::versions::ClientVersion::Unknown)), - luabind::value("Titanium", static_cast(EQEmu::versions::ClientVersion::Titanium)), - luabind::value("SoF", static_cast(EQEmu::versions::ClientVersion::SoF)), - luabind::value("SoD", static_cast(EQEmu::versions::ClientVersion::SoD)), - luabind::value("Underfoot", static_cast(EQEmu::versions::ClientVersion::UF)), // deprecated - luabind::value("UF", static_cast(EQEmu::versions::ClientVersion::UF)), - luabind::value("RoF", static_cast(EQEmu::versions::ClientVersion::RoF)), - luabind::value("RoF2", static_cast(EQEmu::versions::ClientVersion::RoF2)) + luabind::value("Unknown", static_cast(EQ::versions::ClientVersion::Unknown)), + luabind::value("Titanium", static_cast(EQ::versions::ClientVersion::Titanium)), + luabind::value("SoF", static_cast(EQ::versions::ClientVersion::SoF)), + luabind::value("SoD", static_cast(EQ::versions::ClientVersion::SoD)), + luabind::value("Underfoot", static_cast(EQ::versions::ClientVersion::UF)), // deprecated + luabind::value("UF", static_cast(EQ::versions::ClientVersion::UF)), + luabind::value("RoF", static_cast(EQ::versions::ClientVersion::RoF)), + luabind::value("RoF2", static_cast(EQ::versions::ClientVersion::RoF2)) ]; } @@ -2245,86 +2245,86 @@ luabind::scope lua_register_skills() { return luabind::class_("Skill") .enum_("constants") [ - luabind::value("1HBlunt", EQEmu::skills::Skill1HBlunt), - luabind::value("1HSlashing", EQEmu::skills::Skill1HSlashing), - luabind::value("2HBlunt", EQEmu::skills::Skill2HBlunt), - luabind::value("2HSlashing", EQEmu::skills::Skill2HSlashing), - luabind::value("Abjuration", EQEmu::skills::SkillAbjuration), - luabind::value("Alteration", EQEmu::skills::SkillAlteration), - luabind::value("ApplyPoison", EQEmu::skills::SkillApplyPoison), - luabind::value("Archery", EQEmu::skills::SkillArchery), - luabind::value("Backstab", EQEmu::skills::SkillBackstab), - luabind::value("BindWound", EQEmu::skills::SkillBindWound), - luabind::value("Bash", EQEmu::skills::SkillBash), - luabind::value("Block", EQEmu::skills::SkillBlock), - luabind::value("BrassInstruments", EQEmu::skills::SkillBrassInstruments), - luabind::value("Channeling", EQEmu::skills::SkillChanneling), - luabind::value("Conjuration", EQEmu::skills::SkillConjuration), - luabind::value("Defense", EQEmu::skills::SkillDefense), - luabind::value("Disarm", EQEmu::skills::SkillDisarm), - luabind::value("DisarmTraps", EQEmu::skills::SkillDisarmTraps), - luabind::value("Divination", EQEmu::skills::SkillDivination), - luabind::value("Dodge", EQEmu::skills::SkillDodge), - luabind::value("DoubleAttack", EQEmu::skills::SkillDoubleAttack), - luabind::value("DragonPunch", EQEmu::skills::SkillDragonPunch), - luabind::value("TailRake", EQEmu::skills::SkillTailRake), - luabind::value("DualWield", EQEmu::skills::SkillDualWield), - luabind::value("EagleStrike", EQEmu::skills::SkillEagleStrike), - luabind::value("Evocation", EQEmu::skills::SkillEvocation), - luabind::value("FeignDeath", EQEmu::skills::SkillFeignDeath), - luabind::value("FlyingKick", EQEmu::skills::SkillFlyingKick), - luabind::value("Forage", EQEmu::skills::SkillForage), - luabind::value("HandtoHand", EQEmu::skills::SkillHandtoHand), - luabind::value("Hide", EQEmu::skills::SkillHide), - luabind::value("Kick", EQEmu::skills::SkillKick), - luabind::value("Meditate", EQEmu::skills::SkillMeditate), - luabind::value("Mend", EQEmu::skills::SkillMend), - luabind::value("Offense", EQEmu::skills::SkillOffense), - luabind::value("Parry", EQEmu::skills::SkillParry), - luabind::value("PickLock", EQEmu::skills::SkillPickLock), - luabind::value("1HPiercing", EQEmu::skills::Skill1HPiercing), - luabind::value("Riposte", EQEmu::skills::SkillRiposte), - luabind::value("RoundKick", EQEmu::skills::SkillRoundKick), - luabind::value("SafeFall", EQEmu::skills::SkillSafeFall), - luabind::value("SenseHeading", EQEmu::skills::SkillSenseHeading), - luabind::value("Singing", EQEmu::skills::SkillSinging), - luabind::value("Sneak", EQEmu::skills::SkillSneak), - luabind::value("SpecializeAbjure", EQEmu::skills::SkillSpecializeAbjure), - luabind::value("SpecializeAlteration", EQEmu::skills::SkillSpecializeAlteration), - luabind::value("SpecializeConjuration", EQEmu::skills::SkillSpecializeConjuration), - luabind::value("SpecializeDivination", EQEmu::skills::SkillSpecializeDivination), - luabind::value("SpecializeEvocation", EQEmu::skills::SkillSpecializeEvocation), - luabind::value("PickPockets", EQEmu::skills::SkillPickPockets), - luabind::value("StringedInstruments", EQEmu::skills::SkillStringedInstruments), - luabind::value("Swimming", EQEmu::skills::SkillSwimming), - luabind::value("Throwing", EQEmu::skills::SkillThrowing), - luabind::value("TigerClaw", EQEmu::skills::SkillTigerClaw), - luabind::value("Tracking", EQEmu::skills::SkillTracking), - luabind::value("WindInstruments", EQEmu::skills::SkillWindInstruments), - luabind::value("Fishing", EQEmu::skills::SkillFishing), - luabind::value("MakePoison", EQEmu::skills::SkillMakePoison), - luabind::value("Tinkering", EQEmu::skills::SkillTinkering), - luabind::value("Research", EQEmu::skills::SkillResearch), - luabind::value("Alchemy", EQEmu::skills::SkillAlchemy), - luabind::value("Baking", EQEmu::skills::SkillBaking), - luabind::value("Tailoring", EQEmu::skills::SkillTailoring), - luabind::value("SenseTraps", EQEmu::skills::SkillSenseTraps), - luabind::value("Blacksmithing", EQEmu::skills::SkillBlacksmithing), - luabind::value("Fletching", EQEmu::skills::SkillFletching), - luabind::value("Brewing", EQEmu::skills::SkillBrewing), - luabind::value("AlcoholTolerance", EQEmu::skills::SkillAlcoholTolerance), - luabind::value("Begging", EQEmu::skills::SkillBegging), - luabind::value("JewelryMaking", EQEmu::skills::SkillJewelryMaking), - luabind::value("Pottery", EQEmu::skills::SkillPottery), - luabind::value("PercussionInstruments", EQEmu::skills::SkillPercussionInstruments), - luabind::value("Intimidation", EQEmu::skills::SkillIntimidation), - luabind::value("Berserking", EQEmu::skills::SkillBerserking), - luabind::value("Taunt", EQEmu::skills::SkillTaunt), - luabind::value("Frenzy", EQEmu::skills::SkillFrenzy), - luabind::value("RemoveTraps", EQEmu::skills::SkillRemoveTraps), - luabind::value("TripleAttack", EQEmu::skills::SkillTripleAttack), - luabind::value("2HPiercing", EQEmu::skills::Skill2HPiercing), - luabind::value("HIGHEST_SKILL", EQEmu::skills::HIGHEST_SKILL) + luabind::value("1HBlunt", EQ::skills::Skill1HBlunt), + luabind::value("1HSlashing", EQ::skills::Skill1HSlashing), + luabind::value("2HBlunt", EQ::skills::Skill2HBlunt), + luabind::value("2HSlashing", EQ::skills::Skill2HSlashing), + luabind::value("Abjuration", EQ::skills::SkillAbjuration), + luabind::value("Alteration", EQ::skills::SkillAlteration), + luabind::value("ApplyPoison", EQ::skills::SkillApplyPoison), + luabind::value("Archery", EQ::skills::SkillArchery), + luabind::value("Backstab", EQ::skills::SkillBackstab), + luabind::value("BindWound", EQ::skills::SkillBindWound), + luabind::value("Bash", EQ::skills::SkillBash), + luabind::value("Block", EQ::skills::SkillBlock), + luabind::value("BrassInstruments", EQ::skills::SkillBrassInstruments), + luabind::value("Channeling", EQ::skills::SkillChanneling), + luabind::value("Conjuration", EQ::skills::SkillConjuration), + luabind::value("Defense", EQ::skills::SkillDefense), + luabind::value("Disarm", EQ::skills::SkillDisarm), + luabind::value("DisarmTraps", EQ::skills::SkillDisarmTraps), + luabind::value("Divination", EQ::skills::SkillDivination), + luabind::value("Dodge", EQ::skills::SkillDodge), + luabind::value("DoubleAttack", EQ::skills::SkillDoubleAttack), + luabind::value("DragonPunch", EQ::skills::SkillDragonPunch), + luabind::value("TailRake", EQ::skills::SkillTailRake), + luabind::value("DualWield", EQ::skills::SkillDualWield), + luabind::value("EagleStrike", EQ::skills::SkillEagleStrike), + luabind::value("Evocation", EQ::skills::SkillEvocation), + luabind::value("FeignDeath", EQ::skills::SkillFeignDeath), + luabind::value("FlyingKick", EQ::skills::SkillFlyingKick), + luabind::value("Forage", EQ::skills::SkillForage), + luabind::value("HandtoHand", EQ::skills::SkillHandtoHand), + luabind::value("Hide", EQ::skills::SkillHide), + luabind::value("Kick", EQ::skills::SkillKick), + luabind::value("Meditate", EQ::skills::SkillMeditate), + luabind::value("Mend", EQ::skills::SkillMend), + luabind::value("Offense", EQ::skills::SkillOffense), + luabind::value("Parry", EQ::skills::SkillParry), + luabind::value("PickLock", EQ::skills::SkillPickLock), + luabind::value("1HPiercing", EQ::skills::Skill1HPiercing), + luabind::value("Riposte", EQ::skills::SkillRiposte), + luabind::value("RoundKick", EQ::skills::SkillRoundKick), + luabind::value("SafeFall", EQ::skills::SkillSafeFall), + luabind::value("SenseHeading", EQ::skills::SkillSenseHeading), + luabind::value("Singing", EQ::skills::SkillSinging), + luabind::value("Sneak", EQ::skills::SkillSneak), + luabind::value("SpecializeAbjure", EQ::skills::SkillSpecializeAbjure), + luabind::value("SpecializeAlteration", EQ::skills::SkillSpecializeAlteration), + luabind::value("SpecializeConjuration", EQ::skills::SkillSpecializeConjuration), + luabind::value("SpecializeDivination", EQ::skills::SkillSpecializeDivination), + luabind::value("SpecializeEvocation", EQ::skills::SkillSpecializeEvocation), + luabind::value("PickPockets", EQ::skills::SkillPickPockets), + luabind::value("StringedInstruments", EQ::skills::SkillStringedInstruments), + luabind::value("Swimming", EQ::skills::SkillSwimming), + luabind::value("Throwing", EQ::skills::SkillThrowing), + luabind::value("TigerClaw", EQ::skills::SkillTigerClaw), + luabind::value("Tracking", EQ::skills::SkillTracking), + luabind::value("WindInstruments", EQ::skills::SkillWindInstruments), + luabind::value("Fishing", EQ::skills::SkillFishing), + luabind::value("MakePoison", EQ::skills::SkillMakePoison), + luabind::value("Tinkering", EQ::skills::SkillTinkering), + luabind::value("Research", EQ::skills::SkillResearch), + luabind::value("Alchemy", EQ::skills::SkillAlchemy), + luabind::value("Baking", EQ::skills::SkillBaking), + luabind::value("Tailoring", EQ::skills::SkillTailoring), + luabind::value("SenseTraps", EQ::skills::SkillSenseTraps), + luabind::value("Blacksmithing", EQ::skills::SkillBlacksmithing), + luabind::value("Fletching", EQ::skills::SkillFletching), + luabind::value("Brewing", EQ::skills::SkillBrewing), + luabind::value("AlcoholTolerance", EQ::skills::SkillAlcoholTolerance), + luabind::value("Begging", EQ::skills::SkillBegging), + luabind::value("JewelryMaking", EQ::skills::SkillJewelryMaking), + luabind::value("Pottery", EQ::skills::SkillPottery), + luabind::value("PercussionInstruments", EQ::skills::SkillPercussionInstruments), + luabind::value("Intimidation", EQ::skills::SkillIntimidation), + luabind::value("Berserking", EQ::skills::SkillBerserking), + luabind::value("Taunt", EQ::skills::SkillTaunt), + luabind::value("Frenzy", EQ::skills::SkillFrenzy), + luabind::value("RemoveTraps", EQ::skills::SkillRemoveTraps), + luabind::value("TripleAttack", EQ::skills::SkillTripleAttack), + luabind::value("2HPiercing", EQ::skills::Skill2HPiercing), + luabind::value("HIGHEST_SKILL", EQ::skills::HIGHEST_SKILL) ]; } diff --git a/zone/lua_inventory.cpp b/zone/lua_inventory.cpp index dd4e1cc6b..1eba6e6f6 100644 --- a/zone/lua_inventory.cpp +++ b/zone/lua_inventory.cpp @@ -20,7 +20,7 @@ Lua_ItemInst Lua_Inventory::GetItem(int slot_id, int bag_slot) { int Lua_Inventory::PutItem(int slot_id, Lua_ItemInst item) { Lua_Safe_Call_Int(); - EQEmu::ItemInstance *inst = item; + EQ::ItemInstance *inst = item; if(!inst) { return 0; } @@ -30,7 +30,7 @@ int Lua_Inventory::PutItem(int slot_id, Lua_ItemInst item) { int Lua_Inventory::PushCursor(Lua_ItemInst item) { Lua_Safe_Call_Int(); - EQEmu::ItemInstance *inst = item; + EQ::ItemInstance *inst = item; if(!inst) { return 0; } @@ -40,7 +40,7 @@ int Lua_Inventory::PushCursor(Lua_ItemInst item) { bool Lua_Inventory::SwapItem(int source_slot, int destination_slot) { Lua_Safe_Call_Bool(); - EQEmu::InventoryProfile::SwapItemFailState fail_state = EQEmu::InventoryProfile::swapInvalid; + EQ::InventoryProfile::SwapItemFailState fail_state = EQ::InventoryProfile::swapInvalid; return self->SwapItem(source_slot, destination_slot, fail_state); } diff --git a/zone/lua_inventory.h b/zone/lua_inventory.h index 272e142de..b64e9c48c 100644 --- a/zone/lua_inventory.h +++ b/zone/lua_inventory.h @@ -7,7 +7,7 @@ class Lua_ItemInst; class Lua_Item; -namespace EQEmu +namespace EQ { class InventoryProfile; } @@ -23,16 +23,16 @@ luabind::scope lua_register_inventory(); // of database calls and can lead to lost items, duplicated items and/or // desync'd inventories, if not handled correctly. -class Lua_Inventory : public Lua_Ptr +class Lua_Inventory : public Lua_Ptr { - typedef EQEmu::InventoryProfile NativeType; + typedef EQ::InventoryProfile NativeType; public: Lua_Inventory() : Lua_Ptr(nullptr) { } - Lua_Inventory(EQEmu::InventoryProfile *d) : Lua_Ptr(d) { } + Lua_Inventory(EQ::InventoryProfile *d) : Lua_Ptr(d) { } virtual ~Lua_Inventory() { } - operator EQEmu::InventoryProfile*() { - return reinterpret_cast(GetLuaPtrData()); + operator EQ::InventoryProfile*() { + return reinterpret_cast(GetLuaPtrData()); } Lua_ItemInst GetItem(int slot_id); diff --git a/zone/lua_item.cpp b/zone/lua_item.cpp index 67e7a1bd4..5ee5f5d69 100644 --- a/zone/lua_item.cpp +++ b/zone/lua_item.cpp @@ -7,7 +7,7 @@ #include "lua_item.h" Lua_Item::Lua_Item(uint32 item_id) { - const EQEmu::ItemData *t = database.GetItem(item_id); + const EQ::ItemData *t = database.GetItem(item_id); SetLuaPtrData(t); } diff --git a/zone/lua_item.h b/zone/lua_item.h index d5a32c41f..6a55c80b3 100644 --- a/zone/lua_item.h +++ b/zone/lua_item.h @@ -4,7 +4,7 @@ #include "lua_ptr.h" -namespace EQEmu +namespace EQ { struct ItemData; } @@ -15,17 +15,17 @@ namespace luabind { luabind::scope lua_register_item(); -class Lua_Item : public Lua_Ptr +class Lua_Item : public Lua_Ptr { - typedef const EQEmu::ItemData NativeType; + typedef const EQ::ItemData NativeType; public: Lua_Item(uint32 item_id); Lua_Item() : Lua_Ptr(nullptr) { } - Lua_Item(const EQEmu::ItemData *d) : Lua_Ptr(d) { } + Lua_Item(const EQ::ItemData *d) : Lua_Ptr(d) { } virtual ~Lua_Item() { } - operator const EQEmu::ItemData*() { - return reinterpret_cast(GetLuaPtrData()); + operator const EQ::ItemData*() { + return reinterpret_cast(GetLuaPtrData()); } int GetMinStatus(); diff --git a/zone/lua_iteminst.cpp b/zone/lua_iteminst.cpp index 7844a64bb..ba3c8a2c6 100644 --- a/zone/lua_iteminst.cpp +++ b/zone/lua_iteminst.cpp @@ -21,7 +21,7 @@ Lua_ItemInst::Lua_ItemInst(int item_id, int charges) { Lua_ItemInst& Lua_ItemInst::operator=(const Lua_ItemInst& o) { if(o.cloned_) { cloned_ = true; - d_ = new EQEmu::ItemInstance(*o.d_); + d_ = new EQ::ItemInstance(*o.d_); } else { cloned_ = false; d_ = o.d_; @@ -32,7 +32,7 @@ Lua_ItemInst& Lua_ItemInst::operator=(const Lua_ItemInst& o) { Lua_ItemInst::Lua_ItemInst(const Lua_ItemInst& o) { if(o.cloned_) { cloned_ = true; - d_ = new EQEmu::ItemInstance(*o.d_); + d_ = new EQ::ItemInstance(*o.d_); } else { cloned_ = false; d_ = o.d_; @@ -41,7 +41,7 @@ Lua_ItemInst::Lua_ItemInst(const Lua_ItemInst& o) { bool Lua_ItemInst::IsType(int item_class) { Lua_Safe_Call_Bool(); - return self->IsType(static_cast(item_class)); + return self->IsType(static_cast(item_class)); } bool Lua_ItemInst::IsStackable() { diff --git a/zone/lua_iteminst.h b/zone/lua_iteminst.h index 98943d6dc..7614bea5d 100644 --- a/zone/lua_iteminst.h +++ b/zone/lua_iteminst.h @@ -6,7 +6,7 @@ class Lua_Item; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -17,21 +17,21 @@ namespace luabind { luabind::scope lua_register_iteminst(); -class Lua_ItemInst : public Lua_Ptr +class Lua_ItemInst : public Lua_Ptr { - typedef EQEmu::ItemInstance NativeType; + typedef EQ::ItemInstance NativeType; public: Lua_ItemInst(int item_id); Lua_ItemInst(int item_id, int charges); Lua_ItemInst() : Lua_Ptr(nullptr), cloned_(false) { } - Lua_ItemInst(EQEmu::ItemInstance *d) : Lua_Ptr(d), cloned_(false) { } - Lua_ItemInst(EQEmu::ItemInstance *d, bool cloned) : Lua_Ptr(d), cloned_(cloned) { } + Lua_ItemInst(EQ::ItemInstance *d) : Lua_Ptr(d), cloned_(false) { } + Lua_ItemInst(EQ::ItemInstance *d, bool cloned) : Lua_Ptr(d), cloned_(cloned) { } Lua_ItemInst& operator=(const Lua_ItemInst& o); Lua_ItemInst(const Lua_ItemInst& o); - virtual ~Lua_ItemInst() { if(cloned_) { EQEmu::ItemInstance *ptr = GetLuaPtrData(); if(ptr) { delete ptr; } } } + virtual ~Lua_ItemInst() { if(cloned_) { EQ::ItemInstance *ptr = GetLuaPtrData(); if(ptr) { delete ptr; } } } - operator EQEmu::ItemInstance*() { - return reinterpret_cast(GetLuaPtrData()); + operator EQ::ItemInstance*() { + return reinterpret_cast(GetLuaPtrData()); } bool IsType(int item_class); diff --git a/zone/lua_mob.cpp b/zone/lua_mob.cpp index 4860ae1e8..69742c655 100644 --- a/zone/lua_mob.cpp +++ b/zone/lua_mob.cpp @@ -179,22 +179,22 @@ bool Lua_Mob::Attack(Lua_Mob other, int hand, bool from_riposte, bool is_striket void Lua_Mob::Damage(Lua_Mob from, int damage, int spell_id, int attack_skill) { Lua_Safe_Call_Void(); - return self->Damage(from, damage, spell_id, static_cast(attack_skill)); + return self->Damage(from, damage, spell_id, static_cast(attack_skill)); } void Lua_Mob::Damage(Lua_Mob from, int damage, int spell_id, int attack_skill, bool avoidable) { Lua_Safe_Call_Void(); - return self->Damage(from, damage, spell_id, static_cast(attack_skill), avoidable); + return self->Damage(from, damage, spell_id, static_cast(attack_skill), avoidable); } void Lua_Mob::Damage(Lua_Mob from, int damage, int spell_id, int attack_skill, bool avoidable, int buffslot) { Lua_Safe_Call_Void(); - return self->Damage(from, damage, spell_id, static_cast(attack_skill), avoidable, buffslot); + return self->Damage(from, damage, spell_id, static_cast(attack_skill), avoidable, buffslot); } void Lua_Mob::Damage(Lua_Mob from, int damage, int spell_id, int attack_skill, bool avoidable, int buffslot, bool buff_tic) { Lua_Safe_Call_Void(); - return self->Damage(from, damage, spell_id, static_cast(attack_skill), avoidable, buffslot, buff_tic); + return self->Damage(from, damage, spell_id, static_cast(attack_skill), avoidable, buffslot, buff_tic); } void Lua_Mob::RangedAttack(Lua_Mob other) { @@ -853,28 +853,28 @@ bool Lua_Mob::CastSpell(int spell_id, int target_id) { bool Lua_Mob::CastSpell(int spell_id, int target_id, int slot) { Lua_Safe_Call_Bool(); - return self->CastSpell(spell_id, target_id, static_cast(slot)); + return self->CastSpell(spell_id, target_id, static_cast(slot)); } bool Lua_Mob::CastSpell(int spell_id, int target_id, int slot, int cast_time) { Lua_Safe_Call_Bool(); - return self->CastSpell(spell_id, target_id, static_cast(slot), cast_time); + return self->CastSpell(spell_id, target_id, static_cast(slot), cast_time); } bool Lua_Mob::CastSpell(int spell_id, int target_id, int slot, int cast_time, int mana_cost) { Lua_Safe_Call_Bool(); - return self->CastSpell(spell_id, target_id, static_cast(slot), cast_time, mana_cost); + return self->CastSpell(spell_id, target_id, static_cast(slot), cast_time, mana_cost); } bool Lua_Mob::CastSpell(int spell_id, int target_id, int slot, int cast_time, int mana_cost, int item_slot) { Lua_Safe_Call_Bool(); - return self->CastSpell(spell_id, target_id, static_cast(slot), cast_time, mana_cost, nullptr, static_cast(item_slot)); + return self->CastSpell(spell_id, target_id, static_cast(slot), cast_time, mana_cost, nullptr, static_cast(item_slot)); } bool Lua_Mob::CastSpell(int spell_id, int target_id, int slot, int cast_time, int mana_cost, int item_slot, int timer, int timer_duration) { Lua_Safe_Call_Bool(); - return self->CastSpell(spell_id, target_id, static_cast(slot), cast_time, mana_cost, nullptr, static_cast(item_slot), + return self->CastSpell(spell_id, target_id, static_cast(slot), cast_time, mana_cost, nullptr, static_cast(item_slot), static_cast(timer), static_cast(timer_duration)); } @@ -883,7 +883,7 @@ bool Lua_Mob::CastSpell(int spell_id, int target_id, int slot, int cast_time, in Lua_Safe_Call_Bool(); int16 res = resist_adjust; - return self->CastSpell(spell_id, target_id, static_cast(slot), cast_time, mana_cost, nullptr, static_cast(item_slot), + return self->CastSpell(spell_id, target_id, static_cast(slot), cast_time, mana_cost, nullptr, static_cast(item_slot), static_cast(timer), static_cast(timer_duration), &res); } @@ -894,27 +894,27 @@ bool Lua_Mob::SpellFinished(int spell_id, Lua_Mob target) { bool Lua_Mob::SpellFinished(int spell_id, Lua_Mob target, int slot) { Lua_Safe_Call_Bool(); - return self->SpellFinished(spell_id, target, static_cast(slot)); + return self->SpellFinished(spell_id, target, static_cast(slot)); } bool Lua_Mob::SpellFinished(int spell_id, Lua_Mob target, int slot, int mana_used) { Lua_Safe_Call_Bool(); - return self->SpellFinished(spell_id, target, static_cast(slot), mana_used); + return self->SpellFinished(spell_id, target, static_cast(slot), mana_used); } bool Lua_Mob::SpellFinished(int spell_id, Lua_Mob target, int slot, int mana_used, uint32 inventory_slot) { Lua_Safe_Call_Bool(); - return self->SpellFinished(spell_id, target, static_cast(slot), mana_used, inventory_slot); + return self->SpellFinished(spell_id, target, static_cast(slot), mana_used, inventory_slot); } bool Lua_Mob::SpellFinished(int spell_id, Lua_Mob target, int slot, int mana_used, uint32 inventory_slot, int resist_adjust) { Lua_Safe_Call_Bool(); - return self->SpellFinished(spell_id, target, static_cast(slot), mana_used, inventory_slot, resist_adjust); + return self->SpellFinished(spell_id, target, static_cast(slot), mana_used, inventory_slot, resist_adjust); } bool Lua_Mob::SpellFinished(int spell_id, Lua_Mob target, int slot, int mana_used, uint32 inventory_slot, int resist_adjust, bool proc) { Lua_Safe_Call_Bool(); - return self->SpellFinished(spell_id, target, static_cast(slot), mana_used, inventory_slot, resist_adjust, proc); + return self->SpellFinished(spell_id, target, static_cast(slot), mana_used, inventory_slot, resist_adjust, proc); } void Lua_Mob::SendBeginCast(int spell_id, int cast_time) { @@ -1349,22 +1349,22 @@ bool Lua_Mob::CombatRange(Lua_Mob other) { void Lua_Mob::DoSpecialAttackDamage(Lua_Mob other, int skill, int max_damage) { Lua_Safe_Call_Void(); - self->DoSpecialAttackDamage(other, static_cast(skill), max_damage); + self->DoSpecialAttackDamage(other, static_cast(skill), max_damage); } void Lua_Mob::DoSpecialAttackDamage(Lua_Mob other, int skill, int max_damage, int min_damage) { Lua_Safe_Call_Void(); - self->DoSpecialAttackDamage(other, static_cast(skill), max_damage, min_damage); + self->DoSpecialAttackDamage(other, static_cast(skill), max_damage, min_damage); } void Lua_Mob::DoSpecialAttackDamage(Lua_Mob other, int skill, int max_damage, int min_damage, int hate_override) { Lua_Safe_Call_Void(); - self->DoSpecialAttackDamage(other, static_cast(skill), max_damage, min_damage, hate_override); + self->DoSpecialAttackDamage(other, static_cast(skill), max_damage, min_damage, hate_override); } void Lua_Mob::DoSpecialAttackDamage(Lua_Mob other, int skill, int max_damage, int min_damage, int hate_override, int reuse_time) { Lua_Safe_Call_Void(); - self->DoSpecialAttackDamage(other, static_cast(skill), max_damage, min_damage, hate_override, reuse_time); + self->DoSpecialAttackDamage(other, static_cast(skill), max_damage, min_damage, hate_override, reuse_time); } void Lua_Mob::DoThrowingAttackDmg(Lua_Mob other) { @@ -1400,22 +1400,22 @@ void Lua_Mob::DoThrowingAttackDmg(Lua_Mob other, Lua_ItemInst range_weapon, Lua_ void Lua_Mob::DoMeleeSkillAttackDmg(Lua_Mob other, int weapon_damage, int skill) { Lua_Safe_Call_Void(); - self->DoMeleeSkillAttackDmg(other, weapon_damage, static_cast(skill)); + self->DoMeleeSkillAttackDmg(other, weapon_damage, static_cast(skill)); } void Lua_Mob::DoMeleeSkillAttackDmg(Lua_Mob other, int weapon_damage, int skill, int chance_mod) { Lua_Safe_Call_Void(); - self->DoMeleeSkillAttackDmg(other, weapon_damage, static_cast(skill), chance_mod); + self->DoMeleeSkillAttackDmg(other, weapon_damage, static_cast(skill), chance_mod); } void Lua_Mob::DoMeleeSkillAttackDmg(Lua_Mob other, int weapon_damage, int skill, int chance_mod, int focus) { Lua_Safe_Call_Void(); - self->DoMeleeSkillAttackDmg(other, weapon_damage, static_cast(skill), chance_mod, focus); + self->DoMeleeSkillAttackDmg(other, weapon_damage, static_cast(skill), chance_mod, focus); } void Lua_Mob::DoMeleeSkillAttackDmg(Lua_Mob other, int weapon_damage, int skill, int chance_mod, int focus, bool can_riposte) { Lua_Safe_Call_Void(); - self->DoMeleeSkillAttackDmg(other, weapon_damage, static_cast(skill), chance_mod, focus, can_riposte); + self->DoMeleeSkillAttackDmg(other, weapon_damage, static_cast(skill), chance_mod, focus, can_riposte); } void Lua_Mob::DoArcheryAttackDmg(Lua_Mob other) { @@ -1879,17 +1879,17 @@ void Lua_Mob::SetTargetable(bool on) { void Lua_Mob::ModSkillDmgTaken(int skill, int value) { Lua_Safe_Call_Void(); - self->ModSkillDmgTaken(static_cast(skill), value); + self->ModSkillDmgTaken(static_cast(skill), value); } int Lua_Mob::GetModSkillDmgTaken(int skill) { Lua_Safe_Call_Int(); - return self->GetModSkillDmgTaken(static_cast(skill)); + return self->GetModSkillDmgTaken(static_cast(skill)); } int Lua_Mob::GetSkillDmgTaken(int skill) { Lua_Safe_Call_Int(); - return self->GetSkillDmgTaken(static_cast(skill)); + return self->GetSkillDmgTaken(static_cast(skill)); } int Lua_Mob::GetFcDamageAmtIncoming(Lua_Mob caster, uint32 spell_id, bool use_skill, uint16 skill) @@ -1951,7 +1951,7 @@ int Lua_Mob::GetFlurryChance() { int Lua_Mob::GetSkill(int skill) { Lua_Safe_Call_Int(); - return self->GetSkill(static_cast(skill)); + return self->GetSkill(static_cast(skill)); } int Lua_Mob::GetSpecialAbility(int ability) { diff --git a/zone/lua_mod.cpp b/zone/lua_mod.cpp index 8dc77f4f7..382f8adba 100644 --- a/zone/lua_mod.cpp +++ b/zone/lua_mod.cpp @@ -95,7 +95,7 @@ void GetDamageHitInfo(luabind::adl::object &ret, DamageHitInfo &hit) { } if (luabind::type(skill) == LUA_TNUMBER) { - hit.skill = (EQEmu::skills::SkillType)luabind::object_cast(skill); + hit.skill = (EQ::skills::SkillType)luabind::object_cast(skill); } } } diff --git a/zone/lua_parser.cpp b/zone/lua_parser.cpp index 620ee14d1..ebe88f32a 100644 --- a/zone/lua_parser.cpp +++ b/zone/lua_parser.cpp @@ -246,7 +246,7 @@ LuaParser::~LuaParser() { } int LuaParser::EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -265,7 +265,7 @@ int LuaParser::EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, } int LuaParser::EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -283,7 +283,7 @@ int LuaParser::EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, std::string } int LuaParser::_EventNPC(std::string package_name, QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers, luabind::adl::object *l_func) { + std::vector *extra_pointers, luabind::adl::object *l_func) { const char *sub_name = LuaEvents[evt]; int start = lua_gettop(L); @@ -342,7 +342,7 @@ int LuaParser::_EventNPC(std::string package_name, QuestEventID evt, NPC* npc, M } int LuaParser::EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -360,7 +360,7 @@ int LuaParser::EventPlayer(QuestEventID evt, Client *client, std::string data, u } int LuaParser::EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -378,7 +378,7 @@ int LuaParser::EventGlobalPlayer(QuestEventID evt, Client *client, std::string d } int LuaParser::_EventPlayer(std::string package_name, QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers, luabind::adl::object *l_func) { + std::vector *extra_pointers, luabind::adl::object *l_func) { const char *sub_name = LuaEvents[evt]; int start = lua_gettop(L); @@ -434,8 +434,8 @@ int LuaParser::_EventPlayer(std::string package_name, QuestEventID evt, Client * return 0; } -int LuaParser::EventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { +int LuaParser::EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -454,8 +454,8 @@ int LuaParser::EventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance * return _EventItem(package_name, evt, client, item, mob, data, extra_data, extra_pointers); } -int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, - std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func) { +int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, + std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func) { const char *sub_name = LuaEvents[evt]; int start = lua_gettop(L); @@ -518,7 +518,7 @@ int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *cl } int LuaParser::EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -534,7 +534,7 @@ int LuaParser::EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spe } int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers, luabind::adl::object *l_func) { + std::vector *extra_pointers, luabind::adl::object *l_func) { const char *sub_name = LuaEvents[evt]; int start = lua_gettop(L); @@ -598,7 +598,7 @@ int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, NPC* npc, return 0; } -int LuaParser::EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, std::vector *extra_pointers) { +int LuaParser::EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -614,7 +614,7 @@ int LuaParser::EventEncounter(QuestEventID evt, std::string encounter_name, std: } int LuaParser::_EventEncounter(std::string package_name, QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { const char *sub_name = LuaEvents[evt]; int start = lua_gettop(L); @@ -718,7 +718,7 @@ bool LuaParser::SpellHasQuestSub(uint32 spell_id, QuestEventID evt) { return HasFunction(subname, package_name); } -bool LuaParser::ItemHasQuestSub(EQEmu::ItemInstance *itm, QuestEventID evt) { +bool LuaParser::ItemHasQuestSub(EQ::ItemInstance *itm, QuestEventID evt) { if (itm == nullptr) { return false; } @@ -764,7 +764,7 @@ void LuaParser::LoadGlobalPlayerScript(std::string filename) { LoadScript(filename, "global_player"); } -void LuaParser::LoadItemScript(std::string filename, EQEmu::ItemInstance *item) { +void LuaParser::LoadItemScript(std::string filename, EQ::ItemInstance *item) { if (item == nullptr) return; std::string package_name = "item_"; @@ -1118,7 +1118,7 @@ void LuaParser::MapFunctions(lua_State *L) { } int LuaParser::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -1164,7 +1164,7 @@ int LuaParser::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::stri } int LuaParser::DispatchEventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -1192,8 +1192,8 @@ int LuaParser::DispatchEventPlayer(QuestEventID evt, Client *client, std::string return ret; } -int LuaParser::DispatchEventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { +int LuaParser::DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -1239,7 +1239,7 @@ int LuaParser::DispatchEventItem(QuestEventID evt, Client *client, EQEmu::ItemIn } int LuaParser::DispatchEventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; diff --git a/zone/lua_parser.h b/zone/lua_parser.h index eb57faa96..8265a191f 100644 --- a/zone/lua_parser.h +++ b/zone/lua_parser.h @@ -18,7 +18,7 @@ struct lua_State; class Client; class NPC; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -37,33 +37,33 @@ public: ~LuaParser(); virtual int EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); virtual int EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); virtual int EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); virtual int EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers); - virtual int EventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); + virtual int EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); virtual int EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); virtual int EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); virtual bool HasQuestSub(uint32 npc_id, QuestEventID evt); virtual bool HasGlobalQuestSub(QuestEventID evt); virtual bool PlayerHasQuestSub(QuestEventID evt); virtual bool GlobalPlayerHasQuestSub(QuestEventID evt); virtual bool SpellHasQuestSub(uint32 spell_id, QuestEventID evt); - virtual bool ItemHasQuestSub(EQEmu::ItemInstance *itm, QuestEventID evt); + virtual bool ItemHasQuestSub(EQ::ItemInstance *itm, QuestEventID evt); virtual bool EncounterHasQuestSub(std::string encounter_name, QuestEventID evt); virtual void LoadNPCScript(std::string filename, int npc_id); virtual void LoadGlobalNPCScript(std::string filename); virtual void LoadPlayerScript(std::string filename); virtual void LoadGlobalPlayerScript(std::string filename); - virtual void LoadItemScript(std::string filename, EQEmu::ItemInstance *item); + virtual void LoadItemScript(std::string filename, EQ::ItemInstance *item); virtual void LoadSpellScript(std::string filename, uint32 spell_id); virtual void LoadEncounterScript(std::string filename, std::string encounter_name); @@ -74,13 +74,13 @@ public: virtual uint32 GetIdentifier() { return 0xb0712acc; } virtual int DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); virtual int DispatchEventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers); - virtual int DispatchEventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); + virtual int DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); virtual int DispatchEventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); static LuaParser* Instance() { static LuaParser inst; @@ -106,15 +106,15 @@ private: LuaParser& operator=(const LuaParser&); int _EventNPC(std::string package_name, QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers, luabind::adl::object *l_func = nullptr); + std::vector *extra_pointers, luabind::adl::object *l_func = nullptr); int _EventPlayer(std::string package_name, QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers, luabind::adl::object *l_func = nullptr); - int _EventItem(std::string package_name, QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, - uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func = nullptr); + std::vector *extra_pointers, luabind::adl::object *l_func = nullptr); + int _EventItem(std::string package_name, QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, + uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func = nullptr); int _EventSpell(std::string package_name, QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers, luabind::adl::object *l_func = nullptr); + std::vector *extra_pointers, luabind::adl::object *l_func = nullptr); int _EventEncounter(std::string package_name, QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void LoadScript(std::string filename, std::string package_name); void MapFunctions(lua_State *L); diff --git a/zone/lua_parser_events.cpp b/zone/lua_parser_events.cpp index 3ca9edad7..9a1a2c67f 100644 --- a/zone/lua_parser_events.cpp +++ b/zone/lua_parser_events.cpp @@ -28,7 +28,7 @@ //NPC void handle_npc_event_say(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { npc->DoQuestPause(init); Lua_Client l_client(reinterpret_cast(init)); @@ -44,7 +44,7 @@ void handle_npc_event_say(QuestInterface *parse, lua_State* L, NPC* npc, Mob *in } void handle_npc_event_trade(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Lua_Client l_client(reinterpret_cast(init)); luabind::adl::object l_client_o = luabind::adl::object(L, l_client); l_client_o.push(L); @@ -58,7 +58,7 @@ void handle_npc_event_trade(QuestInterface *parse, lua_State* L, NPC* npc, Mob * size_t sz = extra_pointers->size(); for(size_t i = 0; i < sz; ++i) { std::string prefix = "item" + std::to_string(i + 1); - EQEmu::ItemInstance *inst = EQEmu::any_cast(extra_pointers->at(i)); + EQ::ItemInstance *inst = EQ::any_cast(extra_pointers->at(i)); Lua_ItemInst l_inst = inst; luabind::adl::object l_inst_o = luabind::adl::object(L, l_inst); @@ -83,7 +83,7 @@ void handle_npc_event_trade(QuestInterface *parse, lua_State* L, NPC* npc, Mob * } void handle_npc_event_hp(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { if(extra_data == 1) { lua_pushinteger(L, -1); lua_setfield(L, -2, "hp_event"); @@ -100,7 +100,7 @@ void handle_npc_event_hp(QuestInterface *parse, lua_State* L, NPC* npc, Mob *ini } void handle_npc_single_mob(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Lua_Mob l_mob(init); luabind::adl::object l_mob_o = luabind::adl::object(L, l_mob); l_mob_o.push(L); @@ -108,7 +108,7 @@ void handle_npc_single_mob(QuestInterface *parse, lua_State* L, NPC* npc, Mob *i } void handle_npc_single_client(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Lua_Client l_client(reinterpret_cast(init)); luabind::adl::object l_client_o = luabind::adl::object(L, l_client); l_client_o.push(L); @@ -116,7 +116,7 @@ void handle_npc_single_client(QuestInterface *parse, lua_State* L, NPC* npc, Mob } void handle_npc_single_npc(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Lua_NPC l_npc(reinterpret_cast(init)); luabind::adl::object l_npc_o = luabind::adl::object(L, l_npc); l_npc_o.push(L); @@ -124,7 +124,7 @@ void handle_npc_single_npc(QuestInterface *parse, lua_State* L, NPC* npc, Mob *i } void handle_npc_task_accepted(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Lua_Client l_client(reinterpret_cast(init)); luabind::adl::object l_client_o = luabind::adl::object(L, l_client); l_client_o.push(L); @@ -135,7 +135,7 @@ void handle_npc_task_accepted(QuestInterface *parse, lua_State* L, NPC* npc, Mob } void handle_npc_popup(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Lua_Mob l_mob(init); luabind::adl::object l_mob_o = luabind::adl::object(L, l_mob); l_mob_o.push(L); @@ -146,7 +146,7 @@ void handle_npc_popup(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, } void handle_npc_waypoint(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Lua_Mob l_mob(init); luabind::adl::object l_mob_o = luabind::adl::object(L, l_mob); l_mob_o.push(L); @@ -157,7 +157,7 @@ void handle_npc_waypoint(QuestInterface *parse, lua_State* L, NPC* npc, Mob *ini } void handle_npc_hate(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Lua_Mob l_mob(init); luabind::adl::object l_mob_o = luabind::adl::object(L, l_mob); l_mob_o.push(L); @@ -169,19 +169,19 @@ void handle_npc_hate(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, s void handle_npc_signal(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushinteger(L, std::stoi(data)); lua_setfield(L, -2, "signal"); } void handle_npc_timer(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushstring(L, data.c_str()); lua_setfield(L, -2, "timer"); } void handle_npc_death(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Lua_Mob l_mob(init); luabind::adl::object l_mob_o = luabind::adl::object(L, l_mob); l_mob_o.push(L); @@ -209,7 +209,7 @@ void handle_npc_death(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, } void handle_npc_cast(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { int spell_id = std::stoi(data); if(IsValidSpell(spell_id)) { Lua_Spell l_spell(&spells[spell_id]); @@ -225,21 +225,21 @@ void handle_npc_cast(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, s } void handle_npc_area(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - lua_pushinteger(L, *EQEmu::any_cast(extra_pointers->at(0))); + std::vector *extra_pointers) { + lua_pushinteger(L, *EQ::any_cast(extra_pointers->at(0))); lua_setfield(L, -2, "area_id"); - lua_pushinteger(L, *EQEmu::any_cast(extra_pointers->at(1))); + lua_pushinteger(L, *EQ::any_cast(extra_pointers->at(1))); lua_setfield(L, -2, "area_type"); } void handle_npc_null(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { } //Player void handle_player_say(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushstring(L, data.c_str()); lua_setfield(L, -2, "message"); @@ -248,7 +248,7 @@ void handle_player_say(QuestInterface *parse, lua_State* L, Client* client, std: } void handle_player_environmental_damage(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers){ + std::vector *extra_pointers){ Seperator sep(data.c_str()); lua_pushinteger(L, std::stoi(sep.arg[0])); lua_setfield(L, -2, "env_damage"); @@ -261,7 +261,7 @@ void handle_player_environmental_damage(QuestInterface *parse, lua_State* L, Cli } void handle_player_death(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Seperator sep(data.c_str()); Mob *o = entity_list.GetMobID(std::stoi(sep.arg[0])); @@ -291,14 +291,14 @@ void handle_player_death(QuestInterface *parse, lua_State* L, Client* client, st } void handle_player_timer(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushstring(L, data.c_str()); lua_setfield(L, -2, "timer"); } void handle_player_discover_item(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - const EQEmu::ItemData *item = database.GetItem(extra_data); + std::vector *extra_pointers) { + const EQ::ItemData *item = database.GetItem(extra_data); if(item) { Lua_Item l_item(item); luabind::adl::object l_item_o = luabind::adl::object(L, l_item); @@ -313,51 +313,51 @@ void handle_player_discover_item(QuestInterface *parse, lua_State* L, Client* cl } void handle_player_fish_forage_success(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_ItemInst l_item(EQEmu::any_cast(extra_pointers->at(0))); + std::vector *extra_pointers) { + Lua_ItemInst l_item(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_item_o = luabind::adl::object(L, l_item); l_item_o.push(L); lua_setfield(L, -2, "item"); } void handle_player_click_object(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_Object l_object(EQEmu::any_cast(extra_pointers->at(0))); + std::vector *extra_pointers) { + Lua_Object l_object(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_object_o = luabind::adl::object(L, l_object); l_object_o.push(L); lua_setfield(L, -2, "object"); } void handle_player_click_door(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_Door l_door(EQEmu::any_cast(extra_pointers->at(0))); + std::vector *extra_pointers) { + Lua_Door l_door(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_door_o = luabind::adl::object(L, l_door); l_door_o.push(L); lua_setfield(L, -2, "door"); } void handle_player_signal(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushinteger(L, std::stoi(data)); lua_setfield(L, -2, "signal"); } void handle_player_popup_response(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushinteger(L, std::stoi(data)); lua_setfield(L, -2, "popup_id"); } void handle_player_pick_up(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_ItemInst l_item(EQEmu::any_cast(extra_pointers->at(0))); + std::vector *extra_pointers) { + Lua_ItemInst l_item(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_item_o = luabind::adl::object(L, l_item); l_item_o.push(L); lua_setfield(L, -2, "item"); } void handle_player_cast(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { int spell_id = std::stoi(data); if(IsValidSpell(spell_id)) { Lua_Spell l_spell(&spells[spell_id]); @@ -373,48 +373,48 @@ void handle_player_cast(QuestInterface *parse, lua_State* L, Client* client, std } void handle_player_task_fail(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushinteger(L, std::stoi(data)); lua_setfield(L, -2, "task_id"); } void handle_player_zone(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushinteger(L, std::stoi(data)); lua_setfield(L, -2, "zone_id"); } void handle_player_duel_win(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_Client l_client(EQEmu::any_cast(extra_pointers->at(1))); + std::vector *extra_pointers) { + Lua_Client l_client(EQ::any_cast(extra_pointers->at(1))); luabind::adl::object l_client_o = luabind::adl::object(L, l_client); l_client_o.push(L); lua_setfield(L, -2, "other"); } void handle_player_duel_loss(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_Client l_client(EQEmu::any_cast(extra_pointers->at(0))); + std::vector *extra_pointers) { + Lua_Client l_client(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_client_o = luabind::adl::object(L, l_client); l_client_o.push(L); lua_setfield(L, -2, "other"); } void handle_player_loot(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_ItemInst l_item(EQEmu::any_cast(extra_pointers->at(0))); + std::vector *extra_pointers) { + Lua_ItemInst l_item(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_item_o = luabind::adl::object(L, l_item); l_item_o.push(L); lua_setfield(L, -2, "item"); - Lua_Corpse l_corpse(EQEmu::any_cast(extra_pointers->at(1))); + Lua_Corpse l_corpse(EQ::any_cast(extra_pointers->at(1))); luabind::adl::object l_corpse_o = luabind::adl::object(L, l_corpse); l_corpse_o.push(L); lua_setfield(L, -2, "corpse"); } void handle_player_task_stage_complete(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Seperator sep(data.c_str()); lua_pushinteger(L, std::stoi(sep.arg[0])); lua_setfield(L, -2, "task_id"); @@ -424,7 +424,7 @@ void handle_player_task_stage_complete(QuestInterface *parse, lua_State* L, Clie } void handle_player_task_update(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Seperator sep(data.c_str()); lua_pushinteger(L, std::stoi(sep.arg[0])); lua_setfield(L, -2, "count"); @@ -437,7 +437,7 @@ void handle_player_task_update(QuestInterface *parse, lua_State* L, Client* clie } void handle_player_command(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { Seperator sep(data.c_str(), ' ', 10, 100, true); std::string command(sep.arg[0] + 1); lua_pushstring(L, command.c_str()); @@ -456,7 +456,7 @@ void handle_player_command(QuestInterface *parse, lua_State* L, Client* client, } void handle_player_combine(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushinteger(L, extra_data); lua_setfield(L, -2, "recipe_id"); @@ -465,24 +465,24 @@ void handle_player_combine(QuestInterface *parse, lua_State* L, Client* client, } void handle_player_feign(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_NPC l_npc(EQEmu::any_cast(extra_pointers->at(0))); + std::vector *extra_pointers) { + Lua_NPC l_npc(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_npc_o = luabind::adl::object(L, l_npc); l_npc_o.push(L); lua_setfield(L, -2, "other"); } void handle_player_area(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - lua_pushinteger(L, *EQEmu::any_cast(extra_pointers->at(0))); + std::vector *extra_pointers) { + lua_pushinteger(L, *EQ::any_cast(extra_pointers->at(0))); lua_setfield(L, -2, "area_id"); - lua_pushinteger(L, *EQEmu::any_cast(extra_pointers->at(1))); + lua_pushinteger(L, *EQ::any_cast(extra_pointers->at(1))); lua_setfield(L, -2, "area_type"); } void handle_player_respawn(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushinteger(L, std::stoi(data)); lua_setfield(L, -2, "option"); @@ -491,8 +491,8 @@ void handle_player_respawn(QuestInterface *parse, lua_State* L, Client* client, } void handle_player_packet(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_Packet l_packet(EQEmu::any_cast(extra_pointers->at(0))); + std::vector *extra_pointers) { + Lua_Packet l_packet(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_packet_o = luabind::adl::object(L, l_packet); l_packet_o.push(L); lua_setfield(L, -2, "packet"); @@ -502,10 +502,10 @@ void handle_player_packet(QuestInterface *parse, lua_State* L, Client* client, s } void handle_player_null(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { } -void handle_player_use_skill(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, std::vector *extra_pointers) { +void handle_player_use_skill(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, std::vector *extra_pointers) { Seperator sep(data.c_str()); lua_pushinteger(L, std::stoi(sep.arg[0])); lua_setfield(L, -2, "skill_id"); @@ -515,7 +515,7 @@ void handle_player_use_skill(QuestInterface *parse, lua_State* L, Client* client } void handle_player_combine_validate(QuestInterface* parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector* extra_pointers) { + std::vector* extra_pointers) { Seperator sep(data.c_str()); lua_pushinteger(L, extra_data); lua_setfield(L, -2, "recipe_id"); @@ -540,7 +540,7 @@ void handle_player_combine_validate(QuestInterface* parse, lua_State* L, Client* } void handle_player_bot_command(QuestInterface* parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector* extra_pointers) { + std::vector* extra_pointers) { Seperator sep(data.c_str(), ' ', 10, 100, true); std::string bot_command(sep.arg[0] + 1); lua_pushstring(L, bot_command.c_str()); @@ -559,20 +559,20 @@ void handle_player_bot_command(QuestInterface* parse, lua_State* L, Client* clie } //Item -void handle_item_click(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { +void handle_item_click(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { lua_pushinteger(L, extra_data); lua_setfield(L, -2, "slot_id"); } -void handle_item_timer(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { +void handle_item_timer(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { lua_pushstring(L, data.c_str()); lua_setfield(L, -2, "timer"); } -void handle_item_proc(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { +void handle_item_proc(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { Lua_Mob l_mob(mob); luabind::adl::object l_mob_o = luabind::adl::object(L, l_mob); @@ -592,8 +592,8 @@ void handle_item_proc(QuestInterface *parse, lua_State* L, Client* client, EQEmu } } -void handle_item_loot(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { +void handle_item_loot(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { if(mob && mob->IsCorpse()) { Lua_Corpse l_corpse(mob->CastToCorpse()); luabind::adl::object l_corpse_o = luabind::adl::object(L, l_corpse); @@ -607,15 +607,15 @@ void handle_item_loot(QuestInterface *parse, lua_State* L, Client* client, EQEmu } } -void handle_item_equip(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { +void handle_item_equip(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { lua_pushinteger(L, extra_data); lua_setfield(L, -2, "slot_id"); } -void handle_item_augment(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_ItemInst l_item(EQEmu::any_cast(extra_pointers->at(0))); +void handle_item_augment(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { + Lua_ItemInst l_item(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_item_o = luabind::adl::object(L, l_item); l_item_o.push(L); lua_setfield(L, -2, "aug"); @@ -624,9 +624,9 @@ void handle_item_augment(QuestInterface *parse, lua_State* L, Client* client, EQ lua_setfield(L, -2, "slot_id"); } -void handle_item_augment_insert(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_ItemInst l_item(EQEmu::any_cast(extra_pointers->at(0))); +void handle_item_augment_insert(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { + Lua_ItemInst l_item(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_item_o = luabind::adl::object(L, l_item); l_item_o.push(L); lua_setfield(L, -2, "item"); @@ -635,9 +635,9 @@ void handle_item_augment_insert(QuestInterface *parse, lua_State* L, Client* cli lua_setfield(L, -2, "slot_id"); } -void handle_item_augment_remove(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { - Lua_ItemInst l_item(EQEmu::any_cast(extra_pointers->at(0))); +void handle_item_augment_remove(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { + Lua_ItemInst l_item(EQ::any_cast(extra_pointers->at(0))); luabind::adl::object l_item_o = luabind::adl::object(L, l_item); l_item_o.push(L); lua_setfield(L, -2, "item"); @@ -645,17 +645,17 @@ void handle_item_augment_remove(QuestInterface *parse, lua_State* L, Client* cli lua_pushinteger(L, extra_data); lua_setfield(L, -2, "slot_id"); - lua_pushboolean(L, *EQEmu::any_cast(extra_pointers->at(1))); + lua_pushboolean(L, *EQ::any_cast(extra_pointers->at(1))); lua_setfield(L, -2, "destroyed"); } -void handle_item_null(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { +void handle_item_null(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { } //Spell void handle_spell_effect(QuestInterface *parse, lua_State* L, NPC* npc, Client* client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { if(npc) { Lua_Mob l_npc(npc); luabind::adl::object l_npc_o = luabind::adl::object(L, l_npc); @@ -672,7 +672,7 @@ void handle_spell_effect(QuestInterface *parse, lua_State* L, NPC* npc, Client* lua_setfield(L, -2, "target"); - lua_pushinteger(L, *EQEmu::any_cast(extra_pointers->at(0))); + lua_pushinteger(L, *EQ::any_cast(extra_pointers->at(0))); lua_setfield(L, -2, "buff_slot"); lua_pushinteger(L, extra_data); @@ -680,7 +680,7 @@ void handle_spell_effect(QuestInterface *parse, lua_State* L, NPC* npc, Client* } void handle_spell_tic(QuestInterface *parse, lua_State* L, NPC* npc, Client* client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { if(npc) { Lua_Mob l_npc(npc); luabind::adl::object l_npc_o = luabind::adl::object(L, l_npc); @@ -697,13 +697,13 @@ void handle_spell_tic(QuestInterface *parse, lua_State* L, NPC* npc, Client* cli lua_setfield(L, -2, "target"); - lua_pushinteger(L, *EQEmu::any_cast(extra_pointers->at(0))); + lua_pushinteger(L, *EQ::any_cast(extra_pointers->at(0))); lua_setfield(L, -2, "tics_remaining"); - lua_pushinteger(L, *EQEmu::any_cast(extra_pointers->at(1))); + lua_pushinteger(L, *EQ::any_cast(extra_pointers->at(1))); lua_setfield(L, -2, "caster_level"); - lua_pushinteger(L, *EQEmu::any_cast(extra_pointers->at(2))); + lua_pushinteger(L, *EQ::any_cast(extra_pointers->at(2))); lua_setfield(L, -2, "buff_slot"); lua_pushinteger(L, extra_data); @@ -711,7 +711,7 @@ void handle_spell_tic(QuestInterface *parse, lua_State* L, NPC* npc, Client* cli } void handle_spell_fade(QuestInterface *parse, lua_State* L, NPC* npc, Client* client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { if(npc) { Lua_Mob l_npc(npc); luabind::adl::object l_npc_o = luabind::adl::object(L, l_npc); @@ -731,12 +731,12 @@ void handle_spell_fade(QuestInterface *parse, lua_State* L, NPC* npc, Client* cl lua_pushinteger(L, extra_data); lua_setfield(L, -2, "buff_slot"); - lua_pushinteger(L, *EQEmu::any_cast(extra_pointers->at(0))); + lua_pushinteger(L, *EQ::any_cast(extra_pointers->at(0))); lua_setfield(L, -2, "caster_id"); } void handle_translocate_finish(QuestInterface *parse, lua_State* L, NPC* npc, Client* client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { if(npc) { Lua_Mob l_npc(npc); luabind::adl::object l_npc_o = luabind::adl::object(L, l_npc); @@ -755,17 +755,17 @@ void handle_translocate_finish(QuestInterface *parse, lua_State* L, NPC* npc, Cl } void handle_spell_null(QuestInterface *parse, lua_State* L, NPC* npc, Client* client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { } void handle_encounter_timer(QuestInterface *parse, lua_State* L, Encounter* encounter, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { lua_pushstring(L, data.c_str()); lua_setfield(L, -2, "timer"); } void handle_encounter_load(QuestInterface *parse, lua_State* L, Encounter* encounter, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { if (encounter) { Lua_Encounter l_enc(encounter); luabind::adl::object l_enc_o = luabind::adl::object(L, l_enc); @@ -773,23 +773,23 @@ void handle_encounter_load(QuestInterface *parse, lua_State* L, Encounter* encou lua_setfield(L, -2, "encounter"); } if (extra_pointers) { - std::string *str = EQEmu::any_cast(extra_pointers->at(0)); + std::string *str = EQ::any_cast(extra_pointers->at(0)); lua_pushstring(L, str->c_str()); lua_setfield(L, -2, "data"); } } void handle_encounter_unload(QuestInterface *parse, lua_State* L, Encounter* encounter, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { if (extra_pointers) { - std::string *str = EQEmu::any_cast(extra_pointers->at(0)); + std::string *str = EQ::any_cast(extra_pointers->at(0)); lua_pushstring(L, str->c_str()); lua_setfield(L, -2, "data"); } } void handle_encounter_null(QuestInterface *parse, lua_State* L, Encounter* encounter, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { } diff --git a/zone/lua_parser_events.h b/zone/lua_parser_events.h index 9eeeb11cb..0f826a421 100644 --- a/zone/lua_parser_events.h +++ b/zone/lua_parser_events.h @@ -2,148 +2,148 @@ #define _EQE_LUA_PARSER_EVENTS_H #ifdef LUA_EQEMU -typedef void(*NPCArgumentHandler)(QuestInterface*, lua_State*, NPC*, Mob*, std::string, uint32, std::vector*); -typedef void(*PlayerArgumentHandler)(QuestInterface*, lua_State*, Client*, std::string, uint32, std::vector*); -typedef void(*ItemArgumentHandler)(QuestInterface*, lua_State*, Client*, EQEmu::ItemInstance*, Mob*, std::string, uint32, std::vector*); -typedef void(*SpellArgumentHandler)(QuestInterface*, lua_State*, NPC*, Client*, uint32, uint32, std::vector*); -typedef void(*EncounterArgumentHandler)(QuestInterface*, lua_State*, Encounter* encounter, std::string, uint32, std::vector*); +typedef void(*NPCArgumentHandler)(QuestInterface*, lua_State*, NPC*, Mob*, std::string, uint32, std::vector*); +typedef void(*PlayerArgumentHandler)(QuestInterface*, lua_State*, Client*, std::string, uint32, std::vector*); +typedef void(*ItemArgumentHandler)(QuestInterface*, lua_State*, Client*, EQ::ItemInstance*, Mob*, std::string, uint32, std::vector*); +typedef void(*SpellArgumentHandler)(QuestInterface*, lua_State*, NPC*, Client*, uint32, uint32, std::vector*); +typedef void(*EncounterArgumentHandler)(QuestInterface*, lua_State*, Encounter* encounter, std::string, uint32, std::vector*); //NPC void handle_npc_event_say(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_event_trade(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_event_hp(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_single_mob(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_single_client(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_single_npc(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_task_accepted(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_popup(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_waypoint(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_hate(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_signal(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_timer(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_death(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_cast(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_area(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_npc_null(QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); //Player void handle_player_say(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_environmental_damage(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_death(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_timer(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_discover_item(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_fish_forage_success(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_click_object(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_click_door(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_signal(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_popup_response(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_pick_up(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_cast(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_task_fail(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_zone(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_duel_win(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_duel_loss(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_loot(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_task_stage_complete(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_task_update(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_command(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_combine(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_feign(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_area(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_respawn(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_packet(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_null(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_use_skill(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_player_combine_validate(QuestInterface* parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector* extra_pointers); + std::vector* extra_pointers); void handle_player_bot_command(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); //Item -void handle_item_click(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); -void handle_item_timer(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); -void handle_item_proc(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); -void handle_item_loot(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); -void handle_item_equip(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); -void handle_item_augment(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); -void handle_item_augment_insert(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); -void handle_item_augment_remove(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); -void handle_item_null(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); +void handle_item_click(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); +void handle_item_timer(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); +void handle_item_proc(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); +void handle_item_loot(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); +void handle_item_equip(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); +void handle_item_augment(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); +void handle_item_augment_insert(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); +void handle_item_augment_remove(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); +void handle_item_null(QuestInterface *parse, lua_State* L, Client* client, EQ::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); //Spell void handle_spell_effect(QuestInterface *parse, lua_State* L, NPC* npc, Client* client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_spell_tic(QuestInterface *parse, lua_State* L, NPC* npc, Client* client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_spell_fade(QuestInterface *parse, lua_State* L, NPC* npc, Client* client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_translocate_finish(QuestInterface *parse, lua_State* L, NPC* npc, Client* client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_spell_null(QuestInterface *parse, lua_State* L, NPC* npc, Client* client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); //Encounter void handle_encounter_timer(QuestInterface *parse, lua_State* L, Encounter* encounter, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_encounter_load(QuestInterface *parse, lua_State* L, Encounter* encounter, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_encounter_unload(QuestInterface *parse, lua_State* L, Encounter* encounter, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); void handle_encounter_null(QuestInterface *parse, lua_State* L, Encounter* encounter, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); #endif #endif diff --git a/zone/main.cpp b/zone/main.cpp index 364df32b9..594f9cf51 100644 --- a/zone/main.cpp +++ b/zone/main.cpp @@ -345,7 +345,7 @@ int main(int argc, char** argv) { database.GetDecayTimes(npcCorpseDecayTimes); LogInfo("Loading profanity list"); - if (!EQEmu::ProfanityManager::LoadProfanityList(&database)) + if (!EQ::ProfanityManager::LoadProfanityList(&database)) LogError("Loading profanity list failed!"); LogInfo("Loading commands"); @@ -373,7 +373,7 @@ int main(int argc, char** argv) { } } - EQEmu::InitializeDynamicLookups(); + EQ::InitializeDynamicLookups(); LogInfo("Initialized dynamic dictionary entries"); } diff --git a/zone/map.cpp b/zone/map.cpp index dbfa3928e..3d35aeabc 100644 --- a/zone/map.cpp +++ b/zone/map.cpp @@ -403,7 +403,7 @@ bool Map::LoadV2(FILE *f) { std::vector buffer; buffer.resize(buffer_size); - uint32 v = EQEmu::InflateData(&data[0], data_size, &buffer[0], buffer_size); + uint32 v = EQ::InflateData(&data[0], data_size, &buffer[0], buffer_size); char *buf = &buffer[0]; uint32 vert_count; diff --git a/zone/merc.cpp b/zone/merc.cpp index 4e635fe72..98d9b24bb 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -50,7 +50,7 @@ Merc::Merc(const NPCType* d, float x, float y, float z, float heading) _baseFR = d->FR; _basePR = d->PR; _baseCorrup = d->Corrup; - _OwnerClientVersion = static_cast(EQEmu::versions::ClientVersion::Titanium); + _OwnerClientVersion = static_cast(EQ::versions::ClientVersion::Titanium); RestRegenHP = 0; RestRegenMana = 0; RestRegenEndurance = 0; @@ -66,15 +66,15 @@ Merc::Merc(const NPCType* d, float x, float y, float z, float heading) memset(equipment, 0, sizeof(equipment)); SetMercID(0); - SetStance(EQEmu::constants::stanceBalanced); + SetStance(EQ::constants::stanceBalanced); rest_timer.Disable(); if (GetClass() == ROGUE) evade_timer.Start(); int r; - for (r = 0; r <= EQEmu::skills::HIGHEST_SKILL; r++) { - skills[r] = database.GetSkillCap(GetClass(), (EQEmu::skills::SkillType)r, GetLevel()); + for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) { + skills[r] = database.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, GetLevel()); } size = d->size; @@ -217,12 +217,12 @@ void Merc::CalcItemBonuses(StatBonuses* newbon) { unsigned int i; //should not include 21 (SLOT_AMMO) - for (i = EQEmu::invslot::BONUS_BEGIN; i <= EQEmu::invslot::BONUS_STAT_END; i++) { - if (i == EQEmu::invslot::slotAmmo) + for (i = EQ::invslot::BONUS_BEGIN; i <= EQ::invslot::BONUS_STAT_END; i++) { + if (i == EQ::invslot::slotAmmo) continue; if (equipment[i] == 0) continue; - const EQEmu::ItemData * itm = database.GetItem(equipment[i]); + const EQ::ItemData * itm = database.GetItem(equipment[i]); if (itm) AddItemBonuses(itm, newbon); } @@ -240,7 +240,7 @@ void Merc::CalcItemBonuses(StatBonuses* newbon) { SetAttackTimer(); } -void Merc::AddItemBonuses(const EQEmu::ItemData *item, StatBonuses* newbon) { +void Merc::AddItemBonuses(const EQ::ItemData *item, StatBonuses* newbon) { if(GetLevel() < item->ReqLevel) { @@ -453,11 +453,11 @@ void Merc::AddItemBonuses(const EQEmu::ItemData *item, StatBonuses* newbon) { else newbon->DSMitigation += item->DSMitigation; } - if (item->Worn.Effect>0 && (item->Worn.Type == EQEmu::item::ItemEffectWorn)) { // latent effects + if (item->Worn.Effect>0 && (item->Worn.Type == EQ::item::ItemEffectWorn)) { // latent effects ApplySpellsBonuses(item->Worn.Effect, item->Worn.Level, newbon, 0, item->Worn.Type); } - if (item->Focus.Effect>0 && (item->Focus.Type == EQEmu::item::ItemEffectFocus)) { // focus effects + if (item->Focus.Effect>0 && (item->Focus.Type == EQ::item::ItemEffectFocus)) { // focus effects ApplySpellsBonuses(item->Focus.Effect, item->Focus.Level, newbon, 0); } @@ -509,7 +509,7 @@ void Merc::AddItemBonuses(const EQEmu::ItemData *item, StatBonuses* newbon) { } } - if (item->SkillModValue != 0 && item->SkillModType <= EQEmu::skills::HIGHEST_SKILL){ + if (item->SkillModValue != 0 && item->SkillModType <= EQ::skills::HIGHEST_SKILL){ if ((item->SkillModValue > 0 && newbon->skillmod[item->SkillModType] < item->SkillModValue) || (item->SkillModValue < 0 && newbon->skillmod[item->SkillModType] > item->SkillModValue)) { @@ -563,7 +563,7 @@ void Merc::AddItemBonuses(const EQEmu::ItemData *item, StatBonuses* newbon) { } } - if (item->ExtraDmgSkill != 0 && item->ExtraDmgSkill <= EQEmu::skills::HIGHEST_SKILL) { + if (item->ExtraDmgSkill != 0 && item->ExtraDmgSkill <= EQ::skills::HIGHEST_SKILL) { if((newbon->SkillDamageAmount[item->ExtraDmgSkill] + item->ExtraDmgAmt) > RuleI(Character, ItemExtraDmgCap)) newbon->SkillDamageAmount[item->ExtraDmgSkill] = RuleI(Character, ItemExtraDmgCap); else @@ -928,8 +928,8 @@ int32 Merc::CalcBaseManaRegen() int32 regen = 0; if (IsSitting()) { - if (HasSkill(EQEmu::skills::SkillMeditate)) - regen = (((GetSkill(EQEmu::skills::SkillMeditate) / 10) + (clevel - (clevel / 4))) / 4) + 4; + if (HasSkill(EQ::skills::SkillMeditate)) + regen = (((GetSkill(EQ::skills::SkillMeditate) / 10) + (clevel - (clevel / 4))) / 4) + 4; else regen = 2; } @@ -945,9 +945,9 @@ int32 Merc::CalcManaRegen() if (IsSitting()) { BuffFadeBySitModifier(); - if (HasSkill(EQEmu::skills::SkillMeditate)) { + if (HasSkill(EQ::skills::SkillMeditate)) { this->_medding = true; - regen = ((GetSkill(EQEmu::skills::SkillMeditate) / 10) + mana_regen); + regen = ((GetSkill(EQ::skills::SkillMeditate) / 10) + mana_regen); regen += spellbonuses.ManaRegen + itembonuses.ManaRegen; } else @@ -1015,7 +1015,7 @@ int32 Merc::CalcBaseEndurance() int32 sta_end = 0; int Stats = 0; - if (GetClientVersion() >= static_cast(EQEmu::versions::ClientVersion::SoD) && RuleB(Character, SoDClientUseSoDHPManaEnd)) { + if (GetClientVersion() >= static_cast(EQ::versions::ClientVersion::SoD) && RuleB(Character, SoDClientUseSoDHPManaEnd)) { int HeroicStats = 0; Stats = ((GetSTR() + GetSTA() + GetDEX() + GetAGI()) / 4); @@ -1175,16 +1175,16 @@ void Merc::CalcRestState() { RestRegenEndurance = 6 * (GetMaxEndurance() / zone->newzone_data.FastRegenEndurance); } -bool Merc::HasSkill(EQEmu::skills::SkillType skill_id) const { +bool Merc::HasSkill(EQ::skills::SkillType skill_id) const { return((GetSkill(skill_id) > 0) && CanHaveSkill(skill_id)); } -bool Merc::CanHaveSkill(EQEmu::skills::SkillType skill_id) const { +bool Merc::CanHaveSkill(EQ::skills::SkillType skill_id) const { return(database.GetSkillCap(GetClass(), skill_id, RuleI(Character, MaxLevel)) > 0); //if you don't have it by max level, then odds are you never will? } -uint16 Merc::MaxSkill(EQEmu::skills::SkillType skillid, uint16 class_, uint16 level) const { +uint16 Merc::MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const { return(database.GetSkillCap(class_, skillid, level)); } @@ -1207,7 +1207,7 @@ void Merc::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) { ns->spawn.show_name = true; UpdateActiveLight(); - ns->spawn.light = m_Light.Type[EQEmu::lightsource::LightActive]; + ns->spawn.light = m_Light.Type[EQ::lightsource::LightActive]; /* // Wear Slots are not setup for Mercs yet @@ -1518,12 +1518,12 @@ void Merc::AI_Process() { // Hate redux actions if (evade_timer.Check(false)) { // Attempt to evade - int timer_duration = (HideReuseTime - GetSkillReuseTime(EQEmu::skills::SkillHide)) * 1000; + int timer_duration = (HideReuseTime - GetSkillReuseTime(EQ::skills::SkillHide)) * 1000; if (timer_duration < 0) timer_duration = 0; evade_timer.Start(timer_duration); - if (zone->random.Int(0, 260) < (int)GetSkill(EQEmu::skills::SkillHide)) + if (zone->random.Int(0, 260) < (int)GetSkill(EQ::skills::SkillHide)) RogueEvade(GetTarget()); return; @@ -1590,24 +1590,24 @@ void Merc::AI_Process() { //try main hand first if(attack_timer.Check()) { - Attack(GetTarget(), EQEmu::invslot::slotPrimary); + Attack(GetTarget(), EQ::invslot::slotPrimary); bool tripleSuccess = false; if(GetOwner() && GetTarget() && CanThisClassDoubleAttack()) { if(GetOwner()) { - Attack(GetTarget(), EQEmu::invslot::slotPrimary, true); + Attack(GetTarget(), EQ::invslot::slotPrimary, true); } if(GetOwner() && GetTarget() && GetSpecialAbility(SPECATK_TRIPLE)) { tripleSuccess = true; - Attack(GetTarget(), EQEmu::invslot::slotPrimary, true); + Attack(GetTarget(), EQ::invslot::slotPrimary, true); } //quad attack, does this belong here?? if(GetOwner() && GetTarget() && GetSpecialAbility(SPECATK_QUAD)) { - Attack(GetTarget(), EQEmu::invslot::slotPrimary, true); + Attack(GetTarget(), EQ::invslot::slotPrimary, true); } } @@ -1619,8 +1619,8 @@ void Merc::AI_Process() { if(zone->random.Roll(flurrychance)) { MessageString(Chat::NPCFlurry, YOU_FLURRY); - Attack(GetTarget(), EQEmu::invslot::slotPrimary, false); - Attack(GetTarget(), EQEmu::invslot::slotPrimary, false); + Attack(GetTarget(), EQ::invslot::slotPrimary, false); + Attack(GetTarget(), EQ::invslot::slotPrimary, false); } } @@ -1629,7 +1629,7 @@ void Merc::AI_Process() { if (GetTarget() && ExtraAttackChanceBonus) { if(zone->random.Roll(ExtraAttackChanceBonus)) { - Attack(GetTarget(), EQEmu::invslot::slotPrimary, false); + Attack(GetTarget(), EQ::invslot::slotPrimary, false); } } } @@ -1653,23 +1653,23 @@ void Merc::AI_Process() { bool bIsFist = true; // why are we checking 'weapontype' when we know it's set to '0' above? - if (bIsFist || ((weapontype != EQEmu::item::ItemType2HSlash) && (weapontype != EQEmu::item::ItemType2HPiercing) && (weapontype != EQEmu::item::ItemType2HBlunt))) + if (bIsFist || ((weapontype != EQ::item::ItemType2HSlash) && (weapontype != EQ::item::ItemType2HPiercing) && (weapontype != EQ::item::ItemType2HBlunt))) { float DualWieldProbability = 0.0f; int16 Ambidexterity = aabonuses.Ambidexterity + spellbonuses.Ambidexterity + itembonuses.Ambidexterity; - DualWieldProbability = (GetSkill(EQEmu::skills::SkillDualWield) + GetLevel() + Ambidexterity) / 400.0f; // 78.0 max + DualWieldProbability = (GetSkill(EQ::skills::SkillDualWield) + GetLevel() + Ambidexterity) / 400.0f; // 78.0 max int16 DWBonus = spellbonuses.DualWieldChance + itembonuses.DualWieldChance; DualWieldProbability += DualWieldProbability*float(DWBonus)/ 100.0f; // Max 78% of DW if (zone->random.Roll(DualWieldProbability)) { - Attack(GetTarget(), EQEmu::invslot::slotSecondary); // Single attack with offhand + Attack(GetTarget(), EQ::invslot::slotSecondary); // Single attack with offhand if(CanThisClassDoubleAttack()) { if(GetTarget() && GetTarget()->GetHP() > -10) - Attack(GetTarget(), EQEmu::invslot::slotSecondary); // Single attack with offhand + Attack(GetTarget(), EQ::invslot::slotSecondary); // Single attack with offhand } } } @@ -1993,7 +1993,7 @@ bool Merc::AIDoSpellCast(uint16 spellid, Mob* tar, int32 mana_cost, uint32* oDon SentPositionPacket(0.0f, 0.0f, 0.0f, 0.0f, 0); SetMoving(false); - result = CastSpell(spellid, tar->GetID(), EQEmu::spells::CastingSlot::Gem2, -1, mana_cost, oDontDoAgainBefore, -1, -1, 0, 0); + result = CastSpell(spellid, tar->GetID(), EQ::spells::CastingSlot::Gem2, -1, mana_cost, oDontDoAgainBefore, -1, -1, 0, 0); if(IsCasting() && IsSitting()) Stand(); @@ -2348,7 +2348,7 @@ bool Merc::AICastSpell(int8 iChance, uint32 iSpellTypes) { continue; } - if (spells[selectedMercSpell.spellid].skill == EQEmu::skills::SkillBackstab && spells[selectedMercSpell.spellid].targettype == ST_Self) { + if (spells[selectedMercSpell.spellid].skill == EQ::skills::SkillBackstab && spells[selectedMercSpell.spellid].targettype == ST_Self) { if(!hidden) { continue; } @@ -2577,15 +2577,15 @@ int16 Merc::GetFocusEffect(focusType type, uint16 spell_id) { //Check if item focus effect exists for the client. if (itembonuses.FocusEffects[type]){ - const EQEmu::ItemData* TempItem = nullptr; - const EQEmu::ItemData* UsedItem = nullptr; + const EQ::ItemData* TempItem = nullptr; + const EQ::ItemData* UsedItem = nullptr; uint16 UsedFocusID = 0; int16 Total = 0; int16 focus_max = 0; int16 focus_max_real = 0; //item focus - for (int x = EQEmu::invslot::EQUIPMENT_BEGIN; x <= EQEmu::invslot::EQUIPMENT_END; ++x) + for (int x = EQ::invslot::EQUIPMENT_BEGIN; x <= EQ::invslot::EQUIPMENT_END; ++x) { TempItem = nullptr; if (equipment[x] == 0) @@ -3669,13 +3669,13 @@ MercSpell Merc::GetBestMercSpellForAENuke(Merc* caster, Mob* tar) { switch(caster->GetStance()) { - case EQEmu::constants::stanceBurnAE: + case EQ::constants::stanceBurnAE: initialCastChance = 50; break; - case EQEmu::constants::stanceBalanced: + case EQ::constants::stanceBalanced: initialCastChance = 25; break; - case EQEmu::constants::stanceBurn: + case EQ::constants::stanceBurn: initialCastChance = 0; break; } @@ -3717,11 +3717,11 @@ MercSpell Merc::GetBestMercSpellForTargetedAENuke(Merc* caster, Mob* tar) { switch(caster->GetStance()) { - case EQEmu::constants::stanceBurnAE: + case EQ::constants::stanceBurnAE: numTargetsCheck = 1; break; - case EQEmu::constants::stanceBalanced: - case EQEmu::constants::stanceBurn: + case EQ::constants::stanceBalanced: + case EQ::constants::stanceBurn: numTargetsCheck = 2; break; } @@ -3769,11 +3769,11 @@ MercSpell Merc::GetBestMercSpellForPBAENuke(Merc* caster, Mob* tar) { switch(caster->GetStance()) { - case EQEmu::constants::stanceBurnAE: + case EQ::constants::stanceBurnAE: numTargetsCheck = 2; break; - case EQEmu::constants::stanceBalanced: - case EQEmu::constants::stanceBurn: + case EQ::constants::stanceBalanced: + case EQ::constants::stanceBurn: numTargetsCheck = 3; break; } @@ -3820,11 +3820,11 @@ MercSpell Merc::GetBestMercSpellForAERainNuke(Merc* caster, Mob* tar) { switch(caster->GetStance()) { - case EQEmu::constants::stanceBurnAE: + case EQ::constants::stanceBurnAE: numTargetsCheck = 1; break; - case EQEmu::constants::stanceBalanced: - case EQEmu::constants::stanceBurn: + case EQ::constants::stanceBalanced: + case EQ::constants::stanceBurn: numTargetsCheck = 2; break; } @@ -4045,7 +4045,7 @@ bool Merc::UseDiscipline(int32 spell_id, int32 target) { if(IsCasting()) InterruptSpell(); - CastSpell(spell_id, target, EQEmu::spells::CastingSlot::Discipline); + CastSpell(spell_id, target, EQ::spells::CastingSlot::Discipline); return(true); } @@ -4461,25 +4461,25 @@ void Merc::DoClassAttacks(Mob *target) { if(zone->random.Int(0, 100) > 25) //tested on live, warrior mobs both kick and bash, kick about 75% of the time, casting doesn't seem to make a difference. { DoAnim(animKick, 0, false); - int32 dmg = GetBaseSkillDamage(EQEmu::skills::SkillKick); + int32 dmg = GetBaseSkillDamage(EQ::skills::SkillKick); - if (GetWeaponDamage(target, (const EQEmu::ItemData*)nullptr) <= 0) + if (GetWeaponDamage(target, (const EQ::ItemData*)nullptr) <= 0) dmg = DMG_INVULNERABLE; reuse = KickReuseTime * 1000; - DoSpecialAttackDamage(target, EQEmu::skills::SkillKick, dmg, 1, -1, reuse); + DoSpecialAttackDamage(target, EQ::skills::SkillKick, dmg, 1, -1, reuse); did_attack = true; } else { DoAnim(animTailRake, 0, false); - int32 dmg = GetBaseSkillDamage(EQEmu::skills::SkillBash); + int32 dmg = GetBaseSkillDamage(EQ::skills::SkillBash); - if (GetWeaponDamage(target, (const EQEmu::ItemData*)nullptr) <= 0) + if (GetWeaponDamage(target, (const EQ::ItemData*)nullptr) <= 0) dmg = DMG_INVULNERABLE; reuse = BashReuseTime * 1000; - DoSpecialAttackDamage(target, EQEmu::skills::SkillBash, dmg, 1, -1, reuse); + DoSpecialAttackDamage(target, EQ::skills::SkillBash, dmg, 1, -1, reuse); did_attack = true; } } @@ -4501,7 +4501,7 @@ bool Merc::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, boo return NPC::Attack(other, Hand, bRiposte, IsStrikethrough, IsFromSpell, opts); } -void Merc::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) +void Merc::Damage(Mob* other, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) { if(IsDead() || IsCorpse()) return; @@ -4542,7 +4542,7 @@ Mob* Merc::GetOwnerOrSelf() { return Result; } -bool Merc::Death(Mob* killerMob, int32 damage, uint16 spell, EQEmu::skills::SkillType attack_skill) +bool Merc::Death(Mob* killerMob, int32 damage, uint16 spell, EQ::skills::SkillType attack_skill) { if(!NPC::Death(killerMob, damage, spell, attack_skill)) { @@ -5062,12 +5062,12 @@ void Merc::ScaleStats(int scalepercent, bool setmax) { void Merc::UpdateMercAppearance() { // Copied from Bot Code: uint32 itemID = 0; - uint8 materialFromSlot = EQEmu::textures::materialInvalid; - for (int i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; ++i) { + uint8 materialFromSlot = EQ::textures::materialInvalid; + for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; ++i) { itemID = equipment[i]; if(itemID != 0) { - materialFromSlot = EQEmu::InventoryProfile::CalcMaterialFromSlot(i); - if (materialFromSlot != EQEmu::textures::materialInvalid) + materialFromSlot = EQ::InventoryProfile::CalcMaterialFromSlot(i); + if (materialFromSlot != EQ::textures::materialInvalid) this->SendWearChange(materialFromSlot); } } @@ -5078,18 +5078,18 @@ void Merc::UpdateMercAppearance() { void Merc::UpdateEquipmentLight() { - m_Light.Type[EQEmu::lightsource::LightEquipment] = 0; - m_Light.Level[EQEmu::lightsource::LightEquipment] = 0; + m_Light.Type[EQ::lightsource::LightEquipment] = 0; + m_Light.Level[EQ::lightsource::LightEquipment] = 0; - for (int index = EQEmu::invslot::EQUIPMENT_BEGIN; index <= EQEmu::invslot::EQUIPMENT_END; ++index) { - if (index == EQEmu::invslot::slotAmmo) { continue; } + for (int index = EQ::invslot::EQUIPMENT_BEGIN; index <= EQ::invslot::EQUIPMENT_END; ++index) { + if (index == EQ::invslot::slotAmmo) { continue; } auto item = database.GetItem(equipment[index]); if (item == nullptr) { continue; } - if (EQEmu::lightsource::IsLevelGreater(item->Light, m_Light.Type[EQEmu::lightsource::LightEquipment])) { - m_Light.Type[EQEmu::lightsource::LightEquipment] = item->Light; - m_Light.Level[EQEmu::lightsource::LightEquipment] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightEquipment]); + if (EQ::lightsource::IsLevelGreater(item->Light, m_Light.Type[EQ::lightsource::LightEquipment])) { + m_Light.Type[EQ::lightsource::LightEquipment] = item->Light; + m_Light.Level[EQ::lightsource::LightEquipment] = EQ::lightsource::TypeToLevel(m_Light.Type[EQ::lightsource::LightEquipment]); } } @@ -5101,14 +5101,14 @@ void Merc::UpdateEquipmentLight() if (!item->IsClassCommon()) { continue; } if (item->Light < 9 || item->Light > 13) { continue; } - if (EQEmu::lightsource::TypeToLevel(item->Light)) + if (EQ::lightsource::TypeToLevel(item->Light)) general_light_type = item->Light; } - if (EQEmu::lightsource::IsLevelGreater(general_light_type, m_Light.Type[EQEmu::lightsource::LightEquipment])) - m_Light.Type[EQEmu::lightsource::LightEquipment] = general_light_type; + if (EQ::lightsource::IsLevelGreater(general_light_type, m_Light.Type[EQ::lightsource::LightEquipment])) + m_Light.Type[EQ::lightsource::LightEquipment] = general_light_type; - m_Light.Level[EQEmu::lightsource::LightEquipment] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightEquipment]); + m_Light.Level[EQ::lightsource::LightEquipment] = EQ::lightsource::TypeToLevel(m_Light.Type[EQ::lightsource::LightEquipment]); } void Merc::AddItem(uint8 slot, uint32 item_id) { @@ -5164,109 +5164,109 @@ void Client::SendMercResponsePackets(uint32 ResponseType) SendMercMerchantResponsePacket(6); break; case 7: //You must dismiss your suspended mercenary before purchasing a new one! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(7); else //You have the maximum number of mercenaries. You must dismiss one before purchasing a new one! SendMercMerchantResponsePacket(6); break; case 8: //You can not purchase a mercenary because your group is full! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(8); else SendMercMerchantResponsePacket(7); break; case 9: //You can not purchase a mercenary because you are in combat! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) //Mercenary failed to spawn! SendMercMerchantResponsePacket(3); else SendMercMerchantResponsePacket(8); break; case 10: //You have recently dismissed a mercenary and must wait a few more seconds before you can purchase a new one! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) //Mercenary failed to spawn! SendMercMerchantResponsePacket(3); else SendMercMerchantResponsePacket(9); break; case 11: //An error occurred created your mercenary! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(9); else SendMercMerchantResponsePacket(10); break; case 12: //Upkeep Charge Message - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(10); else SendMercMerchantResponsePacket(11); break; case 13: // ??? - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(11); else SendMercMerchantResponsePacket(12); break; case 14: //You ran out of funds to pay for your mercenary! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(12); else SendMercMerchantResponsePacket(13); break; case 15: // ??? - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(13); else SendMercMerchantResponsePacket(14); break; case 16: //Your mercenary is about to be suspended due to insufficient funds! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(14); else SendMercMerchantResponsePacket(15); break; case 17: //There is no mercenary liaison nearby! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(15); else SendMercMerchantResponsePacket(16); break; case 18: //You are too far from the liaison! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(16); else SendMercMerchantResponsePacket(17); break; case 19: //You do not meet the requirements for that mercenary! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) SendMercMerchantResponsePacket(17); else SendMercMerchantResponsePacket(18); break; case 20: //You are unable to interact with the liaison! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) //You are too far from the liaison! SendMercMerchantResponsePacket(16); else SendMercMerchantResponsePacket(19); break; case 21: //You do not have a high enough membership level to purchase this mercenary! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) //You do not meet the requirements for that mercenary! SendMercMerchantResponsePacket(17); else SendMercMerchantResponsePacket(20); break; case 22: //Your purchase has failed because this mercenary requires a Gold membership! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) //You do not meet the requirements for that mercenary! SendMercMerchantResponsePacket(17); else SendMercMerchantResponsePacket(21); break; case 23: //Your purchase has failed because this mercenary requires at least a Silver membership! - if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() < EQ::versions::ClientVersion::RoF) //You do not meet the requirements for that mercenary! SendMercMerchantResponsePacket(17); else @@ -5649,7 +5649,7 @@ void Client::SpawnMerc(Merc* merc, bool setMaxStats) { merc->SetSuspended(false); SetMerc(merc); merc->Unsuspend(setMaxStats); - merc->SetStance((EQEmu::constants::StanceType)GetMercInfo().Stance); + merc->SetStance((EQ::constants::StanceType)GetMercInfo().Stance); Log(Logs::General, Logs::Mercenaries, "SpawnMerc Success for %s.", GetName()); @@ -6106,7 +6106,7 @@ void Client::UpdateMercLevel() { void Client::SendMercMerchantResponsePacket(int32 response_type) { // This response packet brings up the Mercenary Manager window - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD) + if (ClientVersion() >= EQ::versions::ClientVersion::SoD) { auto outapp = new EQApplicationPacket(OP_MercenaryHire, sizeof(MercenaryMerchantResponse_Struct)); MercenaryMerchantResponse_Struct* mmr = (MercenaryMerchantResponse_Struct*)outapp->pBuffer; diff --git a/zone/merc.h b/zone/merc.h index 0fdc05f7a..efd27f703 100644 --- a/zone/merc.h +++ b/zone/merc.h @@ -12,7 +12,7 @@ struct MercTemplate; struct NPCType; struct NewSpawn_Struct; -namespace EQEmu +namespace EQ { struct ItemData; } @@ -52,9 +52,9 @@ public: virtual ~Merc(); //abstract virtual function implementations requird by base abstract class - virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill); - virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None); - virtual bool Attack(Mob* other, int Hand = EQEmu::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, + virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill); + virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None); + virtual bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr); virtual bool HasRaid() { return false; } virtual bool HasGroup() { return (GetGroup() ? true : false); } @@ -163,16 +163,16 @@ public: uint8 GetTierID() { return _TierID; } uint32 GetCostFormula() { return _CostFormula; } uint32 GetMercNameType() { return _NameType; } - EQEmu::constants::StanceType GetStance() { return _currentStance; } + EQ::constants::StanceType GetStance() { return _currentStance; } int GetHatedCount() { return _hatedCount; } inline const uint8 GetClientVersion() const { return _OwnerClientVersion; } virtual void SetTarget(Mob* mob); - bool HasSkill(EQEmu::skills::SkillType skill_id) const; - bool CanHaveSkill(EQEmu::skills::SkillType skill_id) const; - uint16 MaxSkill(EQEmu::skills::SkillType skillid, uint16 class_, uint16 level) const; - inline uint16 MaxSkill(EQEmu::skills::SkillType skillid) const { return MaxSkill(skillid, GetClass(), GetLevel()); } + bool HasSkill(EQ::skills::SkillType skill_id) const; + bool CanHaveSkill(EQ::skills::SkillType skill_id) const; + uint16 MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const; + inline uint16 MaxSkill(EQ::skills::SkillType skillid) const { return MaxSkill(skillid, GetClass(), GetLevel()); } virtual void DoClassAttacks(Mob *target); void CheckHateList(); bool CheckTaunt(); @@ -253,7 +253,7 @@ public: void SetMercNameType( uint8 nametype ) { _NameType = nametype; } void SetClientVersion(uint8 clientVersion) { _OwnerClientVersion = clientVersion; } void SetSuspended(bool suspended) { _suspended = suspended; } - void SetStance( EQEmu::constants::StanceType stance ) { _currentStance = stance; } + void SetStance( EQ::constants::StanceType stance ) { _currentStance = stance; } void SetHatedCount( int count ) { _hatedCount = count; } void Sit(); @@ -270,7 +270,7 @@ public: protected: void CalcItemBonuses(StatBonuses* newbon); - void AddItemBonuses(const EQEmu::ItemData *item, StatBonuses* newbon); + void AddItemBonuses(const EQ::ItemData *item, StatBonuses* newbon); int CalcRecommendedLevelBonus(uint8 level, uint8 reclevel, int basestat); int16 GetFocusEffect(focusType type, uint16 spell_id); @@ -280,8 +280,8 @@ protected: Timer evade_timer; // can be moved to pTimers at some point - uint16 skills[EQEmu::skills::HIGHEST_SKILL + 1]; - uint32 equipment[EQEmu::invslot::EQUIPMENT_COUNT]; //this is an array of item IDs + uint16 skills[EQ::skills::HIGHEST_SKILL + 1]; + uint32 equipment[EQ::invslot::EQUIPMENT_COUNT]; //this is an array of item IDs uint16 d_melee_texture1; //this is an item Material value uint16 d_melee_texture2; //this is an item Material value (offhand) uint8 prim_melee_type; //Sets the Primary Weapon attack message and animation @@ -373,9 +373,9 @@ private: uint8 _CostFormula; uint8 _NameType; uint8 _OwnerClientVersion; - EQEmu::constants::StanceType _currentStance; + EQ::constants::StanceType _currentStance; - EQEmu::InventoryProfile m_inv; + EQ::InventoryProfile m_inv; int32 max_end; int32 cur_end; bool _medding; diff --git a/zone/mob.cpp b/zone/mob.cpp index 5d25c42f0..3b607b2d2 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -77,7 +77,7 @@ Mob::Mob( uint32 in_drakkin_heritage, uint32 in_drakkin_tattoo, uint32 in_drakkin_details, - EQEmu::TintProfile in_armor_tint, + EQ::TintProfile in_armor_tint, uint8 in_aa_title, uint8 in_see_invis, // see through invis/ivu uint8 in_see_invis_undead, @@ -199,10 +199,10 @@ Mob::Mob( runspeed = 1.25f; } - m_Light.Type[EQEmu::lightsource::LightInnate] = in_light; - m_Light.Level[EQEmu::lightsource::LightInnate] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightInnate]); - m_Light.Type[EQEmu::lightsource::LightActive] = m_Light.Type[EQEmu::lightsource::LightInnate]; - m_Light.Level[EQEmu::lightsource::LightActive] = m_Light.Level[EQEmu::lightsource::LightInnate]; + m_Light.Type[EQ::lightsource::LightInnate] = in_light; + m_Light.Level[EQ::lightsource::LightInnate] = EQ::lightsource::TypeToLevel(m_Light.Type[EQ::lightsource::LightInnate]); + m_Light.Type[EQ::lightsource::LightActive] = m_Light.Type[EQ::lightsource::LightInnate]; + m_Light.Level[EQ::lightsource::LightActive] = m_Light.Level[EQ::lightsource::LightInnate]; texture = in_texture; helmtexture = in_helmtexture; @@ -300,7 +300,7 @@ Mob::Mob( RangedProcs[j].level_override = -1; } - for (int i = EQEmu::textures::textureBegin; i < EQEmu::textures::materialCount; i++) { + for (int i = EQ::textures::textureBegin; i < EQ::textures::materialCount; i++) { armor_tint.Slot[i].Color = in_armor_tint.Slot[i].Color; } @@ -444,7 +444,7 @@ Mob::Mob( m_AllowBeneficial = false; m_DisableMelee = false; - for (int i = 0; i < EQEmu::skills::HIGHEST_SKILL + 2; i++) { + for (int i = 0; i < EQ::skills::HIGHEST_SKILL + 2; i++) { SkillDmgTaken_Mod[i] = 0; } @@ -1147,7 +1147,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) ns->spawn.findable = findable?1:0; UpdateActiveLight(); - ns->spawn.light = m_Light.Type[EQEmu::lightsource::LightActive]; + ns->spawn.light = m_Light.Type[EQ::lightsource::LightActive]; if (IsNPC() && race == ERUDITE) ns->spawn.showhelm = 1; @@ -1363,7 +1363,7 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal (skip_self ? "true" : "false") ); - if (!skip_self || this->CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (!skip_self || this->CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::SoD) { auto client_packet = new EQApplicationPacket(OP_HPUpdate, sizeof(SpawnHPUpdate_Struct)); auto *hp_packet_client = (SpawnHPUpdate_Struct *) client_packet->pBuffer; @@ -1419,7 +1419,7 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal /** * Update those who have us targeted */ - entity_list.QueueClientsByTarget(this, &hp_packet, false, 0, false, true, EQEmu::versions::maskAllClients); + entity_list.QueueClientsByTarget(this, &hp_packet, false, 0, false, true, EQ::versions::maskAllClients); /** * Update those who have us on x-target @@ -1639,9 +1639,9 @@ void Mob::ShowStats(Client* client) client->Message(Chat::White, " AggroRange: %1.0f AssistRange: %1.0f", GetAggroRange(), GetAssistRange()); } - client->Message(Chat::White, " compute_tohit: %i TotalToHit: %i", compute_tohit(EQEmu::skills::SkillHandtoHand), GetTotalToHit(EQEmu::skills::SkillHandtoHand, 0)); + client->Message(Chat::White, " compute_tohit: %i TotalToHit: %i", compute_tohit(EQ::skills::SkillHandtoHand), GetTotalToHit(EQ::skills::SkillHandtoHand, 0)); client->Message(Chat::White, " compute_defense: %i TotalDefense: %i", compute_defense(), GetTotalDefense()); - client->Message(Chat::White, " offense: %i mitigation ac: %i", offense(EQEmu::skills::SkillHandtoHand), GetMitigationAC()); + client->Message(Chat::White, " offense: %i mitigation ac: %i", offense(EQ::skills::SkillHandtoHand), GetMitigationAC()); } } @@ -2368,18 +2368,18 @@ void Mob::SetAppearance(EmuAppearance app, bool iIgnoreSelf) { bool Mob::UpdateActiveLight() { - uint8 old_light_level = m_Light.Level[EQEmu::lightsource::LightActive]; + uint8 old_light_level = m_Light.Level[EQ::lightsource::LightActive]; - m_Light.Type[EQEmu::lightsource::LightActive] = 0; - m_Light.Level[EQEmu::lightsource::LightActive] = 0; + m_Light.Type[EQ::lightsource::LightActive] = 0; + m_Light.Level[EQ::lightsource::LightActive] = 0; - if (EQEmu::lightsource::IsLevelGreater((m_Light.Type[EQEmu::lightsource::LightInnate] & 0x0F), m_Light.Type[EQEmu::lightsource::LightActive])) { m_Light.Type[EQEmu::lightsource::LightActive] = m_Light.Type[EQEmu::lightsource::LightInnate]; } - if (m_Light.Level[EQEmu::lightsource::LightEquipment] > m_Light.Level[EQEmu::lightsource::LightActive]) { m_Light.Type[EQEmu::lightsource::LightActive] = m_Light.Type[EQEmu::lightsource::LightEquipment]; } // limiter in property handler - if (m_Light.Level[EQEmu::lightsource::LightSpell] > m_Light.Level[EQEmu::lightsource::LightActive]) { m_Light.Type[EQEmu::lightsource::LightActive] = m_Light.Type[EQEmu::lightsource::LightSpell]; } // limiter in property handler + if (EQ::lightsource::IsLevelGreater((m_Light.Type[EQ::lightsource::LightInnate] & 0x0F), m_Light.Type[EQ::lightsource::LightActive])) { m_Light.Type[EQ::lightsource::LightActive] = m_Light.Type[EQ::lightsource::LightInnate]; } + if (m_Light.Level[EQ::lightsource::LightEquipment] > m_Light.Level[EQ::lightsource::LightActive]) { m_Light.Type[EQ::lightsource::LightActive] = m_Light.Type[EQ::lightsource::LightEquipment]; } // limiter in property handler + if (m_Light.Level[EQ::lightsource::LightSpell] > m_Light.Level[EQ::lightsource::LightActive]) { m_Light.Type[EQ::lightsource::LightActive] = m_Light.Type[EQ::lightsource::LightSpell]; } // limiter in property handler - m_Light.Level[EQEmu::lightsource::LightActive] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightActive]); + m_Light.Level[EQ::lightsource::LightActive] = EQ::lightsource::TypeToLevel(m_Light.Type[EQ::lightsource::LightActive]); - return (m_Light.Level[EQEmu::lightsource::LightActive] != old_light_level); + return (m_Light.Level[EQ::lightsource::LightActive] != old_light_level); } void Mob::ChangeSize(float in_size = 0, bool bNoRestriction) { @@ -2511,20 +2511,20 @@ void Mob::SetZone(uint32 zone_id, uint32 instance_id) } void Mob::Kill() { - Death(this, 0, SPELL_UNKNOWN, EQEmu::skills::SkillHandtoHand); + Death(this, 0, SPELL_UNKNOWN, EQ::skills::SkillHandtoHand); } bool Mob::CanThisClassDualWield(void) const { if(!IsClient()) { - return(GetSkill(EQEmu::skills::SkillDualWield) > 0); + return(GetSkill(EQ::skills::SkillDualWield) > 0); } - else if (CastToClient()->HasSkill(EQEmu::skills::SkillDualWield)) { - const EQEmu::ItemInstance* pinst = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary); - const EQEmu::ItemInstance* sinst = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotSecondary); + else if (CastToClient()->HasSkill(EQ::skills::SkillDualWield)) { + const EQ::ItemInstance* pinst = CastToClient()->GetInv().GetItem(EQ::invslot::slotPrimary); + const EQ::ItemInstance* sinst = CastToClient()->GetInv().GetItem(EQ::invslot::slotSecondary); // 2HS, 2HB, or 2HP if(pinst && pinst->IsWeapon()) { - const EQEmu::ItemData* item = pinst->GetItem(); + const EQ::ItemData* item = pinst->GetItem(); if (item->IsType2HWeapon()) return false; @@ -2548,12 +2548,12 @@ bool Mob::CanThisClassDualWield(void) const { bool Mob::CanThisClassDoubleAttack(void) const { if(!IsClient()) { - return(GetSkill(EQEmu::skills::SkillDoubleAttack) > 0); + return(GetSkill(EQ::skills::SkillDoubleAttack) > 0); } else { if(aabonuses.GiveDoubleAttack || itembonuses.GiveDoubleAttack || spellbonuses.GiveDoubleAttack) { return true; } - return(CastToClient()->HasSkill(EQEmu::skills::SkillDoubleAttack)); + return(CastToClient()->HasSkill(EQ::skills::SkillDoubleAttack)); } } @@ -2562,7 +2562,7 @@ bool Mob::CanThisClassTripleAttack() const if (!IsClient()) return false; // When they added the real triple attack skill, mobs lost the ability to triple else - return CastToClient()->HasSkill(EQEmu::skills::SkillTripleAttack); + return CastToClient()->HasSkill(EQ::skills::SkillTripleAttack); } bool Mob::IsWarriorClass(void) const @@ -2601,36 +2601,36 @@ bool Mob::IsWarriorClass(void) const bool Mob::CanThisClassParry(void) const { if(!IsClient()) { - return(GetSkill(EQEmu::skills::SkillParry) > 0); + return(GetSkill(EQ::skills::SkillParry) > 0); } else { - return(CastToClient()->HasSkill(EQEmu::skills::SkillParry)); + return(CastToClient()->HasSkill(EQ::skills::SkillParry)); } } bool Mob::CanThisClassDodge(void) const { if(!IsClient()) { - return(GetSkill(EQEmu::skills::SkillDodge) > 0); + return(GetSkill(EQ::skills::SkillDodge) > 0); } else { - return(CastToClient()->HasSkill(EQEmu::skills::SkillDodge)); + return(CastToClient()->HasSkill(EQ::skills::SkillDodge)); } } bool Mob::CanThisClassRiposte(void) const { if(!IsClient()) { - return(GetSkill(EQEmu::skills::SkillRiposte) > 0); + return(GetSkill(EQ::skills::SkillRiposte) > 0); } else { - return(CastToClient()->HasSkill(EQEmu::skills::SkillRiposte)); + return(CastToClient()->HasSkill(EQ::skills::SkillRiposte)); } } bool Mob::CanThisClassBlock(void) const { if(!IsClient()) { - return(GetSkill(EQEmu::skills::SkillBlock) > 0); + return(GetSkill(EQ::skills::SkillBlock) > 0); } else { - return(CastToClient()->HasSkill(EQEmu::skills::SkillBlock)); + return(CastToClient()->HasSkill(EQ::skills::SkillBlock)); } } /* @@ -2881,7 +2881,7 @@ uint32 Mob::RandomTimer(int min, int max) uint32 Mob::IsEliteMaterialItem(uint8 material_slot) const { - const EQEmu::ItemData *item = nullptr; + const EQ::ItemData *item = nullptr; item = database.GetItem(GetEquippedItemFromTextureSlot(material_slot)); if(item != 0) @@ -3111,7 +3111,7 @@ int32 Mob::GetActSpellCasttime(uint16 spell_id, int32 casttime) { return casttime; } -void Mob::ExecWeaponProc(const EQEmu::ItemInstance *inst, uint16 spell_id, Mob *on, int level_override) { +void Mob::ExecWeaponProc(const EQ::ItemInstance *inst, uint16 spell_id, Mob *on, int level_override) { // Changed proc targets to look up based on the spells goodEffect flag. // This should work for the majority of weapons. if(spell_id == SPELL_UNKNOWN || on->GetSpecialAbility(NO_HARM_FROM_CLIENT)) { @@ -3132,9 +3132,9 @@ void Mob::ExecWeaponProc(const EQEmu::ItemInstance *inst, uint16 spell_id, Mob * if(inst && IsClient()) { //const cast is dirty but it would require redoing a ton of interfaces at this point - //It should be safe as we don't have any truly const EQEmu::ItemInstance floating around anywhere. + //It should be safe as we don't have any truly const EQ::ItemInstance floating around anywhere. //So we'll live with it for now - int i = parse->EventItem(EVENT_WEAPON_PROC, CastToClient(), const_cast(inst), on, "", spell_id); + int i = parse->EventItem(EVENT_WEAPON_PROC, CastToClient(), const_cast(inst), on, "", spell_id); if(i != 0) { return; } @@ -3150,12 +3150,12 @@ void Mob::ExecWeaponProc(const EQEmu::ItemInstance *inst, uint16 spell_id, Mob * twinproc = true; if (IsBeneficialSpell(spell_id) && (!IsNPC() || (IsNPC() && CastToNPC()->GetInnateProcSpellID() != spell_id))) { // NPC innate procs don't take this path ever - SpellFinished(spell_id, this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff, true, level_override); + SpellFinished(spell_id, this, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff, true, level_override); if(twinproc) SpellOnTarget(spell_id, this, false, false, 0, true, level_override); } else if(!(on->IsClient() && on->CastToClient()->dead)) { //dont proc on dead clients - SpellFinished(spell_id, on, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff, true, level_override); + SpellFinished(spell_id, on, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff, true, level_override); if(twinproc) SpellOnTarget(spell_id, on, false, false, 0, true, level_override); } @@ -3368,19 +3368,19 @@ void Mob::TriggerDefensiveProcs(Mob *on, uint16 hand, bool FromSkillProc, int da uint16 skillinuse = 0; switch (damage) { case (-1): - skillinuse = EQEmu::skills::SkillBlock; + skillinuse = EQ::skills::SkillBlock; break; case (-2): - skillinuse = EQEmu::skills::SkillParry; + skillinuse = EQ::skills::SkillParry; break; case (-3): - skillinuse = EQEmu::skills::SkillRiposte; + skillinuse = EQ::skills::SkillRiposte; break; case (-4): - skillinuse = EQEmu::skills::SkillDodge; + skillinuse = EQ::skills::SkillDodge; break; } @@ -3496,7 +3496,7 @@ void Mob::TriggerOnCast(uint32 focus_spell, uint32 spell_id, bool aa_trigger) trigger_spell_id = CastToClient()->CalcAAFocus(focusTriggerOnCast, *rank, spell_id); if (IsValidSpell(trigger_spell_id) && GetTarget()) - SpellFinished(trigger_spell_id, GetTarget(), EQEmu::spells::CastingSlot::Item, 0, -1, + SpellFinished(trigger_spell_id, GetTarget(), EQ::spells::CastingSlot::Item, 0, -1, spells[trigger_spell_id].ResistDiff); } @@ -3504,7 +3504,7 @@ void Mob::TriggerOnCast(uint32 focus_spell, uint32 spell_id, bool aa_trigger) trigger_spell_id = CalcFocusEffect(focusTriggerOnCast, focus_spell, spell_id); if (IsValidSpell(trigger_spell_id) && GetTarget()) { - SpellFinished(trigger_spell_id, GetTarget(), EQEmu::spells::CastingSlot::Item, 0, -1, + SpellFinished(trigger_spell_id, GetTarget(), EQ::spells::CastingSlot::Item, 0, -1, spells[trigger_spell_id].ResistDiff); CheckNumHitsRemaining(NumHit::MatchingSpells, -1, focus_spell); } @@ -3535,7 +3535,7 @@ bool Mob::TrySpellTrigger(Mob *target, uint32 spell_id, int effect) { // If we trigger an effect then its over. if (IsValidSpell(spells[spell_id].base2[i])){ - SpellFinished(spells[spell_id].base2[i], target, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spells[spell_id].base2[i]].ResistDiff); + SpellFinished(spells[spell_id].base2[i], target, EQ::spells::CastingSlot::Item, 0, -1, spells[spells[spell_id].base2[i]].ResistDiff); return true; } } @@ -3554,7 +3554,7 @@ bool Mob::TrySpellTrigger(Mob *target, uint32 spell_id, int effect) if(zone->random.Int(0, 100) <= spells[spell_id].base[effect]) { if (IsValidSpell(spells[spell_id].base2[effect])){ - SpellFinished(spells[spell_id].base2[effect], target, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spells[spell_id].base2[effect]].ResistDiff); + SpellFinished(spells[spell_id].base2[effect], target, EQ::spells::CastingSlot::Item, 0, -1, spells[spells[spell_id].base2[effect]].ResistDiff); return true; //Only trigger once of these per spell effect. } } @@ -3631,7 +3631,7 @@ void Mob::TryTriggerOnValueAmount(bool IsHP, bool IsMana, bool IsEndur, bool IsP } if (use_spell){ - SpellFinished(spells[spell_id].base[i], this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); + SpellFinished(spells[spell_id].base[i], this, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); if(!TryFadeEffect(e)) BuffFadeBySlot(e); @@ -3659,7 +3659,7 @@ void Mob::TryTwincast(Mob *caster, Mob *target, uint32 spell_id) if(zone->random.Roll(focus)) { Message(Chat::Spells,"You twincast %s!", spells[spell_id].name); - SpellFinished(spell_id, target, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); + SpellFinished(spell_id, target, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); } } } @@ -3677,7 +3677,7 @@ void Mob::TryTwincast(Mob *caster, Mob *target, uint32 spell_id) { if(zone->random.Roll(focus)) { - SpellFinished(spell_id, target, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); + SpellFinished(spell_id, target, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); } } } @@ -3745,15 +3745,15 @@ int32 Mob::GetVulnerability(Mob* caster, uint32 spell_id, uint32 ticsremaining) return value; } -int16 Mob::GetSkillDmgTaken(const EQEmu::skills::SkillType skill_used, ExtraAttackOptions *opts) +int16 Mob::GetSkillDmgTaken(const EQ::skills::SkillType skill_used, ExtraAttackOptions *opts) { int skilldmg_mod = 0; // All skill dmg mod + Skill specific - skilldmg_mod += itembonuses.SkillDmgTaken[EQEmu::skills::HIGHEST_SKILL + 1] + spellbonuses.SkillDmgTaken[EQEmu::skills::HIGHEST_SKILL + 1] + + skilldmg_mod += itembonuses.SkillDmgTaken[EQ::skills::HIGHEST_SKILL + 1] + spellbonuses.SkillDmgTaken[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.SkillDmgTaken[skill_used] + spellbonuses.SkillDmgTaken[skill_used]; - skilldmg_mod += SkillDmgTaken_Mod[skill_used] + SkillDmgTaken_Mod[EQEmu::skills::HIGHEST_SKILL + 1]; + skilldmg_mod += SkillDmgTaken_Mod[skill_used] + SkillDmgTaken_Mod[EQ::skills::HIGHEST_SKILL + 1]; if (opts) skilldmg_mod += opts->skilldmgtaken_bonus_flat; @@ -3805,10 +3805,10 @@ bool Mob::TryFadeEffect(int slot) if(IsValidSpell(spell_id)) { if (IsBeneficialSpell(spell_id)) { - SpellFinished(spell_id, this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); + SpellFinished(spell_id, this, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); } else if(!(IsClient() && CastToClient()->dead)) { - SpellFinished(spell_id, this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); + SpellFinished(spell_id, this, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); } return true; } @@ -3842,7 +3842,7 @@ void Mob::TrySympatheticProc(Mob *target, uint32 spell_id) SpellFinished(focus_trigger, target); else - SpellFinished(focus_trigger, this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[focus_trigger].ResistDiff); + SpellFinished(focus_trigger, this, EQ::spells::CastingSlot::Item, 0, -1, spells[focus_trigger].ResistDiff); } // For detrimental spells, if the triggered spell is beneficial, then it will land on the caster // if the triggered spell is also detrimental, then it will land on the target @@ -3852,7 +3852,7 @@ void Mob::TrySympatheticProc(Mob *target, uint32 spell_id) SpellFinished(focus_trigger, this); else - SpellFinished(focus_trigger, target, EQEmu::spells::CastingSlot::Item, 0, -1, spells[focus_trigger].ResistDiff); + SpellFinished(focus_trigger, target, EQ::spells::CastingSlot::Item, 0, -1, spells[focus_trigger].ResistDiff); } CheckNumHitsRemaining(NumHit::MatchingSpells, -1, focus_spell); @@ -3860,11 +3860,11 @@ void Mob::TrySympatheticProc(Mob *target, uint32 spell_id) int32 Mob::GetItemStat(uint32 itemid, const char *identifier) { - const EQEmu::ItemInstance* inst = database.CreateItem(itemid); + const EQ::ItemInstance* inst = database.CreateItem(itemid); if (!inst) return 0; - const EQEmu::ItemData* item = inst->GetItem(); + const EQ::ItemData* item = inst->GetItem(); if (!item) return 0; @@ -4502,7 +4502,7 @@ void Mob::TrySpellOnKill(uint8 level, uint16 spell_id) if (IsValidSpell(spells[spell_id].base2[i]) && spells[spell_id].max[i] <= level) { if(zone->random.Roll(spells[spell_id].base[i])) - SpellFinished(spells[spell_id].base2[i], this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spells[spell_id].base2[i]].ResistDiff); + SpellFinished(spells[spell_id].base2[i], this, EQ::spells::CastingSlot::Item, 0, -1, spells[spells[spell_id].base2[i]].ResistDiff); } } } @@ -4517,17 +4517,17 @@ void Mob::TrySpellOnKill(uint8 level, uint16 spell_id) if(aabonuses.SpellOnKill[i] && IsValidSpell(aabonuses.SpellOnKill[i]) && (level >= aabonuses.SpellOnKill[i + 2])) { if(zone->random.Roll(static_cast(aabonuses.SpellOnKill[i + 1]))) - SpellFinished(aabonuses.SpellOnKill[i], this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SpellOnKill[i]].ResistDiff); + SpellFinished(aabonuses.SpellOnKill[i], this, EQ::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SpellOnKill[i]].ResistDiff); } if(itembonuses.SpellOnKill[i] && IsValidSpell(itembonuses.SpellOnKill[i]) && (level >= itembonuses.SpellOnKill[i + 2])){ if(zone->random.Roll(static_cast(itembonuses.SpellOnKill[i + 1]))) - SpellFinished(itembonuses.SpellOnKill[i], this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SpellOnKill[i]].ResistDiff); + SpellFinished(itembonuses.SpellOnKill[i], this, EQ::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SpellOnKill[i]].ResistDiff); } if(spellbonuses.SpellOnKill[i] && IsValidSpell(spellbonuses.SpellOnKill[i]) && (level >= spellbonuses.SpellOnKill[i + 2])) { if(zone->random.Roll(static_cast(spellbonuses.SpellOnKill[i + 1]))) - SpellFinished(spellbonuses.SpellOnKill[i], this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SpellOnKill[i]].ResistDiff); + SpellFinished(spellbonuses.SpellOnKill[i], this, EQ::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SpellOnKill[i]].ResistDiff); } } @@ -4544,19 +4544,19 @@ bool Mob::TrySpellOnDeath() for(int i = 0; i < MAX_SPELL_TRIGGER*2; i+=2) { if(IsClient() && aabonuses.SpellOnDeath[i] && IsValidSpell(aabonuses.SpellOnDeath[i])) { if(zone->random.Roll(static_cast(aabonuses.SpellOnDeath[i + 1]))) { - SpellFinished(aabonuses.SpellOnDeath[i], this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SpellOnDeath[i]].ResistDiff); + SpellFinished(aabonuses.SpellOnDeath[i], this, EQ::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SpellOnDeath[i]].ResistDiff); } } if(itembonuses.SpellOnDeath[i] && IsValidSpell(itembonuses.SpellOnDeath[i])) { if(zone->random.Roll(static_cast(itembonuses.SpellOnDeath[i + 1]))) { - SpellFinished(itembonuses.SpellOnDeath[i], this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[itembonuses.SpellOnDeath[i]].ResistDiff); + SpellFinished(itembonuses.SpellOnDeath[i], this, EQ::spells::CastingSlot::Item, 0, -1, spells[itembonuses.SpellOnDeath[i]].ResistDiff); } } if(spellbonuses.SpellOnDeath[i] && IsValidSpell(spellbonuses.SpellOnDeath[i])) { if(zone->random.Roll(static_cast(spellbonuses.SpellOnDeath[i + 1]))) { - SpellFinished(spellbonuses.SpellOnDeath[i], this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spellbonuses.SpellOnDeath[i]].ResistDiff); + SpellFinished(spellbonuses.SpellOnDeath[i], this, EQ::spells::CastingSlot::Item, 0, -1, spells[spellbonuses.SpellOnDeath[i]].ResistDiff); } } } @@ -4573,7 +4573,7 @@ int16 Mob::GetCritDmgMod(uint16 skill) int critDmg_mod = 0; // All skill dmg mod + Skill specific - critDmg_mod += itembonuses.CritDmgMod[EQEmu::skills::HIGHEST_SKILL + 1] + spellbonuses.CritDmgMod[EQEmu::skills::HIGHEST_SKILL + 1] + aabonuses.CritDmgMod[EQEmu::skills::HIGHEST_SKILL + 1] + + critDmg_mod += itembonuses.CritDmgMod[EQ::skills::HIGHEST_SKILL + 1] + spellbonuses.CritDmgMod[EQ::skills::HIGHEST_SKILL + 1] + aabonuses.CritDmgMod[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.CritDmgMod[skill] + spellbonuses.CritDmgMod[skill] + aabonuses.CritDmgMod[skill]; return critDmg_mod; @@ -4615,7 +4615,7 @@ int Mob::GetCriticalChanceBonus(uint16 skill) int critical_chance = 0; // All skills + Skill specific - critical_chance += itembonuses.CriticalHitChance[EQEmu::skills::HIGHEST_SKILL + 1] + spellbonuses.CriticalHitChance[EQEmu::skills::HIGHEST_SKILL + 1] + aabonuses.CriticalHitChance[EQEmu::skills::HIGHEST_SKILL + 1] + + critical_chance += itembonuses.CriticalHitChance[EQ::skills::HIGHEST_SKILL + 1] + spellbonuses.CriticalHitChance[EQ::skills::HIGHEST_SKILL + 1] + aabonuses.CriticalHitChance[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.CriticalHitChance[skill] + spellbonuses.CriticalHitChance[skill] + aabonuses.CriticalHitChance[skill]; if(critical_chance < -100) @@ -4629,10 +4629,10 @@ int16 Mob::GetMeleeDamageMod_SE(uint16 skill) int dmg_mod = 0; // All skill dmg mod + Skill specific - dmg_mod += itembonuses.DamageModifier[EQEmu::skills::HIGHEST_SKILL + 1] + spellbonuses.DamageModifier[EQEmu::skills::HIGHEST_SKILL + 1] + aabonuses.DamageModifier[EQEmu::skills::HIGHEST_SKILL + 1] + + dmg_mod += itembonuses.DamageModifier[EQ::skills::HIGHEST_SKILL + 1] + spellbonuses.DamageModifier[EQ::skills::HIGHEST_SKILL + 1] + aabonuses.DamageModifier[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.DamageModifier[skill] + spellbonuses.DamageModifier[skill] + aabonuses.DamageModifier[skill]; - dmg_mod += itembonuses.DamageModifier2[EQEmu::skills::HIGHEST_SKILL + 1] + spellbonuses.DamageModifier2[EQEmu::skills::HIGHEST_SKILL + 1] + aabonuses.DamageModifier2[EQEmu::skills::HIGHEST_SKILL + 1] + + dmg_mod += itembonuses.DamageModifier2[EQ::skills::HIGHEST_SKILL + 1] + spellbonuses.DamageModifier2[EQ::skills::HIGHEST_SKILL + 1] + aabonuses.DamageModifier2[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.DamageModifier2[skill] + spellbonuses.DamageModifier2[skill] + aabonuses.DamageModifier2[skill]; if(dmg_mod < -100) @@ -4646,7 +4646,7 @@ int16 Mob::GetMeleeMinDamageMod_SE(uint16 skill) int dmg_mod = 0; dmg_mod = itembonuses.MinDamageModifier[skill] + spellbonuses.MinDamageModifier[skill] + - itembonuses.MinDamageModifier[EQEmu::skills::HIGHEST_SKILL + 1] + spellbonuses.MinDamageModifier[EQEmu::skills::HIGHEST_SKILL + 1]; + itembonuses.MinDamageModifier[EQ::skills::HIGHEST_SKILL + 1] + spellbonuses.MinDamageModifier[EQ::skills::HIGHEST_SKILL + 1]; if(dmg_mod < -100) dmg_mod = -100; @@ -4678,10 +4678,10 @@ int16 Mob::GetSkillDmgAmt(uint16 skill) int skill_dmg = 0; // All skill dmg(only spells do this) + Skill specific - skill_dmg += spellbonuses.SkillDamageAmount[EQEmu::skills::HIGHEST_SKILL + 1] + itembonuses.SkillDamageAmount[EQEmu::skills::HIGHEST_SKILL + 1] + aabonuses.SkillDamageAmount[EQEmu::skills::HIGHEST_SKILL + 1] + skill_dmg += spellbonuses.SkillDamageAmount[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.SkillDamageAmount[EQ::skills::HIGHEST_SKILL + 1] + aabonuses.SkillDamageAmount[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.SkillDamageAmount[skill] + spellbonuses.SkillDamageAmount[skill] + aabonuses.SkillDamageAmount[skill]; - skill_dmg += spellbonuses.SkillDamageAmount2[EQEmu::skills::HIGHEST_SKILL + 1] + itembonuses.SkillDamageAmount2[EQEmu::skills::HIGHEST_SKILL + 1] + skill_dmg += spellbonuses.SkillDamageAmount2[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.SkillDamageAmount2[EQ::skills::HIGHEST_SKILL + 1] + itembonuses.SkillDamageAmount2[skill] + spellbonuses.SkillDamageAmount2[skill]; return skill_dmg; @@ -4701,7 +4701,7 @@ void Mob::MeleeLifeTap(int32 damage) { if (lifetap_amt > 0) HealDamage(lifetap_amt); //Heal self for modified damage amount. else - Damage(this, -lifetap_amt, 0, EQEmu::skills::SkillEvocation, false); //Dmg self for modified damage amount. + Damage(this, -lifetap_amt, 0, EQ::skills::SkillEvocation, false); //Dmg self for modified damage amount. } } @@ -4904,21 +4904,21 @@ void Mob::SetBodyType(bodyType new_body, bool overwrite_orig) { } -void Mob::ModSkillDmgTaken(EQEmu::skills::SkillType skill_num, int value) +void Mob::ModSkillDmgTaken(EQ::skills::SkillType skill_num, int value) { if (skill_num == ALL_SKILLS) - SkillDmgTaken_Mod[EQEmu::skills::HIGHEST_SKILL + 1] = value; + SkillDmgTaken_Mod[EQ::skills::HIGHEST_SKILL + 1] = value; - else if (skill_num >= 0 && skill_num <= EQEmu::skills::HIGHEST_SKILL) + else if (skill_num >= 0 && skill_num <= EQ::skills::HIGHEST_SKILL) SkillDmgTaken_Mod[skill_num] = value; } -int16 Mob::GetModSkillDmgTaken(const EQEmu::skills::SkillType skill_num) +int16 Mob::GetModSkillDmgTaken(const EQ::skills::SkillType skill_num) { if (skill_num == ALL_SKILLS) - return SkillDmgTaken_Mod[EQEmu::skills::HIGHEST_SKILL + 1]; + return SkillDmgTaken_Mod[EQ::skills::HIGHEST_SKILL + 1]; - else if (skill_num >= 0 && skill_num <= EQEmu::skills::HIGHEST_SKILL) + else if (skill_num >= 0 && skill_num <= EQ::skills::HIGHEST_SKILL) return SkillDmgTaken_Mod[skill_num]; return 0; @@ -5010,56 +5010,56 @@ void Mob::SlowMitigation(Mob* caster) uint16 Mob::GetSkillByItemType(int ItemType) { switch (ItemType) { - case EQEmu::item::ItemType1HSlash: - return EQEmu::skills::Skill1HSlashing; - case EQEmu::item::ItemType2HSlash: - return EQEmu::skills::Skill2HSlashing; - case EQEmu::item::ItemType1HPiercing: - return EQEmu::skills::Skill1HPiercing; - case EQEmu::item::ItemType1HBlunt: - return EQEmu::skills::Skill1HBlunt; - case EQEmu::item::ItemType2HBlunt: - return EQEmu::skills::Skill2HBlunt; - case EQEmu::item::ItemType2HPiercing: - if (IsClient() && CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::RoF2) - return EQEmu::skills::Skill1HPiercing; + case EQ::item::ItemType1HSlash: + return EQ::skills::Skill1HSlashing; + case EQ::item::ItemType2HSlash: + return EQ::skills::Skill2HSlashing; + case EQ::item::ItemType1HPiercing: + return EQ::skills::Skill1HPiercing; + case EQ::item::ItemType1HBlunt: + return EQ::skills::Skill1HBlunt; + case EQ::item::ItemType2HBlunt: + return EQ::skills::Skill2HBlunt; + case EQ::item::ItemType2HPiercing: + if (IsClient() && CastToClient()->ClientVersion() < EQ::versions::ClientVersion::RoF2) + return EQ::skills::Skill1HPiercing; else - return EQEmu::skills::Skill2HPiercing; - case EQEmu::item::ItemTypeBow: - return EQEmu::skills::SkillArchery; - case EQEmu::item::ItemTypeLargeThrowing: - case EQEmu::item::ItemTypeSmallThrowing: - return EQEmu::skills::SkillThrowing; - case EQEmu::item::ItemTypeMartial: - return EQEmu::skills::SkillHandtoHand; + return EQ::skills::Skill2HPiercing; + case EQ::item::ItemTypeBow: + return EQ::skills::SkillArchery; + case EQ::item::ItemTypeLargeThrowing: + case EQ::item::ItemTypeSmallThrowing: + return EQ::skills::SkillThrowing; + case EQ::item::ItemTypeMartial: + return EQ::skills::SkillHandtoHand; default: - return EQEmu::skills::SkillHandtoHand; + return EQ::skills::SkillHandtoHand; } } -uint8 Mob::GetItemTypeBySkill(EQEmu::skills::SkillType skill) +uint8 Mob::GetItemTypeBySkill(EQ::skills::SkillType skill) { switch (skill) { - case EQEmu::skills::SkillThrowing: - return EQEmu::item::ItemTypeSmallThrowing; - case EQEmu::skills::SkillArchery: - return EQEmu::item::ItemTypeArrow; - case EQEmu::skills::Skill1HSlashing: - return EQEmu::item::ItemType1HSlash; - case EQEmu::skills::Skill2HSlashing: - return EQEmu::item::ItemType2HSlash; - case EQEmu::skills::Skill1HPiercing: - return EQEmu::item::ItemType1HPiercing; - case EQEmu::skills::Skill2HPiercing: // watch for undesired client behavior - return EQEmu::item::ItemType2HPiercing; - case EQEmu::skills::Skill1HBlunt: - return EQEmu::item::ItemType1HBlunt; - case EQEmu::skills::Skill2HBlunt: - return EQEmu::item::ItemType2HBlunt; - case EQEmu::skills::SkillHandtoHand: - return EQEmu::item::ItemTypeMartial; + case EQ::skills::SkillThrowing: + return EQ::item::ItemTypeSmallThrowing; + case EQ::skills::SkillArchery: + return EQ::item::ItemTypeArrow; + case EQ::skills::Skill1HSlashing: + return EQ::item::ItemType1HSlash; + case EQ::skills::Skill2HSlashing: + return EQ::item::ItemType2HSlash; + case EQ::skills::Skill1HPiercing: + return EQ::item::ItemType1HPiercing; + case EQ::skills::Skill2HPiercing: // watch for undesired client behavior + return EQ::item::ItemType2HPiercing; + case EQ::skills::Skill1HBlunt: + return EQ::item::ItemType1HBlunt; + case EQ::skills::Skill2HBlunt: + return EQ::item::ItemType2HBlunt; + case EQ::skills::SkillHandtoHand: + return EQ::item::ItemTypeMartial; default: - return EQEmu::item::ItemTypeMartial; + return EQ::item::ItemTypeMartial; } } @@ -5623,7 +5623,7 @@ int32 Mob::GetSpellStat(uint32 spell_id, const char *identifier, uint8 slot) bool Mob::CanClassEquipItem(uint32 item_id) { - const EQEmu::ItemData* itm = nullptr; + const EQ::ItemData* itm = nullptr; itm = database.GetItem(item_id); if (!itm) @@ -5679,9 +5679,9 @@ int32 Mob::GetMeleeMitigation() { } /* this is the mob being attacked. - * Pass in the weapon's EQEmu::ItemInstance + * Pass in the weapon's EQ::ItemInstance */ -int Mob::ResistElementalWeaponDmg(const EQEmu::ItemInstance *item) +int Mob::ResistElementalWeaponDmg(const EQ::ItemInstance *item) { if (!item) return 0; @@ -5831,9 +5831,9 @@ int Mob::ResistElementalWeaponDmg(const EQEmu::ItemInstance *item) } /* this is the mob being attacked. - * Pass in the weapon's EQEmu::ItemInstance + * Pass in the weapon's EQ::ItemInstance */ -int Mob::CheckBaneDamage(const EQEmu::ItemInstance *item) +int Mob::CheckBaneDamage(const EQ::ItemInstance *item) { if (!item) return 0; diff --git a/zone/mob.h b/zone/mob.h index f1c128080..efdf68012 100644 --- a/zone/mob.h +++ b/zone/mob.h @@ -54,7 +54,7 @@ class MobMovementManager; const int COLLISION_BOX_SIZE = 8; -namespace EQEmu +namespace EQ { struct ItemData; class ItemInstance; @@ -145,7 +145,7 @@ public: uint32 in_drakkin_heritage, uint32 in_drakkin_tattoo, uint32 in_drakkin_details, - EQEmu::TintProfile in_armor_tint, + EQ::TintProfile in_armor_tint, uint8 in_aa_title, uint8 in_see_invis, // see through invis uint8 in_see_invis_undead, // see through invis vs. undead @@ -193,26 +193,26 @@ public: virtual void RangedAttack(Mob* other) { } virtual void ThrowingAttack(Mob* other) { } // 13 = Primary (default), 14 = secondary - virtual bool Attack(Mob* other, int Hand = EQEmu::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, + virtual bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) = 0; void DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts = nullptr); int MonkSpecialAttack(Mob* other, uint8 skill_used); virtual void TryBackstab(Mob *other,int ReuseTime = 10); bool AvoidDamage(Mob *attacker, DamageHitInfo &hit); - int compute_tohit(EQEmu::skills::SkillType skillinuse); - int GetTotalToHit(EQEmu::skills::SkillType skill, int chance_mod); // compute_tohit + spell bonuses + int compute_tohit(EQ::skills::SkillType skillinuse); + int GetTotalToHit(EQ::skills::SkillType skill, int chance_mod); // compute_tohit + spell bonuses int compute_defense(); int GetTotalDefense(); // compute_defense + spell bonuses bool CheckHitChance(Mob* attacker, DamageHitInfo &hit); void TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *opts = nullptr); void TryPetCriticalHit(Mob *defender, DamageHitInfo &hit); virtual bool TryFinishingBlow(Mob *defender, int &damage); - int TryHeadShot(Mob* defender, EQEmu::skills::SkillType skillInUse); - int TryAssassinate(Mob* defender, EQEmu::skills::SkillType skillInUse); + int TryHeadShot(Mob* defender, EQ::skills::SkillType skillInUse); + int TryAssassinate(Mob* defender, EQ::skills::SkillType skillInUse); virtual void DoRiposte(Mob* defender); void ApplyMeleeDamageMods(uint16 skill, int &damage, Mob * defender = nullptr, ExtraAttackOptions *opts = nullptr); int ACSum(); - int offense(EQEmu::skills::SkillType skill); + int offense(EQ::skills::SkillType skill); int GetBestMeleeSkill(); void CalcAC() { mitigation_ac = ACSum(); } int GetACSoftcap(); @@ -251,11 +251,11 @@ public: ************************************************ */ - EQEmu::InternalTextureProfile mob_texture_profile = {}; + EQ::InternalTextureProfile mob_texture_profile = {}; bool IsInvisible(Mob* other = 0) const; - EQEmu::skills::SkillType AttackAnimation(int Hand, const EQEmu::ItemInstance* weapon, EQEmu::skills::SkillType skillinuse = EQEmu::skills::Skill1HBlunt); + EQ::skills::SkillType AttackAnimation(int Hand, const EQ::ItemInstance* weapon, EQ::skills::SkillType skillinuse = EQ::skills::Skill1HBlunt); inline bool GetSeeInvisible(uint8 see_invis); inline bool SeeHide() const { return see_hide; } @@ -275,7 +275,7 @@ public: void ChangeSize(float in_size, bool bNoRestriction = false); void DoAnim(const int animnum, int type=0, bool ackreq = true, eqFilterType filter = FilterNone); - void ProjectileAnimation(Mob* to, int item_id, bool IsArrow = false, float speed = 0, float angle = 0, float tilt = 0, float arc = 0, const char *IDFile = nullptr, EQEmu::skills::SkillType skillInUse = EQEmu::skills::SkillArchery); + void ProjectileAnimation(Mob* to, int item_id, bool IsArrow = false, float speed = 0, float angle = 0, float tilt = 0, float arc = 0, const char *IDFile = nullptr, EQ::skills::SkillType skillInUse = EQ::skills::SkillArchery); void SendAppearanceEffect(uint32 parm1, uint32 parm2, uint32 parm3, uint32 parm4, uint32 parm5, Client *specific_target=nullptr); void SendLevelAppearance(); void SendStunAppearance(); @@ -285,7 +285,7 @@ public: //Song bool UseBardSpellLogic(uint16 spell_id = 0xffff, int slot = -1); - bool ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, EQEmu::spells::CastingSlot slot); + bool ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, EQ::spells::CastingSlot slot); void BardPulse(uint16 spell_id, Mob *caster); //Spell @@ -309,31 +309,31 @@ public: int level_override = -1); int GetResist(uint8 resist_type); int ResistPhysical(int level_diff, uint8 caster_level); - int ResistElementalWeaponDmg(const EQEmu::ItemInstance *item); - int CheckBaneDamage(const EQEmu::ItemInstance *item); + int ResistElementalWeaponDmg(const EQ::ItemInstance *item); + int CheckBaneDamage(const EQ::ItemInstance *item); uint16 GetSpecializeSkillValue(uint16 spell_id) const; void SendSpellBarDisable(); void SendSpellBarEnable(uint16 spellid); void ZeroCastingVars(); virtual void SpellProcess(); - virtual bool CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlot slot = EQEmu::spells::CastingSlot::Item, int32 casttime = -1, + virtual bool CastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, int16 *resist_adjust = nullptr, uint32 aa_id = 0); - virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlot slot = EQEmu::spells::CastingSlot::Item, int32 casttime = -1, + virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, int16 resist_adjust = 0, uint32 aa_id = 0); - void CastedSpellFinished(uint16 spell_id, uint32 target_id, EQEmu::spells::CastingSlot slot, uint16 mana_used, + void CastedSpellFinished(uint16 spell_id, uint32 target_id, EQ::spells::CastingSlot slot, uint16 mana_used, uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0); - bool SpellFinished(uint16 spell_id, Mob *target, EQEmu::spells::CastingSlot slot = EQEmu::spells::CastingSlot::Item, uint16 mana_used = 0, + bool SpellFinished(uint16 spell_id, Mob *target, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, uint16 mana_used = 0, uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0, bool isproc = false, int level_override = -1); void SendBeginCast(uint16 spell_id, uint32 casttime); virtual bool SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect = false, bool use_resist_adjust = false, int16 resist_adjust = 0, bool isproc = false, int level_override = -1); virtual bool SpellEffect(Mob* caster, uint16 spell_id, float partial = 100, int level_override = -1); virtual bool DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, - CastAction_type &CastAction, EQEmu::spells::CastingSlot slot, bool isproc = false); + CastAction_type &CastAction, EQ::spells::CastingSlot slot, bool isproc = false); virtual bool CheckFizzle(uint16 spell_id); virtual bool CheckSpellLevelRestriction(uint16 spell_id); virtual bool IsImmuneToSpell(uint16 spell_id, Mob *caster); @@ -432,7 +432,7 @@ public: void SetTwoHanderEquipped(bool val) { has_twohanderequipped = val; } bool CanFacestab() { return can_facestab; } void SetFacestab(bool val) { can_facestab = val; } - virtual uint16 GetSkill(EQEmu::skills::SkillType skill_num) const { return 0; } + virtual uint16 GetSkill(EQ::skills::SkillType skill_num) const { return 0; } virtual uint32 GetEquippedItemFromTextureSlot(uint8 material_slot) const { return(0); } virtual int32 GetEquipmentMaterial(uint8 material_slot) const; virtual int32 GetHerosForgeModel(uint8 material_slot) const; @@ -440,8 +440,8 @@ public: virtual uint32 IsEliteMaterialItem(uint8 material_slot) const; bool CanClassEquipItem(uint32 item_id); bool AffectedBySpellExcludingSlot(int slot, int effect); - virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill) = 0; - virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, + virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill) = 0; + virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) = 0; inline virtual void SetHP(int32 hp) { if (hp >= max_hp) current_hp = max_hp; else current_hp = hp;} bool ChangeHP(Mob* other, int32 amount, uint16 spell_id = 0, int8 buffslot = -1, bool iBuffTic = false); @@ -453,7 +453,7 @@ public: virtual inline uint8 GetBaseGender() const { return base_gender; } virtual uint16 GetFactionRace(); virtual inline uint16 GetDeity() const { return deity; } - virtual EQEmu::deity::DeityTypeBit GetDeityBit() { return EQEmu::deity::ConvertDeityTypeToDeityTypeBit((EQEmu::deity::DeityType)deity); } + virtual EQ::deity::DeityTypeBit GetDeityBit() { return EQ::deity::ConvertDeityTypeToDeityTypeBit((EQ::deity::DeityType)deity); } inline uint16 GetRace() const { return race; } inline uint16 GetModel() const { return (use_model == 0) ? race : use_model; } inline uint8 GetGender() const { return gender; } @@ -483,7 +483,7 @@ public: inline void ChangeDrakkinHeritage(uint8 in) { drakkin_heritage = in; } inline void ChangeDrakkinTattoo(uint8 in) { drakkin_tattoo = in; } inline void ChangeDrakkinDetails(uint8 in) { drakkin_details = in; } - inline uint32 GetArmorTint(uint8 i) const { return armor_tint.Slot[(i < EQEmu::textures::materialCount) ? i : 0].Color; } + inline uint32 GetArmorTint(uint8 i) const { return armor_tint.Slot[(i < EQ::textures::materialCount) ? i : 0].Color; } inline uint8 GetClass() const { return class_; } inline uint8 GetLevel() const { return level; } inline uint8 GetOrigLevel() const { return orig_level; } @@ -680,7 +680,7 @@ public: static uint8 GetDefaultGender(uint16 in_race, uint8 in_gender = 0xFF); static bool IsPlayerRace(uint16 in_race); uint16 GetSkillByItemType(int ItemType); - uint8 GetItemTypeBySkill(EQEmu::skills::SkillType skill); + uint8 GetItemTypeBySkill(EQ::skills::SkillType skill); virtual void MakePet(uint16 spell_id, const char* pettype, const char *petname = nullptr); virtual void MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, const char *petname = nullptr, float in_size = 0.0f); bool IsWarriorClass() const; @@ -709,7 +709,7 @@ public: inline AuraMgr &GetAuraMgr() { return aura_mgr; } // mainly used for zone db loading/saving //Procs - void TriggerDefensiveProcs(Mob *on, uint16 hand = EQEmu::invslot::slotPrimary, bool FromSkillProc = false, int damage = 0); + void TriggerDefensiveProcs(Mob *on, uint16 hand = EQ::invslot::slotPrimary, bool FromSkillProc = false, int damage = 0); bool AddRangedProc(uint16 spell_id, uint16 iChance = 3, uint16 base_spell_id = SPELL_UNKNOWN); bool RemoveRangedProc(uint16 spell_id, bool bAll = false); bool HasRangedProcs() const; @@ -796,7 +796,7 @@ public: int32 GetVulnerability(Mob* caster, uint32 spell_id, uint32 ticsremaining); int32 GetFcDamageAmtIncoming(Mob *caster, uint32 spell_id, bool use_skill = false, uint16 skill=0); int32 GetFocusIncoming(focusType type, int effect, Mob *caster, uint32 spell_id); - int16 GetSkillDmgTaken(const EQEmu::skills::SkillType skill_used, ExtraAttackOptions *opts = nullptr); + int16 GetSkillDmgTaken(const EQ::skills::SkillType skill_used, ExtraAttackOptions *opts = nullptr); void DoKnockback(Mob *caster, uint32 pushback, uint32 pushup); int16 CalcResistChanceBonus(); int16 CalcFearResistChance(); @@ -829,8 +829,8 @@ public: inline void SetSpellPowerDistanceMod(int16 value) { SpellPowerDistanceMod = value; }; int32 GetSpellStat(uint32 spell_id, const char *identifier, uint8 slot = 0); - void ModSkillDmgTaken(EQEmu::skills::SkillType skill_num, int value); - int16 GetModSkillDmgTaken(const EQEmu::skills::SkillType skill_num); + void ModSkillDmgTaken(EQ::skills::SkillType skill_num, int value); + int16 GetModSkillDmgTaken(const EQ::skills::SkillType skill_num); void ModVulnerability(uint8 resist, int16 value); int16 GetModVulnerability(const uint8 resist); @@ -856,17 +856,17 @@ public: bool IsDestructibleObject() { return destructibleobject; } void SetDestructibleObject(bool in) { destructibleobject = in; } - inline uint8 GetInnateLightType() { return m_Light.Type[EQEmu::lightsource::LightInnate]; } - inline uint8 GetEquipmentLightType() { return m_Light.Type[EQEmu::lightsource::LightEquipment]; } - inline uint8 GetSpellLightType() { return m_Light.Type[EQEmu::lightsource::LightSpell]; } + inline uint8 GetInnateLightType() { return m_Light.Type[EQ::lightsource::LightInnate]; } + inline uint8 GetEquipmentLightType() { return m_Light.Type[EQ::lightsource::LightEquipment]; } + inline uint8 GetSpellLightType() { return m_Light.Type[EQ::lightsource::LightSpell]; } - virtual void UpdateEquipmentLight() { m_Light.Type[EQEmu::lightsource::LightEquipment] = 0; m_Light.Level[EQEmu::lightsource::LightEquipment] = 0; } - inline void SetSpellLightType(uint8 light_type) { m_Light.Type[EQEmu::lightsource::LightSpell] = (light_type & 0x0F); m_Light.Level[EQEmu::lightsource::LightSpell] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightSpell]); } + virtual void UpdateEquipmentLight() { m_Light.Type[EQ::lightsource::LightEquipment] = 0; m_Light.Level[EQ::lightsource::LightEquipment] = 0; } + inline void SetSpellLightType(uint8 light_type) { m_Light.Type[EQ::lightsource::LightSpell] = (light_type & 0x0F); m_Light.Level[EQ::lightsource::LightSpell] = EQ::lightsource::TypeToLevel(m_Light.Type[EQ::lightsource::LightSpell]); } - inline uint8 GetActiveLightType() { return m_Light.Type[EQEmu::lightsource::LightActive]; } + inline uint8 GetActiveLightType() { return m_Light.Type[EQ::lightsource::LightActive]; } bool UpdateActiveLight(); // returns true if change, false if no change - EQEmu::LightSourceProfile* GetLightProfile() { return &m_Light; } + EQ::LightSourceProfile* GetLightProfile() { return &m_Light; } Mob* GetPet(); void SetPet(Mob* newpet); @@ -917,7 +917,7 @@ public: virtual int GetHaste(); int32 GetMeleeMitigation(); - uint8 GetWeaponDamageBonus(const EQEmu::ItemData* weapon, bool offhand = false); + uint8 GetWeaponDamageBonus(const EQ::ItemData* weapon, bool offhand = false); const DamageTable &GetDamageTable() const; void ApplyDamageTable(DamageHitInfo &hit); virtual int GetHandToHandDamage(void); @@ -942,11 +942,11 @@ public: int32 AffectMagicalDamage(int32 damage, uint16 spell_id, const bool iBuffTic, Mob* attacker); int32 ReduceAllDamage(int32 damage); - void DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int base_damage, int min_damage = 0, int32 hate_override = -1, int ReuseTime = 10); - virtual void DoThrowingAttackDmg(Mob* other, const EQEmu::ItemInstance* RangeWeapon = nullptr, const EQEmu::ItemData* AmmoItem = nullptr, uint16 weapon_damage = 0, int16 chance_mod = 0, int16 focus = 0, int ReuseTime = 0, uint32 range_id = 0, int AmmoSlot = 0, float speed = 4.0f); - void DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, EQEmu::skills::SkillType skillinuse, int16 chance_mod = 0, int16 focus = 0, bool CanRiposte = false, int ReuseTime = 0); - virtual void DoArcheryAttackDmg(Mob* other, const EQEmu::ItemInstance* RangeWeapon = nullptr, const EQEmu::ItemInstance* Ammo = nullptr, uint16 weapon_damage = 0, int16 chance_mod = 0, int16 focus = 0, int ReuseTime = 0, uint32 range_id = 0, uint32 ammo_id = 0, const EQEmu::ItemData *AmmoItem = nullptr, int AmmoSlot = 0, float speed = 4.0f); - bool TryProjectileAttack(Mob* other, const EQEmu::ItemData *item, EQEmu::skills::SkillType skillInUse, uint16 weapon_dmg, const EQEmu::ItemInstance* RangeWeapon, const EQEmu::ItemInstance* Ammo, int AmmoSlot, float speed); + void DoSpecialAttackDamage(Mob *who, EQ::skills::SkillType skill, int base_damage, int min_damage = 0, int32 hate_override = -1, int ReuseTime = 10); + virtual void DoThrowingAttackDmg(Mob* other, const EQ::ItemInstance* RangeWeapon = nullptr, const EQ::ItemData* AmmoItem = nullptr, uint16 weapon_damage = 0, int16 chance_mod = 0, int16 focus = 0, int ReuseTime = 0, uint32 range_id = 0, int AmmoSlot = 0, float speed = 4.0f); + void DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, EQ::skills::SkillType skillinuse, int16 chance_mod = 0, int16 focus = 0, bool CanRiposte = false, int ReuseTime = 0); + virtual void DoArcheryAttackDmg(Mob* other, const EQ::ItemInstance* RangeWeapon = nullptr, const EQ::ItemInstance* Ammo = nullptr, uint16 weapon_damage = 0, int16 chance_mod = 0, int16 focus = 0, int ReuseTime = 0, uint32 range_id = 0, uint32 ammo_id = 0, const EQ::ItemData *AmmoItem = nullptr, int AmmoSlot = 0, float speed = 4.0f); + bool TryProjectileAttack(Mob* other, const EQ::ItemData *item, EQ::skills::SkillType skillInUse, uint16 weapon_dmg, const EQ::ItemInstance* RangeWeapon, const EQ::ItemInstance* Ammo, int AmmoSlot, float speed); void ProjectileAttack(); inline bool HasProjectileAttack() const { return ActiveProjectileATK; } inline void SetProjectileAttack(bool value) { ActiveProjectileATK = value; } @@ -1083,7 +1083,7 @@ public: // HP Event inline int GetNextHPEvent() const { return nexthpevent; } void SetNextHPEvent( int hpevent ); - void SendItemAnimation(Mob *to, const EQEmu::ItemData *item, EQEmu::skills::SkillType skillInUse, float velocity = 4.0); + void SendItemAnimation(Mob *to, const EQ::ItemData *item, EQ::skills::SkillType skillInUse, float velocity = 4.0); inline int& GetNextIncHPEvent() { return nextinchpevent; } void SetNextIncHPEvent( int inchpevent ); @@ -1136,7 +1136,7 @@ public: bool HasSpellEffect(int effectid); int mod_effect_value(int effect_value, uint16 spell_id, int effect_type, Mob* caster, uint16 caster_id); - float mod_hit_chance(float chancetohit, EQEmu::skills::SkillType skillinuse, Mob* attacker); + float mod_hit_chance(float chancetohit, EQ::skills::SkillType skillinuse, Mob* attacker); float mod_riposte_chance(float ripostchance, Mob* attacker); float mod_block_chance(float blockchance, Mob* attacker); float mod_parry_chance(float parrychance, Mob* attacker); @@ -1147,11 +1147,11 @@ public: int32 mod_kick_damage(int32 dmg); int32 mod_bash_damage(int32 dmg); int32 mod_frenzy_damage(int32 dmg); - int32 mod_monk_special_damage(int32 ndamage, EQEmu::skills::SkillType skill_type); + int32 mod_monk_special_damage(int32 ndamage, EQ::skills::SkillType skill_type); int32 mod_backstab_damage(int32 ndamage); - int mod_archery_bonus_chance(int bonuschance, const EQEmu::ItemInstance* RangeWeapon); - uint32 mod_archery_bonus_damage(uint32 MaxDmg, const EQEmu::ItemInstance* RangeWeapon); - int32 mod_archery_damage(int32 TotalDmg, bool hasbonus, const EQEmu::ItemInstance* RangeWeapon); + int mod_archery_bonus_chance(int bonuschance, const EQ::ItemInstance* RangeWeapon); + uint32 mod_archery_bonus_damage(uint32 MaxDmg, const EQ::ItemInstance* RangeWeapon); + int32 mod_archery_damage(int32 TotalDmg, bool hasbonus, const EQ::ItemInstance* RangeWeapon); uint16 mod_throwing_damage(uint16 MaxDmg); int32 mod_cast_time(int32 cast_time); int mod_buff_duration(int res, Mob* caster, Mob* target, uint16 spell_id); @@ -1166,7 +1166,7 @@ public: uint32 Tune_GetMeanDamage(Mob* GM, Mob *attacker, int32 damage, int32 minhit, ExtraAttackOptions *opts = nullptr, int Msg = 0,int ac_override=0, int atk_override=0, int add_ac=0, int add_atk = 0); void Tune_FindATKByPctMitigation(Mob* defender, Mob *attacker, float pct_mitigation, int interval = 50, int max_loop = 100, int ac_override=0,int Msg =0); void Tune_FindACByPctMitigation(Mob* defender, Mob *attacker, float pct_mitigation, int interval = 50, int max_loop = 100, int atk_override=0,int Msg =0); - float Tune_CheckHitChance(Mob* defender, Mob* attacker, EQEmu::skills::SkillType skillinuse, int Hand, int16 chance_mod, int Msg = 1, int acc_override = 0, int avoid_override = 0, int add_acc = 0, int add_avoid = 0); + float Tune_CheckHitChance(Mob* defender, Mob* attacker, EQ::skills::SkillType skillinuse, int Hand, int16 chance_mod, int Msg = 1, int acc_override = 0, int avoid_override = 0, int add_acc = 0, int add_avoid = 0); void Tune_FindAccuaryByHitChance(Mob* defender, Mob *attacker, float hit_chance, int interval, int max_loop, int avoid_override, int Msg = 0); void Tune_FindAvoidanceByHitChance(Mob* defender, Mob *attacker, float hit_chance, int interval, int max_loop, int acc_override, int Msg = 0); @@ -1187,8 +1187,8 @@ public: void AddAssistCap() { ++npc_assist_cap; } void DelAssistCap() { --npc_assist_cap; } void ResetAssistCap() { npc_assist_cap = 0; } - int GetWeaponDamage(Mob *against, const EQEmu::ItemData *weapon_item); - int GetWeaponDamage(Mob *against, const EQEmu::ItemInstance *weapon_item, uint32 *hate = nullptr); + int GetWeaponDamage(Mob *against, const EQ::ItemData *weapon_item); + int GetWeaponDamage(Mob *against, const EQ::ItemInstance *weapon_item, uint32 *hate = nullptr); int32 GetHPRegen() const; int32 GetManaRegen() const; @@ -1214,7 +1214,7 @@ public: #endif protected: - void CommonDamage(Mob* other, int &damage, const uint16 spell_id, const EQEmu::skills::SkillType attack_skill, bool &avoidable, const int8 buffslot, const bool iBuffTic, eSpecialAttacks specal = eSpecialAttacks::None); + void CommonDamage(Mob* other, int &damage, const uint16 spell_id, const EQ::skills::SkillType attack_skill, bool &avoidable, const int8 buffslot, const bool iBuffTic, eSpecialAttacks specal = eSpecialAttacks::None); static uint16 GetProcID(uint16 spell_id, uint8 effect_index); float _GetMovementSpeed(int mod) const; int _GetWalkSpeed() const; @@ -1231,7 +1231,7 @@ protected: std::vector RampageArray; std::map m_EntityVariables; - int16 SkillDmgTaken_Mod[EQEmu::skills::HIGHEST_SKILL + 2]; + int16 SkillDmgTaken_Mod[EQ::skills::HIGHEST_SKILL + 2]; int16 Vulnerability_Mod[HIGHEST_RESIST+2]; bool m_AllowBeneficial; bool m_DisableMelee; @@ -1341,19 +1341,19 @@ protected: void TrySkillProc(Mob *on, uint16 skill, uint16 ReuseTime, bool Success = false, uint16 hand = 0, bool IsDefensive = false); // hand = SlotCharm? bool PassLimitToSkill(uint16 spell_id, uint16 skill); bool PassLimitClass(uint32 Classes_, uint16 Class_); - void TryDefensiveProc(Mob *on, uint16 hand = EQEmu::invslot::slotPrimary); - void TryWeaponProc(const EQEmu::ItemInstance* inst, const EQEmu::ItemData* weapon, Mob *on, uint16 hand = EQEmu::invslot::slotPrimary); - void TrySpellProc(const EQEmu::ItemInstance* inst, const EQEmu::ItemData* weapon, Mob *on, uint16 hand = EQEmu::invslot::slotPrimary); - void TryWeaponProc(const EQEmu::ItemInstance* weapon, Mob *on, uint16 hand = EQEmu::invslot::slotPrimary); - void ExecWeaponProc(const EQEmu::ItemInstance* weapon, uint16 spell_id, Mob *on, int level_override = -1); - virtual float GetProcChances(float ProcBonus, uint16 hand = EQEmu::invslot::slotPrimary); - virtual float GetDefensiveProcChances(float &ProcBonus, float &ProcChance, uint16 hand = EQEmu::invslot::slotPrimary, Mob *on = nullptr); + void TryDefensiveProc(Mob *on, uint16 hand = EQ::invslot::slotPrimary); + void TryWeaponProc(const EQ::ItemInstance* inst, const EQ::ItemData* weapon, Mob *on, uint16 hand = EQ::invslot::slotPrimary); + void TrySpellProc(const EQ::ItemInstance* inst, const EQ::ItemData* weapon, Mob *on, uint16 hand = EQ::invslot::slotPrimary); + void TryWeaponProc(const EQ::ItemInstance* weapon, Mob *on, uint16 hand = EQ::invslot::slotPrimary); + void ExecWeaponProc(const EQ::ItemInstance* weapon, uint16 spell_id, Mob *on, int level_override = -1); + virtual float GetProcChances(float ProcBonus, uint16 hand = EQ::invslot::slotPrimary); + virtual float GetDefensiveProcChances(float &ProcBonus, float &ProcChance, uint16 hand = EQ::invslot::slotPrimary, Mob *on = nullptr); virtual float GetSkillProcChances(uint16 ReuseTime, uint16 hand = 0); // hand = MainCharm? uint16 GetWeaponSpeedbyHand(uint16 hand); #ifdef BOTS virtual #endif - int GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target = nullptr); + int GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target = nullptr); virtual int16 GetFocusEffect(focusType type, uint16 spell_id) { return 0; } void CalculateNewFearpoint(); float FindGroundZ(float new_x, float new_y, float z_offset=0.0); @@ -1379,7 +1379,7 @@ protected: // ideally we should use real models, but this should be quick and work mostly glm::vec4 m_CollisionBox[COLLISION_BOX_SIZE]; - EQEmu::LightSourceProfile m_Light; + EQ::LightSourceProfile m_Light; float fixedZ; EmuAppearance _appearance; @@ -1403,7 +1403,7 @@ protected: int attacked_count; bool delaytimer; uint16 casting_spell_targetid; - EQEmu::spells::CastingSlot casting_spell_slot; + EQ::spells::CastingSlot casting_spell_slot; uint16 casting_spell_mana; uint32 casting_spell_inventory_slot; uint32 casting_spell_timer; @@ -1413,7 +1413,7 @@ protected: uint32 casting_spell_aa_id; bool casting_spell_checks; uint16 bardsong; - EQEmu::spells::CastingSlot bardsong_slot; + EQ::spells::CastingSlot bardsong_slot; uint32 bardsong_target_id; bool ActiveProjectileATK; @@ -1438,7 +1438,7 @@ protected: uint32 drakkin_heritage; uint32 drakkin_tattoo; uint32 drakkin_details; - EQEmu::TintProfile armor_tint; + EQ::TintProfile armor_tint; uint8 aa_title; @@ -1567,7 +1567,7 @@ protected: glm::vec3 m_TargetRing; // we might want to do this differently, we gotta do max NPC buffs ... which is 97 - uint32 m_spellHitsLeft[EQEmu::spells::TOTAL_BUFFS]; // Used to track which spells will have their numhits incremented when spell finishes casting + uint32 m_spellHitsLeft[EQ::spells::TOTAL_BUFFS]; // Used to track which spells will have their numhits incremented when spell finishes casting GravityBehavior flymode; bool m_targetable; int QGVarDuration(const char *fmt); diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp index b687c0c8a..f37d70292 100644 --- a/zone/mob_ai.cpp +++ b/zone/mob_ai.cpp @@ -144,7 +144,7 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint32 iSpellTypes, bool bInnates int min_hp = AIspells[i].min_hp; // well 0 is default, so no special case here int max_hp = AIspells[i].max_hp ? AIspells[i].max_hp : RuleI(Spells, AI_HealHPPct); - if (EQEmu::ValueWithin(hp_ratio, min_hp, max_hp) || (tar->IsClient() && hp_ratio <= 99)) { // not sure about client bit, leaving it + if (EQ::ValueWithin(hp_ratio, min_hp, max_hp) || (tar->IsClient() && hp_ratio <= 99)) { // not sure about client bit, leaving it uint32 tempTime = 0; AIDoSpellCast(i, tar, mana_cost, &tempTime); tar->SetDontHealMeBefore(tempTime); @@ -375,7 +375,7 @@ bool NPC::AIDoSpellCast(uint8 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgain #endif casting_spell_AIindex = i; - return CastSpell(AIspells[i].spellid, tar->GetID(), EQEmu::spells::CastingSlot::Gem2, AIspells[i].manacost == -2 ? 0 : -1, mana_cost, oDontDoAgainBefore, -1, -1, 0, &(AIspells[i].resist_adjust)); + return CastSpell(AIspells[i].spellid, tar->GetID(), EQ::spells::CastingSlot::Gem2, AIspells[i].manacost == -2 ? 0 : -1, mana_cost, oDontDoAgainBefore, -1, -1, 0, &(AIspells[i].resist_adjust)); } void Mob::AI_Init() @@ -635,11 +635,11 @@ void Client::AI_SpellCast() } uint32 spell_to_cast = 0xFFFFFFFF; - EQEmu::spells::CastingSlot slot_to_use = EQEmu::spells::CastingSlot::Item; + EQ::spells::CastingSlot slot_to_use = EQ::spells::CastingSlot::Item; if(valid_spells.size() == 1) { spell_to_cast = valid_spells[0]; - slot_to_use = static_cast(slots[0]); + slot_to_use = static_cast(slots[0]); } else if(valid_spells.empty()) { @@ -649,7 +649,7 @@ void Client::AI_SpellCast() { uint32 idx = zone->random.Int(0, (valid_spells.size()-1)); spell_to_cast = valid_spells[idx]; - slot_to_use = static_cast(slots[idx]); + slot_to_use = static_cast(slots[idx]); } if(IsMezSpell(spell_to_cast) || IsFearSpell(spell_to_cast)) @@ -803,7 +803,7 @@ void Client::AI_Process() if (GetTarget() && !IsStunned() && !IsMezzed() && !GetFeigned()) { if (attack_timer.Check()) { // Should charmed clients not be procing? - DoAttackRounds(GetTarget(), EQEmu::invslot::slotPrimary); + DoAttackRounds(GetTarget(), EQ::invslot::slotPrimary); } } @@ -811,7 +811,7 @@ void Client::AI_Process() if (attack_dw_timer.Check()) { if (CheckDualWield()) { // Should charmed clients not be procing? - DoAttackRounds(GetTarget(), EQEmu::invslot::slotSecondary); + DoAttackRounds(GetTarget(), EQ::invslot::slotSecondary); } } } @@ -1159,7 +1159,7 @@ void Mob::AI_Process() { //try main hand first if (attack_timer.Check()) { DoMainHandAttackRounds(target); - TriggerDefensiveProcs(target, EQEmu::invslot::slotPrimary, false); + TriggerDefensiveProcs(target, EQ::invslot::slotPrimary, false); bool specialed = false; // NPCs can only do one of these a round if (GetSpecialAbility(SPECATK_FLURRY)) { @@ -1549,10 +1549,10 @@ void NPC::AI_DoMovement() { // Check if we're already moving to a WP // If so, if we're not moving we have arrived and need to set delay - if (GetCWP() == EQEmu::WaypointStatus::RoamBoxPauseInProgress && !IsMoving()) { + if (GetCWP() == EQ::WaypointStatus::RoamBoxPauseInProgress && !IsMoving()) { // We have arrived - int roambox_move_delay = EQEmu::ClampLower(GetRoamboxDelay(), GetRoamboxMinDelay()); + int roambox_move_delay = EQ::ClampLower(GetRoamboxDelay(), GetRoamboxMinDelay()); int move_delay_max = (roambox_move_delay > 0 ? roambox_move_delay : (int) GetRoamboxMinDelay() * 4); int random_timer = RandomTimer( GetRoamboxMinDelay(), @@ -1579,8 +1579,8 @@ void NPC::AI_DoMovement() { auto move_x = static_cast(zone->random.Real(-roambox_distance, roambox_distance)); auto move_y = static_cast(zone->random.Real(-roambox_distance, roambox_distance)); - roambox_destination_x = EQEmu::Clamp((GetX() + move_x), roambox_min_x, roambox_max_x); - roambox_destination_y = EQEmu::Clamp((GetY() + move_y), roambox_min_y, roambox_max_y); + roambox_destination_x = EQ::Clamp((GetX() + move_x), roambox_min_x, roambox_max_x); + roambox_destination_y = EQ::Clamp((GetY() + move_y), roambox_min_y, roambox_max_y); /** * If our roambox was configured with large distances, chances of hitting the min or max end of @@ -1672,7 +1672,7 @@ void NPC::AI_DoMovement() { roambox_destination_z ); - SetCurrentWP(EQEmu::WaypointStatus::RoamBoxPauseInProgress); + SetCurrentWP(EQ::WaypointStatus::RoamBoxPauseInProgress); NavigateTo(roambox_destination_x, roambox_destination_y, roambox_destination_z); } @@ -1686,7 +1686,7 @@ void NPC::AI_DoMovement() { int32 gridno = CastToNPC()->GetGrid(); - if (gridno > 0 || cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) { + if (gridno > 0 || cur_wp == EQ::WaypointStatus::QuestControlNoGrid) { if (pause_timer_complete == true) { // time to pause at wp is over AI_SetupNextWaypoint(); } // endif (pause_timer_complete==true) @@ -1736,7 +1736,7 @@ void NPC::AI_DoMovement() { // as that is where roamer is unset and we don't want // the next trip through to move again based on grid stuff. doMove = false; - if (cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) { + if (cur_wp == EQ::WaypointStatus::QuestControlNoGrid) { AI_SetupNextWaypoint(); } @@ -1830,7 +1830,7 @@ void NPC::AI_SetupNextWaypoint() { pause_timer_complete = false; LogPathing("We are departing waypoint [{}]", cur_wp); //if we were under quest control (with no grid), we are done now.. - if (cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) { + if (cur_wp == EQ::WaypointStatus::QuestControlNoGrid) { LogPathing("Non-grid quest mob has reached its quest ordered waypoint. Leaving pathing mode"); roamer = false; cur_wp = 0; @@ -2107,7 +2107,7 @@ bool Mob::Flurry(ExtraAttackOptions *opts) int num_attacks = GetSpecialAbilityParam(SPECATK_FLURRY, 1); num_attacks = num_attacks > 0 ? num_attacks : RuleI(Combat, MaxFlurryHits); for (int i = 0; i < num_attacks; i++) - Attack(target, EQEmu::invslot::slotPrimary, false, false, false, opts); + Attack(target, EQ::invslot::slotPrimary, false, false, false, opts); } return true; } diff --git a/zone/mob_appearance.cpp b/zone/mob_appearance.cpp index fe4e07eee..88b52b774 100644 --- a/zone/mob_appearance.cpp +++ b/zone/mob_appearance.cpp @@ -52,47 +52,47 @@ void Mob::SetMobTextureProfile(uint8 material_slot, uint16 texture, uint32 color ); switch (material_slot) { - case EQEmu::textures::armorHead: + case EQ::textures::armorHead: mob_texture_profile.Head.Material = texture; mob_texture_profile.Head.HerosForgeModel = hero_forge_model; mob_texture_profile.Head.Color = color; break; - case EQEmu::textures::armorChest: + case EQ::textures::armorChest: mob_texture_profile.Chest.Material = texture; mob_texture_profile.Chest.HerosForgeModel = hero_forge_model; mob_texture_profile.Chest.Color = color; break; - case EQEmu::textures::armorArms: + case EQ::textures::armorArms: mob_texture_profile.Arms.Material = texture; mob_texture_profile.Arms.HerosForgeModel = hero_forge_model; mob_texture_profile.Arms.Color = color; break; - case EQEmu::textures::armorWrist: + case EQ::textures::armorWrist: mob_texture_profile.Wrist.Material = texture; mob_texture_profile.Wrist.HerosForgeModel = hero_forge_model; mob_texture_profile.Wrist.Color = color; break; - case EQEmu::textures::armorHands: + case EQ::textures::armorHands: mob_texture_profile.Hands.Material = texture; mob_texture_profile.Hands.HerosForgeModel = hero_forge_model; mob_texture_profile.Hands.Color = color; break; - case EQEmu::textures::armorLegs: + case EQ::textures::armorLegs: mob_texture_profile.Legs.Material = texture; mob_texture_profile.Legs.HerosForgeModel = hero_forge_model; mob_texture_profile.Legs.Color = color; break; - case EQEmu::textures::armorFeet: + case EQ::textures::armorFeet: mob_texture_profile.Feet.Material = texture; mob_texture_profile.Feet.HerosForgeModel = hero_forge_model; mob_texture_profile.Feet.Color = color; break; - case EQEmu::textures::weaponPrimary: + case EQ::textures::weaponPrimary: mob_texture_profile.Primary.Material = texture; mob_texture_profile.Primary.HerosForgeModel = hero_forge_model; mob_texture_profile.Primary.Color = color; break; - case EQEmu::textures::weaponSecondary: + case EQ::textures::weaponSecondary: mob_texture_profile.Secondary.Material = texture; mob_texture_profile.Secondary.HerosForgeModel = hero_forge_model; mob_texture_profile.Secondary.Color = color; @@ -111,23 +111,23 @@ void Mob::SetMobTextureProfile(uint8 material_slot, uint16 texture, uint32 color int32 Mob::GetTextureProfileMaterial(uint8 material_slot) const { switch (material_slot) { - case EQEmu::textures::armorHead: + case EQ::textures::armorHead: return mob_texture_profile.Head.Material; - case EQEmu::textures::armorChest: + case EQ::textures::armorChest: return mob_texture_profile.Chest.Material; - case EQEmu::textures::armorArms: + case EQ::textures::armorArms: return mob_texture_profile.Arms.Material; - case EQEmu::textures::armorWrist: + case EQ::textures::armorWrist: return mob_texture_profile.Wrist.Material; - case EQEmu::textures::armorHands: + case EQ::textures::armorHands: return mob_texture_profile.Hands.Material; - case EQEmu::textures::armorLegs: + case EQ::textures::armorLegs: return mob_texture_profile.Legs.Material; - case EQEmu::textures::armorFeet: + case EQ::textures::armorFeet: return mob_texture_profile.Feet.Material; - case EQEmu::textures::weaponPrimary: + case EQ::textures::weaponPrimary: return mob_texture_profile.Primary.Material; - case EQEmu::textures::weaponSecondary: + case EQ::textures::weaponSecondary: return mob_texture_profile.Secondary.Material; default: return 0; @@ -143,23 +143,23 @@ int32 Mob::GetTextureProfileMaterial(uint8 material_slot) const int32 Mob::GetTextureProfileColor(uint8 material_slot) const { switch (material_slot) { - case EQEmu::textures::armorHead: + case EQ::textures::armorHead: return mob_texture_profile.Head.Color; - case EQEmu::textures::armorChest: + case EQ::textures::armorChest: return mob_texture_profile.Chest.Color; - case EQEmu::textures::armorArms: + case EQ::textures::armorArms: return mob_texture_profile.Arms.Color; - case EQEmu::textures::armorWrist: + case EQ::textures::armorWrist: return mob_texture_profile.Wrist.Color; - case EQEmu::textures::armorHands: + case EQ::textures::armorHands: return mob_texture_profile.Hands.Color; - case EQEmu::textures::armorLegs: + case EQ::textures::armorLegs: return mob_texture_profile.Legs.Color; - case EQEmu::textures::armorFeet: + case EQ::textures::armorFeet: return mob_texture_profile.Feet.Color; - case EQEmu::textures::weaponPrimary: + case EQ::textures::weaponPrimary: return mob_texture_profile.Primary.Color; - case EQEmu::textures::weaponSecondary: + case EQ::textures::weaponSecondary: return mob_texture_profile.Secondary.Color; default: return 0; @@ -175,23 +175,23 @@ int32 Mob::GetTextureProfileColor(uint8 material_slot) const int32 Mob::GetTextureProfileHeroForgeModel(uint8 material_slot) const { switch (material_slot) { - case EQEmu::textures::armorHead: + case EQ::textures::armorHead: return mob_texture_profile.Head.HerosForgeModel; - case EQEmu::textures::armorChest: + case EQ::textures::armorChest: return mob_texture_profile.Chest.HerosForgeModel; - case EQEmu::textures::armorArms: + case EQ::textures::armorArms: return mob_texture_profile.Arms.HerosForgeModel; - case EQEmu::textures::armorWrist: + case EQ::textures::armorWrist: return mob_texture_profile.Wrist.HerosForgeModel; - case EQEmu::textures::armorHands: + case EQ::textures::armorHands: return mob_texture_profile.Hands.HerosForgeModel; - case EQEmu::textures::armorLegs: + case EQ::textures::armorLegs: return mob_texture_profile.Legs.HerosForgeModel; - case EQEmu::textures::armorFeet: + case EQ::textures::armorFeet: return mob_texture_profile.Feet.HerosForgeModel; - case EQEmu::textures::weaponPrimary: + case EQ::textures::weaponPrimary: return mob_texture_profile.Primary.HerosForgeModel; - case EQEmu::textures::weaponSecondary: + case EQ::textures::weaponSecondary: return mob_texture_profile.Secondary.HerosForgeModel; default: return 0; @@ -230,18 +230,18 @@ int32 Mob::GetEquipmentMaterial(uint8 material_slot) const * Handle primary / secondary texture */ bool is_primary_or_secondary_weapon = - material_slot == EQEmu::textures::weaponPrimary || - material_slot == EQEmu::textures::weaponSecondary; + material_slot == EQ::textures::weaponPrimary || + material_slot == EQ::textures::weaponSecondary; if (is_primary_or_secondary_weapon) { if (this->IsClient()) { - int16 inventory_slot = EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot); + int16 inventory_slot = EQ::InventoryProfile::CalcSlotFromMaterial(material_slot); if (inventory_slot == INVALID_INDEX) { return 0; } - const EQEmu::ItemInstance *item_instance = CastToClient()->m_inv[inventory_slot]; + const EQ::ItemInstance *item_instance = CastToClient()->m_inv[inventory_slot]; if (item_instance) { if (item_instance->GetOrnamentationAug(ornamentation_augment_type)) { item = item_instance->GetOrnamentationAug(ornamentation_augment_type)->GetItem(); @@ -273,7 +273,7 @@ int32 Mob::GetEquipmentMaterial(uint8 material_slot) const */ uint32 Mob::GetEquipmentColor(uint8 material_slot) const { - const EQEmu::ItemData *item = nullptr; + const EQ::ItemData *item = nullptr; if (armor_tint.Slot[material_slot].Color) { return armor_tint.Slot[material_slot].Color; @@ -294,15 +294,15 @@ uint32 Mob::GetEquipmentColor(uint8 material_slot) const int32 Mob::GetHerosForgeModel(uint8 material_slot) const { uint32 hero_model = 0; - if (material_slot >= 0 && material_slot < EQEmu::textures::weaponPrimary) { + if (material_slot >= 0 && material_slot < EQ::textures::weaponPrimary) { uint32 ornamentation_aug_type = RuleI(Character, OrnamentationAugmentType); - const EQEmu::ItemData *item = database.GetItem(GetEquippedItemFromTextureSlot(material_slot)); - int16 invslot = EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot); + const EQ::ItemData *item = database.GetItem(GetEquippedItemFromTextureSlot(material_slot)); + int16 invslot = EQ::InventoryProfile::CalcSlotFromMaterial(material_slot); if (item != nullptr && invslot != INVALID_INDEX) { if (IsClient()) { - const EQEmu::ItemInstance *inst = CastToClient()->m_inv[invslot]; + const EQ::ItemInstance *inst = CastToClient()->m_inv[invslot]; if (inst) { if (inst->GetOrnamentationAug(ornamentation_aug_type)) { item = inst->GetOrnamentationAug(ornamentation_aug_type)->GetItem(); @@ -352,7 +352,7 @@ uint32 NPC::GetEquippedItemFromTextureSlot(uint8 material_slot) const return 0; } - int16 inventory_slot = EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot); + int16 inventory_slot = EQ::InventoryProfile::CalcSlotFromMaterial(material_slot); if (inventory_slot == INVALID_INDEX) { return 0; } @@ -383,8 +383,8 @@ void Mob::SendArmorAppearance(Client *one_client) if (IsPlayerRace(race)) { if (!IsClient()) { - for (uint8 i = 0; i <= EQEmu::textures::materialCount; ++i) { - const EQEmu::ItemData *item = database.GetItem(GetEquippedItemFromTextureSlot(i)); + for (uint8 i = 0; i <= EQ::textures::materialCount; ++i) { + const EQ::ItemData *item = database.GetItem(GetEquippedItemFromTextureSlot(i)); if (item != nullptr) { SendWearChange(i, one_client); } @@ -392,7 +392,7 @@ void Mob::SendArmorAppearance(Client *one_client) } } - for (uint8 i = 0; i <= EQEmu::textures::materialCount; ++i) { + for (uint8 i = 0; i <= EQ::textures::materialCount; ++i) { if (GetTextureProfileMaterial(i)) { SendWearChange(i, one_client); } @@ -419,7 +419,7 @@ void Mob::SendWearChange(uint8 material_slot, Client *one_client) #ifdef BOTS if (IsBot()) { - auto item_inst = CastToBot()->GetBotItem(EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot)); + auto item_inst = CastToBot()->GetBotItem(EQ::InventoryProfile::CalcSlotFromMaterial(material_slot)); if (item_inst) wear_change->color.Color = item_inst->GetColor(); else diff --git a/zone/mob_info.cpp b/zone/mob_info.cpp index edac37768..95f04edec 100644 --- a/zone/mob_info.cpp +++ b/zone/mob_info.cpp @@ -230,11 +230,11 @@ inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribut } if (attribute == "tohit") { - return std::to_string(mob->compute_tohit(EQEmu::skills::SkillHandtoHand)); + return std::to_string(mob->compute_tohit(EQ::skills::SkillHandtoHand)); } if (attribute == "total_to_hit") { - return std::to_string(mob->GetTotalToHit(EQEmu::skills::SkillHandtoHand, 0)); + return std::to_string(mob->GetTotalToHit(EQ::skills::SkillHandtoHand, 0)); } if (attribute == "defense") { @@ -246,7 +246,7 @@ inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribut } if (attribute == "offense") { - return std::to_string(mob->offense(EQEmu::skills::SkillHandtoHand)); + return std::to_string(mob->offense(EQ::skills::SkillHandtoHand)); } if (attribute == "mitigation_ac") { @@ -606,24 +606,24 @@ inline void NPCCommandsMenu(Client* client, NPC* npc) std::string menu_commands; if (npc->GetGrid() > 0) { - menu_commands += "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#grid show", false, "Grid Points") + "] "; + menu_commands += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#grid show", false, "Grid Points") + "] "; } if (npc->GetEmoteID() > 0) { std::string saylink = StringFormat("#emotesearch %u", npc->GetEmoteID()); - menu_commands += "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Emotes") + "] "; + menu_commands += "[" + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Emotes") + "] "; } if (npc->GetLoottableID() > 0) { - menu_commands += "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#npcloot show", false, "Loot") + "] "; + menu_commands += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#npcloot show", false, "Loot") + "] "; } if (npc->IsProximitySet()) { - menu_commands += "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#proximity show", false, "Proximity") + "] "; + menu_commands += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#proximity show", false, "Proximity") + "] "; } if (menu_commands.length() > 0) { - std::string dev_menu = "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#devtools", false, "DevTools") + "] ";; + std::string dev_menu = "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#devtools", false, "DevTools") + "] ";; client->Message(Chat::White, "| %s [Show Commands] %s", dev_menu.c_str(), menu_commands.c_str()); } } @@ -823,7 +823,7 @@ void Mob::DisplayInfo(Mob *mob) client->SendFullPopup( "GM: Entity Info", window_text.c_str(), - EQEmu::popupresponse::MOB_INFO_DISMISS, + EQ::popupresponse::MOB_INFO_DISMISS, 0, 100, 0, diff --git a/zone/mod_functions.cpp b/zone/mod_functions.cpp index ca9a5e107..b0b335a4e 100644 --- a/zone/mod_functions.cpp +++ b/zone/mod_functions.cpp @@ -9,7 +9,7 @@ class Spawn2; struct Consider_Struct; struct DBTradeskillRecipe_Struct; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -29,7 +29,7 @@ void Zone::mod_repop() { return; } void NPC::mod_prespawn(Spawn2 *sp) { return; } //Base damage from NPC::Attack -int NPC::mod_npc_damage(int damage, EQEmu::skills::SkillType skillinuse, int hand, const EQEmu::ItemData* weapon, Mob* other) { return(damage); } +int NPC::mod_npc_damage(int damage, EQ::skills::SkillType skillinuse, int hand, const EQ::ItemData* weapon, Mob* other) { return(damage); } //Mob c has been given credit for a kill. This is called after the regular EVENT_KILLED_MERIT event. void NPC::mod_npc_killed_merit(Mob* c) { return; } @@ -38,7 +38,7 @@ void NPC::mod_npc_killed_merit(Mob* c) { return; } void NPC::mod_npc_killed(Mob* oos) { return; } //Base damage from Client::Attack - can cover myriad skill types -int Client::mod_client_damage(int damage, EQEmu::skills::SkillType skillinuse, int hand, const EQEmu::ItemInstance* weapon, Mob* other) { return(damage); } +int Client::mod_client_damage(int damage, EQ::skills::SkillType skillinuse, int hand, const EQ::ItemInstance* weapon, Mob* other) { return(damage); } //message is char[4096], don't screw it up. Return true for normal behavior, false to return immediately. // Channels: @@ -58,7 +58,7 @@ bool Client::mod_client_message(char* message, uint8 chan_num) { return(true); } //Skillup override. When this is called the regular skillup check has failed. Return false to proceed with default behavior. //This will NOT allow a client to increase skill past a cap. -bool Client::mod_can_increase_skill(EQEmu::skills::SkillType skillid, Mob* against_who) { return(false); } +bool Client::mod_can_increase_skill(EQ::skills::SkillType skillid, Mob* against_who) { return(false); } //chance of general skill increase, rolled against 0-99 where higher chance is better. int16 Client::mod_increase_skill_chance(int16 chance, Mob* against_who) { return(chance); } @@ -91,7 +91,7 @@ float Client::mod_tradeskill_chance(float chance, DBTradeskillRecipe_Struct *spe float Client::mod_tradeskill_skillup(float chance_stage2) { return(chance_stage2); } //Tribute value override -int32 Client::mod_tribute_item_value(int32 pts, const EQEmu::ItemInstance* item) { return(pts); } +int32 Client::mod_tribute_item_value(int32 pts, const EQ::ItemInstance* item) { return(pts); } //Death reporting void Client::mod_client_death_npc(Mob* killerMob) { return; } @@ -107,14 +107,14 @@ int32 Client::mod_client_xp(int32 in_xp, NPC *npc) { return(in_xp); } uint32 Client::mod_client_xp_for_level(uint32 xp, uint16 check_level) { return(xp); } //Food and drink values as computed by consume requests. Return < 0 to abort the request. -int Client::mod_food_value(const EQEmu::ItemData *item, int change) { return(change); } -int Client::mod_drink_value(const EQEmu::ItemData *item, int change) { return(change); } +int Client::mod_food_value(const EQ::ItemData *item, int change) { return(change); } +int Client::mod_drink_value(const EQ::ItemData *item, int change) { return(change); } //effect_vallue - Spell effect value as calculated by default formulas. You will want to ignore effects that don't lend themselves to scaling - pet ID's, gate coords, etc. int Mob::mod_effect_value(int effect_value, uint16 spell_id, int effect_type, Mob* caster, uint16 caster_id) { return(effect_value); } //chancetohit - 0 to 100 percent - set over 1000 for a guaranteed hit -float Mob::mod_hit_chance(float chancetohit, EQEmu::skills::SkillType skillinuse, Mob* attacker) { return(chancetohit); } +float Mob::mod_hit_chance(float chancetohit, EQ::skills::SkillType skillinuse, Mob* attacker) { return(chancetohit); } //Final riposte chance float Mob::mod_riposte_chance(float ripostechance, Mob* attacker) { return(ripostechance); } @@ -146,19 +146,19 @@ int32 Mob::mod_bash_damage(int32 dmg) { return(dmg); } int32 Mob::mod_frenzy_damage(int32 dmg) { return(dmg); } //Special attack damage after all other bonuses are applied. -int32 Mob::mod_monk_special_damage(int32 ndamage, EQEmu::skills::SkillType skill_type) { return(ndamage); } +int32 Mob::mod_monk_special_damage(int32 ndamage, EQ::skills::SkillType skill_type) { return(ndamage); } //ndamage - Backstab damage as calculated by default formulas int32 Mob::mod_backstab_damage(int32 ndamage) { return(ndamage); } //Chance for 50+ archery bonus damage if Combat:UseArcheryBonusRoll is true. Base is Combat:ArcheryBonusChance -int Mob::mod_archery_bonus_chance(int bonuschance, const EQEmu::ItemInstance* RangeWeapon) { return(bonuschance); } +int Mob::mod_archery_bonus_chance(int bonuschance, const EQ::ItemInstance* RangeWeapon) { return(bonuschance); } //Archery bonus damage -uint32 Mob::mod_archery_bonus_damage(uint32 MaxDmg, const EQEmu::ItemInstance* RangeWeapon) { return(MaxDmg); } +uint32 Mob::mod_archery_bonus_damage(uint32 MaxDmg, const EQ::ItemInstance* RangeWeapon) { return(MaxDmg); } //Final archery damage including bonus if it was applied. -int32 Mob::mod_archery_damage(int32 TotalDmg, bool hasbonus, const EQEmu::ItemInstance* RangeWeapon) { return(TotalDmg); } +int32 Mob::mod_archery_damage(int32 TotalDmg, bool hasbonus, const EQ::ItemInstance* RangeWeapon) { return(TotalDmg); } //Thrown weapon damage after all other calcs uint16 Mob::mod_throwing_damage(uint16 MaxDmg) { return(MaxDmg); } diff --git a/zone/npc.cpp b/zone/npc.cpp index edc9f88c3..1794c6d8c 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -303,8 +303,8 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi //give NPCs skill values... int r; - for (r = 0; r <= EQEmu::skills::HIGHEST_SKILL; r++) { - skills[r] = database.GetSkillCap(GetClass(), (EQEmu::skills::SkillType)r, moblevel); + for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) { + skills[r] = database.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, moblevel); } // some overrides -- really we need to be able to set skills for mobs in the DB // There are some known low level SHM/BST pets that do not follow this, which supports @@ -319,15 +319,15 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi } else { if (moblevel > 50) { - skills[EQEmu::skills::SkillDoubleAttack] = 250; - skills[EQEmu::skills::SkillDualWield] = 250; + skills[EQ::skills::SkillDoubleAttack] = 250; + skills[EQ::skills::SkillDualWield] = 250; } else if (moblevel > 3) { - skills[EQEmu::skills::SkillDoubleAttack] = moblevel * 5; - skills[EQEmu::skills::SkillDualWield] = skills[EQEmu::skills::SkillDoubleAttack]; + skills[EQ::skills::SkillDoubleAttack] = moblevel * 5; + skills[EQ::skills::SkillDualWield] = skills[EQ::skills::SkillDoubleAttack]; } else { - skills[EQEmu::skills::SkillDoubleAttack] = moblevel * 5; + skills[EQ::skills::SkillDoubleAttack] = moblevel * 5; } } @@ -527,7 +527,7 @@ void NPC::SetTarget(Mob* mob) { if (owner) { auto client = owner->CastToClient(); - if (client->ClientVersionBit() & EQEmu::versions::maskUFAndLater) { + if (client->ClientVersionBit() & EQ::versions::maskUFAndLater) { auto app = new EQApplicationPacket(OP_PetHoTT, sizeof(ClientTarget_Struct)); auto ct = (ClientTarget_Struct *)app->pBuffer; ct->new_target = mob ? mob->GetID() : 0; @@ -592,8 +592,8 @@ void NPC::CheckMinMaxLevel(Mob *them) if(themlevel < (*cur)->min_level || themlevel > (*cur)->max_level) { - material = EQEmu::InventoryProfile::CalcMaterialFromSlot((*cur)->equip_slot); - if (material != EQEmu::textures::materialInvalid) + material = EQ::InventoryProfile::CalcMaterialFromSlot((*cur)->equip_slot); + if (material != EQ::textures::materialInvalid) SendWearChange(material); cur = itemlist.erase(cur); @@ -637,8 +637,8 @@ void NPC::QueryLoot(Client* to) continue; } - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkLootItem); + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkLootItem); linker.SetLootData(*cur); to->Message( @@ -790,7 +790,7 @@ bool NPC::Process() if (GetMana() < GetMaxMana()) { if (RuleB(NPC, UseMeditateBasedManaRegen)) { int32 npc_idle_mana_regen_bonus = 2; - uint16 meditate_skill = GetSkill(EQEmu::skills::SkillMeditate); + uint16 meditate_skill = GetSkill(EQ::skills::SkillMeditate); if (!IsEngaged() && meditate_skill > 0) { uint8 clevel = GetLevel(); npc_idle_mana_regen_bonus = @@ -916,18 +916,18 @@ uint32 NPC::CountLoot() { void NPC::UpdateEquipmentLight() { - m_Light.Type[EQEmu::lightsource::LightEquipment] = 0; - m_Light.Level[EQEmu::lightsource::LightEquipment] = 0; + m_Light.Type[EQ::lightsource::LightEquipment] = 0; + m_Light.Level[EQ::lightsource::LightEquipment] = 0; - for (int index = EQEmu::invslot::EQUIPMENT_BEGIN; index <= EQEmu::invslot::EQUIPMENT_END; ++index) { - if (index == EQEmu::invslot::slotAmmo) { continue; } + for (int index = EQ::invslot::EQUIPMENT_BEGIN; index <= EQ::invslot::EQUIPMENT_END; ++index) { + if (index == EQ::invslot::slotAmmo) { continue; } auto item = database.GetItem(equipment[index]); if (item == nullptr) { continue; } - if (EQEmu::lightsource::IsLevelGreater(item->Light, m_Light.Type[EQEmu::lightsource::LightEquipment])) { - m_Light.Type[EQEmu::lightsource::LightEquipment] = item->Light; - m_Light.Level[EQEmu::lightsource::LightEquipment] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightEquipment]); + if (EQ::lightsource::IsLevelGreater(item->Light, m_Light.Type[EQ::lightsource::LightEquipment])) { + m_Light.Type[EQ::lightsource::LightEquipment] = item->Light; + m_Light.Level[EQ::lightsource::LightEquipment] = EQ::lightsource::TypeToLevel(m_Light.Type[EQ::lightsource::LightEquipment]); } } @@ -939,14 +939,14 @@ void NPC::UpdateEquipmentLight() if (!item->IsClassCommon()) { continue; } if (item->Light < 9 || item->Light > 13) { continue; } - if (EQEmu::lightsource::TypeToLevel(item->Light)) + if (EQ::lightsource::TypeToLevel(item->Light)) general_light_type = item->Light; } - if (EQEmu::lightsource::IsLevelGreater(general_light_type, m_Light.Type[EQEmu::lightsource::LightEquipment])) - m_Light.Type[EQEmu::lightsource::LightEquipment] = general_light_type; + if (EQ::lightsource::IsLevelGreater(general_light_type, m_Light.Type[EQ::lightsource::LightEquipment])) + m_Light.Type[EQ::lightsource::LightEquipment] = general_light_type; - m_Light.Level[EQEmu::lightsource::LightEquipment] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightEquipment]); + m_Light.Level[EQ::lightsource::LightEquipment] = EQ::lightsource::TypeToLevel(m_Light.Type[EQ::lightsource::LightEquipment]); } void NPC::Depop(bool StartSpawnTimer) { @@ -1586,34 +1586,34 @@ int32 NPC::GetEquipmentMaterial(uint8 material_slot) const return texture_profile_material; } - if (material_slot >= EQEmu::textures::materialCount) { + if (material_slot >= EQ::textures::materialCount) { return 0; } - int16 invslot = EQEmu::InventoryProfile::CalcSlotFromMaterial(material_slot); + int16 invslot = EQ::InventoryProfile::CalcSlotFromMaterial(material_slot); if (invslot == INVALID_INDEX) { return 0; } if (equipment[invslot] == 0) { switch (material_slot) { - case EQEmu::textures::armorHead: + case EQ::textures::armorHead: return helmtexture; - case EQEmu::textures::armorChest: + case EQ::textures::armorChest: return texture; - case EQEmu::textures::armorArms: + case EQ::textures::armorArms: return armtexture; - case EQEmu::textures::armorWrist: + case EQ::textures::armorWrist: return bracertexture; - case EQEmu::textures::armorHands: + case EQ::textures::armorHands: return handtexture; - case EQEmu::textures::armorLegs: + case EQ::textures::armorLegs: return legtexture; - case EQEmu::textures::armorFeet: + case EQ::textures::armorFeet: return feettexture; - case EQEmu::textures::weaponPrimary: + case EQ::textures::weaponPrimary: return d_melee_texture1; - case EQEmu::textures::weaponSecondary: + case EQ::textures::weaponSecondary: return d_melee_texture2; default: //they have nothing in the slot, and its not a special slot... they get nothing. @@ -1641,7 +1641,7 @@ uint32 NPC::GetMaxDamage(uint8 tlevel) void NPC::PickPocket(Client* thief) { - thief->CheckIncreaseSkill(EQEmu::skills::SkillPickPockets, nullptr, 5); + thief->CheckIncreaseSkill(EQ::skills::SkillPickPockets, nullptr, 5); //make sure were allowed to target them: int over_level = GetLevel(); @@ -1661,7 +1661,7 @@ void NPC::PickPocket(Client* thief) return; } - int steal_skill = thief->GetSkill(EQEmu::skills::SkillPickPockets); + int steal_skill = thief->GetSkill(EQ::skills::SkillPickPockets); int steal_chance = steal_skill * 100 / (5 * over_level + 5); // Determine whether to steal money or an item. @@ -1671,7 +1671,7 @@ void NPC::PickPocket(Client* thief) // still needs to have FindFreeSlot vs PutItemInInventory issue worked out while (steal_item) { - std::vector> loot_selection; // + std::vector> loot_selection; // for (auto item_iter : itemlist) { if (!item_iter || !item_iter->item_id) continue; @@ -1688,7 +1688,7 @@ void NPC::PickPocket(Client* thief) } int random = zone->random.Int(0, (loot_selection.size() - 1)); - uint16 slot_id = thief->GetInv().FindFreeSlot(false, true, (loot_selection[random].first->Size), (loot_selection[random].first->ItemType == EQEmu::item::ItemTypeArrow)); + uint16 slot_id = thief->GetInv().FindFreeSlot(false, true, (loot_selection[random].first->Size), (loot_selection[random].first->ItemType == EQ::item::ItemTypeArrow)); if (slot_id == INVALID_INDEX) { steal_item = false; break; @@ -1769,12 +1769,12 @@ void NPC::PickPocket(Client* thief) void NPC::Disarm(Client* client, int chance) { // disarm primary if available, otherwise disarm secondary - const EQEmu::ItemData* weapon = NULL; + const EQ::ItemData* weapon = NULL; uint8 eslot = 0xFF; - if (equipment[EQEmu::invslot::slotPrimary] != 0) - eslot = EQEmu::invslot::slotPrimary; - else if (equipment[EQEmu::invslot::slotSecondary] != 0) - eslot = EQEmu::invslot::slotSecondary; + if (equipment[EQ::invslot::slotPrimary] != 0) + eslot = EQ::invslot::slotPrimary; + else if (equipment[EQ::invslot::slotSecondary] != 0) + eslot = EQ::invslot::slotSecondary; if (eslot != 0xFF) { if (zone->random.Int(0, 1000) <= chance) { weapon = database.GetItem(equipment[eslot]); @@ -1792,7 +1792,7 @@ void NPC::Disarm(Client* client, int chance) { break; } } - EQEmu::ItemInstance *inst = NULL; + EQ::ItemInstance *inst = NULL; inst = database.CreateItem(weapon->ID, charges); // Remove item from loot table RemoveItem(weapon->ID); @@ -1808,19 +1808,19 @@ void NPC::Disarm(Client* client, int chance) { } // Update Appearance equipment[eslot] = 0; - int matslot = eslot == EQEmu::invslot::slotPrimary ? EQEmu::textures::weaponPrimary : EQEmu::textures::weaponSecondary; + int matslot = eslot == EQ::invslot::slotPrimary ? EQ::textures::weaponPrimary : EQ::textures::weaponSecondary; if (matslot != -1) SendWearChange(matslot); - if ((CastToMob()->GetBodyType() == BT_Humanoid || CastToMob()->GetBodyType() == BT_Summoned) && eslot == EQEmu::invslot::slotPrimary) + if ((CastToMob()->GetBodyType() == BT_Humanoid || CastToMob()->GetBodyType() == BT_Summoned) && eslot == EQ::invslot::slotPrimary) Say("Ahh! My weapon!"); client->MessageString(Chat::Skills, DISARM_SUCCESS, this->GetCleanName()); if (chance != 1000) - client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4); + client->CheckIncreaseSkill(EQ::skills::SkillDisarm, nullptr, 4); return; } client->MessageString(Chat::Skills, DISARM_FAILED); if (chance != 1000) - client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2); + client->CheckIncreaseSkill(EQ::skills::SkillDisarm, nullptr, 2); return; } client->MessageString(Chat::Skills, DISARM_FAILED); @@ -3236,8 +3236,8 @@ void NPC::AIYellForHelp(Mob *sender, Mob *attacker) void NPC::RecalculateSkills() { int r; - for (r = 0; r <= EQEmu::skills::HIGHEST_SKILL; r++) { - skills[r] = database.GetSkillCap(GetClass(), (EQEmu::skills::SkillType)r, level); + for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) { + skills[r] = database.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, level); } // some overrides -- really we need to be able to set skills for mobs in the DB @@ -3245,15 +3245,15 @@ void NPC::RecalculateSkills() // the theory of needing to be able to set skills for each mob separately if (!IsBot()) { if (level > 50) { - skills[EQEmu::skills::SkillDoubleAttack] = 250; - skills[EQEmu::skills::SkillDualWield] = 250; + skills[EQ::skills::SkillDoubleAttack] = 250; + skills[EQ::skills::SkillDualWield] = 250; } else if (level > 3) { - skills[EQEmu::skills::SkillDoubleAttack] = level * 5; - skills[EQEmu::skills::SkillDualWield] = skills[EQEmu::skills::SkillDoubleAttack]; + skills[EQ::skills::SkillDoubleAttack] = level * 5; + skills[EQ::skills::SkillDualWield] = skills[EQ::skills::SkillDoubleAttack]; } else { - skills[EQEmu::skills::SkillDoubleAttack] = level * 5; + skills[EQ::skills::SkillDoubleAttack] = level * 5; } } } diff --git a/zone/npc.h b/zone/npc.h index 2b8edc9b9..d9f98cfc6 100644 --- a/zone/npc.h +++ b/zone/npc.h @@ -95,7 +95,7 @@ class Raid; class Spawn2; class Aura; -namespace EQEmu +namespace EQ { struct ItemData; } @@ -115,9 +115,9 @@ public: static NPC *SpawnGridNodeNPC(std::string name, const glm::vec4 &position, uint32 grid_id, uint32 grid_number, uint32 pause); //abstract virtual function implementations requird by base abstract class - virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill); - virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None); - virtual bool Attack(Mob* other, int Hand = EQEmu::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, + virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill); + virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None); + virtual bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr); virtual bool HasRaid() { return false; } virtual bool HasGroup() { return false; } @@ -149,7 +149,7 @@ public: void LevelScale(); virtual void SetTarget(Mob* mob); - virtual uint16 GetSkill(EQEmu::skills::SkillType skill_num) const { if (skill_num <= EQEmu::skills::HIGHEST_SKILL) { return skills[skill_num]; } return 0; } + virtual uint16 GetSkill(EQ::skills::SkillType skill_num) const { if (skill_num <= EQ::skills::HIGHEST_SKILL) { return skills[skill_num]; } return 0; } void CalcItemBonuses(StatBonuses *newbon); virtual void CalcBonuses(); @@ -168,7 +168,7 @@ public: virtual void RangedAttack(Mob* other); virtual void ThrowingAttack(Mob* other) { } int32 GetNumberOfAttacks() const { return attack_count; } - void DoRangedAttackDmg(Mob* other, bool Launch = true, int16 damage_mod = 0, int16 chance_mod = 0, EQEmu::skills::SkillType skill = EQEmu::skills::SkillArchery, float speed = 4.0f, const char *IDFile = nullptr); + void DoRangedAttackDmg(Mob* other, bool Launch = true, int16 damage_mod = 0, int16 chance_mod = 0, EQ::skills::SkillType skill = EQ::skills::SkillArchery, float speed = 4.0f, const char *IDFile = nullptr); bool DatabaseCastAccepted(int spell_id); bool IsFactionListAlly(uint32 other_faction); @@ -185,7 +185,7 @@ public: virtual void SpellProcess(); virtual void FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho); - void AddItem(const EQEmu::ItemData* item, uint16 charges, bool equipitem = true); + void AddItem(const EQ::ItemData* item, uint16 charges, bool equipitem = true); void AddItem(uint32 itemid, uint16 charges, bool equipitem = true, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0); void AddLootTable(); void AddLootTable(uint32 ldid); @@ -290,7 +290,7 @@ public: void PickPocket(Client* thief); void Disarm(Client* client, int chance); void StartSwarmTimer(uint32 duration) { swarm_timer.Start(duration); } - void AddLootDrop(const EQEmu::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*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); virtual void DoClassAttacks(Mob *target); void CheckSignal(); inline bool IsNotTargetableWithHotkey() const { return no_target_hotkey; } @@ -443,7 +443,7 @@ public: uint32 GetSpawnKillCount(); int GetScore(); void mod_prespawn(Spawn2 *sp); - int mod_npc_damage(int damage, EQEmu::skills::SkillType skillinuse, int hand, const EQEmu::ItemData* weapon, Mob* other); + int mod_npc_damage(int damage, EQ::skills::SkillType skillinuse, int hand, const EQ::ItemData* weapon, Mob* other); void mod_npc_killed_merit(Mob* c); void mod_npc_killed(Mob* oos); void AISpellsList(Client *c); @@ -587,9 +587,9 @@ protected: uint32 roambox_delay; uint32 roambox_min_delay; - uint16 skills[EQEmu::skills::HIGHEST_SKILL + 1]; + uint16 skills[EQ::skills::HIGHEST_SKILL + 1]; - uint32 equipment[EQEmu::invslot::EQUIPMENT_COUNT]; //this is an array of item IDs + uint32 equipment[EQ::invslot::EQUIPMENT_COUNT]; //this is an array of item IDs uint32 herosforgemodel; //this is the Hero Forge Armor Model (i.e 63 or 84 or 203) uint16 d_melee_texture1; diff --git a/zone/object.cpp b/zone/object.cpp index 4fbaef1c3..4516e0ec2 100644 --- a/zone/object.cpp +++ b/zone/object.cpp @@ -37,7 +37,7 @@ extern Zone* zone; extern EntityList entity_list; // Loading object from database -Object::Object(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, const EQEmu::ItemInstance* inst) +Object::Object(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, const EQ::ItemInstance* inst) : respawn_timer(0), decay_timer(300000) { @@ -69,7 +69,7 @@ Object::Object(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, } //creating a re-ocurring ground spawn. -Object::Object(const EQEmu::ItemInstance* inst, char* name,float max_x,float min_x,float max_y,float min_y,float z,float heading,uint32 respawntimer) +Object::Object(const EQ::ItemInstance* inst, char* name,float max_x,float min_x,float max_y,float min_y,float z,float heading,uint32 respawntimer) : respawn_timer(respawntimer * 1000), decay_timer(300000) { @@ -102,7 +102,7 @@ Object::Object(const EQEmu::ItemInstance* inst, char* name,float max_x,float min } // Loading object from client dropping item on ground -Object::Object(Client* client, const EQEmu::ItemInstance* inst) +Object::Object(Client* client, const EQ::ItemInstance* inst) : respawn_timer(0), decay_timer(300000) { user = nullptr; @@ -120,7 +120,7 @@ Object::Object(Client* client, const EQEmu::ItemInstance* inst) m_data.heading = client->GetHeading(); m_data.x = client->GetX(); m_data.y = client->GetY(); - if (client->ClientVersion() >= EQEmu::versions::ClientVersion::RoF2) + if (client->ClientVersion() >= EQ::versions::ClientVersion::RoF2) { // RoF2 places items at player's Z, which is 0.625 of their height. m_data.z = client->GetZ() - (client->GetSize() * 0.625f); @@ -141,7 +141,7 @@ Object::Object(Client* client, const EQEmu::ItemInstance* inst) // Set object name if (inst) { - const EQEmu::ItemData* item = inst->GetItem(); + const EQ::ItemData* item = inst->GetItem(); if (item && item->IDFile) { if (strlen(item->IDFile) == 0) { strcpy(m_data.object_name, DEFAULT_OBJECT_NAME); @@ -164,7 +164,7 @@ Object::Object(Client* client, const EQEmu::ItemInstance* inst) } } -Object::Object(const EQEmu::ItemInstance *inst, float x, float y, float z, float heading, uint32 decay_time) +Object::Object(const EQ::ItemInstance *inst, float x, float y, float z, float heading, uint32 decay_time) : respawn_timer(0), decay_timer(decay_time) { user = nullptr; @@ -197,7 +197,7 @@ Object::Object(const EQEmu::ItemInstance *inst, float x, float y, float z, float // Set object name if (inst) { - const EQEmu::ItemData* item = inst->GetItem(); + const EQ::ItemData* item = inst->GetItem(); if (item && item->IDFile) { if (strlen(item->IDFile) == 0) { strcpy(m_data.object_name, DEFAULT_OBJECT_NAME); @@ -225,7 +225,7 @@ Object::Object(const char *model, float x, float y, float z, float heading, uint { user = nullptr; last_user = nullptr; - EQEmu::ItemInstance* inst = new EQEmu::ItemInstance(ItemInstWorldContainer); + EQ::ItemInstance* inst = new EQ::ItemInstance(ItemInstWorldContainer); // Initialize members m_id = 0; @@ -327,8 +327,8 @@ void Object::Delete(bool reset_state) } } -const EQEmu::ItemInstance* Object::GetItem(uint8 index) { - if (index < EQEmu::invtype::WORLD_SIZE) { +const EQ::ItemInstance* Object::GetItem(uint8 index) { + if (index < EQ::invtype::WORLD_SIZE) { return m_inst->GetItem(index); } @@ -336,14 +336,14 @@ const EQEmu::ItemInstance* Object::GetItem(uint8 index) { } // Add item to object (only logical for world tradeskill containers -void Object::PutItem(uint8 index, const EQEmu::ItemInstance* inst) +void Object::PutItem(uint8 index, const EQ::ItemInstance* inst) { if (index > 9) { LogError("Object::PutItem: Invalid index specified ([{}])", index); return; } - if (m_inst && m_inst->IsType(EQEmu::item::ItemClassBag)) { + if (m_inst && m_inst->IsType(EQ::item::ItemClassBag)) { if (inst) { m_inst->PutItem(index, *inst); } @@ -363,12 +363,12 @@ void Object::Close() { last_user = user; // put any remaining items from the world container back into the player's inventory to avoid item loss // if they close the container without removing all items - EQEmu::ItemInstance* container = this->m_inst; + EQ::ItemInstance* container = this->m_inst; if(container != nullptr) { - for (uint8 i = EQEmu::invbag::SLOT_BEGIN; i <= EQEmu::invbag::SLOT_END; i++) + for (uint8 i = EQ::invbag::SLOT_BEGIN; i <= EQ::invbag::SLOT_END; i++) { - EQEmu::ItemInstance* inst = container->PopItem(i); + EQ::ItemInstance* inst = container->PopItem(i); if(inst != nullptr) { user->MoveItemToInventory(inst, true); @@ -384,7 +384,7 @@ void Object::Close() { // Remove item from container void Object::DeleteItem(uint8 index) { - if (m_inst && m_inst->IsType(EQEmu::item::ItemClassBag)) { + if (m_inst && m_inst->IsType(EQ::item::ItemClassBag)) { m_inst->DeleteItem(index); // This is _highly_ inefficient, but for now it will work: Save entire object to database @@ -393,11 +393,11 @@ void Object::DeleteItem(uint8 index) } // Pop item out of container -EQEmu::ItemInstance* Object::PopItem(uint8 index) +EQ::ItemInstance* Object::PopItem(uint8 index) { - EQEmu::ItemInstance* inst = nullptr; + EQ::ItemInstance* inst = nullptr; - if (m_inst && m_inst->IsType(EQEmu::item::ItemClassBag)) { + if (m_inst && m_inst->IsType(EQ::item::ItemClassBag)) { inst = m_inst->PopItem(index); // This is _highly_ inefficient, but for now it will work: Save entire object to database @@ -510,7 +510,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) char buf[10]; snprintf(buf, 9, "%u", item->ID); buf[9] = '\0'; - std::vector args; + std::vector args; args.push_back(m_inst); if(parse->EventPlayer(EVENT_PLAYER_PICKUP, sender, buf, this->GetID(), &args)) { @@ -530,11 +530,11 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) // Transfer item to client - sender->PutItemInInventory(EQEmu::invslot::slotCursor, *m_inst, false); - sender->SendItemPacket(EQEmu::invslot::slotCursor, m_inst, ItemPacketTrade); + sender->PutItemInInventory(EQ::invslot::slotCursor, *m_inst, false); + sender->SendItemPacket(EQ::invslot::slotCursor, m_inst, ItemPacketTrade); if(cursordelete) // delete the item if it's a duplicate lore. We have to do this because the client expects the item packet - sender->DeleteItemInInventory(EQEmu::invslot::slotCursor); + sender->DeleteItemInInventory(EQ::invslot::slotCursor); sender->DropItemQS(m_inst, true); @@ -577,7 +577,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) else { coa->open = 0x00; - if (sender->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) { + if (sender->ClientVersion() >= EQ::versions::ClientVersion::RoF) { coa->drop_id = 0xFFFFFFFF; sender->Message(Chat::White, "Someone else is using that. Try again later."); } @@ -598,7 +598,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) // Send items inside of container - if (m_inst && m_inst->IsType(EQEmu::item::ItemClassBag)) { + if (m_inst && m_inst->IsType(EQ::item::ItemClassBag)) { //Clear out no-drop and no-rent items first if different player opens it if(user != last_user) @@ -607,8 +607,8 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) auto outapp = new EQApplicationPacket(OP_ClientReady, 0); sender->QueuePacket(outapp); safe_delete(outapp); - for (uint8 i = EQEmu::invbag::SLOT_BEGIN; i <= EQEmu::invbag::SLOT_END; i++) { - const EQEmu::ItemInstance* inst = m_inst->GetItem(i); + for (uint8 i = EQ::invbag::SLOT_BEGIN; i <= EQ::invbag::SLOT_END; i++) { + const EQ::ItemInstance* inst = m_inst->GetItem(i); if (inst) { //sender->GetInv().PutItem(i+4000,inst); sender->SendItemPacket(i, inst, ItemPacketWorldContainer); @@ -621,7 +621,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) } // Add new Zone Object (theoretically only called for items dropped to ground) -uint32 ZoneDatabase::AddObject(uint32 type, uint32 icon, const Object_Struct& object, const EQEmu::ItemInstance* inst) +uint32 ZoneDatabase::AddObject(uint32 type, uint32 icon, const Object_Struct& object, const EQ::ItemInstance* inst) { uint32 database_id = 0; uint32 item_id = 0; @@ -652,14 +652,14 @@ uint32 ZoneDatabase::AddObject(uint32 type, uint32 icon, const Object_Struct& ob } // Save container contents, if container - if (inst && inst->IsType(EQEmu::item::ItemClassBag)) + if (inst && inst->IsType(EQ::item::ItemClassBag)) SaveWorldContainer(object.zone_id, database_id, inst); return database_id; } // Update information about existing object in database -void ZoneDatabase::UpdateObject(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, const EQEmu::ItemInstance* inst) +void ZoneDatabase::UpdateObject(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, const EQ::ItemInstance* inst) { uint32 item_id = 0; int16 charges = 0; @@ -691,7 +691,7 @@ void ZoneDatabase::UpdateObject(uint32 id, uint32 type, uint32 icon, const Objec } // Save container contents, if container - if (inst && inst->IsType(EQEmu::item::ItemClassBag)) + if (inst && inst->IsType(EQ::item::ItemClassBag)) SaveWorldContainer(object.zone_id, id, inst); } @@ -950,7 +950,7 @@ uint32 Object::GetItemID() return 0; } - const EQEmu::ItemData* item = this->m_inst->GetItem(); + const EQ::ItemData* item = this->m_inst->GetItem(); if (item == 0) { diff --git a/zone/object.h b/zone/object.h index ce64ee47e..1ab4463f1 100644 --- a/zone/object.h +++ b/zone/object.h @@ -30,7 +30,7 @@ class Client; class EQApplicationPacket; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -73,7 +73,7 @@ IT10714_ACTORDEF=Augmentation Sealer IT10725_ACTORDEF=Shuriken */ -#define OT_DROPPEDITEM EQEmu::item::BagTypeLargeBag +#define OT_DROPPEDITEM EQ::item::BagTypeLargeBag // Icon values: //0x0453 a pie @@ -93,11 +93,11 @@ class Object: public Entity { public: // Loading object from database - Object(uint32 id, uint32 type, uint32 icon, const Object_Struct& data, const EQEmu::ItemInstance* inst); - Object(const EQEmu::ItemInstance* inst, char* name,float max_x,float min_x,float max_y,float min_y,float z,float heading,uint32 respawntimer); + Object(uint32 id, uint32 type, uint32 icon, const Object_Struct& data, const EQ::ItemInstance* inst); + Object(const EQ::ItemInstance* inst, char* name,float max_x,float min_x,float max_y,float min_y,float z,float heading,uint32 respawntimer); // Loading object from client dropping item on ground - Object(Client* client, const EQEmu::ItemInstance* inst); - Object(const EQEmu::ItemInstance *inst, float x, float y, float z, float heading, uint32 decay_time = 300000); + Object(Client* client, const EQ::ItemInstance* inst); + Object(const EQ::ItemInstance *inst, float x, float y, float z, float heading, uint32 decay_time = 300000); Object(const char *model, float x, float y, float z, float heading, uint8 type, uint32 decay_time = 0); // Destructor @@ -112,7 +112,7 @@ public: static void HandleAugmentation(Client* user, const AugmentItem_Struct* in_augment, Object *worldo); static void HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac); - static EQEmu::skills::SkillType TypeToSkill(uint32 type); + static EQ::skills::SkillType TypeToSkill(uint32 type); // Packet functions void CreateSpawnPacket(EQApplicationPacket* app); @@ -124,10 +124,10 @@ public: void StartDecay() {decay_timer.Start();} // Container functions - const EQEmu::ItemInstance* GetItem(uint8 index); - void PutItem(uint8 index, const EQEmu::ItemInstance* inst); + const EQ::ItemInstance* GetItem(uint8 index); + void PutItem(uint8 index, const EQ::ItemInstance* inst); void DeleteItem(uint8 index); // Item inside container - EQEmu::ItemInstance* PopItem(uint8 index); // Pop item out of container + EQ::ItemInstance* PopItem(uint8 index); // Pop item out of container // Override base class implementations virtual bool IsObject() const { return true; } @@ -180,7 +180,7 @@ protected: void RandomSpawn(bool send_packet = false); //spawn this ground spawn at a random place Object_Struct m_data; // Packet data - EQEmu::ItemInstance *m_inst; // Item representing object + EQ::ItemInstance *m_inst; // Item representing object bool m_inuse; // Currently in use by a client? uint32 m_id; // Database key, different than drop_id uint32 m_type; // Object Type, ie, forge, oven, dropped item, etc (ref: ContainerUseTypes) diff --git a/zone/pathfinder_nav_mesh.cpp b/zone/pathfinder_nav_mesh.cpp index 998515a35..4af9fc0f6 100644 --- a/zone/pathfinder_nav_mesh.cpp +++ b/zone/pathfinder_nav_mesh.cpp @@ -432,7 +432,7 @@ void PathfinderNavmesh::Load(const std::string &path) std::vector buffer; buffer.resize(buffer_size); - uint32_t v = EQEmu::InflateData(&data[0], data_size, &buffer[0], buffer_size); + uint32_t v = EQ::InflateData(&data[0], data_size, &buffer[0], buffer_size); fclose(f); char *buf = &buffer[0]; diff --git a/zone/pathing.cpp b/zone/pathing.cpp index ee5f0138a..1513cd5d6 100644 --- a/zone/pathing.cpp +++ b/zone/pathing.cpp @@ -40,14 +40,14 @@ void CullPoints(std::vector &points) { } void Client::SendPathPacket(const std::vector &points) { - EQEmu::Any data(points); + EQ::Any data(points); EQ::Task([=](EQ::Task::ResolveFn resolve, EQ::Task::RejectFn reject) { - auto points = EQEmu::any_cast>(data); + auto points = EQ::any_cast>(data); CullPoints(points); resolve(points); }) - .Then([this](const EQEmu::Any &result) { - auto points = EQEmu::any_cast>(result); + .Then([this](const EQ::Any &result) { + auto points = EQ::any_cast>(result); if (points.size() < 2) { if (Admin() > 10) { Message(Chat::System, "Too few points"); diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index 1c0c42bf5..d2262ddad 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -1891,7 +1891,7 @@ XS(XS_Client_GetSkill) { Client *THIS; uint16 RETVAL; dXSTARG; - EQEmu::skills::SkillType skill_id = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skill_id = (EQ::skills::SkillType) SvUV(ST(1)); if (sv_derived_from(ST(0), "Client")) { IV tmp = SvIV((SV *) SvRV(ST(0))); @@ -1917,7 +1917,7 @@ XS(XS_Client_GetRawSkill) { Client *THIS; uint32 RETVAL; dXSTARG; - EQEmu::skills::SkillType skill_id = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skill_id = (EQ::skills::SkillType) SvUV(ST(1)); if (sv_derived_from(ST(0), "Client")) { IV tmp = SvIV((SV *) SvRV(ST(0))); @@ -1942,7 +1942,7 @@ XS(XS_Client_HasSkill) { { Client *THIS; bool RETVAL; - EQEmu::skills::SkillType skill_id = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skill_id = (EQ::skills::SkillType) SvUV(ST(1)); if (sv_derived_from(ST(0), "Client")) { IV tmp = SvIV((SV *) SvRV(ST(0))); @@ -1967,7 +1967,7 @@ XS(XS_Client_CanHaveSkill) { { Client *THIS; bool RETVAL; - EQEmu::skills::SkillType skill_id = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skill_id = (EQ::skills::SkillType) SvUV(ST(1)); if (sv_derived_from(ST(0), "Client")) { IV tmp = SvIV((SV *) SvRV(ST(0))); @@ -1991,7 +1991,7 @@ XS(XS_Client_SetSkill) { Perl_croak(aTHX_ "Usage: Client::SetSkill(THIS, int skill_id, uint16 value)"); { Client *THIS; - EQEmu::skills::SkillType skill_num = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skill_num = (EQ::skills::SkillType) SvUV(ST(1)); uint16 value = (uint16) SvUV(ST(2)); if (sv_derived_from(ST(0), "Client")) { @@ -2014,7 +2014,7 @@ XS(XS_Client_AddSkill) { Perl_croak(aTHX_ "Usage: Client::AddSkill(THIS, int skill_id, uint16 value)"); { Client *THIS; - EQEmu::skills::SkillType skillid = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skillid = (EQ::skills::SkillType) SvUV(ST(1)); uint16 value = (uint16) SvUV(ST(2)); if (sv_derived_from(ST(0), "Client")) { @@ -2060,7 +2060,7 @@ XS(XS_Client_CheckIncreaseSkill) { { Client *THIS; bool RETVAL; - EQEmu::skills::SkillType skillid = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skillid = (EQ::skills::SkillType) SvUV(ST(1)); int chancemodi; if (sv_derived_from(ST(0), "Client")) { @@ -2116,7 +2116,7 @@ XS(XS_Client_MaxSkill) { { Client *THIS; uint16 RETVAL; - EQEmu::skills::SkillType skillid = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skillid = (EQ::skills::SkillType) SvUV(ST(1)); uint16 class_ = 0; uint16 level = 0; dXSTARG; @@ -3148,7 +3148,7 @@ XS(XS_Client_SummonItem) { uint32 aug3 = 0; uint32 aug4 = 0; uint32 aug5 = 0; - uint16 slot_id = EQEmu::invslot::slotCursor; + uint16 slot_id = EQ::invslot::slotCursor; if (sv_derived_from(ST(0), "Client")) { IV tmp = SvIV((SV *) SvRV(ST(0))); @@ -4206,7 +4206,7 @@ XS(XS_Client_GetItemAt) { Perl_croak(aTHX_ "Usage: Client::GetItemAt(THIS, uint32 slot)"); { Client *THIS; - EQEmu::ItemInstance *RETVAL; + EQ::ItemInstance *RETVAL; uint32 slot = (int32) SvIV(ST(1)); if (sv_derived_from(ST(0), "Client")) { @@ -4231,7 +4231,7 @@ XS(XS_Client_GetAugmentAt) { Perl_croak(aTHX_ "Usage: Client::GetAugmentAt(THIS, uint32 slot, uint32 aug_slot)"); { Client *THIS; - EQEmu::ItemInstance *RETVAL; + EQ::ItemInstance *RETVAL; uint32 slot = (int32) SvIV(ST(1)); uint32 aug_slot = (int32) SvIV(ST(1)); @@ -4243,7 +4243,7 @@ XS(XS_Client_GetAugmentAt) { if (THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - EQEmu::ItemInstance *inst = THIS->GetInv().GetItem(slot); + EQ::ItemInstance *inst = THIS->GetInv().GetItem(slot); if (inst) { RETVAL = inst->GetAugment(aug_slot); } else { @@ -5431,7 +5431,7 @@ XS(XS_Client_GetItemInInventory) { { Client *THIS; int16 slot_id = (int16) SvIV(ST(1)); - EQEmu::ItemInstance *RETVAL = nullptr; + EQ::ItemInstance *RETVAL = nullptr; if (sv_derived_from(ST(0), "Client")) { IV tmp = SvIV((SV *) SvRV(ST(0))); diff --git a/zone/perl_mob.cpp b/zone/perl_mob.cpp index cf6ef4be7..24d46b8be 100644 --- a/zone/perl_mob.cpp +++ b/zone/perl_mob.cpp @@ -606,7 +606,7 @@ XS(XS_Mob_GetSkill) { Mob *THIS; uint32 RETVAL; dXSTARG; - EQEmu::skills::SkillType skill_num = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skill_num = (EQ::skills::SkillType) SvUV(ST(1)); if (sv_derived_from(ST(0), "Mob")) { IV tmp = SvIV((SV *) SvRV(ST(0))); @@ -872,7 +872,7 @@ XS(XS_Mob_Damage) { Mob *from; int32 damage = (int32) SvIV(ST(2)); uint16 spell_id = (uint16) SvUV(ST(3)); - EQEmu::skills::SkillType attack_skill = (EQEmu::skills::SkillType) SvUV(ST(4)); + EQ::skills::SkillType attack_skill = (EQ::skills::SkillType) SvUV(ST(4)); bool avoidable; int8 buffslot; bool iBuffTic; @@ -3830,7 +3830,7 @@ XS(XS_Mob_CastSpell) { Mob *THIS; uint16 spell_id = (uint16) SvUV(ST(1)); uint16 target_id = (uint16) SvUV(ST(2)); - EQEmu::spells::CastingSlot slot; + EQ::spells::CastingSlot slot; int32 casttime; int32 mana_cost; int16 resist_adjust; @@ -3844,9 +3844,9 @@ XS(XS_Mob_CastSpell) { Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); if (items < 4) - slot = EQEmu::spells::CastingSlot::Item; + slot = EQ::spells::CastingSlot::Item; else { - slot = static_cast(SvUV(ST(3))); + slot = static_cast(SvUV(ST(3))); } if (items < 5) @@ -3919,7 +3919,7 @@ XS(XS_Mob_SpellFinished) { resist_diff = spells[spell_id].ResistDiff; } - THIS->SpellFinished(spell_id, spell_target, EQEmu::spells::CastingSlot::Item, mana_cost, -1, resist_diff); + THIS->SpellFinished(spell_id, spell_target, EQ::spells::CastingSlot::Item, mana_cost, -1, resist_diff); } XSRETURN_EMPTY; } @@ -6494,7 +6494,7 @@ XS(XS_Mob_DoSpecialAttackDamage) { { Mob *THIS; Mob *target; - EQEmu::skills::SkillType attack_skill = (EQEmu::skills::SkillType) SvUV(ST(2)); + EQ::skills::SkillType attack_skill = (EQ::skills::SkillType) SvUV(ST(2)); int32 max_damage = (int32) SvIV(ST(3)); int32 min_damage = 1; int32 hate_override = -11; @@ -7401,7 +7401,7 @@ XS(XS_Mob_ModSkillDmgTaken) { Perl_croak(aTHX_ "Usage: Mob::ModSkillDmgTaken(THIS, int skill, int16 value)"); { Mob *THIS; - EQEmu::skills::SkillType skill_num = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skill_num = (EQ::skills::SkillType) SvUV(ST(1)); int16 value = (int16) SvIV(ST(2)); if (sv_derived_from(ST(0), "Mob")) { @@ -7426,7 +7426,7 @@ XS(XS_Mob_GetModSkillDmgTaken) { Mob *THIS; int16 RETVAL; dXSTARG; - EQEmu::skills::SkillType skill_num = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skill_num = (EQ::skills::SkillType) SvUV(ST(1)); if (sv_derived_from(ST(0), "Mob")) { IV tmp = SvIV((SV *) SvRV(ST(0))); @@ -7452,7 +7452,7 @@ XS(XS_Mob_GetSkillDmgTaken) { Mob *THIS; int32 RETVAL; dXSTARG; - EQEmu::skills::SkillType skill_num = (EQEmu::skills::SkillType) SvUV(ST(1)); + EQ::skills::SkillType skill_num = (EQ::skills::SkillType) SvUV(ST(1)); if (sv_derived_from(ST(0), "Mob")) { IV tmp = SvIV((SV *) SvRV(ST(0))); @@ -7607,7 +7607,7 @@ XS(XS_Mob_DoMeleeSkillAttackDmg) { Mob *THIS; Mob *target; uint16 weapon_damage = (uint16) SvIV(ST(2)); - EQEmu::skills::SkillType skill = (EQEmu::skills::SkillType) SvUV(ST(3)); + EQ::skills::SkillType skill = (EQ::skills::SkillType) SvUV(ST(3)); int16 chance_mod = (int16) SvIV(ST(4)); int16 focus = (int16) SvIV(ST(5)); uint8 CanRiposte = (uint8) SvIV(ST(6)); @@ -7641,8 +7641,8 @@ XS(XS_Mob_DoArcheryAttackDmg) { { Mob *THIS; Mob *target; - EQEmu::ItemInstance *RangeWeapon = nullptr; - EQEmu::ItemInstance *Ammo = nullptr; + EQ::ItemInstance *RangeWeapon = nullptr; + EQ::ItemInstance *Ammo = nullptr; uint16 weapon_damage = (uint16) SvIV(ST(4)); int16 chance_mod = (int16) SvIV(ST(5)); int16 focus = (int16) SvIV(ST(6)); @@ -7676,8 +7676,8 @@ XS(XS_Mob_DoThrowingAttackDmg) { { Mob *THIS; Mob *target; - EQEmu::ItemInstance *RangeWeapon = nullptr; - EQEmu::ItemData *item = nullptr; + EQ::ItemInstance *RangeWeapon = nullptr; + EQ::ItemData *item = nullptr; uint16 weapon_damage = (uint16) SvIV(ST(4)); int16 chance_mod = (int16) SvIV(ST(5)); int16 focus = (int16) SvIV(ST(6)); diff --git a/zone/perl_questitem.cpp b/zone/perl_questitem.cpp index 6d728e65e..f30728147 100644 --- a/zone/perl_questitem.cpp +++ b/zone/perl_questitem.cpp @@ -40,15 +40,15 @@ XS(XS_QuestItem_GetName) { if (items != 1) Perl_croak(aTHX_ "Usage: QuestItem::GetName(THIS)"); { - EQEmu::ItemInstance *THIS; + EQ::ItemInstance *THIS; Const_char *RETVAL; dXSTARG; if (sv_derived_from(ST(0), "QuestItem")) { IV tmp = SvIV((SV *) SvRV(ST(0))); - THIS = INT2PTR(EQEmu::ItemInstance *, tmp); + THIS = INT2PTR(EQ::ItemInstance *, tmp); } else - Perl_croak(aTHX_ "THIS is not of type EQEmu::ItemInstance"); + Perl_croak(aTHX_ "THIS is not of type EQ::ItemInstance"); if (THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); @@ -66,14 +66,14 @@ XS(XS_QuestItem_SetScale) { if (items != 2) Perl_croak(aTHX_ "Usage: QuestItem::SetScale(THIS, float scale_multiplier)"); { - EQEmu::ItemInstance *THIS; + EQ::ItemInstance *THIS; float Mult; if (sv_derived_from(ST(0), "QuestItem")) { IV tmp = SvIV((SV *) SvRV(ST(0))); - THIS = INT2PTR(EQEmu::ItemInstance *, tmp); + THIS = INT2PTR(EQ::ItemInstance *, tmp); } else - Perl_croak(aTHX_ "THIS is not of type EQEmu::ItemInstance"); + Perl_croak(aTHX_ "THIS is not of type EQ::ItemInstance"); if (THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); @@ -92,15 +92,15 @@ XS(XS_QuestItem_ItemSay) { if (items != 2 && items != 3) Perl_croak(aTHX_ "Usage: QuestItem::ItemSay(THIS, string text [int language_id])"); { - EQEmu::ItemInstance *THIS; + EQ::ItemInstance *THIS; Const_char *text; int lang = 0; if (sv_derived_from(ST(0), "QuestItem")) { IV tmp = SvIV((SV *) SvRV(ST(0))); - THIS = INT2PTR(EQEmu::ItemInstance *, tmp); + THIS = INT2PTR(EQ::ItemInstance *, tmp); } else - Perl_croak(aTHX_ "THIS is not of type EQEmu::ItemInstance"); + Perl_croak(aTHX_ "THIS is not of type EQ::ItemInstance"); if (THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); @@ -119,19 +119,19 @@ XS(XS_QuestItem_IsType) { if (items != 2) Perl_croak(aTHX_ "Usage: QuestItem::IsType(THIS, type)"); { - EQEmu::ItemInstance *THIS; + EQ::ItemInstance *THIS; bool RETVAL; uint32 type = (int32) SvIV(ST(1)); if (sv_derived_from(ST(0), "QuestItem")) { IV tmp = SvIV((SV *) SvRV(ST(0))); - THIS = INT2PTR(EQEmu::ItemInstance *, tmp); + THIS = INT2PTR(EQ::ItemInstance *, tmp); } else - Perl_croak(aTHX_ "THIS is not of type EQEmu::ItemInstance"); + Perl_croak(aTHX_ "THIS is not of type EQ::ItemInstance"); if (THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - RETVAL = THIS->IsType((EQEmu::item::ItemClass) type); + RETVAL = THIS->IsType((EQ::item::ItemClass) type); ST(0) = boolSV(RETVAL); sv_2mortal(ST(0)); } @@ -144,14 +144,14 @@ XS(XS_QuestItem_IsAttuned) { if (items != 1) Perl_croak(aTHX_ "Usage: QuestItem::IsAttuned(THIS)"); { - EQEmu::ItemInstance *THIS; + EQ::ItemInstance *THIS; bool RETVAL; if (sv_derived_from(ST(0), "QuestItem")) { IV tmp = SvIV((SV *) SvRV(ST(0))); - THIS = INT2PTR(EQEmu::ItemInstance *, tmp); + THIS = INT2PTR(EQ::ItemInstance *, tmp); } else - Perl_croak(aTHX_ "THIS is not of type EQEmu::ItemInstance"); + Perl_croak(aTHX_ "THIS is not of type EQ::ItemInstance"); if (THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); @@ -168,15 +168,15 @@ XS(XS_QuestItem_GetCharges) { if (items != 1) Perl_croak(aTHX_ "Usage: QuestItem::GetCharges(THIS)"); { - EQEmu::ItemInstance *THIS; + EQ::ItemInstance *THIS; int16 RETVAL; dXSTARG; if (sv_derived_from(ST(0), "QuestItem")) { IV tmp = SvIV((SV *) SvRV(ST(0))); - THIS = INT2PTR(EQEmu::ItemInstance *, tmp); + THIS = INT2PTR(EQ::ItemInstance *, tmp); } else - Perl_croak(aTHX_ "THIS is not of type EQEmu::ItemInstance"); + Perl_croak(aTHX_ "THIS is not of type EQ::ItemInstance"); if (THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); @@ -193,15 +193,15 @@ XS(XS_QuestItem_GetAugment) { if (items != 2) Perl_croak(aTHX_ "Usage: QuestItem::GetAugment(THIS, int16 slot_id)"); { - EQEmu::ItemInstance *THIS; + EQ::ItemInstance *THIS; int16 slot_id = (int16) SvIV(ST(1)); - EQEmu::ItemInstance *RETVAL; + EQ::ItemInstance *RETVAL; if (sv_derived_from(ST(0), "QuestItem")) { IV tmp = SvIV((SV *) SvRV(ST(0))); - THIS = INT2PTR(EQEmu::ItemInstance *, tmp); + THIS = INT2PTR(EQ::ItemInstance *, tmp); } else - Perl_croak(aTHX_ "THIS is not of type EQEmu::ItemInstance"); + Perl_croak(aTHX_ "THIS is not of type EQ::ItemInstance"); if (THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); @@ -218,15 +218,15 @@ XS(XS_QuestItem_GetID) { if (items != 1) Perl_croak(aTHX_ "Usage: QuestItem::GetID(THIS)"); { - EQEmu::ItemInstance *THIS; + EQ::ItemInstance *THIS; uint32 RETVAL; dXSTARG; if (sv_derived_from(ST(0), "QuestItem")) { IV tmp = SvIV((SV *) SvRV(ST(0))); - THIS = INT2PTR(EQEmu::ItemInstance *, tmp); + THIS = INT2PTR(EQ::ItemInstance *, tmp); } else - Perl_croak(aTHX_ "THIS is not of type EQEmu::ItemInstance"); + Perl_croak(aTHX_ "THIS is not of type EQ::ItemInstance"); if (THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); diff --git a/zone/pets.cpp b/zone/pets.cpp index b4897940a..1c7b15f54 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -385,12 +385,12 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, // the base items for the pet. These are always loaded // so that a rank 1 suspend minion does not kill things // like the special back items some focused pets may receive. - uint32 petinv[EQEmu::invslot::EQUIPMENT_COUNT]; + uint32 petinv[EQ::invslot::EQUIPMENT_COUNT]; memset(petinv, 0, sizeof(petinv)); - const EQEmu::ItemData *item = nullptr; + const EQ::ItemData *item = nullptr; if (database.GetBasePetItems(record.equipmentset, petinv)) { - for (int i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; i++) + for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; i++) if (petinv[i]) { item = database.GetItem(petinv[i]); npc->AddLootDrop(item, &npc->itemlist, 0, 1, 127, true, true); @@ -524,10 +524,10 @@ void NPC::GetPetState(SpellBuff_Struct *pet_buffs, uint32 *items, char *name) { strn0cpy(name, GetName(), 64); //save their items, we only care about what they are actually wearing - memcpy(items, equipment, sizeof(uint32) * EQEmu::invslot::EQUIPMENT_COUNT); + memcpy(items, equipment, sizeof(uint32) * EQ::invslot::EQUIPMENT_COUNT); //save their buffs. - for (int i=EQEmu::invslot::EQUIPMENT_BEGIN; i < GetPetMaxTotalSlots(); i++) { + for (int i=EQ::invslot::EQUIPMENT_BEGIN; i < GetPetMaxTotalSlots(); i++) { if (buffs[i].spellid != SPELL_UNKNOWN) { pet_buffs[i].spellid = buffs[i].spellid; pet_buffs[i].effect_type = i+1; @@ -612,11 +612,11 @@ void NPC::SetPetState(SpellBuff_Struct *pet_buffs, uint32 *items) { } //restore their equipment... - for (i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; i++) { + for (i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; i++) { if(items[i] == 0) continue; - const EQEmu::ItemData* item2 = database.GetItem(items[i]); + const EQ::ItemData* item2 = database.GetItem(items[i]); if (item2) { bool noDrop=(item2->NoDrop == 0); // Field is reverse logic @@ -679,7 +679,7 @@ bool ZoneDatabase::GetBasePetItems(int32 equipmentset, uint32 *items) { { slot = atoi(row[0]); - if (slot > EQEmu::invslot::EQUIPMENT_END) + if (slot > EQ::invslot::EQUIPMENT_END) continue; if (items[slot] == 0) diff --git a/zone/quest_interface.h b/zone/quest_interface.h index 63310efae..a2a6c73c8 100644 --- a/zone/quest_interface.h +++ b/zone/quest_interface.h @@ -26,7 +26,7 @@ class Client; class NPC; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -34,44 +34,44 @@ namespace EQEmu class QuestInterface { public: virtual int EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { return 0; } + std::vector *extra_pointers) { return 0; } virtual int EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { return 0; } + std::vector *extra_pointers) { return 0; } virtual int EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { return 0; } + std::vector *extra_pointers) { return 0; } virtual int EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { return 0; } - virtual int EventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { return 0; } + std::vector *extra_pointers) { return 0; } + virtual int EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { return 0; } virtual int EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { return 0; } + std::vector *extra_pointers) { return 0; } virtual int EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, - std::vector *extra_pointers) { return 0; } + std::vector *extra_pointers) { return 0; } virtual bool HasQuestSub(uint32 npcid, QuestEventID evt) { return false; } virtual bool HasGlobalQuestSub(QuestEventID evt) { return false; } virtual bool PlayerHasQuestSub(QuestEventID evt) { return false; } virtual bool GlobalPlayerHasQuestSub(QuestEventID evt) { return false; } virtual bool SpellHasQuestSub(uint32 spell_id, QuestEventID evt) { return false; } - virtual bool ItemHasQuestSub(EQEmu::ItemInstance *itm, QuestEventID evt) { return false; } + virtual bool ItemHasQuestSub(EQ::ItemInstance *itm, QuestEventID evt) { return false; } virtual bool EncounterHasQuestSub(std::string encounter_name, QuestEventID evt) { return false; } virtual void LoadNPCScript(std::string filename, int npc_id) { } virtual void LoadGlobalNPCScript(std::string filename) { } virtual void LoadPlayerScript(std::string filename) { } virtual void LoadGlobalPlayerScript(std::string filename) { } - virtual void LoadItemScript(std::string filename, EQEmu::ItemInstance *item) { } + virtual void LoadItemScript(std::string filename, EQ::ItemInstance *item) { } virtual void LoadSpellScript(std::string filename, uint32 spell_id) { } virtual void LoadEncounterScript(std::string filename, std::string encounter_name) { } virtual int DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { return 0; } + std::vector *extra_pointers) { return 0; } virtual int DispatchEventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { return 0; } - virtual int DispatchEventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { return 0; } + std::vector *extra_pointers) { return 0; } + virtual int DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { return 0; } virtual int DispatchEventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { return 0; } + std::vector *extra_pointers) { return 0; } virtual void AddVar(std::string name, std::string val) { } virtual std::string GetVar(std::string name) { return std::string(); } diff --git a/zone/quest_parser_collection.cpp b/zone/quest_parser_collection.cpp index c3d38ce4f..9320379c6 100644 --- a/zone/quest_parser_collection.cpp +++ b/zone/quest_parser_collection.cpp @@ -201,7 +201,7 @@ bool QuestParserCollection::SpellHasQuestSub(uint32 spell_id, QuestEventID evt) return false; } -bool QuestParserCollection::ItemHasQuestSub(EQEmu::ItemInstance *itm, QuestEventID evt) { +bool QuestParserCollection::ItemHasQuestSub(EQ::ItemInstance *itm, QuestEventID evt) { if (itm == nullptr) return false; @@ -238,7 +238,7 @@ bool QuestParserCollection::ItemHasQuestSub(EQEmu::ItemInstance *itm, QuestEvent } int QuestParserCollection::EventNPC(QuestEventID evt, NPC *npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { int rd = DispatchEventNPC(evt, npc, init, data, extra_data, extra_pointers); int rl = EventNPCLocal(evt, npc, init, data, extra_data, extra_pointers); int rg = EventNPCGlobal(evt, npc, init, data, extra_data, extra_pointers); @@ -256,7 +256,7 @@ int QuestParserCollection::EventNPC(QuestEventID evt, NPC *npc, Mob *init, std:: } int QuestParserCollection::EventNPCLocal(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { auto iter = _npc_quest_status.find(npc->GetNPCTypeID()); if(iter != _npc_quest_status.end()) { //loaded or failed to load @@ -279,7 +279,7 @@ int QuestParserCollection::EventNPCLocal(QuestEventID evt, NPC* npc, Mob *init, } int QuestParserCollection::EventNPCGlobal(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { if(_global_npc_quest_status != QuestUnloaded && _global_npc_quest_status != QuestFailedToLoad) { auto qiter = _interfaces.find(_global_npc_quest_status); return qiter->second->EventGlobalNPC(evt, npc, init, data, extra_data, extra_pointers); @@ -299,7 +299,7 @@ int QuestParserCollection::EventNPCGlobal(QuestEventID evt, NPC* npc, Mob *init, } int QuestParserCollection::EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { int rd = DispatchEventPlayer(evt, client, data, extra_data, extra_pointers); int rl = EventPlayerLocal(evt, client, data, extra_data, extra_pointers); int rg = EventPlayerGlobal(evt, client, data, extra_data, extra_pointers); @@ -317,7 +317,7 @@ int QuestParserCollection::EventPlayer(QuestEventID evt, Client *client, std::st } int QuestParserCollection::EventPlayerLocal(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { if(_player_quest_status == QuestUnloaded) { std::string filename; QuestInterface *qi = GetQIByPlayerQuest(filename); @@ -336,7 +336,7 @@ int QuestParserCollection::EventPlayerLocal(QuestEventID evt, Client *client, st } int QuestParserCollection::EventPlayerGlobal(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { if(_global_player_quest_status == QuestUnloaded) { std::string filename; QuestInterface *qi = GetQIByGlobalPlayerQuest(filename); @@ -354,8 +354,8 @@ int QuestParserCollection::EventPlayerGlobal(QuestEventID evt, Client *client, s return 0; } -int QuestParserCollection::EventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers) { +int QuestParserCollection::EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers) { // needs pointer validation check on 'item' argument std::string item_script; @@ -403,7 +403,7 @@ int QuestParserCollection::EventItem(QuestEventID evt, Client *client, EQEmu::It } int QuestParserCollection::EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { auto iter = _spell_quest_status.find(spell_id); if(iter != _spell_quest_status.end()) { //loaded or failed to load @@ -440,7 +440,7 @@ int QuestParserCollection::EventSpell(QuestEventID evt, NPC* npc, Client *client } int QuestParserCollection::EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { auto iter = _encounter_quest_status.find(encounter_name); if(iter != _encounter_quest_status.end()) { //loaded or failed to load @@ -993,7 +993,7 @@ void QuestParserCollection::GetErrors(std::list &err) { } int QuestParserCollection::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { int ret = 0; auto iter = _load_precedence.begin(); while(iter != _load_precedence.end()) { @@ -1007,7 +1007,7 @@ int QuestParserCollection::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *ini } int QuestParserCollection::DispatchEventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { int ret = 0; auto iter = _load_precedence.begin(); while(iter != _load_precedence.end()) { @@ -1020,8 +1020,8 @@ int QuestParserCollection::DispatchEventPlayer(QuestEventID evt, Client *client, return ret; } -int QuestParserCollection::DispatchEventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, - uint32 extra_data, std::vector *extra_pointers) { +int QuestParserCollection::DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, + uint32 extra_data, std::vector *extra_pointers) { int ret = 0; auto iter = _load_precedence.begin(); while(iter != _load_precedence.end()) { @@ -1035,7 +1035,7 @@ int QuestParserCollection::DispatchEventItem(QuestEventID evt, Client *client, E } int QuestParserCollection::DispatchEventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers) { + std::vector *extra_pointers) { int ret = 0; auto iter = _load_precedence.begin(); while(iter != _load_precedence.end()) { diff --git a/zone/quest_parser_collection.h b/zone/quest_parser_collection.h index 196cfffc2..a5dc07a95 100644 --- a/zone/quest_parser_collection.h +++ b/zone/quest_parser_collection.h @@ -48,7 +48,7 @@ class Mob; class NPC; class QuestInterface; -namespace EQEmu +namespace EQ { class Any; class ItemInstance; @@ -69,18 +69,18 @@ public: bool HasQuestSub(uint32 npcid, QuestEventID evt); bool PlayerHasQuestSub(QuestEventID evt); bool SpellHasQuestSub(uint32 spell_id, QuestEventID evt); - bool ItemHasQuestSub(EQEmu::ItemInstance *itm, QuestEventID evt); + bool ItemHasQuestSub(EQ::ItemInstance *itm, QuestEventID evt); int EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers = nullptr); + std::vector *extra_pointers = nullptr); int EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers = nullptr); - int EventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers = nullptr); + std::vector *extra_pointers = nullptr); + int EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers = nullptr); int EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers = nullptr); + std::vector *extra_pointers = nullptr); int EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, - std::vector *extra_pointers = nullptr); + std::vector *extra_pointers = nullptr); void GetErrors(std::list &err); @@ -111,10 +111,10 @@ private: bool PlayerHasQuestSubLocal(QuestEventID evt); bool PlayerHasQuestSubGlobal(QuestEventID evt); - int EventNPCLocal(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers); - int EventNPCGlobal(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers); - int EventPlayerLocal(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers); - int EventPlayerGlobal(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers); + int EventNPCLocal(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers); + int EventNPCGlobal(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers); + int EventPlayerLocal(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers); + int EventPlayerGlobal(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers); QuestInterface *GetQIByNPCQuest(uint32 npcid, std::string &filename); QuestInterface *GetQIByGlobalNPCQuest(std::string &filename); @@ -125,13 +125,13 @@ private: QuestInterface *GetQIByEncounterQuest(std::string encounter_name, std::string &filename); int DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); int DispatchEventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, - std::vector *extra_pointers); - int DispatchEventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); + int DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, + std::vector *extra_pointers); int DispatchEventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data, - std::vector *extra_pointers); + std::vector *extra_pointers); std::map _interfaces; std::map _extensions; diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index dc2663d5a..969fab6eb 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -54,7 +54,7 @@ QuestManager quest_manager; #define QuestManagerCurrentQuestVars() \ Mob *owner = nullptr; \ Client *initiator = nullptr; \ - EQEmu::ItemInstance* questitem = nullptr; \ + EQ::ItemInstance* questitem = nullptr; \ bool depop_npc = false; \ std::string encounter; \ do { \ @@ -116,7 +116,7 @@ void QuestManager::Process() { } } -void QuestManager::StartQuest(Mob *_owner, Client *_initiator, EQEmu::ItemInstance* _questitem, std::string encounter) { +void QuestManager::StartQuest(Mob *_owner, Client *_initiator, EQ::ItemInstance* _questitem, std::string encounter) { running_quest run; run.owner = _owner; run.initiator = _initiator; @@ -370,14 +370,14 @@ void QuestManager::castspell(int spell_id, int target_id) { if (owner) { Mob *tgt = entity_list.GetMob(target_id); if(tgt != nullptr) - owner->SpellFinished(spell_id, tgt, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); + owner->SpellFinished(spell_id, tgt, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); } } void QuestManager::selfcast(int spell_id) { QuestManagerCurrentQuestVars(); if (initiator) - initiator->SpellFinished(spell_id, initiator, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); + initiator->SpellFinished(spell_id, initiator, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); } void QuestManager::addloot(int item_id, int charges, bool equipitem, int aug1, int aug2, int aug3, int aug4, int aug5, int aug6) { @@ -455,7 +455,7 @@ void QuestManager::settimerMS(const char *timer_name, int milliseconds) { QTimerList.push_back(QuestTimer(milliseconds, owner, timer_name)); } -void QuestManager::settimerMS(const char *timer_name, int milliseconds, EQEmu::ItemInstance *inst) { +void QuestManager::settimerMS(const char *timer_name, int milliseconds, EQ::ItemInstance *inst) { if (inst) { inst->SetTimer(timer_name, milliseconds); } @@ -498,7 +498,7 @@ void QuestManager::stoptimer(const char *timer_name) { } } -void QuestManager::stoptimer(const char *timer_name, EQEmu::ItemInstance *inst) { +void QuestManager::stoptimer(const char *timer_name, EQ::ItemInstance *inst) { if (inst) { inst->StopTimer(timer_name); } @@ -536,7 +536,7 @@ void QuestManager::stopalltimers() { } } -void QuestManager::stopalltimers(EQEmu::ItemInstance *inst) { +void QuestManager::stopalltimers(EQ::ItemInstance *inst) { if (inst) { inst->ClearTimers(); } @@ -847,12 +847,12 @@ void QuestManager::traindisc(int discipline_tome_item_id) { } bool QuestManager::isdisctome(int item_id) { - const EQEmu::ItemData *item = database.GetItem(item_id); + const EQ::ItemData *item = database.GetItem(item_id); if(item == nullptr) { return(false); } - if (!item->IsClassCommon() || item->ItemType != EQEmu::item::ItemTypeSpell) { + if (!item->IsClassCommon() || item->ItemType != EQ::item::ItemTypeSpell) { return(false); } @@ -920,8 +920,8 @@ std::string QuestManager::getspellname(uint32 spell_id) { } std::string QuestManager::getskillname(int skill_id) { - if (skill_id >= 0 && skill_id < EQEmu::skills::SkillCount) { - std::map Skills = EQEmu::skills::GetSkillTypeMap(); + if (skill_id >= 0 && skill_id < EQ::skills::SkillCount) { + std::map Skills = EQ::skills::GetSkillTypeMap(); for (auto skills_iter : Skills) { if (skill_id == skills_iter.first) { return skills_iter.second; @@ -1009,7 +1009,7 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) { bool SpellGlobalCheckResult = false; bool SpellBucketCheckResult = false; - for ( ; spell_id < SPDAT_RECORDS && book_slot < EQEmu::spells::SPELLBOOK_SIZE; ++spell_id) { + for ( ; spell_id < SPDAT_RECORDS && book_slot < EQ::spells::SPELLBOOK_SIZE; ++spell_id) { if (book_slot == -1) { initiator->Message( 13, @@ -1024,8 +1024,8 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) { initiator->Message(Chat::Red, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS); return count; } - if (book_slot < 0 || book_slot >= EQEmu::spells::SPELLBOOK_SIZE) { - initiator->Message(Chat::Red, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQEmu::spells::SPELLBOOK_SIZE); + if (book_slot < 0 || book_slot >= EQ::spells::SPELLBOOK_SIZE) { + initiator->Message(Chat::Red, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQ::spells::SPELLBOOK_SIZE); return count; } @@ -1286,10 +1286,10 @@ void QuestManager::doanim(int anim_id) { void QuestManager::addskill(int skill_id, int value) { QuestManagerCurrentQuestVars(); - if (skill_id < 0 || skill_id > EQEmu::skills::HIGHEST_SKILL) + if (skill_id < 0 || skill_id > EQ::skills::HIGHEST_SKILL) return; if (initiator && initiator->IsClient()) - initiator->AddSkill((EQEmu::skills::SkillType) skill_id, value); + initiator->AddSkill((EQ::skills::SkillType) skill_id, value); } void QuestManager::setlanguage(int skill_id, int value) { @@ -1300,10 +1300,10 @@ void QuestManager::setlanguage(int skill_id, int value) { void QuestManager::setskill(int skill_id, int value) { QuestManagerCurrentQuestVars(); - if (skill_id < 0 || skill_id > EQEmu::skills::HIGHEST_SKILL) + if (skill_id < 0 || skill_id > EQ::skills::HIGHEST_SKILL) return; if (initiator && initiator->IsClient()) - initiator->SetSkill((EQEmu::skills::SkillType) skill_id, value); + initiator->SetSkill((EQ::skills::SkillType) skill_id, value); } void QuestManager::setallskill(int value) { @@ -1311,8 +1311,8 @@ void QuestManager::setallskill(int value) { if (!initiator) return; if (initiator && initiator->IsClient()) { - EQEmu::skills::SkillType sk; - for (sk = EQEmu::skills::Skill1HBlunt; sk <= EQEmu::skills::HIGHEST_SKILL; sk = (EQEmu::skills::SkillType)(sk + 1)) { + EQ::skills::SkillType sk; + for (sk = EQ::skills::Skill1HBlunt; sk <= EQ::skills::HIGHEST_SKILL; sk = (EQ::skills::SkillType)(sk + 1)) { initiator->SetSkill(sk, value); } } @@ -1438,12 +1438,12 @@ void QuestManager::settime(uint8 new_hour, uint8 new_min, bool update_world /*= void QuestManager::itemlink(int item_id) { QuestManagerCurrentQuestVars(); if (initiator) { - const EQEmu::ItemData* item = database.GetItem(item_id); + const EQ::ItemData* item = database.GetItem(item_id); if (item == nullptr) return; - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkItemData); + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkItemData); linker.SetItemData(item); initiator->Message(Chat::White, "%s tells you, %s", owner->GetCleanName(), linker.GenerateLink().c_str()); @@ -1908,7 +1908,7 @@ void QuestManager::clear_zone_flag(int zone_id) { void QuestManager::sethp(int hpperc) { QuestManagerCurrentQuestVars(); int newhp = (owner->GetMaxHP() * (100 - hpperc)) / 100; - owner->Damage(owner, newhp, SPELL_UNKNOWN, EQEmu::skills::SkillHandtoHand, false, 0, false); + owner->Damage(owner, newhp, SPELL_UNKNOWN, EQ::skills::SkillHandtoHand, false, 0, false); } bool QuestManager::summonburiedplayercorpse(uint32 char_id, const glm::vec4& position) { @@ -2567,7 +2567,7 @@ int QuestManager::collectitems_processSlot(int16 slot_id, uint32 item_id, bool remove) { QuestManagerCurrentQuestVars(); - EQEmu::ItemInstance *item = nullptr; + EQ::ItemInstance *item = nullptr; int quantity = 0; item = initiator->GetInv().GetItem(slot_id); @@ -2602,12 +2602,12 @@ int QuestManager::collectitems(uint32 item_id, bool remove) int quantity = 0; int slot_id; - for (slot_id = EQEmu::invslot::GENERAL_BEGIN; slot_id <= EQEmu::invslot::GENERAL_END; ++slot_id) + for (slot_id = EQ::invslot::GENERAL_BEGIN; slot_id <= EQ::invslot::GENERAL_END; ++slot_id) { quantity += collectitems_processSlot(slot_id, item_id, remove); } - for (slot_id = EQEmu::invbag::GENERAL_BAGS_BEGIN; slot_id <= EQEmu::invbag::GENERAL_BAGS_END; ++slot_id) + for (slot_id = EQ::invbag::GENERAL_BAGS_BEGIN; slot_id <= EQ::invbag::GENERAL_BAGS_END; ++slot_id) { quantity += collectitems_processSlot(slot_id, item_id, remove); } @@ -2618,15 +2618,15 @@ int QuestManager::collectitems(uint32 item_id, bool remove) int QuestManager::countitem(uint32 item_id) { QuestManagerCurrentQuestVars(); int quantity = 0; - EQEmu::ItemInstance *item = nullptr; + EQ::ItemInstance *item = nullptr; static const int16 slots[][2] = { - { EQEmu::invslot::POSSESSIONS_BEGIN, EQEmu::invslot::POSSESSIONS_END }, - { EQEmu::invbag::GENERAL_BAGS_BEGIN, EQEmu::invbag::GENERAL_BAGS_END }, - { EQEmu::invbag::CURSOR_BAG_BEGIN, EQEmu::invbag::CURSOR_BAG_END}, - { EQEmu::invslot::BANK_BEGIN, EQEmu::invslot::BANK_END }, - { EQEmu::invbag::BANK_BAGS_BEGIN, EQEmu::invbag::BANK_BAGS_END }, - { EQEmu::invslot::SHARED_BANK_BEGIN, EQEmu::invslot::SHARED_BANK_END }, - { EQEmu::invbag::SHARED_BANK_BAGS_BEGIN, EQEmu::invbag::SHARED_BANK_BAGS_END }, + { EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END }, + { EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END }, + { EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END}, + { EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END }, + { EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END }, + { EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END }, + { EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END }, }; const size_t size = sizeof(slots) / sizeof(slots[0]); for (int slot_index = 0; slot_index < size; ++slot_index) { @@ -2682,7 +2682,7 @@ void QuestManager::MerchantSetItem(uint32 NPCid, uint32 itemid, uint32 quantity) if (merchant == 0 || !merchant->IsNPC() || (merchant->GetClass() != MERCHANT)) return; // don't do anything if NPCid isn't a merchant - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; item = database.GetItem(itemid); if (!item) return; // if the item id doesn't correspond to a real item, do nothing @@ -2695,7 +2695,7 @@ uint32 QuestManager::MerchantCountItem(uint32 NPCid, uint32 itemid) { if (merchant == 0 || !merchant->IsNPC() || (merchant->GetClass() != MERCHANT)) return 0; // if it isn't a merchant, it doesn't have any items - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; item = database.GetItem(itemid); if (!item) return 0; // if it isn't a valid item, the merchant doesn't have any @@ -2718,12 +2718,12 @@ uint32 QuestManager::MerchantCountItem(uint32 NPCid, uint32 itemid) { // Item Link for use in Variables - "my $example_link = quest::varlink(item_id);" const char* QuestManager::varlink(char* perltext, int item_id) { QuestManagerCurrentQuestVars(); - const EQEmu::ItemData* item = database.GetItem(item_id); + const EQ::ItemData* item = database.GetItem(item_id); if (!item) return "INVALID ITEM ID IN VARLINK"; - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkItemData); + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkItemData); linker.SetItemData(item); strcpy(perltext, linker.GenerateLink().c_str()); @@ -2732,7 +2732,7 @@ const char* QuestManager::varlink(char* perltext, int item_id) { } std::string QuestManager::getitemname(uint32 item_id) { - const EQEmu::ItemData* item_data = database.GetItem(item_id); + const EQ::ItemData* item_data = database.GetItem(item_id); if (!item_data) { return "INVALID ITEM ID IN GETITEMNAME"; } @@ -2948,7 +2948,7 @@ std::string QuestManager::saylink(char *saylink_text, bool silent, const char *l { QuestManagerCurrentQuestVars(); - return EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink_text, silent, link_name); + return EQ::SayLinkEngine::GenerateQuestSaylink(saylink_text, silent, link_name); } const char* QuestManager::getcharnamebyid(uint32 char_id) { @@ -3427,7 +3427,7 @@ Mob *QuestManager::GetOwner() const { return nullptr; } -EQEmu::ItemInstance *QuestManager::GetQuestItem() const { +EQ::ItemInstance *QuestManager::GetQuestItem() const { if(!quests_running_.empty()) { running_quest e = quests_running_.top(); return e.questitem; diff --git a/zone/questmgr.h b/zone/questmgr.h index 6f9ab4c4e..fb27ca002 100644 --- a/zone/questmgr.h +++ b/zone/questmgr.h @@ -28,7 +28,7 @@ class Client; class Mob; class NPC; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -37,7 +37,7 @@ class QuestManager { struct running_quest { Mob *owner; Client *initiator; - EQEmu::ItemInstance* questitem; + EQ::ItemInstance* questitem; bool depop_npc; std::string encounter; }; @@ -51,7 +51,7 @@ public: QuestManager(); virtual ~QuestManager(); - void StartQuest(Mob *_owner, Client *_initiator = nullptr, EQEmu::ItemInstance* _questitem = nullptr, std::string encounter = ""); + void StartQuest(Mob *_owner, Client *_initiator = nullptr, EQ::ItemInstance* _questitem = nullptr, std::string encounter = ""); void EndQuest(); bool QuestsRunning() { return !quests_running_.empty(); } @@ -79,13 +79,13 @@ public: void Zone(const char *zone_name); void settimer(const char *timer_name, int seconds); void settimerMS(const char *timer_name, int milliseconds); - void settimerMS(const char *timer_name, int milliseconds, EQEmu::ItemInstance *inst); + void settimerMS(const char *timer_name, int milliseconds, EQ::ItemInstance *inst); void settimerMS(const char *timer_name, int milliseconds, Mob *mob); void stoptimer(const char *timer_name); - void stoptimer(const char *timer_name, EQEmu::ItemInstance *inst); + void stoptimer(const char *timer_name, EQ::ItemInstance *inst); void stoptimer(const char *timer_name, Mob *mob); void stopalltimers(); - void stopalltimers(EQEmu::ItemInstance *inst); + void stopalltimers(EQ::ItemInstance *inst); void stopalltimers(Mob *mob); void pausetimer(const char *timer_name); void resumetimer(const char *timer_name); @@ -302,7 +302,7 @@ public: Client *GetInitiator() const; NPC *GetNPC() const; Mob *GetOwner() const; - EQEmu::ItemInstance *GetQuestItem() const; + EQ::ItemInstance *GetQuestItem() const; std::string GetEncounter() const; inline bool ProximitySayInUse() { return HaveProximitySays; } diff --git a/zone/raids.cpp b/zone/raids.cpp index 428b17843..2dc892a9a 100644 --- a/zone/raids.cpp +++ b/zone/raids.cpp @@ -1592,7 +1592,7 @@ void Raid::SendHPManaEndPacketsTo(Client *client) safe_delete_array(hp_packet.pBuffer); hp_packet.size = 0; - if (client->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (client->ClientVersion() >= EQ::versions::ClientVersion::SoD) { outapp.SetOpcode(OP_MobManaUpdate); MobManaUpdate_Struct *mana_update = (MobManaUpdate_Struct *)outapp.pBuffer; @@ -1629,7 +1629,7 @@ void Raid::SendHPManaEndPacketsFrom(Mob *mob) if(members[x].member) { if(!mob->IsClient() || ((members[x].member != mob->CastToClient()) && (members[x].GroupNumber == group_id))) { members[x].member->QueuePacket(&hpapp, false); - if (members[x].member->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (members[x].member->ClientVersion() >= EQ::versions::ClientVersion::SoD) { outapp.SetOpcode(OP_MobManaUpdate); MobManaUpdate_Struct *mana_update = (MobManaUpdate_Struct *)outapp.pBuffer; mana_update->spawn_id = mob->GetID(); @@ -1661,7 +1661,7 @@ void Raid::SendManaPacketFrom(Mob *mob) for (int x = 0; x < MAX_RAID_MEMBERS; x++) { if (members[x].member) { if (!mob->IsClient() || ((members[x].member != mob->CastToClient()) && (members[x].GroupNumber == group_id))) { - if (members[x].member->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (members[x].member->ClientVersion() >= EQ::versions::ClientVersion::SoD) { outapp.SetOpcode(OP_MobManaUpdate); MobManaUpdate_Struct *mana_update = (MobManaUpdate_Struct *)outapp.pBuffer; mana_update->spawn_id = mob->GetID(); @@ -1688,7 +1688,7 @@ void Raid::SendEndurancePacketFrom(Mob *mob) for (int x = 0; x < MAX_RAID_MEMBERS; x++) { if (members[x].member) { if (!mob->IsClient() || ((members[x].member != mob->CastToClient()) && (members[x].GroupNumber == group_id))) { - if (members[x].member->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (members[x].member->ClientVersion() >= EQ::versions::ClientVersion::SoD) { outapp.SetOpcode(OP_MobEnduranceUpdate); MobEnduranceUpdate_Struct *endurance_update = (MobEnduranceUpdate_Struct *)outapp.pBuffer; endurance_update->spawn_id = mob->GetID(); diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 9334e4f6c..831580e8f 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -29,15 +29,15 @@ extern double frame_time; -int Mob::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) +int Mob::GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target) { - int base = EQEmu::skills::GetBaseDamage(skill); + int base = EQ::skills::GetBaseDamage(skill); auto skill_level = GetSkill(skill); switch (skill) { - case EQEmu::skills::SkillDragonPunch: - case EQEmu::skills::SkillEagleStrike: - case EQEmu::skills::SkillTigerClaw: - case EQEmu::skills::SkillRoundKick: + case EQ::skills::SkillDragonPunch: + case EQ::skills::SkillEagleStrike: + case EQ::skills::SkillTigerClaw: + case EQ::skills::SkillRoundKick: if (skill_level >= 25) base++; if (skill_level >= 75) @@ -47,8 +47,8 @@ int Mob::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) if (skill_level >= 175) base++; return base; - case EQEmu::skills::SkillFrenzy: - if (IsClient() && CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary)) { + case EQ::skills::SkillFrenzy: + if (IsClient() && CastToClient()->GetInv().GetItem(EQ::invslot::slotPrimary)) { if (GetLevel() > 15) base += GetLevel() - 15; if (base > 23) @@ -61,11 +61,11 @@ int Mob::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) base++; } return base; - case EQEmu::skills::SkillFlyingKick: { + case EQ::skills::SkillFlyingKick: { float skill_bonus = skill_level / 9.0f; float ac_bonus = 0.0f; if (IsClient()) { - auto inst = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotFeet); + auto inst = CastToClient()->GetInv().GetItem(EQ::invslot::slotFeet); if (inst) ac_bonus = inst->GetItemArmorClass(true) / 25.0f; } @@ -73,12 +73,12 @@ int Mob::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) ac_bonus = skill_bonus; return static_cast(ac_bonus + skill_bonus); } - case EQEmu::skills::SkillKick: { + case EQ::skills::SkillKick: { // there is some base *= 4 case in here? float skill_bonus = skill_level / 10.0f; float ac_bonus = 0.0f; if (IsClient()) { - auto inst = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotFeet); + auto inst = CastToClient()->GetInv().GetItem(EQ::invslot::slotFeet); if (inst) ac_bonus = inst->GetItemArmorClass(true) / 25.0f; } @@ -86,15 +86,15 @@ int Mob::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) ac_bonus = skill_bonus; return static_cast(ac_bonus + skill_bonus); } - case EQEmu::skills::SkillBash: { + case EQ::skills::SkillBash: { float skill_bonus = skill_level / 10.0f; float ac_bonus = 0.0f; - const EQEmu::ItemInstance *inst = nullptr; + const EQ::ItemInstance *inst = nullptr; if (IsClient()) { if (HasShieldEquiped()) - inst = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotSecondary); + inst = CastToClient()->GetInv().GetItem(EQ::invslot::slotSecondary); else if (HasTwoHanderEquipped()) - inst = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary); + inst = CastToClient()->GetInv().GetItem(EQ::invslot::slotPrimary); } if (inst) ac_bonus = inst->GetItemArmorClass(true) / 25.0f; @@ -104,13 +104,13 @@ int Mob::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) ac_bonus = skill_bonus; return static_cast(ac_bonus + skill_bonus); } - case EQEmu::skills::SkillBackstab: { + case EQ::skills::SkillBackstab: { float skill_bonus = static_cast(skill_level) * 0.02f; base = 3; // There seems to be a base 3 for NPCs or some how BS w/o weapon? // until we get a better inv system for NPCs they get nerfed! if (IsClient()) { - auto *inst = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary); - if (inst && inst->GetItem() && inst->GetItem()->ItemType == EQEmu::item::ItemType1HPiercing) { + auto *inst = CastToClient()->GetInv().GetItem(EQ::invslot::slotPrimary); + if (inst && inst->GetItem() && inst->GetItem()->ItemType == EQ::item::ItemType1HPiercing) { base = inst->GetItemBackstabDamage(true); if (!inst->GetItemBackstabDamage()) base += inst->GetItemWeaponDamage(true); @@ -136,7 +136,7 @@ int Mob::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) } } -void Mob::DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32 base_damage, int32 min_damage, +void Mob::DoSpecialAttackDamage(Mob *who, EQ::skills::SkillType skill, int32 base_damage, int32 min_damage, int32 hate_override, int ReuseTime) { // this really should go through the same code as normal melee damage to @@ -159,21 +159,21 @@ void Mob::DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32 if (who->GetInvul() || who->GetSpecialAbility(IMMUNE_MELEE)) my_hit.damage_done = DMG_INVULNERABLE; - if (who->GetSpecialAbility(IMMUNE_MELEE_EXCEPT_BANE) && skill != EQEmu::skills::SkillBackstab) + if (who->GetSpecialAbility(IMMUNE_MELEE_EXCEPT_BANE) && skill != EQ::skills::SkillBackstab) my_hit.damage_done = DMG_INVULNERABLE; uint32 hate = my_hit.base_damage; if (hate_override > -1) hate = hate_override; - if (skill == EQEmu::skills::SkillBash) { + if (skill == EQ::skills::SkillBash) { if (IsClient()) { - EQEmu::ItemInstance *item = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotSecondary); + EQ::ItemInstance *item = CastToClient()->GetInv().GetItem(EQ::invslot::slotSecondary); if (item) { - if (item->GetItem()->ItemType == EQEmu::item::ItemTypeShield) { + if (item->GetItem()->ItemType == EQ::item::ItemTypeShield) { hate += item->GetItem()->AC; } - const EQEmu::ItemData *itm = item->GetItem(); + const EQ::ItemData *itm = item->GetItem(); auto fbash = GetFuriousBash(itm->Focus.Effect); hate = hate * (100 + fbash) / 100; if (fbash) @@ -185,10 +185,10 @@ void Mob::DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32 my_hit.offense = offense(my_hit.skill); my_hit.tohit = GetTotalToHit(my_hit.skill, 0); - my_hit.hand = EQEmu::invslot::slotPrimary; // Avoid checks hand for throwing/archery exclusion, primary should + my_hit.hand = EQ::invslot::slotPrimary; // Avoid checks hand for throwing/archery exclusion, primary should // work for most - if (skill == EQEmu::skills::SkillThrowing || skill == EQEmu::skills::SkillArchery) - my_hit.hand = EQEmu::invslot::slotRange; + if (skill == EQ::skills::SkillThrowing || skill == EQ::skills::SkillArchery) + my_hit.hand = EQ::invslot::slotRange; DoAttack(who, my_hit); @@ -197,7 +197,7 @@ void Mob::DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32 IsValidSpell(aabonuses.SkillAttackProc[2])) { float chance = aabonuses.SkillAttackProc[0] / 1000.0f; if (zone->random.Roll(chance)) - SpellFinished(aabonuses.SkillAttackProc[2], who, EQEmu::spells::CastingSlot::Item, 0, -1, + SpellFinished(aabonuses.SkillAttackProc[2], who, EQ::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SkillAttackProc[2]].ResistDiff); } @@ -228,13 +228,13 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) pTimerType timer = pTimerCombatAbility; // RoF2+ Tiger Claw is unlinked from other monk skills, if they ever do that for other classes there will need // to be more checks here - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF2 && ca_atk->m_skill == EQEmu::skills::SkillTigerClaw) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF2 && ca_atk->m_skill == EQ::skills::SkillTigerClaw) timer = pTimerCombatAbility2; bool CanBypassSkillCheck = false; - if (ca_atk->m_skill == EQEmu::skills::SkillBash) { // SLAM - Bash without a shield equipped + if (ca_atk->m_skill == EQ::skills::SkillBash) { // SLAM - Bash without a shield equipped switch (GetRace()) { case OGRE: @@ -247,7 +247,7 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) } /* Check to see if actually have skill */ - if (!MaxSkill(static_cast(ca_atk->m_skill)) && !CanBypassSkillCheck) + if (!MaxSkill(static_cast(ca_atk->m_skill)) && !CanBypassSkillCheck) return; if (GetTarget()->GetID() != ca_atk->m_target) @@ -259,8 +259,8 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) // These two are not subject to the combat ability timer, as they // allready do their checking in conjunction with the attack timer // throwing weapons - if (ca_atk->m_atk == EQEmu::invslot::slotRange) { - if (ca_atk->m_skill == EQEmu::skills::SkillThrowing) { + if (ca_atk->m_atk == EQ::invslot::slotRange) { + if (ca_atk->m_skill == EQ::skills::SkillThrowing) { SetAttackTimer(); ThrowingAttack(GetTarget()); if (CheckDoubleRangedAttack()) @@ -268,7 +268,7 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) return; } // ranged attack (archery) - if (ca_atk->m_skill == EQEmu::skills::SkillArchery) { + if (ca_atk->m_skill == EQ::skills::SkillArchery) { SetAttackTimer(); RangedAttack(GetTarget()); if (CheckDoubleRangedAttack()) @@ -302,38 +302,38 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) // not sure what the '100' indicates..if ->m_atk is not used as 'slot' reference, then change SlotRange above back to '11' if (ca_atk->m_atk == 100 && - ca_atk->m_skill == EQEmu::skills::SkillBash) { // SLAM - Bash without a shield equipped + ca_atk->m_skill == EQ::skills::SkillBash) { // SLAM - Bash without a shield equipped if (GetTarget() != this) { - CheckIncreaseSkill(EQEmu::skills::SkillBash, GetTarget(), 10); + CheckIncreaseSkill(EQ::skills::SkillBash, GetTarget(), 10); DoAnim(animTailRake, 0, false); int32 ht = 0; - if (GetWeaponDamage(GetTarget(), GetInv().GetItem(EQEmu::invslot::slotSecondary)) <= 0 && - GetWeaponDamage(GetTarget(), GetInv().GetItem(EQEmu::invslot::slotShoulders)) <= 0) + if (GetWeaponDamage(GetTarget(), GetInv().GetItem(EQ::invslot::slotSecondary)) <= 0 && + GetWeaponDamage(GetTarget(), GetInv().GetItem(EQ::invslot::slotShoulders)) <= 0) dmg = -5; else - ht = dmg = GetBaseSkillDamage(EQEmu::skills::SkillBash, GetTarget()); + ht = dmg = GetBaseSkillDamage(EQ::skills::SkillBash, GetTarget()); ReuseTime = BashReuseTime - 1 - skill_reduction; ReuseTime = (ReuseTime * HasteMod) / 100; - DoSpecialAttackDamage(GetTarget(), EQEmu::skills::SkillBash, dmg, 0, ht, ReuseTime); + DoSpecialAttackDamage(GetTarget(), EQ::skills::SkillBash, dmg, 0, ht, ReuseTime); if (ReuseTime > 0) p_timers.Start(timer, ReuseTime); } return; } - if (ca_atk->m_atk == 100 && ca_atk->m_skill == EQEmu::skills::SkillFrenzy) { - CheckIncreaseSkill(EQEmu::skills::SkillFrenzy, GetTarget(), 10); + if (ca_atk->m_atk == 100 && ca_atk->m_skill == EQ::skills::SkillFrenzy) { + CheckIncreaseSkill(EQ::skills::SkillFrenzy, GetTarget(), 10); int AtkRounds = 1; - int32 max_dmg = GetBaseSkillDamage(EQEmu::skills::SkillFrenzy, GetTarget()); + int32 max_dmg = GetBaseSkillDamage(EQ::skills::SkillFrenzy, GetTarget()); DoAnim(anim2HSlashing, 0, false); max_dmg = mod_frenzy_damage(max_dmg); if (GetClass() == BERSERKER) { - int chance = GetLevel() * 2 + GetSkill(EQEmu::skills::SkillFrenzy); + int chance = GetLevel() * 2 + GetSkill(EQ::skills::SkillFrenzy); if (zone->random.Roll0(450) < chance) AtkRounds++; if (zone->random.Roll0(450) < chance) @@ -345,7 +345,7 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) while (AtkRounds > 0) { if (GetTarget()) - DoSpecialAttackDamage(GetTarget(), EQEmu::skills::SkillFrenzy, max_dmg, 0, max_dmg, ReuseTime); + DoSpecialAttackDamage(GetTarget(), EQ::skills::SkillFrenzy, max_dmg, 0, max_dmg, ReuseTime); AtkRounds--; } @@ -359,20 +359,20 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) case WARRIOR: case RANGER: case BEASTLORD: - if (ca_atk->m_atk != 100 || ca_atk->m_skill != EQEmu::skills::SkillKick) + if (ca_atk->m_atk != 100 || ca_atk->m_skill != EQ::skills::SkillKick) break; if (GetTarget() != this) { - CheckIncreaseSkill(EQEmu::skills::SkillKick, GetTarget(), 10); + CheckIncreaseSkill(EQ::skills::SkillKick, GetTarget(), 10); DoAnim(animKick, 0, false); int32 ht = 0; - if (GetWeaponDamage(GetTarget(), GetInv().GetItem(EQEmu::invslot::slotFeet)) <= 0) + if (GetWeaponDamage(GetTarget(), GetInv().GetItem(EQ::invslot::slotFeet)) <= 0) dmg = -5; else - ht = dmg = GetBaseSkillDamage(EQEmu::skills::SkillKick, GetTarget()); + ht = dmg = GetBaseSkillDamage(EQ::skills::SkillKick, GetTarget()); ReuseTime = KickReuseTime - 1 - skill_reduction; - DoSpecialAttackDamage(GetTarget(), EQEmu::skills::SkillKick, dmg, 0, ht, ReuseTime); + DoSpecialAttackDamage(GetTarget(), EQ::skills::SkillKick, dmg, 0, ht, ReuseTime); } break; case MONK: { @@ -383,11 +383,11 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) if (wuchance) { const int MonkSPA[5] = { - EQEmu::skills::SkillFlyingKick, - EQEmu::skills::SkillDragonPunch, - EQEmu::skills::SkillEagleStrike, - EQEmu::skills::SkillTigerClaw, - EQEmu::skills::SkillRoundKick + EQ::skills::SkillFlyingKick, + EQ::skills::SkillDragonPunch, + EQ::skills::SkillEagleStrike, + EQ::skills::SkillTigerClaw, + EQ::skills::SkillRoundKick }; int extra = 0; // always 1/4 of the double attack chance, 25% at rank 5 (100/4) @@ -415,12 +415,12 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) // hackish... but we return a huge reuse time if this is an // invalid skill, otherwise, we can safely assume it is a // valid monk skill and just cast it to a SkillType - CheckIncreaseSkill((EQEmu::skills::SkillType)ca_atk->m_skill, GetTarget(), 10); + CheckIncreaseSkill((EQ::skills::SkillType)ca_atk->m_skill, GetTarget(), 10); } break; } case ROGUE: { - if (ca_atk->m_atk != 100 || ca_atk->m_skill != EQEmu::skills::SkillBackstab) + if (ca_atk->m_atk != 100 || ca_atk->m_skill != EQ::skills::SkillBackstab) break; ReuseTime = BackstabReuseTime-1 - skill_reduction; TryBackstab(GetTarget(), ReuseTime); @@ -448,50 +448,50 @@ int Mob::MonkSpecialAttack(Mob *other, uint8 unchecked_type) int32 max_dmg = 0; int32 min_dmg = 0; int reuse = 0; - EQEmu::skills::SkillType skill_type; // to avoid casting... even though it "would work" - uint8 itemslot = EQEmu::invslot::slotFeet; + EQ::skills::SkillType skill_type; // to avoid casting... even though it "would work" + uint8 itemslot = EQ::invslot::slotFeet; if (IsNPC()) { auto *npc = CastToNPC(); min_dmg = npc->GetMinDamage(); } switch (unchecked_type) { - case EQEmu::skills::SkillFlyingKick: - skill_type = EQEmu::skills::SkillFlyingKick; + case EQ::skills::SkillFlyingKick: + skill_type = EQ::skills::SkillFlyingKick; max_dmg = GetBaseSkillDamage(skill_type); min_dmg = 0; // revamped FK formula is missing the min mod? DoAnim(animFlyingKick, 0, false); reuse = FlyingKickReuseTime; break; - case EQEmu::skills::SkillDragonPunch: - skill_type = EQEmu::skills::SkillDragonPunch; + case EQ::skills::SkillDragonPunch: + skill_type = EQ::skills::SkillDragonPunch; max_dmg = GetBaseSkillDamage(skill_type); - itemslot = EQEmu::invslot::slotHands; + itemslot = EQ::invslot::slotHands; DoAnim(animTailRake, 0, false); reuse = TailRakeReuseTime; break; - case EQEmu::skills::SkillEagleStrike: - skill_type = EQEmu::skills::SkillEagleStrike; + case EQ::skills::SkillEagleStrike: + skill_type = EQ::skills::SkillEagleStrike; max_dmg = GetBaseSkillDamage(skill_type); - itemslot = EQEmu::invslot::slotHands; + itemslot = EQ::invslot::slotHands; DoAnim(animEagleStrike, 0, false); reuse = EagleStrikeReuseTime; break; - case EQEmu::skills::SkillTigerClaw: - skill_type = EQEmu::skills::SkillTigerClaw; + case EQ::skills::SkillTigerClaw: + skill_type = EQ::skills::SkillTigerClaw; max_dmg = GetBaseSkillDamage(skill_type); - itemslot = EQEmu::invslot::slotHands; + itemslot = EQ::invslot::slotHands; DoAnim(animTigerClaw, 0, false); reuse = TigerClawReuseTime; break; - case EQEmu::skills::SkillRoundKick: - skill_type = EQEmu::skills::SkillRoundKick; + case EQ::skills::SkillRoundKick: + skill_type = EQ::skills::SkillRoundKick; max_dmg = GetBaseSkillDamage(skill_type); DoAnim(animRoundKick, 0, false); reuse = RoundKickReuseTime; break; - case EQEmu::skills::SkillKick: - skill_type = EQEmu::skills::SkillKick; + case EQ::skills::SkillKick: + skill_type = EQ::skills::SkillKick; max_dmg = GetBaseSkillDamage(skill_type); DoAnim(animKick, 0, false); reuse = KickReuseTime; @@ -506,7 +506,7 @@ int Mob::MonkSpecialAttack(Mob *other, uint8 unchecked_type) max_dmg = DMG_INVULNERABLE; } } else { - if (GetWeaponDamage(other, (const EQEmu::ItemData *)nullptr) <= 0) { + if (GetWeaponDamage(other, (const EQ::ItemData *)nullptr) <= 0) { max_dmg = DMG_INVULNERABLE; } } @@ -532,8 +532,8 @@ void Mob::TryBackstab(Mob *other, int ReuseTime) { //make sure we have a proper weapon if we are a client. if(IsClient()) { - const EQEmu::ItemInstance *wpn = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary); - if (!wpn || (wpn->GetItem()->ItemType != EQEmu::item::ItemType1HPiercing)){ + const EQ::ItemInstance *wpn = CastToClient()->GetInv().GetItem(EQ::invslot::slotPrimary); + if (!wpn || (wpn->GetItem()->ItemType != EQ::item::ItemType1HPiercing)){ MessageString(Chat::Red, BACKSTAB_WEAPON); return; } @@ -571,7 +571,7 @@ void Mob::TryBackstab(Mob *other, int ReuseTime) { } if(IsClient()) - CastToClient()->CheckIncreaseSkill(EQEmu::skills::SkillBackstab, other, 10); + CastToClient()->CheckIncreaseSkill(EQ::skills::SkillBackstab, other, 10); } //Live AA - Chaotic Backstab @@ -583,11 +583,11 @@ void Mob::TryBackstab(Mob *other, int ReuseTime) { // Live actually added SPA 473 which grants chance to double here when they revamped chaotic/seized RogueBackstab(other, true, ReuseTime); if(IsClient()) - CastToClient()->CheckIncreaseSkill(EQEmu::skills::SkillBackstab, other, 10); + CastToClient()->CheckIncreaseSkill(EQ::skills::SkillBackstab, other, 10); m_specialattacks = eSpecialAttacks::None; } else { //We do a single regular attack if we attack from the front without chaotic stab - Attack(other, EQEmu::invslot::slotPrimary); + Attack(other, EQ::invslot::slotPrimary); } } @@ -601,17 +601,17 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime) // make sure we can hit (bane, magical, etc) if (IsClient()) { - const EQEmu::ItemInstance *wpn = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary); + const EQ::ItemInstance *wpn = CastToClient()->GetInv().GetItem(EQ::invslot::slotPrimary); if (!GetWeaponDamage(other, wpn)) return; - } else if (!GetWeaponDamage(other, (const EQEmu::ItemData*)nullptr)){ + } else if (!GetWeaponDamage(other, (const EQ::ItemData*)nullptr)){ return; } - int base_damage = GetBaseSkillDamage(EQEmu::skills::SkillBackstab, other); + int base_damage = GetBaseSkillDamage(EQ::skills::SkillBackstab, other); hate = base_damage; - DoSpecialAttackDamage(other, EQEmu::skills::SkillBackstab, base_damage, 0, hate, ReuseTime); + DoSpecialAttackDamage(other, EQ::skills::SkillBackstab, base_damage, 0, hate, ReuseTime); DoAnim(anim1HPiercing, 0, false); } @@ -620,10 +620,10 @@ void Mob::RogueAssassinate(Mob* other) { //can you dodge, parry, etc.. an assassinate?? //if so, use DoSpecialAttackDamage(other, BACKSTAB, 32000); instead - if (GetWeaponDamage(other, IsClient() ? CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary) : (const EQEmu::ItemInstance*)nullptr) > 0){ - other->Damage(this, 32000, SPELL_UNKNOWN, EQEmu::skills::SkillBackstab); + if (GetWeaponDamage(other, IsClient() ? CastToClient()->GetInv().GetItem(EQ::invslot::slotPrimary) : (const EQ::ItemInstance*)nullptr) > 0){ + other->Damage(this, 32000, SPELL_UNKNOWN, EQ::skills::SkillBackstab); }else{ - other->Damage(this, -5, SPELL_UNKNOWN, EQEmu::skills::SkillBackstab); + other->Damage(this, -5, SPELL_UNKNOWN, EQ::skills::SkillBackstab); } DoAnim(anim1HPiercing, 0, false); //piercing animation } @@ -640,34 +640,34 @@ void Client::RangedAttack(Mob* other, bool CanDoubleAttack) { //Message(0, "Error: Timer not up. Attack %d, ranged %d", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime()); return; } - const EQEmu::ItemInstance* RangeWeapon = m_inv[EQEmu::invslot::slotRange]; + const EQ::ItemInstance* RangeWeapon = m_inv[EQ::invslot::slotRange]; //locate ammo - int ammo_slot = EQEmu::invslot::slotAmmo; - const EQEmu::ItemInstance* Ammo = m_inv[EQEmu::invslot::slotAmmo]; + int ammo_slot = EQ::invslot::slotAmmo; + const EQ::ItemInstance* Ammo = m_inv[EQ::invslot::slotAmmo]; if (!RangeWeapon || !RangeWeapon->IsClassCommon()) { - LogCombat("Ranged attack canceled. Missing or invalid ranged weapon ([{}]) in slot [{}]", GetItemIDAt(EQEmu::invslot::slotRange), EQEmu::invslot::slotRange); - Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have no bow!", GetItemIDAt(EQEmu::invslot::slotRange)); + LogCombat("Ranged attack canceled. Missing or invalid ranged weapon ([{}]) in slot [{}]", GetItemIDAt(EQ::invslot::slotRange), EQ::invslot::slotRange); + Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have no bow!", GetItemIDAt(EQ::invslot::slotRange)); return; } if (!Ammo || !Ammo->IsClassCommon()) { - LogCombat("Ranged attack canceled. Missing or invalid ammo item ([{}]) in slot [{}]", GetItemIDAt(EQEmu::invslot::slotAmmo), EQEmu::invslot::slotAmmo); - Message(0, "Error: Ammo: GetItem(%i)==0, you have no ammo!", GetItemIDAt(EQEmu::invslot::slotAmmo)); + LogCombat("Ranged attack canceled. Missing or invalid ammo item ([{}]) in slot [{}]", GetItemIDAt(EQ::invslot::slotAmmo), EQ::invslot::slotAmmo); + Message(0, "Error: Ammo: GetItem(%i)==0, you have no ammo!", GetItemIDAt(EQ::invslot::slotAmmo)); return; } - const EQEmu::ItemData* RangeItem = RangeWeapon->GetItem(); - const EQEmu::ItemData* AmmoItem = Ammo->GetItem(); + const EQ::ItemData* RangeItem = RangeWeapon->GetItem(); + const EQ::ItemData* AmmoItem = Ammo->GetItem(); - if (RangeItem->ItemType != EQEmu::item::ItemTypeBow) { + if (RangeItem->ItemType != EQ::item::ItemTypeBow) { LogCombat("Ranged attack canceled. Ranged item is not a bow. type [{}]", RangeItem->ItemType); Message(0, "Error: Rangeweapon: Item %d is not a bow.", RangeWeapon->GetID()); return; } - if (AmmoItem->ItemType != EQEmu::item::ItemTypeArrow) { + if (AmmoItem->ItemType != EQ::item::ItemTypeArrow) { LogCombat("Ranged attack canceled. Ammo item is not an arrow. type [{}]", AmmoItem->ItemType); - Message(0, "Error: Ammo: type %d != %d, you have the wrong type of ammo!", AmmoItem->ItemType, EQEmu::item::ItemTypeArrow); + Message(0, "Error: Ammo: type %d != %d, you have the wrong type of ammo!", AmmoItem->ItemType, EQ::item::ItemTypeArrow); return; } @@ -678,18 +678,18 @@ void Client::RangedAttack(Mob* other, bool CanDoubleAttack) { //first look for quivers int r; bool found = false; - for (r = EQEmu::invslot::GENERAL_BEGIN; r <= EQEmu::invslot::GENERAL_END; r++) { - const EQEmu::ItemInstance *pi = m_inv[r]; + for (r = EQ::invslot::GENERAL_BEGIN; r <= EQ::invslot::GENERAL_END; r++) { + const EQ::ItemInstance *pi = m_inv[r]; if (pi == nullptr || !pi->IsClassBag()) continue; - const EQEmu::ItemData* bagitem = pi->GetItem(); - if (!bagitem || bagitem->BagType != EQEmu::item::BagTypeQuiver) + const EQ::ItemData* bagitem = pi->GetItem(); + if (!bagitem || bagitem->BagType != EQ::item::BagTypeQuiver) continue; //we found a quiver, look for the ammo in it int i; for (i = 0; i < bagitem->BagSlots; i++) { - EQEmu::ItemInstance* baginst = pi->GetItem(i); + EQ::ItemInstance* baginst = pi->GetItem(i); if(!baginst) continue; //empty if(baginst->GetID() == Ammo->GetID()) { @@ -756,13 +756,13 @@ void Client::RangedAttack(Mob* other, bool CanDoubleAttack) { LogCombat("Endless Quiver prevented ammo consumption"); } - CheckIncreaseSkill(EQEmu::skills::SkillArchery, GetTarget(), -15); + CheckIncreaseSkill(EQ::skills::SkillArchery, GetTarget(), -15); CommonBreakInvisibleFromCombat(); } -void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon, const EQEmu::ItemInstance *Ammo, +void Mob::DoArcheryAttackDmg(Mob *other, const EQ::ItemInstance *RangeWeapon, const EQ::ItemInstance *Ammo, uint16 weapon_damage, int16 chance_mod, int16 focus, int ReuseTime, uint32 range_id, - uint32 ammo_id, const EQEmu::ItemData *AmmoItem, int AmmoSlot, float speed) + uint32 ammo_id, const EQ::ItemData *AmmoItem, int AmmoSlot, float speed) { if ((other == nullptr || ((IsClient() && CastToClient()->dead) || (other->IsClient() && other->CastToClient()->dead)) || @@ -770,9 +770,9 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon, return; } - const EQEmu::ItemInstance *_RangeWeapon = nullptr; - const EQEmu::ItemInstance *_Ammo = nullptr; - const EQEmu::ItemData *ammo_lost = nullptr; + const EQ::ItemInstance *_RangeWeapon = nullptr; + const EQ::ItemInstance *_Ammo = nullptr; + const EQ::ItemData *ammo_lost = nullptr; /* If LaunchProjectile is false this function will do archery damage on target, @@ -795,7 +795,7 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon, if (!RangeWeapon && !Ammo && range_id && ammo_id) { if (IsClient()) { - _RangeWeapon = CastToClient()->m_inv[EQEmu::invslot::slotRange]; + _RangeWeapon = CastToClient()->m_inv[EQ::invslot::slotRange]; if (_RangeWeapon && _RangeWeapon->GetItem() && _RangeWeapon->GetItem()->ID == range_id) RangeWeapon = _RangeWeapon; @@ -809,7 +809,7 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon, } } } else if (AmmoItem) { - SendItemAnimation(other, AmmoItem, EQEmu::skills::SkillArchery); + SendItemAnimation(other, AmmoItem, EQ::skills::SkillArchery); } LogCombat("Ranged attack hit [{}]", other->GetName()); @@ -826,7 +826,7 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon, } if (LaunchProjectile) { // 1: Shoot the Projectile once we calculate weapon damage. - TryProjectileAttack(other, AmmoItem, EQEmu::skills::SkillArchery, (WDmg + ADmg), RangeWeapon, + TryProjectileAttack(other, AmmoItem, EQ::skills::SkillArchery, (WDmg + ADmg), RangeWeapon, Ammo, AmmoSlot, speed); return; } @@ -858,10 +858,10 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon, my_hit.min_damage = 0; my_hit.damage_done = 1; - my_hit.skill = EQEmu::skills::SkillArchery; + my_hit.skill = EQ::skills::SkillArchery; my_hit.offense = offense(my_hit.skill); my_hit.tohit = GetTotalToHit(my_hit.skill, chance_mod); - my_hit.hand = EQEmu::invslot::slotRange; + my_hit.hand = EQ::invslot::slotRange; DoAttack(other, my_hit); TotalDmg = my_hit.damage_done; @@ -872,14 +872,14 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon, if (IsClient() && !CastToClient()->GetFeigned()) other->AddToHateList(this, hate, 0, false); - other->Damage(this, TotalDmg, SPELL_UNKNOWN, EQEmu::skills::SkillArchery); + other->Damage(this, TotalDmg, SPELL_UNKNOWN, EQ::skills::SkillArchery); // Skill Proc Success if (TotalDmg > 0 && HasSkillProcSuccess() && other && !other->HasDied()) { if (ReuseTime) - TrySkillProc(other, EQEmu::skills::SkillArchery, ReuseTime); + TrySkillProc(other, EQ::skills::SkillArchery, ReuseTime); else - TrySkillProc(other, EQEmu::skills::SkillArchery, 0, true, EQEmu::invslot::slotRange); + TrySkillProc(other, EQ::skills::SkillArchery, 0, true, EQ::invslot::slotRange); } // end of old fuck @@ -888,26 +888,26 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon, // Weapon Proc if (RangeWeapon && other && !other->HasDied()) - TryWeaponProc(RangeWeapon, other, EQEmu::invslot::slotRange); + TryWeaponProc(RangeWeapon, other, EQ::invslot::slotRange); // Ammo Proc if (ammo_lost) - TryWeaponProc(nullptr, ammo_lost, other, EQEmu::invslot::slotRange); + TryWeaponProc(nullptr, ammo_lost, other, EQ::invslot::slotRange); else if (Ammo && other && !other->HasDied()) - TryWeaponProc(Ammo, other, EQEmu::invslot::slotRange); + TryWeaponProc(Ammo, other, EQ::invslot::slotRange); // Skill Proc if (HasSkillProcs() && other && !other->HasDied()) { if (ReuseTime) - TrySkillProc(other, EQEmu::skills::SkillArchery, ReuseTime); + TrySkillProc(other, EQ::skills::SkillArchery, ReuseTime); else - TrySkillProc(other, EQEmu::skills::SkillArchery, 0, false, EQEmu::invslot::slotRange); + TrySkillProc(other, EQ::skills::SkillArchery, 0, false, EQ::invslot::slotRange); } } -bool Mob::TryProjectileAttack(Mob *other, const EQEmu::ItemData *item, EQEmu::skills::SkillType skillInUse, - uint16 weapon_dmg, const EQEmu::ItemInstance *RangeWeapon, - const EQEmu::ItemInstance *Ammo, int AmmoSlot, float speed) +bool Mob::TryProjectileAttack(Mob *other, const EQ::ItemData *item, EQ::skills::SkillType skillInUse, + uint16 weapon_dmg, const EQ::ItemInstance *RangeWeapon, + const EQ::ItemInstance *Ammo, int AmmoSlot, float speed) { if (!other) return false; @@ -994,7 +994,7 @@ void Mob::ProjectileAttack() if (ProjectileAtk[i].hit_increment <= ProjectileAtk[i].increment) { if (target) { if (IsNPC()) { - if (ProjectileAtk[i].skill == EQEmu::skills::SkillConjuration) { + if (ProjectileAtk[i].skill == EQ::skills::SkillConjuration) { if (IsValidSpell(ProjectileAtk[i].wpn_dmg)) SpellOnTarget(ProjectileAtk[i].wpn_dmg, target, false, true, spells[ProjectileAtk[i].wpn_dmg].ResistDiff, @@ -1002,19 +1002,19 @@ void Mob::ProjectileAttack() } else { CastToNPC()->DoRangedAttackDmg( target, false, ProjectileAtk[i].wpn_dmg, 0, - static_cast(ProjectileAtk[i].skill)); + static_cast(ProjectileAtk[i].skill)); } } else { - if (ProjectileAtk[i].skill == EQEmu::skills::SkillArchery) + if (ProjectileAtk[i].skill == EQ::skills::SkillArchery) DoArcheryAttackDmg(target, nullptr, nullptr, ProjectileAtk[i].wpn_dmg, 0, 0, 0, ProjectileAtk[i].ranged_id, ProjectileAtk[i].ammo_id, nullptr, ProjectileAtk[i].ammo_slot); - else if (ProjectileAtk[i].skill == EQEmu::skills::SkillThrowing) + else if (ProjectileAtk[i].skill == EQ::skills::SkillThrowing) DoThrowingAttackDmg(target, nullptr, nullptr, ProjectileAtk[i].wpn_dmg, 0, 0, 0, ProjectileAtk[i].ranged_id, ProjectileAtk[i].ammo_slot); - else if (ProjectileAtk[i].skill == EQEmu::skills::SkillConjuration && + else if (ProjectileAtk[i].skill == EQ::skills::SkillConjuration && IsValidSpell(ProjectileAtk[i].wpn_dmg)) SpellOnTarget(ProjectileAtk[i].wpn_dmg, target, false, true, spells[ProjectileAtk[i].wpn_dmg].ResistDiff, true); @@ -1139,7 +1139,7 @@ void NPC::RangedAttack(Mob* other) } } -void NPC::DoRangedAttackDmg(Mob* other, bool Launch, int16 damage_mod, int16 chance_mod, EQEmu::skills::SkillType skill, float speed, const char *IDFile) +void NPC::DoRangedAttackDmg(Mob* other, bool Launch, int16 damage_mod, int16 chance_mod, EQ::skills::SkillType skill, float speed, const char *IDFile) { if ((other == nullptr || (other->HasDied())) || @@ -1151,7 +1151,7 @@ void NPC::DoRangedAttackDmg(Mob* other, bool Launch, int16 damage_mod, int16 cha return; } - EQEmu::skills::SkillType skillInUse = static_cast(GetRangedSkill()); + EQ::skills::SkillType skillInUse = static_cast(GetRangedSkill()); if (skill != skillInUse) skillInUse = skill; @@ -1192,7 +1192,7 @@ void NPC::DoRangedAttackDmg(Mob* other, bool Launch, int16 damage_mod, int16 cha my_hit.skill = skill; my_hit.offense = offense(my_hit.skill); my_hit.tohit = GetTotalToHit(my_hit.skill, chance_mod); - my_hit.hand = EQEmu::invslot::slotRange; + my_hit.hand = EQ::invslot::slotRange; DoAttack(other, my_hit); @@ -1208,14 +1208,14 @@ void NPC::DoRangedAttackDmg(Mob* other, bool Launch, int16 damage_mod, int16 cha other->Damage(this, TotalDmg, SPELL_UNKNOWN, skillInUse); if (TotalDmg > 0 && HasSkillProcSuccess() && !other->HasDied()) - TrySkillProc(other, skillInUse, 0, true, EQEmu::invslot::slotRange); + TrySkillProc(other, skillInUse, 0, true, EQ::invslot::slotRange); //try proc on hits and misses if(other && !other->HasDied()) - TrySpellProc(nullptr, (const EQEmu::ItemData*)nullptr, other, EQEmu::invslot::slotRange); + TrySpellProc(nullptr, (const EQ::ItemData*)nullptr, other, EQ::invslot::slotRange); if (HasSkillProcs() && other && !other->HasDied()) - TrySkillProc(other, skillInUse, 0, false, EQEmu::invslot::slotRange); + TrySkillProc(other, skillInUse, 0, false, EQ::invslot::slotRange); } void Client::ThrowingAttack(Mob* other, bool CanDoubleAttack) { //old was 51 @@ -1231,19 +1231,19 @@ void Client::ThrowingAttack(Mob* other, bool CanDoubleAttack) { //old was 51 return; } - int ammo_slot = EQEmu::invslot::slotRange; - const EQEmu::ItemInstance* RangeWeapon = m_inv[EQEmu::invslot::slotRange]; + int ammo_slot = EQ::invslot::slotRange; + const EQ::ItemInstance* RangeWeapon = m_inv[EQ::invslot::slotRange]; if (!RangeWeapon || !RangeWeapon->IsClassCommon()) { - LogCombat("Ranged attack canceled. Missing or invalid ranged weapon ([{}]) in slot [{}]", GetItemIDAt(EQEmu::invslot::slotRange), EQEmu::invslot::slotRange); - Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have nothing to throw!", GetItemIDAt(EQEmu::invslot::slotRange)); + LogCombat("Ranged attack canceled. Missing or invalid ranged weapon ([{}]) in slot [{}]", GetItemIDAt(EQ::invslot::slotRange), EQ::invslot::slotRange); + Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have nothing to throw!", GetItemIDAt(EQ::invslot::slotRange)); return; } - const EQEmu::ItemData* item = RangeWeapon->GetItem(); - if (item->ItemType != EQEmu::item::ItemTypeLargeThrowing && item->ItemType != EQEmu::item::ItemTypeSmallThrowing) { + const EQ::ItemData* item = RangeWeapon->GetItem(); + if (item->ItemType != EQ::item::ItemTypeLargeThrowing && item->ItemType != EQ::item::ItemTypeSmallThrowing) { LogCombat("Ranged attack canceled. Ranged item [{}] is not a throwing weapon. type [{}]", item->ItemType); - Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have nothing useful to throw!", GetItemIDAt(EQEmu::invslot::slotRange)); + Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have nothing useful to throw!", GetItemIDAt(EQ::invslot::slotRange)); return; } @@ -1251,11 +1251,11 @@ void Client::ThrowingAttack(Mob* other, bool CanDoubleAttack) { //old was 51 if(RangeWeapon->GetCharges() == 1) { //first check ammo - const EQEmu::ItemInstance* AmmoItem = m_inv[EQEmu::invslot::slotAmmo]; + const EQ::ItemInstance* AmmoItem = m_inv[EQ::invslot::slotAmmo]; if(AmmoItem != nullptr && AmmoItem->GetID() == RangeWeapon->GetID()) { //more in the ammo slot, use it RangeWeapon = AmmoItem; - ammo_slot = EQEmu::invslot::slotAmmo; + ammo_slot = EQ::invslot::slotAmmo; LogCombat("Using ammo from ammo slot, stack at slot [{}]. [{}] in stack", ammo_slot, RangeWeapon->GetCharges()); } else { //look through our inventory for more @@ -1301,7 +1301,7 @@ void Client::ThrowingAttack(Mob* other, bool CanDoubleAttack) { //old was 51 CommonBreakInvisibleFromCombat(); } -void Mob::DoThrowingAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon, const EQEmu::ItemData *AmmoItem, +void Mob::DoThrowingAttackDmg(Mob *other, const EQ::ItemInstance *RangeWeapon, const EQ::ItemData *AmmoItem, uint16 weapon_damage, int16 chance_mod, int16 focus, int ReuseTime, uint32 range_id, int AmmoSlot, float speed) { @@ -1311,8 +1311,8 @@ void Mob::DoThrowingAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon return; } - const EQEmu::ItemInstance *_RangeWeapon = nullptr; - const EQEmu::ItemData *ammo_lost = nullptr; + const EQ::ItemInstance *_RangeWeapon = nullptr; + const EQ::ItemData *ammo_lost = nullptr; /* If LaunchProjectile is false this function will do archery damage on target, @@ -1337,7 +1337,7 @@ void Mob::DoThrowingAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon } } } else if (AmmoItem) { - SendItemAnimation(other, AmmoItem, EQEmu::skills::SkillThrowing); + SendItemAnimation(other, AmmoItem, EQ::skills::SkillThrowing); } LogCombat("Throwing attack hit [{}]", other->GetName()); @@ -1351,7 +1351,7 @@ void Mob::DoThrowingAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon WDmg = GetWeaponDamage(other, AmmoItem); if (LaunchProjectile) { - TryProjectileAttack(other, AmmoItem, EQEmu::skills::SkillThrowing, WDmg, RangeWeapon, + TryProjectileAttack(other, AmmoItem, EQ::skills::SkillThrowing, WDmg, RangeWeapon, nullptr, AmmoSlot, speed); return; } @@ -1370,10 +1370,10 @@ void Mob::DoThrowingAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon my_hit.min_damage = 0; my_hit.damage_done = 1; - my_hit.skill = EQEmu::skills::SkillThrowing; + my_hit.skill = EQ::skills::SkillThrowing; my_hit.offense = offense(my_hit.skill); my_hit.tohit = GetTotalToHit(my_hit.skill, chance_mod); - my_hit.hand = EQEmu::invslot::slotRange; + my_hit.hand = EQ::invslot::slotRange; DoAttack(other, my_hit); TotalDmg = my_hit.damage_done; @@ -1386,13 +1386,13 @@ void Mob::DoThrowingAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon if (IsClient() && !CastToClient()->GetFeigned()) other->AddToHateList(this, WDmg, 0, false); - other->Damage(this, TotalDmg, SPELL_UNKNOWN, EQEmu::skills::SkillThrowing); + other->Damage(this, TotalDmg, SPELL_UNKNOWN, EQ::skills::SkillThrowing); if (TotalDmg > 0 && HasSkillProcSuccess() && other && !other->HasDied()) { if (ReuseTime) - TrySkillProc(other, EQEmu::skills::SkillThrowing, ReuseTime); + TrySkillProc(other, EQ::skills::SkillThrowing, ReuseTime); else - TrySkillProc(other, EQEmu::skills::SkillThrowing, 0, true, EQEmu::invslot::slotRange); + TrySkillProc(other, EQ::skills::SkillThrowing, 0, true, EQ::invslot::slotRange); } // end old shit @@ -1401,22 +1401,22 @@ void Mob::DoThrowingAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon // Throwing item Proc if (ammo_lost) - TryWeaponProc(nullptr, ammo_lost, other, EQEmu::invslot::slotRange); + TryWeaponProc(nullptr, ammo_lost, other, EQ::invslot::slotRange); else if (RangeWeapon && other && !other->HasDied()) - TryWeaponProc(RangeWeapon, other, EQEmu::invslot::slotRange); + TryWeaponProc(RangeWeapon, other, EQ::invslot::slotRange); if (HasSkillProcs() && other && !other->HasDied()) { if (ReuseTime) - TrySkillProc(other, EQEmu::skills::SkillThrowing, ReuseTime); + TrySkillProc(other, EQ::skills::SkillThrowing, ReuseTime); else - TrySkillProc(other, EQEmu::skills::SkillThrowing, 0, false, EQEmu::invslot::slotRange); + TrySkillProc(other, EQ::skills::SkillThrowing, 0, false, EQ::invslot::slotRange); } if (IsClient()) { - CastToClient()->CheckIncreaseSkill(EQEmu::skills::SkillThrowing, GetTarget()); + CastToClient()->CheckIncreaseSkill(EQ::skills::SkillThrowing, GetTarget()); } } -void Mob::SendItemAnimation(Mob *to, const EQEmu::ItemData *item, EQEmu::skills::SkillType skillInUse, float velocity) { +void Mob::SendItemAnimation(Mob *to, const EQ::ItemData *item, EQ::skills::SkillType skillInUse, float velocity) { auto outapp = new EQApplicationPacket(OP_SomeItemPacketMaybe, sizeof(Arrow_Struct)); Arrow_Struct *as = (Arrow_Struct *) outapp->pBuffer; as->type = 1; @@ -1462,11 +1462,11 @@ void Mob::SendItemAnimation(Mob *to, const EQEmu::ItemData *item, EQEmu::skills: safe_delete(outapp); } -void Mob::ProjectileAnimation(Mob* to, int item_id, bool IsArrow, float speed, float angle, float tilt, float arc, const char *IDFile, EQEmu::skills::SkillType skillInUse) { +void Mob::ProjectileAnimation(Mob* to, int item_id, bool IsArrow, float speed, float angle, float tilt, float arc, const char *IDFile, EQ::skills::SkillType skillInUse) { if (!to) return; - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; uint8 item_type = 0; if(!item_id) { @@ -1592,12 +1592,12 @@ void NPC::DoClassAttacks(Mob *target) { } break; case MONK: case MONKGM: { - uint8 satype = EQEmu::skills::SkillKick; - if (level > 29) { satype = EQEmu::skills::SkillFlyingKick; } - else if (level > 24) { satype = EQEmu::skills::SkillDragonPunch; } - else if (level > 19) { satype = EQEmu::skills::SkillEagleStrike; } - else if (level > 9) { satype = EQEmu::skills::SkillTigerClaw; } - else if (level > 4) { satype = EQEmu::skills::SkillRoundKick; } + uint8 satype = EQ::skills::SkillKick; + if (level > 29) { satype = EQ::skills::SkillFlyingKick; } + else if (level > 24) { satype = EQ::skills::SkillDragonPunch; } + else if (level > 19) { satype = EQ::skills::SkillEagleStrike; } + else if (level > 9) { satype = EQ::skills::SkillTigerClaw; } + else if (level > 4) { satype = EQ::skills::SkillRoundKick; } reuse = MonkSpecialAttack(target, satype); reuse *= 1000; @@ -1608,24 +1608,24 @@ void NPC::DoClassAttacks(Mob *target) { if(level >= RuleI(Combat, NPCBashKickLevel)){ if(zone->random.Roll(75)) { //tested on live, warrior mobs both kick and bash, kick about 75% of the time, casting doesn't seem to make a difference. DoAnim(animKick, 0, false); - int32 dmg = GetBaseSkillDamage(EQEmu::skills::SkillKick); + int32 dmg = GetBaseSkillDamage(EQ::skills::SkillKick); - if (GetWeaponDamage(target, (const EQEmu::ItemData*)nullptr) <= 0) + if (GetWeaponDamage(target, (const EQ::ItemData*)nullptr) <= 0) dmg = DMG_INVULNERABLE; reuse = (KickReuseTime + 3) * 1000; - DoSpecialAttackDamage(target, EQEmu::skills::SkillKick, dmg, GetMinDamage(), -1, reuse); + DoSpecialAttackDamage(target, EQ::skills::SkillKick, dmg, GetMinDamage(), -1, reuse); did_attack = true; } else { DoAnim(animTailRake, 0, false); - int32 dmg = GetBaseSkillDamage(EQEmu::skills::SkillBash); + int32 dmg = GetBaseSkillDamage(EQ::skills::SkillBash); - if (GetWeaponDamage(target, (const EQEmu::ItemData*)nullptr) <= 0) + if (GetWeaponDamage(target, (const EQ::ItemData*)nullptr) <= 0) dmg = DMG_INVULNERABLE; reuse = (BashReuseTime + 3) * 1000; - DoSpecialAttackDamage(target, EQEmu::skills::SkillBash, dmg, GetMinDamage(), -1, reuse); + DoSpecialAttackDamage(target, EQ::skills::SkillBash, dmg, GetMinDamage(), -1, reuse); did_attack = true; } } @@ -1633,11 +1633,11 @@ void NPC::DoClassAttacks(Mob *target) { } case BERSERKER: case BERSERKERGM:{ int AtkRounds = 1; - int32 max_dmg = GetBaseSkillDamage(EQEmu::skills::SkillFrenzy); + int32 max_dmg = GetBaseSkillDamage(EQ::skills::SkillFrenzy); DoAnim(anim2HSlashing, 0, false); if (GetClass() == BERSERKER) { - int chance = GetLevel() * 2 + GetSkill(EQEmu::skills::SkillFrenzy); + int chance = GetLevel() * 2 + GetSkill(EQ::skills::SkillFrenzy); if (zone->random.Roll0(450) < chance) AtkRounds++; if (zone->random.Roll0(450) < chance) @@ -1646,7 +1646,7 @@ void NPC::DoClassAttacks(Mob *target) { while (AtkRounds > 0) { if (GetTarget()) - DoSpecialAttackDamage(GetTarget(), EQEmu::skills::SkillFrenzy, max_dmg, GetMinDamage(), -1, reuse); + DoSpecialAttackDamage(GetTarget(), EQ::skills::SkillFrenzy, max_dmg, GetMinDamage(), -1, reuse); AtkRounds--; } @@ -1658,13 +1658,13 @@ void NPC::DoClassAttacks(Mob *target) { //kick if(level >= RuleI(Combat, NPCBashKickLevel)){ DoAnim(animKick, 0, false); - int32 dmg = GetBaseSkillDamage(EQEmu::skills::SkillKick); + int32 dmg = GetBaseSkillDamage(EQ::skills::SkillKick); - if (GetWeaponDamage(target, (const EQEmu::ItemData*)nullptr) <= 0) + if (GetWeaponDamage(target, (const EQ::ItemData*)nullptr) <= 0) dmg = DMG_INVULNERABLE; reuse = (KickReuseTime + 3) * 1000; - DoSpecialAttackDamage(target, EQEmu::skills::SkillKick, dmg, GetMinDamage(), -1, reuse); + DoSpecialAttackDamage(target, EQ::skills::SkillKick, dmg, GetMinDamage(), -1, reuse); did_attack = true; } break; @@ -1674,13 +1674,13 @@ void NPC::DoClassAttacks(Mob *target) { case PALADIN: case PALADINGM:{ if(level >= RuleI(Combat, NPCBashKickLevel)){ DoAnim(animTailRake, 0, false); - int32 dmg = GetBaseSkillDamage(EQEmu::skills::SkillBash); + int32 dmg = GetBaseSkillDamage(EQ::skills::SkillBash); - if (GetWeaponDamage(target, (const EQEmu::ItemData*)nullptr) <= 0) + if (GetWeaponDamage(target, (const EQ::ItemData*)nullptr) <= 0) dmg = DMG_INVULNERABLE; reuse = (BashReuseTime + 3) * 1000; - DoSpecialAttackDamage(target, EQEmu::skills::SkillBash, dmg, GetMinDamage(), -1, reuse); + DoSpecialAttackDamage(target, EQ::skills::SkillBash, dmg, GetMinDamage(), -1, reuse); did_attack = true; } break; @@ -1721,43 +1721,43 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) case WARRIOR: case RANGER: case BEASTLORD: - skill_to_use = EQEmu::skills::SkillKick; + skill_to_use = EQ::skills::SkillKick; break; case BERSERKER: - skill_to_use = EQEmu::skills::SkillFrenzy; + skill_to_use = EQ::skills::SkillFrenzy; break; case SHADOWKNIGHT: case PALADIN: - skill_to_use = EQEmu::skills::SkillBash; + skill_to_use = EQ::skills::SkillBash; break; case MONK: if(GetLevel() >= 30) { - skill_to_use = EQEmu::skills::SkillFlyingKick; + skill_to_use = EQ::skills::SkillFlyingKick; } else if(GetLevel() >= 25) { - skill_to_use = EQEmu::skills::SkillDragonPunch; + skill_to_use = EQ::skills::SkillDragonPunch; } else if(GetLevel() >= 20) { - skill_to_use = EQEmu::skills::SkillEagleStrike; + skill_to_use = EQ::skills::SkillEagleStrike; } else if(GetLevel() >= 10) { - skill_to_use = EQEmu::skills::SkillTigerClaw; + skill_to_use = EQ::skills::SkillTigerClaw; } else if(GetLevel() >= 5) { - skill_to_use = EQEmu::skills::SkillRoundKick; + skill_to_use = EQ::skills::SkillRoundKick; } else { - skill_to_use = EQEmu::skills::SkillKick; + skill_to_use = EQ::skills::SkillKick; } break; case ROGUE: - skill_to_use = EQEmu::skills::SkillBackstab; + skill_to_use = EQ::skills::SkillBackstab; break; } } @@ -1768,18 +1768,18 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) if(skill_to_use == -1) return; - int dmg = GetBaseSkillDamage(static_cast(skill_to_use), GetTarget()); + int dmg = GetBaseSkillDamage(static_cast(skill_to_use), GetTarget()); - if (skill_to_use == EQEmu::skills::SkillBash) { + if (skill_to_use == EQ::skills::SkillBash) { if (ca_target!=this) { DoAnim(animTailRake, 0, false); - if (GetWeaponDamage(ca_target, GetInv().GetItem(EQEmu::invslot::slotSecondary)) <= 0 && GetWeaponDamage(ca_target, GetInv().GetItem(EQEmu::invslot::slotShoulders)) <= 0) + if (GetWeaponDamage(ca_target, GetInv().GetItem(EQ::invslot::slotSecondary)) <= 0 && GetWeaponDamage(ca_target, GetInv().GetItem(EQ::invslot::slotShoulders)) <= 0) dmg = DMG_INVULNERABLE; ReuseTime = (BashReuseTime - 1) / HasteMod; - DoSpecialAttackDamage(ca_target, EQEmu::skills::SkillBash, dmg, 0, -1, ReuseTime); + DoSpecialAttackDamage(ca_target, EQ::skills::SkillBash, dmg, 0, -1, ReuseTime); if(ReuseTime > 0 && !IsRiposte) { p_timers.Start(pTimerCombatAbility, ReuseTime); @@ -1788,8 +1788,8 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) return; } - if (skill_to_use == EQEmu::skills::SkillFrenzy) { - CheckIncreaseSkill(EQEmu::skills::SkillFrenzy, GetTarget(), 10); + if (skill_to_use == EQ::skills::SkillFrenzy) { + CheckIncreaseSkill(EQ::skills::SkillFrenzy, GetTarget(), 10); int AtkRounds = 1; DoAnim(anim2HSlashing, 0, false); @@ -1797,7 +1797,7 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) // bards can do riposte frenzy for some reason if (!IsRiposte && GetClass() == BERSERKER) { - int chance = GetLevel() * 2 + GetSkill(EQEmu::skills::SkillFrenzy); + int chance = GetLevel() * 2 + GetSkill(EQ::skills::SkillFrenzy); if (zone->random.Roll0(450) < chance) AtkRounds++; if (zone->random.Roll0(450) < chance) @@ -1806,7 +1806,7 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) while(AtkRounds > 0) { if (ca_target!=this) - DoSpecialAttackDamage(ca_target, EQEmu::skills::SkillFrenzy, dmg, 0, dmg, ReuseTime); + DoSpecialAttackDamage(ca_target, EQ::skills::SkillFrenzy, dmg, 0, dmg, ReuseTime); AtkRounds--; } @@ -1816,20 +1816,20 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) return; } - if (skill_to_use == EQEmu::skills::SkillKick){ + if (skill_to_use == EQ::skills::SkillKick){ if(ca_target!=this){ DoAnim(animKick, 0, false); - if (GetWeaponDamage(ca_target, GetInv().GetItem(EQEmu::invslot::slotFeet)) <= 0) + if (GetWeaponDamage(ca_target, GetInv().GetItem(EQ::invslot::slotFeet)) <= 0) dmg = DMG_INVULNERABLE; ReuseTime = KickReuseTime-1; - DoSpecialAttackDamage(ca_target, EQEmu::skills::SkillKick, dmg, 0, -1, ReuseTime); + DoSpecialAttackDamage(ca_target, EQ::skills::SkillKick, dmg, 0, -1, ReuseTime); } } - if (skill_to_use == EQEmu::skills::SkillFlyingKick || skill_to_use == EQEmu::skills::SkillDragonPunch || skill_to_use == EQEmu::skills::SkillEagleStrike || skill_to_use == EQEmu::skills::SkillTigerClaw || skill_to_use == EQEmu::skills::SkillRoundKick) { + if (skill_to_use == EQ::skills::SkillFlyingKick || skill_to_use == EQ::skills::SkillDragonPunch || skill_to_use == EQ::skills::SkillEagleStrike || skill_to_use == EQ::skills::SkillTigerClaw || skill_to_use == EQ::skills::SkillRoundKick) { ReuseTime = MonkSpecialAttack(ca_target, skill_to_use) - 1; MonkSpecialAttack(ca_target, skill_to_use); @@ -1839,9 +1839,9 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) //Live AA - Technique of Master Wu int wuchance = itembonuses.DoubleSpecialAttack + spellbonuses.DoubleSpecialAttack + aabonuses.DoubleSpecialAttack; if (wuchance) { - const int MonkSPA[5] = {EQEmu::skills::SkillFlyingKick, EQEmu::skills::SkillDragonPunch, - EQEmu::skills::SkillEagleStrike, EQEmu::skills::SkillTigerClaw, - EQEmu::skills::SkillRoundKick}; + const int MonkSPA[5] = {EQ::skills::SkillFlyingKick, EQ::skills::SkillDragonPunch, + EQ::skills::SkillEagleStrike, EQ::skills::SkillTigerClaw, + EQ::skills::SkillRoundKick}; int extra = 0; // always 1/4 of the double attack chance, 25% at rank 5 (100/4) while (wuchance > 0) { @@ -1865,7 +1865,7 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) } } - if (skill_to_use == EQEmu::skills::SkillBackstab){ + if (skill_to_use == EQ::skills::SkillBackstab){ ReuseTime = BackstabReuseTime-1; if (IsRiposte) @@ -1892,7 +1892,7 @@ void Mob::Taunt(NPC *who, bool always_succeed, int chance_bonus, bool FromSpell, return; if (!always_succeed && IsClient()) - CastToClient()->CheckIncreaseSkill(EQEmu::skills::SkillTaunt, who, 10); + CastToClient()->CheckIncreaseSkill(EQ::skills::SkillTaunt, who, 10); Mob *hate_top = who->GetHateMost(); @@ -1936,8 +1936,8 @@ void Mob::Taunt(NPC *who, bool always_succeed, int chance_bonus, bool FromSpell, // result. if (IsClient() && !always_succeed) tauntchance -= (RuleR(Combat, TauntSkillFalloff) * - (CastToClient()->MaxSkill(EQEmu::skills::SkillTaunt) - - GetSkill(EQEmu::skills::SkillTaunt))); + (CastToClient()->MaxSkill(EQ::skills::SkillTaunt) - + GetSkill(EQ::skills::SkillTaunt))); if (tauntchance < 1) tauntchance = 1.0f; @@ -1966,10 +1966,10 @@ void Mob::Taunt(NPC *who, bool always_succeed, int chance_bonus, bool FromSpell, } if (HasSkillProcs()) - TrySkillProc(who, EQEmu::skills::SkillTaunt, TauntReuseTime * 1000); + TrySkillProc(who, EQ::skills::SkillTaunt, TauntReuseTime * 1000); if (Success && HasSkillProcSuccess()) - TrySkillProc(who, EQEmu::skills::SkillTaunt, TauntReuseTime * 1000, true); + TrySkillProc(who, EQ::skills::SkillTaunt, TauntReuseTime * 1000, true); } void Mob::InstillDoubt(Mob *who) { @@ -1988,14 +1988,14 @@ void Mob::InstillDoubt(Mob *who) { return; if(IsClient()) { - CastToClient()->CheckIncreaseSkill(EQEmu::skills::SkillIntimidation, who, 10); + CastToClient()->CheckIncreaseSkill(EQ::skills::SkillIntimidation, who, 10); } //I think this formula needs work int value = 0; //user's bonus - value += GetSkill(EQEmu::skills::SkillIntimidation) + GetCHA() / 4; + value += GetSkill(EQ::skills::SkillIntimidation) + GetCHA() / 4; //target's counters value -= target->GetLevel()*4 + who->GetWIS()/4; @@ -2017,11 +2017,11 @@ void Mob::InstillDoubt(Mob *who) { } } -int Mob::TryHeadShot(Mob *defender, EQEmu::skills::SkillType skillInUse) +int Mob::TryHeadShot(Mob *defender, EQ::skills::SkillType skillInUse) { // Only works on YOUR target. if (defender && defender->GetBodyType() == BT_Humanoid && !defender->IsClient() && - skillInUse == EQEmu::skills::SkillArchery && GetTarget() == defender) { + skillInUse == EQ::skills::SkillArchery && GetTarget() == defender) { uint32 HeadShot_Dmg = aabonuses.HeadShot[1] + spellbonuses.HeadShot[1] + itembonuses.HeadShot[1]; uint8 HeadShot_Level = 0; // Get Highest Headshot Level HeadShot_Level = std::max({aabonuses.HSLevel[0], spellbonuses.HSLevel[0], itembonuses.HSLevel[0]}); @@ -2048,12 +2048,12 @@ int Mob::TryHeadShot(Mob *defender, EQEmu::skills::SkillType skillInUse) return 0; } -int Mob::TryAssassinate(Mob *defender, EQEmu::skills::SkillType skillInUse) +int Mob::TryAssassinate(Mob *defender, EQ::skills::SkillType skillInUse) { if (defender && (defender->GetBodyType() == BT_Humanoid) && !defender->IsClient() && GetLevel() >= 60 && - (skillInUse == EQEmu::skills::SkillBackstab || skillInUse == EQEmu::skills::SkillThrowing)) { + (skillInUse == EQ::skills::SkillBackstab || skillInUse == EQ::skills::SkillThrowing)) { int chance = GetDEX(); - if (skillInUse == EQEmu::skills::SkillBackstab) { + if (skillInUse == EQ::skills::SkillBackstab) { chance = 100 * chance / (chance + 3500); if (IsClient()) chance += CastToClient()->GetHeroicDEX(); @@ -2061,7 +2061,7 @@ int Mob::TryAssassinate(Mob *defender, EQEmu::skills::SkillType skillInUse) int norm = aabonuses.AssassinateLevel[1]; if (norm > 0) chance = chance * norm / 100; - } else if (skillInUse == EQEmu::skills::SkillThrowing) { + } else if (skillInUse == EQ::skills::SkillThrowing) { if (chance > 255) chance = 260; else @@ -2094,7 +2094,7 @@ int Mob::TryAssassinate(Mob *defender, EQEmu::skills::SkillType skillInUse) return 0; } -void Mob::DoMeleeSkillAttackDmg(Mob *other, uint16 weapon_damage, EQEmu::skills::SkillType skillinuse, int16 chance_mod, +void Mob::DoMeleeSkillAttackDmg(Mob *other, uint16 weapon_damage, EQ::skills::SkillType skillinuse, int16 chance_mod, int16 focus, bool CanRiposte, int ReuseTime) { if (!CanDoSpecialAttack(other)) @@ -2106,8 +2106,8 @@ void Mob::DoMeleeSkillAttackDmg(Mob *other, uint16 weapon_damage, EQEmu::skills: TODO: We need to stop moving skill 98, it's suppose to just be a dummy skill AFAIK Spells using offense should use the skill of your primary, if you can use it, otherwise h2h */ - if (skillinuse == EQEmu::skills::SkillBegging) - skillinuse = EQEmu::skills::SkillOffense; + if (skillinuse == EQ::skills::SkillBegging) + skillinuse = EQ::skills::SkillOffense; int damage = 0; uint32 hate = 0; @@ -2118,15 +2118,15 @@ void Mob::DoMeleeSkillAttackDmg(Mob *other, uint16 weapon_damage, EQEmu::skills: if (focus) // From FcBaseEffects weapon_damage += weapon_damage * focus / 100; - if (skillinuse == EQEmu::skills::SkillBash) { + if (skillinuse == EQ::skills::SkillBash) { if (IsClient()) { - EQEmu::ItemInstance *item = - CastToClient()->GetInv().GetItem(EQEmu::invslot::slotSecondary); + EQ::ItemInstance *item = + CastToClient()->GetInv().GetItem(EQ::invslot::slotSecondary); if (item) { - if (item->GetItem()->ItemType == EQEmu::item::ItemTypeShield) { + if (item->GetItem()->ItemType == EQ::item::ItemTypeShield) { hate += item->GetItem()->AC; } - const EQEmu::ItemData *itm = item->GetItem(); + const EQ::ItemData *itm = item->GetItem(); hate = hate * (100 + GetFuriousBash(itm->Focus.Effect)) / 100; } } @@ -2141,7 +2141,7 @@ void Mob::DoMeleeSkillAttackDmg(Mob *other, uint16 weapon_damage, EQEmu::skills: my_hit.offense = offense(my_hit.skill); my_hit.tohit = GetTotalToHit(my_hit.skill, chance_mod); // slot range exclude ripe etc ... - my_hit.hand = CanRiposte ? EQEmu::invslot::slotRange : EQEmu::invslot::slotPrimary; + my_hit.hand = CanRiposte ? EQ::invslot::slotRange : EQ::invslot::slotPrimary; if (IsNPC()) my_hit.min_damage = CastToNPC()->GetMinDamage(); @@ -2153,8 +2153,8 @@ void Mob::DoMeleeSkillAttackDmg(Mob *other, uint16 weapon_damage, EQEmu::skills: } bool CanSkillProc = true; - if (skillinuse == EQEmu::skills::SkillOffense) { // Hack to allow damage to display. - skillinuse = EQEmu::skills::SkillTigerClaw; //'strike' your opponent - Arbitrary choice for message. + if (skillinuse == EQ::skills::SkillOffense) { // Hack to allow damage to display. + skillinuse = EQ::skills::SkillTigerClaw; //'strike' your opponent - Arbitrary choice for message. CanSkillProc = false; // Disable skill procs } @@ -2163,7 +2163,7 @@ void Mob::DoMeleeSkillAttackDmg(Mob *other, uint16 weapon_damage, EQEmu::skills: IsValidSpell(aabonuses.SkillAttackProc[2])) { float chance = aabonuses.SkillAttackProc[0] / 1000.0f; if (zone->random.Roll(chance)) - SpellFinished(aabonuses.SkillAttackProc[2], other, EQEmu::spells::CastingSlot::Item, 0, -1, + SpellFinished(aabonuses.SkillAttackProc[2], other, EQ::spells::CastingSlot::Item, 0, -1, spells[aabonuses.SkillAttackProc[2]].ResistDiff); } diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 63a4a113f..2eb17eb29 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -49,7 +49,7 @@ extern WorldServer worldserver; bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_override) { int caster_level, buffslot, effect, effect_value, i; - EQEmu::ItemInstance *SummonedItem=nullptr; + EQ::ItemInstance *SummonedItem=nullptr; #ifdef SPELL_EFFECT_SPAM #define _EDLEN 200 char effect_desc[_EDLEN]; @@ -65,7 +65,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove bool c_override = false; if (caster && caster->IsClient() && GetCastedSpellInvSlot() > 0) { - const EQEmu::ItemInstance *inst = caster->CastToClient()->GetInv().GetItem(GetCastedSpellInvSlot()); + const EQ::ItemInstance *inst = caster->CastToClient()->GetInv().GetItem(GetCastedSpellInvSlot()); if (inst) { if (inst->GetItem()->Click.Level > 0) { caster_level = inst->GetItem()->Click.Level; @@ -149,7 +149,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove if (spells[spell_id].EndurUpkeep > 0) SetEndurUpkeep(true); - if (IsClient() && CastToClient()->ClientVersionBit() & EQEmu::versions::maskUFAndLater) + if (IsClient() && CastToClient()->ClientVersionBit() & EQ::versions::maskUFAndLater) { EQApplicationPacket *outapp = MakeBuffsPacket(false); CastToClient()->FastQueuePacket(&outapp); @@ -158,7 +158,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove if(IsNPC()) { - std::vector args; + std::vector args; args.push_back(&buffslot); int i = parse->EventSpell(EVENT_SPELL_EFFECT_NPC, CastToNPC(), nullptr, spell_id, caster ? caster->GetID() : 0, &args); if(i != 0){ @@ -168,7 +168,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove } else if(IsClient()) { - std::vector args; + std::vector args; args.push_back(&buffslot); int i = parse->EventSpell(EVENT_SPELL_EFFECT_CLIENT, nullptr, CastToClient(), spell_id, caster ? caster->GetID() : 0, &args); if(i != 0){ @@ -627,7 +627,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove snprintf(effect_desc, _EDLEN, "Flesh To Bone"); #endif if(IsClient()){ - EQEmu::ItemInstance* transI = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotCursor); + EQ::ItemInstance* transI = CastToClient()->GetInv().GetItem(EQ::invslot::slotCursor); if (transI && transI->IsClassCommon() && transI->IsStackable()){ uint32 fcharges = transI->GetCharges(); //Does it sound like meat... maybe should check if it looks like meat too... @@ -637,7 +637,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove strstr(transI->GetItem()->Name, "Flesh") || strstr(transI->GetItem()->Name, "parts") || strstr(transI->GetItem()->Name, "Parts")){ - CastToClient()->DeleteItemInInventory(EQEmu::invslot::slotCursor, fcharges, true); + CastToClient()->DeleteItemInInventory(EQ::invslot::slotCursor, fcharges, true); CastToClient()->SummonItem(13073, fcharges); } else{ @@ -829,7 +829,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove #endif if(IsClient()) { - if (CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoDAndLater) + if (CastToClient()->ClientVersionBit() & EQ::versions::maskSoDAndLater) { bodyType bt = BT_Undead; @@ -1152,7 +1152,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove case SE_SummonItem: { - const EQEmu::ItemData *item = database.GetItem(spell.base[i]); + const EQ::ItemData *item = database.GetItem(spell.base[i]); #ifdef SPELL_EFFECT_SPAM const char *itemname = item ? item->Name : "*Unknown Item*"; snprintf(effect_desc, _EDLEN, "Summon Item: %s (id %d)", itemname, spell.base[i]); @@ -1177,7 +1177,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove if (SummonedItem) { c->PushItemOnCursor(*SummonedItem); - c->SendItemPacket(EQEmu::invslot::slotCursor, SummonedItem, ItemPacketLimbo); + c->SendItemPacket(EQ::invslot::slotCursor, SummonedItem, ItemPacketLimbo); safe_delete(SummonedItem); } SummonedItem = database.CreateItem(spell.base[i], charges); @@ -1188,7 +1188,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove } case SE_SummonItemIntoBag: { - const EQEmu::ItemData *item = database.GetItem(spell.base[i]); + const EQ::ItemData *item = database.GetItem(spell.base[i]); #ifdef SPELL_EFFECT_SPAM const char *itemname = item ? item->Name : "*Unknown Item*"; snprintf(effect_desc, _EDLEN, "Summon Item In Bag: %s (id %d)", itemname, spell.base[i]); @@ -1217,7 +1217,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove if (charges < 1) charges = 1; - EQEmu::ItemInstance *SubItem = database.CreateItem(spell.base[i], charges); + EQ::ItemInstance *SubItem = database.CreateItem(spell.base[i], charges); if (SubItem != nullptr) { SummonedItem->PutItem(slot, *SubItem); safe_delete(SubItem); @@ -1247,7 +1247,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove // Will fix buttons for now if (IsClient()) { auto c = CastToClient(); - if (c->ClientVersionBit() & EQEmu::versions::maskUFAndLater) { + if (c->ClientVersionBit() & EQ::versions::maskUFAndLater) { c->SetPetCommandState(PET_BUTTON_SIT, 0); c->SetPetCommandState(PET_BUTTON_STOP, 0); c->SetPetCommandState(PET_BUTTON_REGROUP, 0); @@ -1466,7 +1466,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove } } - for (int x = EQEmu::textures::textureBegin; x <= EQEmu::textures::LastTintableTexture; x++) + for (int x = EQ::textures::textureBegin; x <= EQ::textures::LastTintableTexture; x++) SendWearChange(x); if (caster == this && spell.id != 287 && spell.id != 601 && @@ -1492,7 +1492,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove ); caster->SendAppearancePacket(AT_Size, static_cast(caster->GetTarget()->GetSize())); - for (int x = EQEmu::textures::textureBegin; x <= EQEmu::textures::LastTintableTexture; x++) + for (int x = EQ::textures::textureBegin; x <= EQ::textures::LastTintableTexture; x++) caster->SendWearChange(x); } } @@ -1670,7 +1670,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove #endif // This is handled by the client prior to SoD. // - if (IsClient() && (CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoDAndLater)) + if (IsClient() && (CastToClient()->ClientVersionBit() & EQ::versions::maskSoDAndLater)) CastToClient()->LocateCorpse(); break; @@ -2278,7 +2278,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove snprintf(effect_desc, _EDLEN, "Rampage"); #endif if(caster) - entity_list.AEAttack(caster, 30, EQEmu::invslot::slotPrimary, 0, true); // on live wars dont get a duration ramp, its a one shot deal + entity_list.AEAttack(caster, 30, EQ::invslot::slotPrimary, 0, true); // on live wars dont get a duration ramp, its a one shot deal break; } @@ -2329,10 +2329,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove focus = caster->GetFocusEffect(focusFcBaseEffects, spell_id); switch(spells[spell_id].skill) { - case EQEmu::skills::SkillThrowing: + case EQ::skills::SkillThrowing: caster->DoThrowingAttackDmg(this, nullptr, nullptr, spells[spell_id].base[i],spells[spell_id].base2[i], focus, ReuseTime); break; - case EQEmu::skills::SkillArchery: + case EQ::skills::SkillArchery: caster->DoArcheryAttackDmg(this, nullptr, nullptr, spells[spell_id].base[i],spells[spell_id].base2[i],focus, ReuseTime); break; default: @@ -2532,7 +2532,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove case SE_FcTimerRefresh: { if(IsClient()) { - for (unsigned int i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; ++i) { + for (unsigned int i = 0; i < EQ::spells::SPELL_GEM_COUNT; ++i) { if(IsValidSpell(CastToClient()->m_pp.mem_spells[i])) { if (CalcFocusEffect(focusFcTimerRefresh, spell_id, CastToClient()->m_pp.mem_spells[i])){ CastToClient()->m_pp.spellSlotRefresh[i] = 1; @@ -2801,7 +2801,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove if (caster && IsValidSpell(spells[spell_id].base2[i])){ if(zone->random.Roll(spells[spell_id].base[i])) - caster->SpellFinished(spells[spell_id].base2[i], this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spells[spell_id].base2[i]].ResistDiff); + caster->SpellFinished(spells[spell_id].base2[i], this, EQ::spells::CastingSlot::Item, 0, -1, spells[spells[spell_id].base2[i]].ResistDiff); } break; } @@ -3080,7 +3080,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove if (SummonedItem) { Client *c=CastToClient(); c->PushItemOnCursor(*SummonedItem); - c->SendItemPacket(EQEmu::invslot::slotCursor, SummonedItem, ItemPacketLimbo); + c->SendItemPacket(EQ::invslot::slotCursor, SummonedItem, ItemPacketLimbo); safe_delete(SummonedItem); } @@ -3105,7 +3105,7 @@ int Mob::CalcSpellEffectValue(uint16 spell_id, int effect_id, int caster_level, effect_value = CalcSpellEffectValue_formula(formula, base, max, caster_level, spell_id, ticsremaining); // this doesn't actually need to be a song to get mods, just the right skill - if (EQEmu::skills::IsBardInstrumentSkill(spells[spell_id].skill) && + if (EQ::skills::IsBardInstrumentSkill(spells[spell_id].skill) && spells[spell_id].effectid[effect_id] != SE_AttackSpeed && spells[spell_id].effectid[effect_id] != SE_AttackSpeed2 && spells[spell_id].effectid[effect_id] != SE_AttackSpeed3 && @@ -3464,7 +3464,7 @@ void Mob::BuffProcess() LogSpells("Buff [{}] in slot [{}] has [{}] tics remaining", buffs[buffs_i].spellid, buffs_i, buffs[buffs_i].ticsremaining); } } - else if (IsClient() && !(CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater)) + else if (IsClient() && !(CastToClient()->ClientVersionBit() & EQ::versions::maskSoFAndLater)) { buffs[buffs_i].UpdateClient = true; } @@ -3476,7 +3476,7 @@ void Mob::BuffProcess() { CastToClient()->SendBuffDurationPacket(buffs[buffs_i], buffs_i); // Hack to get UF to play nicer, RoF seems fine without it - if (CastToClient()->ClientVersion() == EQEmu::versions::ClientVersion::UF && buffs[buffs_i].numhits > 0) + if (CastToClient()->ClientVersion() == EQ::versions::ClientVersion::UF && buffs[buffs_i].numhits > 0) CastToClient()->SendBuffNumHitPacket(buffs[buffs_i], buffs_i); buffs[buffs_i].UpdateClient = false; } @@ -3495,7 +3495,7 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster) const SPDat_Spell_Struct &spell = spells[buff.spellid]; if (IsNPC()) { - std::vector args; + std::vector args; args.push_back(&buff.ticsremaining); args.push_back(&buff.casterlevel); args.push_back(&slot); @@ -3505,7 +3505,7 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster) return; } } else { - std::vector args; + std::vector args; args.push_back(&buff.ticsremaining); args.push_back(&buff.casterlevel); args.push_back(&slot); @@ -3686,13 +3686,13 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster) if (!IsBardSong(buff.spellid)) { double break_chance = 2.0; if (caster) { - break_chance -= (2 * (((double)caster->GetSkill(EQEmu::skills::SkillDivination) + + break_chance -= (2 * (((double)caster->GetSkill(EQ::skills::SkillDivination) + ((double)caster->GetLevel() * 3.0)) / 650.0)); } else { break_chance -= (2 * - (((double)GetSkill(EQEmu::skills::SkillDivination) + ((double)GetLevel() * 3.0)) / + (((double)GetSkill(EQ::skills::SkillDivination) + ((double)GetLevel() * 3.0)) / 650.0)); } @@ -3724,14 +3724,14 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster) case SE_CastOnFadeEffectNPC: case SE_CastOnFadeEffectAlways: { if (buff.ticsremaining == 0) { - SpellFinished(spells[buff.spellid].base[i], this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spells[buff.spellid].base[i]].ResistDiff); + SpellFinished(spells[buff.spellid].base[i], this, EQ::spells::CastingSlot::Item, 0, -1, spells[spells[buff.spellid].base[i]].ResistDiff); } break; } case SE_LocateCorpse: { // This is handled by the client prior to SoD. - if (IsClient() && (CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoDAndLater)) + if (IsClient() && (CastToClient()->ClientVersionBit() & EQ::versions::maskSoDAndLater)) CastToClient()->LocateCorpse(); } @@ -3812,12 +3812,12 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) } if(IsClient()) { - std::vector args; + std::vector args; args.push_back(&buffs[slot].casterid); parse->EventSpell(EVENT_SPELL_FADE, nullptr, CastToClient(), buffs[slot].spellid, slot, &args); } else if(IsNPC()) { - std::vector args; + std::vector args; args.push_back(&buffs[slot].casterid); parse->EventSpell(EVENT_SPELL_FADE, CastToNPC(), nullptr, buffs[slot].spellid, slot, &args); @@ -3889,7 +3889,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) else{ SendAppearancePacket(AT_Size, 6); } - for (int x = EQEmu::textures::textureBegin; x <= EQEmu::textures::LastTintableTexture; x++){ + for (int x = EQ::textures::textureBegin; x <= EQ::textures::LastTintableTexture; x++){ SendWearChange(x); } break; @@ -4155,7 +4155,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) { EQApplicationPacket *outapp = MakeBuffsPacket(); - entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, EQEmu::versions::maskSoDAndLater); + entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, EQ::versions::maskSoDAndLater); if(IsClient() && GetTarget() == this) { CastToClient()->QueuePacket(outapp); } @@ -4165,11 +4165,11 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) if (IsNPC()) { EQApplicationPacket *outapp = MakeBuffsPacket(); - entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, EQEmu::versions::maskSoDAndLater, true); + entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, EQ::versions::maskSoDAndLater, true); safe_delete(outapp); } - if (IsClient() && CastToClient()->ClientVersionBit() & EQEmu::versions::maskUFAndLater) + if (IsClient() && CastToClient()->ClientVersionBit() & EQ::versions::maskUFAndLater) { EQApplicationPacket *outapp = MakeBuffsPacket(false); CastToClient()->FastQueuePacket(&outapp); @@ -5170,7 +5170,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo if (Caston_spell_id) { if (IsValidSpell(Caston_spell_id) && (Caston_spell_id != spell_id)) - SpellFinished(Caston_spell_id, this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[Caston_spell_id].ResistDiff); + SpellFinished(Caston_spell_id, this, EQ::spells::CastingSlot::Item, 0, -1, spells[Caston_spell_id].ResistDiff); } return (value * lvlModifier / 100); @@ -5189,15 +5189,15 @@ uint16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) { //item focus if (itembonuses.FocusEffects[type]){ - const EQEmu::ItemData* TempItem = nullptr; + const EQ::ItemData* TempItem = nullptr; - for (int x = EQEmu::invslot::EQUIPMENT_BEGIN; x <= EQEmu::invslot::EQUIPMENT_END; x++) + for (int x = EQ::invslot::EQUIPMENT_BEGIN; x <= EQ::invslot::EQUIPMENT_END; x++) { if (SympatheticProcList.size() > MAX_SYMPATHETIC_PROCS) continue; TempItem = nullptr; - EQEmu::ItemInstance* ins = GetInv().GetItem(x); + EQ::ItemInstance* ins = GetInv().GetItem(x); if (!ins) continue; TempItem = ins->GetItem(); @@ -5211,16 +5211,16 @@ uint16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) { } } - for (int y = EQEmu::invaug::SOCKET_BEGIN; y <= EQEmu::invaug::SOCKET_END; ++y) + for (int y = EQ::invaug::SOCKET_BEGIN; y <= EQ::invaug::SOCKET_END; ++y) { if (SympatheticProcList.size() > MAX_SYMPATHETIC_PROCS) continue; - EQEmu::ItemInstance *aug = nullptr; + EQ::ItemInstance *aug = nullptr; aug = ins->GetAugment(y); if(aug) { - const EQEmu::ItemData* TempItemAug = aug->GetItem(); + const EQ::ItemData* TempItemAug = aug->GetItem(); if (TempItemAug && TempItemAug->Focus.Effect > 0 && IsValidSpell(TempItemAug->Focus.Effect)) { proc_spellid = CalcFocusEffect(type, TempItemAug->Focus.Effect, spell_id); if (IsValidSpell(proc_spellid)){ @@ -5318,18 +5318,18 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) //Check if item focus effect exists for the client. if (itembonuses.FocusEffects[type]){ - const EQEmu::ItemData* TempItem = nullptr; - const EQEmu::ItemData* UsedItem = nullptr; + const EQ::ItemData* TempItem = nullptr; + const EQ::ItemData* UsedItem = nullptr; uint16 UsedFocusID = 0; int16 Total = 0; int16 focus_max = 0; int16 focus_max_real = 0; //item focus - for (int x = EQEmu::invslot::EQUIPMENT_BEGIN; x <= EQEmu::invslot::EQUIPMENT_END; x++) + for (int x = EQ::invslot::EQUIPMENT_BEGIN; x <= EQ::invslot::EQUIPMENT_END; x++) { TempItem = nullptr; - EQEmu::ItemInstance* ins = GetInv().GetItem(x); + EQ::ItemInstance* ins = GetInv().GetItem(x); if (!ins) continue; TempItem = ins->GetItem(); @@ -5360,13 +5360,13 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) } } - for (int y = EQEmu::invaug::SOCKET_BEGIN; y <= EQEmu::invaug::SOCKET_END; ++y) + for (int y = EQ::invaug::SOCKET_BEGIN; y <= EQ::invaug::SOCKET_END; ++y) { - EQEmu::ItemInstance *aug = nullptr; + EQ::ItemInstance *aug = nullptr; aug = ins->GetAugment(y); if(aug) { - const EQEmu::ItemData* TempItemAug = aug->GetItem(); + const EQ::ItemData* TempItemAug = aug->GetItem(); if (TempItemAug && TempItemAug->Focus.Effect > 0 && TempItemAug->Focus.Effect != SPELL_UNKNOWN) { if(rand_effectiveness) { focus_max = CalcFocusEffect(type, TempItemAug->Focus.Effect, spell_id, true); @@ -5398,10 +5398,10 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) } //Tribute Focus - for (int x = EQEmu::invslot::TRIBUTE_BEGIN; x <= EQEmu::invslot::TRIBUTE_END; ++x) + for (int x = EQ::invslot::TRIBUTE_BEGIN; x <= EQ::invslot::TRIBUTE_END; ++x) { TempItem = nullptr; - EQEmu::ItemInstance* ins = GetInv().GetItem(x); + EQ::ItemInstance* ins = GetInv().GetItem(x); if (!ins) continue; TempItem = ins->GetItem(); @@ -5590,16 +5590,16 @@ int16 NPC::GetFocusEffect(focusType type, uint16 spell_id) { if (RuleB(Spells, NPC_UseFocusFromItems) && itembonuses.FocusEffects[type]){ - const EQEmu::ItemData* TempItem = nullptr; - const EQEmu::ItemData* UsedItem = nullptr; + const EQ::ItemData* TempItem = nullptr; + const EQ::ItemData* UsedItem = nullptr; uint16 UsedFocusID = 0; int16 Total = 0; int16 focus_max = 0; int16 focus_max_real = 0; //item focus - for (int i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invslot::EQUIPMENT_END; i++){ - const EQEmu::ItemData *cur = database.GetItem(equipment[i]); + for (int i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invslot::EQUIPMENT_END; i++){ + const EQ::ItemData *cur = database.GetItem(equipment[i]); if(!cur) continue; @@ -6702,7 +6702,7 @@ bool Mob::TrySpellProjectile(Mob* spell_target, uint16 spell_id, float speed){ ProjectileAtk[slot].origin_x = GetX(); ProjectileAtk[slot].origin_y = GetY(); ProjectileAtk[slot].origin_z = GetZ(); - ProjectileAtk[slot].skill = EQEmu::skills::SkillConjuration; + ProjectileAtk[slot].skill = EQ::skills::SkillConjuration; ProjectileAtk[slot].speed_mod = speed_mod; SetProjectileAttack(true); @@ -6758,7 +6758,7 @@ void Mob::ResourceTap(int32 damage, uint16 spellid) if (damage > 0) HealDamage(damage); else - Damage(this, -damage, 0, EQEmu::skills::SkillEvocation, false); + Damage(this, -damage, 0, EQ::skills::SkillEvocation, false); } if (spells[spellid].base2[i] == 1) // Mana Tap @@ -6801,10 +6801,10 @@ void Mob::TryTriggerThreshHold(int32 damage, int effect_id, Mob* attacker){ if (IsValidSpell(spell_id)) { if (IsBeneficialSpell(spell_id)) - SpellFinished(spell_id, this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); + SpellFinished(spell_id, this, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); else if(attacker) - SpellFinished(spell_id, attacker, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); + SpellFinished(spell_id, attacker, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff); } } } @@ -6875,7 +6875,7 @@ void Mob::CalcSpellPowerDistanceMod(uint16 spell_id, float range, Mob* caster) else distance = sqrt(range); - distance = EQEmu::Clamp(distance, spells[spell_id].min_dist, spells[spell_id].max_dist); + distance = EQ::Clamp(distance, spells[spell_id].min_dist, spells[spell_id].max_dist); float dm_range = spells[spell_id].max_dist - spells[spell_id].min_dist; float dm_mod_interval = spells[spell_id].max_dist_mod - spells[spell_id].min_dist_mod; diff --git a/zone/spells.cpp b/zone/spells.cpp index d9378a23c..8e70df06d 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -108,7 +108,7 @@ extern volatile bool is_zone_loaded; extern WorldServer worldserver; extern FastMath g_Math; -using EQEmu::spells::CastingSlot; +using EQ::spells::CastingSlot; // this is run constantly for every mob void Mob::SpellProcess() @@ -245,12 +245,12 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot, //Added to prevent MQ2 exploitation of equipping normally-unequippable/clickable items with effects and clicking them for benefits. if(item_slot && IsClient() && (slot == CastingSlot::Item || slot == CastingSlot::PotionBelt)) { - EQEmu::ItemInstance *itm = CastToClient()->GetInv().GetItem(item_slot); + EQ::ItemInstance *itm = CastToClient()->GetInv().GetItem(item_slot); int bitmask = 1; bitmask = bitmask << (CastToClient()->GetClass() - 1); if( itm && itm->GetItem()->Classes != 65535 ) { - if ((itm->GetItem()->Click.Type == EQEmu::item::ItemEffectEquipClick) && !(itm->GetItem()->Classes & bitmask)) { - if (CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::SoF) { + if ((itm->GetItem()->Click.Type == EQ::item::ItemEffectEquipClick) && !(itm->GetItem()->Classes & bitmask)) { + if (CastToClient()->ClientVersion() < EQ::versions::ClientVersion::SoF) { // They are casting a spell from an item that requires equipping but shouldn't let them equip it LogError("HACKER: [{}] (account: [{}]) attempted to click an equip-only effect on item [{}] (id: [{}]) which they shouldn't be able to equip!", CastToClient()->GetCleanName(), CastToClient()->AccountName(), itm->GetItem()->Name, itm->GetItem()->ID); @@ -261,15 +261,15 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot, } return(false); } - if ((itm->GetItem()->Click.Type == EQEmu::item::ItemEffectClick2) && !(itm->GetItem()->Classes & bitmask)) { - if (CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::SoF) { + if ((itm->GetItem()->Click.Type == EQ::item::ItemEffectClick2) && !(itm->GetItem()->Classes & bitmask)) { + if (CastToClient()->ClientVersion() < EQ::versions::ClientVersion::SoF) { // They are casting a spell from an item that they don't meet the race/class requirements to cast LogError("HACKER: [{}] (account: [{}]) attempted to click a race/class restricted effect on item [{}] (id: [{}]) which they shouldn't be able to click!", CastToClient()->GetCleanName(), CastToClient()->AccountName(), itm->GetItem()->Name, itm->GetItem()->ID); database.SetHackerFlag(CastToClient()->AccountName(), CastToClient()->GetCleanName(), "Clicking race/class restricted item with an invalid class"); } else { - if (CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (CastToClient()->ClientVersion() >= EQ::versions::ClientVersion::RoF) { // Line 181 in eqstr_us.txt was changed in RoF+ Message(Chat::Yellow, "Your race, class, or deity cannot use this item."); @@ -282,8 +282,8 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot, return(false); } } - if (itm && (itm->GetItem()->Click.Type == EQEmu::item::ItemEffectEquipClick) && item_slot > EQEmu::invslot::EQUIPMENT_END){ - if (CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::SoF) { + if (itm && (itm->GetItem()->Click.Type == EQ::item::ItemEffectEquipClick) && item_slot > EQ::invslot::EQUIPMENT_END){ + if (CastToClient()->ClientVersion() < EQ::versions::ClientVersion::SoF) { // They are attempting to cast a must equip clicky without having it equipped LogError("HACKER: [{}] (account: [{}]) attempted to click an equip-only effect on item [{}] (id: [{}]) without equiping it!", CastToClient()->GetCleanName(), CastToClient()->AccountName(), itm->GetItem()->Name, itm->GetItem()->ID); database.SetHackerFlag(CastToClient()->AccountName(), CastToClient()->GetCleanName(), "Clicking equip-only item without equiping it"); @@ -611,16 +611,16 @@ bool Mob::DoCastingChecks() uint16 Mob::GetSpecializeSkillValue(uint16 spell_id) const { switch(spells[spell_id].skill) { - case EQEmu::skills::SkillAbjuration: - return(GetSkill(EQEmu::skills::SkillSpecializeAbjure)); - case EQEmu::skills::SkillAlteration: - return(GetSkill(EQEmu::skills::SkillSpecializeAlteration)); - case EQEmu::skills::SkillConjuration: - return(GetSkill(EQEmu::skills::SkillSpecializeConjuration)); - case EQEmu::skills::SkillDivination: - return(GetSkill(EQEmu::skills::SkillSpecializeDivination)); - case EQEmu::skills::SkillEvocation: - return(GetSkill(EQEmu::skills::SkillSpecializeEvocation)); + case EQ::skills::SkillAbjuration: + return(GetSkill(EQ::skills::SkillSpecializeAbjure)); + case EQ::skills::SkillAlteration: + return(GetSkill(EQ::skills::SkillSpecializeAlteration)); + case EQ::skills::SkillConjuration: + return(GetSkill(EQ::skills::SkillSpecializeConjuration)); + case EQ::skills::SkillDivination: + return(GetSkill(EQ::skills::SkillSpecializeDivination)); + case EQ::skills::SkillEvocation: + return(GetSkill(EQ::skills::SkillSpecializeEvocation)); default: //wtf... break; @@ -639,20 +639,20 @@ void Client::CheckSpecializeIncrease(uint16 spell_id) { */ switch(spells[spell_id].skill) { - case EQEmu::skills::SkillAbjuration: - CheckIncreaseSkill(EQEmu::skills::SkillSpecializeAbjure, nullptr); + case EQ::skills::SkillAbjuration: + CheckIncreaseSkill(EQ::skills::SkillSpecializeAbjure, nullptr); break; - case EQEmu::skills::SkillAlteration: - CheckIncreaseSkill(EQEmu::skills::SkillSpecializeAlteration, nullptr); + case EQ::skills::SkillAlteration: + CheckIncreaseSkill(EQ::skills::SkillSpecializeAlteration, nullptr); break; - case EQEmu::skills::SkillConjuration: - CheckIncreaseSkill(EQEmu::skills::SkillSpecializeConjuration, nullptr); + case EQ::skills::SkillConjuration: + CheckIncreaseSkill(EQ::skills::SkillSpecializeConjuration, nullptr); break; - case EQEmu::skills::SkillDivination: - CheckIncreaseSkill(EQEmu::skills::SkillSpecializeDivination, nullptr); + case EQ::skills::SkillDivination: + CheckIncreaseSkill(EQ::skills::SkillSpecializeDivination, nullptr); break; - case EQEmu::skills::SkillEvocation: - CheckIncreaseSkill(EQEmu::skills::SkillSpecializeEvocation, nullptr); + case EQ::skills::SkillEvocation: + CheckIncreaseSkill(EQ::skills::SkillSpecializeEvocation, nullptr); break; default: //wtf... @@ -672,48 +672,48 @@ void Client::CheckSongSkillIncrease(uint16 spell_id){ switch(spells[spell_id].skill) { - case EQEmu::skills::SkillSinging: - CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15); + case EQ::skills::SkillSinging: + CheckIncreaseSkill(EQ::skills::SkillSinging, nullptr, -15); break; - case EQEmu::skills::SkillPercussionInstruments: + case EQ::skills::SkillPercussionInstruments: if(this->itembonuses.percussionMod > 0) { - if (GetRawSkill(EQEmu::skills::SkillPercussionInstruments) > 0) // no skill increases if not trained in the instrument - CheckIncreaseSkill(EQEmu::skills::SkillPercussionInstruments, nullptr, -15); + if (GetRawSkill(EQ::skills::SkillPercussionInstruments) > 0) // no skill increases if not trained in the instrument + CheckIncreaseSkill(EQ::skills::SkillPercussionInstruments, nullptr, -15); else MessageString(Chat::Red,NO_INSTRUMENT_SKILL); // tell the client that they need instrument training } else - CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15); + CheckIncreaseSkill(EQ::skills::SkillSinging, nullptr, -15); break; - case EQEmu::skills::SkillStringedInstruments: + case EQ::skills::SkillStringedInstruments: if(this->itembonuses.stringedMod > 0) { - if (GetRawSkill(EQEmu::skills::SkillStringedInstruments) > 0) - CheckIncreaseSkill(EQEmu::skills::SkillStringedInstruments, nullptr, -15); + if (GetRawSkill(EQ::skills::SkillStringedInstruments) > 0) + CheckIncreaseSkill(EQ::skills::SkillStringedInstruments, nullptr, -15); else MessageString(Chat::Red,NO_INSTRUMENT_SKILL); } else - CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15); + CheckIncreaseSkill(EQ::skills::SkillSinging, nullptr, -15); break; - case EQEmu::skills::SkillWindInstruments: + case EQ::skills::SkillWindInstruments: if(this->itembonuses.windMod > 0) { - if (GetRawSkill(EQEmu::skills::SkillWindInstruments) > 0) - CheckIncreaseSkill(EQEmu::skills::SkillWindInstruments, nullptr, -15); + if (GetRawSkill(EQ::skills::SkillWindInstruments) > 0) + CheckIncreaseSkill(EQ::skills::SkillWindInstruments, nullptr, -15); else MessageString(Chat::Red,NO_INSTRUMENT_SKILL); } else - CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15); + CheckIncreaseSkill(EQ::skills::SkillSinging, nullptr, -15); break; - case EQEmu::skills::SkillBrassInstruments: + case EQ::skills::SkillBrassInstruments: if(this->itembonuses.brassMod > 0) { - if (GetRawSkill(EQEmu::skills::SkillBrassInstruments) > 0) - CheckIncreaseSkill(EQEmu::skills::SkillBrassInstruments, nullptr, -15); + if (GetRawSkill(EQ::skills::SkillBrassInstruments) > 0) + CheckIncreaseSkill(EQ::skills::SkillBrassInstruments, nullptr, -15); else MessageString(Chat::Red,NO_INSTRUMENT_SKILL); } else - CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15); + CheckIncreaseSkill(EQ::skills::SkillSinging, nullptr, -15); break; default: break; @@ -967,7 +967,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo uint16 mana_used, uint32 inventory_slot, int16 resist_adjust) { bool IsFromItem = false; - EQEmu::ItemInstance *item = nullptr; + EQ::ItemInstance *item = nullptr; if(IsClient() && slot != CastingSlot::Item && slot != CastingSlot::PotionBelt && spells[spell_id].recast_time > 1000) { // 10 is item if(!CastToClient()->GetPTimers().Expired(&database, pTimerSpellStart + spell_id, false)) { @@ -1081,7 +1081,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo channelbonuses += spellbonuses.ChannelChanceSpells + itembonuses.ChannelChanceSpells + aabonuses.ChannelChanceSpells; // max 93% chance at 252 skill - channelchance = 30 + GetSkill(EQEmu::skills::SkillChanneling) / 400.0f * 100; + channelchance = 30 + GetSkill(EQ::skills::SkillChanneling) / 400.0f * 100; channelchance -= attacked_count * 2; channelchance += channelchance * channelbonuses / 100.0f; } @@ -1095,7 +1095,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo channelbonuses += spellbonuses.ChannelChanceSpells + itembonuses.ChannelChanceSpells + aabonuses.ChannelChanceSpells; // max 93% chance at 252 skill - channelchance = 30 + GetSkill(EQEmu::skills::SkillChanneling) / 400.0f * 100; + channelchance = 30 + GetSkill(EQ::skills::SkillChanneling) / 400.0f * 100; channelchance -= attacked_count * 2; channelchance += channelchance * channelbonuses / 100.0f; } @@ -1127,7 +1127,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo } } - LogSpells("Checking Interruption: spell x: [{}] spell y: [{}] cur x: [{}] cur y: [{}] channelchance [{}] channeling skill [{}]\n", GetSpellX(), GetSpellY(), GetX(), GetY(), channelchance, GetSkill(EQEmu::skills::SkillChanneling)); + LogSpells("Checking Interruption: spell x: [{}] spell y: [{}] cur x: [{}] cur y: [{}] channelchance [{}] channeling skill [{}]\n", GetSpellX(), GetSpellY(), GetX(), GetY(), channelchance, GetSkill(EQ::skills::SkillChanneling)); if(!spells[spell_id].uninterruptable && zone->random.Real(0, 100) > channelchance) { LogSpells("Casting of [{}] canceled: interrupted", spell_id); @@ -1241,7 +1241,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo missingreags=true; } - const EQEmu::ItemData *item = database.GetItem(component); + const EQ::ItemData *item = database.GetItem(component); if(item) { c->MessageString(Chat::Red, MISSING_SPELL_COMP_ITEM, item->Name); LogSpells("Spell [{}]: Canceled. Missing required reagent [{}] ([{}])", spell_id, item->Name, component); @@ -1305,7 +1305,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo && inventory_slot != 0xFFFFFFFF) // 10 is an item { bool fromaug = false; - EQEmu::ItemData* augitem = nullptr; + EQ::ItemData* augitem = nullptr; uint32 recastdelay = 0; uint32 recasttype = 0; @@ -1313,12 +1313,12 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo if (item == nullptr) break; - for (int r = EQEmu::invaug::SOCKET_BEGIN; r <= EQEmu::invaug::SOCKET_END; r++) { - const EQEmu::ItemInstance* aug_i = item->GetAugment(r); + for (int r = EQ::invaug::SOCKET_BEGIN; r <= EQ::invaug::SOCKET_END; r++) { + const EQ::ItemInstance* aug_i = item->GetAugment(r); if (!aug_i) continue; - const EQEmu::ItemData* aug = aug_i->GetItem(); + const EQ::ItemData* aug = aug_i->GetItem(); if (!aug) continue; @@ -1439,11 +1439,11 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo SetMana(GetMana()); // skills - if (EQEmu::skills::IsCastingSkill(spells[spell_id].skill)) { + if (EQ::skills::IsCastingSkill(spells[spell_id].skill)) { c->CheckIncreaseSkill(spells[spell_id].skill, nullptr); // increased chance of gaining channel skill if you regained concentration - c->CheckIncreaseSkill(EQEmu::skills::SkillChanneling, nullptr, regain_conc ? 5 : 0); + c->CheckIncreaseSkill(EQ::skills::SkillChanneling, nullptr, regain_conc ? 5 : 0); c->CheckSpecializeIncrease(spell_id); } @@ -2422,7 +2422,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui auto end_cost = spells[spell_id].EndurCost; if (mgb) end_cost *= 2; - SetEndurance(GetEndurance() - EQEmu::ClampUpper(end_cost, GetEndurance())); + SetEndurance(GetEndurance() - EQ::ClampUpper(end_cost, GetEndurance())); TryTriggerOnValueAmount(false, false, true); } if (mgb) @@ -2465,7 +2465,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui if(IsClient() && (slot == CastingSlot::Item || slot == CastingSlot::PotionBelt)) { - EQEmu::ItemInstance *itm = CastToClient()->GetInv().GetItem(inventory_slot); + EQ::ItemInstance *itm = CastToClient()->GetInv().GetItem(inventory_slot); if(itm && itm->GetItem()->RecastDelay > 0){ auto recast_type = itm->GetItem()->RecastType; CastToClient()->GetPTimers().Start((pTimerItemStart + recast_type), itm->GetItem()->RecastDelay); @@ -3335,7 +3335,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid { EQApplicationPacket *outapp = MakeBuffsPacket(); - entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, EQEmu::versions::maskSoDAndLater); + entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, EQ::versions::maskSoDAndLater); if(IsClient() && GetTarget() == this) CastToClient()->QueuePacket(outapp); @@ -3345,7 +3345,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid if (IsNPC()) { EQApplicationPacket *outapp = MakeBuffsPacket(); - entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, EQEmu::versions::maskSoDAndLater, true); + entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, EQ::versions::maskSoDAndLater, true); safe_delete(outapp); } @@ -5034,7 +5034,7 @@ void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message) void Client::MemSpell(uint16 spell_id, int slot, bool update_client) { - if(slot >= EQEmu::spells::SPELL_GEM_COUNT || slot < 0) + if(slot >= EQ::spells::SPELL_GEM_COUNT || slot < 0) return; if(update_client) @@ -5056,7 +5056,7 @@ void Client::MemSpell(uint16 spell_id, int slot, bool update_client) void Client::UnmemSpell(int slot, bool update_client) { - if(slot > EQEmu::spells::SPELL_GEM_COUNT || slot < 0) + if(slot > EQ::spells::SPELL_GEM_COUNT || slot < 0) return; LogSpells("Spell [{}] forgotten from slot [{}]", m_pp.mem_spells[slot], slot); @@ -5072,7 +5072,7 @@ void Client::UnmemSpell(int slot, bool update_client) void Client::UnmemSpellBySpellID(int32 spell_id) { - for(int i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; i++) { + for(int i = 0; i < EQ::spells::SPELL_GEM_COUNT; i++) { if(m_pp.mem_spells[i] == spell_id) { UnmemSpell(i, true); break; @@ -5084,7 +5084,7 @@ void Client::UnmemSpellAll(bool update_client) { int i; - for(i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; i++) + for(i = 0; i < EQ::spells::SPELL_GEM_COUNT; i++) if(m_pp.mem_spells[i] != 0xFFFFFFFF) UnmemSpell(i, update_client); } @@ -5098,7 +5098,7 @@ uint16 Client::FindMemmedSpellBySlot(int slot) { int Client::MemmedCount() { int memmed_count = 0; - for (int i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; i++) + for (int i = 0; i < EQ::spells::SPELL_GEM_COUNT; i++) if (m_pp.mem_spells[i] != 0xFFFFFFFF) memmed_count++; @@ -5108,7 +5108,7 @@ int Client::MemmedCount() { void Client::ScribeSpell(uint16 spell_id, int slot, bool update_client) { - if(slot >= EQEmu::spells::SPELLBOOK_SIZE || slot < 0) + if(slot >= EQ::spells::SPELLBOOK_SIZE || slot < 0) return; if(update_client) @@ -5129,14 +5129,14 @@ void Client::ScribeSpell(uint16 spell_id, int slot, bool update_client) void Client::UnscribeSpell(int slot, bool update_client) { - if(slot >= EQEmu::spells::SPELLBOOK_SIZE || slot < 0) + if(slot >= EQ::spells::SPELLBOOK_SIZE || slot < 0) return; LogSpells("Spell [{}] erased from spell book slot [{}]", m_pp.spell_book[slot], slot); m_pp.spell_book[slot] = 0xFFFFFFFF; database.DeleteCharacterSpell(this->CharacterID(), m_pp.spell_book[slot], slot); - if(update_client && slot < EQEmu::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize) + if(update_client && slot < EQ::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize) { auto outapp = new EQApplicationPacket(OP_DeleteSpell, sizeof(DeleteSpell_Struct)); DeleteSpell_Struct* del = (DeleteSpell_Struct*)outapp->pBuffer; @@ -5149,7 +5149,7 @@ void Client::UnscribeSpell(int slot, bool update_client) void Client::UnscribeSpellAll(bool update_client) { - for(int i = 0; i < EQEmu::spells::SPELLBOOK_SIZE; i++) + for(int i = 0; i < EQ::spells::SPELLBOOK_SIZE; i++) { if(m_pp.spell_book[i] != 0xFFFFFFFF) UnscribeSpell(i, update_client); @@ -5183,7 +5183,7 @@ void Client::UntrainDiscAll(bool update_client) } int Client::GetNextAvailableSpellBookSlot(int starting_slot) { - for (int i = starting_slot; i < EQEmu::spells::SPELLBOOK_SIZE; i++) { //using starting_slot should help speed this up when we're iterating through a bunch of spells + for (int i = starting_slot; i < EQ::spells::SPELLBOOK_SIZE; i++) { //using starting_slot should help speed this up when we're iterating through a bunch of spells if (!IsValidSpell(GetSpellByBookSlot(i))) return i; } @@ -5192,7 +5192,7 @@ int Client::GetNextAvailableSpellBookSlot(int starting_slot) { } int Client::FindSpellBookSlotBySpellID(uint16 spellid) { - for(int i = 0; i < EQEmu::spells::SPELLBOOK_SIZE; i++) { + for(int i = 0; i < EQ::spells::SPELLBOOK_SIZE; i++) { if(m_pp.spell_book[i] == spellid) return i; } @@ -5543,7 +5543,7 @@ bool Mob::UseBardSpellLogic(uint16 spell_id, int slot) spell_id != SPELL_UNKNOWN && slot != -1 && GetClass() == BARD && - slot <= EQEmu::spells::SPELL_GEM_COUNT && + slot <= EQ::spells::SPELL_GEM_COUNT && IsBardSong(spell_id) ); } @@ -5607,7 +5607,7 @@ void Client::SendBuffDurationPacket(Buffs_Struct &buff, int slot) void Client::SendBuffNumHitPacket(Buffs_Struct &buff, int slot) { // UF+ use this packet - if (ClientVersion() < EQEmu::versions::ClientVersion::UF) + if (ClientVersion() < EQ::versions::ClientVersion::UF) return; EQApplicationPacket *outapp = nullptr; outapp = new EQApplicationPacket(OP_BuffCreate, sizeof(BuffIcon_Struct) + sizeof(BuffIconEntry_Struct)); @@ -5664,7 +5664,7 @@ void Mob::SendBuffsToClient(Client *c) if(!c) return; - if (c->ClientVersionBit() & EQEmu::versions::maskSoDAndLater) + if (c->ClientVersionBit() & EQ::versions::maskSoDAndLater) { EQApplicationPacket *outapp = MakeBuffsPacket(); c->FastQueuePacket(&outapp); @@ -5752,12 +5752,12 @@ int Client::GetCurrentBuffSlots() const numbuffs++; if (GetLevel() > 74) numbuffs++; - return EQEmu::ClampUpper(numbuffs, EQEmu::spells::StaticLookup(m_ClientVersion)->LongBuffs); + return EQ::ClampUpper(numbuffs, EQ::spells::StaticLookup(m_ClientVersion)->LongBuffs); } int Client::GetCurrentSongSlots() const { - return EQEmu::spells::StaticLookup(m_ClientVersion)->ShortBuffs; // AAs dont affect this + return EQ::spells::StaticLookup(m_ClientVersion)->ShortBuffs; // AAs dont affect this } void Client::InitializeBuffSlots() diff --git a/zone/tasks.cpp b/zone/tasks.cpp index afa7b2062..a2c601aa3 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -1071,7 +1071,7 @@ void TaskManager::TaskQuestSetSelector(Client *c, ClientTaskState *state, Mob *m void TaskManager::SendTaskSelector(Client *c, Mob *mob, int TaskCount, int *TaskList) { - if (c->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (c->ClientVersion() >= EQ::versions::ClientVersion::RoF) { SendTaskSelectorNew(c, mob, TaskCount, TaskList); return; @@ -1118,7 +1118,7 @@ void TaskManager::SendTaskSelector(Client *c, Mob *mob, int TaskCount, int *Task continue; buf.WriteUInt32(TaskList[i]); // TaskID - if (c->ClientVersion() != EQEmu::versions::ClientVersion::Titanium) + if (c->ClientVersion() != EQ::versions::ClientVersion::Titanium) buf.WriteFloat(1.0f); // affects color, difficulty? buf.WriteUInt32(Tasks[TaskList[i]]->Duration); buf.WriteUInt32(static_cast(Tasks[TaskList[i]]->dur_code)); @@ -1126,7 +1126,7 @@ void TaskManager::SendTaskSelector(Client *c, Mob *mob, int TaskCount, int *Task buf.WriteString(Tasks[TaskList[i]]->Title); // max 64 with null buf.WriteString(Tasks[TaskList[i]]->Description); // max 4000 with null - if (c->ClientVersion() != EQEmu::versions::ClientVersion::Titanium) + if (c->ClientVersion() != EQ::versions::ClientVersion::Titanium) buf.WriteUInt8(0); // Has reward set flag buf.WriteUInt32(Tasks[TaskList[i]]->ActivityCount); @@ -1771,7 +1771,7 @@ void ClientTaskState::UpdateTasksOnExplore(Client *c, int ExploreID) return; } -bool ClientTaskState::UpdateTasksOnDeliver(Client *c, std::list &Items, int Cash, int NPCTypeID) +bool ClientTaskState::UpdateTasksOnDeliver(Client *c, std::list &Items, int Cash, int NPCTypeID) { bool Ret = false; @@ -1988,7 +1988,7 @@ void ClientTaskState::RewardTask(Client *c, TaskInformation *Task) { if(!Task || !c) return; - const EQEmu::ItemData* Item; + const EQ::ItemData* Item; std::vector RewardList; switch(Task->RewardMethod) { @@ -2698,7 +2698,7 @@ void TaskManager::SendTaskActivityShort(Client *c, int TaskID, int ActivityID, i TaskActivityShort_Struct* tass; - if (c->ClientVersionBit() & EQEmu::versions::maskRoFAndLater) + if (c->ClientVersionBit() & EQ::versions::maskRoFAndLater) { auto outapp = new EQApplicationPacket(OP_TaskActivity, 25); outapp->WriteUInt32(ClientTaskIndex); @@ -2734,7 +2734,7 @@ void TaskManager::SendTaskActivityShort(Client *c, int TaskID, int ActivityID, i void TaskManager::SendTaskActivityLong(Client *c, int TaskID, int ActivityID, int ClientTaskIndex, bool Optional, bool TaskComplete) { - if (c->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (c->ClientVersion() >= EQ::versions::ClientVersion::RoF) { SendTaskActivityNew(c, TaskID, ActivityID, ClientTaskIndex, Optional, TaskComplete); return; @@ -2943,10 +2943,10 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, ClientTaskInf } if(ItemID) { - const EQEmu::ItemData* reward_item = database.GetItem(ItemID); + const EQ::ItemData* reward_item = database.GetItem(ItemID); - EQEmu::SayLinkEngine linker; - linker.SetLinkType(EQEmu::saylink::SayLinkItemData); + EQ::SayLinkEngine linker; + linker.SetLinkType(EQ::saylink::SayLinkItemData); linker.SetItemData(reward_item); linker.SetTaskUse(); Tasks[TaskID]->item_link = linker.GenerateLink(); diff --git a/zone/tasks.h b/zone/tasks.h index 48fc8e2cc..8d948c370 100644 --- a/zone/tasks.h +++ b/zone/tasks.h @@ -48,7 +48,7 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) class Client; class Mob; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -222,7 +222,7 @@ public: void UpdateTasksForItem(Client *c, ActivityType Type, int ItemID, int Count=1); void UpdateTasksOnExplore(Client *c, int ExploreID); bool UpdateTasksOnSpeakWith(Client *c, int NPCTypeID); - bool UpdateTasksOnDeliver(Client *c, std::list& Items, int Cash, int NPCTypeID); + bool UpdateTasksOnDeliver(Client *c, std::list& Items, int Cash, int NPCTypeID); void UpdateTasksOnTouch(Client *c, int ZoneID); void ProcessTaskProximities(Client *c, float X, float Y, float Z); bool TaskOutOfTime(TaskType type, int Index); diff --git a/zone/titles.cpp b/zone/titles.cpp index 7b4537b88..a0cd10a12 100644 --- a/zone/titles.cpp +++ b/zone/titles.cpp @@ -47,7 +47,7 @@ bool TitleManager::LoadTitles() for (auto row = results.begin(); row != results.end(); ++row) { TitleEntry Title; Title.TitleID = atoi(row[0]); - Title.SkillID = (EQEmu::skills::SkillType) atoi(row[1]); + Title.SkillID = (EQ::skills::SkillType) atoi(row[1]); Title.MinSkillValue = atoi(row[2]); Title.MaxSkillValue = atoi(row[3]); Title.MinAAPoints = atoi(row[4]); @@ -188,10 +188,10 @@ bool TitleManager::IsClientEligibleForTitle(Client *c, std::vector:: if(Title->SkillID >= 0) { - if ((Title->MinSkillValue >= 0) && (c->GetRawSkill(static_cast(Title->SkillID)) < static_cast(Title->MinSkillValue))) + if ((Title->MinSkillValue >= 0) && (c->GetRawSkill(static_cast(Title->SkillID)) < static_cast(Title->MinSkillValue))) return false; - if ((Title->MaxSkillValue >= 0) && (c->GetRawSkill(static_cast(Title->SkillID)) > static_cast(Title->MaxSkillValue))) + if ((Title->MaxSkillValue >= 0) && (c->GetRawSkill(static_cast(Title->SkillID)) > static_cast(Title->MaxSkillValue))) return false; } diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index b4451119f..64aa7db72 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -36,7 +36,7 @@ extern QueryServ* QServ; -static const EQEmu::skills::SkillType TradeskillUnknown = EQEmu::skills::Skill1HBlunt; /* an arbitrary non-tradeskill */ +static const EQ::skills::SkillType TradeskillUnknown = EQ::skills::Skill1HBlunt; /* an arbitrary non-tradeskill */ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augment, Object *worldo) { @@ -46,7 +46,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme return; } - EQEmu::ItemInstance* container = nullptr; + EQ::ItemInstance* container = nullptr; if (worldo) { @@ -55,23 +55,23 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme else { // Check to see if they have an inventory container type 53 that is used for this. - EQEmu::InventoryProfile& user_inv = user->GetInv(); - EQEmu::ItemInstance* inst = nullptr; + EQ::InventoryProfile& user_inv = user->GetInv(); + EQ::ItemInstance* inst = nullptr; inst = user_inv.GetItem(in_augment->container_slot); if (inst) { - const EQEmu::ItemData* item = inst->GetItem(); - if (item && inst->IsType(EQEmu::item::ItemClassBag) && item->BagType == 53) + const EQ::ItemData* item = inst->GetItem(); + if (item && inst->IsType(EQ::item::ItemClassBag) && item->BagType == 53) { // We have found an appropriate inventory augmentation sealer container = inst; // Verify that no more than two items are in container to guarantee no inadvertant wipes. uint8 itemsFound = 0; - for (uint8 i = EQEmu::invbag::SLOT_BEGIN; i < EQEmu::invtype::WORLD_SIZE; i++) + for (uint8 i = EQ::invbag::SLOT_BEGIN; i < EQ::invtype::WORLD_SIZE; i++) { - const EQEmu::ItemInstance* inst = container->GetItem(i); + const EQ::ItemInstance* inst = container->GetItem(i); if (inst) { itemsFound++; @@ -94,7 +94,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme return; } - EQEmu::ItemInstance *tobe_auged = nullptr, *auged_with = nullptr; + EQ::ItemInstance *tobe_auged = nullptr, *auged_with = nullptr; int8 slot=-1; // Verify 2 items in the augmentation device @@ -135,7 +135,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme bool deleteItems = false; - EQEmu::ItemInstance *itemOneToPush = nullptr, *itemTwoToPush = nullptr; + EQ::ItemInstance *itemOneToPush = nullptr, *itemTwoToPush = nullptr; // Adding augment if (in_augment->augment_slot == -1) @@ -145,9 +145,9 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme { tobe_auged->PutAugment(slot, *auged_with); - EQEmu::ItemInstance *aug = tobe_auged->GetAugment(slot); + EQ::ItemInstance *aug = tobe_auged->GetAugment(slot); if(aug) { - std::vector args; + std::vector args; args.push_back(aug); parse->EventItem(EVENT_AUGMENT_ITEM, user, tobe_auged, nullptr, "", slot, &args); @@ -165,9 +165,9 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme } else { - EQEmu::ItemInstance *old_aug = nullptr; - bool isSolvent = auged_with->GetItem()->ItemType == EQEmu::item::ItemTypeAugmentationSolvent; - if (!isSolvent && auged_with->GetItem()->ItemType != EQEmu::item::ItemTypeAugmentationDistiller) + EQ::ItemInstance *old_aug = nullptr; + bool isSolvent = auged_with->GetItem()->ItemType == EQ::item::ItemTypeAugmentationSolvent; + if (!isSolvent && auged_with->GetItem()->ItemType != EQ::item::ItemTypeAugmentationDistiller) { LogError("Player tried to remove an augment without a solvent or distiller"); user->Message(Chat::Red, "Error: Missing an augmentation solvent or distiller for removing this augment."); @@ -175,7 +175,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme return; } - EQEmu::ItemInstance *aug = tobe_auged->GetAugment(in_augment->augment_slot); + EQ::ItemInstance *aug = tobe_auged->GetAugment(in_augment->augment_slot); if (aug) { if (!isSolvent && auged_with->GetItem()->ID != aug->GetItem()->AugDistiller) { @@ -183,7 +183,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme user->Message(Chat::Red, "Error: Wrong augmentation distiller for safely removing this augment."); return; } - std::vector args; + std::vector args; args.push_back(aug); parse->EventItem(EVENT_UNAUGMENT_ITEM, user, tobe_auged, nullptr, "", slot, &args); @@ -222,12 +222,12 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme else { // Delete items in our inventory container... - for (uint8 i = EQEmu::invbag::SLOT_BEGIN; i < EQEmu::invtype::WORLD_SIZE; i++) + for (uint8 i = EQ::invbag::SLOT_BEGIN; i < EQ::invtype::WORLD_SIZE; i++) { - const EQEmu::ItemInstance* inst = container->GetItem(i); + const EQ::ItemInstance* inst = container->GetItem(i); if (inst) { - user->DeleteItemInInventory(EQEmu::InventoryProfile::CalcSlotId(in_augment->container_slot, i), 0, true); + user->DeleteItemInInventory(EQ::InventoryProfile::CalcSlotId(in_augment->container_slot, i), 0, true); } } // Explicitly mark container as cleared. @@ -256,15 +256,15 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob return; } - EQEmu::InventoryProfile& user_inv = user->GetInv(); + EQ::InventoryProfile& user_inv = user->GetInv(); PlayerProfile_Struct& user_pp = user->GetPP(); - EQEmu::ItemInstance* container = nullptr; - EQEmu::ItemInstance* inst = nullptr; + EQ::ItemInstance* container = nullptr; + EQ::ItemInstance* inst = nullptr; uint8 c_type = 0xE8; uint32 some_id = 0; bool worldcontainer=false; - if (in_combine->container_slot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { + if (in_combine->container_slot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) { if(!worldo) { user->Message(Chat::Red, "Error: Server is not aware of the tradeskill container you are attempting to use"); return; @@ -274,7 +274,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob worldcontainer=true; // if we're a world container with an item, use that too if (inst) { - const EQEmu::ItemData* item = inst->GetItem(); + const EQ::ItemData* item = inst->GetItem(); if (item) some_id = item->ID; } @@ -282,28 +282,28 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob else { inst = user_inv.GetItem(in_combine->container_slot); if (inst) { - const EQEmu::ItemData* item = inst->GetItem(); - if (item && inst->IsType(EQEmu::item::ItemClassBag)) { + const EQ::ItemData* item = inst->GetItem(); + if (item && inst->IsType(EQ::item::ItemClassBag)) { c_type = item->BagType; some_id = item->ID; } } } - if (!inst || !inst->IsType(EQEmu::item::ItemClassBag)) { + if (!inst || !inst->IsType(EQ::item::ItemClassBag)) { user->Message(Chat::Red, "Error: Server does not recognize specified tradeskill container"); return; } container = inst; - if (container->GetItem() && container->GetItem()->BagType == EQEmu::item::BagTypeTransformationmold) { - const EQEmu::ItemInstance* inst = container->GetItem(0); + if (container->GetItem() && container->GetItem()->BagType == EQ::item::BagTypeTransformationmold) { + const EQ::ItemInstance* inst = container->GetItem(0); bool AllowAll = RuleB(Inventory, AllowAnyWeaponTransformation); - if (inst && EQEmu::ItemInstance::CanTransform(inst->GetItem(), container->GetItem(), AllowAll)) { - const EQEmu::ItemData* new_weapon = inst->GetItem(); - user->DeleteItemInInventory(EQEmu::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true); + if (inst && EQ::ItemInstance::CanTransform(inst->GetItem(), container->GetItem(), AllowAll)) { + const EQ::ItemData* new_weapon = inst->GetItem(); + user->DeleteItemInInventory(EQ::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true); container->Clear(); - user->SummonItem(new_weapon->ID, inst->GetCharges(), inst->GetAugmentItemID(0), inst->GetAugmentItemID(1), inst->GetAugmentItemID(2), inst->GetAugmentItemID(3), inst->GetAugmentItemID(4), inst->GetAugmentItemID(5), inst->IsAttuned(), EQEmu::invslot::slotCursor, container->GetItem()->Icon, atoi(container->GetItem()->IDFile + 2)); + user->SummonItem(new_weapon->ID, inst->GetCharges(), inst->GetAugmentItemID(0), inst->GetAugmentItemID(1), inst->GetAugmentItemID(2), inst->GetAugmentItemID(3), inst->GetAugmentItemID(4), inst->GetAugmentItemID(5), inst->IsAttuned(), EQ::invslot::slotCursor, container->GetItem()->Icon, atoi(container->GetItem()->IDFile + 2)); user->MessageString(Chat::LightBlue, TRANSFORM_COMPLETE, inst->GetItem()->Name); if (RuleB(Inventory, DeleteTransformationMold)) user->DeleteItemInInventory(in_combine->container_slot, 0, true); @@ -317,13 +317,13 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob return; } - if (container->GetItem() && container->GetItem()->BagType == EQEmu::item::BagTypeDetransformationmold) { - const EQEmu::ItemInstance* inst = container->GetItem(0); + if (container->GetItem() && container->GetItem()->BagType == EQ::item::BagTypeDetransformationmold) { + const EQ::ItemInstance* inst = container->GetItem(0); if (inst && inst->GetOrnamentationIcon() && inst->GetOrnamentationIcon()) { - const EQEmu::ItemData* new_weapon = inst->GetItem(); - user->DeleteItemInInventory(EQEmu::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true); + const EQ::ItemData* new_weapon = inst->GetItem(); + user->DeleteItemInInventory(EQ::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true); container->Clear(); - user->SummonItem(new_weapon->ID, inst->GetCharges(), inst->GetAugmentItemID(0), inst->GetAugmentItemID(1), inst->GetAugmentItemID(2), inst->GetAugmentItemID(3), inst->GetAugmentItemID(4), inst->GetAugmentItemID(5), inst->IsAttuned(), EQEmu::invslot::slotCursor, 0, 0); + user->SummonItem(new_weapon->ID, inst->GetCharges(), inst->GetAugmentItemID(0), inst->GetAugmentItemID(1), inst->GetAugmentItemID(2), inst->GetAugmentItemID(3), inst->GetAugmentItemID(4), inst->GetAugmentItemID(5), inst->IsAttuned(), EQ::invslot::slotCursor, 0, 0); user->MessageString(Chat::LightBlue, TRANSFORM_COMPLETE, inst->GetItem()->Name); } else if (inst) { @@ -369,7 +369,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob } //changing from a switch to string of if's since we don't need to iterate through all of the skills in the SkillType enum - if (spec.tradeskill == EQEmu::skills::SkillAlchemy) { + if (spec.tradeskill == EQ::skills::SkillAlchemy) { if (user_pp.class_ != SHAMAN) { user->Message(Chat::Red, "This tradeskill can only be performed by a shaman."); return; @@ -379,13 +379,13 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob return; } } - else if (spec.tradeskill == EQEmu::skills::SkillTinkering) { + else if (spec.tradeskill == EQ::skills::SkillTinkering) { if (user_pp.race != GNOME) { user->Message(Chat::Red, "Only gnomes can tinker."); return; } } - else if (spec.tradeskill == EQEmu::skills::SkillMakePoison) { + else if (spec.tradeskill == EQ::skills::SkillMakePoison) { if (user_pp.class_ != ROGUE) { user->Message(Chat::Red, "Only rogues can mix poisons."); return; @@ -416,10 +416,10 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob safe_delete(outapp); database.DeleteWorldContainer(worldo->m_id, zone->GetZoneID()); } else{ - for (uint8 i = EQEmu::invbag::SLOT_BEGIN; i < EQEmu::invtype::WORLD_SIZE; i++) { - const EQEmu::ItemInstance* inst = container->GetItem(i); + for (uint8 i = EQ::invbag::SLOT_BEGIN; i < EQ::invtype::WORLD_SIZE; i++) { + const EQ::ItemInstance* inst = container->GetItem(i); if (inst) { - user->DeleteItemInInventory(EQEmu::InventoryProfile::CalcSlotId(in_combine->container_slot, i), 0, true); + user->DeleteItemInInventory(EQ::InventoryProfile::CalcSlotId(in_combine->container_slot, i), 0, true); } } container->Clear(); @@ -516,7 +516,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac memset(counts, 0, sizeof(counts)); //search for all the items in their inventory - EQEmu::InventoryProfile& user_inv = user->GetInv(); + EQ::InventoryProfile& user_inv = user->GetInv(); uint8 count = 0; uint8 needcount = 0; @@ -552,7 +552,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac user->MessageString(Chat::Skills, TRADESKILL_MISSING_COMPONENTS); for (auto it = MissingItems.begin(); it != MissingItems.end(); ++it) { - const EQEmu::ItemData* item = database.GetItem(*it); + const EQ::ItemData* item = database.GetItem(*it); if(item) user->MessageString(Chat::Skills, TRADESKILL_MISSING_ITEM, item->Name); @@ -581,7 +581,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac return; } - const EQEmu::ItemInstance* inst = user_inv.GetItem(slot); + const EQ::ItemInstance* inst = user_inv.GetItem(slot); if (inst && !inst->IsStackable()) user->DeleteItemInInventory(slot, 0, true); @@ -619,84 +619,84 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac parse->EventPlayer(EVENT_COMBINE_FAILURE, user, spec.name.c_str(), spec.recipe_id); } -EQEmu::skills::SkillType Object::TypeToSkill(uint32 type) +EQ::skills::SkillType Object::TypeToSkill(uint32 type) { switch(type) { // grouped and ordered by SkillUseTypes name - new types need to be verified for proper SkillUseTypes and use /*SkillAlchemy*/ - case EQEmu::item::BagTypeMedicineBag: - return EQEmu::skills::SkillAlchemy; + case EQ::item::BagTypeMedicineBag: + return EQ::skills::SkillAlchemy; /*SkillBaking*/ - //case EQEmu::item::BagTypeMixingBowl: // No idea... - case EQEmu::item::BagTypeOven: - return EQEmu::skills::SkillBaking; + //case EQ::item::BagTypeMixingBowl: // No idea... + case EQ::item::BagTypeOven: + return EQ::skills::SkillBaking; /*SkillBlacksmithing*/ - case EQEmu::item::BagTypeForge: - //case EQEmu::item::BagTypeKoadaDalForge: - case EQEmu::item::BagTypeTeirDalForge: - case EQEmu::item::BagTypeOggokForge: - case EQEmu::item::BagTypeStormguardForge: - //case EQEmu::item::BagTypeAkanonForge: - //case EQEmu::item::BagTypeNorthmanForge: - //case EQEmu::item::BagTypeCabilisForge: - //case EQEmu::item::BagTypeFreeportForge: - //case EQEmu::item::BagTypeRoyalQeynosForge: - //case EQEmu::item::BagTypeTrollForge: - case EQEmu::item::BagTypeFierDalForge: - case EQEmu::item::BagTypeValeForge: - //case EQEmu::item::BagTypeErudForge: - //case EQEmu::item::BagTypeGuktaForge: - return EQEmu::skills::SkillBlacksmithing; + case EQ::item::BagTypeForge: + //case EQ::item::BagTypeKoadaDalForge: + case EQ::item::BagTypeTeirDalForge: + case EQ::item::BagTypeOggokForge: + case EQ::item::BagTypeStormguardForge: + //case EQ::item::BagTypeAkanonForge: + //case EQ::item::BagTypeNorthmanForge: + //case EQ::item::BagTypeCabilisForge: + //case EQ::item::BagTypeFreeportForge: + //case EQ::item::BagTypeRoyalQeynosForge: + //case EQ::item::BagTypeTrollForge: + case EQ::item::BagTypeFierDalForge: + case EQ::item::BagTypeValeForge: + //case EQ::item::BagTypeErudForge: + //case EQ::item::BagTypeGuktaForge: + return EQ::skills::SkillBlacksmithing; /*SkillBrewing*/ - //case EQEmu::item::BagTypeIceCreamChurn: // No idea... - case EQEmu::item::BagTypeBrewBarrel: - return EQEmu::skills::SkillBrewing; + //case EQ::item::BagTypeIceCreamChurn: // No idea... + case EQ::item::BagTypeBrewBarrel: + return EQ::skills::SkillBrewing; /*SkillFishing*/ - case EQEmu::item::BagTypeTackleBox: - return EQEmu::skills::SkillFishing; + case EQ::item::BagTypeTackleBox: + return EQ::skills::SkillFishing; /*SkillFletching*/ - case EQEmu::item::BagTypeFletchingKit: - //case EQEmu::item::BagTypeFierDalFletchingKit: - return EQEmu::skills::SkillFletching; + case EQ::item::BagTypeFletchingKit: + //case EQ::item::BagTypeFierDalFletchingKit: + return EQ::skills::SkillFletching; /*SkillJewelryMaking*/ - case EQEmu::item::BagTypeJewelersKit: - return EQEmu::skills::SkillJewelryMaking; + case EQ::item::BagTypeJewelersKit: + return EQ::skills::SkillJewelryMaking; /*SkillMakePoison*/ // This is a guess and needs to be verified... (Could be SkillAlchemy) - //case EQEmu::item::BagTypeMortar: + //case EQ::item::BagTypeMortar: // return SkillMakePoison; /*SkillPottery*/ - case EQEmu::item::BagTypePotteryWheel: - case EQEmu::item::BagTypeKiln: - //case EQEmu::item::BagTypeIksarPotteryWheel: - return EQEmu::skills::SkillPottery; + case EQ::item::BagTypePotteryWheel: + case EQ::item::BagTypeKiln: + //case EQ::item::BagTypeIksarPotteryWheel: + return EQ::skills::SkillPottery; /*SkillResearch*/ - //case EQEmu::item::BagTypeLexicon: - case EQEmu::item::BagTypeWizardsLexicon: - case EQEmu::item::BagTypeMagesLexicon: - case EQEmu::item::BagTypeNecromancersLexicon: - case EQEmu::item::BagTypeEnchantersLexicon: - //case EQEmu::item::BagTypeConcordanceofResearch: - return EQEmu::skills::SkillResearch; + //case EQ::item::BagTypeLexicon: + case EQ::item::BagTypeWizardsLexicon: + case EQ::item::BagTypeMagesLexicon: + case EQ::item::BagTypeNecromancersLexicon: + case EQ::item::BagTypeEnchantersLexicon: + //case EQ::item::BagTypeConcordanceofResearch: + return EQ::skills::SkillResearch; /*SkillTailoring*/ - case EQEmu::item::BagTypeSewingKit: - //case EQEmu::item::BagTypeHalflingTailoringKit: - //case EQEmu::item::BagTypeErudTailoringKit: - //case EQEmu::item::BagTypeFierDalTailoringKit: - return EQEmu::skills::SkillTailoring; + case EQ::item::BagTypeSewingKit: + //case EQ::item::BagTypeHalflingTailoringKit: + //case EQ::item::BagTypeErudTailoringKit: + //case EQ::item::BagTypeFierDalTailoringKit: + return EQ::skills::SkillTailoring; /*SkillTinkering*/ - case EQEmu::item::BagTypeToolBox: - return EQEmu::skills::SkillTinkering; + case EQ::item::BagTypeToolBox: + return EQ::skills::SkillTinkering; /*Undefined*/ default: @@ -733,7 +733,7 @@ void Client::TradeskillSearchResults(const std::string &query, unsigned long obj // Recipes that have either been made before or were // explicitly learned are excempt from that limit if (RuleB(Skills, UseLimitTradeskillSearchSkillDiff) - && ((int32)trivial - (int32)GetSkill((EQEmu::skills::SkillType)tradeskill)) > RuleI(Skills, MaxTradeskillSearchSkillDiff) + && ((int32)trivial - (int32)GetSkill((EQ::skills::SkillType)tradeskill)) > RuleI(Skills, MaxTradeskillSearchSkillDiff) && row[4] == nullptr) continue; @@ -882,34 +882,34 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { // If you want to customize the stage1 success rate do it here. // Remember: skillup_modifier is (float). Lower is better switch(spec->tradeskill) { - case EQEmu::skills::SkillFletching: + case EQ::skills::SkillFletching: skillup_modifier = RuleI(Character, TradeskillUpFletching); break; - case EQEmu::skills::SkillAlchemy: + case EQ::skills::SkillAlchemy: skillup_modifier = RuleI(Character, TradeskillUpAlchemy); break; - case EQEmu::skills::SkillJewelryMaking: + case EQ::skills::SkillJewelryMaking: skillup_modifier = RuleI(Character, TradeskillUpJewelcrafting); break; - case EQEmu::skills::SkillPottery: + case EQ::skills::SkillPottery: skillup_modifier = RuleI(Character, TradeskillUpPottery); break; - case EQEmu::skills::SkillBaking: + case EQ::skills::SkillBaking: skillup_modifier = RuleI(Character, TradeskillUpBaking); break; - case EQEmu::skills::SkillBrewing: + case EQ::skills::SkillBrewing: skillup_modifier = RuleI(Character, TradeskillUpBrewing); break; - case EQEmu::skills::SkillBlacksmithing: + case EQ::skills::SkillBlacksmithing: skillup_modifier = RuleI(Character, TradeskillUpBlacksmithing); break; - case EQEmu::skills::SkillResearch: + case EQ::skills::SkillResearch: skillup_modifier = RuleI(Character, TradeskillUpResearch); break; - case EQEmu::skills::SkillMakePoison: + case EQ::skills::SkillMakePoison: skillup_modifier = RuleI(Character, TradeskillUpMakePoison); break; - case EQEmu::skills::SkillTinkering: + case EQ::skills::SkillTinkering: skillup_modifier = RuleI(Character, TradeskillUpTinkering); break; default: @@ -920,11 +920,11 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { // Some tradeskills take the higher of one additional stat beside INT and WIS // to determine the skillup rate. Additionally these tradeskills do not have an // -15 modifier on their statbonus. - if (spec->tradeskill == EQEmu::skills::SkillFletching || spec->tradeskill == EQEmu::skills::SkillMakePoison) { + if (spec->tradeskill == EQ::skills::SkillFletching || spec->tradeskill == EQ::skills::SkillMakePoison) { thirdstat = GetDEX(); stat_modifier = 0; } - else if (spec->tradeskill == EQEmu::skills::SkillBlacksmithing) { + else if (spec->tradeskill == EQ::skills::SkillBlacksmithing) { thirdstat = GetSTR(); stat_modifier = 0; } @@ -977,7 +977,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { aa_chance = spellbonuses.ReduceTradeskillFail[spec->tradeskill] + itembonuses.ReduceTradeskillFail[spec->tradeskill] + aabonuses.ReduceTradeskillFail[spec->tradeskill]; - const EQEmu::ItemData* item = nullptr; + const EQ::ItemData* item = nullptr; chance = mod_tradeskill_chance(chance, spec); @@ -1085,7 +1085,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { return(false); } -void Client::CheckIncreaseTradeskill(int16 bonusstat, int16 stat_modifier, float skillup_modifier, uint16 success_modifier, EQEmu::skills::SkillType tradeskill) +void Client::CheckIncreaseTradeskill(int16 bonusstat, int16 stat_modifier, float skillup_modifier, uint16 success_modifier, EQ::skills::SkillType tradeskill) { uint16 current_raw_skill = GetRawSkill(tradeskill); @@ -1129,7 +1129,7 @@ void Client::CheckIncreaseTradeskill(int16 bonusstat, int16 stat_modifier, float LogTradeskills("Stage2 chance was: [{}] percent. 0 percent means stage1 failed", chance_stage2); } -bool ZoneDatabase::GetTradeRecipe(const EQEmu::ItemInstance* container, uint8 c_type, uint32 some_id, +bool ZoneDatabase::GetTradeRecipe(const EQ::ItemInstance* container, uint8 c_type, uint32 some_id, uint32 char_id, DBTradeskillRecipe_Struct *spec) { if (container == nullptr) @@ -1148,11 +1148,11 @@ bool ZoneDatabase::GetTradeRecipe(const EQEmu::ItemInstance* container, uint8 c_ uint32 count = 0; uint32 sum = 0; for (uint8 i = 0; i < 10; i++) { // TODO: need to determine if this is bound to world/item container size - const EQEmu::ItemInstance* inst = container->GetItem(i); + const EQ::ItemInstance* inst = container->GetItem(i); if (!inst) continue; - const EQEmu::ItemData* item = GetItem(inst->GetItem()->ID); + const EQ::ItemData* item = GetItem(inst->GetItem()->ID); if (!item) continue; @@ -1285,12 +1285,12 @@ bool ZoneDatabase::GetTradeRecipe(const EQEmu::ItemInstance* container, uint8 c_ for (auto row = results.begin(); row != results.end(); ++row) { int ccnt = 0; - for (int x = EQEmu::invbag::SLOT_BEGIN; x < EQEmu::invtype::WORLD_SIZE; x++) { - const EQEmu::ItemInstance* inst = container->GetItem(x); + for (int x = EQ::invbag::SLOT_BEGIN; x < EQ::invtype::WORLD_SIZE; x++) { + const EQ::ItemInstance* inst = container->GetItem(x); if(!inst) continue; - const EQEmu::ItemData* item = GetItem(inst->GetItem()->ID); + const EQ::ItemData* item = GetItem(inst->GetItem()->ID); if (!item) continue; @@ -1339,7 +1339,7 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id return false;//just not found i guess.. auto row = results.begin(); - spec->tradeskill = (EQEmu::skills::SkillType)atoi(row[1]); + spec->tradeskill = (EQ::skills::SkillType)atoi(row[1]); spec->skill_needed = (int16)atoi(row[2]); spec->trivial = (uint16)atoi(row[3]); spec->nofail = atoi(row[4]) ? true : false; @@ -1455,32 +1455,32 @@ void Client::LearnRecipe(uint32 recipeID) results = database.QueryDatabase(query); } -bool Client::CanIncreaseTradeskill(EQEmu::skills::SkillType tradeskill) { +bool Client::CanIncreaseTradeskill(EQ::skills::SkillType tradeskill) { uint32 rawskill = GetRawSkill(tradeskill); uint16 maxskill = MaxSkill(tradeskill); if (rawskill >= maxskill) //Max skill sanity check return false; - uint8 Baking = (GetRawSkill(EQEmu::skills::SkillBaking) > 200) ? 1 : 0; - uint8 Smithing = (GetRawSkill(EQEmu::skills::SkillBlacksmithing) > 200) ? 1 : 0; - uint8 Brewing = (GetRawSkill(EQEmu::skills::SkillBrewing) > 200) ? 1 : 0; - uint8 Fletching = (GetRawSkill(EQEmu::skills::SkillFletching) > 200) ? 1 : 0; - uint8 Jewelry = (GetRawSkill(EQEmu::skills::SkillJewelryMaking) > 200) ? 1 : 0; - uint8 Pottery = (GetRawSkill(EQEmu::skills::SkillPottery) > 200) ? 1 : 0; - uint8 Tailoring = (GetRawSkill(EQEmu::skills::SkillTailoring) > 200) ? 1 : 0; + uint8 Baking = (GetRawSkill(EQ::skills::SkillBaking) > 200) ? 1 : 0; + uint8 Smithing = (GetRawSkill(EQ::skills::SkillBlacksmithing) > 200) ? 1 : 0; + uint8 Brewing = (GetRawSkill(EQ::skills::SkillBrewing) > 200) ? 1 : 0; + uint8 Fletching = (GetRawSkill(EQ::skills::SkillFletching) > 200) ? 1 : 0; + uint8 Jewelry = (GetRawSkill(EQ::skills::SkillJewelryMaking) > 200) ? 1 : 0; + uint8 Pottery = (GetRawSkill(EQ::skills::SkillPottery) > 200) ? 1 : 0; + uint8 Tailoring = (GetRawSkill(EQ::skills::SkillTailoring) > 200) ? 1 : 0; uint8 SkillTotal = Baking + Smithing + Brewing + Fletching + Jewelry + Pottery + Tailoring; //Tradeskills above 200 //New Tanaan AA: Each level allows an additional tradeskill above 200 (first one is free) uint8 aaLevel = spellbonuses.TradeSkillMastery + itembonuses.TradeSkillMastery + aabonuses.TradeSkillMastery; switch (tradeskill) { - case EQEmu::skills::SkillBaking: - case EQEmu::skills::SkillBlacksmithing: - case EQEmu::skills::SkillBrewing: - case EQEmu::skills::SkillFletching: - case EQEmu::skills::SkillJewelryMaking: - case EQEmu::skills::SkillPottery: - case EQEmu::skills::SkillTailoring: + case EQ::skills::SkillBaking: + case EQ::skills::SkillBlacksmithing: + case EQ::skills::SkillBrewing: + case EQ::skills::SkillFletching: + case EQ::skills::SkillJewelryMaking: + case EQ::skills::SkillPottery: + case EQ::skills::SkillTailoring: if (aaLevel == 6) break; //Maxed AA if (SkillTotal == 0) diff --git a/zone/trading.cpp b/zone/trading.cpp index 1618e7770..f1dd3ef12 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -99,14 +99,14 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) { // Item always goes into trade bucket from cursor Client* client = owner->CastToClient(); - EQEmu::ItemInstance* inst = client->GetInv().GetItem(EQEmu::invslot::slotCursor); + EQ::ItemInstance* inst = client->GetInv().GetItem(EQ::invslot::slotCursor); if (!inst) { client->Message(Chat::Red, "Error: Could not find item on your cursor!"); return; } - EQEmu::ItemInstance* inst2 = client->GetInv().GetItem(trade_slot_id); + EQ::ItemInstance* inst2 = client->GetInv().GetItem(trade_slot_id); // it looks like the original code attempted to allow stacking... // (it just didn't handle partial stack move actions) @@ -132,7 +132,7 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) { if (_stack_size > 0) inst->SetCharges(_stack_size); else - client->DeleteItemInInventory(EQEmu::invslot::slotCursor); + client->DeleteItemInInventory(EQ::invslot::slotCursor); SendItemData(inst2, trade_slot_id); } @@ -147,7 +147,7 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) { LogTrading("[{}] added item [{}] to trade slot [{}]", owner->GetName(), inst->GetItem()->Name, trade_slot_id); client->PutItemInInventory(trade_slot_id, *inst); - client->DeleteItemInInventory(EQEmu::invslot::slotCursor); + client->DeleteItemInInventory(EQ::invslot::slotCursor); } } @@ -159,7 +159,7 @@ Mob* Trade::With() } // Private Method: Send item data for trade item to other person involved in trade -void Trade::SendItemData(const EQEmu::ItemInstance* inst, int16 dest_slot_id) +void Trade::SendItemData(const EQ::ItemInstance* inst, int16 dest_slot_id) { if (inst == nullptr) return; @@ -172,13 +172,13 @@ void Trade::SendItemData(const EQEmu::ItemInstance* inst, int16 dest_slot_id) Client* with = mob->CastToClient(); Client* trader = owner->CastToClient(); if (with && with->IsClient()) { - with->SendItemPacket(dest_slot_id - EQEmu::invslot::TRADE_BEGIN, inst, ItemPacketTradeView); + with->SendItemPacket(dest_slot_id - EQ::invslot::TRADE_BEGIN, inst, ItemPacketTradeView); if (inst->GetItem()->ItemClass == 1) { - for (uint16 i = EQEmu::invbag::SLOT_BEGIN; i <= EQEmu::invbag::SLOT_END; i++) { - uint16 bagslot_id = EQEmu::InventoryProfile::CalcSlotId(dest_slot_id, i); - const EQEmu::ItemInstance* bagitem = trader->GetInv().GetItem(bagslot_id); + for (uint16 i = EQ::invbag::SLOT_BEGIN; i <= EQ::invbag::SLOT_END; i++) { + uint16 bagslot_id = EQ::InventoryProfile::CalcSlotId(dest_slot_id, i); + const EQ::ItemInstance* bagitem = trader->GetInv().GetItem(bagslot_id); if (bagitem) { - with->SendItemPacket(bagslot_id - EQEmu::invslot::TRADE_BEGIN, bagitem, ItemPacketTradeView); + with->SendItemPacket(bagslot_id - EQ::invslot::TRADE_BEGIN, bagitem, ItemPacketTradeView); } } } @@ -200,7 +200,7 @@ void Trade::LogTrade() uint8 item_count = 0; if (zone->tradevar != 0) { - for (uint16 i = EQEmu::invslot::TRADE_BEGIN; i <= EQEmu::invslot::TRADE_END; i++) { + for (uint16 i = EQ::invslot::TRADE_BEGIN; i <= EQ::invslot::TRADE_END; i++) { if (trader->GetInv().GetItem(i)) item_count++; } @@ -252,8 +252,8 @@ void Trade::LogTrade() if (item_count > 0) { strcat(logtext, "items {"); - for (uint16 i = EQEmu::invslot::TRADE_BEGIN; i <= EQEmu::invslot::TRADE_END; i++) { - const EQEmu::ItemInstance* inst = trader->GetInv().GetItem(i); + for (uint16 i = EQ::invslot::TRADE_BEGIN; i <= EQ::invslot::TRADE_END; i++) { + const EQ::ItemInstance* inst = trader->GetInv().GetItem(i); if (!comma) comma = true; @@ -268,7 +268,7 @@ void Trade::LogTrade() strcat(logtext, item_num); if (inst->IsClassBag()) { - for (uint8 j = EQEmu::invbag::SLOT_BEGIN; j <= EQEmu::invbag::SLOT_END; j++) { + for (uint8 j = EQ::invbag::SLOT_BEGIN; j <= EQ::invbag::SLOT_END; j++) { inst = trader->GetInv().GetItem(i, j); if (inst) { strcat(logtext, ","); @@ -304,8 +304,8 @@ void Trade::DumpTrade() return; Client* trader = owner->CastToClient(); - for (uint16 i = EQEmu::invslot::TRADE_BEGIN; i <= EQEmu::invslot::TRADE_END; i++) { - const EQEmu::ItemInstance* inst = trader->GetInv().GetItem(i); + for (uint16 i = EQ::invslot::TRADE_BEGIN; i <= EQ::invslot::TRADE_END; i++) { + const EQ::ItemInstance* inst = trader->GetInv().GetItem(i); if (inst) { LogTrading("Item [{}] (Charges=[{}], Slot=[{}], IsBag=[{}])", @@ -313,12 +313,12 @@ void Trade::DumpTrade() i, ((inst->IsClassBag()) ? "True" : "False")); if (inst->IsClassBag()) { - for (uint8 j = EQEmu::invbag::SLOT_BEGIN; j <= EQEmu::invbag::SLOT_END; j++) { + for (uint8 j = EQ::invbag::SLOT_BEGIN; j <= EQ::invbag::SLOT_END; j++) { inst = trader->GetInv().GetItem(i, j); if (inst) { LogTrading("\tBagItem [{}] (Charges=[{}], Slot=[{}])", inst->GetItem()->ID, inst->GetCharges(), - EQEmu::InventoryProfile::CalcSlotId(i, j)); + EQ::InventoryProfile::CalcSlotId(i, j)); } } } @@ -333,8 +333,8 @@ void Client::ResetTrade() { AddMoneyToPP(trade->cp, trade->sp, trade->gp, trade->pp, true); // step 1: process bags - for (int16 trade_slot = EQEmu::invslot::TRADE_BEGIN; trade_slot <= EQEmu::invslot::TRADE_END; ++trade_slot) { - const EQEmu::ItemInstance* inst = m_inv[trade_slot]; + for (int16 trade_slot = EQ::invslot::TRADE_BEGIN; trade_slot <= EQ::invslot::TRADE_END; ++trade_slot) { + const EQ::ItemInstance* inst = m_inv[trade_slot]; if (inst && inst->IsClassBag()) { int16 free_slot = m_inv.FindFreeSlotForTradeItem(inst); @@ -352,18 +352,18 @@ void Client::ResetTrade() { } // step 2a: process stackables - for (int16 trade_slot = EQEmu::invslot::TRADE_BEGIN; trade_slot <= EQEmu::invslot::TRADE_END; ++trade_slot) { - EQEmu::ItemInstance* inst = GetInv().GetItem(trade_slot); + for (int16 trade_slot = EQ::invslot::TRADE_BEGIN; trade_slot <= EQ::invslot::TRADE_END; ++trade_slot) { + EQ::ItemInstance* inst = GetInv().GetItem(trade_slot); if (inst && inst->IsStackable()) { while (true) { // there's no built-in safety check against an infinite loop..but, it should break on one of the conditional checks int16 free_slot = m_inv.FindFreeSlotForTradeItem(inst); - if ((free_slot == EQEmu::invslot::slotCursor) || (free_slot == INVALID_INDEX)) + if ((free_slot == EQ::invslot::slotCursor) || (free_slot == INVALID_INDEX)) break; - EQEmu::ItemInstance* partial_inst = GetInv().GetItem(free_slot); + EQ::ItemInstance* partial_inst = GetInv().GetItem(free_slot); if (!partial_inst) break; @@ -399,15 +399,15 @@ void Client::ResetTrade() { // step 2b: adjust trade stack bias // (if any partial stacks exist before the final stack, FindFreeSlotForTradeItem() will return that slot in step 3 and an overwrite will occur) - for (int16 trade_slot = EQEmu::invslot::TRADE_END; trade_slot >= EQEmu::invslot::TRADE_BEGIN; --trade_slot) { - EQEmu::ItemInstance* inst = GetInv().GetItem(trade_slot); + for (int16 trade_slot = EQ::invslot::TRADE_END; trade_slot >= EQ::invslot::TRADE_BEGIN; --trade_slot) { + EQ::ItemInstance* inst = GetInv().GetItem(trade_slot); if (inst && inst->IsStackable()) { - for (int16 bias_slot = EQEmu::invslot::TRADE_BEGIN; bias_slot <= EQEmu::invslot::TRADE_END; ++bias_slot) { + for (int16 bias_slot = EQ::invslot::TRADE_BEGIN; bias_slot <= EQ::invslot::TRADE_END; ++bias_slot) { if (bias_slot >= trade_slot) break; - EQEmu::ItemInstance* bias_inst = GetInv().GetItem(bias_slot); + EQ::ItemInstance* bias_inst = GetInv().GetItem(bias_slot); if (!bias_inst || (bias_inst->GetID() != inst->GetID()) || (bias_inst->GetCharges() >= bias_inst->GetItem()->StackSize)) continue; @@ -433,8 +433,8 @@ void Client::ResetTrade() { } // step 3: process everything else - for (int16 trade_slot = EQEmu::invslot::TRADE_BEGIN; trade_slot <= EQEmu::invslot::TRADE_END; ++trade_slot) { - const EQEmu::ItemInstance* inst = m_inv[trade_slot]; + for (int16 trade_slot = EQ::invslot::TRADE_BEGIN; trade_slot <= EQ::invslot::TRADE_END; ++trade_slot) { + const EQ::ItemInstance* inst = m_inv[trade_slot]; if (inst) { int16 free_slot = m_inv.FindFreeSlotForTradeItem(inst); @@ -488,8 +488,8 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st } // step 1: process bags - for (int16 trade_slot = EQEmu::invslot::TRADE_BEGIN; trade_slot <= EQEmu::invslot::TRADE_END; ++trade_slot) { - const EQEmu::ItemInstance* inst = m_inv[trade_slot]; + for (int16 trade_slot = EQ::invslot::TRADE_BEGIN; trade_slot <= EQ::invslot::TRADE_END; ++trade_slot) { + const EQ::ItemInstance* inst = m_inv[trade_slot]; if (inst && inst->IsClassBag()) { LogTrading("Giving container [{}] ([{}]) in slot [{}] to [{}]", inst->GetItem()->Name, inst->GetItem()->ID, trade_slot, other->GetName()); @@ -523,16 +523,16 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st else qs_audit->char1_count += detail->charges; - for (uint8 sub_slot = EQEmu::invbag::SLOT_BEGIN; (sub_slot <= EQEmu::invbag::SLOT_END); ++sub_slot) { // this is to catch ALL items - const EQEmu::ItemInstance* bag_inst = inst->GetItem(sub_slot); + for (uint8 sub_slot = EQ::invbag::SLOT_BEGIN; (sub_slot <= EQ::invbag::SLOT_END); ++sub_slot) { // this is to catch ALL items + const EQ::ItemInstance* bag_inst = inst->GetItem(sub_slot); if (bag_inst) { detail = new QSTradeItems_Struct; detail->from_id = this->character_id; - detail->from_slot = EQEmu::InventoryProfile::CalcSlotId(trade_slot, sub_slot); + detail->from_slot = EQ::InventoryProfile::CalcSlotId(trade_slot, sub_slot); detail->to_id = other->CharacterID(); - detail->to_slot = EQEmu::InventoryProfile::CalcSlotId(free_slot, sub_slot); + detail->to_slot = EQ::InventoryProfile::CalcSlotId(free_slot, sub_slot); detail->item_id = bag_inst->GetID(); detail->charges = (!bag_inst->IsStackable() ? 1 : bag_inst->GetCharges()); detail->aug_1 = bag_inst->GetAugmentItemID(1); @@ -571,18 +571,18 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st } // step 2a: process stackables - for (int16 trade_slot = EQEmu::invslot::TRADE_BEGIN; trade_slot <= EQEmu::invslot::TRADE_END; ++trade_slot) { - EQEmu::ItemInstance* inst = GetInv().GetItem(trade_slot); + for (int16 trade_slot = EQ::invslot::TRADE_BEGIN; trade_slot <= EQ::invslot::TRADE_END; ++trade_slot) { + EQ::ItemInstance* inst = GetInv().GetItem(trade_slot); if (inst && inst->IsStackable()) { while (true) { // there's no built-in safety check against an infinite loop..but, it should break on one of the conditional checks int16 partial_slot = other->GetInv().FindFreeSlotForTradeItem(inst); - if ((partial_slot == EQEmu::invslot::slotCursor) || (partial_slot == INVALID_INDEX)) + if ((partial_slot == EQ::invslot::slotCursor) || (partial_slot == INVALID_INDEX)) break; - EQEmu::ItemInstance* partial_inst = other->GetInv().GetItem(partial_slot); + EQ::ItemInstance* partial_inst = other->GetInv().GetItem(partial_slot); if (!partial_inst) break; @@ -653,15 +653,15 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st // step 2b: adjust trade stack bias // (if any partial stacks exist before the final stack, FindFreeSlotForTradeItem() will return that slot in step 3 and an overwrite will occur) - for (int16 trade_slot = EQEmu::invslot::TRADE_END; trade_slot >= EQEmu::invslot::TRADE_BEGIN; --trade_slot) { - EQEmu::ItemInstance* inst = GetInv().GetItem(trade_slot); + for (int16 trade_slot = EQ::invslot::TRADE_END; trade_slot >= EQ::invslot::TRADE_BEGIN; --trade_slot) { + EQ::ItemInstance* inst = GetInv().GetItem(trade_slot); if (inst && inst->IsStackable()) { - for (int16 bias_slot = EQEmu::invslot::TRADE_BEGIN; bias_slot <= EQEmu::invslot::TRADE_END; ++bias_slot) { + for (int16 bias_slot = EQ::invslot::TRADE_BEGIN; bias_slot <= EQ::invslot::TRADE_END; ++bias_slot) { if (bias_slot >= trade_slot) break; - EQEmu::ItemInstance* bias_inst = GetInv().GetItem(bias_slot); + EQ::ItemInstance* bias_inst = GetInv().GetItem(bias_slot); if (!bias_inst || (bias_inst->GetID() != inst->GetID()) || (bias_inst->GetCharges() >= bias_inst->GetItem()->StackSize)) continue; @@ -706,8 +706,8 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st } // step 3: process everything else - for (int16 trade_slot = EQEmu::invslot::TRADE_BEGIN; trade_slot <= EQEmu::invslot::TRADE_END; ++trade_slot) { - const EQEmu::ItemInstance* inst = m_inv[trade_slot]; + for (int16 trade_slot = EQ::invslot::TRADE_BEGIN; trade_slot <= EQ::invslot::TRADE_END; ++trade_slot) { + const EQ::ItemInstance* inst = m_inv[trade_slot]; if (inst) { LogTrading("Giving item [{}] ([{}]) in slot [{}] to [{}]", inst->GetItem()->Name, inst->GetItem()->ID, trade_slot, other->GetName()); @@ -742,8 +742,8 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st qs_audit->char1_count += detail->charges; // 'step 3' should never really see containers..but, just in case... - for (uint8 sub_slot = EQEmu::invbag::SLOT_BEGIN; (sub_slot <= EQEmu::invbag::SLOT_END); ++sub_slot) { // this is to catch ALL items - const EQEmu::ItemInstance* bag_inst = inst->GetItem(sub_slot); + for (uint8 sub_slot = EQ::invbag::SLOT_BEGIN; (sub_slot <= EQ::invbag::SLOT_END); ++sub_slot) { // this is to catch ALL items + const EQ::ItemInstance* bag_inst = inst->GetItem(sub_slot); if (bag_inst) { detail = new QSTradeItems_Struct; @@ -819,8 +819,8 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st } if(qs_log) { // This can be incorporated below when revisions are made - for (int16 trade_slot = EQEmu::invslot::TRADE_BEGIN; trade_slot <= EQEmu::invslot::TRADE_NPC_END; ++trade_slot) { - const EQEmu::ItemInstance* trade_inst = m_inv[trade_slot]; + for (int16 trade_slot = EQ::invslot::TRADE_BEGIN; trade_slot <= EQ::invslot::TRADE_NPC_END; ++trade_slot) { + const EQ::ItemInstance* trade_inst = m_inv[trade_slot]; if(trade_inst) { auto detail = new QSHandinItems_Struct; @@ -840,15 +840,15 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st qs_audit->char_count += detail->charges; if (trade_inst->IsClassBag()) { - for (uint8 sub_slot = EQEmu::invbag::SLOT_BEGIN; sub_slot < trade_inst->GetItem()->BagSlots; ++sub_slot) { - const EQEmu::ItemInstance* trade_baginst = trade_inst->GetItem(sub_slot); + for (uint8 sub_slot = EQ::invbag::SLOT_BEGIN; sub_slot < trade_inst->GetItem()->BagSlots; ++sub_slot) { + const EQ::ItemInstance* trade_baginst = trade_inst->GetItem(sub_slot); if(trade_baginst) { detail = new QSHandinItems_Struct; strcpy(detail->action_type, "HANDIN"); - detail->char_slot = EQEmu::InventoryProfile::CalcSlotId(trade_slot, sub_slot); + detail->char_slot = EQ::InventoryProfile::CalcSlotId(trade_slot, sub_slot); detail->item_id = trade_baginst->GetID(); detail->charges = (!trade_inst->IsStackable() ? 1 : trade_inst->GetCharges()); detail->aug_1 = trade_baginst->GetAugmentItemID(1); @@ -872,19 +872,19 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st quest_npc = true; } - std::vector item_list; - std::list items; - for (int i = EQEmu::invslot::TRADE_BEGIN; i <= EQEmu::invslot::TRADE_NPC_END; ++i) { - EQEmu::ItemInstance *inst = m_inv.GetItem(i); + std::vector item_list; + std::list items; + for (int i = EQ::invslot::TRADE_BEGIN; i <= EQ::invslot::TRADE_NPC_END; ++i) { + EQ::ItemInstance *inst = m_inv.GetItem(i); if(inst) { items.push_back(inst); item_list.push_back(inst); } else { - item_list.push_back((EQEmu::ItemInstance*)nullptr); + item_list.push_back((EQ::ItemInstance*)nullptr); continue; } - const EQEmu::ItemData* item = inst->GetItem(); + const EQ::ItemData* item = inst->GetItem(); if(item && quest_npc == false) { bool isPetAndCanHaveNoDrop = (RuleB(Pets, CanTakeNoDrop) && _CLIENTPET(tradingWith) && @@ -894,10 +894,10 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st (item->NoDrop != 0 || isPetAndCanHaveNoDrop))) { // pets need to look inside bags and try to equip items found there if (item->IsClassBag() && item->BagSlots > 0) { - for (int16 bslot = EQEmu::invbag::SLOT_BEGIN; bslot < item->BagSlots; bslot++) { - const EQEmu::ItemInstance* baginst = inst->GetItem(bslot); + for (int16 bslot = EQ::invbag::SLOT_BEGIN; bslot < item->BagSlots; bslot++) { + const EQ::ItemInstance* baginst = inst->GetItem(bslot); if (baginst) { - const EQEmu::ItemData* bagitem = baginst->GetItem(); + const EQ::ItemData* bagitem = baginst->GetItem(); if (bagitem && (GetGM() || (bagitem->NoDrop != 0 && baginst->IsAttuned() == false))) { tradingWith->CastToNPC()->AddLootDrop(bagitem, &tradingWith->CastToNPC()->itemlist, baginst->GetCharges(), 1, 127, true, true); @@ -950,9 +950,9 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st tradingWith->FaceTarget(this); } - EQEmu::ItemInstance *insts[4] = { 0 }; - for (int i = EQEmu::invslot::TRADE_BEGIN; i <= EQEmu::invslot::TRADE_NPC_END; ++i) { - insts[i - EQEmu::invslot::TRADE_BEGIN] = m_inv.PopItem(i); + EQ::ItemInstance *insts[4] = { 0 }; + for (int i = EQ::invslot::TRADE_BEGIN; i <= EQ::invslot::TRADE_NPC_END; ++i) { + insts[i - EQ::invslot::TRADE_BEGIN] = m_inv.PopItem(i); database.SaveInventory(CharacterID(), nullptr, i); } @@ -971,8 +971,8 @@ bool Client::CheckTradeLoreConflict(Client* other) if (!other) return true; - for (int16 index = EQEmu::invslot::TRADE_BEGIN; index <= EQEmu::invslot::TRADE_END; ++index) { - const EQEmu::ItemInstance* inst = m_inv[index]; + for (int16 index = EQ::invslot::TRADE_BEGIN; index <= EQ::invslot::TRADE_END; ++index) { + const EQ::ItemInstance* inst = m_inv[index]; if (!inst || !inst->GetItem()) continue; @@ -980,8 +980,8 @@ bool Client::CheckTradeLoreConflict(Client* other) return true; } - for (int16 index = EQEmu::invbag::TRADE_BAGS_BEGIN; index <= EQEmu::invbag::TRADE_BAGS_END; ++index) { - const EQEmu::ItemInstance* inst = m_inv[index]; + for (int16 index = EQ::invbag::TRADE_BAGS_BEGIN; index <= EQ::invbag::TRADE_BAGS_END; ++index) { + const EQ::ItemInstance* inst = m_inv[index]; if (!inst || !inst->GetItem()) continue; @@ -994,8 +994,8 @@ bool Client::CheckTradeLoreConflict(Client* other) bool Client::CheckTradeNonDroppable() { - for (int16 index = EQEmu::invslot::TRADE_BEGIN; index <= EQEmu::invslot::TRADE_END; ++index){ - const EQEmu::ItemInstance* inst = m_inv[index]; + for (int16 index = EQ::invslot::TRADE_BEGIN; index <= EQ::invslot::TRADE_END; ++index){ + const EQ::ItemInstance* inst = m_inv[index]; if (!inst) continue; @@ -1115,7 +1115,7 @@ void Client::Trader_EndTrader() { for(int i = 0; i < 80; i++) { if(gis->Items[i] != 0) { - if (Customer->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (Customer->ClientVersion() >= EQ::versions::ClientVersion::RoF) { // RoF+ use Item IDs for now tdis->ItemID = gis->Items[i]; @@ -1175,18 +1175,18 @@ void Client::SendTraderItem(uint32 ItemID, uint16 Quantity) { std::string Packet; int16 FreeSlotID=0; - const EQEmu::ItemData* item = database.GetItem(ItemID); + const EQ::ItemData* item = database.GetItem(ItemID); if(!item){ LogTrading("Bogus item deleted in Client::SendTraderItem!\n"); return; } - EQEmu::ItemInstance* inst = database.CreateItem(item, Quantity); + EQ::ItemInstance* inst = database.CreateItem(item, Quantity); if (inst) { - bool is_arrow = (inst->GetItem()->ItemType == EQEmu::item::ItemTypeArrow) ? true : false; + bool is_arrow = (inst->GetItem()->ItemType == EQ::item::ItemTypeArrow) ? true : false; FreeSlotID = m_inv.FindFreeSlot(false, true, inst->GetItem()->Size, is_arrow); PutItemInInventory(FreeSlotID, *inst); @@ -1200,16 +1200,16 @@ void Client::SendTraderItem(uint32 ItemID, uint16 Quantity) { void Client::SendSingleTraderItem(uint32 CharID, int SerialNumber) { - EQEmu::ItemInstance* inst= database.LoadSingleTraderItem(CharID, SerialNumber); + EQ::ItemInstance* inst= database.LoadSingleTraderItem(CharID, SerialNumber); if(inst) { - SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketMerchant); // MainCursor? + SendItemPacket(EQ::invslot::slotCursor, inst, ItemPacketMerchant); // MainCursor? safe_delete(inst); } } void Client::BulkSendTraderInventory(uint32 char_id) { - const EQEmu::ItemData *item; + const EQ::ItemData *item; TraderCharges_Struct* TraderItems = database.LoadTraderItemWithCharges(char_id); @@ -1221,7 +1221,7 @@ void Client::BulkSendTraderInventory(uint32 char_id) { item=database.GetItem(TraderItems->ItemID[i]); if (item && (item->NoDrop!=0)) { - EQEmu::ItemInstance* inst = database.CreateItem(item); + EQ::ItemInstance* inst = database.CreateItem(item); if (inst) { inst->SetSerialNumber(TraderItems->SerialNumber[i]); if(TraderItems->Charges[i] > 0) @@ -1233,7 +1233,7 @@ void Client::BulkSendTraderInventory(uint32 char_id) { } inst->SetPrice(TraderItems->ItemCost[i]); - SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketMerchant); // MainCursor? + SendItemPacket(EQ::invslot::slotCursor, inst, ItemPacketMerchant); // MainCursor? safe_delete(inst); } else @@ -1245,14 +1245,14 @@ void Client::BulkSendTraderInventory(uint32 char_id) { uint32 Client::FindTraderItemSerialNumber(int32 ItemID) { - EQEmu::ItemInstance* item = nullptr; + EQ::ItemInstance* item = nullptr; uint16 SlotID = 0; - for (int i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::GENERAL_END; i++){ + for (int i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::GENERAL_END; i++){ item = this->GetInv().GetItem(i); if (item && item->GetItem()->ID == 17899){ //Traders Satchel - for (int x = EQEmu::invbag::SLOT_BEGIN; x <= EQEmu::invbag::SLOT_END; x++) { + for (int x = EQ::invbag::SLOT_BEGIN; x <= EQ::invbag::SLOT_END; x++) { // we already have the parent bag and a contents iterator..why not just iterate the bag!?? - SlotID = EQEmu::InventoryProfile::CalcSlotId(i, x); + SlotID = EQ::InventoryProfile::CalcSlotId(i, x); item = this->GetInv().GetItem(SlotID); if (item) { if (item->GetID() == ItemID) @@ -1266,16 +1266,16 @@ uint32 Client::FindTraderItemSerialNumber(int32 ItemID) { return 0; } -EQEmu::ItemInstance* Client::FindTraderItemBySerialNumber(int32 SerialNumber){ +EQ::ItemInstance* Client::FindTraderItemBySerialNumber(int32 SerialNumber){ - EQEmu::ItemInstance* item = nullptr; + EQ::ItemInstance* item = nullptr; uint16 SlotID = 0; - for (int i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::GENERAL_END; i++){ + for (int i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::GENERAL_END; i++){ item = this->GetInv().GetItem(i); if(item && item->GetItem()->ID == 17899){ //Traders Satchel - for (int x = EQEmu::invbag::SLOT_BEGIN; x <= EQEmu::invbag::SLOT_END; x++) { + for (int x = EQ::invbag::SLOT_BEGIN; x <= EQ::invbag::SLOT_END; x++) { // we already have the parent bag and a contents iterator..why not just iterate the bag!?? - SlotID = EQEmu::InventoryProfile::CalcSlotId(i, x); + SlotID = EQ::InventoryProfile::CalcSlotId(i, x); item = this->GetInv().GetItem(SlotID); if(item) { if(item->GetSerialNumber() == SerialNumber) @@ -1292,7 +1292,7 @@ EQEmu::ItemInstance* Client::FindTraderItemBySerialNumber(int32 SerialNumber){ GetItems_Struct* Client::GetTraderItems(){ - const EQEmu::ItemInstance* item = nullptr; + const EQ::ItemInstance* item = nullptr; uint16 SlotID = INVALID_INDEX; auto gis = new GetItems_Struct; @@ -1301,16 +1301,16 @@ GetItems_Struct* Client::GetTraderItems(){ uint8 ndx = 0; - for (int i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::GENERAL_END; i++) { + for (int i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::GENERAL_END; i++) { if (ndx >= 80) break; item = this->GetInv().GetItem(i); if(item && item->GetItem()->ID == 17899){ //Traders Satchel - for (int x = EQEmu::invbag::SLOT_BEGIN; x <= EQEmu::invbag::SLOT_END; x++) { + for (int x = EQ::invbag::SLOT_BEGIN; x <= EQ::invbag::SLOT_END; x++) { if (ndx >= 80) break; - SlotID = EQEmu::InventoryProfile::CalcSlotId(i, x); + SlotID = EQ::InventoryProfile::CalcSlotId(i, x); item = this->GetInv().GetItem(SlotID); @@ -1328,13 +1328,13 @@ GetItems_Struct* Client::GetTraderItems(){ uint16 Client::FindTraderItem(int32 SerialNumber, uint16 Quantity){ - const EQEmu::ItemInstance* item= nullptr; + const EQ::ItemInstance* item= nullptr; uint16 SlotID = 0; - for (int i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::GENERAL_END; i++) { + for (int i = EQ::invslot::GENERAL_BEGIN; i <= EQ::invslot::GENERAL_END; i++) { item = this->GetInv().GetItem(i); if(item && item->GetItem()->ID == 17899){ //Traders Satchel - for (int x = EQEmu::invbag::SLOT_BEGIN; x <= EQEmu::invbag::SLOT_END; x++){ - SlotID = EQEmu::InventoryProfile::CalcSlotId(i, x); + for (int x = EQ::invbag::SLOT_BEGIN; x <= EQ::invbag::SLOT_END; x++){ + SlotID = EQ::InventoryProfile::CalcSlotId(i, x); item = this->GetInv().GetItem(SlotID); @@ -1371,7 +1371,7 @@ void Client::NukeTraderItem(uint16 Slot,int16 Charges,uint16 Quantity,Client* Cu tdis->Unknown000 = 0; tdis->TraderID = Customer->GetID(); - if (Customer->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (Customer->ClientVersion() >= EQ::versions::ClientVersion::RoF) { // RoF+ use Item IDs for now tdis->ItemID = itemid; @@ -1390,7 +1390,7 @@ void Client::NukeTraderItem(uint16 Slot,int16 Charges,uint16 Quantity,Client* Cu } // This updates the trader. Removes it from his trading bags. // - const EQEmu::ItemInstance* Inst = m_inv[Slot]; + const EQ::ItemInstance* Inst = m_inv[Slot]; database.SaveInventory(CharacterID(), Inst, Slot); @@ -1432,7 +1432,7 @@ void Client::TraderUpdate(uint16 SlotID,uint32 TraderID){ void Client::FindAndNukeTraderItem(int32 SerialNumber, uint16 Quantity, Client* Customer, uint16 TraderSlot){ - const EQEmu::ItemInstance* item= nullptr; + const EQ::ItemInstance* item= nullptr; bool Stackable = false; int16 Charges=0; @@ -1507,7 +1507,7 @@ void Client::ReturnTraderReq(const EQApplicationPacket* app, int16 TraderItemCha EQApplicationPacket* outapp = nullptr; - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { outapp = new EQApplicationPacket(OP_TraderShop, sizeof(TraderBuy_Struct)); } @@ -1519,7 +1519,7 @@ void Client::ReturnTraderReq(const EQApplicationPacket* app, int16 TraderItemCha TraderBuy_Struct* outtbs = (TraderBuy_Struct*)outapp->pBuffer; memcpy(outtbs, tbs, app->size); - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { // Convert Serial Number back to Item ID for RoF+ outtbs->ItemID = itemid; @@ -1584,10 +1584,10 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic outtbs->ItemID = tbs->ItemID; - const EQEmu::ItemInstance* BuyItem = nullptr; + const EQ::ItemInstance* BuyItem = nullptr; uint32 ItemID = 0; - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { // Convert Item ID to Serial Number for RoF+ ItemID = tbs->ItemID; @@ -1648,7 +1648,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic // This cannot overflow assuming MAX_TRANSACTION_VALUE, checked above, is the default of 2000000000 uint32 TotalCost = tbs->Price * outtbs->Quantity; - if (Trader->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (Trader->ClientVersion() >= EQ::versions::ClientVersion::RoF) { // RoF+ uses individual item price where older clients use total price outtbs->Price = tbs->Price; @@ -1699,7 +1699,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic Trader->FindAndNukeTraderItem(tbs->ItemID, outtbs->Quantity, this, 0); - if (ItemID > 0 && Trader->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ItemID > 0 && Trader->ClientVersion() >= EQ::versions::ClientVersion::RoF) { // Convert Serial Number back to ItemID for RoF+ outtbs->ItemID = ItemID; @@ -1717,7 +1717,7 @@ void Client::SendBazaarWelcome() auto row = results.begin(); EQApplicationPacket* outapp = nullptr; - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { outapp = new EQApplicationPacket(OP_TraderShop, sizeof(BazaarWelcome_Struct)); } @@ -1735,7 +1735,7 @@ void Client::SendBazaarWelcome() bws->Traders = atoi(row[0]); bws->Items = atoi(row[1]); - if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (ClientVersion() >= EQ::versions::ClientVersion::RoF) { bws->Unknown012 = GetID(); } @@ -2046,11 +2046,11 @@ static void UpdateTraderCustomerItemsAdded(uint32 CustomerID, TraderCharges_Stru if(!Customer) return; - const EQEmu::ItemData *item = database.GetItem(ItemID); + const EQ::ItemData *item = database.GetItem(ItemID); if(!item) return; - EQEmu::ItemInstance* inst = database.CreateItem(item); + EQ::ItemInstance* inst = database.CreateItem(item); if(!inst) return; @@ -2074,7 +2074,7 @@ static void UpdateTraderCustomerItemsAdded(uint32 CustomerID, TraderCharges_Stru LogTrading("Sending price update for [{}], Serial No. [{}] with [{}] charges", item->Name, gis->SerialNumber[i], gis->Charges[i]); - Customer->SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketMerchant); // MainCursor? + Customer->SendItemPacket(EQ::invslot::slotCursor, inst, ItemPacketMerchant); // MainCursor? } } @@ -2090,7 +2090,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St if(!Customer) return; - const EQEmu::ItemData *item = database.GetItem(ItemID); + const EQ::ItemData *item = database.GetItem(ItemID); if(!item) return; @@ -2107,7 +2107,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St for(int i = 0; i < 80; i++) { if(gis->ItemID[i] == ItemID) { - if (Customer->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) + if (Customer->ClientVersion() >= EQ::versions::ClientVersion::RoF) { // RoF+ use Item IDs for now tdis->ItemID = gis->ItemID[i]; @@ -2131,7 +2131,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St LogTrading("Sending price updates to customer [{}]", Customer->GetName()); - EQEmu::ItemInstance* inst = database.CreateItem(item); + EQ::ItemInstance* inst = database.CreateItem(item); if(!inst) return; @@ -2158,7 +2158,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St LogTrading("Sending price update for [{}], Serial No. [{}] with [{}] charges", item->Name, gis->SerialNumber[i], gis->Charges[i]); - Customer->SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketMerchant); // MainCursor?? + Customer->SendItemPacket(EQ::invslot::slotCursor, inst, ItemPacketMerchant); // MainCursor?? } safe_delete(inst); } @@ -2249,7 +2249,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) { } - const EQEmu::ItemData *item = 0; + const EQ::ItemData *item = 0; if(IDOfItemToAdd) item = database.GetItem(IDOfItemToAdd); @@ -2415,7 +2415,7 @@ void Client::SendBuyerResults(char* searchString, uint32 searchID) { char *buf = (char *)outapp->pBuffer; - const EQEmu::ItemData* item = database.GetItem(itemID); + const EQ::ItemData* item = database.GetItem(itemID); if(!item) { safe_delete(outapp); @@ -2511,7 +2511,7 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) { char *Buf = (char *)outapp->pBuffer; - const EQEmu::ItemData* item = database.GetItem(ItemID); + const EQ::ItemData* item = database.GetItem(ItemID); if(!item) { safe_delete(outapp); @@ -2555,7 +2555,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { /*uint32 BuyerID2 =*/ VARSTRUCT_SKIP_TYPE(uint32, Buf); //unused /*uint32 Unknown3 =*/ VARSTRUCT_SKIP_TYPE(uint32, Buf); //unused - const EQEmu::ItemData *item = database.GetItem(ItemID); + const EQ::ItemData *item = database.GetItem(ItemID); if(!item || !Quantity || !Price || !QtyBuyerWants) return; @@ -2621,7 +2621,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { return; } - EQEmu::ItemInstance* ItemToTransfer = m_inv.PopItem(SellerSlot); + EQ::ItemInstance* ItemToTransfer = m_inv.PopItem(SellerSlot); if(!ItemToTransfer || !Buyer->MoveItemToInventory(ItemToTransfer, true)) { LogError("Unexpected error while moving item from seller to buyer"); @@ -2667,7 +2667,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { return; } - EQEmu::ItemInstance* ItemToTransfer = m_inv.PopItem(SellerSlot); + EQ::ItemInstance* ItemToTransfer = m_inv.PopItem(SellerSlot); if(!ItemToTransfer) { LogError("Unexpected error while moving item from seller to buyer"); @@ -2767,7 +2767,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity * Price); - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD) + if (ClientVersion() >= EQ::versions::ClientVersion::SoD) { VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); // Think this is the upper 32 bits of a 64 bit price } @@ -2791,7 +2791,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity * Price); - if (Buyer->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) + if (Buyer->ClientVersion() >= EQ::versions::ClientVersion::SoD) { VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); // Think this is the upper 32 bits of a 64 bit price } @@ -2946,7 +2946,7 @@ void Client::UpdateBuyLine(const EQApplicationPacket *app) { /*uint32 UnknownZ =*/ VARSTRUCT_SKIP_TYPE(uint32, Buf); //unused uint32 ItemCount = VARSTRUCT_DECODE_TYPE(uint32, Buf); - const EQEmu::ItemData *item = database.GetItem(ItemID); + const EQ::ItemData *item = database.GetItem(ItemID); if(!item) return; @@ -3010,7 +3010,7 @@ void Client::BuyerItemSearch(const EQApplicationPacket *app) { BuyerItemSearchResults_Struct* bisr = (BuyerItemSearchResults_Struct*)outapp->pBuffer; - const EQEmu::ItemData* item = 0; + const EQ::ItemData* item = 0; int Count=0; diff --git a/zone/trap.cpp b/zone/trap.cpp index 7027f3e28..44f34eb8a 100644 --- a/zone/trap.cpp +++ b/zone/trap.cpp @@ -135,7 +135,7 @@ void Trap::Trigger(Mob* trigger) entity_list.MessageClose(trigger,false,100,13,"%s",message.c_str()); } if(hiddenTrigger){ - hiddenTrigger->SpellFinished(effectvalue, trigger, EQEmu::spells::CastingSlot::Item, 0, -1, spells[effectvalue].ResistDiff); + hiddenTrigger->SpellFinished(effectvalue, trigger, EQ::spells::CastingSlot::Item, 0, -1, spells[effectvalue].ResistDiff); } break; case trapTypeAlarm: diff --git a/zone/tribute.cpp b/zone/tribute.cpp index 3e80f5446..95640947e 100644 --- a/zone/tribute.cpp +++ b/zone/tribute.cpp @@ -66,7 +66,7 @@ void Client::ToggleTribute(bool enabled) { int r; uint32 cost = 0; uint32 level = GetLevel(); - for (r = 0; r < EQEmu::invtype::TRIBUTE_SIZE; r++) { + for (r = 0; r < EQ::invtype::TRIBUTE_SIZE; r++) { uint32 tid = m_pp.tributes[r].tribute; if(tid == TRIBUTE_NONE) continue; @@ -119,7 +119,7 @@ void Client::DoTributeUpdate() { tis->tribute_master_id = tribute_master_id; //Dont know what this is for int r; - for (r = 0; r < EQEmu::invtype::TRIBUTE_SIZE; r++) { + for (r = 0; r < EQ::invtype::TRIBUTE_SIZE; r++) { if(m_pp.tributes[r].tribute != TRIBUTE_NONE) { tis->tributes[r] = m_pp.tributes[r].tribute; tis->tiers[r] = m_pp.tributes[r].tier; @@ -134,24 +134,24 @@ void Client::DoTributeUpdate() { if(m_pp.tribute_active) { //send and equip tribute items... - for (r = 0; r < EQEmu::invtype::TRIBUTE_SIZE; r++) { + for (r = 0; r < EQ::invtype::TRIBUTE_SIZE; r++) { uint32 tid = m_pp.tributes[r].tribute; if(tid == TRIBUTE_NONE) { - if (m_inv[EQEmu::invslot::TRIBUTE_BEGIN + r]) - DeleteItemInInventory(EQEmu::invslot::TRIBUTE_BEGIN + r, 0, false); + if (m_inv[EQ::invslot::TRIBUTE_BEGIN + r]) + DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, 0, false); continue; } if(tribute_list.count(tid) != 1) { - if (m_inv[EQEmu::invslot::TRIBUTE_BEGIN + r]) - DeleteItemInInventory(EQEmu::invslot::TRIBUTE_BEGIN + r, 0, false); + if (m_inv[EQ::invslot::TRIBUTE_BEGIN + r]) + DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, 0, false); continue; } //sanity check if(m_pp.tributes[r].tier >= MAX_TRIBUTE_TIERS) { - if (m_inv[EQEmu::invslot::TRIBUTE_BEGIN + r]) - DeleteItemInInventory(EQEmu::invslot::TRIBUTE_BEGIN + r, 0, false); + if (m_inv[EQ::invslot::TRIBUTE_BEGIN + r]) + DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, 0, false); m_pp.tributes[r].tier = 0; continue; } @@ -161,19 +161,19 @@ void Client::DoTributeUpdate() { uint32 item_id = tier.tribute_item_id; //summon the item for them - const EQEmu::ItemInstance* inst = database.CreateItem(item_id, 1); + const EQ::ItemInstance* inst = database.CreateItem(item_id, 1); if(inst == nullptr) continue; - PutItemInInventory(EQEmu::invslot::TRIBUTE_BEGIN + r, *inst, false); - SendItemPacket(EQEmu::invslot::TRIBUTE_BEGIN + r, inst, ItemPacketTributeItem); + PutItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, *inst, false); + SendItemPacket(EQ::invslot::TRIBUTE_BEGIN + r, inst, ItemPacketTributeItem); safe_delete(inst); } } else { //unequip tribute items... - for (r = 0; r < EQEmu::invtype::TRIBUTE_SIZE; r++) { - if (m_inv[EQEmu::invslot::TRIBUTE_BEGIN + r]) - DeleteItemInInventory(EQEmu::invslot::TRIBUTE_BEGIN + r, 0, false); + for (r = 0; r < EQ::invtype::TRIBUTE_SIZE; r++) { + if (m_inv[EQ::invslot::TRIBUTE_BEGIN + r]) + DeleteItemInInventory(EQ::invslot::TRIBUTE_BEGIN + r, 0, false); } } CalcBonuses(); @@ -192,7 +192,7 @@ void Client::SendTributeTimer() { void Client::ChangeTributeSettings(TributeInfo_Struct *t) { int r; - for (r = 0; r < EQEmu::invtype::TRIBUTE_SIZE; r++) { + for (r = 0; r < EQ::invtype::TRIBUTE_SIZE; r++) { m_pp.tributes[r].tribute = TRIBUTE_NONE; @@ -239,7 +239,7 @@ void Client::SendTributeDetails(uint32 client_id, uint32 tribute_id) { //returns the number of points received from the tribute int32 Client::TributeItem(uint32 slot, uint32 quantity) { - const EQEmu::ItemInstance*inst = m_inv[slot]; + const EQ::ItemInstance*inst = m_inv[slot]; if(inst == nullptr) return(0); diff --git a/zone/tune.cpp b/zone/tune.cpp index 22ca90375..f22fe6a53 100644 --- a/zone/tune.cpp +++ b/zone/tune.cpp @@ -255,7 +255,7 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh } if (RuleB(Combat, UseIntervalAC)) { - float softcap = (GetSkill(EQEmu::skills::SkillDefense) + GetLevel()) * + float softcap = (GetSkill(EQ::skills::SkillDefense) + GetLevel()) * RuleR(Combat, SoftcapFactor) * (1.0 + aa_mit); float mitigation_rating = 0.0; float attack_rating = 0.0; @@ -410,14 +410,14 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh int tmp_armor = armor; if (GetClass() == WIZARD || GetClass() == MAGICIAN || GetClass() == NECROMANCER || GetClass() == ENCHANTER){ - mitigation_rating = ((GetSkill(EQEmu::skills::SkillDefense) + itembonuses.HeroicAGI / 10) / 4.0) + armor + 1; + mitigation_rating = ((GetSkill(EQ::skills::SkillDefense) + itembonuses.HeroicAGI / 10) / 4.0) + armor + 1; if (Msg >= 2) - GM->Message(Chat::White, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQEmu::skills::SkillDefense), itembonuses.HeroicAGI); + GM->Message(Chat::White, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQ::skills::SkillDefense), itembonuses.HeroicAGI); } else{ - mitigation_rating = ((GetSkill(EQEmu::skills::SkillDefense) + itembonuses.HeroicAGI / 10) / 3.0) + (armor * 1.333333) + 1; + mitigation_rating = ((GetSkill(EQ::skills::SkillDefense) + itembonuses.HeroicAGI / 10) / 3.0) + (armor * 1.333333) + 1; if (Msg >= 2) - GM->Message(Chat::White, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQEmu::skills::SkillDefense), itembonuses.HeroicAGI); + GM->Message(Chat::White, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQ::skills::SkillDefense), itembonuses.HeroicAGI); } mitigation_rating *= 0.847; @@ -443,16 +443,16 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh if (attacker->IsClient()){ if (atk_override) - attack_rating = (atk_override + ((attacker->GetSTR() - 66) * 0.9) + (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345)); + attack_rating = (atk_override + ((attacker->GetSTR() - 66) * 0.9) + (attacker->GetSkill(EQ::skills::SkillOffense)*1.345)); else - attack_rating = ((attacker->CastToClient()->CalcATK() + add_atk) + ((attacker->GetSTR() - 66) * 0.9) + (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345)); + attack_rating = ((attacker->CastToClient()->CalcATK() + add_atk) + ((attacker->GetSTR() - 66) * 0.9) + (attacker->GetSkill(EQ::skills::SkillOffense)*1.345)); } else{ if (atk_override) - attack_rating = (atk_override + (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345) + ((attacker->GetSTR() - 66) * 0.9)); + attack_rating = (atk_override + (attacker->GetSkill(EQ::skills::SkillOffense)*1.345) + ((attacker->GetSTR() - 66) * 0.9)); else - attack_rating = ((attacker->GetATK() + add_atk) + (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345) + ((attacker->GetSTR() - 66) * 0.9)); + attack_rating = ((attacker->GetATK() + add_atk) + (attacker->GetSkill(EQ::skills::SkillOffense)*1.345) + ((attacker->GetSTR() - 66) * 0.9)); } attack_rating = attacker->mod_attack_rating(attack_rating, this); @@ -468,7 +468,7 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh GM->Message(Chat::White, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK); GM->Message(Chat::White, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK); GM->Message(Chat::White, "# %.2f #### ATTACKER Strength Stat ATK Bonus [Stat Amt: %i]", ((attacker->GetSTR()-66) * 0.9),attacker->GetSTR()); - GM->Message(Chat::White, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345), attacker->GetSkill(EQEmu::skills::SkillOffense)); + GM->Message(Chat::White, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQ::skills::SkillOffense)*1.345), attacker->GetSkill(EQ::skills::SkillOffense)); } else{ @@ -476,7 +476,7 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh GM->Message(Chat::White, "# %i #### ATTACKER SE_ATK(2) spell Bonus", attacker->spellbonuses.ATK); GM->Message(Chat::White, "# %i #### ATTACKER NPC ATK Stat", attacker->CastToNPC()->ATK); GM->Message(Chat::White, "# %.2f #### ATTACKER Strength Stat ATK Bonus [Stat Amt: %i]", ((attacker->GetSTR()-66) * 0.9),attacker->GetSTR()); - GM->Message(Chat::White, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345), attacker->GetSkill(EQEmu::skills::SkillOffense)); + GM->Message(Chat::White, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQ::skills::SkillOffense)*1.345), attacker->GetSkill(EQ::skills::SkillOffense)); } } @@ -582,13 +582,13 @@ int32 Client::Tune_GetMeleeMitDmg(Mob* GM, Mob *attacker, int32 damage, int32 mi int32 Client::GetMeleeDamage(Mob* other, bool GetMinDamage) { - int Hand = EQEmu::invslot::slotPrimary; + int Hand = EQ::invslot::slotPrimary; if (!other) return 0; - EQEmu::ItemInstance* weapon; - weapon = GetInv().GetItem(EQEmu::invslot::slotPrimary); + EQ::ItemInstance* weapon; + weapon = GetInv().GetItem(EQ::invslot::slotPrimary); if(weapon != nullptr) { if (!weapon->IsWeapon()) { @@ -596,7 +596,7 @@ int32 Client::GetMeleeDamage(Mob* other, bool GetMinDamage) } } - EQEmu::skills::SkillType skillinuse = AttackAnimation(Hand, weapon); + EQ::skills::SkillType skillinuse = AttackAnimation(Hand, weapon); int damage = 0; uint8 mylevel = GetLevel() ? GetLevel() : 1; @@ -620,16 +620,16 @@ int32 Client::GetMeleeDamage(Mob* other, bool GetMinDamage) max_hit = (RuleI(Combat, HitCapPre20)); CheckIncreaseSkill(skillinuse, other, -15); - CheckIncreaseSkill(EQEmu::skills::SkillOffense, other, -15); + CheckIncreaseSkill(EQ::skills::SkillOffense, other, -15); #ifndef EQEMU_NO_WEAPON_DAMAGE_BONUS int ucDamageBonus = 0; - if (Hand == EQEmu::invslot::slotPrimary && GetLevel() >= 28 && IsWarriorClass()) + if (Hand == EQ::invslot::slotPrimary && GetLevel() >= 28 && IsWarriorClass()) { - ucDamageBonus = GetWeaponDamageBonus(weapon ? weapon->GetItem() : (const EQEmu::ItemData*) nullptr); + ucDamageBonus = GetWeaponDamageBonus(weapon ? weapon->GetItem() : (const EQ::ItemData*) nullptr); min_hit += (int) ucDamageBonus; max_hit += (int) ucDamageBonus; @@ -657,28 +657,28 @@ void Mob::Tune_FindAccuaryByHitChance(Mob* defender, Mob *attacker, float hit_ch float tmp_hit_chance = 0.0f; bool end = false; - EQEmu::skills::SkillType skillinuse = EQEmu::skills::SkillHandtoHand; + EQ::skills::SkillType skillinuse = EQ::skills::SkillHandtoHand; if (attacker->IsClient()) {//Will check first equiped weapon for skill. Ie. remove wepaons to assess bow. - EQEmu::ItemInstance* weapon; - weapon = attacker->CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary); + EQ::ItemInstance* weapon; + weapon = attacker->CastToClient()->GetInv().GetItem(EQ::invslot::slotPrimary); if(weapon && weapon->IsWeapon()){ - skillinuse = attacker->CastToClient()->AttackAnimation(EQEmu::invslot::slotPrimary, weapon); + skillinuse = attacker->CastToClient()->AttackAnimation(EQ::invslot::slotPrimary, weapon); } else { - weapon = attacker->CastToClient()->GetInv().GetItem(EQEmu::invslot::slotSecondary); + weapon = attacker->CastToClient()->GetInv().GetItem(EQ::invslot::slotSecondary); if (weapon && weapon->IsWeapon()) - skillinuse = attacker->CastToClient()->AttackAnimation(EQEmu::invslot::slotSecondary, weapon); + skillinuse = attacker->CastToClient()->AttackAnimation(EQ::invslot::slotSecondary, weapon); else { - weapon = attacker->CastToClient()->GetInv().GetItem(EQEmu::invslot::slotRange); + weapon = attacker->CastToClient()->GetInv().GetItem(EQ::invslot::slotRange); if (weapon && weapon->IsWeapon()) - skillinuse = attacker->CastToClient()->AttackAnimation(EQEmu::invslot::slotRange, weapon); + skillinuse = attacker->CastToClient()->AttackAnimation(EQ::invslot::slotRange, weapon); } } } - tmp_hit_chance = Tune_CheckHitChance(defender, attacker, skillinuse, EQEmu::invslot::slotPrimary, 0, 0, 0, avoid_override); + tmp_hit_chance = Tune_CheckHitChance(defender, attacker, skillinuse, EQ::invslot::slotPrimary, 0, 0, 0, avoid_override); Message(0, "#Tune - Begin Parse [Interval %i Max Loop Iterations %i]", interval, max_loop); @@ -690,7 +690,7 @@ void Mob::Tune_FindAccuaryByHitChance(Mob* defender, Mob *attacker, float hit_ch for (int j=0; j < max_loop; j++) { - tmp_hit_chance = Tune_CheckHitChance(defender, attacker, skillinuse, EQEmu::invslot::slotPrimary, 0, false, 0, avoid_override, add_acc); + tmp_hit_chance = Tune_CheckHitChance(defender, attacker, skillinuse, EQ::invslot::slotPrimary, 0, false, 0, avoid_override, add_acc); if (Msg >= 3) Message(Chat::Yellow, "#Tune - Processing... [%i] [ACCURACY %i] Hit Chance %.2f ",j,add_acc,tmp_hit_chance); @@ -705,7 +705,7 @@ void Mob::Tune_FindAccuaryByHitChance(Mob* defender, Mob *attacker, float hit_ch if (end){ - Tune_CheckHitChance(defender, attacker, skillinuse, EQEmu::invslot::slotPrimary, 0, Msg, 0, avoid_override);//Display Stat Report + Tune_CheckHitChance(defender, attacker, skillinuse, EQ::invslot::slotPrimary, 0, Msg, 0, avoid_override);//Display Stat Report Message(0, " "); @@ -737,28 +737,28 @@ void Mob::Tune_FindAvoidanceByHitChance(Mob* defender, Mob *attacker, float hit_ float tmp_hit_chance = 0.0f; bool end = false; - EQEmu::skills::SkillType skillinuse = EQEmu::skills::SkillHandtoHand; + EQ::skills::SkillType skillinuse = EQ::skills::SkillHandtoHand; if (attacker->IsClient()) {//Will check first equiped weapon for skill. Ie. remove wepaons to assess bow. - EQEmu::ItemInstance* weapon; - weapon = attacker->CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary); + EQ::ItemInstance* weapon; + weapon = attacker->CastToClient()->GetInv().GetItem(EQ::invslot::slotPrimary); if(weapon && weapon->IsWeapon()){ - skillinuse = attacker->CastToClient()->AttackAnimation(EQEmu::invslot::slotPrimary, weapon); + skillinuse = attacker->CastToClient()->AttackAnimation(EQ::invslot::slotPrimary, weapon); } else { - weapon = attacker->CastToClient()->GetInv().GetItem(EQEmu::invslot::slotSecondary); + weapon = attacker->CastToClient()->GetInv().GetItem(EQ::invslot::slotSecondary); if (weapon && weapon->IsWeapon()) - skillinuse = attacker->CastToClient()->AttackAnimation(EQEmu::invslot::slotSecondary, weapon); + skillinuse = attacker->CastToClient()->AttackAnimation(EQ::invslot::slotSecondary, weapon); else { - weapon = attacker->CastToClient()->GetInv().GetItem(EQEmu::invslot::slotRange); + weapon = attacker->CastToClient()->GetInv().GetItem(EQ::invslot::slotRange); if (weapon && weapon->IsWeapon()) - skillinuse = attacker->CastToClient()->AttackAnimation(EQEmu::invslot::slotRange, weapon); + skillinuse = attacker->CastToClient()->AttackAnimation(EQ::invslot::slotRange, weapon); } } } - tmp_hit_chance = Tune_CheckHitChance(defender, attacker, skillinuse, EQEmu::invslot::slotPrimary, 0, 0, acc_override, 0); + tmp_hit_chance = Tune_CheckHitChance(defender, attacker, skillinuse, EQ::invslot::slotPrimary, 0, 0, acc_override, 0); Message(0, "#Tune - Begin Parse [Interval %i Max Loop Iterations %i]", interval, max_loop); Message(0, "#Tune - Processing... Find Avoidance for hit chance on defender of (%.0f) pct from attacker. [Current Hit Chance %.2f]", hit_chance, tmp_hit_chance); @@ -768,7 +768,7 @@ void Mob::Tune_FindAvoidanceByHitChance(Mob* defender, Mob *attacker, float hit_ for (int j=0; j < max_loop; j++) { - tmp_hit_chance = Tune_CheckHitChance(defender, attacker, skillinuse, EQEmu::invslot::slotPrimary, 0, 0, acc_override, 0, 0, add_avoid); + tmp_hit_chance = Tune_CheckHitChance(defender, attacker, skillinuse, EQ::invslot::slotPrimary, 0, 0, acc_override, 0, 0, add_avoid); if (Msg >= 3) Message(0, "#Tune - Processing... [%i] [AVOIDANCE %i] Hit Chance %.2f ",j,add_avoid,tmp_hit_chance); @@ -783,7 +783,7 @@ void Mob::Tune_FindAvoidanceByHitChance(Mob* defender, Mob *attacker, float hit_ if (end){ - Tune_CheckHitChance(defender, attacker, skillinuse, EQEmu::invslot::slotPrimary, 0, Msg, acc_override, 0);//Display Stat Report + Tune_CheckHitChance(defender, attacker, skillinuse, EQ::invslot::slotPrimary, 0, Msg, acc_override, 0);//Display Stat Report Message(0, " "); @@ -808,7 +808,7 @@ void Mob::Tune_FindAvoidanceByHitChance(Mob* defender, Mob *attacker, float hit_ } -float Mob::Tune_CheckHitChance(Mob* defender, Mob* attacker, EQEmu::skills::SkillType skillinuse, int Hand, int16 chance_mod, int Msg, int acc_override, int avoid_override, int add_acc, int add_avoid) +float Mob::Tune_CheckHitChance(Mob* defender, Mob* attacker, EQ::skills::SkillType skillinuse, int Hand, int16 chance_mod, int Msg, int acc_override, int avoid_override, int add_acc, int add_avoid) { float chancetohit = RuleR(Combat, BaseHitChance); @@ -896,9 +896,9 @@ float Mob::Tune_CheckHitChance(Mob* defender, Mob* attacker, EQEmu::skills::Skil if(defender->IsClient()) { - chancetohit += (RuleR(Combat, WeaponSkillFalloff) * (defender->CastToClient()->MaxSkill(EQEmu::skills::SkillDefense) - defender->GetSkill(EQEmu::skills::SkillDefense))); + chancetohit += (RuleR(Combat, WeaponSkillFalloff) * (defender->CastToClient()->MaxSkill(EQ::skills::SkillDefense) - defender->GetSkill(EQ::skills::SkillDefense))); if (Msg >= 2) - Message(0, "# + %.2f Total: %.2f #### DEFENDER Defense Skill Mod", (RuleR(Combat, WeaponSkillFalloff) * (defender->CastToClient()->MaxSkill(EQEmu::skills::SkillDefense) - defender->GetSkill(EQEmu::skills::SkillDefense))), chancetohit); + Message(0, "# + %.2f Total: %.2f #### DEFENDER Defense Skill Mod", (RuleR(Combat, WeaponSkillFalloff) * (defender->CastToClient()->MaxSkill(EQ::skills::SkillDefense) - defender->GetSkill(EQ::skills::SkillDefense))), chancetohit); } @@ -987,17 +987,17 @@ float Mob::Tune_CheckHitChance(Mob* defender, Mob* attacker, EQEmu::skills::Skil hitBonus += attacker->itembonuses.HitChanceEffect[skillinuse] + attacker->spellbonuses.HitChanceEffect[skillinuse]+ attacker->aabonuses.HitChanceEffect[skillinuse]+ - attacker->itembonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] + - attacker->spellbonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1] + - attacker->aabonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1]; + attacker->itembonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] + + attacker->spellbonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1] + + attacker->aabonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1]; if (Msg >= 2){ - if (attacker->aabonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1]) - Message(0, "# %i #### ATTACKER SE_HitChance(184) AA Bonus [All Skills]", attacker->aabonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1]); - if (attacker->spellbonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1]) - Message(0, "# %i #### ATTACKER SE_HitChance(184) Spell Bonus [All Skills]", attacker->spellbonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1]); - if (attacker->itembonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1]) - Message(0, "# %i #### ATTACKER SE_HitChance(184) Worn Bonus [All Skills]", attacker->itembonuses.HitChanceEffect[EQEmu::skills::HIGHEST_SKILL + 1]); + if (attacker->aabonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1]) + Message(0, "# %i #### ATTACKER SE_HitChance(184) AA Bonus [All Skills]", attacker->aabonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1]); + if (attacker->spellbonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1]) + Message(0, "# %i #### ATTACKER SE_HitChance(184) Spell Bonus [All Skills]", attacker->spellbonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1]); + if (attacker->itembonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1]) + Message(0, "# %i #### ATTACKER SE_HitChance(184) Worn Bonus [All Skills]", attacker->itembonuses.HitChanceEffect[EQ::skills::HIGHEST_SKILL + 1]); if (attacker->itembonuses.HitChanceEffect[skillinuse]) Message(0, "# %i #### ATTACKER SE_HitChance(184) AA Bonus [Skill]", attacker->aabonuses.HitChanceEffect[skillinuse]); if (attacker->spellbonuses.HitChanceEffect[skillinuse]) @@ -1008,19 +1008,19 @@ float Mob::Tune_CheckHitChance(Mob* defender, Mob* attacker, EQEmu::skills::Skil //Accuracy = Spell Effect , HitChance = 'Accuracy' from Item Effect //Only AA derived accuracy can be skill limited. ie (Precision of the Pathfinder, Dead Aim) - hitBonus += (attacker->itembonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] + - attacker->spellbonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] + - attacker->aabonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1] + + hitBonus += (attacker->itembonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1] + + attacker->spellbonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1] + + attacker->aabonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1] + attacker->aabonuses.Accuracy[skillinuse] + attacker->itembonuses.HitChance) / 15.0f; //Item Mod 'Accuracy' if (Msg >= 2) { - if (attacker->aabonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1]) - Message(0, "# %.2f #### ATTACKER SE_Accuracy(216) AA Bonus [All Skills] [Stat Amt: %i]", static_cast(attacker->aabonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1]) / 15.0f, attacker->aabonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1]); - if (attacker->spellbonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1]) - Message(0, "# %.2f #### ATTACKER SE_Accuracy(216) Spell Bonus [All Skills] [Stat Amt: %i]", static_cast(attacker->spellbonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1]) / 15.0f, attacker->spellbonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1]); - if (attacker->itembonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1]) - Message(0, "# %.2f #### ATTACKER SE_Accuracy(216) Worn Bonus [All Skills] [Stat Amt: %i]", static_cast(attacker->itembonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1]) / 15.0f, attacker->itembonuses.Accuracy[EQEmu::skills::HIGHEST_SKILL + 1]); + if (attacker->aabonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1]) + Message(0, "# %.2f #### ATTACKER SE_Accuracy(216) AA Bonus [All Skills] [Stat Amt: %i]", static_cast(attacker->aabonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1]) / 15.0f, attacker->aabonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1]); + if (attacker->spellbonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1]) + Message(0, "# %.2f #### ATTACKER SE_Accuracy(216) Spell Bonus [All Skills] [Stat Amt: %i]", static_cast(attacker->spellbonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1]) / 15.0f, attacker->spellbonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1]); + if (attacker->itembonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1]) + Message(0, "# %.2f #### ATTACKER SE_Accuracy(216) Worn Bonus [All Skills] [Stat Amt: %i]", static_cast(attacker->itembonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1]) / 15.0f, attacker->itembonuses.Accuracy[EQ::skills::HIGHEST_SKILL + 1]); if (attacker->aabonuses.Accuracy[skillinuse]) Message(0, "# %.2f #### ATTACKER SE_Accuracy(216) AA Bonus [Skill] [Stat Amt: %i]", static_cast(attacker->aabonuses.Accuracy[skillinuse])/15.0f,attacker->aabonuses.Accuracy[skillinuse]); if (attacker->itembonuses.HitChance) @@ -1052,7 +1052,7 @@ float Mob::Tune_CheckHitChance(Mob* defender, Mob* attacker, EQEmu::skills::Skil hitBonus += (add_acc / 15.0f); //Modifier from database } - if (skillinuse == EQEmu::skills::SkillArchery){ + if (skillinuse == EQ::skills::SkillArchery){ hitBonus -= hitBonus*RuleR(Combat, ArcheryHitPenalty); if (Msg >= 2) Message(0, "# %.2f pct #### RuleR(Combat, ArcheryHitPenalty) ", RuleR(Combat, ArcheryHitPenalty)); diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index 65f4fd099..544fca2cd 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -118,7 +118,7 @@ void NPC::ResumeWandering() { // we were paused by a quest AI_walking_timer->Disable(); SetGrid(0 - GetGrid()); - if (cur_wp == EQEmu::WaypointStatus::QuestControlGrid) + if (cur_wp == EQ::WaypointStatus::QuestControlGrid) { // got here by a MoveTo() cur_wp = save_wp; UpdateWaypoint(cur_wp); // have him head to last destination from here @@ -184,7 +184,7 @@ void NPC::MoveTo(const glm::vec4 &position, bool saveguardspot) AI_walking_timer->Disable(); // disable timer in case he is paused at a wp if (cur_wp >= 0) { // we've not already done a MoveTo() save_wp = cur_wp; // save the current waypoint - cur_wp = EQEmu::WaypointStatus::QuestControlGrid; + cur_wp = EQ::WaypointStatus::QuestControlGrid; } LogAI("MoveTo [{}], pausing regular grid wandering. Grid [{}], save_wp [{}]", to_string(static_cast(position)).c_str(), @@ -194,7 +194,7 @@ void NPC::MoveTo(const glm::vec4 &position, bool saveguardspot) else { // not on a grid roamer = true; save_wp = 0; - cur_wp = EQEmu::WaypointStatus::QuestControlNoGrid; + cur_wp = EQ::WaypointStatus::QuestControlNoGrid; LogAI("MoveTo [{}] without a grid", to_string(static_cast(position)).c_str()); } diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 0279d55be..dfc9c447a 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -834,7 +834,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) break; } case ServerOP_RefreshCensorship: { - if (!EQEmu::ProfanityManager::LoadProfanityList(&database)) + if (!EQ::ProfanityManager::LoadProfanityList(&database)) LogError("Received request to refresh the profanity list..but, the action failed"); break; } @@ -926,7 +926,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) database.SetGroupLeaderName(group->GetID(), Inviter->GetName()); group->UpdateGroupAAs(); - if (Inviter->CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::SoD) + if (Inviter->CastToClient()->ClientVersion() < EQ::versions::ClientVersion::SoD) { auto outapp = new EQApplicationPacket(OP_GroupUpdate, sizeof(GroupJoin_Struct)); @@ -1454,7 +1454,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) bool found_corpse = false; for (auto const& it : entity_list.GetCorpseList()) { if (it.second->IsPlayerCorpse() && strcmp(it.second->GetOwnerName(), s->ownername) == 0) { - if (s->consent_type == EQEmu::consent::Normal) { + if (s->consent_type == EQ::consent::Normal) { if (s->permission == 1) { it.second->AddConsentName(s->grantname); } @@ -1462,13 +1462,13 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) it.second->RemoveConsentName(s->grantname); } } - else if (s->consent_type == EQEmu::consent::Group) { + else if (s->consent_type == EQ::consent::Group) { it.second->SetConsentGroupID(s->consent_id); } - else if (s->consent_type == EQEmu::consent::Raid) { + else if (s->consent_type == EQ::consent::Raid) { it.second->SetConsentRaidID(s->consent_id); } - else if (s->consent_type == EQEmu::consent::Guild) { + else if (s->consent_type == EQ::consent::Guild) { it.second->SetConsentGuildID(s->consent_id); } found_corpse = true; @@ -1492,7 +1492,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) ServerOP_Consent_Struct* s = (ServerOP_Consent_Struct*)pack->pBuffer; Client* owner_client = entity_list.GetClientByName(s->ownername); Client* grant_client = nullptr; - if (s->consent_type == EQEmu::consent::Normal) { + if (s->consent_type == EQ::consent::Normal) { grant_client = entity_list.GetClientByName(s->grantname); } if (owner_client || grant_client) { diff --git a/zone/zone.cpp b/zone/zone.cpp index d64c198d3..c9342f305 100755 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -262,12 +262,12 @@ bool Zone::LoadZoneObjects() data.tilt_y = atof(row[18]); data.unknown084 = 0; - EQEmu::ItemInstance *inst = nullptr; + EQ::ItemInstance *inst = nullptr; // FatherNitwit: this dosent seem to work... // tradeskill containers do not have an itemid of 0... at least what I am seeing if (itemid == 0) { // Generic tradeskill container - inst = new EQEmu::ItemInstance(ItemInstWorldContainer); + inst = new EQ::ItemInstance(ItemInstWorldContainer); } else { // Groundspawn object inst = database.CreateItem(itemid); @@ -275,11 +275,11 @@ bool Zone::LoadZoneObjects() // Father Nitwit's fix... not perfect... if (inst == nullptr && type != OT_DROPPEDITEM) { - inst = new EQEmu::ItemInstance(ItemInstWorldContainer); + inst = new EQ::ItemInstance(ItemInstWorldContainer); } // Load child objects if container - if (inst && inst->IsType(EQEmu::item::ItemClassBag)) { + if (inst && inst->IsType(EQ::item::ItemClassBag)) { database.LoadWorldContainer(id, inst); } @@ -308,7 +308,7 @@ bool Zone::LoadGroundSpawns() { uint32 gsnumber=0; for(gsindex=0;gsindex<50;gsindex++){ if(groundspawn.spawn[gsindex].item>0 && groundspawn.spawn[gsindex].item iterator(spawn2_list); - EQEmu::InventoryProfile::CleanDirty(); + EQ::InventoryProfile::CleanDirty(); LogSpawns("Running Zone::Process -> Spawn2::Process"); @@ -2512,7 +2512,7 @@ void Zone::CalculateNpcUpdateDistanceSpread() int x_spread = int(abs(max_x - min_x)); int y_spread = int(abs(max_y - min_y)); int combined_spread = int(abs((x_spread + y_spread) / 2)); - int update_distance = EQEmu::ClampLower(int(combined_spread / 4), int(zone->GetMaxMovementUpdateRange())); + int update_distance = EQ::ClampLower(int(combined_spread / 4), int(zone->GetMaxMovementUpdateRange())); SetNpcPositionUpdateDistance(update_distance); diff --git a/zone/zone.h b/zone/zone.h index 6d8fc54e6..9c56efbab 100755 --- a/zone/zone.h +++ b/zone/zone.h @@ -133,7 +133,7 @@ public: const char *GetSpellBlockedMessage(uint32 spell_id, const glm::vec3 &location); - EQEmu::Random random; + EQ::Random random; EQTime zone_time; ZonePoint *GetClosestZonePoint(const glm::vec3 &location, const char *to_name, Client *client, float max_distance = 40000.0f); diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 1dfbeb4a2..40ec77ecd 100755 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -553,7 +553,7 @@ void ZoneDatabase::RegisterBug(Client* client, BugReport_Struct* bug_report) { " '%s')", zone->GetShortName(), client->ClientVersion(), - EQEmu::versions::ClientVersionName(client->ClientVersion()), + EQ::versions::ClientVersionName(client->ClientVersion()), client->AccountID(), client->CharacterID(), client->GetName(), @@ -570,11 +570,11 @@ void ZoneDatabase::RegisterBug(Client* client, BugReport_Struct* bug_report) { bug_report->target_id, (target_name_ ? target_name_ : ""), bug_report->optional_info_mask, - ((bug_report->optional_info_mask & EQEmu::bug::infoCanDuplicate) != 0 ? 1 : 0), - ((bug_report->optional_info_mask & EQEmu::bug::infoCrashBug) != 0 ? 1 : 0), - ((bug_report->optional_info_mask & EQEmu::bug::infoTargetInfo) != 0 ? 1 : 0), - ((bug_report->optional_info_mask & EQEmu::bug::infoCharacterFlags) != 0 ? 1 : 0), - ((bug_report->optional_info_mask & EQEmu::bug::infoUnknownValue) != 0 ? 1 : 0), + ((bug_report->optional_info_mask & EQ::bug::infoCanDuplicate) != 0 ? 1 : 0), + ((bug_report->optional_info_mask & EQ::bug::infoCrashBug) != 0 ? 1 : 0), + ((bug_report->optional_info_mask & EQ::bug::infoTargetInfo) != 0 ? 1 : 0), + ((bug_report->optional_info_mask & EQ::bug::infoCharacterFlags) != 0 ? 1 : 0), + ((bug_report->optional_info_mask & EQ::bug::infoUnknownValue) != 0 ? 1 : 0), (bug_report_ ? bug_report_ : ""), (system_info_ ? system_info_ : "") ); @@ -679,7 +679,7 @@ void ZoneDatabase::GetEventLogs(const char* name,char* target,uint32 account_id, } // Load child objects for a world container (i.e., forge, bag dropped to ground, etc) -void ZoneDatabase::LoadWorldContainer(uint32 parentid, EQEmu::ItemInstance* container) +void ZoneDatabase::LoadWorldContainer(uint32 parentid, EQ::ItemInstance* container) { if (!container) { LogError("Programming error: LoadWorldContainer passed nullptr pointer"); @@ -701,7 +701,7 @@ void ZoneDatabase::LoadWorldContainer(uint32 parentid, EQEmu::ItemInstance* cont uint8 index = (uint8)atoi(row[0]); uint32 item_id = (uint32)atoi(row[1]); int8 charges = (int8)atoi(row[2]); - uint32 aug[EQEmu::invaug::SOCKET_COUNT]; + uint32 aug[EQ::invaug::SOCKET_COUNT]; aug[0] = (uint32)atoi(row[3]); aug[1] = (uint32)atoi(row[4]); aug[2] = (uint32)atoi(row[5]); @@ -709,9 +709,9 @@ void ZoneDatabase::LoadWorldContainer(uint32 parentid, EQEmu::ItemInstance* cont aug[4] = (uint32)atoi(row[7]); aug[5] = (uint32)atoi(row[8]); - EQEmu::ItemInstance* inst = database.CreateItem(item_id, charges); + EQ::ItemInstance* inst = database.CreateItem(item_id, charges); if (inst && inst->GetItem()->IsClassCommon()) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) if (aug[i]) inst->PutAugment(&database, i, aug[i]); // Put item inside world container @@ -723,7 +723,7 @@ void ZoneDatabase::LoadWorldContainer(uint32 parentid, EQEmu::ItemInstance* cont } // Save child objects for a world container (i.e., forge, bag dropped to ground, etc) -void ZoneDatabase::SaveWorldContainer(uint32 zone_id, uint32 parent_id, const EQEmu::ItemInstance* container) +void ZoneDatabase::SaveWorldContainer(uint32 zone_id, uint32 parent_id, const EQ::ItemInstance* container) { // Since state is not saved for each world container action, we'll just delete // all and save from scratch .. we may come back later to optimize @@ -734,18 +734,18 @@ void ZoneDatabase::SaveWorldContainer(uint32 zone_id, uint32 parent_id, const EQ DeleteWorldContainer(parent_id,zone_id); // Save all 10 items, if they exist - for (uint8 index = EQEmu::invbag::SLOT_BEGIN; index <= EQEmu::invbag::SLOT_END; index++) { + for (uint8 index = EQ::invbag::SLOT_BEGIN; index <= EQ::invbag::SLOT_END; index++) { - EQEmu::ItemInstance* inst = container->GetItem(index); + EQ::ItemInstance* inst = container->GetItem(index); if (!inst) continue; uint32 item_id = inst->GetItem()->ID; - uint32 augslot[EQEmu::invaug::SOCKET_COUNT] = { 0, 0, 0, 0, 0, 0 }; + uint32 augslot[EQ::invaug::SOCKET_COUNT] = { 0, 0, 0, 0, 0, 0 }; - if (inst->IsType(EQEmu::item::ItemClassCommon)) { - for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) { - EQEmu::ItemInstance *auginst=inst->GetAugment(i); + if (inst->IsType(EQ::item::ItemClassCommon)) { + for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { + EQ::ItemInstance *auginst=inst->GetAugment(i); augslot[i]=(auginst && auginst->GetItem()) ? auginst->GetItem()->ID : 0; } } @@ -825,7 +825,7 @@ TraderCharges_Struct* ZoneDatabase::LoadTraderItemWithCharges(uint32 char_id) return loadti; } -EQEmu::ItemInstance* ZoneDatabase::LoadSingleTraderItem(uint32 CharID, int SerialNumber) { +EQ::ItemInstance* ZoneDatabase::LoadSingleTraderItem(uint32 CharID, int SerialNumber) { std::string query = StringFormat("SELECT * FROM trader WHERE char_id = %i AND serialnumber = %i " "ORDER BY slot_id LIMIT 80", CharID, SerialNumber); auto results = QueryDatabase(query); @@ -843,7 +843,7 @@ EQEmu::ItemInstance* ZoneDatabase::LoadSingleTraderItem(uint32 CharID, int Seria int Charges = atoi(row[3]); int Cost = atoi(row[4]); - const EQEmu::ItemData *item = database.GetItem(ItemID); + const EQ::ItemData *item = database.GetItem(ItemID); if(!item) { LogTrading("Unable to create item\n"); @@ -854,7 +854,7 @@ EQEmu::ItemInstance* ZoneDatabase::LoadSingleTraderItem(uint32 CharID, int Seria if (item->NoDrop == 0) return nullptr; - EQEmu::ItemInstance* inst = database.CreateItem(item); + EQ::ItemInstance* inst = database.CreateItem(item); if(!inst) { LogTrading("Unable to create item instance\n"); fflush(stdout); @@ -897,7 +897,7 @@ void ZoneDatabase::UpdateTraderItemPrice(int CharID, uint32 ItemID, uint32 Charg LogTrading("ZoneDatabase::UpdateTraderPrice([{}], [{}], [{}], [{}])", CharID, ItemID, Charges, NewPrice); - const EQEmu::ItemData *item = database.GetItem(ItemID); + const EQ::ItemData *item = database.GetItem(ItemID); if(!item) return; @@ -1222,12 +1222,12 @@ bool ZoneDatabase::LoadCharacterMemmedSpells(uint32 character_id, PlayerProfile_ auto results = database.QueryDatabase(query); int i = 0; /* Initialize Spells */ - for (i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; i++){ + for (i = 0; i < EQ::spells::SPELL_GEM_COUNT; i++){ pp->mem_spells[i] = 0xFFFFFFFF; } for (auto row = results.begin(); row != results.end(); ++row) { i = atoi(row[0]); - if (i < EQEmu::spells::SPELL_GEM_COUNT && atoi(row[1]) <= SPDAT_RECORDS){ + if (i < EQ::spells::SPELL_GEM_COUNT && atoi(row[1]) <= SPDAT_RECORDS){ pp->mem_spells[i] = atoi(row[1]); } } @@ -1246,7 +1246,7 @@ bool ZoneDatabase::LoadCharacterSpellBook(uint32 character_id, PlayerProfile_Str /* Initialize Spells */ - memset(pp->spell_book, 0xFF, (sizeof(uint32) * EQEmu::spells::SPELLBOOK_SIZE)); + memset(pp->spell_book, 0xFF, (sizeof(uint32) * EQ::spells::SPELLBOOK_SIZE)); // We have the ability to block loaded spells by max id on a per-client basis.. // but, we do not have to ability to keep players from using older clients after @@ -1257,7 +1257,7 @@ bool ZoneDatabase::LoadCharacterSpellBook(uint32 character_id, PlayerProfile_Str int idx = atoi(row[0]); int id = atoi(row[1]); - if (idx < 0 || idx >= EQEmu::spells::SPELLBOOK_SIZE) + if (idx < 0 || idx >= EQ::spells::SPELLBOOK_SIZE) continue; if (id < 3 || id > SPDAT_RECORDS) // 3 ("Summon Corpse") is the first scribable spell in spells_us.txt continue; @@ -1405,11 +1405,11 @@ bool ZoneDatabase::LoadCharacterMaterialColor(uint32 character_id, PlayerProfile bool ZoneDatabase::LoadCharacterBandolier(uint32 character_id, PlayerProfile_Struct* pp) { std::string query = StringFormat("SELECT `bandolier_id`, `bandolier_slot`, `item_id`, `icon`, `bandolier_name` FROM `character_bandolier` WHERE `id` = %u LIMIT %u", - character_id, EQEmu::profile::BANDOLIERS_SIZE); + character_id, EQ::profile::BANDOLIERS_SIZE); auto results = database.QueryDatabase(query); int i = 0; int r = 0; int si = 0; - for (i = 0; i < EQEmu::profile::BANDOLIERS_SIZE; i++) { + for (i = 0; i < EQ::profile::BANDOLIERS_SIZE; i++) { pp->bandoliers[i].Name[0] = '\0'; - for (int si = 0; si < EQEmu::profile::BANDOLIER_ITEM_COUNT; si++) { + for (int si = 0; si < EQ::profile::BANDOLIER_ITEM_COUNT; si++) { pp->bandoliers[i].Items[si].ID = 0; pp->bandoliers[i].Items[si].Icon = 0; pp->bandoliers[i].Items[si].Name[0] = '\0'; @@ -1421,7 +1421,7 @@ bool ZoneDatabase::LoadCharacterBandolier(uint32 character_id, PlayerProfile_Str i = atoi(row[r]); /* Bandolier ID */ r++; si = atoi(row[r]); /* Bandolier Slot */ r++; - const EQEmu::ItemData* item_data = database.GetItem(atoi(row[r])); + const EQ::ItemData* item_data = database.GetItem(atoi(row[r])); if (item_data) { pp->bandoliers[i].Items[si].ID = item_data->ID; r++; pp->bandoliers[i].Items[si].Icon = atoi(row[r]); r++; // Must use db value in case an Ornamentation is assigned @@ -1443,7 +1443,7 @@ bool ZoneDatabase::LoadCharacterTribute(uint32 character_id, PlayerProfile_Struc std::string query = StringFormat("SELECT `tier`, `tribute` FROM `character_tribute` WHERE `id` = %u", character_id); auto results = database.QueryDatabase(query); int i = 0; - for (i = 0; i < EQEmu::invtype::TRIBUTE_SIZE; i++){ + for (i = 0; i < EQ::invtype::TRIBUTE_SIZE; i++){ pp->tributes[i].tribute = 0xFFFFFFFF; pp->tributes[i].tier = 0; } @@ -1462,10 +1462,10 @@ bool ZoneDatabase::LoadCharacterPotions(uint32 character_id, PlayerProfile_Struc { std::string query = StringFormat("SELECT `potion_id`, `item_id`, `icon` FROM `character_potionbelt` WHERE `id` = %u LIMIT %u", - character_id, EQEmu::profile::POTION_BELT_SIZE); + character_id, EQ::profile::POTION_BELT_SIZE); auto results = database.QueryDatabase(query); int i = 0; - for (i = 0; i < EQEmu::profile::POTION_BELT_SIZE; i++) { + for (i = 0; i < EQ::profile::POTION_BELT_SIZE; i++) { pp->potionbelt.Items[i].Icon = 0; pp->potionbelt.Items[i].ID = 0; pp->potionbelt.Items[i].Name[0] = '\0'; @@ -1473,7 +1473,7 @@ bool ZoneDatabase::LoadCharacterPotions(uint32 character_id, PlayerProfile_Struc for (auto row = results.begin(); row != results.end(); ++row) { i = atoi(row[0]); - const EQEmu::ItemData *item_data = database.GetItem(atoi(row[1])); + const EQ::ItemData *item_data = database.GetItem(atoi(row[1])); if (!item_data) continue; pp->potionbelt.Items[i].ID = item_data->ID; @@ -1562,7 +1562,7 @@ bool ZoneDatabase::SaveCharacterTribute(uint32 character_id, PlayerProfile_Struc std::string query = StringFormat("DELETE FROM `character_tribute` WHERE `id` = %u", character_id); QueryDatabase(query); /* Save Tributes only if we have values... */ - for (int i = 0; i < EQEmu::invtype::TRIBUTE_SIZE; i++){ + for (int i = 0; i < EQ::invtype::TRIBUTE_SIZE; i++){ if (pp->tributes[i].tribute >= 0 && pp->tributes[i].tribute != TRIBUTE_NONE){ std::string query = StringFormat("REPLACE INTO `character_tribute` (id, tier, tribute) VALUES (%u, %u, %u)", character_id, pp->tributes[i].tier, pp->tributes[i].tribute); QueryDatabase(query); @@ -2641,7 +2641,7 @@ const NPCType *ZoneDatabase::LoadNPCTypesData(uint32 npc_type_id, bool bulk_load else { auto armorTint_row = armortint_results.begin(); - for (int index = EQEmu::textures::textureBegin; index <= EQEmu::textures::LastTexture; index++) { + for (int index = EQ::textures::textureBegin; index <= EQ::textures::LastTexture; index++) { temp_npctype_data->armor_tint.Slot[index].Color = atoi(armorTint_row[index * 3]) << 16; temp_npctype_data->armor_tint.Slot[index].Color |= atoi(armorTint_row[index * 3 + 1]) << 8; temp_npctype_data->armor_tint.Slot[index].Color |= atoi(armorTint_row[index * 3 + 2]); @@ -2652,7 +2652,7 @@ const NPCType *ZoneDatabase::LoadNPCTypesData(uint32 npc_type_id, bool bulk_load } // Try loading npc_types tint fields if armor tint is 0 or query failed to get results if (armor_tint_id == 0) { - for (int index = EQEmu::textures::armorChest; index < EQEmu::textures::materialCount; index++) { + for (int index = EQ::textures::armorChest; index < EQ::textures::materialCount; index++) { temp_npctype_data->armor_tint.Slot[index].Color = temp_npctype_data->armor_tint.Slot[0].Color; // odd way to 'zero-out' the array... } } @@ -2878,7 +2878,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client tmpNPCType->armor_tint.Slot[0].Color |= (tmpNPCType->armor_tint.Slot[0].Color) ? (0xFF << 24) : 0; if (armor_tint_id == 0) - for (int index = EQEmu::textures::armorChest; index <= EQEmu::textures::LastTexture; index++) + for (int index = EQ::textures::armorChest; index <= EQ::textures::LastTexture; index++) tmpNPCType->armor_tint.Slot[index].Color = tmpNPCType->armor_tint.Slot[0].Color; else if (tmpNPCType->armor_tint.Slot[0].Color == 0) { std::string armorTint_query = StringFormat("SELECT red1h, grn1h, blu1h, " @@ -2898,7 +2898,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client else { auto armorTint_row = results.begin(); - for (int index = EQEmu::textures::textureBegin; index <= EQEmu::textures::LastTexture; index++) { + for (int index = EQ::textures::textureBegin; index <= EQ::textures::LastTexture; index++) { tmpNPCType->armor_tint.Slot[index].Color = atoi(armorTint_row[index * 3]) << 16; tmpNPCType->armor_tint.Slot[index].Color |= atoi(armorTint_row[index * 3 + 1]) << 8; tmpNPCType->armor_tint.Slot[index].Color |= atoi(armorTint_row[index * 3 + 2]); @@ -3257,7 +3257,7 @@ void ZoneDatabase::LoadMercEquipment(Merc *merc) { int itemCount = 0; for(auto row = results.begin(); row != results.end(); ++row) { - if (itemCount == EQEmu::invslot::EQUIPMENT_COUNT) + if (itemCount == EQ::invslot::EQUIPMENT_COUNT) break; if(atoi(row[0]) == 0) @@ -3396,7 +3396,7 @@ void ZoneDatabase::RefreshGroupFromDB(Client *client){ client->QueuePacket(outapp); safe_delete(outapp); - if (client->ClientVersion() >= EQEmu::versions::ClientVersion::SoD) { + if (client->ClientVersion() >= EQ::versions::ClientVersion::SoD) { group->NotifyMainTank(client, 1); group->NotifyPuller(client, 1); } @@ -3698,7 +3698,7 @@ void ZoneDatabase::LoadBuffs(Client *client) } // We load up to the most our client supports - max_slots = EQEmu::spells::StaticLookup(client->ClientVersion())->LongBuffs; + max_slots = EQ::spells::StaticLookup(client->ClientVersion())->LongBuffs; for (int index = 0; index < max_slots; ++index) { if (!IsValidSpell(buffs[index].spellid)) continue; @@ -3807,7 +3807,7 @@ void ZoneDatabase::SavePetInfo(Client *client) query.clear(); // pet inventory! - for (int index = EQEmu::invslot::EQUIPMENT_BEGIN; index <= EQEmu::invslot::EQUIPMENT_END; index++) { + for (int index = EQ::invslot::EQUIPMENT_BEGIN; index <= EQ::invslot::EQUIPMENT_END; index++) { if (!petinfo->Items[index]) continue; @@ -3939,7 +3939,7 @@ void ZoneDatabase::LoadPetInfo(Client *client) continue; int slot = atoi(row[1]); - if (slot < EQEmu::invslot::EQUIPMENT_BEGIN || slot > EQEmu::invslot::EQUIPMENT_END) + if (slot < EQ::invslot::EQUIPMENT_BEGIN || slot > EQ::invslot::EQUIPMENT_END) continue; pi->Items[slot] = atoul(row[2]); diff --git a/zone/zonedb.h b/zone/zonedb.h index b1d88539d..366762fba 100644 --- a/zone/zonedb.h +++ b/zone/zonedb.h @@ -31,7 +31,7 @@ struct PlayerCorpse_Struct; struct ZonePoint; struct npcDecayTimes_Struct; -namespace EQEmu +namespace EQ { class ItemInstance; } @@ -106,7 +106,7 @@ struct DBnpcspellseffects_Struct { }; struct DBTradeskillRecipe_Struct { - EQEmu::skills::SkillType tradeskill; + EQ::skills::SkillType tradeskill; int16 skill_needed; uint16 trivial; bool nofail; @@ -153,7 +153,7 @@ struct PetInfo { uint32 Mana; float size; SpellBuff_Struct Buffs[PET_BUFF_COUNT]; - uint32 Items[EQEmu::invslot::EQUIPMENT_COUNT]; + uint32 Items[EQ::invslot::EQUIPMENT_COUNT]; char Name[64]; }; @@ -251,11 +251,11 @@ public: virtual ~ZoneDatabase(); /* Objects and World Containers */ - void LoadWorldContainer(uint32 parentid, EQEmu::ItemInstance* container); - void SaveWorldContainer(uint32 zone_id, uint32 parent_id, const EQEmu::ItemInstance* container); + void LoadWorldContainer(uint32 parentid, EQ::ItemInstance* container); + void SaveWorldContainer(uint32 zone_id, uint32 parent_id, const EQ::ItemInstance* container); void DeleteWorldContainer(uint32 parent_id,uint32 zone_id); - uint32 AddObject(uint32 type, uint32 icon, const Object_Struct& object, const EQEmu::ItemInstance* inst); - void UpdateObject(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, const EQEmu::ItemInstance* inst); + uint32 AddObject(uint32 type, uint32 icon, const Object_Struct& object, const EQ::ItemInstance* inst); + void UpdateObject(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, const EQ::ItemInstance* inst); void DeleteObject(uint32 id); Ground_Spawns* LoadGroundSpawns(uint32 zone_id, int16 version, Ground_Spawns* gs); @@ -266,7 +266,7 @@ public: void DeleteTraderItem(uint32 char_id); void DeleteTraderItem(uint32 char_id,uint16 slot_id); - EQEmu::ItemInstance* LoadSingleTraderItem(uint32 char_id, int uniqueid); + EQ::ItemInstance* LoadSingleTraderItem(uint32 char_id, int uniqueid); Trader_Struct* LoadTraderItem(uint32 char_id); TraderCharges_Struct* LoadTraderItemWithCharges(uint32 char_id); @@ -488,7 +488,7 @@ public: void DeleteMerchantTemp(uint32 npcid, uint32 slot); /* Tradeskills */ - bool GetTradeRecipe(const EQEmu::ItemInstance* container, uint8 c_type, uint32 some_id, uint32 char_id, DBTradeskillRecipe_Struct *spec); + bool GetTradeRecipe(const EQ::ItemInstance* container, uint8 c_type, uint32 some_id, uint32 char_id, DBTradeskillRecipe_Struct *spec); bool GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id, uint32 char_id, DBTradeskillRecipe_Struct *spec); uint32 GetZoneForage(uint32 ZoneID, uint8 skill); /* for foraging */ uint32 GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, uint8 &npc_chance); diff --git a/zone/zonedump.h b/zone/zonedump.h index 0a1bcd07d..a30ec9f5f 100644 --- a/zone/zonedump.h +++ b/zone/zonedump.h @@ -86,7 +86,7 @@ struct NPCType uint32 drakkin_heritage; uint32 drakkin_tattoo; uint32 drakkin_details; - EQEmu::TintProfile armor_tint; + EQ::TintProfile armor_tint; uint32 min_dmg; uint32 max_dmg; uint32 charm_ac; @@ -185,7 +185,7 @@ struct PlayerCorpse_Struct { uint32 silver; uint32 gold; uint32 plat; - EQEmu::TintProfile item_tint; + EQ::TintProfile item_tint; uint8 haircolor; uint8 beardcolor; uint8 eyecolor1; diff --git a/zone/zoning.cpp b/zone/zoning.cpp index 8eaa05c5a..7a04cfeae 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -561,7 +561,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z if (entity == 0) { Message(Chat::Red, "Error: OP_EndLootRequest: Corpse not found (ent = 0)"); - if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD) + if (ClientVersion() >= EQ::versions::ClientVersion::SoD) Corpse::SendEndLootErrorPacket(this); else Corpse::SendLootReqErrorPacket(this); @@ -588,7 +588,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z // If we are SoF and later and are respawning from hover, we want the real zone ID, else zero to use the old hack. // if(zone->GetZoneID() == zoneID) { - if ((ClientVersionBit() & EQEmu::versions::maskSoFAndLater) && (!RuleB(Character, RespawnFromHover) || !IsHoveringForRespawn())) + if ((ClientVersionBit() & EQ::versions::maskSoFAndLater) && (!RuleB(Character, RespawnFromHover) || !IsHoveringForRespawn())) gmg->bind_zone_id = 0; else gmg->bind_zone_id = zoneID;