mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9716] Allow to vendor have same items in list with different extanded price.

Browse source
This commit is contained in:
VladimirMangos 2010-04-10 04:28:34 +04:00
parent da253087cb
commit 25c2a76b63
12 changed files with 56 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/mangos.sql
View file

@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
`version` varchar(120) default NULL, `version` varchar(120) default NULL,
`creature_ai_version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL,
`cache_id` int(10) default '0', `cache_id` int(10) default '0',
`required_9710_01_mangos_command` bit(1) default NULL `required_9716_02_mangos_mangos_string` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
-- --
@ -3071,7 +3071,7 @@ INSERT INTO `mangos_string` VALUES
(207,'Item \'%i\' not found in database.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (207,'Item \'%i\' not found in database.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(208,'Item \'%i\' \'%s\' deleted from vendor list',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (208,'Item \'%i\' \'%s\' deleted from vendor list',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(209,'Item \'%i\' not found in vendor list.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (209,'Item \'%i\' not found in vendor list.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(210,'Item \'%i\' already in vendor list.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (210,'Item \'%i\' (with extended cost %u) already in vendor list.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(211,'Spells of %s reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (211,'Spells of %s reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(212,'Spells of %s will reset at next login.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (212,'Spells of %s will reset at next login.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(213,'Talents of %s reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (213,'Talents of %s reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@ -3827,7 +3827,7 @@ CREATE TABLE `npc_vendor` (
`maxcount` tinyint(3) unsigned NOT NULL default '0', `maxcount` tinyint(3) unsigned NOT NULL default '0',
`incrtime` int(10) unsigned NOT NULL default '0', `incrtime` int(10) unsigned NOT NULL default '0',
`ExtendedCost` mediumint(8) unsigned NOT NULL default '0', `ExtendedCost` mediumint(8) unsigned NOT NULL default '0',
PRIMARY KEY (`entry`,`item`) PRIMARY KEY (`entry`,`item`,`ExtendedCost`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Npc System'; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Npc System';
-- --

5
sql/updates/9716_01_mangos_npc_vendor.sql Normal file
View file

@ -0,0 +1,5 @@
ALTER TABLE db_version CHANGE COLUMN required_9710_01_mangos_command required_9716_01_mangos_npc_vendor bit;
ALTER TABLE npc_vendor
DROP PRIMARY KEY,
PRIMARY KEY (`entry`,`item`,`ExtendedCost`);

6
sql/updates/9716_02_mangos_mangos_string.sql Normal file
View file

@ -0,0 +1,6 @@
ALTER TABLE db_version CHANGE COLUMN required_9716_01_mangos_npc_vendor required_9716_02_mangos_mangos_string bit;
DELETE FROM mangos_string WHERE entry in (210);
INSERT INTO mangos_string VALUES
(210,'Item \'%i\' (with extended cost %u) already in vendor list.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

4
sql/updates/Makefile.am
View file

@ -112,6 +112,8 @@ pkgdata_DATA = \
9702_01_characters_item.sql \ 9702_01_characters_item.sql \
9704_01_mangos_achievement_reward.sql \ 9704_01_mangos_achievement_reward.sql \
9710_01_mangos_command.sql \ 9710_01_mangos_command.sql \
9716_01_mangos_npc_vendor.sql \
9716_02_mangos_mangos_string.sql \
README README
## Additional files to include when running 'make dist' ## Additional files to include when running 'make dist'
@ -204,4 +206,6 @@ EXTRA_DIST = \
9702_01_characters_item.sql \ 9702_01_characters_item.sql \
9704_01_mangos_achievement_reward.sql \ 9704_01_mangos_achievement_reward.sql \
9710_01_mangos_command.sql \ 9710_01_mangos_command.sql \
9716_01_mangos_npc_vendor.sql \
9716_02_mangos_mangos_string.sql \
README README

19
src/game/Creature.cpp
View file

@ -58,29 +58,24 @@ TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const
bool VendorItemData::RemoveItem( uint32 item_id ) bool VendorItemData::RemoveItem( uint32 item_id )
{ {
bool found = false;
for(VendorItemList::iterator i = m_items.begin(); i != m_items.end(); ++i ) for(VendorItemList::iterator i = m_items.begin(); i != m_items.end(); ++i )
{ {
// can have many examples
if((*i)->item == item_id) if((*i)->item == item_id)
{ {
m_items.erase(i); m_items.erase(i);
return true; found = true;
} }
} }
return false;
return found;
} }
size_t VendorItemData::FindItemSlot(uint32 item_id) const VendorItem const* VendorItemData::FindItemCostPair(uint32 item_id, uint32 extendedCost) const
{
for(size_t i = 0; i < m_items.size(); ++i )
if(m_items[i]->item == item_id)
return i;
return m_items.size();
}
VendorItem const* VendorItemData::FindItem(uint32 item_id) const
{ {
for(VendorItemList::const_iterator i = m_items.begin(); i != m_items.end(); ++i ) for(VendorItemList::const_iterator i = m_items.begin(); i != m_items.end(); ++i )
if((*i)->item == item_id) if((*i)->item == item_id && (*i)->ExtendedCost == extendedCost)
return *i; return *i;
return NULL; return NULL;
} }

3
src/game/Creature.h
View file

@ -301,8 +301,7 @@ struct VendorItemData
m_items.push_back(new VendorItem(item, maxcount, ptime, ExtendedCost)); m_items.push_back(new VendorItem(item, maxcount, ptime, ExtendedCost));
} }
bool RemoveItem( uint32 item_id ); bool RemoveItem( uint32 item_id );
VendorItem const* FindItem(uint32 item_id) const; VendorItem const* FindItemCostPair(uint32 item_id, uint32 extendedCost) const;
size_t FindItemSlot(uint32 item_id) const;
void Clear() void Clear()
{ {

14
src/game/ItemHandler.cpp
View file

@ -643,6 +643,11 @@ void WorldSession::HandleBuyItemInSlotOpcode( WorldPacket & recv_data )
recv_data >> vendorguid >> item >> slot >> bagguid >> bagslot >> count; recv_data >> vendorguid >> item >> slot >> bagguid >> bagslot >> count;
if (slot < 1)
return; // client numbering slots from 1
--slot;
uint8 bag = NULL_BAG; // init for case invalid bagGUID uint8 bag = NULL_BAG; // init for case invalid bagGUID
// find bag slot by bag guid // find bag slot by bag guid
@ -667,7 +672,7 @@ void WorldSession::HandleBuyItemInSlotOpcode( WorldPacket & recv_data )
if (bag == NULL_BAG) if (bag == NULL_BAG)
return; return;
GetPlayer()->BuyItemFromVendor(vendorguid, item, count, bag, bagslot); GetPlayer()->BuyItemFromVendorSlot(vendorguid, slot, item, count, bag, bagslot);
} }
void WorldSession::HandleBuyItemOpcode( WorldPacket & recv_data ) void WorldSession::HandleBuyItemOpcode( WorldPacket & recv_data )
@ -679,7 +684,12 @@ void WorldSession::HandleBuyItemOpcode( WorldPacket & recv_data )
recv_data >> vendorguid >> item >> slot >> count >> unk1; recv_data >> vendorguid >> item >> slot >> count >> unk1;
GetPlayer()->BuyItemFromVendor(vendorguid, item, count, NULL_BAG, NULL_SLOT); if (slot < 1)
return; // client numbering slots from 1
--slot;
GetPlayer()->BuyItemFromVendorSlot(vendorguid, slot, item, count, NULL_BAG, NULL_SLOT);
} }
void WorldSession::HandleListInventoryOpcode( WorldPacket & recv_data ) void WorldSession::HandleListInventoryOpcode( WorldPacket & recv_data )

9
src/game/ObjectMgr.cpp
View file

@ -8274,10 +8274,9 @@ bool ObjectMgr::RemoveVendorItem( uint32 entry,uint32 item )
if(iter == m_mCacheVendorItemMap.end()) if(iter == m_mCacheVendorItemMap.end())
return false; return false;
if(!iter->second.FindItem(item)) if(!iter->second.RemoveItem(item))
return false; return false;
iter->second.RemoveItem(item);
WorldDatabase.PExecuteLog("DELETE FROM npc_vendor WHERE entry='%u' AND item='%u'",entry, item); WorldDatabase.PExecuteLog("DELETE FROM npc_vendor WHERE entry='%u' AND item='%u'",entry, item);
return true; return true;
} }
@ -8348,12 +8347,12 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
if(!vItems) if(!vItems)
return true; // later checks for non-empty lists return true; // later checks for non-empty lists
if(vItems->FindItem(item_id)) if(vItems->FindItemCostPair(item_id,ExtendedCost))
{ {
if(pl) if(pl)
ChatHandler(pl).PSendSysMessage(LANG_ITEM_ALREADY_IN_LIST,item_id); ChatHandler(pl).PSendSysMessage(LANG_ITEM_ALREADY_IN_LIST, item_id, ExtendedCost);
else else
sLog.outErrorDb( "Table `npc_vendor` has duplicate items %u for vendor (Entry: %u), ignoring", item_id, vendor_entry); sLog.outErrorDb( "Table `npc_vendor` has duplicate items %u (with extended cost %u) for vendor (Entry: %u), ignoring", item_id, ExtendedCost, vendor_entry);
return false; return false;
} }

17
src/game/Player.cpp
View file

@ -18296,7 +18296,7 @@ void Player::InitDisplayIds()
} }
// Return true is the bought item has a max count to force refresh of window by caller // Return true is the bought item has a max count to force refresh of window by caller
bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint8 bag, uint8 slot) bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 item, uint8 count, uint8 bag, uint8 slot)
{ {
// cheating attempt // cheating attempt
if (count < 1) count = 1; if (count < 1) count = 1;
@ -18326,14 +18326,19 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
return false; return false;
} }
size_t vendor_slot = vItems->FindItemSlot(item); if (vendorslot >= vItems->GetItemCount())
if (vendor_slot >= vItems->GetItemCount()) {
SendBuyError( BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0);
return false;
}
VendorItem const* crItem = vItems->m_items[vendorslot];
if(!crItem || crItem->item != item) // store diff item (cheating)
{ {
SendBuyError( BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0); SendBuyError( BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0);
return false; return false;
} }
VendorItem const* crItem = vItems->m_items[vendor_slot];
// check current item amount if it limited // check current item amount if it limited
if (crItem->maxcount != 0) if (crItem->maxcount != 0)
@ -18435,7 +18440,7 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
WorldPacket data(SMSG_BUY_ITEM, (8+4+4+4)); WorldPacket data(SMSG_BUY_ITEM, (8+4+4+4));
data << uint64(pCreature->GetGUID()); data << uint64(pCreature->GetGUID());
data << uint32(vendor_slot+1); // numbered from 1 at client data << uint32(vendorslot+1); // numbered from 1 at client
data << uint32(crItem->maxcount > 0 ? new_count : 0xFFFFFFFF); data << uint32(crItem->maxcount > 0 ? new_count : 0xFFFFFFFF);
data << uint32(count); data << uint32(count);
GetSession()->SendPacket(&data); GetSession()->SendPacket(&data);
@ -18480,7 +18485,7 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
WorldPacket data(SMSG_BUY_ITEM, (8+4+4+4)); WorldPacket data(SMSG_BUY_ITEM, (8+4+4+4));
data << uint64(pCreature->GetGUID()); data << uint64(pCreature->GetGUID());
data << uint32(vendor_slot + 1); // numbered from 1 at client data << uint32(vendorslot + 1); // numbered from 1 at client
data << uint32(crItem->maxcount > 0 ? new_count : 0xFFFFFFFF); data << uint32(crItem->maxcount > 0 ? new_count : 0xFFFFFFFF);
data << uint32(count); data << uint32(count);
GetSession()->SendPacket(&data); GetSession()->SendPacket(&data);

2
src/game/Player.h
View file

@ -1276,7 +1276,7 @@ class MANGOS_DLL_SPEC Player : public Unit
return mainItem && mainItem->GetProto()->InventoryType == INVTYPE_2HWEAPON && !CanTitanGrip(); return mainItem && mainItem->GetProto()->InventoryType == INVTYPE_2HWEAPON && !CanTitanGrip();
} }
void SendNewItem( Item *item, uint32 count, bool received, bool created, bool broadcast = false ); void SendNewItem( Item *item, uint32 count, bool received, bool created, bool broadcast = false );
bool BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint8 bag, uint8 slot); bool BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 item, uint8 count, uint8 bag, uint8 slot);
float GetReputationPriceDiscount( Creature const* pCreature ) const; float GetReputationPriceDiscount( Creature const* pCreature ) const;
Player* GetTrader() const { return pTrader; } Player* GetTrader() const { return pTrader; }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9715" #define REVISION_NR "9716"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__

2
src/shared/revision_sql.h
View file

@ -1,6 +1,6 @@
#ifndef __REVISION_SQL_H__ #ifndef __REVISION_SQL_H__
#define __REVISION_SQL_H__ #define __REVISION_SQL_H__
#define REVISION_DB_CHARACTERS "required_9702_01_characters_item" #define REVISION_DB_CHARACTERS "required_9702_01_characters_item"
#define REVISION_DB_MANGOS "required_9710_01_mangos_command" #define REVISION_DB_MANGOS "required_9716_02_mangos_mangos_string"
#define REVISION_DB_REALMD "required_9010_01_realmd_realmlist" #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist"
#endif // __REVISION_SQL_H__ #endif // __REVISION_SQL_H__