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

[12143] Fix extendedCost

Browse source 
Signed-off-by: Yaki Khadafi <elsoldollo@gmail.com>
This commit is contained in:
Yaki Khadafi 2012-08-29 17:54:55 +03:00 • committed by Antz
parent 0c8d8c67d8
commit 796068fc13
4 changed files with 91 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/game/DB2Structure.h
View file

@ -50,11 +50,21 @@ struct ItemCurrencyCostEntry
#define MAX_EXTENDED_COST_ITEMS 5 #define MAX_EXTENDED_COST_ITEMS 5
#define MAX_EXTENDED_COST_CURRENCIES 5 #define MAX_EXTENDED_COST_CURRENCIES 5
enum ItemExtendedCostFlags
{
ITEM_EXTENDED_COST_FLAG_UNK = 0x01, // guild related
ITEM_EXTENDED_COST_FLAG_SEASON_IN_INDEX_0 = 0x02, // currency requirements under these indexes require season count
ITEM_EXTENDED_COST_FLAG_SEASON_IN_INDEX_1 = 0x04,
ITEM_EXTENDED_COST_FLAG_SEASON_IN_INDEX_2 = 0x08,
ITEM_EXTENDED_COST_FLAG_SEASON_IN_INDEX_3 = 0x10,
ITEM_EXTENDED_COST_FLAG_SEASON_IN_INDEX_4 = 0x20,
};
struct ItemExtendedCostEntry struct ItemExtendedCostEntry
{ {
uint32 Id; // 0 uint32 Id; // 0
uint32 reqhonorpoints; // 1 m_honorPoints // // 1 unk, old reqhonorpoints
uint32 reqarenapoints; // 2 m_arenaPoints // // 2 unk, old reqarenapoints
uint32 reqarenaslot; // 3 m_arenaBracket uint32 reqarenaslot; // 3 m_arenaBracket
uint32 reqitem[MAX_EXTENDED_COST_ITEMS]; // 5-8 m_itemID uint32 reqitem[MAX_EXTENDED_COST_ITEMS]; // 5-8 m_itemID
uint32 reqitemcount[MAX_EXTENDED_COST_ITEMS]; // 9-13 m_itemCount uint32 reqitemcount[MAX_EXTENDED_COST_ITEMS]; // 9-13 m_itemCount
@ -62,7 +72,19 @@ struct ItemExtendedCostEntry
//uint32 // 15 m_itemPurchaseGroup //uint32 // 15 m_itemPurchaseGroup
uint32 reqcur[MAX_EXTENDED_COST_CURRENCIES]; // 16-20 uint32 reqcur[MAX_EXTENDED_COST_CURRENCIES]; // 16-20
uint32 reqcurrcount[MAX_EXTENDED_COST_CURRENCIES]; // 21-25 uint32 reqcurrcount[MAX_EXTENDED_COST_CURRENCIES]; // 21-25
//uint32 something[5]; // 26-30 // 26 reputation-related
// 27 reputation-related
uint32 flags; // 28
// // 29
// // 30
bool IsSeasonCurrencyRequirement(uint32 i) const
{
MANGOS_ASSERT(i < MAX_EXTENDED_COST_CURRENCIES);
// start from ITEM_EXTENDED_COST_FLAG_SEASON_IN_INDEX_0
return flags & 1 << (i + 1);
}
}; };
#endif #endif

2
src/game/DB2fmt.h
View file

@ -21,6 +21,6 @@
const char Itemfmt[]="niiiiiii"; const char Itemfmt[]="niiiiiii";
const char ItemCurrencyCostfmt[]="di"; const char ItemCurrencyCostfmt[]="di";
const char ItemExtendedCostEntryfmt[]="niiiiiiiiiiiiiixiiiiiiiiiixxxxx"; const char ItemExtendedCostEntryfmt[]="nxxiiiiiiiiiiiixiiiiiiiiiixxixx";
#endif #endif

94
src/game/Player.cpp
View file

