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

[10207] Implement ITEM_FLAGS2_EXT_COST_REQUIRES_GOLD use instead sign of ExtendedCost field.

Browse source
This commit is contained in:
VladimirMangos 2010-07-17 19:12:16 +04:00
parent 9882bc811f
commit 20a5551739
13 changed files with 42 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
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_10205_01_mangos_spell_area` bit(1) default NULL `required_10207_01_mangos_npc_vendor` 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';
-- --
@ -3921,7 +3921,7 @@ CREATE TABLE `npc_vendor` (
`item` mediumint(8) unsigned NOT NULL default '0', `item` mediumint(8) unsigned NOT NULL default '0',
`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) NOT NULL default '0' COMMENT 'negative if cost must exclude normal money cost', `ExtendedCost` mediumint(8) unsigned NOT NULL default '0',
PRIMARY KEY (`entry`,`item`,`ExtendedCost`) 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';

7
sql/updates/10207_01_mangos_npc_vendor.sql Normal file
View file

@ -0,0 +1,7 @@
ALTER TABLE db_version CHANGE COLUMN required_10205_01_mangos_spell_area required_10207_01_mangos_npc_vendor bit;
UPDATE npc_vendor
SET ExtendedCost = abs(ExtendedCost) WHERE ExtendedCost < 0;
ALTER TABLE npc_vendor
CHANGE COLUMN `ExtendedCost` `ExtendedCost` mediumint(8) unsigned NOT NULL default '0';

2
sql/updates/Makefile.am
View file

@ -109,6 +109,7 @@ pkgdata_DATA = \
10197_01_mangos_playercreateinfo.sql \ 10197_01_mangos_playercreateinfo.sql \
10203_01_mangos_item_template.sql \ 10203_01_mangos_item_template.sql \
10205_01_mangos_spell_area.sql \ 10205_01_mangos_spell_area.sql \
10207_01_mangos_npc_vendor.sql \
README README
## Additional files to include when running 'make dist' ## Additional files to include when running 'make dist'
@ -198,4 +199,5 @@ EXTRA_DIST = \
10197_01_mangos_playercreateinfo.sql \ 10197_01_mangos_playercreateinfo.sql \
10203_01_mangos_item_template.sql \ 10203_01_mangos_item_template.sql \
10205_01_mangos_spell_area.sql \ 10205_01_mangos_spell_area.sql \
10207_01_mangos_npc_vendor.sql \
README README

2
src/game/Creature.cpp
View file

@ -74,7 +74,7 @@ bool VendorItemData::RemoveItem( uint32 item_id )
return found; return found;
} }
VendorItem const* VendorItemData::FindItemCostPair(uint32 item_id, int32 extendedCost) const VendorItem const* VendorItemData::FindItemCostPair(uint32 item_id, uint32 extendedCost) 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 && (*i)->ExtendedCost == extendedCost) if((*i)->item == item_id && (*i)->ExtendedCost == extendedCost)

12
src/game/Creature.h
View file

