Commit Graph

27003 Commits

Author SHA1 Message Date
ariel-
b3ea9fbbe5 Map local guids 6.x -> 4.3.4
Ported the following commits:
ca83e14f8b
ee1c1b97be
18e4ab6911
bf37446b3c
cb854a2b7b
2016-01-11 01:50:45 -03:00
ariel-
694c89d76d Fix crash in StormLib 2016-01-11 01:50:41 -03:00
pete318
6d04b6ecc6 Improved Auction house deposit handling.
Including the weird quirks.

Changes:
* Deposit caculated according to same rule as client. (detailed below). Should always match client deposit now
* Deposit for multiple auctions now only collected once. Deferred calculation of deposit until all auctions listed.

Deposit calculation is as follows:

Base deposit calculation = MSV x 15/75% (depending on AH). However this is not rounded. Case to int is used (so always round down)
The remainder is held in a float.
The base is then multiplied by number of items, and the time multiplier (x2 for 24 hour, x4 for 48 hour)
The nearest (no of items or lower) no of items when multiplied by the remainder that creates a whole number is then multiplied by the time multiplier (x1/x2/x4) and then added to deposit.

Example:

Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 1 = 36c. Remainder = 0.75 (n) Min = 1s. Deposit 1s
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 2 = 72c. Remainder = 1.50 (n)  Min = 1s. Deposit 1s
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 3 = 108c. Remainder = 2.25 (n) Min = 1s. Deposit 1s08c
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 4 = 144c. Remainder = 3.00 (n) Min = 1s. Deposit 1s50c (144c + (3c * 2))

Horrible kludge, to re-create a very weird deposit method.

Closes #15674 (PR)
Closes #15643 (Issue)

(cherry picked from commit 0ac442f19f)

Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
2016-01-11 01:50:38 -03:00
pete318
c29fc4cbd9 Auction house changes:
- Stop storing guid for auctioneer.
 - Store instead house ID
 - No separate ID for various houses. Only Horde, Alliance and Neutral.
 - Removed non-needed faction checks.
 - Use enum for auction house IDs

NOTE: This will expire all current auctions and return item to player (or
award to high bidder) in order to prepare database for the changes.

(cherry-picked from commit 01ae5c4bf6)

Conflicts:
	sql/base/characters_database.sql
	src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
2016-01-11 01:50:35 -03:00
ariel-
7bd5dfe1b2 Update characters_database_conversor_335a_to_434.sql
- BLOB, TEXT, GEOMETRY or JSON column 'guids' can't have a default value
- Unknown column 'auctionhouse' in 'WHERE clause'
2016-01-11 01:50:31 -03:00
Aokromes
706b5625fe Merge branch 'findzmq' into '4.3.4'
Corrected issues with ZeroMQ and VS2015

Sync FindZMQ.cmake, also fix CMake unable to find ZeroMQ if Visual Studio 2015 is used.

See merge request !3
2016-01-10 21:51:09 +00:00
ariel-
5723f54a44 Sync FindZMQ.cmake, also fix CMake unable to find ZeroMQ if Visual Studio 2015 is used. 2016-01-09 10:06:23 -03:00
Aokromes
cabf159308 Merge branch 'free' into '4.3.4'
Replace missing delete data with dtFree

Ref: Mismatched free() / delete / delete []
 at 0x4C2A360: operator delete(void*) (vg_replace_malloc.c:507)
 by 0x21EF5B1: MMAP::MMapManager::UnloadPhaseTile(std::__detail::_Node_const_iterator<std::pair<unsigned int const, std::vector<unsigned int, std::allocator<unsigned int> > >, false, false>, int, int) (MMapManager.cpp:300)

See merge request !2
2016-01-07 22:57:52 +00:00
ariel
5bf4fd939b Replace missing delete data with dtFree
Ref: Mismatched free() / delete / delete []
 at 0x4C2A360: operator delete(void*) (vg_replace_malloc.c:507)
 by 0x21EF5B1: MMAP::MMapManager::UnloadPhaseTile(std::__detail::_Node_const_iterator<std::pair<unsigned int const, std::vector<unsigned int, std::allocator<unsigned int> > >, false, false>, int, int) (MMapManager.cpp:300)
