aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-23DB/Misc: Remove ammoKillyana
closes #16313 by msoky
2016-03-23Build fixDDuarte
2016-03-23Improved Auction house deposit handling.pete318
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-22Scripts: Add override to CheckInRoom() definitionsDDuarte
Fixes -Winconsistent-missing-override (cherry picked from commit ac727ab208e592c7a2d01ebe321944402860c3ae)
2016-03-22Core/Instances: Fix build in older VS versionsDDuarte
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-22DB/Creature: Fordragon Battle SteedKillyana
Closes #16295 (cherry picked from commit cdf7ac60965fb280461fc1db24ee4784c7336142)
2016-03-22Merge branch '3.3.5-boundaryagain' into 3.3.5-base (PR #16270)treeston
(cherry picked from commit 1050b68899c661ea09da9e36edb82e8648393673)
2016-03-22DB/SAI: Fix Coilfang Scale-Healer spamming 'Heal'Killyana
By @Treeston Closes #16176 (cherry picked from commit 7f5805f30841697a67ff37163d08544a3f148414)
2016-03-22DB/Crearure text: Upate AlgalonText RangeKillyana
By @Treeston Closes #16170 (cherry picked from commit 8b30ee0e39ffac4b96fdb02855592eaebc69c229)
2016-03-22DB/Creature: Remove duplicate spawn for Dreadfang WidowKillyana
By @Saben65 Closes #16140 (cherry picked from commit 3d9f997478cc95592c121675a2daabbb6074a551)
2016-03-22DB/Creature: Update MovementType of Shadow of Thel'zan the DuskbringerKittnz
Closes #16304 (cherry picked from commit cb064601a8177c808a80fa72eadd6367432e0977)
2016-03-22DB/Quest: Nether Gas In a Fel Fire EngineDr-J
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-22DB/Creature: Terrorclaw Reputation on kill reputationKillyana
By @Saben65 Closes #16212 (cherry picked from commit 696a66155b5c03daa6478f651bed949f5eca8b60)
2016-03-22DB/Creature: Add Stealth Detection for Steamvaults CreaturesKillyana
By @Saben65 Closes #16185 (cherry picked from commit bf71f51fba8902abb0588ccc6bf0f425c3604460)
2016-03-22DB/SAI: Add a despawn action for npcs involved on "From Their Corpses, Rise!"Killyana
Closes #16167 (cherry picked from commit 2e595543bbae1bf3987fa679eed79625d450dd51)
2016-03-22DB/Creature: Spell ShadeKillyana
Closes #15988 (cherry picked from commit 1e75569852d5a4c82b5c9ff5d761234967a9fc91)
2016-03-22DB/Gossip: Remove a npc textKillyana
By @Saben65 Closes #16214 (cherry picked from commit 34847ea44a48911c113cd3ee6faf5d42be81ad4f)
2016-03-22Fix stuff™.treeston
(cherry picked from commit 0316dff24530da83ef3466500ee8bd4e1af548ba)
2016-03-22Merge branch '3.3.5-bossboundary' into 3.3.5-base (PR #16089)treeston
(cherry picked from commit 5b8b8c653039ec2add0b3a66468abb85e6f35054)
2016-03-22Merge pull request #16245 from sirikfoll/TurkinatorKittnz
Core/Spells Implement SpellScript needed for Achievement The Turkinator (cherry picked from commit 529899675ab3ef58c7c564bd17e0339bcbbddc23)
2016-03-22Core/Quests: Fixed party accept questsShauren
(cherry picked from commit 48940e292fdde1042f096cac507c2b1b54e8146b)
2016-03-22Merge remote-tracking branch 'tkrokli/gossip_accept_duel' into 3.3.5-basetreeston
(cherry picked from commit 90914518184061d06c7bfba0aebc4ac03b23104f)
2016-03-22Core/Quests: Fixed quest sharingShauren
Closes #12304 Closes #16183 (cherry picked from commit 3c3cde028cbcab64d463707e192fc333d8cadda0)
2016-03-22DB: Game_tele to Emerald DreamKillyana
By @Helias Closes #16131 (cherry picked from commit 614ae6cba93498bd153be6da79231c704d90b9ab)
2016-03-22DB/SAI: Fix the react state for Darkfallen BloodbearerKillyana
Closes #16159 (cherry picked from commit 69d59885c459b6a8f12384c401784edfc18d6888)
2016-03-22DB/SAI: Harvest CollectorKillyana
Closes #16158 (cherry picked from commit 2668258fe227252fd337cb2d668a27b6a4a02eb8)
2016-03-22DB/Creature: Fix The Crippler unit_flagsKillyana
Closes #16148 (cherry picked from commit 419430987335906eef344678d49a5e653631d060)
2016-03-22DB/SAI: Fix Windroc Matriarch script and textKillyana
By @Saben65 and @velinath Closes #16215 (cherry picked from commit 70868ceee781e6b73da6ec8de4e48ae8fe709242)
2016-03-22Fix a spawndist start-up warning.treeston
(cherry picked from commit 91fa2154e892c1cc6d7769e39c50afce74c836fc)
2016-03-22Rename 2016_03_21_10_world2016_01_09_00_world.sql to ↵Aokromes
2016_03_21_10_world_2016_01_09_00_world.sql
2016-03-22DB/Creature: Remove a wrong spawnKillyana
(cherry picked from commit 5d9370a0f755887d2fff13e4ce982bd52f00f77b)
2016-03-22DB/Misc: Sholazar Guardians (Updates)Dr-J
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-22Core: Fix non pch buildVincent-Michael
2016-03-22Core/AuctionHouse: Fix compileAokromes
2016-03-22Core/AuctionHouse: Fix compile (Part 2)Aokromes
2016-03-22Core/AuctionHouse: Fix compileAokromes
2016-03-22DB/Misc: Fix importAokromes
2016-03-22Buildsystem: Removed unneeded FindZMQ scriptShauren
2016-03-21Merge pull request #15977 from tkrokli/landmine_knockback_achievementjackpoz
Scripts/Spells: Mine Sweeper achievement (cherry picked from commit e59b4324b8123fa2123a990cd2b907c39db1a42e)
2016-03-21Merge pull request #16101 from NathanHandley/3.3.5Duarte Duarte
Updated AuctionHouseSeller to have item class stack control (cherry picked from commit bddf9ec6febc9a77308d074bd10db2ddec4b48d5)
2016-03-21Merge remote-tracking branch 'velinath/sai-migrations-3' into 3.3.5-basetreeston
(cherry picked from commit 5084b17308c3441e1ca7f455aad17b4a3de2da72)
2016-03-21Merge remote-tracking branch 'velinath/sai-migrations-2' into 3.3.5-basetreeston
(cherry picked from commit 1d9d03b2891b5481eff6541a8563599ccc60c48d)
2016-03-21Merge remote-tracking branch 'velinath/sai-migrations' into 3.3.5-basetreeston
(cherry picked from commit c7459327b2c8565e7cb101826f5059e3cf0628c4)
2016-03-21Merge pull request #16156 from Treeston/3.3.5-instancerevive2Treeston
Game/Maps: Instance handling bug-fix follow-up (cherry picked from commit ae4fcc3685079e1c24cd46545dae169d5be12046)
2016-03-21Merge pull request #16182 from velinath/sai-migrationsTreeston
Core/Scripts: remove unused npc_taxi scripts (cherry picked from commit 48d0fd276dad6bbf1de364f692243c78814efbfa)
2016-03-21Merge pull request #16171 from velinath/sai-migrationsjoschiwald
Core/Scripts/DB: move Gryphoneer Windbellow to SAI (cherry picked from commit f377a5875cc320934573f5980cd99388ca45f7d3)
2016-03-21DB/Misc: Victorious ChallengerDr-J
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-21DB/Quests: Betrayal (12713) by @dr-j:treeston
- Fix "Blight Fog" cast behavior - Fix "Throw Blight Crystal" cast timing (cherry picked from commit 19462efb4ef04d7b988ec55369dd10f00dd1e895)
2016-03-21DB/Creature: Correct Orbaz Bloodbane creature text (#16168)treeston
(cherry picked from commit 3af1d9196784759bb69dd59ce26599afdfd277a0)
2016-03-21DB/SAI: Moving some scripts from waypoint_script to SAIKillyana
Closes #12727 (cherry picked from commit 10757e60f1fbd6ca026c955c7cf687cac1526b8f)