From ad3d065225dc330663588836a53c59067106044b Mon Sep 17 00:00:00 2001 From: Uleat Date: Fri, 10 Oct 2014 04:26:54 -0400 Subject: [PATCH] Updated/activated EQDictionary code to use the new possessions enumeration --- common/CMakeLists.txt | 2 + common/eq_constants.h | 69 +---- common/eq_dictionary.cpp | 362 +++++++++++++-------------- common/eq_dictionary.h | 106 ++++---- common/patches/client62_constants.h | 8 +- common/patches/rof_constants.h | 9 +- common/patches/sod_constants.h | 8 +- common/patches/sof_constants.h | 8 +- common/patches/titanium_constants.h | 8 +- common/patches/underfoot_constants.h | 8 +- 10 files changed, 277 insertions(+), 311 deletions(-) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index ac42f5e4e..7be1c0582 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -216,6 +216,7 @@ SET(common_headers patches/rof_itemfields.h patches/rof_ops.h patches/rof_structs.h + patches/rof2_constants.h patches/titanium.h patches/titanium_constants.h patches/titanium_itemfields.h @@ -268,6 +269,7 @@ SOURCE_GROUP(Patches FILES patches/rof_itemfields.h patches/rof_ops.h patches/rof_constants.h + patches/rof2_constants.h patches/rof_structs.h patches/titanium.h patches/titanium_itemfields.h diff --git a/common/eq_constants.h b/common/eq_constants.h index 1868d6c3e..da1db6860 100644 --- a/common/eq_constants.h +++ b/common/eq_constants.h @@ -810,77 +810,12 @@ enum MaterialUseSlots : uint8 ** */ -enum InventoryMapTypes : int16 { - MapPossessions = 0, - MapBank, - MapSharedBank, - MapTrade, - MapWorld, - MapLimbo, - MapTribute, - MapTrophyTribute, - MapGuildTribute, - MapMerchant, - MapDeleted, - MapCorpse, - MapBazaar, - MapInspect, - MapRealEstate, - MapViewMODPC, - MapViewMODBank, - MapViewMODSharedBank, - MapViewMODLimbo, - MapAltStorage, - MapArchived, - MapMail, - MapGuildTrophyTribute, - MapKrono, - MapOther, - _MapCount -}; - -enum InventoryMainTypes : int16 { - MainCharm = 0, - MainEar1, - MainHead, - MainFace, - MainEar2, - MainNeck, - MainShoulders, - MainArms, - MainBack, - MainWrist1, - MainWrist2, - MainRange, - MainHands, - MainPrimary, - MainSecondary, - MainFinger1, - MainFinger2, - MainChest, - MainLegs, - MainFeet, - MainWaist, - MainPowerSource = 9999, // temp - MainAmmo = 21, // temp - MainGeneral1, - MainGeneral2, - MainGeneral3, - MainGeneral4, - MainGeneral5, - MainGeneral6, - MainGeneral7, - MainGeneral8, - //MainGeneral9, - //MainGeneral10, - MainCursor, - _MainCount -}; - #define INVALID_INDEX -1 #define NOT_USED 0 #define NO_ITEM 0 +#define DB_ITEM_CONTAINER_SIZE 255 // probably need to move to database.h + // yes..these are redundant... but, they help to identify and define what is actually being performed // plus, since they're pre-op's, they don't affect the actual binary size #define MAP_BEGIN 0 diff --git a/common/eq_dictionary.cpp b/common/eq_dictionary.cpp index f85d3110f..720659405 100644 --- a/common/eq_dictionary.cpp +++ b/common/eq_dictionary.cpp @@ -216,12 +216,10 @@ std::string EmuConstants::InventoryMainName(int16 main) { return "General 7"; case MainGeneral8: return "General 8"; - /* case MainGeneral9: return "General 9"; case MainGeneral10: return "General 10"; - */ case MainCursor: return "Cursor"; default: @@ -517,7 +515,7 @@ EQClientVersion EQLimits::ValidateMobVersion(EQClientVersion version) { // inventory uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) { // not all maps will have an instantiated container..some are references for queue generators (i.e., bazaar, mail, etc...) - // a zero '0' indicates a needed value..otherwise, change to '_NOTUSED' for a null value so indices requiring research can be identified + // a zero '0' indicates a needed value..otherwise, change to 'NOT_USED' for a null value so indices requiring research can be identified // ALL of these values need to be verified before pushing to live // // make sure that you transcribe the actual value from 'defaults' to here before updating or client crashes will ensue..and/or... @@ -586,10 +584,10 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) { /*RoF*/ EmuConstants::MAP_TRADE_SIZE, /*RoF2*/ 0, -/*NPC*/ 4, -/*Merc*/ 4, +/*NPC*/ EmuConstants::TRADE_NPC_SIZE, +/*Merc*/ EmuConstants::TRADE_NPC_SIZE, /*Bot*/ EmuConstants::MAP_TRADE_SIZE, // client thinks this is another client -/*Pet*/ 4 +/*Pet*/ EmuConstants::TRADE_NPC_SIZE }, { // local[MapWorld] /*Unknown*/ NOT_USED, @@ -631,70 +629,70 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) { /*RoF*/ EmuConstants::MAP_TRIBUTE_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapTrophyTribute] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_TROPHY_TRIBUTE_SIZE, +/*Titanium*/ EmuConstants::MAP_TROPHY_TRIBUTE_SIZE, +/*SoF*/ EmuConstants::MAP_TROPHY_TRIBUTE_SIZE, +/*SoD*/ EmuConstants::MAP_TROPHY_TRIBUTE_SIZE, +/*Underfoot*/ EmuConstants::MAP_TROPHY_TRIBUTE_SIZE, /*RoF*/ EmuConstants::MAP_TROPHY_TRIBUTE_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapGuildTribute] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_GUILD_TRIBUTE_SIZE, +/*Titanium*/ EmuConstants::MAP_GUILD_TRIBUTE_SIZE, +/*SoF*/ EmuConstants::MAP_GUILD_TRIBUTE_SIZE, +/*SoD*/ EmuConstants::MAP_GUILD_TRIBUTE_SIZE, +/*Underfoot*/ EmuConstants::MAP_GUILD_TRIBUTE_SIZE, /*RoF*/ EmuConstants::MAP_GUILD_TRIBUTE_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapMerchant] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_MERCHANT_SIZE, +/*Titanium*/ EmuConstants::MAP_MERCHANT_SIZE, +/*SoF*/ EmuConstants::MAP_MERCHANT_SIZE, +/*SoD*/ EmuConstants::MAP_MERCHANT_SIZE, +/*Underfoot*/ EmuConstants::MAP_MERCHANT_SIZE, /*RoF*/ EmuConstants::MAP_MERCHANT_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapDeleted] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_DELETED_SIZE, +/*Titanium*/ EmuConstants::MAP_DELETED_SIZE, +/*SoF*/ EmuConstants::MAP_DELETED_SIZE, +/*SoD*/ EmuConstants::MAP_DELETED_SIZE, +/*Underfoot*/ EmuConstants::MAP_DELETED_SIZE, /*RoF*/ EmuConstants::MAP_DELETED_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapCorpse] /*Unknown*/ NOT_USED, @@ -703,13 +701,13 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) { /*SoF*/ SoF::consts::MAP_CORPSE_SIZE, /*SoD*/ SoD::consts::MAP_CORPSE_SIZE, /*Underfoot*/ Underfoot::consts::MAP_CORPSE_SIZE, -/*RoF*/ RoF::consts::MAP_CORPSE_SIZE, +/*RoF*/ EmuConstants::MAP_CORPSE_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ EmuConstants::MAP_CORPSE_SIZE, +/*Merc*/ EmuConstants::MAP_CORPSE_SIZE, +/*Bot*/ EmuConstants::MAP_CORPSE_SIZE, +/*Pet*/ EmuConstants::MAP_CORPSE_SIZE }, { // local[MapBazaar] /*Unknown*/ NOT_USED, @@ -721,19 +719,19 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) { /*RoF*/ EmuConstants::MAP_BAZAAR_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, // this may need to be 'EmuConstants::MAP_BAZAAR_SIZE' if offline client traders respawn as an npc -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, // this may need to be 'EmuConstants::MAP_BAZAAR_SIZE' if offline client traders respawn as an npc +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapInspect] /*Unknown*/ NOT_USED, /*62*/ Client62::consts::MAP_INSPECT_SIZE, /*Titanium*/ Titanium::consts::MAP_INSPECT_SIZE, -/*SoF*/ SoF::consts::MAP_INSPECT_SIZE, -/*SoD*/ SoD::consts::MAP_INSPECT_SIZE, -/*Underfoot*/ Underfoot::consts::MAP_INSPECT_SIZE, -/*RoF*/ RoF::consts::MAP_INSPECT_SIZE, +/*SoF*/ EmuConstants::MAP_INSPECT_SIZE, +/*SoD*/ EmuConstants::MAP_INSPECT_SIZE, +/*Underfoot*/ EmuConstants::MAP_INSPECT_SIZE, +/*RoF*/ EmuConstants::MAP_INSPECT_SIZE, /*RoF2*/ 0, /*NPC*/ NOT_USED, @@ -743,168 +741,168 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) { }, { // local[MapRealEstate] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_REAL_ESTATE_SIZE, +/*Titanium*/ EmuConstants::MAP_REAL_ESTATE_SIZE, +/*SoF*/ EmuConstants::MAP_REAL_ESTATE_SIZE, +/*SoD*/ EmuConstants::MAP_REAL_ESTATE_SIZE, +/*Underfoot*/ EmuConstants::MAP_REAL_ESTATE_SIZE, /*RoF*/ EmuConstants::MAP_REAL_ESTATE_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapViewMODPC] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_VIEW_MOD_PC_SIZE, +/*Titanium*/ EmuConstants::MAP_VIEW_MOD_PC_SIZE, +/*SoF*/ EmuConstants::MAP_VIEW_MOD_PC_SIZE, +/*SoD*/ EmuConstants::MAP_VIEW_MOD_PC_SIZE, +/*Underfoot*/ EmuConstants::MAP_VIEW_MOD_PC_SIZE, /*RoF*/ EmuConstants::MAP_VIEW_MOD_PC_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapViewMODBank] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_VIEW_MOD_BANK_SIZE, +/*Titanium*/ EmuConstants::MAP_VIEW_MOD_BANK_SIZE, +/*SoF*/ EmuConstants::MAP_VIEW_MOD_BANK_SIZE, +/*SoD*/ EmuConstants::MAP_VIEW_MOD_BANK_SIZE, +/*Underfoot*/ EmuConstants::MAP_VIEW_MOD_BANK_SIZE, /*RoF*/ EmuConstants::MAP_VIEW_MOD_BANK_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapViewMODSharedBank] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_VIEW_MOD_SHARED_BANK_SIZE, +/*Titanium*/ EmuConstants::MAP_VIEW_MOD_SHARED_BANK_SIZE, +/*SoF*/ EmuConstants::MAP_VIEW_MOD_SHARED_BANK_SIZE, +/*SoD*/ EmuConstants::MAP_VIEW_MOD_SHARED_BANK_SIZE, +/*Underfoot*/ EmuConstants::MAP_VIEW_MOD_SHARED_BANK_SIZE, /*RoF*/ EmuConstants::MAP_VIEW_MOD_SHARED_BANK_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapViewMODLimbo] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_VIEW_MOD_LIMBO_SIZE, +/*Titanium*/ EmuConstants::MAP_VIEW_MOD_LIMBO_SIZE, +/*SoF*/ EmuConstants::MAP_VIEW_MOD_LIMBO_SIZE, +/*SoD*/ EmuConstants::MAP_VIEW_MOD_LIMBO_SIZE, +/*Underfoot*/ EmuConstants::MAP_VIEW_MOD_LIMBO_SIZE, /*RoF*/ EmuConstants::MAP_VIEW_MOD_LIMBO_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapAltStorage] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_ALT_STORAGE_SIZE, +/*Titanium*/ EmuConstants::MAP_ALT_STORAGE_SIZE, +/*SoF*/ EmuConstants::MAP_ALT_STORAGE_SIZE, +/*SoD*/ EmuConstants::MAP_ALT_STORAGE_SIZE, +/*Underfoot*/ EmuConstants::MAP_ALT_STORAGE_SIZE, /*RoF*/ EmuConstants::MAP_ALT_STORAGE_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapArchived] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_ARCHIVED_SIZE, +/*Titanium*/ EmuConstants::MAP_ARCHIVED_SIZE, +/*SoF*/ EmuConstants::MAP_ARCHIVED_SIZE, +/*SoD*/ EmuConstants::MAP_ARCHIVED_SIZE, +/*Underfoot*/ EmuConstants::MAP_ARCHIVED_SIZE, /*RoF*/ EmuConstants::MAP_ARCHIVED_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapMail] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_MAIL_SIZE, +/*Titanium*/ EmuConstants::MAP_MAIL_SIZE, +/*SoF*/ EmuConstants::MAP_MAIL_SIZE, +/*SoD*/ EmuConstants::MAP_MAIL_SIZE, +/*Underfoot*/ EmuConstants::MAP_MAIL_SIZE, /*RoF*/ EmuConstants::MAP_MAIL_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapGuildTrophyTribute] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_GUILD_TROPHY_TRIBUTE_SIZE, +/*Titanium*/ EmuConstants::MAP_GUILD_TROPHY_TRIBUTE_SIZE, +/*SoF*/ EmuConstants::MAP_GUILD_TROPHY_TRIBUTE_SIZE, +/*SoD*/ EmuConstants::MAP_GUILD_TROPHY_TRIBUTE_SIZE, +/*Underfoot*/ EmuConstants::MAP_GUILD_TROPHY_TRIBUTE_SIZE, /*RoF*/ EmuConstants::MAP_GUILD_TROPHY_TRIBUTE_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapKrono] /*Unknown*/ NOT_USED, -/*62*/ NOT_USED, -/*Titanium*/ NOT_USED, -/*SoF*/ NOT_USED, -/*SoD*/ NOT_USED, -/*Underfoot*/ NOT_USED, +/*62*/ Client62::consts::MAP_KRONO_SIZE, +/*Titanium*/ Titanium::consts::MAP_KRONO_SIZE, +/*SoF*/ SoF::consts::MAP_KRONO_SIZE, +/*SoD*/ SoD::consts::MAP_KRONO_SIZE, +/*Underfoot*/ Underfoot::consts::MAP_KRONO_SIZE, /*RoF*/ EmuConstants::MAP_KRONO_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }, { // local[MapOther] /*Unknown*/ NOT_USED, -/*62*/ 0, -/*Titanium*/ 0, -/*SoF*/ 0, -/*SoD*/ 0, -/*Underfoot*/ 0, +/*62*/ EmuConstants::MAP_OTHER_SIZE, +/*Titanium*/ EmuConstants::MAP_OTHER_SIZE, +/*SoF*/ EmuConstants::MAP_OTHER_SIZE, +/*SoD*/ EmuConstants::MAP_OTHER_SIZE, +/*Underfoot*/ EmuConstants::MAP_OTHER_SIZE, /*RoF*/ EmuConstants::MAP_OTHER_SIZE, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED } }; @@ -915,7 +913,6 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) { } uint64 EQLimits::PossessionsBitmask(uint32 version) { - // these are for the new inventory system (RoF)..not the current (Ti) one... // 0x0000000000200000 is SlotPowerSource (SoF+) // 0x0000000080000000 is SlotGeneral9 (RoF+) // 0x0000000100000000 is SlotGeneral10 (RoF+) @@ -930,14 +927,13 @@ uint64 EQLimits::PossessionsBitmask(uint32 version) { /*RoF*/ 0x00000003FFFFFFFF, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ 0x00000000007FFFFF, // limited to equipment slots..for the time being +/*Merc*/ 0x00000000007FFFFF, +/*Bot*/ 0x00000000007FFFFF, +/*Pet*/ 0x00000000007FFFFF }; - return NOT_USED; - //return local[ValidateMobVersion(version)]; + return local[ValidateMobVersion(version)]; } uint64 EQLimits::EquipmentBitmask(uint32 version) { @@ -951,14 +947,13 @@ uint64 EQLimits::EquipmentBitmask(uint32 version) { /*RoF*/ 0x00000000007FFFFF, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ 0x00000000007FFFFF, +/*Merc*/ 0x00000000007FFFFF, +/*Bot*/ 0x00000000007FFFFF, +/*Pet*/ 0x00000000007FFFFF }; - return NOT_USED; - //return local[ValidateMobVersion(version)]; + return local[ValidateMobVersion(version)]; } uint64 EQLimits::GeneralBitmask(uint32 version) { @@ -972,14 +967,13 @@ uint64 EQLimits::GeneralBitmask(uint32 version) { /*RoF*/ 0x00000001FF800000, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }; - return NOT_USED; - //return local[ValidateMobVersion(version)]; + return local[ValidateMobVersion(version)]; } uint64 EQLimits::CursorBitmask(uint32 version) { @@ -993,14 +987,13 @@ uint64 EQLimits::CursorBitmask(uint32 version) { /*RoF*/ 0x0000000200000000, /*RoF2*/ 0, -/*NPC*/ 0, -/*Merc*/ 0, -/*Bot*/ 0, -/*Pet*/ 0 +/*NPC*/ NOT_USED, +/*Merc*/ NOT_USED, +/*Bot*/ NOT_USED, +/*Pet*/ NOT_USED }; - return NOT_USED; - //return local[ValidateMobVersion(version)]; + return local[ValidateMobVersion(version)]; } bool EQLimits::AllowsEmptyBagInBag(uint32 version) { @@ -1020,8 +1013,7 @@ bool EQLimits::AllowsEmptyBagInBag(uint32 version) { /*Pet*/ false }; - return false; // not implemented - //return local[ValidateMobVersion(version)]; + return local[ValidateMobVersion(version)]; } bool EQLimits::AllowsClickCastFromBag(uint32 version) { diff --git a/common/eq_dictionary.h b/common/eq_dictionary.h index c08809a12..911096c61 100644 --- a/common/eq_dictionary.h +++ b/common/eq_dictionary.h @@ -32,16 +32,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/patches/sod_constants.h" #include "../common/patches/underfoot_constants.h" #include "../common/patches/rof_constants.h" -//#include "../common/patches/rof2_constants.h" +#include "../common/patches/rof2_constants.h" // *** DO NOT CHANGE without a full understanding of the consequences..the server is set up to use these settings explicitly!! *** // *** You will cause compilation failures and corrupt your database if partial or incorrect attempts to change them are made!! *** // Hard-coded values usually indicate that further research is needed and the values given are from the old (known) system -// (future use) -//using namespace RoF2::maps; // server inventory maps enumeration (code and database sync'd to reference) -//using namespace RoF::slots; // server possessions slots enumeration (code and database sync'd to reference) +using namespace RoF2::maps; // server inventory maps enumeration (code and database sync'd to reference) +using namespace RoF2::slots; // server possessions slots enumeration (code and database sync'd to reference) class EmuConstants { // an immutable value is required to initialize arrays, etc... use this class as a repository for those @@ -58,20 +57,20 @@ public: static std::string InventoryAugName(int16 aug); // these are currently hard-coded for existing inventory system..do not use in place of special client version handlers until ready - static const uint16 MAP_POSSESSIONS_SIZE = _MainCount; - static const uint16 MAP_BANK_SIZE = 24; - static const uint16 MAP_SHARED_BANK_SIZE = 2; - static const uint16 MAP_TRADE_SIZE = 8; - static const uint16 MAP_WORLD_SIZE = 10; - static const uint16 MAP_LIMBO_SIZE = 36; - static const uint16 MAP_TRIBUTE_SIZE = 5; // (need client values) + static const uint16 MAP_POSSESSIONS_SIZE = RoF2::consts::MAP_POSSESSIONS_SIZE; + static const uint16 MAP_BANK_SIZE = RoF2::consts::MAP_BANK_SIZE; + static const uint16 MAP_SHARED_BANK_SIZE = RoF2::consts::MAP_SHARED_BANK_SIZE; + static const uint16 MAP_TRADE_SIZE = RoF2::consts::MAP_TRADE_SIZE; + static const uint16 MAP_WORLD_SIZE = RoF2::consts::MAP_WORLD_SIZE; + static const uint16 MAP_LIMBO_SIZE = RoF2::consts::MAP_LIMBO_SIZE; + static const uint16 MAP_TRIBUTE_SIZE = Titanium::consts::MAP_TRIBUTE_SIZE; // server is setup for 'presumed' Titanium value of 5..if Titanium::consts is changed, hard-code this to '5' until server/db is updated static const uint16 MAP_TROPHY_TRIBUTE_SIZE = 0; static const uint16 MAP_GUILD_TRIBUTE_SIZE = 0; static const uint16 MAP_MERCHANT_SIZE = 0; static const uint16 MAP_DELETED_SIZE = 0; - static const uint16 MAP_CORPSE_SIZE = _MainCount; // no bitmask use..limits to size of client corpse window (see EQLimits::InventoryMapSize(MapCorpse,