Commit Graph
36524 Commits
Author SHA1 Message Date
Aokromes 30cec73c61 Coding standards (#23514)
* Coding standards

* revert part

(cherry picked from commit fe744977c917957e112704ccd66e228b826b3f7a)
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 3cdf27494ffe18d674a37561a2c573517a2cb533)
(cherry picked from commit 63383da36e27657734cba6ad23c1bd3d68039d90)
2021-12-13 00:42:16 +01:00
ccrs eda6e5c316 Script/CoS: full instance rewrite (#23388)
(cherry picked from commit ca6228067507f19db230d415a1d088e5c0b5b808)
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 5d670315a03d7eab682239e3119f50e9430b3e5c)
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 c95531595e666c64829499d2bc920cf5b848bbe2)
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 c0b25c9a83126bfd26da8245a31ea684008d804d)
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 616c5e8450d9626e7f14599ddda7c82f32b0d972)
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 13767f81dfaa883a69224a7642b777e3d831fdf3)
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 927d68c8ed76676d77da43ea0a35577334f65b85)
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 3cb96106bfe90625e6660e250fe2418359db84e5)
2021-12-12 02:18:39 +01:00
Wyrserth ce27521936 DB/Creature: The Admiral Revealed
Closes #23494

(cherry picked from commit 9848f98acb500ef863ad8ce50e52797768617c6c)
2021-12-12 02:18:02 +01:00
Killyana 76a37c24ff DB/Fishing: Veiled Sea
(cherry picked from commit 86b5b1b8685eb4ec26d2e479df8c7b4e91b9b4b7)
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 337de2b61e9df6a8d8b3ff2d0076f35345c33907)
2021-12-12 02:16:42 +01:00
ccrs a4da12119e Scripts/Misc: couple corrections to the recent PRs
(cherry picked from commit 4a8736b82924acf109970d317aa493b19914cea1)
2021-12-12 02:16:01 +01:00
ccrs f4a71ea9aa Core/AI: remove extra empty line
(cherry picked from commit 3c77c04b052f721efb96bdaaceeca8de09926f12)
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 ebd438883e31de4482617631ff9939f2246fda69)
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 e3e4b975ce1a7a4aa75d61aff7ab3da287b3ceff)
2021-12-12 02:13:19 +01:00
Killyana 186444485f DB/Creature: Add missing spawns in Onslaught Harbor
(cherry picked from commit 466e11a60d33c398d315a23e9403d6ae4dea8c34)
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 854a113fc7b6610873b77355aed88900ce3b5bc0)
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 1158f267df22c0782fb5f20f7de31f5643ac0b58)
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 5fb44f8f74885c65f66127ebc95fbe5aff612d93)
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 3d8891d39379d145820acb43437b6680ba9fefb0)
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 187e50cb1c60a679551a18b7c69428d8077a5653)
2021-12-12 02:04:10 +01:00
Wyrserth eb77a2ca34 DB/SAI: add out-of-combat text for Brother Keltan and Absalan the Pious
Closes #23485

(cherry picked from commit 26287010e88ea75e35e1a9b8cc440e421e1a5b97)
2021-12-12 02:03:30 +01:00
Wyrserth 929bf454fe DB/Creature: allow Imprisoned Beryl Sorcerer and Archmage Evanor to be visible only after certain milestones in quest chain progress
Closes #23484

(cherry picked from commit 2cd6da0313e063b8c54f7dedb7c99f21d21ceac1)
2021-12-12 02:03:30 +01:00
Wyrserth 97fbce84f2 DB/Quest: The Jig is Up
Closes #23483

(cherry picked from commit 9f07f7945bbc0a1df5bd599ac00ccaece508d53d)
2021-12-12 02:03:30 +01:00
Wyrserth c082458fad DB/Creature: NPCs Rork Sharpchin and Olut Alegut can only sell their items if the related quests are rewarded
Closes #23482

(cherry picked from commit e200c5f6761c9e1087309ddaeb3369b35266a13a)
2021-12-12 02:03:30 +01:00
Wyrserth 800d0adaf6 DB/Loot: Fix rare (superior) drops for NPC Speaker Mar'grom
Closes #23481

(cherry picked from commit babadce78bcaff7a66fee28032c2c5690c5a6d79)
2021-12-12 02:03:30 +01:00
Wyrserth 487199f5cf DB/Loot: remove wrong loot from Young Nightsaber
Closes #23480

