diff --git a/zone/bot.h b/zone/bot.h index 076693c7f..fb3b84abc 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -472,6 +472,7 @@ public: bool IsBotArcher() { return m_bot_archery_setting; } bool IsBotCharmer() { return _botCharmer; } bool IsBot() const override { return true; } + bool IsOfClientBotMerc() const override { return true; } bool GetRangerAutoWeaponSelect() { return _rangerAutoWeaponSelect; } BotRoleType GetBotRole() { return _botRole; } EQ::constants::StanceType GetBotStance() { return _botStance; } diff --git a/zone/client.h b/zone/client.h index 63e079dd5..bead68294 100644 --- a/zone/client.h +++ b/zone/client.h @@ -278,6 +278,7 @@ public: bool KeyRingCheck(uint32 item_id); void KeyRingList(); virtual bool IsClient() const { return true; } + bool IsOfClientBotMerc() const override { return true; } void CompleteConnect(); bool TryStacking(EQ::ItemInstance* item, uint8 type = ItemPacketTrade, bool try_worn = true, bool try_cursor = true); void SendTraderPacket(Client* trader, uint32 Unknown72 = 51); diff --git a/zone/entity.h b/zone/entity.h index d79bd9e83..24b2ddbe2 100644 --- a/zone/entity.h +++ b/zone/entity.h @@ -67,20 +67,21 @@ public: Entity(); virtual ~Entity(); - virtual bool IsClient() const { return false; } - virtual bool IsNPC() const { return false; } - virtual bool IsMob() const { return false; } - virtual bool IsMerc() const { return false; } - virtual bool IsCorpse() const { return false; } - virtual bool IsPlayerCorpse() const { return false; } - virtual bool IsNPCCorpse() const { return false; } - virtual bool IsObject() const { return false; } - virtual bool IsDoor() const { return false; } - virtual bool IsTrap() const { return false; } - virtual bool IsBeacon() const { return false; } - virtual bool IsEncounter() const { return false; } - virtual bool IsBot() const { return false; } - virtual bool IsAura() const { return false; } + virtual bool IsClient() const { return false; } + virtual bool IsNPC() const { return false; } + virtual bool IsMob() const { return false; } + virtual bool IsMerc() const { return false; } + virtual bool IsCorpse() const { return false; } + virtual bool IsPlayerCorpse() const { return false; } + virtual bool IsNPCCorpse() const { return false; } + virtual bool IsObject() const { return false; } + virtual bool IsDoor() const { return false; } + virtual bool IsTrap() const { return false; } + virtual bool IsBeacon() const { return false; } + virtual bool IsEncounter() const { return false; } + virtual bool IsBot() const { return false; } + virtual bool IsAura() const { return false; } + virtual bool IsOfClientBotMerc() const { return false; } virtual bool Process() { return false; } virtual bool Save() { return true; } diff --git a/zone/merc.h b/zone/merc.h index b05fa32d3..9a6c73973 100644 --- a/zone/merc.h +++ b/zone/merc.h @@ -123,6 +123,7 @@ public: bool UseDiscipline(int32 spell_id, int32 target); virtual bool IsMerc() const { return true; } + bool IsOfClientBotMerc() const override { return true; } virtual void FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho); static Merc* LoadMerc(Client *c, MercTemplate* merc_template, uint32 merchant_id, bool updateFromDB = false);