Commit Graph
8669 Commits
Author SHA1 Message Date
Killyana 3e7e6fa4ac DB/Gossip: Fix wrong gossip option text for Byancie
Closes #17697

(cherry picked from commit 308602eebfc57c140f4cdf38aadfd4bb478d9456)
2017-02-18 13:57:38 +01:00
Killyana c690bd14fc DB/SAI: Add missing SAI for Borean Tundra creatures
Closes #17744
By Kodekc

(cherry picked from commit a4e5c7545eb4a366edabd8bdeb6f7c50df484406)
2017-02-18 13:55:15 +01:00
Killyana 5ababe7c5f DB/Object: Update respawn time for ruby lilac
By Tauriella
Closes #17761

(cherry picked from commit 29e9331e3f44c514db9098fa9b13b38b6bc62c8c)
2017-02-18 13:54:18 +01:00
Killyana 01069e62d5 DB: Fix more DB errors
(cherry picked from commit 755add6fd202a50e43074c98315f74eaee1fa662)
2017-02-18 13:53:19 +01:00
joschiwald 80c36f3d9c Scripts/Command: Fixed phases output in .pinfo command
Closes #19144
2017-02-17 21:54:49 +01:00
Keader 0ed67081bc Core/Spells: Fixed Chilled effect on Frostbolt, Frozen Orb and Blizzard (#19131) 2017-02-15 12:17:45 -02:00
RoG_Hannibal 23aca839fe Core/Spells: add slowing effect to Mage spell Frostbolt (#19092)
Closes #18932
2017-02-13 15:17:28 -02:00
RoG_Hannibal d2dba9a5e0 Core/Spells: fix Priest spell Penance and Power Word: Shield (#19033)
- fix talent "The Penitent" for the spell Penance
- re-write Power Word: Shield

Closes #18520
2017-02-13 03:46:00 +01:00
Aokromes 96fb2c9779 DB/Misc: Fix startup errors
(cherry picked from commit 2b3d72d1baa77630603205392ea221f24a2cbedd)

DB/Misc: Fix startup errors
(cherry picked from commit d76f077a7f9e6a17e9bb28a7ebefb048fccca343)

DB/Misc: Fix startup errors
(cherry picked from commit 2151d5f4204360bac612600215e20a81980ea17e)
2017-02-12 16:52:01 +01:00
treeston 1091174f03 Merge remote-tracking branch 'Treeston/3.3.5-petaggro' into 3.3.5 (PR #17800)
(cherry picked from commit aeeae8d09c81e48d68ee3ff5a9588f8f94f5ad4d)
2017-02-12 16:08:32 +01:00
treeston 573cb9d20f AI/SmartScripts: SMART_ACTION_ADD_QUEST -> SMART_ACTION_OFFER_QUEST. Open quest offer instead of adding straight to log - old behavior can be requested using action_param2. Closes #17735.
(cherry picked from commit ba4d6f63936fe3269e6c8b75358bc00a78fd49df)
2017-02-12 16:07:27 +01:00
treeston 7b13e98327 AI/SmartScripts: Add param3 to SMART_ACTION_CAST and SMART_ACTION_INVOKER_CAST that allows specific triggered flags to be set (rather than all-or-nothing). Ignored if SMARTCAST_TRIGGERED is not set.
(cherry picked from commit 9072e0221b39c19fb6be154c623f45d6a9433db0)
2017-02-12 15:50:43 +01:00
treeston d0f4588652 Core/SmartScripts: Add SMART_TARGET_LOOT_RECIPIENTS. Does what it says on the tin.
Use this new target type to fix The Rider of Blood, The Rider of Frost, The Rider of the Unholy. Closes #17817.

(cherry picked from commit e2c915fb43ae27d695c0ab410fb1b14222745e27)
2017-02-12 15:46:19 +01:00
Killyana 4d67347ec0 DB/SAI: Add missing SAI for Mux Manascrambler
By Kodekc
Closes #17788

(cherry picked from commit 2c8da5e174eb71b442ebd8a00a2d43bd9daa4c70)
2017-02-12 15:43:51 +01:00
Aokromes c9c12be2f3 DB/Quest: Children's Week quest RewardText variables $N / $g
Closes #17728 by tkrokli
(cherry picked from commit dc78f1ecfc25a3d8e150dff571bd65c1e0ffab03)
2017-02-12 15:39:25 +01:00
Aokromes 15531e1740 DB/Creature: missing spawn creature 40405 Kieupid <Pet Trainer>
Closes #17747 by tkrokli
(cherry picked from commit 9796ee5b14bb5cf5baeda4eada345dc708e63142)
2017-02-12 15:16:59 +01:00
tkrokli fcd46dd70c Core/Scripts: move Pet Trainer gossip to DB
SQL content based  on issue 14719 by Killyana,
conditions output from Malcrom's Condition Creator

- remove hardcoded #define gossip options
- enum gossip menu IDs from DB
- remove outdated SD comments at the top of the file

Closes #14719
(cherry picked from commit 03bafe334c178f5731f6eee3de402294017c8ddd)
2017-02-12 15:16:58 +01:00
Dr-J a71aa14d3e DB/Misc: Updates
1) Update to conditions for Zombiefest as previous conditions appear to have stopped working correctly
2) Update for Dark Subjugator to prevent these becoming bugged, also correct unit flags for the sentrys to prevent these from agroing player if too close and dropping immune subjugator if killed
3) Conditions to prevent console spam from Bone Warrior closes #17655
(cherry picked from commit c515cdc636beefa83bb1a022a18f34ca053dcd53)
2017-02-12 14:54:00 +01:00
tkrokli 4f7db62f4b Core/Scripts: remove script npc_timothy_daniels (#17779)
The core script `npc_timothy_daniels` is no longer needed,
all the gossip handling is already present in the database.

- remove core script npc_timothy_daniels
- remove ScriptName from c_t entry in DB
(cherry picked from commit e2f395863a7fb1a85dc7d09f2692198faae16f46)

Rename 2016_08_14_01_world.txt to 2016_08_14_01_world.sql
(cherry picked from commit 6d66adbdf158fbce0bc2cdf796d9987261f6033f)
2017-02-12 14:52:55 +01:00
tkrokli 7223adfea3 Core/Scripts: move npc_mortog_steamhead to DB
Move core script npc_mortog_steamhead to database
- script contains gossip handling + 1 condition
- both actions can be handled in DB settings
(cherry picked from commit 0c6eeb3abc54dbc0f147e5098619e8e19e27accd)
2017-02-12 14:51:31 +01:00
ForesterDev 9d5304fd4f Core/Command: Check account password max length
(cherry picked from commit fdcea5c7efd58c929e5d653af955f524dc543034)

Rename 2016_08_04_05_world.sql to 2016_08_11_00_world.sql
(cherry picked from commit d4f2f5968aadc5145e9a8c58dc7a4e0bd48c87e8)
2017-02-12 14:06:35 +01:00
Dr-J 9fffe777ec DB/Misc: Fixes
1) Make http://www.wowhead.com/quest=13125/the-air-stands-still and http://www.wowhead.com/quest=13235/the-flesh-giant-champion so player only has to tag the elite to receive credit so that if those op elites which assist player does more damage than player they still receive credit.
2) An update to previous script for Murloc Pets
(cherry picked from commit 375593761167ba1bf8ef16bbe345cb569ad1e00b)
2017-02-11 23:01:56 +01:00
Nyeriah e57efc201a DB/Misc: Fix a couple of start up errors and allow the mounted version of Attumen the Huntsmen to skip player damage check
(cherry picked from commit 358af1ccc2eda1732cdaf1584682a7be18c900d8)
2017-02-11 22:45:21 +01:00
treeston af6041740c Scripts/Commands: Some adjustments to make shutdown commands more user-friendly.
- New error message if a shutdown is delayed due to force threshold.
- New status message indicating that a server shutdown was successfully cancelled.

