Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,708 Commits 4 Branches 146 Tags
050f55b62fded4cc73b76e42d56d98ea950cc26a
Commit Graph

27998 Commits

Author SHA1 Message Date
offl
050f55b62f Core/AI: OnSpellCast, OnSpellFailed, OnSpellStart hooks (#27704) 
(cherry picked from commit 3dca705acc)
 2022-03-26 15:15:46 +01:00
offl
90e0c04ca8 Scripts/Quest: Update 'Torture the Torturer' (#27782) 
(cherry picked from commit f2904dd577)
 2022-03-26 15:05:42 +01:00
offl
00f002b68c Scripts/Spells: Script A Mysterious Voice from Ahn'kahet (#27779) 
Closes #25683

(cherry picked from commit 75db924e91)
 2022-03-26 15:01:35 +01:00
offl
eb1da698eb Scripts/TK: Few updates for Sepethrea (#27769) 
(cherry picked from commit 951d7d3a58)
 2022-03-26 14:50:20 +01:00
offl
df841dc9f2 Scripts/SL: Update Grandmaster Vorpil (#27765) 
Closes #23801

(cherry picked from commit a19c9660b4)
 2022-03-26 14:49:55 +01:00
offl
4a3d1b1961 Scripts/Spells: Script one more player talk (#27766) 
(cherry picked from commit db1e6f2588)
 2022-03-26 14:29:47 +01:00
offl
5e2ba78c33 Scripts/TK: Update remaining scripts to new register model 2 (#27768) 
(cherry picked from commit 93735ae3bd)
 2022-03-26 14:28:07 +01:00
offl
48f6348f89 Scripts/TK: Update remaining scripts to new register model 1 (#27767) 
(cherry picked from commit 5e3b76bf25)
 2022-03-26 14:23:57 +01:00
offl
68df48acaa Scripts/Items: Fix Goblin Bomb Dispenser (#27749) 
Closes #26523

(cherry picked from commit 2cb970c663)
 2022-03-26 14:13:43 +01:00
anzz1
276c6b4c68 Scripts: Update Silithus Wind Stones (#27700) 
* Despawn Wind Stone after use, allow it to respawn (remove GO_FLAG_NODESPAWN on initialize)
* Re-check twilight set aura on GossipSelect (don't allow to summon without wearing set)
* Fix spell Abyssal Punisment (24803) not casting when interacting with stone without required items
* Fix miniboss not despawning after leaving combat
* Fix possible exploit of spawning many minibosses from a single wind stone spawn
* Improve creature scripts
* Set correct respawn time for wind stones

Closes #27698 Closes #26814

(cherry picked from commit b8059ec6e7)
 2022-03-26 14:08:07 +01:00
Gildor
2065e06207 Revert "Core/Spells: Force Invisibility (mage) to leave combat." (#27701) 
This reverts commit 4b0acb7432.

Co-authored-by: kaelima <kaelima@live.se>
(cherry picked from commit a8475e5d70)
 2022-03-26 00:21:27 +01:00
offl
a2236616cc Scripts/Quest: Rework Mystery of the Infinite & Mystery of the Infinite, Redux (#27677) 
(cherry picked from commit f205e25b33)
 2022-03-26 00:21:13 +01:00
offl
3de50c52fd Scripts/Spells: Handle player talk in spell scripts pt 3 (#27657) 
(cherry picked from commit e3409e277d)
 2022-03-25 23:45:29 +01:00
offl
8be723788d Scripts/Spells: Handle player talk in spell scripts pt 2 (#27640) 
(cherry picked from commit 7a4f1fd201)
 2022-03-25 23:42:43 +01:00
offl
4a65cf25ac Scripts/Spells: Handle player talk in spell scripts pt 1 (#27634) 
(cherry picked from commit c0c12ad761)
 2022-03-25 23:42:38 +01:00
offl
e0fea940b3 Scripts/Quest: Update 'The Light's Mercy' (#27633) 
(cherry picked from commit 7964636ea5)
 2022-03-25 23:25:17 +01:00
offl
a6f8dc3052 Scripts/Botanica: Rework Warp Splinter (#27621) 
(cherry picked from commit 78327500d8)
 2022-03-25 23:23:44 +01:00
offl
18d7814402 Scripts/Botanica: Rework Sarannis & Freywinn (#27611) 
(cherry picked from commit 41da43d9f2)
 2022-03-25 23:05:01 +01:00
offl
8e77287dd2 Scripts/BM: Remove unused text 
(cherry picked from commit fde8619dac)
 2022-03-25 00:25:13 +01:00
offl
979ce40c25 Scripts/Spells: Few fixes to spells with GameObjectActions (#27587) 
(cherry picked from commit dca7e51250)
 2022-03-25 00:23:41 +01:00
offl
8b7effa4cf Core/SAI: Remove SMART_ACTION_ADD_AURA & actions to change object flags (#27571) 
(cherry picked from commit 5ba93a95de)
 2022-03-24 23:52:32 +01:00
Grindelwald
a799a10a90 Core/Spells: Add MaxAffectedTargets for Domination (#27541) 
(cherry picked from commit 5f0e80bf43)
 2022-03-24 23:50:03 +01:00
acidmanifesto
cba1293108 Scripts\Event: COG Corrections (#27532) 
Goldshire is a area not a zone. Zone is Elwynn Forest.

CHILDEREN is spelled with 1 E not 2.

(cherry picked from commit 5fc650645d)
 2022-03-24 23:48:43 +01:00
Grindelwald
e811387bde Update inkeeper content (#27507) 
* Update localized hotel content

Update localized hotel content

* Using the database to display GOSSIP

The broadcast_text_locale has the relevant gossip_menu_option data, but C++'s strong coding makes them appear only in the default English.

(cherry picked from commit 27cb415c13)
 2022-03-24 23:33:59 +01:00
Giacomo Pozzoni
8c25abca72 Core/AI: Fix crashes caused by charmed Creatures having null AI for 1 map update tick (#27434) 
Implement using ScheduledChangeAI instead of nullptr to signal a required AI change

(cherry picked from commit 19e99db821)
 2022-03-24 22:35:05 +01:00
offl
52bb230e4c Core/SAI: Use GetBaseObject as second param of SMART_ACTION_ACTIVATE_GAMEOBJECT & reorder GameObjectActions (#27461) 
(cherry picked from commit 87cb0a4212)
 2022-03-24 21:55:46 +01:00
offl
9ea8cdb457 Core/SAI: Remove SMART_ACTION_SEND_GO_CUSTOM_ANIM, make SMART_ACTION_ADD_AURA & SMART_ACTION_SET_GO_FLAG deprecated (#27452) 
(cherry picked from commit 7709837539)
 2022-03-24 21:48:47 +01:00
ihm-tswow
90b4c5afa2 Core/Misc: Verify LFG role selections by class (#27348) 
* Core/Misc: Verify LFG role selections by class

* style fix

Co-authored-by: MaxtorCoder <warsongkiller.s8@gmail.com>

* fix style

* improve LfgRoleClasses readability

* remove unnecessary comments

* add missing SharedDefine include

- try fix nopch

* style fix

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>

Co-authored-by: MaxtorCoder <warsongkiller.s8@gmail.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-authored-by: Shauren <shauren.trinity@gmail.com>
(cherry picked from commit 5e2b2fd3f8)
 2022-03-24 21:03:06 +01:00
Shauren
56dd1243fd Core/Units: Rename AnimationTier to AnimTier for consistency between branches 2022-03-24 20:44:26 +01:00
offl
37f425b1b3 Scripts/Spells: Remove unnecessary SetAnimationTier 
(cherry picked from commit 8214278cd8)
 2022-03-24 19:44:43 +01:00
offl
c3368fd5fc Scripts/Quest: Rework 'The Cleansing' (11317,11322) (#27413) 
(cherry picked from commit a8464d34bb)
 2022-03-24 14:41:00 +01:00
kvolk2git
299db7af1a Update cs_misc.cpp (#27418) 
(cherry picked from commit 8ac63c7952)
 2022-03-24 14:01:15 +01:00
Gildor
a37f9b6693 Core/Battlegrounds: Avoid teleport players when relogin inside Strand of the Ancients (#27414) 
(cherry picked from commit d3b6d9a38c)
 2022-03-24 13:19:37 +01:00
offl
9dabdf7724 Scripts/Spells: Furious Rage & scripts for creatures who uses it (#27403) 
(cherry picked from commit 7ae525d5e5)
 2022-03-24 13:18:56 +01:00
Gildor
1bfbc371d5 Core/Battlegrounds: Avoid reset BG and Arena scoreboard stats and BG map achievement criterias when relogin if player was already in the BG (#27280) 
(cherry picked from commit fade6fbf4f)
 2022-03-24 11:48:37 +01:00
offl
cc94b595cf Scripts/Quest: Update 'It's All Fun and Games' (12887,12892) (#27394) 
(cherry picked from commit 41c8c4ba74)
 2022-03-24 11:41:01 +01:00
offl
69ee7582fc Scripts/MFF: Update Ahune's Ice Spear behavior (#27384) 
(cherry picked from commit 751a8b9e17)
 2022-03-24 11:39:27 +01:00
offl
f9cefc0337 Scripts/HoS: Update Maiden of Grief (#27360) 
(cherry picked from commit a021d12f85)
 2022-03-24 00:26:04 +01:00
offl
4069baf141 Scripts/HoS: Update Sjonnir (#27357) 
(cherry picked from commit 36ee971415)
 2022-03-24 00:21:42 +01:00
offl
3cfca16359 DB/SAI: Replace SMART_ACTION_SEND_GO_CUSTOM_ANIM with GameObjectActions 
(cherry picked from commit 8516984ffe)
 2022-03-24 00:08:45 +01:00
offl
4004eb8b46 Scripts/Crypts: Rework Exarch Maladaar (#27313) 
(cherry picked from commit 35b55b3f21)
 2022-03-23 23:59:41 +01:00
offl
0097fd95b6 Scripts/Spells: Generic spell script for quest portals (#27305) 
(cherry picked from commit 251304b19c)
 2022-03-23 23:58:25 +01:00
offl
8d3a408fdc Scripts/The Eye: Few updates to Kael'thas & Astromancer (#27304) 
(cherry picked from commit 43315e0e19)
 2022-03-23 20:31:19 +01:00
offl
b6c02d20d5 Scripts/Botanica: Rework Laj (#27282) 
(cherry picked from commit 2fe3b6cc2f)
 2022-03-23 20:30:17 +01:00
offl
55fd025057 Scripts/Mechanar: Rework Nethermancer Sepethrea (#27277) 
(cherry picked from commit be00563a86)
 2022-03-23 20:16:47 +01:00
Shauren
57d9d16442 Core/Auras: Properly clean up partial charm applications 
Ref #24876

(cherry picked from commit 9174281b92)
 2022-03-23 00:06:51 +01:00
offl
83b4c8cd37 Scripts/Spells: Small cleanup for gen/item spell scripts (#27311) 
(cherry picked from commit ef4c878d26)
 2022-03-23 00:06:37 +01:00
offl
4281049e0c Scripts/Misc: Migrate world event scripts to separate files 2 (#27309) 
(cherry picked from commit eb812bf3d5)
 2022-03-23 00:03:14 +01:00
offl
d3c9c14f83 Scripts/Misc: Migrate world event scripts to separate files (#27284) 
(cherry picked from commit 542c10094f)
 2022-03-22 23:50:20 +01:00
Grindelwald
67954a6991 Core/Spells: Add MaxAffectedTargets to Chains of Naberius(36146) (#27291) 
Closes #27289

(cherry picked from commit c3973ff577)
 2022-03-22 23:18:01 +01:00