Commit Graph
4945 Commits
Author SHA1 Message Date
Shauren e9bdcd9d64 Scripts/Naxxramas: Fixed invalid use of std::initializer_list 2017-02-26 15:01:23 +01:00
ariel- b239afb0ef Core/Misc: calculate rotation fields from orientation in some places it's impossible to get:
- SmartScripts: SMART_ACTION_SUMMON_GO
- Spell Effects:
  * SPELL_EFFECT_DUEL
  * SPELL_EFFECT_SUMMON_OBJECT_WILD
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT1
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT2
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT3
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT4
- Command Scripts: .gobject add

Closes #17891

(cherry picked from commit 14445d2202de1b58dcb04c5457be682b8e7075ca)
2017-02-19 15:34:57 +01:00
treeston dd0df772df Scripts/Events: Globally fix all ExecuteEvent loops to check UNIT_STATE_CASTING after each iteration, instead of just checking it once initially.
Fixes and closes #17892.

(cherry picked from commit ac62d7156f93bf86f57dbad1f24f14031322fd5a)

Drycoding is bad, mmkay?
(cherry picked from commit ed83a35fbeeb7f9005fe4792225fb50700791c6f)
2017-02-19 15:09:02 +01:00
r00ty-tc 8a71e4255e [Core/Maps] Activate creatures and objects during opening cinematics and other flyby cameras (sunwell etc).
Requires re-running map extractor to extract camera m2 files from data
files. These are very small.
2017-02-19 14:47:20 +01:00
Trond B Krokli 02757118f2 Core/Scripts/DB: remove hardcoded text from npc_beaten_corpse (#16907)
- remove hardcoded text from script npc_beaten_corpse
- remove OnGossipHello() hook, gossip text moved to DB
- use sGossipSelect() hook instead of OnGossipSelect()
- add npc_text 3557 and 3558 as text_id to gossip_menu
- add gossip_menu_option 2871 to NPC 10668 Beaten Corpse
- add condition for gossip_menu_option 2871 in Quest ID 4921

Tested on 4 different characters/classes, male & female.
Thanks to joschiwald for the sGossipSelect() script change.
(cherry picked from commit d82534a7bbd401f4b672786749f10f5a95f6e76c)
2017-02-18 17:53:48 +01:00
treeston bbbf8df8e5 Entities/Gossip: The Big One™ that gets rid of all uses of The Bad™ and The Ugly™, e.g. gossip preprocessor macros, and replaces them with the new-and-shiny gossip functions.
(cherry picked from commit d55426f5b4e431e6d398b1e2dbbd25f7387328f2)
2017-02-18 17:50:00 +01:00
tkrokli a714fe98f6 Core/Scripts: remove forgotten #define in boss_kalecgos.cpp
This #define was originally supposed to be removed in my PR #17832,
but for some reason it remained undeleted. This commit corrects it.

Also aligned all the enum values to the same column for readability,
based on a common multiple of 4 spaces.

(cherry picked from commit 068656af064db741adf92281fd5a094db66b7d4c)
2017-02-18 17:29:54 +01:00
Gustavo cc39c11d7f Whitespace clean-up
(cherry picked from commit 6ee35734e42a97696056fcb0bf684a11ea4e524c)
2017-02-18 17:25:36 +01:00
Gustavo c4f2012ef5 Core/Spells Make credit for quests "The Grand Melee" and "Among the Champions" a triggered cast (#17870)
Fix a problem where the credit wasn't casted due to CGD
(cherry picked from commit e1761a24ceab167909a71be8d38dda9dc4792932)
2017-02-18 17:23:20 +01:00
ariel- b3f993894a Core/Scripts: Professor Putricide oozes, reapply passive proc auras on reset, and register them as PP summons since they're summoned by a trigger. (f183ed3c50cdcf13cd9fe608e0f4791177f120a4 follow-up)
(cherry picked from commit 27590fbb9856c77af49bcf396e86db8f8f3aec9d)
2017-02-18 17:16:11 +01:00
ariel- 7f66c730ec Update boss_kelthuzad.cpp
(cherry picked from commit 7e4abce820072966dd060c18c8f9901b6da04c98)

Core/Scripts: fix math error that would not select points on the entire circle
(cherry picked from commit cd9226e755640712b308753a43336fdc43af05f5)
2017-02-18 16:54:56 +01:00
Gustavo accbb587b8 Core/Scripts Boss Skadi the Ruthless rework
(cherry picked from commit 40114cacd37675a9cbe7d2eef15445340d87e814)

Rename 2016_99_99_00_world.sql to 2016_08_25_06_world.sql
(cherry picked from commit 738e3cf0020c16d85e7fdeca55128e71ba3d2aed)

travis is lazy
(cherry picked from commit 92876278fe163ffd8ecf9561f5b0044225559c48)
2017-02-18 16:44:24 +01:00
tkrokli ac88c6ec17 Core/Scripts: move npc_experience hardcoded text to DB
(cherry picked from commit 8df4706992f0fa39af5892dce2c23a0dde5bd9c1)

Rename 2016_08_28_17750_world.sql to 2016_08_25_05_world.sql
(cherry picked from commit 9c41af16cae65c6a7cc97a22fd877993eb9dfa49)
2017-02-18 16:23:19 +01:00
tkrokli d01dbdc528 Core/Scripts: move #define to enum in boss_kalecgos.cpp
(cherry picked from commit 8bc00e8952e5ae35b69edb50785d0a19ebf8e91e)
2017-02-18 16:20:47 +01:00
tkrokli 89923791b8 Core/Scripts: move forge_of_souls gossip to DB
(cherry picked from commit 537074a8092ae694cf5d797a2a8f0ffa5013d43c)

Rename 2016_08_24_20_world.sql to 2016_08_25_03_world.sql
(cherry picked from commit 8500d0f9e01964531f469e9bbf2f146e03915a8e)
2017-02-18 16:19:17 +01:00
Gustavo a4fc7d9d2d Core/Scripts Implement Pit of Saron Cavern event
(cherry picked from commit b459c6607f80701945cb822d8c7519998cad205f)

Rename 2016_99_99_99_world.sql to 2016_08_25_01_world.sql
(cherry picked from commit 05df3cc98813688247dc2ec0ce3899a1369ec0d5)
2017-02-18 16:16:00 +01:00
Gustavo e8df5babe6 Scripts/Pet Implemented Argent Squire/Gruntling and Argent Pony Bridle
(cherry picked from commit 989aaaa8b5284bc707c94c62e6c50e9df3cbfc84)

Rename 2016_08_15_17779_world.sql to 2016_08_25_00_world.sql
(cherry picked from commit 526dfca8643d3afb9976eb099281547003dffbb1)
2017-02-18 16:00:52 +01:00
treeston df0d32be81 Merge remote-tracking branch 'Treeston/3.3.5-kelthuzad' into 3.3.5 (PR #16634)
(cherry picked from commit 47a9cb1e562b1132df2b7b14e01d9e4f01e85717)

...Huh. Wonder how this one didn't make travis complain on the PR.
(cherry picked from commit 93a68d58814013a1c656bf17afcc94938457adfd)

Was Travis completely napping on this one?
(cherry picked from commit 2d7dec0d39765dbaad3d3f4c9e203070bcd772d5)
2017-02-18 15:57:19 +01:00
treeston ab6f8f9fb7 Scripts/HallsOfLightning: Fix Volkhan healing.
(cherry picked from commit 5da3ae0489b4bc2d92559874725a31f66951541a)
2017-02-18 15:49:06 +01:00
tkrokli 16c6e0fb80 Core/Scripts: set correct unit_flags on Scarlet Mine Car (#17844)
Closes #17816
(cherry picked from commit f3dc97f263cc14ba5a17d745b552586aecb36a59)

Rename 2016_08_24_08_world.sql to 2016_08_24_03_world.sql
(cherry picked from commit cabf6bd98a8f6c39c4173fb3f30a50708ad20093)
2017-02-18 15:49:05 +01:00
SnapperRy a6209e6d6d Event/Brewfest: implement relay race (#17603)
(cherry picked from commit 894378f86728f54a604f6808b6c34e4f498ddd0c)

Rename 9999_99_99_99_world.sql to 2016_08_23_05_world.sql
(cherry picked from commit 6036b07f2515bec008df3ec02ab71b90e4384229)
2017-02-18 14:47:00 +01:00
tkrokli d8befaf68b Core/Scripts: npc_wormhole #define text moved to DB (#17805)
Another core script hardcoded text removal:
- removed #define text from script
- added the text to gossip_menu_option
- added and renamed enum to match DB entries
- minor additional adjustments and comments

Closes #6841
(cherry picked from commit 8a0990376de608a58054a8103f856ac0952d6114)
2017-02-18 14:42:03 +01:00
Gustavo 7e57e9a91b Improve scripts for quests Breakfast Of Champions and A Bear of an Appetite (#17780)
Properly despawn the related GameObjects after use of the quest item, avoiding multiple use and summon
(cherry picked from commit 5661b4686bf7a1d2147d9fdb47115883a4d11ecf)

Rename 2016_08_99_99_world.sql to 2016_08_23_03_world.sql
(cherry picked from commit 831975fa3426bdec9f9c0647d690e6c9664d5f72)
2017-02-18 14:40:14 +01:00
SnapperRy 2574667854 Scripts/ArgentTournament: improve training dummy script
Now the ranged and charge target dummies will cast their spells and behave correctly for the related quests
(cherry picked from commit 433beb77e32db097bf15f9faea222e99ad6373e3)
2017-02-18 14:38:42 +01:00
jackpoz 143f0c0e4d Core/Misc: Fix static analysis issues
(cherry picked from commit b7306f06f56ea3d7ee1803d7421dcf850878ac80)

# Conflicts:
#	src/server/game/Entities/Unit/StatSystem.cpp
2017-02-18 14:30:23 +01:00
joschiwald c6632dc3ee Fixed build and typo 2017-02-18 13:40:03 +01:00
joschiwald 80c36f3d9c Scripts/Command: Fixed phases output in .pinfo command
Closes #19144
2017-02-17 21:54:49 +01:00
Keader 0ed67081bc Core/Spells: Fixed Chilled effect on Frostbolt, Frozen Orb and Blizzard (#19131) 2017-02-15 12:17:45 -02:00
RoG_Hannibal 23aca839fe Core/Spells: add slowing effect to Mage spell Frostbolt (#19092)
Closes #18932
2017-02-13 15:17:28 -02:00
RoG_Hannibal d2dba9a5e0 Core/Spells: fix Priest spell Penance and Power Word: Shield (#19033)
- fix talent "The Penitent" for the spell Penance
- re-write Power Word: Shield

Closes #18520
2017-02-13 03:46:00 +01:00
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