(cherry picked from commit d7602190623153c8f211ad120e22c6e63371f3db)
2017-02-11 22:35:00 +01:00
Dr-J a49cdc8488 DB/Creature: Father Kamaros
1) Add the missing second http://www.wowhead.com/npc=32800/father-kamaros (only http://www.wowhead.com/npc=31279/father-kamaros is spawned
2) Quests http://www.wowhead.com/quest=13221/im-not-dead-yet and http://www.wowhead.com/quest=13229/im-not-dead-yet should become available once  http://www.wowhead.com/quest=13120/deaths-gaze and http://www.wowhead.com/quest=13119/destroying-the-altars become available not once http://www.wowhead.com/quest=13144/killing-two-scourge-with-one-skeleton is rewarded.
3) Quests http://www.wowhead.com/quest=13482/lets-get-out-of-here and http://www.wowhead.com/quest=13481/lets-get-out-of-here should become available once http://www.wowhead.com/quest=13144/killing-two-scourge-with-one-skeleton is rewarded.
4) Both quests I'm Not Dead Yet and Let's Get Out of Here should be exclusive grouped which player gets depends on what phase they are in when they encounter Father Kamaros
5) Script and texts and wp are identical for this quest as confirmed from sniff so duplicating script from 31279
(cherry picked from commit 60c142fd3b466b31ab65babddc8ee2925f78bfbb)
2017-02-11 22:34:59 +01:00
Killyana 5515ff683f DB/SAI: Fix runtime SAI error
(cherry picked from commit 91b2351876bbe13a898dcf5698c7a37cc38e56f5)
2017-02-11 22:34:59 +01:00
Killyana 0b3af66403 DB: Blood elf start location / Sunstrider isle fixes
By msoky

