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

Merge remote branch 'origin/master' into 335

Browse source
This commit is contained in:
VladimirMangos 2010-06-28 21:15:58 +04:00
commit dcc7eed106
5 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/game/AuctionHouseMgr.cpp
View file

@ -68,9 +68,16 @@ AuctionHouseObject * AuctionHouseMgr::GetAuctionsMap( uint32 factionTemplateId )
uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item *pItem) uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item *pItem)
{ {
uint32 deposit = pItem->GetProto()->SellPrice * pItem->GetCount() * (time / MIN_AUCTION_TIME ); float deposit = float(pItem->GetProto()->SellPrice * pItem->GetCount() * (time / MIN_AUCTION_TIME ));
return uint32(deposit * entry->depositPercent * 3 * sWorld.getConfig(CONFIG_FLOAT_RATE_AUCTION_DEPOSIT) / 100.0f ); deposit = deposit * entry->depositPercent * 3.0f / 100.0f;
float min_deposit = float(sWorld.getConfig(CONFIG_UINT32_AUCTION_DEPOSIT_MIN));
if (deposit < min_deposit)
deposit = min_deposit;
return uint32(deposit * sWorld.getConfig(CONFIG_FLOAT_RATE_AUCTION_DEPOSIT));
} }
//does not clear ram //does not clear ram

1
src/game/World.cpp
View file

@ -485,6 +485,7 @@ void World::LoadConfigSettings(bool reload)
setConfigPos(CONFIG_FLOAT_RATE_AUCTION_TIME, "Rate.Auction.Time", 1.0f); setConfigPos(CONFIG_FLOAT_RATE_AUCTION_TIME, "Rate.Auction.Time", 1.0f);
setConfig(CONFIG_FLOAT_RATE_AUCTION_DEPOSIT, "Rate.Auction.Deposit", 1.0f); setConfig(CONFIG_FLOAT_RATE_AUCTION_DEPOSIT, "Rate.Auction.Deposit", 1.0f);
setConfig(CONFIG_FLOAT_RATE_AUCTION_CUT, "Rate.Auction.Cut", 1.0f); setConfig(CONFIG_FLOAT_RATE_AUCTION_CUT, "Rate.Auction.Cut", 1.0f);
setConfigPos(CONFIG_UINT32_AUCTION_DEPOSIT_MIN, "Auction.Deposit.Min", 0);
setConfig(CONFIG_FLOAT_RATE_HONOR, "Rate.Honor",1.0f); setConfig(CONFIG_FLOAT_RATE_HONOR, "Rate.Honor",1.0f);
setConfigPos(CONFIG_FLOAT_RATE_MINING_AMOUNT, "Rate.Mining.Amount", 1.0f); setConfigPos(CONFIG_FLOAT_RATE_MINING_AMOUNT, "Rate.Mining.Amount", 1.0f);
setConfigPos(CONFIG_FLOAT_RATE_MINING_NEXT, "Rate.Mining.Next", 1.0f); setConfigPos(CONFIG_FLOAT_RATE_MINING_NEXT, "Rate.Mining.Next", 1.0f);

1
src/game/World.h
View file

@ -129,6 +129,7 @@ enum eConfigUInt32Values
CONFIG_UINT32_GROUP_VISIBILITY, CONFIG_UINT32_GROUP_VISIBILITY,
CONFIG_UINT32_MAIL_DELIVERY_DELAY, CONFIG_UINT32_MAIL_DELIVERY_DELAY,
CONFIG_UINT32_UPTIME_UPDATE, CONFIG_UINT32_UPTIME_UPDATE,
CONFIG_UINT32_AUCTION_DEPOSIT_MIN,
CONFIG_UINT32_SKILL_CHANCE_ORANGE, CONFIG_UINT32_SKILL_CHANCE_ORANGE,
CONFIG_UINT32_SKILL_CHANCE_YELLOW, CONFIG_UINT32_SKILL_CHANCE_YELLOW,
CONFIG_UINT32_SKILL_CHANCE_GREEN, CONFIG_UINT32_SKILL_CHANCE_GREEN,

5
src/mangosd/mangosd.conf.dist.in
View file

@ -1163,6 +1163,10 @@ Visibility.Distance.Grey.Object = 10
# Rate.Auction.Cut # Rate.Auction.Cut
# Auction rates (auction time, deposit get at auction start, auction cut from price at auction end) # Auction rates (auction time, deposit get at auction start, auction cut from price at auction end)
# #
# Auction.Deposit.Min
# Mininumum auction deposit size in copper
# Default: 0
#
# Rate.Honor # Rate.Honor
# Honor gain rate # Honor gain rate
# #
@ -1274,6 +1278,7 @@ Rate.Damage.Fall = 1
Rate.Auction.Time = 1 Rate.Auction.Time = 1
Rate.Auction.Deposit = 1 Rate.Auction.Deposit = 1
Rate.Auction.Cut = 1 Rate.Auction.Cut = 1
Auction.Deposit.Min = 0
Rate.Honor = 1 Rate.Honor = 1
Rate.Mining.Amount = 1 Rate.Mining.Amount = 1
Rate.Mining.Next = 1 Rate.Mining.Next = 1

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 "10116" #define REVISION_NR "10117"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__