Commit Graph
4915 Commits
Author SHA1 Message Date
Treeston 8b7934f718 Core/Spells: Fix orientation- and targeting-related issues if the creature isn't currently engaged in combat. (#17120)
Also disable spell focus system for vehicle control auras.

Closes #16572
Closes #17016
(cherry picked from commit 6f85422f0b7221dd38eaa70320b8a28b5fe7a2ef)
2017-02-12 17:04:08 +01:00
Alan Deutscher cd811271d9 Scripts: UNIT_FLAG_REMOVE_CLIENT_CONTROL no longer used as a method for preventing a unit from moving
UNIT_FLAG_REMOVE_CLIENT_CONTROL (formerly UNIT_FLAG_DISABLE_MOVE) is a client-only feature that should not be used for NPC scripting. All applications of this flag in scripts/ have been replaced with applications/removals of the UNIT_STATE_ROOT state.

Closes #17311

(cherry picked from commit 061b62a97dc9fbc1687de48404ed8e56e4fd1f5d)
2017-02-12 16:52:18 +01:00
jackpoz 7616f22bfb Core/Commands: Code cleanup
Remove commented out code

(cherry picked from commit eb9bf314c45a236f71a05814b2ef825c326eab83)
2017-02-12 16:27:58 +01:00
treeston 1091174f03 Merge remote-tracking branch 'Treeston/3.3.5-petaggro' into 3.3.5 (PR #17800)
(cherry picked from commit aeeae8d09c81e48d68ee3ff5a9588f8f94f5ad4d)
2017-02-12 16:08:32 +01:00
ariel- a4baffbf6f Core/Scripts: allow ".debug arena" and ".debug battleground" commands to be issued in the console
(cherry picked from commit 1b44377cda1065285dd3f53d90fc9b4360b6624b)
2017-02-12 15:32:48 +01:00
tkrokli fcd46dd70c Core/Scripts: move Pet Trainer gossip to DB
SQL content based  on issue 14719 by Killyana,
conditions output from Malcrom's Condition Creator

- remove hardcoded #define gossip options
- enum gossip menu IDs from DB
- remove outdated SD comments at the top of the file

Closes #14719
(cherry picked from commit 03bafe334c178f5731f6eee3de402294017c8ddd)
2017-02-12 15:16:58 +01:00
tkrokli 4f7db62f4b Core/Scripts: remove script npc_timothy_daniels (#17779)
The core script `npc_timothy_daniels` is no longer needed,
all the gossip handling is already present in the database.

- remove core script npc_timothy_daniels
- remove ScriptName from c_t entry in DB
(cherry picked from commit e2f395863a7fb1a85dc7d09f2692198faae16f46)

Rename 2016_08_14_01_world.txt to 2016_08_14_01_world.sql
(cherry picked from commit 6d66adbdf158fbce0bc2cdf796d9987261f6033f)
2017-02-12 14:52:55 +01:00
tkrokli 7223adfea3 Core/Scripts: move npc_mortog_steamhead to DB
Move core script npc_mortog_steamhead to database
- script contains gossip handling + 1 condition
- both actions can be handled in DB settings
(cherry picked from commit 0c6eeb3abc54dbc0f147e5098619e8e19e27accd)
2017-02-12 14:51:31 +01:00
ForesterDev 9d5304fd4f Core/Command: Check account password max length
(cherry picked from commit fdcea5c7efd58c929e5d653af955f524dc543034)

Rename 2016_08_04_05_world.sql to 2016_08_11_00_world.sql
(cherry picked from commit d4f2f5968aadc5145e9a8c58dc7a4e0bd48c87e8)
2017-02-12 14:06:35 +01:00
tkrokli bf896fe2b0 Core/Scripts: remove 2 unused scripts (#17759)
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
2017-02-12 13:30:29 +01:00
treeston af6041740c Scripts/Commands: Some adjustments to make shutdown commands more user-friendly.
- 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)
2017-02-11 22:35:00 +01:00
treeston d176be59b8 ScriptedAI/Creature: Fix a bug where a std::chrono overload was counting milliseconds instead of seconds.
(cherry picked from commit 4030e4d780ed60d281c2b0eaff58ed2b40ad7f47)
2017-02-11 22:03:16 +01:00
jackpoz a3384bdc70 Scripts/Commands: Change "server shutdown" behavior
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)
2017-02-11 22:02:08 +01:00
tkrokli 85a16fae3d Core/Scripts: move npc_kharan_mighthammer to DB/SAI
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)
2017-02-11 21:52:29 +01:00
jackpoz 6367be09fa Scripts/Commands: Change "server shutdown" behavior
Change "server shutdown" behavior to always include [force] optional parameter when issued from local or remote console.