(cherry picked from commit dde5389673203358b01818b870b16bb83695fe0b)
2017-02-11 22:15:54 +01:00
tkrokli 85a16fae3d Core/Scripts: move npc_kharan_mighthammer to DB/SAI
This PR affects the following 2 quests:
Quest ID 4001 "What Is Going On?" - part 2 (Horde)
Quest ID 4342 "Kharan's Tale" (Alliance)

Target of this PR:
Move core script npc_kharan_mighthammer to DB/SAI
(thereby removing 10 lines of hardcoded text).

* DB/conditions: extra gossip conditions

- added conditions for gossip before quest taken and after quest completed.
- removed redundant core script SAY_GET_ME_OUT_OF_HERE comment

* DB/creature: add more text to Kharan

- add all missing creature_text lines to entry 9021 Kharan Mighthammer
- add SAI duration to wait before TEXT_OVER is triggered (3000 ms)

(cherry picked from commit 2125c126097812fd6682db8edfd543c0d5583abf)
2017-02-11 21:52:29 +01:00
Kittnz 8b22ed68ea DB/Creature: Grizzly Hills Vordrassil area
- Add missing Vordrassil's Seed spawns
- Add missing creature spawns: Frostpaw Warrior, Redfang Hunter, Generic Trigger LAB, Frostpaw Shaman, Redfang Elder, Frostpaw Trapper
- Add pathing for Frostpaw Shaman, Frostpaw Warrior
- Change some SAI's, Redfang Hunter SAI, Frostpaw Shaman SAI, Generic Trigger LAB SAI
(cherry picked from commit 2c0b0b6afa7c088e0d16e9b9a76130c0bf5de132)

