Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 05:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,010 Commits 4 Branches 146 Tags
4d2c93484c2df032820915f8bc8ac51ff48e9aba
Commit Graph

805 Commits

Author SHA1 Message Date
offl
4d2c93484c DB/Quest: Rework 'A Spirit Guide' (9410) 
(cherry picked from commit c905af818c)
 2022-03-07 20:25:58 +01:00
offl
2c8f166414 DB/Quest: Rework 'The Road to Falcon Watch' (9375) 
Closes #26233

(cherry picked from commit 43fa6698d7)
 2022-03-07 20:25:58 +01:00
offl
7b57dc02d1 Scripts/The Eye: Update instance script (#26190) 
(cherry picked from commit 5a22cd868a)
 2022-03-07 00:18:14 +01:00
offl
99a47c40b2 DB/Instance/Gruul's Lair: Overhaul 
(cherry picked from commit cdb7904182)
 2022-03-06 22:48:56 +01:00
offl
e560eb46cd DB/Instance/The Eye: Overhaul part 2 
(cherry picked from commit 6ad76dd7c0)
 2022-03-06 21:58:00 +01:00
offl
e5ddd07619 DB/Instance/The Eye: Overhaul part 1 
(cherry picked from commit 2f9e38612f)
 2022-03-06 21:51:35 +01:00
offl
ca76786faf Core/Scripts: Move some speed values & UNIT_FLAG_NOT_SELECTABLE to DB 
(cherry picked from commit 3cb70ee62a)
 2022-03-06 20:01:06 +01:00
offl
cdd2875649 DB/Creature: Remove UNIT_FLAG_PACIFIED 
Ref #25764

(cherry picked from commit a9c83d5566)
 2022-03-06 19:39:10 +01:00
offl
8e9e15629f Core/Scripts: Verify & migrate spell school immunities to DB 
Some already are stored in DB. Looks like they all are still valid for master

(cherry picked from commit 1ed79d7a2e)
 2022-03-06 16:30:51 +01:00
Kargatum
373ed8f46b Core: whitespace cleanup, reduce double blank line to single (#25795) 
* Core/Misc: fix double empty line

* worldserver.conf

(cherry picked from commit a32b6b8ac4)
 2022-03-05 20:07:57 +01:00
offl
95d46bb7df DB/Instance/Arcatraz: More adjustments 
(cherry picked from commit 6af54eb508)
 2022-03-01 23:28:45 +01:00
offl
d5e49ff0d2 DB/Instance/The Arcatraz: Update auras, scripts & stats 
(cherry picked from commit a2da08deb1)
 2022-02-28 23:48:05 +01:00
Keader
281aef7c40 Scripts/Black Temple: Some little fixes 
- Fixed Reliquary of Souls ignoring boundary
- Fixed Maiev texts timer
- Fixed Shadow Prison hitting every single npc on black temple

Many thanks to Ovahlord

(cherry picked from commit 83e0a70ddc)
 2022-02-28 23:46:41 +01:00
offl
f930508e83 DB/Instance/Auchenai Crypts: Complete overhaul part 1 
(cherry picked from commit 60ded4ea47)
 2022-02-28 14:42:00 +01:00
offl
7bac14995c DB/Gameobject: Add correct door to Sethekk Halls 
(cherry picked from commit 3ce1a5b3ac)
 2022-02-27 20:08:41 +01:00
Traesh
543a7b79c3 Core/Maps: Add Map::DoOnPlayers helper function (#25233) 2022-02-16 23:54:26 +01:00
Shauren
439b027d48 Core/Misc: Cleanup unused includes 2022-02-13 15:07:00 +01:00
offl
2b515f97a6 DB/Quest: Convert & update support for 'A Slow Death' to SAI 
Closes #25399

Based on dr-j's script

(cherry picked from commit 29b39ae606)
 2022-02-06 00:05:16 +01:00
offl
7090fe5c18 DB/Quest: Convert & update support for 'Escape from Firewing Point!' to SAI 
Closes #25358

Based on dr-j's script

(cherry picked from commit 2ff8da2acd)
 2022-02-05 23:48:27 +01:00
Maks Szokalski
bc04acb726 Add "On" to some gossip methods in AI (#25415) 
* Add "On" to some methods

* Update npc_innkeeper.cpp

* Update zone_borean_tundra.cpp

(cherry picked from commit 41188eb535)
 2022-02-05 22:18:19 +01:00
NoName
ee620856ad Core/Movement: Corrected Animation Tier handling (PR #24875) 
Co-authored-by: Warpten <vertozor@gmail.com>
Co-authored-by: Ovahlord <dreadkiller@gmx.de>
Co-authored-by: Carbenium <carbenium@outlook.com>
(cherry picked from commit dad187615d)
 2022-02-05 15:40:31 +01:00
Treeston
358dc78e47 Scripts/AreaTrigger: Rename OnlyOnceAreaTriggerScript::_OnTrigger to TryHandleOnce, and make its return value useful. 
(cherry picked from commit 0c7f6ac89f)
 2022-02-05 14:53:54 +01:00
Shauren
0a1acb9c05 Scripts/Spells: Replace RegisterAuraScript with RegisterSpellScript and remove it 
(cherry picked from commit 7d4fbf706a)
 2022-02-04 00:27:10 +01:00
Peter Keresztes Schmidt
2e3c612c80 Core/Unit: Make HandleEmoteCommand typesafe (#25249) 
* Scripts/ScarletMonastery: Fix wrong emote during Headless Horseman encounter

* Scripts/HoR: Fix wrong emote during escape event

* Core/Unit: Make improve type safety of HandleEmoteCommand

Change argument type to the expected enum type Emote

* Scripts/CoS: Use SetUInt32Value to set UNIT_NPC_EMOTESTATE

UNIT_NPC_EMOTESTATE is no flag field

(cherry picked from commit 6c7837f947)
 2022-01-26 21:46:51 +01:00
Giacomo Pozzoni
864d775280 Core/Misc: Fix static analysis issues (#25194) 
(cherry picked from commit 07fd84b679)
 2022-01-26 14:06:40 +01:00
Trond B. Krokli
c324f954ce Scripts/Outland: Convert 'Captain Tyralius' to SAI (#25188) 
Closes #24676

(cherry picked from commit 7f2874a7ac)
 2022-01-26 13:23:09 +01:00
Giacomo Pozzoni
61bf51874d Core/Misc: Fix static analysis issues (#25178) 
(cherry picked from commit 7cf122fc2a)
 2022-01-24 20:21:25 +01:00
Trond B. Krokli
fa444aca66 Scripts/Quest: Force of Neltharaku quest credit (#24807) 
* Scripts/Quest: Force of Neltharaku quest credit

**Description:**

Suggested solution to resolve the kill credit double cast issue
in the quest "The Force of Neltharaku" (10854).

by Rushor

**Changes proposed:**

- Remove duplicate spell casts in the zone quest script
- Remove commented-out script section
- Set a couple of unit flags (anim/stand/hover)
- Move return new creature script override to end of script
- Move PlayerGUID, FlyTimer, and Tapped to Private
- Add DB flight movement control to Enslaved Netherwing Drake
- Add SpellMgr MaxAffectedTargets = 1 for spell 38762
- Add movement enum POINT_MOVE_UP
- Add missing enum for quest ID

**Target branch(es):** 3.3.5/master

- [X] 3.3.5
- [X] master

**Issues addressed:** Closes #24796

**Tests performed:** (Does it build, tested in-game, etc.)

Pending for now.

**Known issues and TODO list:** (add/remove lines as needed)

- [X] Open PR in draft mode until testing is cleared
- [ ] Compile and create local server
- [ ] Test changes on local server

* Rename 9999_99_99_99_world.sql to 2020_07_29_00_world.sql

Co-authored-by: Rushor <Rushor@users.noreply.github.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
(cherry picked from commit e0dae8feb6)
 2022-01-24 13:19:36 +01:00
Carbenium
b3f2ff97ff Core/CreatureAI: std::chrono-ify DoSummon* methods 
(cherry picked from commit 1245833cdd)
 2022-01-24 13:11:13 +01:00
Carbenium
82fce41852 Core/WorldObject: Replace non-std::chrono SummonGameObject overloads 
Also fix intended despawn time of GOs used by the "Engineering a Disaster" quest

(cherry picked from commit 8642aaaf92)
 2022-01-24 12:55:43 +01:00
Carbenium
3bba8d50b1 Core/WorldObject: Remove non-std::chrono SummonCreature overload 
Remove
TempSummon* SummonCreature(uint32 entry, Position const& pos, TempSummonType despawnType = TEMPSUMMON_MANUAL_DESPAWN, uint32 despawnTime = 0, uint32 vehId = 0, uint32 spellId = 0);

(cherry picked from commit a41f599be7)
 2022-01-24 12:39:59 +01:00
Carbenium
03e4c0d7bf Core/Creature: Remove non-std::chrono overload of DespawnOrUnsummon 
(cherry picked from commit 480dee3125)
 2022-01-24 12:21:26 +01:00
Carbenium
eeffb310de Core/EventProcessor: std::chrono-ify CalculateTime 
uint64 CalculateTime(uint64 t_offset) has been replaced with Milliseconds CalculateTime(Milliseconds t_offset).
Also add the std::chrono-ified overload void AddEvent(BasicEvent*, Milliseconds, bool)

(cherry picked from commit 92a02a5c87)
 2022-01-24 12:00:35 +01:00
Carbenium
310f996b1d Core/WorldObject: Partially std::chrono-ify SummonCreature overloads 
TempSummon* SummonCreature(uint32 entry, float x, float y, float z, float o = 0, TempSummonType despawnType = TEMPSUMMON_MANUAL_DESPAWN, uint32 despawnTime = 0);
to
TempSummon* SummonCreature(uint32 entry, float x, float y, float z, float o = 0, TempSummonType despawnType = TEMPSUMMON_MANUAL_DESPAWN, Milliseconds despawnTime = 0s);

(cherry picked from commit 1131229ee9)
 2022-01-24 11:55:32 +01:00
Carbenium
27c1f47598 EventMap: Change GetTimeUntilEvent to return std::chrono types 
(cherry picked from commit 8cb35b0d5f)
 2022-01-23 23:59:46 +01:00
Carbenium
38695b0943 Scripts/World+Outland+Spells: Use std::chrono overload of Creature::DespawnOrUnsummon 
(cherry picked from commit 5832790428)
 2022-01-23 23:58:48 +01:00
Carbenium
e660b870e9 Core/ScriptedAI: std::chrono-ify DoSpawnCreature 
(cherry picked from commit f5076112cb)
 2022-01-23 23:33:04 +01:00
Carbenium
330e7100cb Core/Scripts: Fix timing issue of EVENT_FLY_TO_RANDOM_PILLAR during Illidan encounter 
The intention here is to add additional 30 seconds of delay to the current delay of EVENT_FLY_TO_RANDOM_PILLAR.
Instead of EventMap::GetNextEventTime, EventMap::GetTimeUntilEvent has to be used which returns the currently
scheduled delay until the event occurs.
EventMap::GetNextEventTime instead exposes the timer value internal to EventMap at which the event should occur.

(cherry picked from commit f1f251eb38)
 2022-01-23 22:19:24 +01:00
Peter Keresztes Schmidt
44ea32ace4 Build: Enable -Wimplicit-fallthrough on clang (#25056) 
* Misc: Use [[fallthrough]] attribute instead of comment to mark intentional fallthroughs

Related: #25006

* Misc: Add some missing breaks (no-ops) to satisfy clang

Related: #25006
Closes #25055

* Build: Enable -Wimplicit-fallthrough on clang

Closes #25006
 2022-01-23 22:16:15 +01:00
Peter Keresztes Schmidt
ad340466d0 Misc: Use [[fallthrough]] attribute instead of comment to mark intentional fallthroughs (#25054) 
Related: #25006
(cherry picked from commit 85b5b842ca)
 2022-01-23 22:02:03 +01:00
Peter Keresztes Schmidt
253cbf5678 Scripts/Tempest Keep: Use std::chrono::duration overloads of EventMap (#25040) 
Contributes to #25012

(cherry picked from commit 2d9c5979a6)
 2022-01-23 16:01:09 +01:00
Peter Keresztes Schmidt
5507aa2f5e Scripts/Coilfang Reservoir: Use std::chrono::duration overloads of EventMap (#25025) 
Contributes to #25012

(cherry picked from commit 5ed6c6a5c3)
 2022-01-23 15:48:08 +01:00
Peter Keresztes Schmidt
7f948a3e23 Scripts/Hellfire Citadel: Use std::chrono::duration overloads of EventMap (#25024) 
Contributes to #25012

(cherry picked from commit d00c95f26f)
 2022-01-23 15:47:58 +01:00
Shauren
e0256154b6 Scripts/Mana Tombs: Fix Pandemonious Dark Shell event delay 
(cherry picked from commit 7e5cf40d4c)
 2022-01-23 15:47:38 +01:00
Peter Keresztes Schmidt
5c3b3d2225 Scripts/Auchindoun: Use std::chrono::duration overloads of EventMap (#25023) 
Contributes to #25012

(cherry picked from commit 4ad80434a2)
 2022-01-23 15:47:16 +01:00
Peter Keresztes Schmidt
1a53ac17c8 Scripts/Outland: Use std::chrono::duration overloads of EventMap (#25022) 
Contributes to #25012

(cherry picked from commit 39fc17e284)
 2022-01-23 15:47:00 +01:00
offl
306e08cc31 DB/Quest: Convert & update support for 'Scratches' to SAI 
Closes #24824

(cherry picked from commit d526d5d176)
 2022-01-19 20:54:24 +01:00
offl
775c6ca039 DB/Quest: Convert & update support for 'City of Light' to SAI 
Closes #24814

(cherry picked from commit f2c2210dbb)
 2022-01-18 23:45:00 +01:00
Rothend
77e1304a5a Script/Creature: script Terokk's encounter (#24871) 
* Script/Creature: script Terokk's encounter.

Closes #2029

* Apply suggested changes.

* Fix nopch build.

* Rename 9999_99_99_99_world_terokk.sql to 2020_06_24_02_world.sql

* Update 2020_06_24_02_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-authored-by: Eridium <6587064+Killyana@users.noreply.github.com>
(cherry picked from commit 3227ed94bc)
 2022-01-18 00:27:18 +01:00
Killyana
81d6cde257 Script: Remove npc_avatar_of_martyred converted to SAI 
Ref 5924e038d6

(cherry picked from commit 75bc0f6771)
 2022-01-06 23:17:10 +01:00