(cherry picked from commit 884736b3b279737c44b0954ca3fe0f193085fbb3)
2017-02-11 21:43:03 +01:00
Aokromes 3b67401f6a Update boss_jedoga_shadowseeker.cpp
(cherry picked from commit 153b797182b0682cf81d333b879ad99280060025)
2017-02-11 21:37:42 +01:00
Keader 46d6b1a995 Core/Scripts Shade of Akama Rewrite (#17567)
(cherry picked from commit afaaedad2def50ef32ed76ce390efa9523cb80ba)

Rename 9955_22_55_world.sql to 2016_08_01_01_world.sql
(cherry picked from commit 1f8c55d1d67ce0192f8277a7429a5dc5be0b77b1)
2017-02-11 20:57:40 +01:00
tkrokli 9c09a0bd75 Core/Scripts: Remove useless SD2 error log (#17691)
* Core/Scripts:  Remove useless log message (ref. joschiwald)

(cherry picked from commit 8fdb9b4579793dbd8fa68cd5ad331d7a92ce8fea)
2017-02-11 20:51:21 +01:00
ariel- c429e7d489 Core/Entities: debloat SummonGameObject parameter list using proper wrappers and enable GO rotation in scripts
- 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
2017-02-11 20:50:29 +01:00
ariel- 02cef6f034 Core/GameObjects: Gameobject rotation (from cmangos/mangos-wotlk@2bcbc0f) (#14146)
cmangos/mangos-wotlk@0fe88f35df: [11531] Normalize gameobject's quaternion, thanks to zergtmn for pointing
cmangos/mangos-wotlk@060dfb791b: [11667] Implement transport path rotation
cmangos/mangos-wotlk@565f52c6c1: [11806] A bit gameobject code refactoring
cmangos/mangos-wotlk@6874951: [11807] Add gameobject_addon table

Closes #14146

(cherry picked from commit 2967bf59b4a47837b85c995b732a6761c9c35f7e)

# 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/Globals/ObjectMgr.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_gobject.cpp
#	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
#	src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
2017-02-11 19:10:43 +01:00
tkrokli d40dd1f639 Core/Scripts: zone_silithus.cpp cleanup (#17165)
- 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
2017-02-11 17:50:06 +01:00
Nyeriah 9db8ae1654 Scripts/Karazhan: Rework Attumen the Huntsman's script
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)
2017-02-11 17:17:38 +01:00
Keader 5978e90722 Core/Scripts Added Black Temple Boundaries (#17579)
* Core/Scripts Added Black Temple Boundaries
(cherry picked from commit 2710c655ffbbdb128e89609667d45fb02e4d818c)

# Conflicts:
#	src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
2017-02-11 17:00:29 +01:00
ForesterDev 97f65d9b4d Scripts / Naxxramas : add missing null pointer check. Fixes CID 1354738 (#17628)
(cherry picked from commit d57c177d0ba8399925cc86d5f8904df2aa5635b4)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
2017-02-11 15:29:22 +01:00
Shauren 6f176c0980 Core/Spells: Fixed fishing
Closes #19016
2017-02-11 13:04:12 +01:00
Shauren 87513871dc Fixup pr e5e8537c3e 2017-02-11 11:46:55 +01:00
DoctorKraft e5e8537c3e Core/Spells: Fixed Victory Rush
Closes #19044
2017-02-10 23:22:35 +01:00
edreisantafe 9ad50fb08c Core/Spells: Fixed Levitate
Closes #19091
2017-02-10 23:03:19 +01:00
DoctorKraft a692ebdcb0 Core/Spell: Conjure Refreshment (#19035) 2017-02-07 21:17:47 +01:00
ariel- 5f666a2ce6 Core/Spells: Fix Roar of Sacrifice damage part (#17519)
(cherry picked from commit 6988407b43ec92af4ffed60cdb8b4bc884487039)

Rename 2016_99_99_99_world.sql to 2016_07_16_03_world.sql
(cherry picked from commit 4bcb5a058bf735bfc2b32f3900b9a9bb494ae15d)
2017-02-05 20:35:19 +01:00
Gustavo 4a21e8158f Core/Spells GameObjects needs to be spawned in order to be acceptable as a SpellFocus (#17594)
(cherry picked from commit 23e89b8aef1999bbbd52248c40d7b76c0a67cafb)

# Conflicts:
#	src/server/game/Grids/Notifiers/GridNotifiers.h
2017-02-05 20:00:55 +01:00
Andrew Letson 53c98267a5 Core/Scripts: Migrate Tanaris NPC's to SAI (#17390)
(cherry picked from commit 6ea48c036e6eacea037660f057afc2ea5545ae91)

Rename 2016_06_15_99_world.sql to 2016_07_15_08_world.sql
(cherry picked from commit a37a8a316b3c94d7d5ba42db796282ac4e2db478)
2017-02-05 17:48:52 +01:00
robinsch 3ef1f2c531 Script/Archavon: Implement EMOTE_LEAP (#17588)
(cherry picked from commit 8a2df73a8262cb7140c37a57e7702cb68a806d9d)

Script/Archavon: Implement EMOTE_LEAP

By robinsch
(cherry picked from commit 1a2bd0dc3aaa5668521cf758165c64f106e9a276)
2017-02-05 17:31:54 +01:00
Warpten 3cd73a36e3 Scripts/RubySanctum: Fix missing break reported by Coverity.
(cherry picked from commit 07ce570be87db5598e1b05e79070a42d24340df4)
2017-02-05 16:37:36 +01:00
Snapper a3096cc1c1 Core/Misc: use enum for UNIIT_NPC_FLAGS' zero values
(cherry picked from commit ebb33bbfc1f11a16e00e0d84965ad5350267940a)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
2017-02-05 16:27:55 +01:00
Snapper c639153567 Core/Misc: kill whitespace and use enum instead of hardcoded value.
(cherry picked from commit 21797c6c4f1cfee479911f58df9b3e6b6f8a2c4d)
2017-02-05 00:57:20 +01:00
SnapperRy caf744ad02 Core/Script: small improvement for quest "The Hunt is On". (#17537)
Reset emotestate when the event starts.
(cherry picked from commit eb1cd4c90708309a2e3c0e6e7c3e91645f725810)
2017-02-05 00:57:16 +01:00
joschiwald e774c29c21 Fixed build 2017-02-05 00:16:58 +01:00
SnapperRy 623215ce31 Event/Midsummer: improve pole ribbon functionality (#17464)
Event/Midsummer: improve pole ribbon functionality:

- Bunny creature should hover, which puts it in the intended position.
- Use correct visual and internal spells to handle cosmetics and timers.
(cherry picked from commit 03b15d968b56b7855693e47e79a320cf9990d73c)

Rename 9999_99_99_99_world.sql to 2016_07_05_03_world.sql
(cherry picked from commit 8edc1caf32635f417aee290811a9ef2860f145b6)
2017-02-04 23:37:59 +01:00
Gustavo e55420af86 Core/Scripts Corrections on Halion's Encounter (#16725)
Core/Scripts: Updates to Halion

* Fixed Combustion and Consumption.
* Fixed Living Embers and Blazing Auras.
* Timer changes.
(cherry picked from commit dfe278459d79ade500a66356a98b4065c0722572)

# Conflicts:
#	src/server/game/Spells/SpellMgr.cpp
#	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp

Fix sql for merged PR
(cherry picked from commit 7f944695ddad14cec021ff5a0527a5a92fb4cf81)

Derp.

github editor is bad.
(cherry picked from commit 182904946174cd635b7478bd38507235d0d45aa2)
2017-02-04 23:33:26 +01:00
Andrew Letson 4c9301ca70 Core/Scripts: Migrate Shadowmoon Valley NPC's to SAI (#17373)
* Migrate Flanis Swiftwing and Kagrosh to SAI and more.
(cherry picked from commit 32dd6bbca810c652e49befb9c7d6bddc8cd534a2)

Rename 2016_06_14_99_world.sql to 2016_07_04_12_world.sql
(cherry picked from commit d7b3285e78d72c741a2751b644bd553e83a761ce)
2017-02-04 23:15:39 +01:00
Aokromes 5c3651379b Scripts/Midsummer: Burning hot pole dance (#17445)
* Scripts/Midsummer: Burning hot pole dance
By  zwerg, closes #6876
(cherry picked from commit b0e5f6de47e85e1ca7cd3cc54dcf31fddac71a9f)

Rename 2016_99_99_99_world_.sql to 2016_06_26_01_world_.sql
(cherry picked from commit 184e64fa3318caa32cd7b283c79a77b4033d88ed)

Rename 2016_06_26_01_world_.sql to 2016_06_26_01_world.sql
(cherry picked from commit 4cc88b5f091ba7909bda2bb664b7904907b29197)
2017-02-04 17:58:01 +01:00
Gustavo e336272ec2 Core/Scripts Boss Ahune Clean-up (#17320)
Remove use of flags UNIT_FLAG_NON_ATTACKABLE and UNIT_FLAG_REMOVE_CLIENT_CONTROL
Replace with correct one, UNIT_FLAG_UNK_31, imunity part now is fully handled by auras
Fix a problem with bugged orientation while casting SPELL_SYNCH_HEALTH
Use std::crono notations
Remove unneeded code

Move one spell_linked_spell to SpellScript
Fix Loot issue
Fix Possible Crash
(cherry picked from commit f1639a30ba1f52370c128585d1670af18e48e799)

Rename 2016_99_99_99_world.sql to 2016_06_26_00_world.sql
(cherry picked from commit fdf0092ac24a27f1e95ffeb4f0257404998980ee)
2017-02-04 17:56:05 +01:00
DoctorKraft 4075bd16e4 Core/Spells: Fixed Divine Storm (#19031) 2017-02-03 20:49:30 +01:00
Keader d9eb79c3c5 Core/Spells: Missing override 2017-02-03 07:11:15 -03:00
DoctorKraft 8aa07daff3 Core/Spells: Divine Steed (#19027) 2017-02-02 18:19:08 +01:00
Meruemu 9733e084e6 Core/Scripts: Fix array out of bounds in boss_mother_shahraz.cpp. (#17434)
Fix an error in Prismatic Shield auras and Fatal Attraction teleport points selection (was introduced in https://github.com/TrinityCore/TrinityCore/commit/fb63c8e915986650f787de62859e1f818d1d96c7)
(cherry picked from commit 325ccab595780448ade80967aca74a9acb8cd8b2)
2017-02-01 22:53:21 +01:00
tkrokli 604b8bfab1 Core/Scripts: Tom Hegger must target player in Say text (#17395)
File: zone_borean_tundra.cpp
Script: npc_hidden_cultist
Quest: The Hunt is On, 11794
NPC:  Tom Hegger, 25827

Before this change, Tom Hegger does not target player when saying his
aggro text "You don't know who you're messing with, $c!   Death beckons!"
and hence the text $c will be shown instead of the player class.
(cherry picked from commit 736843fbb5442b1338ec888c8a702d666c95a76b)
2017-01-29 21:51:04 +01:00
treeston 5baf6ea4d9 Merge branch '3.3.5-frogger' into 3.3.5 (PR #17261)
(cherry picked from commit 90ff3ce8c8256796cb637fba52e8ae38a0751176)
2017-01-29 21:51:03 +01:00
ariel- d40c151cc8 Core/Scripts: Extended SMART_ACTION_SET_INST_DATA to also set BossStates. (#16739)
Scripts/Dire Maul: Initialize boss states array so it may be called from SmartAI. (Ref #6429)
(cherry picked from commit d1d0c64ad11cb3faf986a5332fec6b704fb8026c)

# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
2017-01-29 18:04:10 +01:00