@ -276,17 +276,13 @@ enum AttackingTarget
// Vendors // Vendors
struct VendorItem struct VendorItem
{ {
VendorItem(uint32 _item, uint32 _maxcount, uint32 _incrtime, int32 _ExtendedCost) VendorItem(uint32 _item, uint32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost)
: item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost) {} : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost) {}
uint32 item; uint32 item;
uint32 maxcount; // 0 for infinity item amount uint32 maxcount; // 0 for infinity item amount
uint32 incrtime; // time for restore items amount if maxcount != 0 uint32 incrtime; // time for restore items amount if maxcount != 0
int32 ExtendedCost; // negative if need exclude normal item money cost uint32 ExtendedCost; // index in ItemExtendedCost.dbc
// helpers
uint32 IsExcludeMoneyPrice() const { return ExtendedCost < 0; }
uint32 GetExtendedCostId() const { return std::abs(ExtendedCost); }
}; };
typedef std::vector<VendorItem*> VendorItemList; typedef std::vector<VendorItem*> VendorItemList;
@ -301,12 +297,12 @@ struct VendorItemData
} }
bool Empty() const { return m_items.empty(); } bool Empty() const { return m_items.empty(); }
uint8 GetItemCount() const { return m_items.size(); } uint8 GetItemCount() const { return m_items.size(); }
void AddItem( uint32 item, uint32 maxcount, uint32 ptime, int32 ExtendedCost) void AddItem( uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost)
{ {
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* FindItemCostPair(uint32 item_id, int32 extendedCost) const; VendorItem const* FindItemCostPair(uint32 item_id, uint32 extendedCost) const;
void Clear() void Clear()
{ {

4
src/game/ItemHandler.cpp
View file

@ -781,7 +781,7 @@ void WorldSession::SendListInventory(uint64 vendorguid)
++count; ++count;
// reputation discount // reputation discount
uint32 price = crItem->IsExcludeMoneyPrice() ? 0 : uint32(floor(pProto->BuyPrice * discountMod)); uint32 price = (crItem->ExtendedCost == 0 || pProto->Flags2 & ITEM_FLAGS2_EXT_COST_REQUIRES_GOLD) ? uint32(floor(pProto->BuyPrice * discountMod)) : 0;
data << uint32(vendorslot +1); // client size expected counting from 1 data << uint32(vendorslot +1); // client size expected counting from 1
data << uint32(crItem->item); data << uint32(crItem->item);
@ -790,7 +790,7 @@ void WorldSession::SendListInventory(uint64 vendorguid)
data << uint32(price); data << uint32(price);
data << uint32(pProto->MaxDurability); data << uint32(pProto->MaxDurability);
data << uint32(pProto->BuyCount); data << uint32(pProto->BuyCount);
data << uint32(crItem->GetExtendedCostId()); data << uint32(crItem->ExtendedCost);
} }
} }
} }

2
src/game/ItemPrototype.h
View file

@ -484,7 +484,7 @@ enum ItemExtraFlags
ITEM_EXTRA_NON_CONSUMABLE = 0x01, // use as additional flag to spellcharges_N negative values, item not expire at no chanrges ITEM_EXTRA_NON_CONSUMABLE = 0x01, // use as additional flag to spellcharges_N negative values, item not expire at no chanrges
ITEM_EXTRA_REAL_TIME_DURATION = 0x02, // if set and have Duration time, then offline time included in counting, if not set then counted only in game time ITEM_EXTRA_REAL_TIME_DURATION = 0x02, // if set and have Duration time, then offline time included in counting, if not set then counted only in game time
ITEM_EXTRA_ALL // all used flags, used for check DB data ITEM_EXTRA_ALL = 0x03 // all used flags, used for check DB data (mask all above flags)
}; };
// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform

2
src/game/Level2.cpp
View file

@ -1161,7 +1161,7 @@ bool ChatHandler::HandleNpcAddVendorItemCommand(const char* args)
incrtime = atol(fincrtime); incrtime = atol(fincrtime);
char* fextendedcost = strtok(NULL, " "); //add ExtendedCost, default: 0 char* fextendedcost = strtok(NULL, " "); //add ExtendedCost, default: 0
int32 extendedcost = fextendedcost ? atol(fextendedcost) : 0; uint32 extendedcost = fextendedcost ? atol(fextendedcost) : 0;
Creature* vendor = getSelectedCreature(); Creature* vendor = getSelectedCreature();

26
src/game/ObjectMgr.cpp
View file