Fix deleting some gameobjects
(cherry picked from commit 74bf937865dca0908c688bd1e54ddcacb564e46f)
2017-02-11 21:49:11 +01:00
Dr-J d753c24acc DB/Quest: From the Depths of Azjol-Nerub
Fix this http://www.wowhead.com/quest=12036/from-the-depths-of-azjol-nerub again after https://github.com/TrinityCore/TrinityCore/commit/cdf8f3c2e1f0363b6d0b7ce82221c813d633a62c areatrigger_involvedrelation does not like sai triggers
(cherry picked from commit 9977bf74790b25caeb4141122fa5c4cb19393017)
2017-02-11 21:44:47 +01:00
Aokromes 81c5da722d DB/Misc: Fix on startup error
(cherry picked from commit ca99b688edb7a6f8676ed9bf87f91fe913713666)
2017-02-11 21:37:41 +01:00
Dr-J 0f1f74852b DB/Quest: A Couple more event scripts
1) http://www.wowhead.com/quest=11631/vision-of-air so there is actually visual rather than quest been immedietly completed when quest item used
2) Event for turn in of http://www.wowhead.com/quest=11695/the-horn-of-elemental-fury
3) A small fix for Subjugated Iskalder so this npc has to be taken back the the bone witch rather than credit been given on spawn and npc not moving (due to bad follow action),
(cherry picked from commit e7cfb08cb5dce8c99d2e4f70d287a76deba70a98)
2017-02-11 21:37:41 +01:00
Keader 46d6b1a995 Core/Scripts Shade of Akama Rewrite (#17567)
(cherry picked from commit afaaedad2def50ef32ed76ce390efa9523cb80ba)

Rename 9955_22_55_world.sql to 2016_08_01_01_world.sql
(cherry picked from commit 1f8c55d1d67ce0192f8277a7429a5dc5be0b77b1)
2017-02-11 20:57:40 +01:00
ariel- 02cef6f034 Core/GameObjects: Gameobject rotation (from cmangos/mangos-wotlk@2bcbc0f) (#14146)
cmangos/mangos-wotlk@0fe88f35df: [11531] Normalize gameobject's quaternion, thanks to zergtmn for pointing
cmangos/mangos-wotlk@060dfb791b: [11667] Implement transport path rotation
cmangos/mangos-wotlk@565f52c6c1: [11806] A bit gameobject code refactoring
cmangos/mangos-wotlk@6874951: [11807] Add gameobject_addon table

Closes #14146

(cherry picked from commit 2967bf59b4a47837b85c995b732a6761c9c35f7e)

# Conflicts:
#	src/server/game/Battlefield/Battlefield.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Entities/GameObject/GameObject.cpp
#	src/server/game/Entities/GameObject/GameObject.h
#	src/server/game/Entities/Object/Object.cpp
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_gobject.cpp
#	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
#	src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
2017-02-11 19:10:43 +01:00
Aokromes 16463e4122 DB/Creature: Fix dmgschool for multiple creatures.
(cherry picked from commit ea9b44d7499508884b42d54d1a51d61242bc7b1d)
2017-02-11 17:56:05 +01:00
tkrokli d40dd1f639 Core/Scripts: zone_silithus.cpp cleanup (#17165)
- move npcs_rutgar_and_frankal to DB/SAI
- move hardcoded text from go_wind_stone to DB
- additional enum cleanup in zone_silithus.cpp
- also solves a $r issue in SAY_TEMPLAR_AGGRO
(cherry picked from commit b7abaed1996608f9a318a22ff657c5261a7acdfb)

# Conflicts:
#	src/server/scripts/Kalimdor/zone_silithus.cpp
2017-02-11 17:50:06 +01:00
Nyeriah 9db8ae1654 Scripts/Karazhan: Rework Attumen the Huntsman's script
Change log:
- Timers are more accurate
- Corrected Charge ability ID based on 6.x researches
- Added Midnight's missing emotes
- Fixed issue with instance being stuck in combat in case of wipes
- Solved the rare scenario where Attumen would be summoned multiple times
- Visual spell on 3rd phase transition added
- Attumen and Midnight can now be damaged during 3rd phase transition
- Midnight calls for the aid of every horse still alive in the stables
- Use proper spells to summon Attumen and handle transitions
- Now despawns on evade
Video of encounter after changes: https://www.youtube.com/watch?v=KX0rqaBeSzw
(cherry picked from commit 4c4d92faa3b9e82fbabffb03eb63761b282f03a2)

Scripts/Karazhan: Fix a warning
(cherry picked from commit 0cc33b5a42f44847393235c20411e34c7caf2bc5)

Scripts/Karazhan: Register Midnight's summons

* Solves issue with bosses not despawning after encounter
(cherry picked from commit 2d0fa2d0201dce03f958aa7583f51fc92c46f795)
2017-02-11 17:17:38 +01:00
Dr-J 307003fc9c DB/Misc: Various Fixes
1) Add a missing to spell to make http://www.wowhead.com/object=182050/box-of-mushrooms#comments spawn a http://www.wowhead.com/npc=18120/angorosh-mauler when looted
2) http://www.wowhead.com/npc=30718/slumbering-mjordin should not be attackable until gossip selected
3) The Valiant's Challenge - Make the Argent Champion set data on squire danny by creature guid instead of closest creature to prevent credit not being given is player is too far away from squire danny.
4) Add civillian flags to http://www.wowhead.com/npc=18206/wastewalker-captive to prevent these non selectable caged npcs from attacking players
5) http://www.wowhead.com/item=7666/shattered-necklace should have possibility to drop for both factions (not just horde) the item is required for a quest for horde players but starts a different quest which horde cant even accept for alliance.
(cherry picked from commit 36306c40d37c6890f83bcb2b32b916f5baa76b69)
2017-02-11 17:10:59 +01:00
Aokromes 643beaf943 DB/Gameobject: Respawntimer fix for Quest 11695
Closes #17643 by Tauriella
(cherry picked from commit 5a550f9418483eb429a9953ed1ea4cf29620ace5)
2017-02-11 17:05:42 +01:00
Killyana a1dcbfc1b3 DB/Creature: update Drak'aguul script and fix a DB error
Updates #16573

