Commit Graph

5023 Commits

Author SHA1 Message Date
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 5661b4686b)

Rename 2016_08_99_99_world.sql to 2016_08_23_03_world.sql
(cherry picked from commit 831975fa34)
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 433beb77e3)
2017-02-18 14:38:42 +01:00
jackpoz
143f0c0e4d Core/Misc: Fix static analysis issues
(cherry picked from commit b7306f06f5)

# 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 6f85422f0b)
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 061b62a97d)
2017-02-12 16:52:18 +01:00
jackpoz
7616f22bfb Core/Commands: Code cleanup
Remove commented out code

(cherry picked from commit eb9bf314c4)
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 aeeae8d09c)
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 1b44377cda)
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 03bafe334c)
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 e2f395863a)

Rename 2016_08_14_01_world.txt to 2016_08_14_01_world.sql
(cherry picked from commit 6d66adbdf1)
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 0c6eeb3abc)
2017-02-12 14:51:31 +01:00
ForesterDev
9d5304fd4f Core/Command: Check account password max length
(cherry picked from commit fdcea5c7ef)

Rename 2016_08_04_05_world.sql to 2016_08_11_00_world.sql
(cherry picked from commit d4f2f5968a)
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 2507b9f8af)

# 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 d760219062)
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 4030e4d780)
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 b37c7101de)
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 2125c12609)
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 884736b3b2)
2017-02-11 21:43:03 +01:00
Aokromes
3b67401f6a Update boss_jedoga_shadowseeker.cpp
(cherry picked from commit 153b797182)
2017-02-11 21:37:42 +01:00
Keader
46d6b1a995 Core/Scripts Shade of Akama Rewrite (#17567)
(cherry picked from commit afaaedad2d)

Rename 9955_22_55_world.sql to 2016_08_01_01_world.sql
(cherry picked from commit 1f8c55d1d6)
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 8fdb9b4579)
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 62bfee37cb)

# 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 2967bf59b4)

# 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 b7abaed199)

# 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 4c4d92faa3)

Scripts/Karazhan: Fix a warning
(cherry picked from commit 0cc33b5a42)

Scripts/Karazhan: Register Midnight's summons

* Solves issue with bosses not despawning after encounter
(cherry picked from commit 2d0fa2d020)
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 2710c655ff)

# 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 d57c177d0b)

# 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 6988407b43)

Rename 2016_99_99_99_world.sql to 2016_07_16_03_world.sql
(cherry picked from commit 4bcb5a058b)
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 23e89b8aef)

# 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 6ea48c036e)

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

Script/Archavon: Implement EMOTE_LEAP

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

# 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 21797c6c4f)
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 eb1cd4c907)
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 03b15d968b)

Rename 9999_99_99_99_world.sql to 2016_07_05_03_world.sql
(cherry picked from commit 8edc1caf32)
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 dfe278459d)

# 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 7f944695dd)

Derp.

github editor is bad.
(cherry picked from commit 1829049461)
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 32dd6bbca8)

Rename 2016_06_14_99_world.sql to 2016_07_04_12_world.sql
(cherry picked from commit d7b3285e78)
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 b0e5f6de47)

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

Rename 2016_06_26_01_world_.sql to 2016_06_26_01_world.sql
(cherry picked from commit 4cc88b5f09)
2017-02-04 17:58:01 +01:00