2016-01-07 22:52:44 +00:00
Aokromes
6a4336034b DB/Misc: 3.3.5a fixes 2016-01-07 10:21:03 +01:00
Aokromes
8eb002e8ff DB/Misc: 3.3.5a fixes 2016-01-04 11:07:27 +01:00
Killyana
8062cbd11b DB/Creature: Add Cataclysm spawns on Silvermoon 2016-01-01 16:35:16 +01:00
Killyana
3e9acd8708 DB/Creature: Add Cataclysm Spawns on Ghostlands 2016-01-01 00:44:50 +01:00
Killyana
07ee3ba075 DB/Creature: Add missing spawns on Eversong Woods 2015-12-30 18:24:27 +01:00
Killyana
ebadc97c80 Rename file 2015-12-18 16:22:40 +01:00
Killyana
8813265de2 DB/Creature: Fix Baron Longshore faction 2015-12-18 16:20:33 +01:00
Aokromes
4be99a50e9 DB/Misc: 3.3.5a fixes 2015-12-18 09:53:29 +01:00
Killyana
c52a149bd3 DB/Creature: Add Wounded Outrunner spawn
Fix curhealth and health regen for Wounded Deathguard
2015-12-14 20:09:43 +01:00
Killyana
2f3229d0ac DB/Creature: Add missing training dummy on Eversong Woods for class quests 2015-12-14 18:33:46 +01:00
Aokromes
b2c0c0ac04 DB/Misc: 3.3.5a fixes 2015-11-29 13:48:31 +01:00
Killyana
2e85c71371 DB/Quests: Beyond the Graves
Fix credit for Recruitment and summoning Darnell for Beyond the Graves
2015-11-26 18:22:13 +01:00
Killyana
b8d7678cd9 DB/Misc: Fix visual issues in Deathknell 2015-11-25 20:52:58 +01:00
Aokromes
d4810088a5 DB/Misc: disable 3.3.5a fixes 2015-11-24 23:09:07 +01:00
Killyana
3cd2301128 Fix a typo 2015-11-24 17:46:44 +01:00
Killyana
3d39993803 DB: Fix some SAI errors 2015-11-24 17:40:53 +01:00
Killyana
139682a526 DB/quest: Fix credit quest for The Wakening 2015-11-24 17:25:31 +01:00
Aokromes
f68b99b9a6 DB/Misc: 3.3.5a db fixes 2015-11-24 16:48:13 +01:00
Killyana
ee9e2ec385 DB/Creature: Fix some wrong quest givers 2015-11-24 15:50:03 +01:00
Aokromes
c91c6fd183 DB/Misc: Fix incorrect commit 2015-11-19 23:12:54 +01:00
Aokromes
d309f11435 DB/Misc: Typo fix 2015-11-19 22:28:59 +01:00
Aokromes
c4229eece2 DB/Misc: Fix import 2015-11-19 22:14:00 +01:00
Aokromes
973e319bdc DB/Misc: 3.3.5a fixes 2015-11-18 11:32:59 +01:00
Aokromes
4f2e553f88 DB/Misc: fix 3.3.5a only commit 2015-11-11 01:31:53 +01:00
Aokromes
e7abb9dd54 DB/Misc: 3.3.5a fixes 2015-11-11 01:30:41 +01:00
Killyana
4f949a6297 DB/SAI: Update SAI for Briny Sea Cucumber
Fix gathering more than one item on the same npc
2015-11-04 16:41:25 +01:00
Aokromes
bf3edbc9dc DB/Misc: Travis fix 2015-11-02 15:57:15 +01:00
Aokromes
9a6e470bf8 DB/Misc: Spawns for highbank
By Malcrom
2015-11-02 15:52:45 +01:00
Aokromes
365935f5e9 DB/Misc: Twilight Highlands Area: 5140 Highbank Phase 361
By Malcrom
2015-11-02 15:46:54 +01:00
Aokromes
6829f89c30 DB/Misc: Hollows End Gameobject Spawns for highbank
By Malcrom
2015-11-02 15:44:39 +01:00
Aokromes
d9417a3d9f DB/Misc: Twilight Highlands Area: 5140 Highbank Phase 169
By Malcrom
2015-11-02 15:41:22 +01:00
Aokromes
03dc96b4c4 Core/Misc: Fix build 2015-11-01 20:02:41 +01:00
Aokromes
c58f540348 Core/Conditions: Phase condition changes
* SourceGroup defines which phase should the condition affect

* SourceEntry limits the area of the phase (alternatively 0 means all areas)
2015-11-01 19:11:52 +01:00
Aokromes
2a0df059f3 DB/Misc: AQ fixes
by Malcrom
2015-10-30 15:35:47 +01:00
Aokromes
630da1b60e DB/Misc: 3.3.5a Fixes 2015-10-30 15:30:37 +01:00
Aokromes
966aa44ff4 DB/Misc: 3.3.5a fixes 2015-10-18 11:32:45 +02:00
Aokromes
e3ea383237 DB/Misc: 3.3.5a Fixes 2015-10-14 10:25:01 +02:00
Aokromes
95618aa12a DB/Misc: Spawn Blackwing Descent 2015-10-02 00:51:43 +02:00
Aokromes
6ebca49afb DB/Misc: More Travis 2015-10-01 10:39:33 +02:00
Aokromes
412384b78a DB/Misc: More Travis 2015-10-01 10:29:43 +02:00
Aokromes
a0eb482902 DB/Misc: More travis fix 2015-10-01 10:04:41 +02:00