Commit Graph
4622 Commits
Author SHA1 Message Date
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 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
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
treeston 94b7e562e2 Merge pull request #16126 from velinath/taxi-to-sai
(partially cherry picked from commit b6ed3d3fc2b8447059ff0aa0e5b6de36947fd006)
2016-03-21 21:29:53 +01:00
jackpoz 96ca739a0b Merge pull request #14896 from Ofinka/dupl
(cherry picked from commit 263f127d075d56be8fd19ef36871bf245bc4bdcc)
2016-03-21 19:04:39 +01:00
joschiwald 77e32e3af5 Scripts: Added combat abilities to trash mobs in Ruby Sanctum
Thx @sirikfoll

SAI by @Keader

Closes #16703

(cherry picked from commit ef7a91d1938becb53fc9201275f0b5f02248765c)
2016-03-20 22:23:40 +01:00
Naios 28d8f7f70d CMake: Use inherited dependencies in scripts
* Removes the circular dependency between game <-> scripts

(cherry picked from commit 96bc31924a5a418d37bd961ef2880f9072126348)
2016-03-19 23:19:54 +01:00
Shauren d47f23ef7c Merge pull request #16404 from Lopfest/6.x
Core/Scripts: SMSG_PLAY_ONE_SHOT_ANIM_KIT can now be used in waypoint_scripts
2016-03-08 08:25:58 +01:00
Naios e40371909c Core/Scripts: Prepare commands once
* Thanks @joschiwald for pointing this out

(cherry picked from commit eee75b80ac8c44c226b950f40babf89942e8988d)
2016-02-24 23:30:04 +01:00
Naios 346b9c1534 Core/Scripts: Remove the npc_netherweb_victim script which is handled through sai now
* Ref 546c8a5b8ead9d198

(cherry picked from commit ecd74a8cccc1a28750a83d71624dc8bc32e0d965)
2016-02-22 16:58:02 +01:00
Naios 5534915f74 Core/Scripts: Split the huge scriptloader into smaller pieces
* Each subdirectory contains it's own translation unit now
  which is responsible for loading it's directory
* Improves merging & decoupling between 3.3.5 <-> 6.x
* Removes unused Battleground loader
* Ref #15671
2016-02-21 15:36:41 +01:00
Lopfest facdc62b43 Merge remote-tracking branch 'upstream/6.x' into HEAD 2016-02-20 23:59:56 +01:00
w5860363 019d15591c Scripts/TheEye: Add spell Rend to advisor Thaladred the Darkener
Closes #16594
Closes #15915

(cherry picked from commit e28cc7161af3929d7aa066b409dfe446705444b5)
2016-02-13 11:43:29 -02:00
Nyeriah 781152a30c Scripts: Fix no-PCH build MKII
Bah
2016-02-10 04:00:28 -02:00
Nyeriah b8445bbc20 Scripts: Fix no-PCH
(cherry picked from commit 130f744c297008ed8b6f6536186513091f8f81fb)
2016-02-10 03:21:49 -02:00
Nyeriah c559a4762d Scripts/Magister's Terrace: Script Kalecgos' appearance after using the Scryer's Orb
- Added missing waypoints, spells, emotes, proper timing... and prevent him from being summoned multiple times
Closes #13208, #16522
(cherry picked from 6a56ede1796b25cb66facc289e75cc0deceabfdd)
2016-02-10 03:10:35 -02:00
joschiwald 3ac2ba721d Core/Gossips: added some sanity checks to prevent duplicate interaction
(cherry picked from commit 8b6954e81b76f8d7c6700eaf1a8b942bebaa85a0)

Scripts: addition to 8b6954e81b76f8d7c6700eaf1a8b942bebaa85a0

Closes #16466

