Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,100 Commits 4 Branches 146 Tags
8d7ab10efa52d4792cdacfcb272be68391b09af1
Commit Graph

9753 Commits

Author SHA1 Message Date
Killyana
5515ff683f DB/SAI: Fix runtime SAI error 
(cherry picked from commit 91b2351876)
 2017-02-11 22:34:59 +01:00
Killyana
0b3af66403 DB: Blood elf start location / Sunstrider isle fixes 
By msoky

(cherry picked from commit dde5389673)
 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 2125c12609)
 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 2c0b0b6afa)

Fix deleting some gameobjects
(cherry picked from commit 74bf937865)
 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 cdf8f3c2e1 areatrigger_involvedrelation does not like sai triggers
(cherry picked from commit 9977bf7479)
 2017-02-11 21:44:47 +01:00
Aokromes
81c5da722d DB/Misc: Fix on startup error 
(cherry picked from commit ca99b688ed)
 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 e7cfb08cb5)
 2017-02-11 21:37:41 +01:00
Keader
46d6b1a995 Core/Scripts Shade of Akama Rewrite (#17567) 
(cherry picked from commit afaaedad2d)

Rename 9955_22_55_world.sql to 2016_08_01_01_world.sql
(cherry picked from commit 1f8c55d1d6)
 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 2967bf59b4)

# 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 ea9b44d749)
 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 b7abaed199)

# 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 4c4d92faa3)

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

Scripts/Karazhan: Register Midnight's summons

* Solves issue with bosses not despawning after encounter
(cherry picked from commit 2d0fa2d020)
 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 36306c40d3)
 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 5a550f9418)
 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 995f5f1f2b)
 2017-02-11 17:03:07 +01:00
Killyana
2ca6c021e1 Creature/SAI: Add Frostbolt to Gordok Ogre-Mage 
(cherry picked from commit eb496e22eb)
 2017-02-11 17:01:32 +01:00
Killyana
28a029c440 DB/SAI: Kilix the Unraveler event 
Closes #16538
By Rushor

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

(cherry picked from commit fc2fa483b7)
 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 10ac7a06de)
 2017-02-11 15:53:55 +01:00
Killyana
bc690f9cb0 SAI: Gordok Ogre-Mage 
Closes #17627

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

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

(cherry picked from commit ce062250a2)
 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 d4e15f1aac)

# 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 3a77dec6e6)
 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
DoctorKraft
e5e8537c3e Core/Spells: Fixed Victory Rush 
Closes #19044
 2017-02-10 23:22:35 +01:00
edreisantafe
9ad50fb08c Core/Spells: Fixed Levitate 
Closes #19091
 2017-02-10 23:03:19 +01:00
