Kelno
b6af6634f4
Core/Misc: Clear unused undef leftover in a refactor ( #26616 )
...
Previously this function was using a macro that was #undef at the end of the function. Since then it uses a lambda function and the undef is not needed anymore.
(cherry picked from commit 17ed3fd1dcfcb859869fcbbeb643fa59793d1687)
2022-03-11 12:14:39 +01:00
Giacomo Pozzoni
2bc1bbd91d
Common/Misc: Replace old macros with modern C++ attributes ( #26613 )
...
(cherry picked from commit 5ae2a0f47d323fadcfebf44c7b6ec11a3f91c75a)
2022-03-11 11:48:31 +01:00
jackpoz
d0fe16b787
Core/Misc: Fix issues reported by static analysis
...
(cherry picked from commit 33dace231c5a169375523ffa89a2cc3fa48737bd)
2022-03-11 11:48:18 +01:00
Gildor
7d01ad8b8f
Scripts/Commands: Minor improvements in .pinfo and .unban character commands ( #26586 )
...
* Scripts/Commands: Minor improvements in .pinfo and .unban character commands
(cherry picked from commit 5446209b89146fdbe01627e806f7beddd6ae5de8)
2022-03-11 11:33:37 +01:00
Kelno
6e182ebe05
Core/Config:Remove now unused CONFIG_SET_SHAPASSHASH config ( #26606 )
...
This is a leftover from https://github.com/TrinityCore/TrinityCore/commit/bcdbdd6f23ce65cc0e381e61d2840140dce79311
(cherry picked from commit c3a013c49928acaa4676cd5350b3ed8fe1f0fddd)
2022-03-11 10:52:00 +01:00
jackpoz
40416d62f3
Core/SAI: Allow SMART_ACTION_SUMMON_CREATURE to summon more than 1 creature
...
Add 6th parameter "count" to SMART_ACTION_SUMMON_CREATURE action to summon more than 1 creature. For backward compatibility, a value of 0 will be treated as 1.
(cherry picked from commit 5628ca7f7cf2fdc053551d3f5e90ad466f3db2e6)
2022-03-11 10:43:08 +01:00
jackpoz
cc38710adb
Core/Misc: Fix issues reported by static analysis
...
(cherry picked from commit 32fd44d2aa6b1386922df07bc4b803e2d0aeaba1)
2022-03-11 01:52:04 +01:00
jackpoz
e8ea10a6a2
Scripts/Misc: Fix issues reported by static analysis
...
(cherry picked from commit 4b9465e1f91adbc139afe5f86ac84eb5f14b62b4)
2022-03-11 01:50:09 +01:00
Giacomo Pozzoni
9d4c57074f
Core/Loot: Allow master looter to see all quest items ( #26584 )
...
(cherry picked from commit 8d92f6f2b483dffa7127614de3c41f3f596743fb)
2022-03-11 01:49:51 +01:00
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 e9a8cea018591334ce3807e2eb2fc2d6ce079252)
2022-03-11 01:48:32 +01:00
offl
4bdf5261e6
Scripts/Misc: Remove few more evil flags
...
Ref #25764
(cherry picked from commit 180f495c7037dc3be61a33dee5745833fd993d4c)
2022-03-11 01:41:20 +01:00
offl
c6e8b5ad31
Scripts/Quest: Rework 'Taken by the Scourge' (11611) ( #26578 )
...
(cherry picked from commit 8a2c1377a9556f2cf2815a4e26d13639e65ee24f)
2022-03-11 01:41:18 +01:00
offl
b2212e2dcd
Scripts/Instances/Underbog: Rework Hungarfen ( #26567 )
...
(cherry picked from commit 3d0a081f8ecbcd44b8bb633dc15928bb03864aa4)
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 9e7cdb02d290e85f27e3e463922cd4cfac46129a)
2022-03-11 01:04:48 +01:00
offl
bea0528436
Scripts/Instances/EoE: Update Malygos to new register model ( #26583 )
...
(cherry picked from commit 7c6ee033e05faca9a013037f1a9c9bbdf62cd702)
2022-03-11 01:04:48 +01:00
offl
ba691ba96c
Scripts/Instances/DK: Update Trollgore to new register model ( #26582 )
...
(cherry picked from commit 2a556b900caad94dbafe5170b310b8e2ee41e83f)
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 f5a4b95a02e915db6947165355223adba723e8ad)
2022-03-11 01:04:48 +01:00
offl
4c97169c46
Scripts/Instances/DK: Update Novos to new register model ( #26580 )
...
(cherry picked from commit cdfce090fca88c35dd1d9a19ec870c6d1d72a070)
2022-03-11 01:04:48 +01:00
offl
4b2478088b
Scripts/Zone: Update IoC scripts to new register model ( #26571 )
...
(cherry picked from commit 0051b3e3456ad76deb4fad6d6c1af33a172d9ace)
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 dadc67c8832a46fe62fa8d4faaed39dde5cc138d)
2022-03-11 01:04:48 +01:00
offl
091d38c67c
Scripts/Instances: Update Mechanar scripts to new register model ( #26569 )
...
(cherry picked from commit 7b9476ea4b8dd43dcb041ced158bcdd46baeff85)
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 57d369dd6a58632679cd6efc2cfca4600c4ad9bb)
2022-03-11 00:00:16 +01:00
jackpoz
67541c58ba
Core/SAI: Fix typo
...
(cherry picked from commit 483f24c5ed8238a9b3a1747f49191b7ba6f3c90e)
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 ff26027453179448bb972d88a51e565d71e95f3f
* Core/Movement: reorder new method MotionMaster::StopOnDeath
* Core/Movement: reorder new method MotionMaster::StopOnDeath
* Keep MoveJump movement generator after death
Co-authored-by: ccrs <[email protected] >
(cherry picked from commit 9fe9dc087b4dc52af7897942a83c1f880d3a4ef8)
2022-03-10 23:57:14 +01:00
jackpoz
89ea13ed46
Core/Player: Log more information when Player::StopCastingCharm() fails
...
(cherry picked from commit af815e991d3dc407846fcd05000b4e356d7336ed)
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 105c70802ded53b49621a92ee8fa136e57d0c717)
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 a57bbe039436d4c5e9fe34c850ea85cc50b104ab)
2022-03-10 23:54:11 +01:00
ccrs
0e0deaefd4
Core/Movement: remove redundant method MovementGenerator::NotifyAIOnFinalize and use existing Finalize - MovementInform implementation
...
6fde051e4e52d98d1a6cf31b8ad3fcf95e0e83fd follow up
(cherry picked from commit 303e01c834d5edd1336a005a0ecf58cc82cfee1b)
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 e7e47866066f0b318c986c355dc4476b5948e622)
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 03c727326dce5d990fd453f42a92300dbd68dc0e)
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 0e804c95ac1e2ae048682fd3b52a02e8f6a88c82)
2022-03-10 23:13:25 +01:00
offl
f2777596a0
Scripts/Spells: Add comments with id & name of spells part 1
...
(cherry picked from commit 80a4b7f1e2f4baae40f08e87cb8cda0a1db833b9)
2022-03-10 22:41:12 +01:00
offl
09551b663a
Scripts/Quest: Rework cocooned creatures ( #26554 )
...
(cherry picked from commit 78bd609e8a37caa354c42ee6da798ab6c0bb3009)
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 f2f0aeb562dfc1a78b04d13a14e3c37a58367619)
2022-03-10 21:29:07 +01:00
offl
e3dbf86d6c
DB/Creature: Rework time bombs
...
Closes #26479
(cherry picked from commit 52333b0e311dabe18010f443b3751422d523e9b2)
2022-03-10 20:36:20 +01:00
Shauren
1f6497f04e
Core/AreaTriggers: Add missing 9.2 changes
2022-03-10 19:59:13 +01:00
Shauren
db3eb418b8
Core/Creatures: Fixed loading ModExperience from database
...
Closes #27858
2022-03-09 23:45:53 +01:00
Shauren
a5f107dafc
Core/Utilities: Fixed child process console output being incorrectly cut off at first newline
2022-03-09 16:22:04 +01:00
Ovahlord
209b90cfdd
Core/DBLayer: escape MySQL keywords in page_text, page_text_locale, broadcast_text and broadcast_text_locale select queries
...
(cherry picked from commit d4f71131f032ecc68545acd838de5a3ccfadc331)
(cherry picked from commit edcaac6c959e944dc6d6dc224666b832521412b4)
2022-03-09 15:30:23 +01:00
HelloKitty
a67bb1f575
Core/Map: Added Map::SetZoneOverrideLight std::chrono overload ( #26486 )
...
* Core/Map: Added Map::SetZoneOverrideLight std::chrono overload
* Scripts: Replace Map::SetZoneOverrideLight usages with new std::chrono overload
* Core/Map: Remove non-chrono Map::SetZoneOverrideLight overload
(cherry picked from commit e33c4b8f7f18c89fec3d95531fdccad526c12c10)
2022-03-09 14:56:04 +01:00
Edder
4dbacb6985
Core/Vehicle: Setting home position of creature passenger on AtEngage ( #26482 )
...
Co-authored-by: Edder <[email protected] >
(cherry picked from commit fb88a1409ff60343edb0c539d406a961724fcc4e)
2022-03-09 14:55:40 +01:00
Mikhail Redko
9e6def8ae2
Core/Console: Improve ReadWinConsole logic and cosmetic changes ( #26402 )
...
* Core/Console: Improve ReadWinConsole logic and cosmetic changes
* Core/Console: Fixed possible appearance of weird characters in the console when printing the output of child processes
* Fix codestyle
* Removed auto
* Core/Misc: Explicit casting Difficulty values to uint8 before outputting to console
* Core/Misc: Cast Difficulty to uint32 for output to console
Co-authored-by: jackpoz <[email protected] >
(cherry picked from commit 6c12f45f3b7d7eab32ed29860d2261fc8a512f0e)
2022-03-09 14:55:18 +01:00
offl
b1139ada4d
DB/Creature: Fix recently broken The Etymidian's script
...
(cherry picked from commit 79944605c644c597bada8535d9edd1fc3c77e4cc)
2022-03-09 14:20:51 +01:00
ihm-tswow
56f0129ff3
Core/Game: Fix cache path with git flow branches ( #26494 )
...
- git flow may put forward slashes in branch names, so we cannot assume we are just creating one directory.
(cherry picked from commit 471e5af32d24f99bea987ea4705f0165c9ece4d6)
2022-03-09 14:20:25 +01:00
robinsch
f7956ffd1e
Core/SAI: Prevent loading invalid smart_scripts entry ( #26508 )
...
(cherry picked from commit 8c0e6e9ee454c0a429a8a7b54d281d3378773e64)
2022-03-09 14:20:25 +01:00
schell244
71287d5861
Core/Sounds - added missing victory near sound for Arathi Basin (3.3.5) ( #26477 )
...
* added missing victory near sound for arathi basin
* switch sound id's
Co-authored-by: schell244 <>
(cherry picked from commit 2ac7499f66a80296486b7df6286ff503c8cdf3b9)
2022-03-09 12:44:54 +01:00
offl
11edf05f1c
Scripts/DTK: Update King Dred to new model ( #26464 )
...
Co-authored-by: offl <[email protected] >
(cherry picked from commit d9670cec6dc310b6fb636b73a92d7be24e89496f)
2022-03-09 12:44:04 +01:00
offl
f379dc56ca
Scripts/POS: Update instance scripts to new model ( #26467 )
...
Co-authored-by: offl <[email protected] >
(cherry picked from commit 7de6e756631391065fbff7c9bf8a0f1ce3d05272)
2022-03-09 12:43:55 +01:00
offl
6dedb40aa5
Scripts/POS: Update Tyrannus to new model ( #26466 )
...
Co-authored-by: offl <[email protected] >
(cherry picked from commit 87ba4a76156aa45cf0de36e9d43b1fb8694778cd)
2022-03-09 12:43:16 +01:00
offl
60168e18be
Scripts/POS: Update Garfrost to new model ( #26465 )
...
Co-authored-by: offl <[email protected] >
(cherry picked from commit b5cc63873d758317896e9523efe4f8fbef7c04b3)
2022-03-09 12:41:51 +01:00