(cherry picked from commit b259d5c2bc41a545aad978c286f21347c0ba51a2)
2016-02-06 18:16:11 +01:00
Shauren db0b8bf24e Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing)
Note: Extracting maps is required
2016-02-02 19:13:04 +01:00
Shauren 8bc3f5545e Merge pull request #16378 from Zedron/6.x
Core/Spells: Fixed a possible crash in spell_pal_light_s_beacon
2016-01-27 21:54:47 +01:00
Boomper 3f503cd1d1 Core/Spells: Fixed Heroic Leap
Closes #14807
Closes #14134
2016-01-27 21:53:05 +01:00
Lopfest 54ab2e0bdb Core/Scripts: SMSG_PLAY_ONE_SHOT_ANIM_KIT corrections. Thx to Arci 2016-01-26 18:58:02 +01:00
Zedron 4b4237174f Core/Spells: Fixed a possible crash in spell_pal_light_s_beacon 2016-01-24 17:09:02 -06:00
myran2 2652d700e1 Core/Spells: Updated combo point handing
Closes #15996
2016-01-22 20:27:48 +01:00
jackpoz 8f13fe9c3b Scripts/ICC: Fix static analysis issue
Fix an issue reported by static analysis

(cherry picked from commit 4191bb868a33288a18079494aff6b52df19dc5b4)
2016-01-20 22:01:17 +01:00
jackpoz 8f91df0465 Scripts/Commands: Modify ".setskill" command to target current Player by default
(cherry picked from commit e138e094a937139aef7a2f265fff2f64b17ffa7f)
2016-01-20 21:59:49 +01:00
Francesco Borzì 6c3f2b9d9b Merge pull request #16208 from ShinDarth/putricide-fix
[3.3.5] Scripts/ICC: Fixed Professor Putricide
(cherry picked from commit 3e42d83e9cb86695a0467726f327599ff354293f)
2016-01-20 21:56:55 +01:00
jackpoz e7f7ffa73f Scripts/Commands: Modify ".learn" command to target current Player by default
(cherry picked from commit f22b1938db5cddcb2a9988ff54dfa08d2fa1aecc)
2016-01-20 21:28:17 +01:00
Killyana a56f92e889 Script/Creature: Imprisoned Beryl Sorcerer
Add missing emote state
Move the credit quest on the 5th hit instead of the 7th one

(cherry picked from commit 13e509a622a6d88afe27d6cdda4cf9f402818745)
2016-01-17 14:04:51 +01:00
Killyana 6e4948a498 Creature/script: William Kielar
Fix Gossips used for taxi
Closes #16112

(cherry picked from commit 79c9af11b9a90b051ecc26b0a60e879e3d9c4134)
2016-01-17 13:58:15 +01:00
joschiwald 09adf4d0ad Scripts/Spells: fixed Beacon of Light
# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Entities/Unit/Unit.h
#	src/server/scripts/Spells/spell_paladin.cpp
2016-01-17 01:52:22 +01:00
treeston e1fae18417 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.
(cherry picked from commit 403ff2132490c7e785bb0ae5373d2c7a34d73e14)
2016-01-16 13:16:57 +01:00
Golrag 6e832dd92b Scripts/ICC: * Bosses now enter when in aggro range.
* Removed some of the MoveInLineOfSight calls
* Added more AreaTriggerScripts

(cherry picked from commit ce90e30a80a742640396a04a767e767c6518a0a5)
2016-01-16 12:58:22 +01:00
treeston 8d428e4b6b 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

(cherry picked from commit 54d583b0fbb7ecfb97a731be21218bbb72d80b4d)

# Conflicts:
#	src/server/game/Spells/SpellMgr.cpp
2016-01-16 12:26:13 +01:00
treeston d3ea8c5750 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)

(cherry picked from commit 5dd61633872fc40d83dfa13aa58a1c7de717c012)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
2016-01-15 21:09:46 +01:00
jackpoz 2f1bd93c9e 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.

(cherry picked from commit 3267c90102068ed88c0bd7146ae747fe8ba44771)

# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScript.cpp
2016-01-15 20:34:27 +01:00
Asterc a0719b75f3 Correctly reset the redirected threat of the hunter's spell Misdirection in cases when it has RemoveMode AURA_REMOVE_BY_DEFAULT
Closes #15930

