Commit Graph

18281 Commits

Author SHA1 Message Date
joschiwald f377a5875c Merge pull request #16171 from velinath/sai-migrations
Core/Scripts/DB: move Gryphoneer Windbellow to SAI
2016-01-04 00:32:10 +01:00
velinath caff65bdb1 Core/Scripts/DB: move Gryphoneer Windbellow to SAI 2016-01-03 18:30:47 -05:00
joschiwald 8a0bbc3869 Core/Spells: Fixed Enrage armor reduce part 2016-01-03 00:55:50 +01:00
joschiwald 35aed8902a Scripts/Taxi: addition to 660f7e72be 2016-01-02 23:57:56 +01:00
tkrokli b0da73fc5d Core/Scripts/DB: move Wyrmrest Temple taxi FP to SAI
Closes #15957

Move NPC gossip menu options from core script to DB SAI script
for the 3 local Flight Path NPCs in Wyrmrest Temple:

- 26443, Tariolstrasz (Steward of Wyrmrest Temple)
- 26949, Torastrasza (Majordomo to the Ruling Council)
- 27575, Lord Afrasastrasz (Commander of Wyrmrest Temple Defenses)

Additional positive effect: the NPCs are now using verified Blizzlike text in their gossip.

Extra credits:  @velinath for relevant background information in the issue,
@Helias & @ShinDarth for their excellent Keira2 web-based database editor.
2016-01-02 22:50:18 +01:00
treeston b6ed3d3fc2 Merge pull request #16126 from velinath/taxi-to-sai 2016-01-02 17:39:54 +01:00
Rushor 923a368ac7 Update copyright note for 2016 2016-01-01 12:02:33 +01:00
Treeston eb3dc8a4f0 Merge pull request #16110 from Treeston/3.3.5-instancerevive
Game/Maps: Clean up instance zone-in handling
2015-12-31 19:51:07 +01:00
treeston 43fa7d48a5 Game/Maps: Clean up instance handling.
- Rename Map::CanEnter to Map::CannotEnter. Return value changed from boolean (true means player can enter) to enum Map::EnterState (CAN_ENTER=0 means player can enter, any other value is a reason for deny).
- Move hack-y player error messages from within Map::CanEnter to the function calling CanEnter as appropriate (primarily WorldSession::HandleAreaTriggerOpcode).
- Modify WorldSession::HandleAreaTriggerOpcode to properly revive the player upon touching the portal leading to the instance they died in even if they are currently unable to zone in. Fixes and closes #15758.
- Modify Player::LoadFromDB to properly spawn players in the instance they logged off in if possible. Fixes and closes #15561.
- Modify permanent save behavior to be blizzlike: Players can always enter an instance they are saved to (assuming there are no map constraints against it), but get a homebind timer if the instance is already in use.
2015-12-31 01:02:07 +01:00
velinath be38235306 Adds William Kielor to SAI 2015-12-29 21:00:45 -05:00
Killyana 13e509a622 Script/Creature: Imprisoned Beryl Sorcerer
Add missing emote state
Move the credit quest on the 5th hit instead of the 7th one
2015-12-30 02:05:24 +01:00
Killyana 79c9af11b9 Creature/script: William Kielar
Fix Gossips used for taxi
Closes #16112
2015-12-29 19:23:02 +01:00
Vincent-Michael dbe854cd31 Core/Objects: Fix typo in 19cab2c508 2015-12-21 17:29:04 +01:00
Gacko 1f839b2434 Auth/Login: Rename config key usage
Related: 193dd505
2015-12-19 14:34:05 +01:00
Gacko 193dd505fa Config/AuthServer: Rename Wrong.Password.Login.Logging to WronPass.Logging and move to correct section. 2015-12-19 13:42:11 +01:00
Shauren 2f44bd9045 Merge pull request #16066 from Treeston/3.3.5-penance
Spells/Penance: Fix erroneous cooldown on misplaced hostile target
2015-12-19 13:22:12 +01:00
MitchesD 776103cfea Merge pull request #15995 from ShinDarth/mmr
Core/Arena: more arena configs
2015-12-19 11:46:32 +01:00
treeston 403ff21324 Spells/Penance: If hostile target is not in front, now fails in the initial cast rather than the triggered cast, thus not erroneously causing a cooldown. 2015-12-19 11:32:25 +01:00
Francesco Borzì 850a4468b4 Merge pull request #15956 from ShinDarth/questdef
Core/Quest: code style
2015-12-16 18:58:33 +01:00
jackpoz e6903fdffa Merge pull request #15852 from Golrag/icc_boss_aggro 2015-12-15 21:29:10 +01:00
rockz1152 60311e0aae Core/Player: Fixed Weapon Skillup on low level mobs
Closes #15998

