araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 14:39:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
34,545 Commits 17 Branches 140 Tags
854abdbfb6ea1075fbe5db09c1ce70aa2bdb18a8
Commit Graph

17490 Commits

Author SHA1 Message Date
Killyana 854abdbfb6 Spell/Script: Torch 52953 and 58121 must hit only one target 
(cherry picked from commit 8f71307e56)
 2021-06-19 01:35:41 +02:00
Treeston 95fb6fe075 Core/Creature: Adjust SelectVictim behavior: (PR #21324) 
- No more automatic combat -> threat promotion. This matches anecdotal retail behavior - spells already in transit will not cause mob to chase you if its primary target vanishes before the spell hits.
- Prevent mobbing by stopping creatures from auto-acquiring a nearby target just because the primary target vanished.

(cherry picked from commit 1acfefb973)
 2021-06-19 01:35:41 +02:00
Treeston 39dff738e1 Scripts/Pets: Mirror Image re-write, because it's a colossal mess right now. (PR #19818) 
(cherry picked from commit 03ef79f3d9)
 2021-06-19 01:35:41 +02:00
Treeston fdc1c5b6c9 Combat/Threat: Now set engaged state for all units on offline reference registration (vanished/invis'd units). For non-PASSIVE units, this will immediately cause an evade. 
This fixes an exploit where creating the reference as offline (by vanishing while a spell was mid-flight) you could damage a creature further without it ever engaging you.

(cherry picked from commit 2402406228)
 2021-06-19 01:35:40 +02:00
Treeston 75a3b2f122 Game/AI: Remove some unused old logic. 
(cherry picked from commit c69584a967)
 2021-06-19 01:35:40 +02:00
Shauren 428bf60f7f Scripts/Icecrown Citadel: Added missing cosmetic colors and emotes to Big Ooze (Rotface) 
(cherry picked from commit aaab7ba9f4)
 2021-06-19 01:35:40 +02:00
Killyana 2d43b8aaa3 Quest/script: Freedom to Ruul 
Follows https://github.com/TrinityCore/TrinityCore/commit/4dc91429dd2158c75679d07c34a18a2e12b4ef7a

(cherry picked from commit 52fc5a572b)
 2021-06-19 01:35:38 +02:00
Killyana 30feaa06e8 DB/Quest: Freedom to Ruul 
Closes #7262

(cherry picked from commit 4dc91429dd)
 2021-06-19 00:14:06 +02:00
Treeston cb3a041482 Core/Creature: add an assertion to guard against infinite loops 
(cherry picked from commit 320306554c)
 2021-06-18 21:20:41 +02:00
Aokromes 3758fa5862 Core/Misc: Sort string 
(cherry picked from commit 4130647bf6)
 2021-06-18 21:19:07 +02:00
Treeston 7db3f7ca96 DB/SpawnGroup: Instance spawn group data for Tempest Keep: The Eye and Hellfire Citadel: Ramparts. 
(also some minor adjustments to command output for convenience)

(cherry picked from commit 51e28ae76a)
 2021-06-16 23:01:48 +02:00
Treeston 7c0ac5b959 Misc: assert -> ASSERT 
(cherry picked from commit 6c3c200cc5)
 2021-06-16 22:51:16 +02:00
Treeston 386ec58233 Scripts/Commands: new command '.debug instancespawn' 
(cherry picked from commit 6ce078d8e8)
 2021-06-16 22:50:04 +02:00
ariel- c43f61df3d Core/Spell: killed deprecated code which randomly changed powercost for missed spells 
Added in 80d3cd43f6

Closes #5954

(cherry picked from commit b1072faa50)
 2021-06-16 21:40:33 +02:00
ariel- 570b2b4ce0 Core/Scripts: reverted Auriaya spell script logic 
Thanks Shauren for spotting it

(cherry picked from commit 6dd465c441)
 2021-06-16 21:36:30 +02:00
ariel- 905112b2a6 Core/Player: only call _ApplyWeaponDamage for actual weapons 
Closes #21308

(cherry picked from commit 8e0af1b93b)
 2021-06-16 21:32:53 +02:00
ariel- d0f4310c44 Core/Entities: don't allow client control if player is still affected by any lose of control state 
(cherry picked from commit e315e41d36)
 2021-06-16 21:26:57 +02:00
ariel- c77925da4a Core/Entities: killed Creature::SetInCombatWithZone and replaced with AI version 
Closes #12108 (again)

(cherry picked from commit 7c9722a4ae)
 2021-06-16 21:03:06 +02:00
ariel- 29bfa32fc3 Core/Entities: don't allow client control if player is still affected by any lose of control state 
(cherry picked from commit e315e41d36)
 2021-06-16 20:38:56 +02:00
ariel- b46d899ef1 Core/PlayerAI: perform cast checks on auto ranged attack 
Closes #19928

(cherry picked from commit 590d251882)
 2021-06-16 19:49:57 +02:00
ariel- df585571f1 Core/Unit: fixed Global cooldown cancelation on spell interrupt 
Thanks to Nyeriah for the heads up

(cherry picked from commit 514c847881)
 2021-06-16 19:43:20 +02:00
ariel- 861cf261c5 Core/Formations: update codestyle and fix crash 
Closes #21288

(cherry picked from commit 73cc613dc8)
 2021-06-16 19:26:32 +02:00
ariel- 0c56ec914f Core/Spells: fix Spirit of Redemption 
- Who would have suspected GetAuraEffect (iconId override) did a check against null spellfamilyflags?
- Remove mirror timers hack (triggered spell already allows underwater breathing)

(cherry picked from commit 4402f71eb7)
 2021-06-16 18:36:21 +02:00
tkrokli 2acaa6fb4a Core/Misc: corrections and indentations in Language.h 
- corrected the comment "1205-2002 - free" to "1205-1999 - free"
- increased the main indent by 2 spaces to get more lines aligned
- corrected the enum LANG_DO_NOT_USE_6X_DEBUG_AREATRIGGER_LEFT from 1999 to 1199

Ref. commit 5f54149107

(cherry picked from commit ba5f6a8616)
 2021-06-16 16:25:40 +02:00
Treeston 14bda72751 Core/Unit: Remove a superfluous threat state update in SetPhaseMask. 
(cherry picked from commit 2c86c78f04)
 2021-06-16 14:37:58 +02:00
Kittnz cd3425f6a6 Scripts/Outland: Fix logical error in Hellfire event in Honor Hold 
(cherry picked from commit 8f64612cb1)
 2021-06-16 14:32:07 +02:00
Treeston 73bf0e3a0b Core/Threat: Assistance threat (healing, buffs, etc.) is now properly split (instead of copied) between all creatures threatened by the action. Thanks to Foereaper for help with testing, and my apologies to healers everywhere. 
(No apologies for charm AI though. You deserve that one.)

(cherry picked from commit 013d4560c7)
 2021-06-16 14:29:45 +02:00
Treeston 9f91cf23ab Core/Threat: Passive creatures now properly become engaged when adding an offline threat entry. Fixes RoS and Thaddius, maybe more. Closes #21269. 
(cherry picked from commit a373275612)
 2021-06-16 14:26:10 +02:00
ariel- 85ffcd9826 Core/Scripts: fix wrong uses of SetHitDamage hook. 
This hook modifies damage AFTER it has been reduced by target auras/armor/resistances etc, it's useful if you want to scale damage by a factor, but not to add flat bonuses.
We're fixing those by moving calculation to Launch phase, where target taken bonuses haven't been used yet.

- Bronjahm: Magic's Bane
- BPC: Shadow Prison
- Oculus: Shock Lance
- Ymiron: Dark Slash (extra fix, it was wrongly damaging half of total health, it's supposed to be half of CURRENT health!)
- DK: Raise Ally Thrash spell (also extra fix: corrected formula)
- Warrior: Bloodthirst (shouldn't matter much as it's damage class none and those don't get bonuses by default)
- Warrior: Concussion Blow
- Warlock: extra fix for Haunt, healing part shouldn't scale with spell power

Closes #9560

(cherry picked from commit 9f5d1e2b10)
 2021-06-16 14:26:09 +02:00
Keader 18b0135bf7 Scripts/Utgarde Keep: Fixed Ingvar evade in phase 2 (again) 
Closes #21264

(cherry picked from commit 96983fc6bb)
 2021-06-16 12:45:57 +02:00
ariel- 2ef2fee3e7 Core/Auras: fixed EquippedItemClass check 
follow-up to 29c3b7d8f6

(cherry picked from commit f1896144c0)
 2021-06-16 12:45:18 +02:00
ariel- d0a766f14f Core/Auras: Don't remove shield only dependant auras on disarm 
Closes #19782

(cherry picked from commit b8c281f497)
 2021-06-16 12:34:40 +02:00
ariel- b27e741096 Core/Auras: define and implement attribute SPELL_ATTR3_NO_PROC_EQUIP_REQUIREMENT 
Closes #20148

(cherry picked from commit 29c3b7d8f6)
 2021-06-16 12:20:14 +02:00
ariel- 62c571076e Core/Scripts: added nullptr checks to DamageTaken hooks 
Since cb9e72e521 attacker may not be in world when hook is called

(cherry picked from commit 0db5c2df3f)
 2021-06-16 12:02:14 +02:00
Treeston ea79b55698 Scripts/AzjolNerub: Missing nullptr check in Hadronox. Closes #21258. 
(cherry picked from commit d9d26200f7)
 2021-06-16 11:49:03 +02:00
Treeston 6fb45e31c2 DB/SpawnGroup: instance_spawn_group data for map 576 (The Nexus) 
(cherry picked from commit 0319c713a4)
 2021-06-16 11:46:50 +02:00
Moein 6d7288356a Scripts/Spells: quest "That's Abominable" (#21253) 
- scripted spell "Burst At The Seams" (59576)
- added Pet Bar

Closes #10876

(cherry picked from commit e519e14df8)
 2021-06-16 11:32:25 +02:00
sirikfoll 3ff61beafa Core/CombatAI: Npcs with TurretAI will be able to attack again 
Needed after the new Threat system

(cherry picked from commit e12e0ad582)
 2021-06-16 11:26:22 +02:00
sirikfoll 78577afa49 Core/Player: Pass correct Zone ID to HandlePlayerLeaveZone 
This will fix some issues with Wintergrasp, like phasing auras getting stuck and missing group invites for the battle, among others

(cherry picked from commit ed9e220991)
 2021-06-16 11:23:01 +02:00
ariel- bb7869b31f Core/Scripts: fix some spells double dipping from done/taken bonuses 
Closes #21007

(cherry picked from commit ab3307fc23)
 2021-06-16 11:22:10 +02:00
ariel- 3bc3b3eeeb Core/Globals: revert back to unordered_map for templates 
Partial revert of commit b64c504314
See discussion on https://github.com/TrinityCore/TrinityCore/commit/b64c5043140dc7b7908e259e441de16cc0261320

(cherry picked from commit b75ff7d4bf)
 2021-06-16 01:29:25 +02:00
ariel- 21556667c1 Core/Globals: throw some RAII into ObjectMgr, and load templates into vectors 
Ref #14274

(cherry picked from commit b64c504314)
 2021-06-16 01:00:11 +02:00
sirikfoll 5b5bc4c5c7 Scripts/Scarlet Enclave: Quest The Endless Hunger will work correctly after Unworthy Initiate Respawn 
Due to dynamic spawns, we need to be able to update the Npc GUID after the respawn, otherwise the quest can only be completed by the first player

(cherry picked from commit 72ff2e30c3)
 2021-06-15 23:43:17 +02:00
ariel- d0fa8c72a3 Core/Unit: check remaining instead of full duration for Bounced by DR auras 
(cherry picked from commit ccf0807be0)
 2021-06-15 23:42:10 +02:00
Keader ca07b1a25d Scripts/Pit of Saron: Tyrannus followup 
fix new issue caused by 947cb6a453

(cherry picked from commit 0b09e9ee4e)
 2021-06-15 23:41:11 +02:00
Keader ed8d57e72d Scripts/Pit of Saron: Fixed Tyrannus not working after evade 
(cherry picked from commit 947cb6a453)
 2021-06-15 23:40:47 +02:00
Moein 172df39350 Core/SAI: Extended SMART_TARGET_VEHICLE_PASSENGER to allow specifying seat mask instead of single seat index (can now target all passengers) (#21245) 
(cherry picked from commit 891bca934e)
 2021-06-15 23:37:25 +02:00
Keader 6ba82b56dc Scripts/Trial Of The Crusader: Lord Jaraxxus rework (#21216) 
(cherry picked from commit a41cd41695)
 2021-06-15 23:32:57 +02:00
Treeston 56fcd8ba1d Core/Threat: Fix a potential crash that would occur in specific edge cases of AI being a bit naughty. 
(cherry picked from commit 1847555c8c)
 2021-06-15 23:22:50 +02:00
ariel- 08ac27d959 Core/Auras: fix static analysis issues 
CID 1384433
CID 1384436

(cherry picked from commit 5153f464d8)
 2021-06-15 23:22:01 +02:00