These scripts are no longer in use:
- generic_creature
- trigger_death
(cherry picked from commit 2507b9f8af15b79b6825d620b2b5d86d5b3c3f40)
# Conflicts:
# src/server/scripts/World/mob_generic_creature.cpp
(cherry picked from commit fdd78d20772701b3e0fd7caf0da2cd5a2e6b6354)
Entities/Creature: Fix spawn health, fdd78d2 follow-up. Fixes and closes#17757.
(cherry picked from commit 5b6eb29b74bbc9e62f12c449b1896a075bdd25a2)
Entity/Creature: Fix spawn health, for real this time. Closes#17757. Also for real this time.
(cherry picked from commit ac35f93c2d6d5436054be474da06c9483e311c36)
And move others to more logical appenders
(cherry picked from commit b65d26b5b450ec60dfe2ac1b923289eafb6946c6)
# Conflicts:
# src/server/game/Handlers/PetHandler.cpp
- New error message if a shutdown is delayed due to force threshold.
- New status message indicating that a server shutdown was successfully cancelled.
(cherry picked from commit d7602190623153c8f211ad120e22c6e63371f3db)
- NULL -> nullptr
- Rename "AssistPlayerInCombat(who)" to "AssistPlayerInCombatAgainst(who)" to reflect what the method actually does
- Code style
No functionality was changed.
(cherry picked from commit 152b3ad5b997f4be06c5bb55ddb15c57a8e28c3b)
# Conflicts:
# src/server/game/AI/SmartScripts/SmartAI.cpp
# src/server/game/AI/SmartScripts/SmartScript.cpp
Change "server shutdown 0" behavior to delay the shutdown by the force threshold specified in configs if there are still players connected, set to 30 by default
(cherry picked from commit b37c7101de272d1b3d599f26d6b5077cfacfb121)
This PR affects the following 2 quests:
Quest ID 4001 "What Is Going On?" - part 2 (Horde)
Quest ID 4342 "Kharan's Tale" (Alliance)
Target of this PR:
Move core script npc_kharan_mighthammer to DB/SAI
(thereby removing 10 lines of hardcoded text).
* DB/conditions: extra gossip conditions
- added conditions for gossip before quest taken and after quest completed.
- removed redundant core script SAY_GET_ME_OUT_OF_HERE comment
* DB/creature: add more text to Kharan
- add all missing creature_text lines to entry 9021 Kharan Mighthammer
- add SAI duration to wait before TEXT_OVER is triggered (3000 ms)
(cherry picked from commit 2125c126097812fd6682db8edfd543c0d5583abf)
Change "server shutdown" behavior to always include [force] optional parameter when issued from local or remote console.
(cherry picked from commit 884736b3b279737c44b0954ca3fe0f193085fbb3)
- Add a workaround in BattleGround correcting for bad rotations in BG scripts
- Calculate rotation from rotation in Wintergrasp, this function hasn't a rotation parameter and should be added in the future.
- Also removed an ugly hardcode in Battlefield::SpawnGameObject
Closes#17711
(cherry picked from commit 33fbc453d236d943c24fb10522ac0720c3174c3d)
# Conflicts:
# src/server/game/Battlefield/Battlefield.cpp
# src/server/game/Battlegrounds/Battleground.cpp
Do not allow a player to invite himself in group.
Fix an edge case when inviting another player that would cause a crash.
Fix#17664
(cherry picked from commit bcfa47c0514b51690a5dd222b3b1ac5f20379232)
(cherry picked from commit afaaedad2def50ef32ed76ce390efa9523cb80ba)
Rename 9955_22_55_world.sql to 2016_08_01_01_world.sql
(cherry picked from commit 1f8c55d1d67ce0192f8277a7429a5dc5be0b77b1)
- There's still an overload allowing for x, y, z, o to be passed directly
- Fixed default animstate for GameObject creation in many places, it should be 255, not 100 (checked in sniffs)
(cherry picked from commit 62bfee37cb21584cef631dda428feaf5eb829cda)
# Conflicts:
# src/server/game/Battlefield/Battlefield.cpp
# src/server/game/Battlegrounds/Battleground.cpp
# src/server/game/Entities/GameObject/GameObject.cpp
# src/server/game/Entities/GameObject/GameObject.h
# src/server/game/Entities/Object/Object.cpp
# src/server/game/Entities/Object/Object.h
# src/server/game/Spells/SpellEffects.cpp
# src/server/scripts/Commands/cs_gobject.cpp
# src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
# src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
# src/server/scripts/Kalimdor/zone_feralas.cpp
# src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
# src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
# src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
- move npcs_rutgar_and_frankal to DB/SAI
- move hardcoded text from go_wind_stone to DB
- additional enum cleanup in zone_silithus.cpp
- also solves a $r issue in SAY_TEMPLAR_AGGRO
(cherry picked from commit b7abaed1996608f9a318a22ff657c5261a7acdfb)
# Conflicts:
# src/server/scripts/Kalimdor/zone_silithus.cpp
Change log:
- Timers are more accurate
- Corrected Charge ability ID based on 6.x researches
- Added Midnight's missing emotes
- Fixed issue with instance being stuck in combat in case of wipes
- Solved the rare scenario where Attumen would be summoned multiple times
- Visual spell on 3rd phase transition added
- Attumen and Midnight can now be damaged during 3rd phase transition
- Midnight calls for the aid of every horse still alive in the stables
- Use proper spells to summon Attumen and handle transitions
- Now despawns on evade
Video of encounter after changes: https://www.youtube.com/watch?v=KX0rqaBeSzw
(cherry picked from commit 4c4d92faa3b9e82fbabffb03eb63761b282f03a2)
Scripts/Karazhan: Fix a warning
(cherry picked from commit 0cc33b5a42f44847393235c20411e34c7caf2bc5)
Scripts/Karazhan: Register Midnight's summons
* Solves issue with bosses not despawning after encounter
(cherry picked from commit 2d0fa2d0201dce03f958aa7583f51fc92c46f795)
tkrokli