Commit Graph

934 Commits

Author SHA1 Message Date
Sirikfoll
5993f91630 Script/SWP Full Rework on M'uru Encounter
(cherry picked from commit 6002acf376)

Another sql fix
(cherry picked from commit 204acbb5b7)
2017-01-08 02:21:10 +01:00
vincent-michael
86b98686a9 Update copyright note for 2017
Happy new year
2017-01-01 16:23:13 +01:00
Shauren
ac1dc758b9 Core/Units: Cleanup hardcoded magic numbers for byte field offsets 2016-12-13 20:58:22 +01:00
Duarte Duarte
7eb4512eee Scripts: Minimize duplicated enum names in header files (#18346)
This reduces the number of cache resets with the Zapcc compiler

Standard followed is instance/raid TLA + DataTypes/CreaturesIds/etc
2016-12-01 01:51:07 +00:00
Ulduar
b8ef8466a9 The Kalecgos evade condition. (#17631)
The Kalecgos evade condition.
2016-11-27 02:06:46 +01:00
Shauren
5411ca8cdf Core/Units: Removed attack speed float to int conversion special case in building SMSG_UPDATE_OBJECT 2016-11-25 17:58:48 +01:00
Krudor
a2b3c34c03 Core/Scripts: Add Shade of Aran & Atiesh interaction
Closes #18270
2016-11-20 12:00:48 +01:00
Vincent-Michael
1f6c324476 Core/Misc: Whitespace cleanup 2016-09-22 21:59:12 +02:00
Mihapro
b7c2d309e6 [6.x] Core/Battlefield: Tol Barad (#17124) 2016-07-15 14:39:41 +02:00
w1sht0l1v3
e47d4de6ec Core/Scripts: Corrections after 14b93c04ee
(cherry picked from commit fcfb7b96b2)
2016-07-09 21:21:43 +02:00
Shauren
ef396877ae Core/Spells: Fixed spell range check
Closes #17060

(cherry picked from commit e6a52d4aae)
2016-07-01 20:39:38 +02:00
Duarte Duarte
71a7f96e22 Scripts/SWP: Remove unused #defines 2016-05-02 03:09:08 +01:00
Shauren
3ac33163db Core/Misc: Fixed -Wmisleading-indentation warnings 2016-04-23 13:22:03 +02:00
DDuarte
00da19ed9e Merge remote-tracking branch 'sirikfoll/geddon' into 3.3.5 (PR #16975)
(cherry picked from commit 75f7b5ae4b)
2016-04-16 18:20:11 +01:00
Chaouki Dhib
3cbbcdb51a Core/Movement: Clean up and improvements on Unit::SetSpeed (#16843)
- Clean up of Unit::SetSpeed (mostly cherry picks from the 6.x branch):
- the opcode sent depends on the unit. until now, MSG_MOVE_SET_* were sent for every units which isn't like retail behavior.
- Removed the unused method parameter "forced" from Unit::SetSpeed
- Renamed Unit::SetSpeed to SetSpeedRate
- Removed the unused method parameter "forced" from Unit::UpdateSpeed
- Added utility method Unit::SetSpeed which take the new flat value.
(cherry picked from commit dc3327f9c5)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Handlers/MovementHandler.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
#	src/server/scripts/Kalimdor/zone_azshara.cpp
#	src/server/scripts/Kalimdor/zone_durotar.cpp
#	src/server/scripts/Outland/zone_hellfire_peninsula.cpp
2016-04-16 02:26:24 +01:00
treeston
d25ba64b4c Scripts/Karazhan: Hackfix the Opera event script to make Wizard of Oz actually completable.
Doing it in script instead of removing the flags from DB because I'm pretty sure that the DB flags are correct and there's some RP event missing before she becomes attackable.

(cherry picked from commit dc39de0141)
2016-04-09 17:35:45 +02:00
Vincent-Michael
179b521dce Core: Remove whitespaces
(cherry picked from commit 5e74c2223b)
2016-04-09 17:14:08 +02:00
Nyeriah
bedd2f4236 Scripts/Karazhan: Use the correct method to access Opera's side entrance door
(cherry picked from commit ecd9dec384)
2016-04-08 22:47:50 +02:00
Nyeriah
39c6f1ce3b Scripts/Karazhan: Clean up instance script
Closes: #16533
(cherry picked from commit f9eff81388)
2016-04-08 22:22:32 +02:00
Aokromes
8adf24605d Merge pull request #16692 from tkrokli/headless_horseman_emote
Core/Scripts/boss_headless_horseman: remove hardcoded text
(cherry picked from commit 5accd69863)
2016-04-08 22:02:11 +02:00
Aokromes
9bf507e592 Merge pull request #16699 from tkrokli/triple_zone_cleanup
Core/Scripts: triple zone cleanup
(cherry picked from commit 2387dbdda9)
2016-04-08 22:01:40 +02:00
treeston
c25222c428 Merge remote-tracking branch 'tkrokli/redemption_tirions_tale' into 3.3.5 (PR #16680)
(cherry picked from commit d1a9d7765c)
2016-04-08 20:32:01 +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
92381950ee Merge remote-tracking branch 'sirikfoll/npcMyranda' into 3.3.5 (PR #16438)
(cherry picked from commit e5e97bedc0)
2016-04-05 18:08:34 +02:00
Rushor
1bf8e32b40 Merge pull request #16486 from Rushor/spiderman
[3.3.5][6.x]Scripts/Karazhan: Implement Optional Boss Spawn
(cherry picked from commit c8f34656ef)
2016-04-03 20:18:33 +01:00
tkrokli
97b70abe54 Core/Scripts/Uldaman: change hardcoded text to enum
Change #define to enum {with brackets}

Possibly the smallest change so far in this series of core script changes.

(cherry picked from commit 627ec0e35e)
2016-04-02 16:47:35 +02:00
Shauren
ddb0bc7b6a Scripts/Undercity: Removed obsolete script
Partial cherry pick of 7a101bcf00
2016-04-02 15:35:49 +02:00
jackpoz
9e0491db48 Scripts/Deadmines: Fix issues reported by static analysis
Fix Coverity issue id 1022474

(cherry picked from commit d75469e31f)
2016-04-02 15:32:10 +02:00
tkrokli
50ad1cca00 Core/Scripts/DB: remove hardcoded text from 'npcs_dithers_and_arbington'
- created DB gossip_menu_option entries for both NPCs
- added enum section instead of "magic numbers" in script
- replaced core text with pointers to DB text
- zone_western_plaguelands.cpp is now cleaned up

(cherry picked from commit 29c2a42324)
2016-04-02 15:18:47 +02:00
Nick
6e5a129d91 Core/Scripts: Change door ID in Blackwing Lair
as per 7d454c66f7

Change the name as well.

(cherry picked from commit a35a6279fe)
2016-04-02 14:38:48 +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
treeston
a254bdff59 Merge remote-tracking branch 'tkrokli/gossip_accept_duel' into 3.3.5-base
(cherry picked from commit 9091451818)
2016-03-22 22:06:54 +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
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
myran2
2652d700e1 Core/Spells: Updated combo point handing
Closes #15996
2016-01-22 20:27:48 +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
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
Vincent-Michael
00b4e8b6cc Scripts: Added missing overrides 2015-11-15 03:38:02 +01:00
Carbenium
17a5f51a29 Fix non-PCH build 2015-11-13 14:17:01 +01:00
CreshandKesh
143d00a242 Core/Scripts: Salanar the Horseman, Into the Realm of Shadows
- Show gossip_menu_option 9739 only if quest 12687 is accepted & not completed
- Cast spell 52693, SPELL_REALM_OF_SHADOWS, when gossip option is selected

Core script by @CreshandKesh (with some modifications)
SQL part by @CreshandKesh and @tkrokli, condition adjustment by @Killyana.

Closes #15603
Closes #15657

(cherry picked from commit 359df54b79)
2015-11-06 13:14:05 +01:00
Incorrect
b022724458 Core/Misc: Remove unneeded files
These 3 BlackRock Mountain scripts can be removed from source:

- boss_anubshiah.cpp
- boss_gorosh_the_dervish.cpp
- boss_grizzle.cpp

They already removed from the creatures in DB, and are currently causing
DBErrors.

(cherry picked from commit d98037a75d)
2015-11-06 13:00:21 +01:00
joschiwald
c4f64c6d9c Scripts/BWL: cleanup instancescript
(cherry picked from commit 05429b3593)

# Conflicts:
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
2015-11-06 11:48:53 +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
Kittnz
2cd545849c Scripts/Uldaman: Fix build & fix some movement suggested by josch
(cherry picked from commit cf286ea9cd)
2015-11-01 00:31:18 +01:00
Kittnz
c094e49e74 Scripts/Uldaman: Instance update
- Fixup Boss Ironaya
- Add the freeze animation for minions and archaedas
- Fix attack target for minions who wake up

(cherry picked from commit 9cb4cb52d8)
2015-11-01 00:31:00 +01:00
tkrokli
3d9b2d8de2 Core/Scripts: The Endless Hunger & Death's Challenge, creature text
This PR solves the following say text issues:
In quest ID 12733, Death's Challenge, the creature script npc_death_knight_initiate is supposed to target the player and refer to the player character's name in the following 2 lines from `creature_text`.`entry` 28406:

- "You don't stand a chance, $n." (`BroadcastTextId` 29267)
- "Remember this day, $n, for it is the day that you will be thoroughly owned." (`BroadcastTextId` 29270)

In quest ID 12848, The Endless Hunger, the creature script npc_unworthy_initiate is supposed to target the player and refer to the player character's race in the following 2 lines from `creature_text`.`entry` 29519, 29520, 29565, 29566 and 29567:

- "You are hopelessly outmatched, $r."  (`BroadcastTextId` 30212)
- "Sate your hunger on cold steel, $r!" (`BroadcastTextId` 30214)

The untargeted variables $r and $n appear in the say lines because the existing script assigns the text to the player character instead of the creatures. This does not produce any race or name information in /say or chat.

This Pull Request closes issue #14700 and replaces PR  #15678.

(cherry picked from commit 89107c3a8e)
2015-10-30 11:33:40 +01:00