Commit Graph
4882 Commits
Author SHA1 Message Date
Warpten 3cd73a36e3 Scripts/RubySanctum: Fix missing break reported by Coverity.
(cherry picked from commit 07ce570be87db5598e1b05e79070a42d24340df4)
2017-02-05 16:37:36 +01:00
Snapper a3096cc1c1 Core/Misc: use enum for UNIIT_NPC_FLAGS' zero values
(cherry picked from commit ebb33bbfc1f11a16e00e0d84965ad5350267940a)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
2017-02-05 16:27:55 +01:00
Snapper c639153567 Core/Misc: kill whitespace and use enum instead of hardcoded value.
(cherry picked from commit 21797c6c4f1cfee479911f58df9b3e6b6f8a2c4d)
2017-02-05 00:57:20 +01:00
SnapperRy caf744ad02 Core/Script: small improvement for quest "The Hunt is On". (#17537)
Reset emotestate when the event starts.
(cherry picked from commit eb1cd4c90708309a2e3c0e6e7c3e91645f725810)
2017-02-05 00:57:16 +01:00
joschiwald e774c29c21 Fixed build 2017-02-05 00:16:58 +01:00
SnapperRy 623215ce31 Event/Midsummer: improve pole ribbon functionality (#17464)
Event/Midsummer: improve pole ribbon functionality:

- Bunny creature should hover, which puts it in the intended position.
- Use correct visual and internal spells to handle cosmetics and timers.
(cherry picked from commit 03b15d968b56b7855693e47e79a320cf9990d73c)

Rename 9999_99_99_99_world.sql to 2016_07_05_03_world.sql
(cherry picked from commit 8edc1caf32635f417aee290811a9ef2860f145b6)
2017-02-04 23:37:59 +01:00
Gustavo e55420af86 Core/Scripts Corrections on Halion's Encounter (#16725)
Core/Scripts: Updates to Halion

* Fixed Combustion and Consumption.
* Fixed Living Embers and Blazing Auras.
* Timer changes.
(cherry picked from commit dfe278459d79ade500a66356a98b4065c0722572)

# Conflicts:
#	src/server/game/Spells/SpellMgr.cpp
#	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp

Fix sql for merged PR
(cherry picked from commit 7f944695ddad14cec021ff5a0527a5a92fb4cf81)

Derp.

github editor is bad.
(cherry picked from commit 182904946174cd635b7478bd38507235d0d45aa2)
2017-02-04 23:33:26 +01:00
Andrew Letson 4c9301ca70 Core/Scripts: Migrate Shadowmoon Valley NPC's to SAI (#17373)
* Migrate Flanis Swiftwing and Kagrosh to SAI and more.
(cherry picked from commit 32dd6bbca810c652e49befb9c7d6bddc8cd534a2)

Rename 2016_06_14_99_world.sql to 2016_07_04_12_world.sql
(cherry picked from commit d7b3285e78d72c741a2751b644bd553e83a761ce)
2017-02-04 23:15:39 +01:00
Aokromes 5c3651379b Scripts/Midsummer: Burning hot pole dance (#17445)
* Scripts/Midsummer: Burning hot pole dance
By  zwerg, closes #6876
(cherry picked from commit b0e5f6de47e85e1ca7cd3cc54dcf31fddac71a9f)

Rename 2016_99_99_99_world_.sql to 2016_06_26_01_world_.sql
(cherry picked from commit 184e64fa3318caa32cd7b283c79a77b4033d88ed)

Rename 2016_06_26_01_world_.sql to 2016_06_26_01_world.sql
(cherry picked from commit 4cc88b5f091ba7909bda2bb664b7904907b29197)
2017-02-04 17:58:01 +01:00
Gustavo e336272ec2 Core/Scripts Boss Ahune Clean-up (#17320)
Remove use of flags UNIT_FLAG_NON_ATTACKABLE and UNIT_FLAG_REMOVE_CLIENT_CONTROL
Replace with correct one, UNIT_FLAG_UNK_31, imunity part now is fully handled by auras
Fix a problem with bugged orientation while casting SPELL_SYNCH_HEALTH
Use std::crono notations
Remove unneeded code

Move one spell_linked_spell to SpellScript
Fix Loot issue
Fix Possible Crash
(cherry picked from commit f1639a30ba1f52370c128585d1670af18e48e799)

Rename 2016_99_99_99_world.sql to 2016_06_26_00_world.sql
(cherry picked from commit fdf0092ac24a27f1e95ffeb4f0257404998980ee)
2017-02-04 17:56:05 +01:00
DoctorKraft 4075bd16e4 Core/Spells: Fixed Divine Storm (#19031) 2017-02-03 20:49:30 +01:00
Keader d9eb79c3c5 Core/Spells: Missing override 2017-02-03 07:11:15 -03:00
DoctorKraft 8aa07daff3 Core/Spells: Divine Steed (#19027) 2017-02-02 18:19:08 +01:00
Meruemu 9733e084e6 Core/Scripts: Fix array out of bounds in boss_mother_shahraz.cpp. (#17434)
Fix an error in Prismatic Shield auras and Fatal Attraction teleport points selection (was introduced in https://github.com/TrinityCore/TrinityCore/commit/fb63c8e915986650f787de62859e1f818d1d96c7)
(cherry picked from commit 325ccab595780448ade80967aca74a9acb8cd8b2)
2017-02-01 22:53:21 +01:00
tkrokli 604b8bfab1 Core/Scripts: Tom Hegger must target player in Say text (#17395)
File: zone_borean_tundra.cpp
Script: npc_hidden_cultist
Quest: The Hunt is On, 11794
NPC:  Tom Hegger, 25827

Before this change, Tom Hegger does not target player when saying his
aggro text "You don't know who you're messing with, $c!   Death beckons!"
and hence the text $c will be shown instead of the player class.
(cherry picked from commit 736843fbb5442b1338ec888c8a702d666c95a76b)
2017-01-29 21:51:04 +01:00
treeston 5baf6ea4d9 Merge branch '3.3.5-frogger' into 3.3.5 (PR #17261)
(cherry picked from commit 90ff3ce8c8256796cb637fba52e8ae38a0751176)
2017-01-29 21:51:03 +01:00
ariel- d40c151cc8 Core/Scripts: Extended SMART_ACTION_SET_INST_DATA to also set BossStates. (#16739)
Scripts/Dire Maul: Initialize boss states array so it may be called from SmartAI. (Ref #6429)
(cherry picked from commit d1d0c64ad11cb3faf986a5332fec6b704fb8026c)

# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
2017-01-29 18:04:10 +01:00
Andrew Letson fd480d14f0 Core/Scripts: Migrate Professor Dabiri to SAI (#17367)
- removes Professor Dabiri from zone script and adds him to smart_scripts.
- also removes one more line of hardcoded text in core scripts
(cherry picked from commit 8e84603090726cf3715c444763a2c499f6518e95)
2017-01-29 17:57:19 +01:00
joschiwald a6d238b833 Core/Player: Moved character_template from character to world db 2017-01-29 16:09:46 +01:00
Shauren c8af5de0d3 Core/Spells: Fixed Crash Lightning 2017-01-29 12:41:54 +01:00
Traesh 6ab3877c91 Core/Entities: Basic AreaTrigger System (#18035)
* Implemented AreaTrigger Templates
* Implemented AreaTrigger Splines
* Implemented SPELL_AURA_AREA_TRIGGER
* and many more
2017-01-29 00:00:43 +01:00
Aokromes 820c69ed8c Core/Scripts: update npc_eagle_spirit
By Malcrom
2017-01-14 15:09:09 +01:00
Aokromes b53513ec11 Core/Scripts: update to sharpbeak
By Malcrom
2017-01-14 15:06:14 +01:00
Aokromes e3986d4a8a Script/Quest: Update Sharpbeak
By Malcrom
2017-01-13 04:51:37 +01:00
treeston 6c6f86d34c Instances/DrakTharonKeep: Fix Novos the Summoner. Fixes #17331.
(cherry picked from commit 813e33b92784831e418a41e3ea0080905bb6dabf)
2017-01-13 00:56:41 +01:00
ariel- 9371c5c7d1 Core/Script: moved SAI to cpp for The Etymidian, closes #17053 (#17330)
(cherry picked from commit f03dc799591afe9421b1970fa9b07465bf6ef312)

Rename 9999_99_99_99_world.sql to 2016_06_13_04_world.sql
(cherry picked from commit 90ba7fe938241b6900daaef950e89b58da1e514f)
2017-01-13 00:56:29 +01:00
Aokromes b52c1b35a5 Scripts/UtgardePinacle: Adjust King Ymiron boundaries
(cherry picked from commit cc521d49dc159d9f4fb043b815d44d33ac810375)
2017-01-13 00:44:14 +01:00
Keader b8757aa8e4 Core/Scripts Fixed Anubarak issues related with Leeching Swarm spell
(cherry picked from commit 3c35ce06af381cd416daad868c0f11709eb4855f)
2017-01-12 23:40:24 +01:00
tkrokli 34d310aff8 Core/Scripts: remove hardcoded text from npc_sayge
- remove hardcoded (and wrong) text from the script
- copy valid text from broadcast_text to gossip_menu_option
- gossip_menu / npc_text is already correct in TDB 335.61
- sort + clean up core script enum list and add new entries
- keep gossip handling unchanged in the script (low prio)

(cherry picked from commit 582af025090462f29576988e7a4517fee9a206fe)

Core/Scripts/DB: move npc_gregan_brewspewer to DB

- Remove npc_gregan_brewspewer, thereby removing hardcoded text
`#define GOSSIP_HELLO "Buy somethin', will ya?"`
- Move all gossip handling to DB (gossip texts already exist in TDB)
(cherry picked from commit 3acf6f36d1d60b7e2ac082bf9f6976de3256e250)

Core/Scripts: npc_grandmother gossip text moved to DB

Removing one more hardcoded text line from core scripts.
Also adding correct gossip to the npc_grandmother script.

Gossip changes in this script:
- remove hardcoded text from core script
- use existing npc_text IDs in gossip enum
- add missing text rows to gossip_menu_option
- use values from gossip_menu_option in enum
- replace spawn coordinates 0.0f with GetPosition()
(cherry picked from commit c214f987d730169e106b37fa1fe5f8565609374b)

Core/Scripts: remove hardcoded text from npc_locksmith

- remove hardcoded text from script
- move the gossip handling to DB SQL
- move the script conditions to DB SQL
- use correct gossip from broadcast_text
- remove options not existing in broadcast_text
- add Key to Searing Gorge option (related spell)
- add The Eye of Haramad option (related spell)
(cherry picked from commit e6ee6e2ae85f8a760dcd17e01b388bf3cd27c1e2)
2017-01-12 23:37:37 +01:00
tkrokli 4e00321970 Core/Scripts: boss_majordomo hardcoded text
2 more text lines removed in the ongoing series:
"Remove hardcoded text from core scripts".

Core script for boss Majordomo Executus:
- add missing gossip_menu_option entries
- link the options via the table gossip_menu
- remove hardcoded text from the script
- minor enum line order sorting cleanup
- replace OnGossipSelect() with sGossipSelect()

The scripted events are unchanged.
If the script is inaccurate, make a new PR.
(cherry picked from commit b6d43623a259f62ce0240a9e9f44f28e8c1ad5eb)
2017-01-12 23:16:41 +01:00
tkrokli 52d0ec3ccb Core/Scripts: move npc_mountaineer_pebblebitty to DB
- move gossip text to DB and add quest condition
- remove core script npc_mountaineer_pebblebitty,
- thereby removing the file zone_loch_modan.cpp
- because the original core script dialog is incorrect

This version of the dialog can be verified from the following web pages:
- http://wow.gamepedia.com/Key_to_Searing_Gorge_quest_chain
- http://www.wowhead.com/npc=3836/mountaineer-pebblebitty#comments:id=332234

(cherry picked from commit 25881de7d3547c22eb76b2e0746f3c57484bca7a)
2017-01-12 03:40:16 +01:00
treeston e2710bc232 Scripts/Instances: Fix a bug that would cause the Hodir encounter to never properly begin. Tagging issue #17302.
(cherry picked from commit e5382ee21538e4383a39b4dc0de274e856bb663b)
2017-01-12 03:19:38 +01:00
treeston 95902126a3 Scripts/Outland: Fix a potential crash. Closes #17308.
(cherry picked from commit 96c05dbec0de5dcff60cc7a97e1b35171f3a8930)
2017-01-12 03:18:07 +01:00
Aokromes 85b72b7b2b someone lives on the past :P 2017-01-12 03:08:48 +01:00
Aokromes a28768a9ad Missing part of c76226c 2017-01-12 03:07:19 +01:00
Aokromes c76226cc41 Script/Quest: Script Quest 24125 Rite of the Winds
By Malcrom, closes #18262
2017-01-12 03:06:14 +01:00
Aokromes 2c1394df84 warning fix 2017-01-12 02:53:09 +01:00
Aokromes 5317a81395 Core/Scripts: Sharpbeak update
By Malcrom
2017-01-12 02:50:07 +01:00
treeston 5e99388981 Scripts/Instances: More #16346 follow-ups. Fixed this time: Halls of Reflection, Ignis the Furnace Master, Mimiron and Rend Blackhand.
(cherry picked from commit 27a3eaab334176af6714f98c2eeb27d93334d226)

Scripts/MoltenCore: Fix Ragnaros (#16346 follow-up).
(cherry picked from commit 83e5df563876e037ecc35d5cb5c4e6d3a9ab2355)

Scripts/BlackrockMountain: Nefarian. (#16346 f-u)
(cherry picked from commit 650d7ab596bf956d146a147fdc938d3c6bdae022)
2017-01-12 00:28:10 +01:00
jackpoz 954b3c9617 Core/VMaps: Fix some vmap height edge cases
Fix Map::GetWaterOrGroundLevel() checking dynamic object only in phase 1 instead of current Unit phase.
Improve DynamicMapTree::getHeight() dynamic object check by casting the ray at +0.5f from the passed Z coordinate, this value will be tuned to improve even more the results.

(cherry picked from commit 1347d7cf7a8656f3db9d8b2f6e6d955e1fa8c129)
2017-01-12 00:13:55 +01:00
treeston 1eb9f8edab Scripts/TotC: More follow-up to #16346. Also code style cleanup. Who names all their creature pointers "temp"?
(cherry picked from commit 4407877f365ff5ae69c30e18201f7d581990be87)

Compiler warning fix.
(cherry picked from commit 7fbd70d4c4a10a742bade4e33a132c0cf7996756)
2017-01-12 00:07:19 +01:00
treeston 8b4435c96c Scripts/Instances: Follow-up to #16346. Fix Illidan and Northrend Beasts.
(cherry picked from commit 4e922a5146889293078d59b881988506a8ac88f4)

# Conflicts:
#	src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
2017-01-12 00:02:30 +01:00
Trisjdc 781c5a3b82 Core/Creatures: Remove resetting of UNIT_FLAG_IMMUNE_TO_PC on combat clearing
(cherry picked from commit 34ef05ce0bfa34855ce33fcdf2bf82d257ae6672)
2017-01-12 00:02:30 +01:00
Keader 6ca75ef039 Core/Scripts Improve Felflame Infernal of Lord Jaraxxus fight (#16998)
(cherry picked from commit 43855b47d8f436bbf6dc5437446490bb02ea3a01)

Rename 9999_99_99_world.sql to 2016_06_02_01_world.sql
(cherry picked from commit 7f0e1caf72acb44a738b89037bf4f2555c4ca023)
2017-01-12 00:02:29 +01:00
Keader 7f2b5f3859 Core/Scripts Improve Jormungars fight
(cherry picked from commit 0912df258d722f867c8ebe8fc77310f4fd1ce38c)

Rename spell_snakes_spray for spell_jormungars_snakes_spray and cleanup
(cherry picked from commit 2c9c8afc0f23dada7599ecede4bf3d598ab42006)

Fixing the issue
(cherry picked from commit 81083a8593b846e5a64f59771c4446f9f29c34c3)

Changing remove aura method
(cherry picked from commit b88d49be2498ce484124c1adc2bc1ab5ac2aa176)

changing creature_text (tk feedback)
(cherry picked from commit 9b444877dd8955ee0cfcf9bf56304220c4c276fb)

Override and tkrokli again :D
(cherry picked from commit 7205b4dd65bd569e4b254586f6802199de447194)

Fix SQL name
(cherry picked from commit cae19692ab2b627b292cdeed59069d5f6fa3be30)
2017-01-12 00:02:29 +01:00
Aokromes 940c522222 Update zone_hinterlands.cpp 2017-01-11 02:14:23 +01:00
Aokromes b3f2dd6807 Script/Taxi Sharpbeak Hinterlands
By Malcrom
2017-01-11 02:10:33 +01:00
joschiwald e9af56c4a4 Fixed warning 2017-01-10 03:13:13 +01:00
sirikfoll 04ff2e195f Core/Achievement A-bomb-inable and A-bomb-ination
(cherry picked from commit e016bf8d06c8236c160ecaf63c6a4f26f7d4467b)

DB: SQL rename
(cherry picked from commit 71081c2576571a6e6d5a16179e6729843094a882)
2017-01-09 21:36:03 +01:00
Shauren dad19df69d Core/Units: Renamed and documented UNIT_FLAG_DISABLE_MOVE to prevent people from trying to use this flag to root a creature leaving them wondering why it doesn't do anything
(cherry picked from commit b36da771857554c5bd652bf8ccc1386d4be607b0)

Core/Scripts: build fix

(cherry picked from commit 258368a2bd0e7c2d395d98dc3220d8e32e65303f)
2017-01-09 21:16:36 +01:00