(cherry picked from commit f8f815dbc3a9ba7ab7fd0700722e4c589e88edff)
2016-01-15 20:33:34 +01:00
jackpoz 3f0026d8e7 Core/Quest: Fix issues reported by static analysis
(cherry picked from commit 1ddf44caf3b0c9af2cc4169b608f1801c2f6f52a)

# Conflicts:
#	src/server/game/Quests/QuestDef.cpp
#	src/server/game/Server/WorldSession.cpp
2016-01-15 20:32:56 +01:00
jackpoz 700899e0e5 Core/Quest: Fix issues reported by static analysis
(cherry picked from commit f1f4005ad8a17ea5fdd2b66f8ed3d0bd7c4c1efb)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Entities/Unit/Unit.h
#	src/server/game/Handlers/GroupHandler.cpp
2016-01-15 20:27:04 +01:00
DevRival 93952b77e2 Scripts/Spells: Hallow's End item Hallowed Wand
Hallowed Wand items should cast a transformation on party members.

by @DevRival, closes  #3574

Before this patch, the following spells do not have any effect at all:
- 24717, Pirate Costume
- 24718, Ninja Costume
- 24719, Leper Gnome Costume
- 24720, Random Costume
- 24737, Ghost Costume

Details from testing on the current 3.3.5 branch (commit ecbbcc8):
- 24724 (Skeleton Costume) seems to work as intended
- 24733 (Bat Costume) only lasts 10 seconds instead of 60 minutes
- 24741 (Wisp Costume) also seems to work as intended

All the spells listed above are included in this PR.

(cherry picked from commit 3fdbcf18ae2eeb7a965a9b2dc4b7e22796aaceae)
2016-01-15 20:06:01 +01:00
MitchesD 43d5d118b2 Core/Misc: fix warning and misc codestyle fixes
(cherry picked from commit 3b90b0368a019d47911062da6257555e88d17fda)
2016-01-15 19:57:34 +01:00
treeston bac8c4376f Scripts/Naxxramas: Thaddius follow-up:
- Reduce initial spawn timer on the encounter from 30 seconds to 5 seconds
- Rearrange respawn logic to fix the "petrified" visual from not showing properly
- Fix a potential infinite respawn loop that could prevent the encounter from initializing properly (fixes and closes #15898)

(cherry picked from commit bf9963039906f4b4df218ecc1818f5b01bcc714d)
2016-01-15 19:54:49 +01:00
Carbenium 0b0b014fad Script/Naxxramas: Fix a -Winconsistent-missing-override warning reported by clang 3.6
(cherry picked from commit f01ef901efab7f5b705948880c79eaf23061791e)
2016-01-15 19:45:24 +01:00
tkrokli b1a5b9ac75 Scripts/Thaddius: Coverity scan Control flow issues (MISSING_BREAK)
Coverity scan defects CID 1339315, 1339316 and 1339317:
- CID 1339315: boss_thaddius.cpp: 542
- CID 1339316: boss_thaddius.cpp: 811
- CID 1339317: boss_thaddius.cpp: 398

Added missing break; statements.

(cherry picked from commit 95d6f09243af81e6e91697b05bac9f664dabd54e)
2016-01-15 19:44:38 +01:00
treeston 43ae580a47 Scripts/Naxxramas: Complete rewrite of the Thaddius encounter.
(cherry picked from commit 29feae5901c049ef2204d956e83cf20507bed37a)
2016-01-15 19:43:42 +01:00
joschiwald 0c61cfd8ee Scripts/Spells: removed obsolete spellscripts 2016-01-03 21:19:43 +01:00
joschiwald ea5f39354b Scripts/Taxi: addition to 660f7e72be
(cherry picked from commit 35aed8902a8b615635bcd0b6fdfe347b804b01c3)
2016-01-03 02:54:07 +01:00
joschiwald 0f21736694 Core/Spells: partial cherry picked from commit 8a0bbc386982612077e6f83f1816b02be757e371 2016-01-03 01:17:39 +01:00