Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,237 Commits 4 Branches 146 Tags
f0d8df8909cf7aaccdbe805fb37ff4b8c2fcd5ce
Commit Graph

39237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jackpoz
f0d8df8909 Scripts/UBRS: Fix crash 
Fix crash triggered during Dragonspire Hall event caused by having more than 5 mobs near a rune.
Crash added in 7c19fb8d0e
Fix #26589

(cherry picked from commit e9a8cea018)
 2022-03-11 01:48:32 +01:00
offl
a232e86484 DB/Creature: Remove more evil flags 
Ref #25764

(cherry picked from commit 2acdd163fe)
 2022-03-11 01:48:19 +01:00
offl
81f76397c6 DB/Creature: Fix speed of Spark of Ionar 
(cherry picked from commit 7e67ea74bf)
 2022-03-11 01:41:59 +01:00
offl
4bdf5261e6 Scripts/Misc: Remove few more evil flags 
Ref #25764

(cherry picked from commit 180f495c70)
 2022-03-11 01:41:20 +01:00
Cerveciento
0fc126642c DB/Locales: Add missing esES & esMX quest locales (Part 170) 
Closes #26577

(cherry picked from commit c6d77a7a83)
 2022-03-11 01:41:20 +01:00
Cerveciento
df075f545d DB/Locales: Add missing esES & esMX quest locales (Part 169) 
Closes #26573

(cherry picked from commit e64d658ad7)
 2022-03-11 01:41:20 +01:00
Cerveciento
a40a06c242 DB/Locales: Add missing esES & esMX quest locales (Part 168) 
Closes #26563

(cherry picked from commit 81bc1155d2)
 2022-03-11 01:41:20 +01:00
