Commit Graph
28261 Commits
Author SHA1 Message Date
DDuarte 0d643fdff2 Build fix 2016-03-23 00:34:47 +00:00
pete318 28f51306d4 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 0ac442f19fcfa8c39775c5ae06bba8f3bcbd0407)

# Conflicts:
#	src/server/game/AuctionHouse/AuctionHouseMgr.h
2016-03-23 00:28:03 +00:00
DDuarte 9660848385 Scripts: Add override to CheckInRoom() definitions
Fixes -Winconsistent-missing-override

(cherry picked from commit ac727ab208e592c7a2d01ebe321944402860c3ae)
2016-03-22 23:42:16 +01:00
DDuarte cb7238e983 Core/Instances: Fix build in older VS versions
Relax const uses in BossBoundaryEntry so the compiler can generate proper
copy assignment operator (error C2582: 'operator =' function is unavailable in 'BossBoundaryEntry')

Also renamed its members to match our coding standards
(public members should be UpperCamelCase)

(cherry picked from commit 954323d9cb13d4ab3d478bcb51eeb157009d8853)
2016-03-22 23:41:10 +01:00
Killyana aad5eb01e3 DB/Creature: Fordragon Battle Steed
Closes #16295

(cherry picked from commit cdf7ac60965fb280461fc1db24ee4784c7336142)
2016-03-22 23:40:31 +01:00
treeston 5fb88c7121 Merge branch '3.3.5-boundaryagain' into 3.3.5-base (PR #16270)
(cherry picked from commit 1050b68899c661ea09da9e36edb82e8648393673)
2016-03-22 23:37:02 +01:00
Killyana 8911962c9e DB/SAI: Fix Coilfang Scale-Healer spamming 'Heal'
By @Treeston
Closes #16176

(cherry picked from commit 7f5805f30841697a67ff37163d08544a3f148414)
2016-03-22 23:24:28 +01:00
Killyana bc331bef41 DB/Crearure text: Upate AlgalonText Range
By @Treeston
Closes  #16170

(cherry picked from commit 8b30ee0e39ffac4b96fdb02855592eaebc69c229)
2016-03-22 23:20:45 +01:00
Killyana d89e8a202a DB/Creature: Remove duplicate spawn for Dreadfang Widow
By @Saben65
Closes #16140

(cherry picked from commit 3d9f997478cc95592c121675a2daabbb6074a551)
2016-03-22 23:16:53 +01:00
Kittnz aa3df4f7c7 DB/Creature: Update MovementType of Shadow of Thel'zan the Duskbringer
Closes #16304

(cherry picked from commit cb064601a8177c808a80fa72eadd6367432e0977)
2016-03-22 23:15:16 +01:00
Dr-J ef2521637f DB/Quest: Nether Gas In a Fel Fire Engine
Update https://github.com/TrinityCore/TrinityCore/commit/01beba21b5210860ddd6a37471c6b2bea77a369e to more reliabily complete quest to actually allow quest to be returned rather than just been marked as complete in quest log and on map but quest giver still showing grey ? ad grey continue button.
(cherry picked from commit 6d10b920718fdbaf526254d74d906733edcb561d)
2016-03-22 23:09:03 +01:00
Killyana 699ca8dd65 DB/Creature: Terrorclaw Reputation on kill reputation
By @Saben65
Closes #16212

(cherry picked from commit 696a66155b5c03daa6478f651bed949f5eca8b60)
2016-03-22 23:07:30 +01:00
Killyana c5f30751ef DB/Creature: Add Stealth Detection for Steamvaults Creatures
By @Saben65
Closes #16185

(cherry picked from commit bf71f51fba8902abb0588ccc6bf0f425c3604460)
2016-03-22 23:04:57 +01:00
Killyana 823a510aa2 DB/SAI: Add a despawn action for npcs involved on "From Their Corpses, Rise!"
Closes #16167

(cherry picked from commit 2e595543bbae1bf3987fa679eed79625d450dd51)
2016-03-22 23:03:42 +01:00
Killyana a902fd43ed DB/Creature: Spell Shade
Closes #15988

(cherry picked from commit 1e75569852d5a4c82b5c9ff5d761234967a9fc91)
2016-03-22 23:01:56 +01:00
Killyana 08ec7a9d18 DB/Gossip: Remove a npc text
By @Saben65
Closes #16214

(cherry picked from commit 34847ea44a48911c113cd3ee6faf5d42be81ad4f)
2016-03-22 23:00:52 +01:00
treeston 9a24c7175d Fix stuff™.
(cherry picked from commit 0316dff24530da83ef3466500ee8bd4e1af548ba)
2016-03-22 22:57:51 +01:00
treeston e2f2c70ba4 Merge branch '3.3.5-bossboundary' into 3.3.5-base (PR #16089)
(cherry picked from commit 5b8b8c653039ec2add0b3a66468abb85e6f35054)
2016-03-22 22:56:43 +01:00
Kittnz 78885769cb Merge pull request #16245 from sirikfoll/Turkinator
Core/Spells Implement SpellScript needed for Achievement The Turkinator
(cherry picked from commit 529899675ab3ef58c7c564bd17e0339bcbbddc23)
2016-03-22 22:13:31 +01:00
Shauren f6b60d461e Core/Quests: Fixed party accept quests
(cherry picked from commit 48940e292fdde1042f096cac507c2b1b54e8146b)
2016-03-22 22:10:12 +01:00
treeston a254bdff59 Merge remote-tracking branch 'tkrokli/gossip_accept_duel' into 3.3.5-base
(cherry picked from commit 90914518184061d06c7bfba0aebc4ac03b23104f)
2016-03-22 22:06:54 +01:00
Shauren f7624e7206 Core/Quests: Fixed quest sharing
Closes #12304
Closes #16183

(cherry picked from commit 3c3cde028cbcab64d463707e192fc333d8cadda0)
2016-03-22 22:00:06 +01:00
Killyana a09468ea52 DB: Game_tele to Emerald Dream
By @Helias
Closes #16131

(cherry picked from commit 614ae6cba93498bd153be6da79231c704d90b9ab)
2016-03-22 21:47:37 +01:00
Killyana 2ae4248179 DB/SAI: Fix the react state for Darkfallen Bloodbearer
Closes #16159

(cherry picked from commit 69d59885c459b6a8f12384c401784edfc18d6888)
2016-03-22 21:46:23 +01:00
Killyana 9b214db05b DB/SAI: Harvest Collector
Closes #16158

(cherry picked from commit 2668258fe227252fd337cb2d668a27b6a4a02eb8)
2016-03-22 21:44:13 +01:00
Killyana 87527e1fe3 DB/Creature: Fix The Crippler unit_flags
Closes #16148

(cherry picked from commit 419430987335906eef344678d49a5e653631d060)
2016-03-22 21:43:01 +01:00
Killyana cbb0e5ce66 DB/SAI: Fix Windroc Matriarch script and text
By @Saben65 and @velinath
Closes #16215

(cherry picked from commit 70868ceee781e6b73da6ec8de4e48ae8fe709242)
2016-03-22 21:41:38 +01:00
treeston dd3ac6eaa8 Fix a spawndist start-up warning.
(cherry picked from commit 91fa2154e892c1cc6d7769e39c50afce74c836fc)
2016-03-22 21:35:42 +01:00
Aokromes 01cccc1ed1 Rename 2016_03_21_10_world2016_01_09_00_world.sql to 2016_03_21_10_world_2016_01_09_00_world.sql 2016-03-22 20:30:54 +01:00
Killyana 5816960851 DB/Creature: Remove a wrong spawn
(cherry picked from commit 5d9370a0f755887d2fff13e4ce982bd52f00f77b)
2016-03-22 19:13:17 +01:00
Dr-J e4ddd96da0 DB/Misc: Sholazar Guardians (Updates)
1) Move the http://www.wowhead.com/spell=52214/rainspeaker-treasures-see-invisibility and http://www.wowhead.com/spell=50735/frenzyheart-chicken-see-invisibility to spell area instead of been cast and removed by quest giver on quest accept and return - this solves the issue of Gods Like Shiny Things, Appeasing the Great Rainstone , Flown the Coop! and Chicken Party not working properly (due to player not been able to see npcs) if player relogged or left zone while had quest uncompleted in log unles quest was abandoned and retaken
2) Someone had put non repeatable flags on some of the events for Guardians since I originally scripted these npcs which resulted in that once guardian and dug up one treasure or threw net at one chicken would not work again, all events on these npcs need to repeatable
(cherry picked from commit 4f2cd84625e36bb300317b724489e8aa0c2a22df)
2016-03-22 19:10:29 +01:00
Vincent-Michael 7cd0ddc529 Core: Fix non pch build 2016-03-22 10:04:55 +01:00
Aokromes 3a38bc6ff9 Core/AuctionHouse: Fix compile 2016-03-22 09:56:07 +01:00
Aokromes b9e090a4ae Core/AuctionHouse: Fix compile (Part 2) 2016-03-22 09:53:04 +01:00
Aokromes a82e9fe4d3 Core/AuctionHouse: Fix compile 2016-03-22 09:48:32 +01:00
Aokromes 674e00db06 DB/Misc: Fix import 2016-03-22 08:48:41 +01:00
Shauren fb8f66f936 Buildsystem: Removed unneeded FindZMQ script 2016-03-22 00:07:04 +01:00
jackpoz f837fc875a Merge pull request #15977 from tkrokli/landmine_knockback_achievement
Scripts/Spells: Mine Sweeper achievement