(cherry picked from commit 995f5f1f2b66d5aaa98a8d824959fa95ec36ccc7)
2017-02-11 17:03:07 +01:00
Killyana 2ca6c021e1 Creature/SAI: Add Frostbolt to Gordok Ogre-Mage
(cherry picked from commit eb496e22ebeeb3109e9f5afa9f3e507d8da0a45a)
2017-02-11 17:01:32 +01:00
Killyana 28a029c440 DB/SAI: Kilix the Unraveler event
Closes #16538
By Rushor

(cherry picked from commit cdf8f3c2e1f0363b6d0b7ce82221c813d633a62c)
2017-02-11 16:48:03 +01:00
Killyana 09740ec4c3 DB/SAI: Drak'aguul
Closes #16573

(cherry picked from commit fc2fa483b77eb2c51e5043c9f99d901ed0a3b4e1)
2017-02-11 16:42:28 +01:00
Killyana 3e33e5bf78 DB/Quest: The Keeper's Favor
Fix spell target and cast type
Closes #17623

(cherry picked from commit 10ac7a06dee726f4a8a6a33dba6533cf88eb0e29)
2017-02-11 15:53:55 +01:00
Killyana bc690f9cb0 SAI: Gordok Ogre-Mage
Closes #17627

(cherry picked from commit 9e46786288bd18eb1cbbb80167d9f9852e979388)
2017-02-11 15:48:14 +01:00
Killyana d5677655f2 DB/NPC: Quartermaster Bartlett
Closes #17611

(cherry picked from commit c2e29a34eb4fe35f1e4331d6b7844fa7d15d5e4c)
2017-02-11 15:35:44 +01:00
Kittnz fe1432cbdb DB/Creature: Add waypoints for Deathguard Molder
Closes #17626

(cherry picked from commit ce062250a2fce8069d35e4b56af4ba5920bfab4f)
2017-02-11 15:31:48 +01:00
SnapperRy 13bac539d6 Core/Mail: implement a way to specify NPC sender for mails when they should be different from the quest ender (#17601)
(cherry picked from commit d4e15f1aac3159bb5e17808ee06efb847fdd4789)

# Conflicts:
#	src/server/game/Quests/QuestDef.cpp
#	src/server/game/Quests/QuestDef.h

Rename 9999_99_99_99_world.sql to sql/updates/world/3.3.5/2016_07_19_00_world.sql
(cherry picked from commit 3a77dec6e6fac47fedeb0aeddd09dfe12c3817a2)
2017-02-11 15:19:42 +01:00
Shauren 6f176c0980 Core/Spells: Fixed fishing
Closes #19016
2017-02-11 13:04:12 +01:00
Shauren 87513871dc Fixup pr e5e8537c3e 2017-02-11 11:46:55 +01:00