offl
c6e8b5ad31 Scripts/Quest: Rework 'Taken by the Scourge' (11611) (#26578) 
(cherry picked from commit 8a2c1377a9)
 2022-03-11 01:41:18 +01:00
offl
b2212e2dcd Scripts/Instances/Underbog: Rework Hungarfen (#26567) 
(cherry picked from commit 3d0a081f8e)
 2022-03-11 01:23:45 +01:00
Giacomo Pozzoni
76c470fb32 Core/SAI: Add support to friendly+hostile to SMART_EVENT_OOC_LOS and SMART_EVENT_IC_LOS (#26579) 
Change SMART_EVENT_OOC_LOS and SMART_EVENT_IC_LOS first parameter to have 3 values:
- 0 : Hostile
- 1 : Not hostile (not that Friendly and Not hostile have different meanings)
- 2 : Any, as in both Hostile and Not hostile

Close #24789

* Add validation on startup for allowed values.
Code cleanup.

* Fix errors

(cherry picked from commit 9e7cdb02d2)
 2022-03-11 01:04:48 +01:00
offl
bea0528436 Scripts/Instances/EoE: Update Malygos to new register model (#26583) 
(cherry picked from commit 7c6ee033e0)
 2022-03-11 01:04:48 +01:00
offl
ba691ba96c Scripts/Instances/DK: Update Trollgore to new register model (#26582) 
(cherry picked from commit 2a556b900c)
 2022-03-11 01:04:48 +01:00
offl
3bf762d1f2 Scripts/Instances/DK: Update Tharon'ja to new register model (#26581) 
(cherry picked from commit f5a4b95a02)
 2022-03-11 01:04:48 +01:00
offl
4c97169c46 Scripts/Instances/DK: Update Novos to new register model (#26580) 
(cherry picked from commit cdfce090fc)
 2022-03-11 01:04:48 +01:00
offl
4b2478088b Scripts/Zone: Update IoC scripts to new register model (#26571) 
(cherry picked from commit 0051b3e345)
 2022-03-11 01:04:48 +01:00
offl
656487a3bb Scripts/Zone: Update Blasted Lands scripts to new register model (#26570) 
(cherry picked from commit dadc67c883)
 2022-03-11 01:04:48 +01:00
offl
091d38c67c Scripts/Instances: Update Mechanar scripts to new register model (#26569) 
(cherry picked from commit 7b9476ea4b)
 2022-03-11 01:04:46 +01:00
offl
857db113c0 Scripts/Instances: Update Slave Pens scripts to new register model (#26568) 
(cherry picked from commit 57d369dd6a)
 2022-03-11 00:00:16 +01:00
jackpoz
67541c58ba Core/SAI: Fix typo 
(cherry picked from commit 483f24c5ed)
 2022-03-10 23:57:14 +01:00
Giacomo Pozzoni
8111f50d03 Core/Movement: Add new flag MOVEMENTGENERATOR_FLAG_PERSIST_ON_DEATH (#26549) 
* Core/Movement: Add new flag MOVEMENTGENERATOR_FLAG_PERSIST_ON_DEATH

Add new flag MOVEMENTGENERATOR_FLAG_PERSIST_ON_DEATH to keep movement generators even after death.

Fixes #23095
Could replace ff26027453

* Core/Movement: reorder new method MotionMaster::StopOnDeath

* Core/Movement: reorder new method MotionMaster::StopOnDeath

* Keep MoveJump movement generator after death

Co-authored-by: ccrs <ccrs@users.noreply.github.com>
(cherry picked from commit 9fe9dc087b)
 2022-03-10 23:57:14 +01:00
jackpoz
89ea13ed46 Core/Player: Log more information when Player::StopCastingCharm() fails 
(cherry picked from commit af815e991d)
 2022-03-10 23:57:13 +01:00
jackpoz
9a17ac108c Scripts/Commands: Fix crashes with ".group revive" and ".group repair" 
Close #26575

(cherry picked from commit 105c70802d)
 2022-03-10 23:54:25 +01:00
ccrs
791864ef57 Core/Movement: comment unused parameter 
/home/runner/work/TrinityCore/TrinityCore/src/server/game/AI/CoreAI/PassiveAI.cpp:82:52: error: unused parameter ‘id’ [-Werror=unused-parameter]
 void CritterAI::MovementInform(uint32 type, uint32 id)
                                             ~~~~~~~^~
compilation terminated due to -Wfatal-errors.

(cherry picked from commit a57bbe0394)
 2022-03-10 23:54:11 +01:00
ccrs
0e0deaefd4 Core/Movement: remove redundant method MovementGenerator::NotifyAIOnFinalize and use existing Finalize - MovementInform implementation 
6fde051e4e follow up

(cherry picked from commit 303e01c834)
 2022-03-10 23:53:54 +01:00
offl
012444ba80 Scripts/Spells: Add comments with id & name of spells part 4 
(cherry picked from commit e7e4786606)
 2022-03-10 23:53:31 +01:00
offl
0408693646 Scripts/Spells: Add comments with id & name of spells part 3 
(cherry picked from commit 03c727326d)
 2022-03-10 23:52:03 +01:00
offl
cec9718d22 Scripts/Spells: Add comments with id & name of spells part 2 
(cherry picked from commit 0e804c95ac)
 2022-03-10 23:13:25 +01:00
offl
2f0623789c DB/GameObject: Add various missing objects to Bloodmyst Isle 
(cherry picked from commit df552f790f)
 2022-03-10 22:57:06 +01:00
offl
5635625e3a DB/GameObject: Add herbs & veins to Bloodmyst Isle 
Closes #21657

Source of some new spawns: CMaNGOS

(cherry picked from commit ab9a0024b1)
 2022-03-10 22:56:20 +01:00
Cerveciento
7beaa6c938 DB/Locales: Add missing esES & esMX quest locales (Part 167) 
Closes #26559

(cherry picked from commit 3f36dc7343)
 2022-03-10 22:53:40 +01:00
Cerveciento
f9ac6e415f DB/Locales: Add missing esES & esMX quest locales (Part 166) 
Closes #26556

(cherry picked from commit 39905b7719)
 2022-03-10 22:52:48 +01:00
Cerveciento
bcba852697 DB/Locales: Add missing esES & esMX quest locales (Part 165) 
Closes #26551

(cherry picked from commit 6669c9fc95)
 2022-03-10 22:52:00 +01:00
Jinnaix
3a4b300653 DB/Creature: Remove holy resistance 
Ref #26527

(cherry picked from commit 15f66670d6)
 2022-03-10 22:43:40 +01:00
offl
b1167318f4 DB/Creature: Add more Riven Widow Cocoon & Nerubian Cocoon & Netherweb Victim 
(cherry picked from commit fb0a873d0e)
 2022-03-10 22:43:13 +01:00
offl
f2777596a0 Scripts/Spells: Add comments with id & name of spells part 1 
(cherry picked from commit 80a4b7f1e2)
 2022-03-10 22:41:12 +01:00
offl
09551b663a Scripts/Quest: Rework cocooned creatures (#26554) 
(cherry picked from commit 78bd609e8a)
 2022-03-10 22:36:09 +01:00
Shauren
86e7789160 Core/Scripts: Allow spell script ValidateSpellInfo to work with any container type 
(cherry picked from commit f2f0aeb562)
 2022-03-10 21:29:07 +01:00
Cerveciento
b5d46ec5ad DB/Locales: Add missing esES & esMX quest locales (Part 164) 
Closes #26545

(cherry picked from commit 302c60d3dd)
 2022-03-10 21:26:57 +01:00
Cerveciento
19fb898ef0 DB/Locales: Add missing esES & esMX quest locales (Part 163) 
Closes #26542

(cherry picked from commit b4f4eb9618)
 2022-03-10 21:25:48 +01:00
illfated
386ea1de09 DB/Texts: Fix wrong text type 
Closes #26544

(cherry picked from commit 343da36409)
 2022-03-10 21:16:59 +01:00
offl
2b5e15aa08 DB/Loot: Add fishing base level to Underbog 
(cherry picked from commit 36dfc86939)
 2022-03-10 21:16:33 +01:00
offl
1d5c592fca DB/Creature: Galaen's Corpse 
(cherry picked from commit 3e2dd51eed)
 2022-03-10 21:15:30 +01:00
offl
8d3957542a DB/SAI: Remove triggered cast flag in more cases 
Updates #24245

(cherry picked from commit 67c6e11d78)
 2022-03-10 21:06:44 +01:00
offl
50dd7cfca9 DB/SAI: Remove triggered cast flag in multiple cases 
Updates #24245

(cherry picked from commit b1242c38cc)
 2022-03-10 21:06:10 +01:00
offl
be90166028 DB/GameObject: Make Enchanted Anvil work as forge too 
Closes #25746

One object can be spellfocus only for one spell type(cooking fire, forge, anvil). However sometimes object is a cooking fire but you can smelt at it. There are no other objects in sniffs in those cases. My best guess those objects are indeed spawned but somehow hidden from client or objects like Enchanted Anvil somehow works as both anvil and forge at the same time. Objects with invisible model(such as the one I added) are shown in sniffs but not in case of Enchanted Anvil

(cherry picked from commit 46d3c651a5)
 2022-03-10 20:44:40 +01:00
offl
12f9ec0994 DB/Quest: Update 'Investigate the Amani Catacombs' (9193) 
Closes #18934

Source of some new spawns: CMaNGOS

(cherry picked from commit f692fc6b1d)
 2022-03-10 20:37:48 +01:00
offl
e3dbf86d6c DB/Creature: Rework time bombs 
Closes #26479

(cherry picked from commit 52333b0e31)
 2022-03-10 20:36:20 +01:00
Cerveciento
e44c477f0f DB/Locales: Add missing esES & esMX quest locales (Part 162) 
Closes #26535

(cherry picked from commit 98bb3c831a)
 2022-03-10 20:35:41 +01:00
Cerveciento
605e8829db DB/Locales: Add missing esES & esMX quest locales (Part 161) 
Closes #26533

(cherry picked from commit 26cc8e1e20)
 2022-03-10 20:34:31 +01:00
Cerveciento
1ef7fe1c60 DB/Locales: Add missing esES & esMX quest locales (Part 160) 
Closes #26526

(cherry picked from commit 5c0b6b524f)
 2022-03-10 20:33:22 +01:00