Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,535 Commits 4 Branches 146 Tags
c7604d87cf5edb9819968cd8ac1377842e14ff21
Commit Graph

9287 Commits

Author SHA1 Message Date
Keader
9c6a43327f Core/Scripts: Teron Gorefiend encounter rewrite (#18263) 
(cherry picked from commit 109174146c)
 2018-02-11 16:37:10 +01:00
Keader
9b9fd4ee24 Core/Scripts: Minor Fixes in Black Temple (#18293) 
Core/Scripts: Minor Fixes in Black Temple

(cherry picked from commit bced796414)
 2018-02-11 16:21:59 +01:00
Keader
83d0ba4b89 Core/Scripts: Gurtogg Bloodboil Rewrite (#18279) 
(cherry picked from commit eb41194dbb)

Rename 9999_25_44_50_world.sql to 2016_11_26_02_world.sql
(cherry picked from commit 8975fb73f0)
 2018-02-11 16:20:32 +01:00
Keader
aab6416e64 Core/Scripts: Fixed Supremus encounter (#18234) 
Core/Scripts: Fixed Supremus encounter

(cherry picked from commit 51507efd01)
 2018-02-11 16:04:28 +01:00
Keader
95ca7b11d0 Core/Scripts: Improved High Warlord Naj'entus fight - Black Temple (#18229) 
Core/Scripts: Improved High Warlord Naj'entus fight

(cherry picked from commit 571b3b6a76)
 2018-02-11 16:02:20 +01:00
Andrew Blakely
06e1990af2 Core/Scripts: Fixed Vaelastrasz bomb mechanic (#18260) 
* Core/Scripts: Fixed Vaelastrasz bomb mechanic

Vaelstraz was suppose to bomb raid members that are mana users every 15
seconds. He was not doing that with the current implementation.

This implementation allows him to bomb the raid and to select the proper
targets. This is also done in a cleaner way.

* Added AuraScript for SPELL_BURNINGADRENALINE

Needed to define an AuraScript for custom behavior that would denatonate
the damaging aura when the debuff falls off.

SpellId - 18173

* Added SQL for Burning Adrenaline Script Ref

* Fixed Multiple Application of BA

* Add unit null check in lambda

* Remove DB name from sql query

* Added Newline in SQL update file.

* Added SQL delete query for potential existing spell

* Fix SQL newline again.

* As suggested a simpler SpellCast overload works

I don't know if there are any consequences but it seems to function fine
in in-game.

I'd like more information on the overload that involves an AuraEffect.

* Remove duplicate Unit null check in lambda

* Update boss_vaelastrasz.cpp

(cherry picked from commit 60ac53ff07)

# Conflicts:
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
 2018-02-11 16:00:49 +01:00
Aokromes
258a06b278 Merge pull request #18094 from Staleness89/3.3.5 
Script/Quest: Rivenwood Captives

(cherry picked from commit 8a864fc085)
 2018-02-11 14:49:18 +01:00
Keader
4a97a5b5b2 DB/Creature: Supremus (BT) trash mobs, waypoints & spawns 
Dragonmaw Sky Stalker (ID 23030) &
Dragonmaw Wind Reaver (ID 23330)

- added 9 missing spawns (23030 / 54254-54262)
- reinserted correct waypoints based on sniffs

Closes #18232

(cherry picked from commit b333c92d0c)
 2018-02-11 12:24:44 +01:00
Killyana
bc23d8c892 Creature/script: Add area restriction for Freed Proto Drake 
Closes #11754
Thanks to ariel-

(cherry picked from commit 3cc89c32d5)
 2018-02-11 12:19:48 +01:00
Killyana
44a91e0230 DB/Creature: Root for 7th Legion Chain Gun 
Closes #16308

(cherry picked from commit 50d9a7494b)
 2018-02-11 12:18:16 +01:00
Teppic1
4e373426aa DB/Loot: Redo Prowler table and remove exploit 
Ref #21341
 2018-02-04 14:33:30 +01:00
Aokromes
89f86298b2 DB/Gameobject: Spawn go for quest Livin' the life 
By Kilyana closes #11489
 2018-02-02 23:35:46 +01:00
Aokromes
f166cfe4e9 DB/Misc: Some Westfall Fixes 
By Kilyana
 2018-02-02 22:32:05 +01:00
Shauren
a3b9eb21b3 Fixed typo in sql 2018-02-01 12:16:24 +01:00
Shauren
b3f9d5e5af Core/Gossip: Revert renaming/changing types part of 853df91048 
Closes #21186
 2018-02-01 12:09:58 +01:00
Aokromes
0f5b8447d0 DB/Creature: Delete incorrectly spawned Gharsul the Remorseless 
Closes #21326
 2018-01-29 15:48:59 +01:00
funjoker
c4bf996c7d Core/Spells: Allow skipping automatic removal of auras from spell_area when condition is no longer met (mostly used for cosmetic cutscenes after quest completion) (#21317) 2018-01-28 19:33:33 +01:00
Aokromes
771ec0b225 Update 2018_01_20_01_world.sql 2018-01-21 11:10:36 +01:00
Aokromes
9e8b4bd4e2 DB/Misc: Some Westfall Fixes 
By danaton
 2018-01-20 16:48:26 +01:00
Aokromes
1a32b1d322 DB/Quest: add Burning Blade Spellscroll loot 
By offl
Closes #16401
 2018-01-20 10:10:34 +01:00
joschiwald
ed318fdc46 Core/Battleground: Dropped battleground texts from trinity_string and replaced them with proper BroadcastText 2018-01-14 18:48:01 +01:00
ariel-
8cb118009e Core/Spell: restore old proc system behaviour on auras self proc. 
- Use Spell::m_triggeredByAuraSpell and compare against trigger aura, it requires scripts to set triggeredByAura parameter.
- Fixed existing scripts lacking it

DB/Spell: Anger Capacitor (Tiny Abomination in a Jar) proc

Closes #18269

(cherry picked from commit 5b56c94e6d)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Spells/Auras/SpellAuras.cpp
#	src/server/game/Spells/Spell.cpp
#	src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
#	src/server/scripts/Pet/pet_hunter.cpp
#	src/server/scripts/Spells/spell_dk.cpp
#	src/server/scripts/Spells/spell_druid.cpp
#	src/server/scripts/Spells/spell_hunter.cpp
#	src/server/scripts/Spells/spell_item.cpp
#	src/server/scripts/Spells/spell_mage.cpp
#	src/server/scripts/Spells/spell_paladin.cpp
#	src/server/scripts/Spells/spell_priest.cpp
#	src/server/scripts/Spells/spell_rogue.cpp
#	src/server/scripts/Spells/spell_shaman.cpp
#	src/server/scripts/Spells/spell_warlock.cpp
#	src/server/scripts/Spells/spell_warrior.cpp
 2018-01-13 16:38:07 +01:00
Shauren
bb718b5578 Core/Entities: Remove phasemask 2018-01-10 22:01:40 +01:00
Aokromes
9b474524e7 DB/Quests: Some elwynn forest fixes 
By danaton
 2018-01-06 22:00:57 +01:00
Aokromes
c46d6ae546 DB/Quest: Defeat the Gearmaster 
By Kilyana closes #16569
 2018-01-06 21:12:34 +01:00
joschiwald
5f1e65599b DB/World: Fixed some startup errors 
Closes #21191
 2018-01-06 19:57:33 +01:00
joschiwald
5e3e4182c8 Core/Entities: Extended SpawnMask to 64 bit 2018-01-06 19:56:11 +01:00
Aokromes
8668fb924a DB/creature: Tushui Quartermaster 
By ArcaneFox closes #19155
 2018-01-06 11:41:03 +01:00
Aokromes
85fbf07dca DB/creature: Lion's Rest 
By ArcaneFox, closes #19161
 2018-01-06 11:26:09 +01:00
Aokromes
8dd779a80a Update 2018_01_06_01_world.sql 2018-01-06 11:13:45 +01:00
Aokromes
1154388581 Update 2018_01_06_01_world.sql 2018-01-06 11:09:06 +01:00
Aokromes
931b457639 Update 2018_01_06_01_world.sql 2018-01-06 11:03:22 +01:00
Aokromes
4810e020ff DB/Spawns: New orgrimmar spawns + Brawl'gar arena 
By someone who deleted account.
 2018-01-06 10:58:46 +01:00
Aokromes
7aa22e7bdd DB/Creature: Implement trainers 
By Aussiewoolf 
Closes #21089 closes #21090 closes #21091
 2018-01-06 06:33:51 +01:00
joschiwald
266ca3cc5e DB/Locales: Updated locales for ruRU to 7.3.2.25549 
Big thanks to @mdX7
 2018-01-06 02:06:36 +01:00
joschiwald
8966e957b6 DB/Locales: Updated locales for zhTW to 7.3.2.25549 2018-01-06 01:27:11 +01:00
joschiwald
76577ddc3c DB/Locales: Updated locales for zhCN to 7.3.2.25549 2018-01-06 01:00:26 +01:00
joschiwald
8ed65cc0ac DB/Locales: Updated locales for koKR to 7.3.2.25549 2018-01-06 00:16:16 +01:00
joschiwald
8e8a9df920 DB/Locales: Updated locales for ptBR to 7.3.2.25549 2018-01-05 23:33:28 +01:00
joschiwald
ec0936092b DB/Locales: Updated locales for esMX to 7.3.2.25549 2018-01-05 22:40:28 +01:00
joschiwald
c78f3d41c6 DB/Locales: Updated locales for itIT to 7.3.2.25549 2018-01-05 22:19:19 +01:00
joschiwald
cecf50a924 DB/World: Updated creature locales for deDE, esES, frFR to 7.3.2.25549 2018-01-05 17:56:59 +01:00
joschiwald
e075435ac4 DB/World: Updated 2 creature_template names 2018-01-05 16:57:47 +01:00
joschiwald
0d1e251e32 Core/Creature: Added TitleAlt to creature_template 2018-01-05 16:46:51 +01:00
joschiwald
739b5309bf DB/World: Updated quest locales for deDE, esES, frFR to 7.3.2.25549 2018-01-05 13:38:06 +01:00
joschiwald
200f72320b DB/Hotfixes: Updated broadcast_text_locale for deDE, esES, frFR to 7.3.2.25549 2018-01-05 00:01:22 +01:00
joschiwald
c2aead1da5 DB: Made timestamp columns, those can have no date, nullable instead of saving invalid date '0000-00-00 00:00:00' 
* This makes our tables mysql strict mode conform

Ref #21113
 2018-01-02 20:55:57 +01:00
Killyana
9f94941a3e DB/Creature: Cosmetic Mottled Raptor 
Closes #18168
 2018-01-01 21:00:02 +01:00
ModoX
549408a706 DB/World: Updated quests to 7.3.2.25549 2018-01-01 20:19:31 +01:00
ModoX
3de380d376 DB/World: Updated creatures to 7.3.2.25549 2018-01-01 20:17:35 +01:00