@ -18966,16 +18966,27 @@ void Player::TakeExtendedCost(uint32 extendedCostId, uint32 count)
{ {
ItemExtendedCostEntry const* extendedCost = sItemExtendedCostStore.LookupEntry(extendedCostId); ItemExtendedCostEntry const* extendedCost = sItemExtendedCostStore.LookupEntry(extendedCostId);
//if (extendedCost->reqhonorpoints)
// ModifyHonorPoints(-int32(extendedCost->reqhonorpoints * count));
//if (extendedCost->reqarenapoints)
// ModifyArenaPoints(-int32(extendedCost->reqarenapoints * count));
for (uint8 i = 0; i < MAX_EXTENDED_COST_ITEMS; ++i) for (uint8 i = 0; i < MAX_EXTENDED_COST_ITEMS; ++i)
{ {
if (extendedCost->reqitem[i]) if (extendedCost->reqitem[i])
DestroyItemCount(extendedCost->reqitem[i], extendedCost->reqitemcount[i] * count, true); DestroyItemCount(extendedCost->reqitem[i], extendedCost->reqitemcount[i] * count, true);
} }
for (int i = 0; i < MAX_EXTENDED_COST_CURRENCIES; ++i)
{
if (extendedCost->reqcur[i] == CURRENCY_NONE)
continue;
if (extendedCost->IsSeasonCurrencyRequirement(i))
continue;
CurrencyTypesEntry const * entry = sCurrencyTypesStore.LookupEntry(extendedCost->reqcur[i]);
if (!entry)
continue;
int32 cost = int32(extendedCost->reqcurrcount[i] * count);
ModifyCurrencyCount(entry->ID, -cost);
}
} }
// 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
@ -19070,20 +19081,6 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot, uin
return false; return false;
} }
// honor points price
//if (GetHonorPoints() < (iece->reqhonorpoints * count))
//{
// SendEquipError(EQUIP_ERR_NOT_ENOUGH_HONOR_POINTS, NULL, NULL);
// return false;
//}
// arena points price
//if (GetArenaPoints() < (iece->reqarenapoints * count))
//{
// SendEquipError(EQUIP_ERR_NOT_ENOUGH_ARENA_POINTS, NULL, NULL);
// return false;
//}
// item base price // item base price
for (uint8 i = 0; i < MAX_EXTENDED_COST_ITEMS; ++i) for (uint8 i = 0; i < MAX_EXTENDED_COST_ITEMS; ++i)
{ {
@ -19094,6 +19091,29 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot, uin
} }
} }
// currency price
for (uint8 i = 0; i < MAX_EXTENDED_COST_CURRENCIES; ++i)
{
if (iece->reqcur[i] == CURRENCY_NONE)
continue;
CurrencyTypesEntry const * costCurrency = sCurrencyTypesStore.LookupEntry(iece->reqcur[i]);
if (!costCurrency)
{
sLog.outError("Item %u has ExtendedCost %u with unexistent currency id %u", pProto->ItemId, extendedCostId, iece->reqcur[i]);
continue;
}
int32 cost = int32(iece->reqcurrcount[i] * count);
bool hasCount = iece->IsSeasonCurrencyRequirement(i) ? HasCurrencySeasonCount(iece->reqcur[i], cost) : HasCurrencyCount(iece->reqcur[i], cost);
if (!hasCount)
{
SendEquipError(EQUIP_ERR_VENDOR_MISSING_TURNINS, NULL);
return false;
}
}
// check for personal arena rating requirement // check for personal arena rating requirement
if (GetMaxPersonalArenaRatingRequirement(iece->reqarenaslot) < iece->reqpersonalarenarating) if (GetMaxPersonalArenaRatingRequirement(iece->reqarenaslot) < iece->reqpersonalarenarating)
{ {
@ -19239,20 +19259,6 @@ bool Player::BuyCurrencyFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot,
return false; return false;
} }
// honor points price
//if (GetHonorPoints() < (iece->reqhonorpoints * count))
//{
// SendEquipError(EQUIP_ERR_NOT_ENOUGH_HONOR_POINTS, NULL, NULL);
// return false;
//}
// arena points price
//if (GetArenaPoints() < (iece->reqarenapoints * count))
//{
// SendEquipError(EQUIP_ERR_NOT_ENOUGH_ARENA_POINTS, NULL, NULL);
// return false;
//}
// item base price // item base price
for (uint8 i = 0; i < MAX_EXTENDED_COST_ITEMS; ++i) for (uint8 i = 0; i < MAX_EXTENDED_COST_ITEMS; ++i)
{ {
@ -19263,6 +19269,28 @@ bool Player::BuyCurrencyFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot,
} }
} }
// currency price
for (uint8 i = 0; i < MAX_EXTENDED_COST_CURRENCIES; ++i)
{
if (iece->reqcur[i] == CURRENCY_NONE)
continue;
CurrencyTypesEntry const * costCurrency = sCurrencyTypesStore.LookupEntry(iece->reqcur[i]);
if (!costCurrency)
{
sLog.outError("Currency %u has ExtendedCost %u with unexistent currency id %u", currencyId, extendedCostId, iece->reqcur[i]);
continue;
}
int32 cost = int32(iece->reqcurrcount[i] * count);
bool hasCount = iece->IsSeasonCurrencyRequirement(i) ? HasCurrencySeasonCount(iece->reqcur[i], cost) : HasCurrencyCount(iece->reqcur[i], cost);
if (!hasCount)
{
SendEquipError(EQUIP_ERR_VENDOR_MISSING_TURNINS, NULL);
return false;
}
}
// check for personal arena rating requirement // check for personal arena rating requirement
if (GetMaxPersonalArenaRatingRequirement(iece->reqarenaslot) < iece->reqpersonalarenarating) if (GetMaxPersonalArenaRatingRequirement(iece->reqarenaslot) < iece->reqpersonalarenarating)
{ {

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 "12142" #define REVISION_NR "12143"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__