Commit Graph

4768 Commits

Author SHA1 Message Date
joschiwald
ee38d8b4a1 Merge pull request #16171 from velinath/sai-migrations
Core/Scripts/DB: move Gryphoneer Windbellow to SAI
(cherry picked from commit f377a5875c)
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 e0ffc2921b)
2016-03-21 21:46:04 +01:00
treeston
94b7e562e2 Merge pull request #16126 from velinath/taxi-to-sai
(partially cherry picked from commit b6ed3d3fc2)
2016-03-21 21:29:53 +01:00
jackpoz
96ca739a0b Merge pull request #14896 from Ofinka/dupl
(cherry picked from commit 263f127d07)
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 ef7a91d193)
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 96bc31924a)
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 eee75b80ac)
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 546c8a5b8e

(cherry picked from commit ecd74a8ccc)
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 e28cc7161a)
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 130f744c29)
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 6a56ede179)
2016-02-10 03:10:35 -02:00
joschiwald
3ac2ba721d Core/Gossips: added some sanity checks to prevent duplicate interaction
(cherry picked from commit 8b6954e81b)

Scripts: addition to 8b6954e81b

Closes #16466

(cherry picked from commit b259d5c2bc)
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 4191bb868a)
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 e138e094a9)
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 3e42d83e9c)
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 f22b1938db)
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 13e509a622)
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 79c9af11b9)
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 403ff21324)
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 ce90e30a80)
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 54d583b0fb)

# 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 5dd6163387)

# 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 3267c90102)

# 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 f8f815dbc3)
2016-01-15 20:33:34 +01:00
jackpoz
3f0026d8e7 Core/Quest: Fix issues reported by static analysis
(cherry picked from commit 1ddf44caf3)

# 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 f1f4005ad8)

# 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 3fdbcf18ae)
2016-01-15 20:06:01 +01:00
MitchesD
43d5d118b2 Core/Misc: fix warning and misc codestyle fixes
(cherry picked from commit 3b90b0368a)
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 bf99630399)
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 f01ef901ef)
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 95d6f09243)
2016-01-15 19:44:38 +01:00
treeston
43ae580a47 Scripts/Naxxramas: Complete rewrite of the Thaddius encounter.
(cherry picked from commit 29feae5901)
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 35aed8902a)
2016-01-03 02:54:07 +01:00
joschiwald
0f21736694 Core/Spells: partial cherry picked from commit 8a0bbc3869 2016-01-03 01:17:39 +01:00
Vincent-Michael
478cc756eb Update copyright note for 2016
Happy new year (Again new year with idiots ...)
2016-01-01 00:34:25 +01:00
jackpoz
8ff2359b7d Merge pull request #15903 from tkrokli/remove_script_npc_anchorite_truuen
Core/Scripts: Remove deprecated script npc_anchorite_truuen

Remove deprecated script npc_anchorite_truuen replaced by SAI in 2cecc7b1f7

(cherry picked from commit 9020790db2)
2015-12-12 03:09:21 +01:00
jackpoz
baa52438e6 Scripts/EyeOfEternity: Fix crash
Fix crash happening when a player would kill a Melee npc on the disks during Malygos fight and mount it before it ended the waypoint path.
Close #15900

(cherry picked from commit 6e296ddaa2)
2015-12-12 03:08:16 +01:00
Shauren
d03ca37f10 Core/Players: Use constant gender from PLAYER_BYTES_3 where appropriate. 2015-11-27 21:53:27 +01:00