Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
36,598 Commits 4 Branches 146 Tags
edf12fd6a1b989d7785bc0619002eda1ccc87368
Commit Graph

36598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wyrserth
edf12fd6a1 Core/Conditions: allow spellclick conditions to properly work for aura apply/remove (#23527) 
(cherry picked from commit 12e545f7e2)
 2021-12-14 20:52:13 +01:00
ForesterDev
104ec7a81a Core/Unit: Implement more helper methods (#23555) 
(cherry picked from commit c44fb37f74)
 2021-12-14 20:42:32 +01:00
Shauren
dbb96e7717 Core/Spells: Fixed spells not doing damage after cherry-picking 83a9222c39 2021-12-14 16:13:41 +01:00
Wyrserth
832409e512 DB/SAI: add emotestate and OOC text for creature Zeh'gehn and improve end event for quest A Carver and a Croaker. 
(cherry picked from commit 9530c33af0)
 2021-12-14 00:18:59 +01:00
Killyana
b86cf349b6 DB/Quest: Tome of Cabal 
Closes #23560

(cherry picked from commit 1557a80610)
 2021-12-14 00:16:01 +01:00
Giacomo Pozzoni
c5173aca15 Core/Quest: Fix repeatable quest mark (#23338) 
(cherry picked from commit 2cb4517303)
 2021-12-14 00:13:47 +01:00
Treeston
513b35ea2f Entities/Unit: Properly unset engaged flag for creates that cannot have a threat list on combat exit. Fixes #23518. 
(cherry picked from commit f44539b642)
 2021-12-14 00:07:37 +01:00
Gildor
e0f3255f90 Scripts/Icecrown Citadel: Ensure Deathbringer Saurfang cast Frenzy (#23559) 
(cherry picked from commit a0a64b10b5)
 2021-12-14 00:07:14 +01:00
Treeston
096269349c Entities/Player: Fix an edge case where overlapping CCs could prevent player movement from being re-enabled. f6f1c48 follow-up. 
(cherry picked from commit 4e767f1c7c)
 2021-12-14 00:06:51 +01:00
Wyrserth
0d9a7f626d DB/Creature: remove wrong repairer npcflag from NPC Perascamin. 
(cherry picked from commit cc5088369b)
 2021-12-14 00:06:37 +01:00
Wyrserth
fdd5063ba2 DB/SAI: add some missing RP events to Culling of Stratholme. 
Scripted RP events involving NPCs Stephanie Sindree, Brandon Eiredeck and Patricia O'Reilly.

(cherry picked from commit c63bbb97b4)
 2021-12-14 00:01:42 +01:00
Wyrserth
13519dc043 DB/Vendor: rework Griftah's inventory. 
Remove deprecated items and fix slot ordering.

(cherry picked from commit f05891405a)
 2021-12-13 23:51:44 +01:00
Treeston
bba4696de7 Entities/Player: Clean up client control handling behavior around possession. Mind Control should no longer cause various weirdness. Closes #23539. 
(cherry picked from commit f6f1c48aa5)
 2021-12-13 23:44:13 +01:00
Shauren
e01f3c81f9 DB/Hotfixes: Add missing hotfix optional data for each locale 2021-12-13 22:51:49 +01:00
Wyrserth
9cfa2ed71e Script/HallsOfLightning: fix mistake related to Shattering Stomp in Volkhan's script, introduced in 3bb0abcd52. 
Closes #23337.

(cherry picked from commit a8b8a43b8d)
 2021-12-13 00:42:20 +01:00
ForesterDev
27886c7f5d Core/Player: add helper methods GetNativeGender/SetNativeGender/SetGender (#23520) 
* Core/Player: add helper methods GetNativeGender/SetNativeGender/SetGender and fix some cases, where we should get player gender, instead of modified by display gender

* fix merge

* Add virtual methods for Unit class

(cherry picked from commit b47bb59e2a)
 2021-12-13 00:42:20 +01:00
ccrs
4e6c59dca7 Core/Unit: rename several getters to follow codestyle 
uint8 GetLevel()
        uint8 GetLevelForTarget(WorldObject const* /*target*/)
        void SetLevel(uint8 lvl)
        uint8 GetRace()
        uint32 GetRaceMask()
        uint8 GetClass()
        uint32 GetClassMask()
        uint8 GetGender()

(cherry picked from commit 5c09ff51f7)
 2021-12-13 00:42:20 +01:00
Sorikoff
b8d675eba7 Scripts/Spells: Dimensional Ripper - Everlook (#23547) 
(cherry picked from commit 5c09ff51f7)
 2021-12-13 00:42:20 +01:00
Wyrserth
1005389b14 DB/SAI: remove delay between clicking gossip and creature text/change faction for NPC Victorious Challenger involved in quest Taking on All Challengers. 
(cherry picked from commit 5a9516cd9c)
 2021-12-13 00:42:20 +01:00
Wyrserth
a117beb1b3 DB/Creature: Hyldsmeet Warbear shouldn't have random movement. 
(cherry picked from commit 4a875ec392)
 2021-12-13 00:42:20 +01:00
Wyrserth
c9cb12afc3 DB/Creature: add emote state and out of combat emote for NPC Brunnhildar Challenger. 
(cherry picked from commit dd870a141f)
 2021-12-13 00:42:20 +01:00
Wyrserth
04675c2322 DB/Conditions: allow gossip option for NPC Agnetta Tyrsdottar to show only if the quest Is That Your Goblin? is taken but not completed. 
(cherry picked from commit e621d40ddc)
 2021-12-13 00:42:20 +01:00
Wyrserth
819f8b1a2d Script/DarkmoonFaire: fix logical error in go_darkmoon_faire_music. 
Closes #23548.

(cherry picked from commit 028d16a812)
 2021-12-13 00:42:19 +01:00
Rynem
ed85a1b701 DB/Quest: fix chaining for quests offered by Lantresor of the Blade. 
Closes #22440.

(cherry picked from commit 72917d5036)
 2021-12-13 00:42:19 +01:00
Wyrserth
ecce30a807 Core/Quest: do not send SMSG_QUESTGIVER_OFFER_REWARD right after SMSG_QUESTGIVER_QUEST_FAILED. 
Allows the gossip window to close after the client receives a quest failed error (for example: not enough inventory space to store the reward).

(cherry picked from commit c8289ada7f)
 2021-12-13 00:42:19 +01:00
ccrs
2e4f38d949 Scripts/ICC: cleanup ReadSaveDataMore definition 
(cherry picked from commit 4c398743b9)
 2021-12-13 00:42:19 +01:00
ccrs
3bc4fc65b9 Scripts/ICC: 3dbf3fe followup 
repeat timer typo

(cherry picked from commit b19a23a5c6)
 2021-12-13 00:42:19 +01:00
Wyrserth
0476ee41e1 DB/SAI: implement out-of-combat event for NPC Ranger Sareyn. 
Closes #23538.

(cherry picked from commit ce3820031d)
 2021-12-13 00:42:19 +01:00
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