Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,229 Commits 4 Branches 146 Tags
c4f2012ef5edb89d825deba4c04897f1ff16bdcf
Commit Graph

30229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustavo
c4f2012ef5 Core/Spells Make credit for quests "The Grand Melee" and "Among the Champions" a triggered cast (#17870) 
Fix a problem where the credit wasn't casted due to CGD
(cherry picked from commit e1761a24ce)
 2017-02-18 17:23:20 +01:00
treeston
a0d48b92d5 Creature/Gossip: offer replacement functions for the existing preprocessor gossip macros 
(cherry picked from commit 175db157f7)

You saw nothing (build fix).
(cherry picked from commit 72a7f4b507)

Build fix. Again. Oops.
(cherry picked from commit 61eb70fd82)

....right, I actually went through a full rebuild now just to make sure it works.
(cherry picked from commit 8531f012a2)

Last one. For real. Please. (Build fix #5).
(cherry picked from commit a32536d490)
 2017-02-18 17:22:53 +01:00
Dr-J
00fed3d44f DB/SAI: Ahab Wheathoof 
* NPC should turn towards invoker and stay facing for a short duration before turning back towards pillar when says line asking about his dog.
* Npc should only have fork equipped when he turns towards player at all other times has hammer equipped
* Added script for when periodically hammers the notice pillar
(cherry picked from commit 2b992d4cb0)
 2017-02-18 17:22:25 +01:00
jackpoz
3cd6e1dd82 Core/Loot: Fix group loot if player loot recipient disconnects 
Fixes #13300

(cherry picked from commit 38f8a03781)
 2017-02-18 17:21:00 +01:00
ariel-
d4a2a725e4 Update SpellEffects.cpp 
(cherry picked from commit 5b81f55141)
 2017-02-18 17:20:42 +01:00
ariel-
27208252ee Core/Spell: Calculate GO rotation for SPELL_EFFECT_TRANS_DOOR 
(cherry picked from commit f5a0342913)

# Conflicts:
#	src/server/game/Spells/SpellEffects.cpp
 2017-02-18 17:19:40 +01:00
ariel-
8a3f053a2f Core/GameObject: save spawn GOState and reset to it instead of toggling from whatever current state we have 
Prevents exploit of SMART_ACTION_ACTIVATE_GOBJECT

(cherry picked from commit be3199314a)
 2017-02-18 17:17:18 +01:00
ariel-
54b038fe2f Core/Entities: Added possibility to construct a Position using a G3D::Vector3 
(cherry picked from commit 17917171f3)
 2017-02-18 17:16:11 +01:00
ariel-
b3f993894a Core/Scripts: Professor Putricide oozes, reapply passive proc auras on reset, and register them as PP summons since they're summoned by a trigger. (f183ed3c50 follow-up) 
(cherry picked from commit 27590fbb98)
 2017-02-18 17:16:11 +01:00
treeston
e0b557c858 Entities/Unit: Add overload to NearTeleportTo taking Position const&. 
(cherry picked from commit 211eee0fce)
 2017-02-18 17:16:10 +01:00
treeston
5c01d14056 Entities/Creature: Add arg2 to DespawnOrUnsummon to allow overriding respawn time. This matches changes that will be merged as part of dynamic spawning, allowing scripts to transition early. 
(cherry picked from commit 4bcc8078d7)
 2017-02-18 17:16:10 +01:00
SnapperRy
668abbf18b Core/Unit: do not refresh last damaged timer if hit by SPELL_AURA_DAMAGE_SHIELD. 
Fixes spells like Retribution Aura, Thorns and Damage Shield that were preventing units from evading.

(cherry picked from commit 42a32a3c7c)
 2017-02-18 17:16:10 +01:00
Ryan
e20f44146e Core/Instance: Fix GetInstanceSave sometimes checking the wrong map (#17856) 
(cherry picked from commit 9c504c8a8e)
 2017-02-18 17:16:05 +01:00
ariel-
7f66c730ec Update boss_kelthuzad.cpp 
(cherry picked from commit 7e4abce820)

Core/Scripts: fix math error that would not select points on the entire circle
(cherry picked from commit cd9226e755)
 2017-02-18 16:54:56 +01:00
treeston
77ecafaa42 Entities/GameObject: Expose GO rotation to scripting. 
(cherry picked from commit bdbe3f22e0)
 2017-02-18 16:53:44 +01:00
Dr-J
5aa7e2a133 DB/Quest: The Journey Has Just Begun 
http://www.wowhead.com/quest=7493/the-journey-has-just-begun should become available when either level 60 or 80 version of Onyxias head quest is turned not only the level 60 version
(cherry picked from commit 01e5a5b4e7)
 2017-02-18 16:53:29 +01:00
Dr-J
2a105e5c9f DB/Loot: Summoned Zombie 
Remove all loot from summoned zombie http://www.wowhead.com/npc=10698/summoned-zombie as these npcs where rather generous on TC as they are meant to drop no loot.
(cherry picked from commit 0a4b4dec09)
 2017-02-18 16:52:34 +01:00
SnapperRy
565e2555b9 DB/SAI: remove wrong dynamicflag from creature Proto-Drake Egg 
Made the tooltip appear as if a Hunter used Beast Lore on them
(cherry picked from commit 59f340b751)
 2017-02-18 16:51:22 +01:00
Gustavo
accbb587b8 Core/Scripts Boss Skadi the Ruthless rework 
(cherry picked from commit 40114cacd3)

Rename 2016_99_99_00_world.sql to 2016_08_25_06_world.sql
(cherry picked from commit 738e3cf002)

travis is lazy
(cherry picked from commit 92876278fe)
 2017-02-18 16:44:24 +01:00
tkrokli
ac88c6ec17 Core/Scripts: move npc_experience hardcoded text to DB 
(cherry picked from commit 8df4706992)

Rename 2016_08_28_17750_world.sql to 2016_08_25_05_world.sql
(cherry picked from commit 9c41af16ca)
 2017-02-18 16:23:19 +01:00
tkrokli
d01dbdc528 Core/Scripts: move #define to enum in boss_kalecgos.cpp 
(cherry picked from commit 8bc00e8952)
 2017-02-18 16:20:47 +01:00
SnapperRy
80b6f54624 DB/Spell: linked spell for Worg Disguise 
Allows players to remove it by right-clicking. Confirmed from sniffs.
(cherry picked from commit 69bec9a022)
 2017-02-18 16:20:34 +01:00
tkrokli
89923791b8 Core/Scripts: move forge_of_souls gossip to DB 
(cherry picked from commit 537074a809)

Rename 2016_08_24_20_world.sql to 2016_08_25_03_world.sql
(cherry picked from commit 8500d0f9e0)
 2017-02-18 16:19:17 +01:00
Aokromes
038012d4f8 DB/Gameobject: Fix respawn time of few Quest GameObjects 
Closes #17845 closes #17846 by Tauriella
(cherry picked from commit ee204984c2)
 2017-02-18 16:19:17 +01:00
Gustavo
a4fc7d9d2d Core/Scripts Implement Pit of Saron Cavern event 
(cherry picked from commit b459c6607f)

Rename 2016_99_99_99_world.sql to 2016_08_25_01_world.sql
(cherry picked from commit 05df3cc988)
 2017-02-18 16:16:00 +01:00
Gustavo
e8df5babe6 Scripts/Pet Implemented Argent Squire/Gruntling and Argent Pony Bridle 
(cherry picked from commit 989aaaa8b5)

Rename 2016_08_15_17779_world.sql to 2016_08_25_00_world.sql
(cherry picked from commit 526dfca864)
 2017-02-18 16:00:52 +01:00
SnapperRy
3e4ca641d3 DB/Conditions: fix target for spell Throw Snowball 
Cannot be used to kill friendly targets anymore.
(cherry picked from commit 17e267ed8b)

Forgot this
(cherry picked from commit 0be073dacf)
 2017-02-18 15:57:19 +01:00
treeston
8a4a51aadf Core/Movement: Properly clear UNIT_STATE_MOVING when reaching chase target. 
(cherry picked from commit 6ae887a5a9)
 2017-02-18 15:57:19 +01:00
treeston
df0d32be81 Merge remote-tracking branch 'Treeston/3.3.5-kelthuzad' into 3.3.5 (PR #16634) 
(cherry picked from commit 47a9cb1e56)

...Huh. Wonder how this one didn't make travis complain on the PR.
(cherry picked from commit 93a68d5881)

Was Travis completely napping on this one?
(cherry picked from commit 2d7dec0d39)
 2017-02-18 15:57:19 +01:00
SnapperRy
41ed592d05 Core/Achievements: implement ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY to check if the item with entry miscvalue1 is exactly of the quality specified in achievement_criteria_data's value1 field. 
Also ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPED_ITEM --> ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPPED_ITEM

(cherry picked from commit 2b48082b9d)
 2017-02-18 15:57:18 +01:00
treeston
bf5988733b DB/Quest: Revert 376d281 and 63c77d2, move changes to reputation_reward_rate instead. 
(cherry picked from commit 1ccdad6eb3)
 2017-02-18 15:49:07 +01:00
SnapperRy
75701f14c3 DB/Quest: fix reputation and offer reward text for quests "Mission Accomplished" 
Closes #17379
(cherry picked from commit 3bc9214391)
 2017-02-18 15:49:06 +01:00
ariel-
c04384b691 Core/SmartAI: fix warning reported by VS2015 
(cherry picked from commit 83c032c2a8)
 2017-02-18 15:49:06 +01:00
treeston
ab6f8f9fb7 Scripts/HallsOfLightning: Fix Volkhan healing. 
(cherry picked from commit 5da3ae0489)
 2017-02-18 15:49:06 +01:00
tkrokli
16c6e0fb80 Core/Scripts: set correct unit_flags on Scarlet Mine Car (#17844) 
Closes #17816
(cherry picked from commit f3dc97f263)

Rename 2016_08_24_08_world.sql to 2016_08_24_03_world.sql
(cherry picked from commit cabf6bd98a)
 2017-02-18 15:49:05 +01:00
treeston
5fd64171a9 DB/Creature: Remove random untargetable flag from a dragonkin in Crystalsong Forest. Sniff confirms flag is incorrect. 
(cherry picked from commit eda05a636e)
 2017-02-18 15:49:05 +01:00
SnapperRy
3a32b50002 DB/Quest: use the new SMART_TARGET_LOOT_RECIPIENTS for quest "Feeding Arngrim" 
By Treeston, closes #16169
(cherry picked from commit c5904a5430)
 2017-02-18 15:49:05 +01:00
SnapperRy
2629009bde DB/Quest: fix event for quest "Mimicking Nature's Call" 
(cherry picked from commit 91cdbf8edd)
 2017-02-18 15:49:04 +01:00
SnapperRy
8220496be1 Core/SmartAI: allow SMART_TARGET_OWNER_OR_SUMMONER to target a temporary summon's summoner, too (#17851) 
Core/SmartAI: allow SMART_TARGET_OWNER_OR_SUMMONER to target a temporary summon's summoner, too
(cherry picked from commit 1fcd03b60a)
 2017-02-18 14:47:01 +01:00
SnapperRy
6ea973adec Core/SmartAI: add param2 to SMART_ACTION_UPDATE_TEMPLATE, allowing to specify if creature's level should remain the same between entry updates. 
A value of 0 (default) forces the creature to keep its current level between entry updates.

Fixes #16371

(cherry picked from commit a6ef9d4539)
 2017-02-18 14:47:01 +01:00
SnapperRy
6a8ca9b0bf Core/Event: prevent seasonal quests from resetting at server restart (#17455) 
Closes #16015.
Closes #16413.
(cherry picked from commit fb6d4dd98f)
 2017-02-18 14:47:00 +01:00
SnapperRy
a6209e6d6d Event/Brewfest: implement relay race (#17603) 
(cherry picked from commit 894378f867)

Rename 9999_99_99_99_world.sql to 2016_08_23_05_world.sql
(cherry picked from commit 6036b07f25)
 2017-02-18 14:47:00 +01:00
tkrokli
d8befaf68b Core/Scripts: npc_wormhole #define text moved to DB (#17805) 
Another core script hardcoded text removal:
- removed #define text from script
- added the text to gossip_menu_option
- added and renamed enum to match DB entries
- minor additional adjustments and comments

Closes #6841
(cherry picked from commit 8a0990376d)
 2017-02-18 14:42:03 +01:00
Gustavo
7e57e9a91b Improve scripts for quests Breakfast Of Champions and A Bear of an Appetite (#17780) 
Properly despawn the related GameObjects after use of the quest item, avoiding multiple use and summon
(cherry picked from commit 5661b4686b)

Rename 2016_08_99_99_world.sql to 2016_08_23_03_world.sql
(cherry picked from commit 831975fa34)
 2017-02-18 14:40:14 +01:00
SnapperRy
2574667854 Scripts/ArgentTournament: improve training dummy script 
Now the ranged and charge target dummies will cast their spells and behave correctly for the related quests
(cherry picked from commit 433beb77e3)
 2017-02-18 14:38:42 +01:00
SnapperRy
3b32bfb650 DB/Conditions: allow spell Counterattack! to target Sunreaver Hawkstrider 
Used by the Argent Tournament's Melee Targets. Was only working for Alliance players due to wrong entry set for the Horde vehicle
(cherry picked from commit 02df4f840a)
 2017-02-18 14:38:01 +01:00
Killyana
39360e69fe DB/Condition: Condition for Fumping spell used on The Big Bone Worm quest 
Updates #11418
By  sirikfoll

(cherry picked from commit f1feb5ac30)
 2017-02-18 14:36:40 +01:00
Killyana
c312fdd3cd DB/Condition: Bael'Gar's Fiery Essence 
By sirikfoll
Closes #12909

(cherry picked from commit 4a3967c8c2)
 2017-02-18 14:34:38 +01:00
SnapperRy
a45d43367c DB/Conditions: cosmetic fix for quest "War is Hell" 
Fires will appear on the corpses' positions instead of the caster's
(cherry picked from commit aec583ffe9)
 2017-02-18 14:31:44 +01:00
Shauren
9b63ee4333 Core/Creatures: Exclude despawned creatures from being found by "nearest entry" searchers 
Updates #11418
Closes #17706

(cherry picked from commit 75c34bda67)
 2017-02-18 14:30:32 +01:00