@ -8178,7 +8178,7 @@ void ObjectMgr::LoadVendors()
uint32 item_id = fields[1].GetUInt32(); uint32 item_id = fields[1].GetUInt32();
uint32 maxcount = fields[2].GetUInt32(); uint32 maxcount = fields[2].GetUInt32();
uint32 incrtime = fields[3].GetUInt32(); uint32 incrtime = fields[3].GetUInt32();
int32 ExtendedCost = fields[4].GetInt32(); uint32 ExtendedCost = fields[4].GetUInt32();
if(!IsVendorItemValid(entry,item_id,maxcount,incrtime,ExtendedCost,NULL,&skip_vendors)) if(!IsVendorItemValid(entry,item_id,maxcount,incrtime,ExtendedCost,NULL,&skip_vendors))
continue; continue;
@ -8456,12 +8456,12 @@ void ObjectMgr::LoadGossipMenuItems()
sLog.outString(">> Loaded %u gossip_menu_option entries", count); sLog.outString(">> Loaded %u gossip_menu_option entries", count);
} }
void ObjectMgr::AddVendorItem( uint32 entry,uint32 item, uint32 maxcount, uint32 incrtime, int32 extendedcost ) void ObjectMgr::AddVendorItem( uint32 entry,uint32 item, uint32 maxcount, uint32 incrtime, uint32 extendedcost )
{ {
VendorItemData& vList = m_mCacheVendorItemMap[entry]; VendorItemData& vList = m_mCacheVendorItemMap[entry];
vList.AddItem(item,maxcount,incrtime,extendedcost); vList.AddItem(item,maxcount,incrtime,extendedcost);
WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%i')",entry, item, maxcount,incrtime,extendedcost); WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%u')",entry, item, maxcount,incrtime,extendedcost);
} }
bool ObjectMgr::RemoveVendorItem( uint32 entry,uint32 item ) bool ObjectMgr::RemoveVendorItem( uint32 entry,uint32 item )
@ -8477,7 +8477,7 @@ bool ObjectMgr::RemoveVendorItem( uint32 entry,uint32 item )
return true; return true;
} }
bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 maxcount, uint32 incrtime, int32 ExtendedCost, Player* pl, std::set<uint32>* skip_vendors ) const bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 maxcount, uint32 incrtime, uint32 ExtendedCost, Player* pl, std::set<uint32>* skip_vendors ) const
{ {
CreatureInfo const* cInfo = GetCreatureTemplate(vendor_entry); CreatureInfo const* cInfo = GetCreatureTemplate(vendor_entry);
if(!cInfo) if(!cInfo)
@ -8509,18 +8509,18 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
if(pl) if(pl)
ChatHandler(pl).PSendSysMessage(LANG_ITEM_NOT_FOUND, item_id); ChatHandler(pl).PSendSysMessage(LANG_ITEM_NOT_FOUND, item_id);
else else
sLog.outErrorDb("Table `npc_vendor` for vendor (Entry: %u) contain nonexistent item (%u), ignoring",vendor_entry,item_id); sLog.outErrorDb("Table `npc_vendor` for vendor (Entry: %u) contain nonexistent item (%u), ignoring",
vendor_entry, item_id);
return false; return false;
} }
uint32 extCostId = std::abs(ExtendedCost); // negative exclude for vendor price money part if(ExtendedCost && !sItemExtendedCostStore.LookupEntry(ExtendedCost))
if(extCostId && !sItemExtendedCostStore.LookupEntry(extCostId))
{ {
if(pl) if(pl)
ChatHandler(pl).PSendSysMessage(LANG_EXTENDED_COST_NOT_EXIST,extCostId); ChatHandler(pl).PSendSysMessage(LANG_EXTENDED_COST_NOT_EXIST,ExtendedCost);
else else
sLog.outErrorDb("Table `npc_vendor` contain item (Entry: %u) with wrong ExtendedCost (%u) for vendor (%u), ignoring",item_id,extCostId,vendor_entry); sLog.outErrorDb("Table `npc_vendor` contain item (Entry: %u) with wrong ExtendedCost (%u) for vendor (%u), ignoring",
item_id, ExtendedCost, vendor_entry);
return false; return false;
} }
@ -8529,7 +8529,8 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
if(pl) if(pl)
ChatHandler(pl).PSendSysMessage("MaxCount!=0 (%u) but IncrTime==0", maxcount); ChatHandler(pl).PSendSysMessage("MaxCount!=0 (%u) but IncrTime==0", maxcount);
else else
sLog.outErrorDb( "Table `npc_vendor` has `maxcount` (%u) for item %u of vendor (Entry: %u) but `incrtime`=0, ignoring", maxcount, item_id, vendor_entry); sLog.outErrorDb( "Table `npc_vendor` has `maxcount` (%u) for item %u of vendor (Entry: %u) but `incrtime`=0, ignoring",
maxcount, item_id, vendor_entry);
return false; return false;
} }
else if(maxcount==0 && incrtime > 0) else if(maxcount==0 && incrtime > 0)
@ -8537,7 +8538,8 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
if(pl) if(pl)
ChatHandler(pl).PSendSysMessage("MaxCount==0 but IncrTime<>=0"); ChatHandler(pl).PSendSysMessage("MaxCount==0 but IncrTime<>=0");
else else
sLog.outErrorDb( "Table `npc_vendor` has `maxcount`=0 for item %u of vendor (Entry: %u) but `incrtime`<>0, ignoring", item_id, vendor_entry); sLog.outErrorDb( "Table `npc_vendor` has `maxcount`=0 for item %u of vendor (Entry: %u) but `incrtime`<>0, ignoring",
item_id, vendor_entry);
return false; return false;
} }