(cherry picked from commit 69a95664cd01eccaedad08a1d5c274993f30b8df)
2021-12-12 02:03:28 +01:00
Wyrserth c2bd525988 DB/SAI: script on-low-health behavior for Darkweb Recluse in Drak'Tharon Keep
Closes #23478

(cherry picked from commit 34eb88e41f8889ada64024ff3641653f74a6cc8a)
2021-12-12 01:55:17 +01:00
Wyrserth 32a38e4c1d DB/SAI: fix event for the quest Ending the Bloodcurse
Closes #23477

(cherry picked from commit 9b0b7a28599b4aefac3ea35b9b14f1ee704eed6c)
2021-12-12 01:54:41 +01:00
Wyrserth 7a9949aad1 DB/Conditions: Lurielle's Pendant should require target to be at 30% health or below
Closes #23476

(cherry picked from commit 69d03e3864b7a77acfa480d8ffdd1f28a94512c6)
2021-12-12 01:54:03 +01:00
Wyrserth 131f4fa374 DB/PageText: fix wrong characters in Archavon's Log's first page
Closes #23475

(cherry picked from commit a8c3c02ba7f1f3bd607b55b2b4d07afc4dd3872d)
2021-12-12 01:53:35 +01:00
Wyrserth 42a0e41603 DB/SAI: fix on-accept event for quest Help for Camp Winterhoof
Closes #23474

(cherry picked from commit e298dca20ff27b2c8dbed475a84b24ee690fc36b)
2021-12-12 01:31:55 +01:00
Wyrserth eeec556f87 DB/Quest: fix breadcrumbs for quest Spirits of the Ice
Closes #23473

(cherry picked from commit d740b38a32722d99f20b546de899c83b68f6d816)
2021-12-12 01:31:19 +01:00
Wyrserth 3a8a1b7929 DB/SAI: Add spell Hoof Strike to Highland Mustang, Frosthorn Ram and Onslaught Destrier
Closes #23472

(cherry picked from commit bfd952bd9fd5fdd5abdd0a4bf4840a9b2af677c2)
2021-12-12 01:30:35 +01:00
Wyrserth d71bb3c525 DB/Quest: Add missing request-items text for The Yeti Next Door and Mastery Of The Charge
Closes #23471

(cherry picked from commit 1efdca0291ea2187e7a576ead47fe238334ec82f)
2021-12-12 01:29:18 +01:00
Wyrserth 241d635c03 DB/Creature: prevent NPC Geezle from being attackable
Closes #23470

(cherry picked from commit 976bc1149969b85697e9d54b852f9b557abbdc5d)
2021-12-12 01:27:04 +01:00
Killyana bec268a235 DB/Creature: Bonechewer Riding Wolf
(cherry picked from commit 6a4c381e865966dcc29b0e457af412883463a002)
2021-12-12 01:27:04 +01:00
Treeston e398bb1664 AI/SmartAI: Move SMART_EVENT_RESPAWN invocation from ::InitializeAI() to ::JustAppeared(). Closes #23313.
(cherry picked from commit 37fc38b91701c3e699b20f3ed8de8da3b5c42063)
2021-12-12 01:27:04 +01:00
Treeston 9f7d3ebd6a Core/AI: Remove EnterEvadeMode calls from Guardian/Summon spell handlers. Add follow logic to CreatureAI::JustAppeared. Closes #23270.
(cherry picked from commit 8499434340919902b5aefe58f812c3f24d37310d)
2021-12-12 01:27:04 +01:00
Treeston f9b8fe686d Entities/Unit: Adjust an overzealous assert to not catch self references, and add the inverse assert too. 396f87c follow-up.
(cherry picked from commit aeed616c22868e2c5759c01d2c0feb52a7c3bc97)
2021-12-12 01:27:04 +01:00
Treeston d10554da14 Entities/Unit: Fix an issue where Unit pointers could be left dangling if a channeled Charm was interrupted by a control aura application. Closes #23440.
(cherry picked from commit f4b06fd0b7ead843bba8f5215a09abf7976e012c)
2021-12-12 01:27:04 +01:00
Treeston edc7583119 Entities/Unit: Cleanup all the direct accesses to m_unitMovedByMe. Refactor the field to be protected. Add assertions to catch dangling pointers.
(cherry picked from commit 396f87c30dff1b50f1eb0d924778a7fbab7e8d11)
2021-12-12 01:26:41 +01:00
Treeston 06823f19cd Core/Misc: Add static versions of GetGUID and ToX methods to Object. The static versions return Empty/nullptr for null objects.
(cherry picked from commit b3ee407707db01a5bc49f544a56b1db381687f65)
2021-12-12 00:46:03 +01:00