Commit Graph

2048 Commits

Author SHA1 Message Date
treeston
6dfe9d34f3 Merge branch '3.3.5-naxxcleanup' into 3.3.5. (PR #16524)
(cherry picked from commit f37682b7ed)
2016-04-10 15:27:49 +02:00
treeston
dc07c24c0c Scripts/Naxxramas: Fix an edge case crash in Gothik. Closes #16575.
(cherry picked from commit a23ccc1b83)
2016-04-10 14:39:32 +02:00
treeston
c344feed96 Merge branch '3.3.5-horsemen' into 3.3.5-base (PR #16194)
(cherry picked from commit e8a79737a5)
2016-04-10 14:32:51 +02:00
treeston
43c3b1b2e0 Merge branch '3.3.5-gothik' into 3.3.5-base (PR #16142)
(cherry picked from commit d23ef5d6d0)
2016-04-10 14:01:37 +02:00
Vincent-Michael
179b521dce Core: Remove whitespaces
(cherry picked from commit 5e74c2223b)
2016-04-09 17:14:08 +02:00
joschiwald
94c33ea43c Merge pull request #16785 from Keader/AlgalonStars
[3.3.5/Core/Scripts] Fix Living Constellation not activating during Algalon encounter
(cherry picked from commit 3e7b7e415e)
2016-04-09 17:09:27 +02:00
Shauren
5c0517c6ef Merge branch 'Golrag-sindragosa_ice_tomb_target' into 3.3.5
(cherry picked from commit 895878010e)
2016-04-09 17:05:24 +02:00
jackpoz
76bbf5fc0c Scripts/Misc: Fix issues reported by static analysis
(cherry picked from commit 510bb30b2c)
2016-04-09 00:26:41 +02:00
sirikfoll
c66d3714f1 Core/Scripts: Fixed Yogg-Saron Portals
Closes #16390
Closes #16708

(cherry picked from commit c4e4ee3ae1)
2016-04-08 23:57:12 +02:00
jackpoz
8046d5a94f Scripts/Ulduar: Fix crash
Change an assert to a NULL check on Flame Leviathan vehicle kit, it can be NULL on map unload.
Close #16662

(cherry picked from commit 31cd082833)
2016-04-08 20:38:09 +02:00
Treeston
adc7ee0c51 Merge pull request #16644 from Treeston/3.3.5-customcharmai
Core/UnitAI: Rework creature-controlled player behavior.
(cherry picked from commit 4e4b2b9a13)
2016-04-08 20:16:15 +02:00
treeston
c9b24515a5 Merge remote-tracking branch 'sirikfoll/despawnAtEvade' into 3.3.5 (PR #16528)
(cherry picked from commit c70e3e31a7)
2016-04-08 18:07:34 +02:00
treeston
73b917e122 Merge remote-tracking branch 'Eliminationzx/FixJumpDestOrientation' into 3.3.5 (PR #16450) with some minor CS adjustments
(cherry picked from commit cfed2d7a3d)
2016-04-05 19:02:11 +02:00
treeston
53722a81a2 AI/BossAI: Make creature never chase targets that are out of bounds
- Add missing const attribute on CheckBoundary arg.
- Prevent AI from attacking a target that is out of bounds. This prevents exploids such as killing Gluth/Deathbringer from out of bounds.

(cherry picked from commit 19ed18c881)
2016-04-05 18:37:20 +02:00
Rushor
c3a2cbc844 Scripts/Northrend: Knockbackimmunity Cleanup
(cherry picked from commit c560cb0a0c)
2016-04-02 19:33:43 +02:00
treeston
677309743a Scripts/UtgardeKeep: Bonus Ingvar the Plunderer fixes to reset behavior. There should no longer be weirdness if a reset happens during the RP phase.
(cherry picked from commit 815f43be7a)
2016-04-02 16:46:13 +02:00
treeston
61d216593c Scripts/UtgardeKeep: Ingvar updates:
- Roar at start of phase two
- Ingvar no longer does a weird move-jump towards his target when resurrecting
- Fixed a duplicate yell on phase one end

(cherry picked from commit c829fc7de4)
2016-04-02 16:46:01 +02:00
Keader
6005b3a5c5 Fix Kinetic Bomb stuck after knockback effect.
(cherry picked from commit 36648d1079)
2016-04-02 15:31:27 +02:00
joschiwald
9a202dfd4a Scripts/ICC/Teleporter: moved gossips to db
(cherry picked from commit ea38a7d95b)
2016-04-02 14:10:19 +02:00
treeston
5fb88c7121 Merge branch '3.3.5-boundaryagain' into 3.3.5-base (PR #16270)
(cherry picked from commit 1050b68899)
2016-03-22 23:37:02 +01:00
treeston
e2f2c70ba4 Merge branch '3.3.5-bossboundary' into 3.3.5-base (PR #16089)
(cherry picked from commit 5b8b8c6530)
2016-03-22 22:56:43 +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
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
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
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
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
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
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
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
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
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
Vincent-Michael
00b4e8b6cc Scripts: Added missing overrides 2015-11-15 03:38:02 +01:00
Carbenium
230e820898 Core/Creature: Remove duplicate call to LoadCreatureAddons in Creature::Create
* Add error log for duplicated aura entries in creature_(template_)addon

(cherry picked from commit c5f635b689)

Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Globals/ObjectMgr.cpp
2015-11-14 04:22:42 +01:00
Killyana
286f0ea6f3 Scripts/ICC: moved saurfang gossips to db
Closes #14904

(cherry picked from commit 7225b7abf1)
2015-11-06 13:17:54 +01:00
MitchesD
81ce5acb34 Core/Scripts: fix build after recent cherry picks 2015-11-06 11:28:35 +01:00
sirikfoll
d4b3b1d1d2 DB/CORE Minor change in quest Kick, What Kick? and some codestyle
Remove the line that despawns the 'Apple' npc, this despawn is non-blizzlike and breaks the quest.
Thx Killyana for sql and valuable information

Closes #15480

(cherry picked from commit 22f1d26986)
2015-11-06 11:11:16 +01:00
treeston
6d14c4871f Scripts/Naxxramas: Anub'rekhan encounter cleanup.
- Cleaned up events behavior to use phases instead of weird checks for auras.
- Cleaned up Crypt Guard despawn behavior, they should no longer despawn instantly upon death.
- Moved initial greeting from MoveInLineOfSight hack to proper areatrigger script.
- Fixed Crypt Guard respawn behaviour to prevent pulling them before Anub'rekhan has fully reset.
- Fixed Crypt Guard aggro behaviour to call for help on aggro. This prevents pulling the initial pair of Crypt Guards without engaging the boss.
- Added missing boss emotes.
- Code style cleanup.

(cherry picked from commit 91de0322bb)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
2015-11-06 11:07:31 +01:00
treeston
b6ac8c577c Scripts/Naxxramas: Faerlina cleanup:
- Move greeting to areatrigger instead of MoveInLineOfSight hack
- Clean up add spawn handling to prevent various glitching with combinations of evade state and add aggro
- Ensure all adds are always pulled alongside the boss and vice versa
- Add missing texts.
- Fix a bug in the core that prevents castable-while-dead spells (such as Widow's Embrace) from appearing on possess bars.

(cherry picked from commit 577fcf356e)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
2015-11-06 10:59:34 +01:00
jackpoz
5f5ac9630c Scripts/Naxxramax: Fix clang warning
(cherry picked from commit da0671f4fe)
2015-11-06 10:56:27 +01:00
Rushor
9483bd9180 Scripts/IcecrownCitadel: Quest 'Blood Quickening' - Add Killcredit in 25ManRaid
closes #15733

(cherry picked from commit c5641a9a58)
2015-11-06 10:35:29 +01:00
treeston
a37e6e20c8 Scripts/Naxxramas: Loatheb follow-up:
- Fix Deathbloom (for real this time)

(cherry picked from commit 17fdb1e091)
2015-11-06 09:54:40 +01:00
Naios
0b6f784591 Core/AI: Convert the hardcoded variadic RAND functions into one C++11 variadic template version. 2015-11-01 14:33:31 +01:00
joschiwald
92b08fc74b Scripts/VioletHold: rewrote the whole instance
thanks @MitchesD for help

(cherry picked from commit df21162fe4)
(cherry picked from commit 3a4f54197c)
(cherry picked from commit f50df72820)
(cherry picked from commit 95bae7143f)
(cherry picked from commit 5406f82044)
2015-11-01 13:09:30 +01:00