4
src/game/ObjectMgr.h
View file

@ -939,9 +939,9 @@ class ObjectMgr
return &iter->second; return &iter->second;
} }
void AddVendorItem(uint32 entry,uint32 item, uint32 maxcount, uint32 incrtime, int32 ExtendedCost); void AddVendorItem(uint32 entry,uint32 item, uint32 maxcount, uint32 incrtime, uint32 ExtendedCost);
bool RemoveVendorItem(uint32 entry,uint32 item); bool RemoveVendorItem(uint32 entry,uint32 item);
bool IsVendorItemValid( uint32 vendor_entry, uint32 item, uint32 maxcount, uint32 ptime, int32 ExtendedCost, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL ) const; bool IsVendorItemValid( uint32 vendor_entry, uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL ) const;
void LoadScriptNames(); void LoadScriptNames();
ScriptNameMap &GetScriptNames() { return m_scriptNames; } ScriptNameMap &GetScriptNames() { return m_scriptNames; }

8
src/game/Player.cpp
View file

@ -18539,7 +18539,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
return false; return false;
} }
if (uint32 extendedCostId = crItem->GetExtendedCostId()) if (uint32 extendedCostId = crItem->ExtendedCost)
{ {
ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId); ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId);
if (!iece) if (!iece)
@ -18581,7 +18581,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
} }
} }
uint32 price = crItem->IsExcludeMoneyPrice() ? 0 : pProto->BuyPrice * count; uint32 price = (crItem->ExtendedCost == 0 || pProto->Flags2 & ITEM_FLAGS2_EXT_COST_REQUIRES_GOLD) ? pProto->BuyPrice * count : 0;
// reputation discount // reputation discount
if (price) if (price)
@ -18604,7 +18604,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
} }
ModifyMoney( -(int32)price ); ModifyMoney( -(int32)price );
if (uint32 extendedCostId = crItem->GetExtendedCostId()) if (uint32 extendedCostId = crItem->ExtendedCost)
{ {
ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId); ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId);
if (iece->reqhonorpoints) if (iece->reqhonorpoints)
@ -18649,7 +18649,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
} }
ModifyMoney( -(int32)price ); ModifyMoney( -(int32)price );
if (uint32 extendedCostId = crItem->GetExtendedCostId()) if (uint32 extendedCostId = crItem->ExtendedCost)
{ {
ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId); ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId);
if (iece->reqhonorpoints) if (iece->reqhonorpoints)

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 "10206" #define REVISION_NR "10207"
#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_10160_02_characters_pet_aura" #define REVISION_DB_CHARACTERS "required_10160_02_characters_pet_aura"
#define REVISION_DB_MANGOS "required_10205_01_mangos_spell_area" #define REVISION_DB_MANGOS "required_10207_01_mangos_npc_vendor"
#define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
#endif // __REVISION_SQL_H__ #endif // __REVISION_SQL_H__