araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 14:10:18 -04:00
Code Issues Packages Projects Releases Wiki Activity
39,720 Commits 17 Branches 140 Tags
3db9034f4c9bfe532cb2e32fa3abff01c94de3bf
Commit Graph

39720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wyrserth 5c2a9364a4 DB/SAI: implement out-of-combat event for NPC Ranger Jaela. 
Closes #23535.

(cherry picked from commit fa0fc13fd0)
 2021-12-13 00:42:19 +01:00
Wyrserth 1a65c72939 DB/SAI: add out-of-combat texts to Instructor Hroegar 
(cherry picked from commit 45a2388bc0)
 2021-12-13 00:42:19 +01:00
Wyrserth 04b02f3672 Core/Spell: Challenge Flag should only hit one target. 
(cherry picked from commit 39aa91f982)
 2021-12-13 00:42:19 +01:00
Wyrserth 866a079600 DB/SAI: script creature Mjordin Combatant involved in the quest Honor Challenge. 
(cherry picked from commit e803ba7732)
 2021-12-13 00:42:19 +01:00
ccrs 8be1927d31 Scripts/ICC: base support for Ymirjar Vrykuls AI 
(cherry picked from commit 3dbf3fed7c)
 2021-12-13 00:42:19 +01:00
Wyrserth 41df87d7aa DB/Creature: fix spawns and emote state for Mjordin Combatants in Icecrown. 
(cherry picked from commit e1787b883e)
 2021-12-13 00:42:19 +01:00
ccrs 9d84b56df1 Scripts/ICC: 1eb2aef followup 
(cherry picked from commit 3e9b553618)
 2021-12-13 00:42:19 +01:00
Shauren 116285818b Core/Misc: Corrected file headers 2021-12-13 00:42:19 +01:00
ccrs bb321ccb02 Scripts/ICC: move Sister Svalna to her own file 
I've almost guttered her, so lets try it more gently this time

(cherry picked from commit 1eb2aef179)
 2021-12-13 00:42:19 +01:00
Wyrserth 94599bd323 DB/Quest: remove quest requirements from the Consortium monthly quests. 
Only one is available each month, based on reputation standing. They're not chained.

(cherry picked from commit 5aedc4a510)
 2021-12-13 00:42:19 +01:00
ccrs fce492d2e2 Core/Instance: 14788ce followup 
No need to repeat code

(cherry picked from commit b9a8095967)
 2021-12-13 00:42:19 +01:00
Wyrserth 9d861a51c2 DB/SAI: improvements for quest Powering our Defenses: 
- There are two waves of three Enraged Wraith each
- The quest does not fail when the Infused Crystal is killed, as the quest item is not consumable so the player can try again straight away

(cherry picked from commit d213970719)
 2021-12-13 00:42:19 +01:00
ccrs 5e3ba5e96f Scripts/ICC: 94b60ff followup 
(cherry picked from commit eb6ea57e7f)
 2021-12-13 00:42:19 +01:00
ccrs 934b72262d Core/Instance: add new method 
(cherry picked from commit 14788ce026)
 2021-12-13 00:42:18 +01:00
ccrs 6a63200e40 Core/Instance: add new hook & method 
(cherry picked from commit 953b05459a)
 2021-12-13 00:42:18 +01:00
ccrs fc6dc06513 Build: fix error 
/var/lib/jenkins/jobs/tc_335_release_clang40_boost_1.63.0_nopch/workspace/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp:583:132: warning: format specifies type 'unsigned int' but the argument has type 'float' [-Wformat]
                TC_LOG_TRACE("scripts.cos", "npc_arthas_stratholmeAI::AdvanceToState: has snapback for this state, distance = %u", target.SnapbackPosition->GetExactDist(me));
                                                                                                                              ~~   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                                                                                              %f
/var/lib/jenkins/jobs/tc_335_release_clang40_boost_1.63.0_nopch/workspace/src/common/Logging/Log.h:176:56: note: expanded from macro 'TC_LOG_TRACE'
    TC_LOG_MESSAGE_BODY(filterType__, LOG_LEVEL_TRACE, __VA_ARGS__)
                                                       ^~~~~~~~~~~
