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,546 Commits 4 Branches 146 Tags
2fea2a1e8104856587d0eff651eb2199dfcd0513
Commit Graph

36546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wyrserth
e8c1adcf8f Core/SAI: silence wrong SAI error when using SMART_ACTION_SET_DATA on a creature using CreatureAI. 
This behavior is fully allowed and should not report any kind of error.

(cherry picked from commit c95531595e)
 2021-12-13 00:42:16 +01:00
funjoker
4c2cad4301 DB/Hotfixes: Update hotfixes to 41359 2021-12-12 23:45:42 +01:00
Shauren
54f607641a Core/Spells: Moved SpellVisual functions from Unit to WorldObject 2021-12-12 19:34:00 +01:00
Shauren
f61de627e5 Core/Commands: Fixed crash in .npc showloot 2021-12-12 19:19:29 +01:00
Shauren
9951b53808 Core/Misc: Fixed some gcc warnings 2021-12-12 19:19:15 +01:00
Meji
1a84641549 Core/BattlePets: Added default cooldown to revive battle pets (#27383) 
* Added SpellHistory function to retrieve remaining category cooldown
* Changed SpellHistory::ModifySpellCooldown to allow adjusting only regular spell cooldown without touching category
 2021-12-12 18:35:15 +01:00
Shauren
1c00109756 Core/Creatures: Fixed crash in CreatureAI::JustAppeared caused by scripted summons without SummonProperties 
Closes #23507

(cherry picked from commit c0b25c9a83)
 2021-12-12 02:20:42 +01:00
Wyrserth
aadb9ab55f DB/Quest: Assign Narain Soothfancy's reward mail to the right quest 
Closes #23506

(cherry picked from commit 616c5e8450)
 2021-12-12 02:20:09 +01:00
Wyrserth
94a0693de6 DB/SAI: Add in-combat texts for Rageclaw Berserker and Rageclaw Hunter 
Closes #23502

(cherry picked from commit 13767f81df)
 2021-12-12 02:19:39 +01:00
Wyrserth
c7290fd2a5 DB/SAI: Add out-of-combat texts for Falcon Watch Ranger 
Closes #23501

(cherry picked from commit 927d68c8ed)
 2021-12-12 02:19:09 +01:00
Wyrserth
d9795df889 DB/SAI: Add special emote on flee for assist for Zulian Cub 
Closes #23499

(cherry picked from commit 3cb96106bf)
 2021-12-12 02:18:39 +01:00
Wyrserth
ce27521936 DB/Creature: The Admiral Revealed 
Closes #23494

(cherry picked from commit 9848f98acb)
 2021-12-12 02:18:02 +01:00
Killyana
76a37c24ff DB/Fishing: Veiled Sea 
(cherry picked from commit 86b5b1b868)
 2021-12-12 02:17:13 +01:00
ccrs
4747debed1 Core/Player: 72fc79a followup 
safer approach, please report any returning issue

(cherry picked from commit 337de2b61e)
 2021-12-12 02:16:42 +01:00
ccrs
a4da12119e Scripts/Misc: couple corrections to the recent PRs 
(cherry picked from commit 4a8736b829)
 2021-12-12 02:16:01 +01:00
ccrs
f4a71ea9aa Core/AI: remove extra empty line 
(cherry picked from commit 3c77c04b05)
 2021-12-12 02:15:10 +01:00
ccrs
d7e544e816 Core/AI: minimize further undesired behaviours (e3e4b97 followup) 
Those Category checks come from checking all Spell::SummonGuardian uses

(cherry picked from commit ebd438883e)
 2021-12-12 02:15:00 +01:00
Treeston
007eb8c931 AI/TotemAI: Tell Shaman Totems to stay put and stop moving. Closes #23498. 
(cherry picked from commit e3e4b975ce)
 2021-12-12 02:13:19 +01:00
Killyana
186444485f DB/Creature: Add missing spawns in Onslaught Harbor 
(cherry picked from commit 466e11a60d)
 2021-12-12 02:12:27 +01:00
Treeston
743d022cee AI/SmartAI: Properly forward to inherited CreatureAI::JustAppeared in SmartAI::JustAppeared. Fixes #23491. 
(cherry picked from commit 854a113fc7)
 2021-12-12 02:11:15 +01:00
Treeston
38d7c1530a Combat/Threat: Split ThreatManager::NotifyDisengaged off from ThreatManager::ClearAllThreat. NotifyDisengaged signifies intent to clear the engagement flag, and should only be called from AI. Fixes #23490. 
(cherry picked from commit 1158f267df)
 2021-12-12 02:09:15 +01:00
Wyrserth
a9946bd580 DB/Creature: make Troll Roof Stalker immune to Mind Control 
Closes #23488

(cherry picked from commit 5fb44f8f74)
 2021-12-12 02:05:14 +01:00
Wyrserth
1edccf977a DB/SAI: add spell Blinding Swarm and associated emote to Nerub'ar Web Lord 
Closes #23487

(cherry picked from commit 3d8891d393)
 2021-12-12 02:04:44 +01:00
Wyrserth
4b3aff8650 DB/SAI: fix out-of-combat event for Warsong Peon in Warsong Hold (Borean Tundra) 
Closes #23486

(cherry picked from commit 187e50cb1c)
 2021-12-12 02:04:10 +01:00