vincent-michael
8aacc07727 DB/Quests: Updated quest_poi / quest_poi_points data für 7.1.5 2017-02-09 16:02:50 +01:00
Shauren
bc623ed97f sql name 2017-02-07 21:20:52 +01:00
DoctorKraft
a692ebdcb0 Core/Spell: Conjure Refreshment (#19035) 2017-02-07 21:17:47 +01:00
vincent-michael
941f7d2bbe DB/Quests: Updated quest_template data for 7.1.5 part 3 2017-02-07 18:06:00 +01:00
Dr-J
7a2a8059c9 DB/SAI: Naturalist Bite 
Improvements to previous script which only gave credit for lost in action
(cherry picked from commit f8f207d21c)
 2017-02-05 21:13:43 +01:00
Aokromes
b26efbcfa0 DB/Creature: Misc fixes 
By Malcrom
(cherry picked from commit 58594c2072)
 2017-02-05 21:10:53 +01:00
SnapperRy
06c7849aa1 Core/Conditions: implement CONDITION_DAILY_QUEST_DONE to check whether or not a daily quest has been completed by a player in that day. 
Also use it to fix two quest chains broken in commit 7905651. Should be the only ones of their kind.

(cherry picked from commit b4b3c10c69)
 2017-02-05 21:07:30 +01:00
Aokromes
df3f4ae811 Update 2016_07_12_01_world.sql 
(cherry picked from commit e5f4ef12db)
 2017-02-05 20:44:29 +01:00
Aokromes
80625ce76a DB/Creature: Fix Runetog Wildhammer 
Closes #17592 by Silvertower
(cherry picked from commit 94fce4a641)
 2017-02-05 20:43:05 +01:00
ariel-
5f666a2ce6 Core/Spells: Fix Roar of Sacrifice damage part (#17519) 
(cherry picked from commit 6988407b43)

Rename 2016_99_99_99_world.sql to 2016_07_16_03_world.sql
(cherry picked from commit 4bcb5a058b)
 2017-02-05 20:35:19 +01:00
SnapperRy
9fcaf60706 DB/Loot: remove wrong loot for item 'Recipe: Savory Deviate Delight' 
Reference loot belongs to 'Murloc Warrior' hailing from Westfall, while the item can only drop from The Barrens' residents
(cherry picked from commit 8b5d193507)
 2017-02-05 20:07:47 +01:00
SnapperRy
61ac98fce2 DB/Conditions: fix cast conditions for two more spells 
(cherry picked from commit c8e9184a4b)
 2017-02-05 20:02:02 +01:00
SnapperRy
c5c399e14f DB/Conditions: fix three spells that require a NPC to be nearby 
Namely, the Venomhide Hatchling feeding quests
(cherry picked from commit 55ba3bd012)
 2017-02-05 19:59:25 +01:00
SnapperRy
0d7a49aa76 DB/Conditions: fix exploit related to quest Disclosure (ID: 12710) 
NPC could be repeatedly summoned by clicking the related gameobject
(cherry picked from commit 11558b3bdc)
 2017-02-05 19:58:13 +01:00
SnapperRy
77f490f630 DB/Mail: add Argent Tournament mail sent when reaching level 77 
(cherry picked from commit f784c36aa6)
 2017-02-05 17:52:32 +01:00
Andrew Letson
53c98267a5 Core/Scripts: Migrate Tanaris NPC's to SAI (#17390) 
(cherry picked from commit 6ea48c036e)

Rename 2016_06_15_99_world.sql to 2016_07_15_08_world.sql
(cherry picked from commit a37a8a316b)
 2017-02-05 17:48:52 +01:00
SnapperRy
3e74109857 Core/SmartAI: change SMART_ACTION_RISE_UP (114) to SMART_ACTION_MOVE_OFFSET and implement offset movement via target fields. (#17362) 
(cherry picked from commit ba0cb53b02)

Rename 9999_99_99_99_world.sql to 2016_07_15_07_world.sql
(cherry picked from commit 2fd124f9a3)
 2017-02-05 17:45:07 +01:00
SnapperRy
dd9cff8328 DB/Script: partly script Shadowy Assassin's event in Southshore 
Updates #14880
(cherry picked from commit c4cbc4341f)

Change creature guid for previous commit

Thanks Aokromes. Also forgot to mention, thanks Rushor for the main script
(cherry picked from commit e9ef43cc20)
 2017-02-05 17:36:10 +01:00
Aokromes
8f1e4df9d6 Rename 9999_99_99_99_world.sql to 2016_07_15_05_world.sql 
(cherry picked from commit 95e77fba90)
 2017-02-05 17:33:10 +01:00
SnapperRy
c9cb63653a Core/Creature: implement INHABIT_ROOT to apply UNIT_STATE_ROOT to creature (#17543) 
Add flag 8 to InhabitType for creatures that should appear rooted client-side
(cherry picked from commit f78ab9aba4)
 2017-02-05 17:32:10 +01:00
robinsch
3ef1f2c531 Script/Archavon: Implement EMOTE_LEAP (#17588) 
(cherry picked from commit 8a2df73a82)

Script/Archavon: Implement EMOTE_LEAP

By robinsch
(cherry picked from commit 1a2bd0dc3a)
 2017-02-05 17:31:54 +01:00
SnapperRy
bec8570eb2 DB/Loot: reduce drop chance for many white items 
Closes #17578
(cherry picked from commit b5cb96a56a)
 2017-02-05 17:25:55 +01:00
SnapperRy
cfca1896de DB/Quest: fix availability for Alliance's breadcrumb quests to Ashenvale 
Onward to Ashenvale can always be done, while only one quest between Trek to Ashenvale and the Draenei-only Travel to Astranaar can be completed.
(cherry picked from commit 4fea1c59e1)
 2017-02-05 17:24:55 +01:00