/var/lib/jenkins/jobs/tc_335_release_clang40_boost_1.63.0_nopch/workspace/src/common/Logging/Log.h:159:32: note: expanded from macro 'TC_LOG_MESSAGE_BODY'
                    check_args(__VA_ARGS__);                            \
                               ^~~~~~~~~~~

(cherry picked from commit 303811399f)
 2021-12-13 00:42:18 +01:00
ccrs 70fd6e7398 Core/Instances: improve DoRemoveAurasDueToSpellOnPlayers & DoCastSpellOnPlayers handling 
(cherry picked from commit 22b3b21ae3)
 2021-12-13 00:42:18 +01:00
ccrs cadbf42ea4 Misc: some corrections after recent merges 
(cherry picked from commit 626a24822b)
 2021-12-13 00:42:18 +01:00
Sorikoff 996b7c1f0e Scripts/Spells: Ultrasafe Transporter: Toshley's Station (#23537) 
* Scripts/Spells: Ultrasafe Transporter: Toshley's Station

* Rename 9999_99_99_99_world.sql to 2019_06_29_01_world.sql

(cherry picked from commit 33b4ad5a89)
 2021-12-13 00:42:18 +01:00
Sorikoff 7b08125c23 Scripts/Spells: Remove Collapsing Cave Aura (#23533) 
* Scripts/Spells: Remove Collapsing Cave Aura

* Rename 9999_99_99_99_world.sql to 2019_06_29_00_world.sql

(cherry picked from commit 8d1a5fa126)
 2021-12-13 00:42:18 +01:00
Wyrserth 5ca9f51033 Core/Loot: fix issue that prevented players from rolling for an unique-category item while an equipped item shares the same unique-category. 
(cherry picked from commit eb7a6391aa)
 2021-12-13 00:42:18 +01:00
jackpoz 841630fcc3 Core/Misc: Fix static analysis issues reported by Coverity Scan 
(cherry picked from commit de88691e25)
 2021-12-13 00:42:18 +01:00
Sorikoff 88457030cc Scripts/Spells: Deathbolt (#23531) 
* Scripts/Spells: Deathbolt

* Rename 9999_99_99_99_world.sql to 2019_06_28_01_world.sql

(cherry picked from commit 62b2c379b3)
 2021-12-13 00:42:18 +01:00
Sorikoff ea4c1ae7d0 Scripts/Spells: Dimensional Ripper - Area 52 (#23505) 
* Scripts/Spells: Dimensional Ripper - Area 52

* Rename 9999_99_99_99_world.sql to 2019_06_28_00_world.sql

(cherry picked from commit 63f548921c)
 2021-12-13 00:42:18 +01:00
Wyrserth 2fea2a1e81 Core/GameObject: do not allow consumable chests to restock while partially looted. 
(cherry picked from commit cd73664f53)
 2021-12-13 00:42:18 +01:00
Wyrserth f136d3cfe0 Core/GameObject: fix some cases where summoned gameobjects of a type different than chest or goober would behave wrongly. 
(cherry picked from commit 9f0ac0c243)
 2021-12-13 00:42:18 +01:00
Wyrserth 575f42089e Core/Spell: fix some issues with taunt spells (#23425) 
(cherry picked from commit 5dc2dfd60c)
 2021-12-13 00:42:18 +01:00
Wyrserth 9d40a105e6 Core/Mail: include 100g in the mail sent after turning in the quest The Wrath of Neptulon (#23500) 
(cherry picked from commit cf223370f3)
 2021-12-13 00:42:18 +01:00
Wyrserth 5c5bcba65a Script/ZulGurub: rewrite High Priest Thekal's encounter script (#23429) 
(cherry picked from commit 365e2f191e)
 2021-12-13 00:42:18 +01:00
Wyrserth c637260a37 Core/GameObject: implement restock mechanic for non-consumable gameobjects (#23526) 
(cherry picked from commit e77c2d55c4)
 2021-12-13 00:42:17 +01:00
Killyana a71823811e DB/Loot: remove wrong loot from gameobjects Worn Wooden Chest and Captain's Footlocker. 
(cherry picked from commit 1c373f29ff)
 2021-12-13 00:42:17 +01:00
Wyrserth 739d6fc420 DB/SAI: fix issue with quest "Still At It" introduced in 2b1cde25. 
Closes #23525.

(cherry picked from commit 6aa3ec8fb1)
 2021-12-13 00:42:17 +01:00
Wyrserth d197a7ce9b Core/SAI: add param3 to SMART_ACTION_CALL_TIMED_ACTIONLIST to allow it to override a currently running actionlist. 
(cherry picked from commit eeba12778b)
 2021-12-13 00:42:17 +01:00
Aokromes 0413abf8f9 DB/Creature: Fix RS, ICC, ToC and VoA melee dmg 
By Fluffybully closes #21598

(cherry picked from commit 81939b9685)
 2021-12-13 00:42:17 +01:00
Killyana 7f7e4971dc DB/Quest: Wolfsbane Root 
Closes #16545

(cherry picked from commit cc788bb8bb)
 2021-12-13 00:42:17 +01:00
Wyrserth 7c7bb95da5 Core/GameObject: restore old behavior for non-consumable chests with restock timer (make them despawn). 
(cherry picked from commit 50c5d30d13)
 2021-12-13 00:42:17 +01:00
ZenoX92 b0ca2ac997 DB/Quest: The Stones That Bind Us 
Closes #11687

(cherry picked from commit 9f1144ac2d)
 2021-12-13 00:42:17 +01:00
Wyrserth 836a1bc622 Core/GameObject: don't allow non-consumable goobers to despawn on use (#23469) 
Closes #15730.

(cherry picked from commit 2b1e8d135b)
 2021-12-13 00:42:17 +01:00
Wyrserth 09e849bb69 Core/Spell: allow damage from binary spells to go through elemental resistance's damage reduction. (#23479) 
(cherry picked from commit efc999227d)
 2021-12-13 00:42:17 +01:00
Wyrserth bf9af53e06 DB/SAI: script event for quest Rescuing the Rescuers. 
Closes #23444

Co-authored-by: Killyana <morphone1@gmail.com>
(cherry picked from commit afbd4bbe59)
 2021-12-13 00:42:17 +01:00
Wyrserth 83a9222c39 Core/SAI: allow creatures to handle gameobject spellhit SAI events. (#23492) 
(cherry picked from commit 7a71127da9)
 2021-12-13 00:42:17 +01:00
Wyrserth 62f5d9b46b Core/SAI: do not pass old creatureData to UpdateEntry() and keep current health when changing a NPC's entry. (#23493) 
(cherry picked from commit 8967cc96df)
 2021-12-13 00:42:17 +01:00
Keader adc16ffbdc Script/FoS: prevent Wailing Souls from becoming desynched in the Devourer of Souls encounter. 
(cherry picked from commit 079b77b5fc)
 2021-12-13 00:42:17 +01:00
Killyana 4196ecc3ce DB: Add cosmetic spawns to The Culling of Stratholme 
(cherry picked from commit 07e76baf77)
 2021-12-13 00:42:17 +01:00
Wyrserth 4441702d5a DB/Waypoint: add pathing for Nishera the Garden Keeper. 
(cherry picked from commit fcae8b1bff)
 2021-12-13 00:42:17 +01:00
Wyrserth 902a6f17dc Script/CoS: fix DB error and remove wrong on-death text for Chrono-Lord Epoch. 
(cherry picked from commit 22b222b44e)
 2021-12-13 00:42:17 +01:00
Aokromes 30cec73c61 Coding standards (#23514) 
* Coding standards

* revert part

(cherry picked from commit fe744977c9)
 2021-12-13 00:42:17 +01:00
Treeston c9d52c9547 Core/AI: Actually accurately reproduce the logic from before 8499434 that determines what summons start following on appearance. Third time's the charm? 
Closes #23513.

(cherry picked from commit 3cdf27494f)
(cherry picked from commit 63383da36e)
 2021-12-13 00:42:16 +01:00
ccrs eda6e5c316 Script/CoS: full instance rewrite (#23388) 
(cherry picked from commit ca62280675)
 2021-12-13 00:42:16 +01:00
Wyrserth d9b344594c DB/SAI: add out-of-combat behavior for Jainthess Thelryn 
Closes #23511

(cherry picked from commit 5d670315a0)
 2021-12-13 00:42:16 +01:00