(cherry picked from commit e59b4324b8123fa2123a990cd2b907c39db1a42e)
2016-03-21 23:35:57 +01:00
Duarte Duarte af0da1dde1 Merge pull request #16101 from NathanHandley/3.3.5
Updated AuctionHouseSeller to have item class stack control
(cherry picked from commit bddf9ec6febc9a77308d074bd10db2ddec4b48d5)
2016-03-21 23:33:00 +01:00
treeston 68c3af4166 Merge remote-tracking branch 'velinath/sai-migrations-3' into 3.3.5-base
(cherry picked from commit 5084b17308c3441e1ca7f455aad17b4a3de2da72)
2016-03-21 23:22:03 +01:00
treeston 40ea130f5a Merge remote-tracking branch 'velinath/sai-migrations-2' into 3.3.5-base
(cherry picked from commit 1d9d03b2891b5481eff6541a8563599ccc60c48d)
2016-03-21 23:21:18 +01:00
treeston c9fdb6af59 Merge remote-tracking branch 'velinath/sai-migrations' into 3.3.5-base
(cherry picked from commit c7459327b2c8565e7cb101826f5059e3cf0628c4)
2016-03-21 23:20:26 +01:00
Treeston 8225fb09c2 Merge pull request #16156 from Treeston/3.3.5-instancerevive2
Game/Maps: Instance handling bug-fix follow-up
(cherry picked from commit ae4fcc3685079e1c24cd46545dae169d5be12046)
2016-03-21 22:41:02 +01:00
Treeston e6ab6b4b0b Merge pull request #16182 from velinath/sai-migrations
Core/Scripts: remove unused npc_taxi scripts
(cherry picked from commit 48d0fd276dad6bbf1de364f692243c78814efbfa)
2016-03-21 22:35:20 +01:00
joschiwald ee38d8b4a1 Merge pull request #16171 from velinath/sai-migrations
Core/Scripts/DB: move Gryphoneer Windbellow to SAI
(cherry picked from commit f377a5875cc320934573f5980cd99388ca45f7d3)
2016-03-21 22:18:29 +01:00
Dr-J 0fe4dddfa3 DB/Misc: Victorious Challenger
correct faction for http://www.wowhead.com/npc=30012/victorious-challenger