Removed block for skill up on grey level mobs.
2015-12-15 14:47:59 -05:00
jackpoz b96704774b Merge pull request #15919 from Treeston/3.3.5-razuvious 2015-12-14 20:34:12 +01:00
treeston 54d583b0fb Scripts/Naxxramas: Instructor Razuvious rework:
- Fix missing yells
- Rearrange existing yells to match live
- Sniffed positions for adds
- Improve add respawn handling
- Make adds not fight the player for control (don't use their spells on their own etc.)
- Update adds' hotbar keys to match live (this will affect other creatures with nonsequential possess keys as well)
- Fix adds' movement when mind controlled, they no longer move automatically when right-clicking (this affects all mind-controlled creatures)
- Blizzlike timers
2015-12-14 20:11:57 +01:00
ShinDarth 3d1614b622 Core/Arena: create more arena configs
- made rating modifiers configurable
- made arena points rate configurable
2015-12-14 20:09:07 +01:00
pete318 0ac442f19f 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)
2015-12-14 19:54:58 +01:00
Vincent-Michael 54424aff30 Scripts/Pets: Fixed non pch build part 3 ... 2015-12-12 18:00:22 +01:00
Vincent-Michael 47d54ce859 Scripts/Pets: Fixed non pch build part 2 2015-12-12 17:56:03 +01:00
Vincent-Michael 677f281b9a Scripts/Pets: Fixed non pch build 2015-12-12 17:52:16 +01:00
jackpoz 263f127d07 Merge pull request #14896 from Ofinka/dupl 2015-12-12 17:43:35 +01:00
Shauren b3e718dcca Removed unneeded loop from previous commit, copypaste fail from 6.x 2015-12-12 00:06:59 +01:00
Shauren f72795240a Core/Creatures: Implemented automatic detection of trigger models, their order in creature_template no longer matters
(cherry picked from commit c488fb219a)
2015-12-11 23:51:04 +01:00
ShinDarth 4a532a71b6 Core/Quest: code style:
- Removed 11 useless for iterations (for each quest loaded)
2015-12-10 22:03:19 +01:00
jackpoz 80ed03a84d Merge pull request #15402 from chaodhib/taunt_player 2015-12-09 22:08:43 +01:00
Shauren cc685ac334 Core/Items: Fixed a possible crash with soulbound tradable items
Closes #15700

(cherry picked from commit 094f505e40)
2015-12-08 18:02:43 +01:00
jackpoz 187e45d24b Merge pull request #15910 from Treeston/3.3.5-maexxna 2015-12-08 12:40:04 +01:00
jackpoz 2cb54d5606 Core/Player: Fix crash related to vehicles
Fix assertion triggered when entering a vehicle while channelling a shared vision spell.
Fix #15953
2015-12-07 23:34:00 +01:00
jackpoz 5b8b32dac7 Core/Quest: Fix issues reported by static analysis 2015-12-07 20:55:33 +01:00
jackpoz 3267c90102 Core/Unit: Add Unit::KillSelf() overload
Add Unit::KillSelf() function as overload of Unit::Kill(this) . Use KillSelf() whenever the killer and the victim are the same to clearly state the Unit is going to kill itself.
2015-12-07 20:06:02 +01:00
jackpoz ee12982008 Merge pull request #15933 from Asterc/3.3.5
Core/Spells: Fix Misdirection exploit
2015-12-07 19:11:48 +01:00
jackpoz 1ddf44caf3 Core/Quest: Fix issues reported by static analysis 2015-12-07 18:31:53 +01:00
jackpoz bffaa92633 Core/Quest: Fix issues reported by static analysis 2015-12-06 22:43:15 +01:00
jackpoz f1f4005ad8 Core/Quest: Fix issues reported by static analysis 2015-12-06 21:37:58 +01:00
Killyana e60bbaa7d3 DB/Quest: Great Bear Spirit
Closes #15950
2015-12-06 20:04:13 +01:00
ShinDarth 03215a2eb7 Core/Spell: fixed possible exploit in Duel Reset script
- thanks @Runico for reporting it
2015-12-06 03:44:12 +01:00
MitchesD ab831507c6 Core/Conditions: extended CONDITION_NEAR_CREATURE, condition value 3 is now used to check for dead creature entries (0 - alive, 1 - dead)
* I used 0 for alive to avoid touching all conditions with this type

(cherry picked from commit cdb5bd3eb7)
2015-12-03 21:41:03 +01:00
Asterc f8f815dbc3 Correctly reset the redirected threat of the hunter's spell Misdirection in cases when it has RemoveMode AURA_REMOVE_BY_DEFAULT
Closes #15930
2015-12-02 19:30:12 -02:00
Shauren 94e4bddb90 Scripts/Icecrown Citadel: Professor Putricide - fixed Expunged Gas damage formula
Closes #6396
2015-12-01 19:27:17 +01:00
MitchesD 3b1f5f29c9 Merge pull request #15864 from tkrokli/hallowed_wands
Scripts/Spells: Hallow's End item Hallowed Wand
2015-12-01 15:05:15 +01:00
jackpoz c703e01471 Merge pull request #15920 from Treeston/3.3.5-MCHotkeyPos
Unit/PossessBar: Fix spell ordering on possess bar
2015-11-30 20:24:15 +01:00
treeston 5dd6163387 Scripts/Naxxramas: Maexxna cleanup:
- Improved Web Wrap target selection
- Added missing text
- Cleanup of web wrap positioning - two players will never be flung to the same position (25-man)
- Further improvement to web wrap spawn behavior - targetable web wrap now only spawns after the player has finished being flung to the respective position (blizzlike)
- Add additional web wrap positions (sniff)
2015-11-30 20:18:55 +01:00