This npc should not be hostile unless spoken for via gosip to fight for quest
(cherry picked from commit 615906e51fc76de0a8ef1a625b50077757fbc48f)
2016-03-21 21:57:04 +01:00
treeston 0b9269cdad DB/Quests: Betrayal (12713) by @dr-j:
- Fix "Blight Fog" cast behavior
- Fix "Throw Blight Crystal" cast timing

(cherry picked from commit 19462efb4ef04d7b988ec55369dd10f00dd1e895)
2016-03-21 21:55:21 +01:00
treeston 4f6d25d616 DB/Creature: Correct Orbaz Bloodbane creature text (#16168)
(cherry picked from commit 3af1d9196784759bb69dd59ce26599afdfd277a0)
2016-03-21 21:55:05 +01:00
Killyana 3704452bd8 DB/SAI: Moving some scripts from waypoint_script to SAI
Closes #12727

(cherry picked from commit 10757e60f1fbd6ca026c955c7cf687cac1526b8f)
2016-03-21 21:54:48 +01:00
treeston d68b809f9b Merge remote-tracking branch 'tkrokli/move_wyrmrest_temple_taxi_to_sai' into 3.3.5
(cherry picked from commit e0ffc2921b71e8822ac267399c468f2b4a449745)
2016-03-21 21:46:04 +01:00