Commit Graph

30100 Commits

Author SHA1 Message Date
treeston
8d7ab10efa Scripts/SmartAI: Some clean-up work:
- 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 152b3ad5b9)

# Conflicts:
#	src/server/game/AI/SmartScripts/SmartAI.cpp
#	src/server/game/AI/SmartScripts/SmartScript.cpp
2017-02-11 22:34:59 +01:00
Killyana
5515ff683f DB/SAI: Fix runtime SAI error
(cherry picked from commit 91b2351876)
2017-02-11 22:34:59 +01:00
Killyana
0b3af66403 DB: Blood elf start location / Sunstrider isle fixes
By msoky

(cherry picked from commit dde5389673)
2017-02-11 22:15:54 +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
Kittnz
8b22ed68ea DB/Creature: Grizzly Hills Vordrassil area
- Add missing Vordrassil's Seed spawns
- Add missing creature spawns: Frostpaw Warrior, Redfang Hunter, Generic Trigger LAB, Frostpaw Shaman, Redfang Elder, Frostpaw Trapper
- Add pathing for Frostpaw Shaman, Frostpaw Warrior
- Change some SAI's, Redfang Hunter SAI, Frostpaw Shaman SAI, Generic Trigger LAB SAI
(cherry picked from commit 2c0b0b6afa)

Fix deleting some gameobjects
(cherry picked from commit 74bf937865)
2017-02-11 21:49:11 +01:00
Dr-J
d753c24acc DB/Quest: From the Depths of Azjol-Nerub
Fix this http://www.wowhead.com/quest=12036/from-the-depths-of-azjol-nerub again after cdf8f3c2e1 areatrigger_involvedrelation does not like sai triggers
(cherry picked from commit 9977bf7479)
2017-02-11 21:44:47 +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
treeston
a0d886020d Core/Spells: Check TRIGGERED_DONT_REPORT_CAST_ERROR flag in SendCastResult rather than CheckCast.
Fixes and closes #16836.

(cherry picked from commit 4b15369378)

# Conflicts:
#	src/server/game/Spells/Spell.cpp
2017-02-11 21:37:42 +01:00
Aokromes
3b67401f6a Update boss_jedoga_shadowseeker.cpp
(cherry picked from commit 153b797182)
2017-02-11 21:37:42 +01:00
Aokromes
81c5da722d DB/Misc: Fix on startup error
(cherry picked from commit ca99b688ed)
2017-02-11 21:37:41 +01:00
Dr-J
0f1f74852b DB/Quest: A Couple more event scripts
1) http://www.wowhead.com/quest=11631/vision-of-air so there is actually visual rather than quest been immedietly completed when quest item used
2) Event for turn in of http://www.wowhead.com/quest=11695/the-horn-of-elemental-fury
3) A small fix for Subjugated Iskalder so this npc has to be taken back the the bone witch rather than credit been given on spawn and npc not moving (due to bad follow action),
(cherry picked from commit e7cfb08cb5)
2017-02-11 21:37:41 +01:00
ariel-
9c0f2c4945 Core/PvP: Gameobject rotation in BGs and Wintergrasp.
- 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 33fbc453d2)

# Conflicts:
#	src/server/game/Battlefield/Battlefield.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
2017-02-11 21:37:40 +01:00
jackpoz
af11f48356 Core/Group: Do not allow a player to invite himself
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 bcfa47c051)
2017-02-11 21:37:40 +01:00
Aokromes
6326bf20f5 Core/Chat: Split ChatLevelReq.Say into 3
ChatLevelReq.Say
ChatLevelReq.Emote
ChatLevelReq.Yell

(cherry picked from commit cf8276845d)

# Conflicts:
#	src/server/game/Handlers/ChatHandler.cpp
2017-02-11 21:11:37 +01:00
ariel-
41fad95ad8 Core/Battlegrounds: do not teleport GMs if out of bounds before starting
(cherry picked from commit 80a463bccb)
2017-02-11 21:09:01 +01:00
Aokromes
5264374fd6 Core/Player: New PartyLevelReq setting (#17707)
(cherry picked from commit bfda0ba91d)

Typo fix
(cherry picked from commit 35f06ccb55)
2017-02-11 21:08:48 +01:00
ariel-
04f7de8957 Core/Spells: Abyssal Shatter should have a chance to skill up
(cherry picked from commit 0d91ccf6bd)
2017-02-11 20:59:21 +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
Aokromes
3b9efd35df Core/PVP: Move report AFK requirement to config (#17699)
(cherry picked from commit 633264f58f)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/World/World.cpp
2017-02-11 20:55:14 +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-
eb6ecb99e6 Update BattleGroundHandler.cpp
(cherry picked from commit dff18152fc)
2017-02-11 20:51:03 +01:00
Aokromes
a7aae1f178 Core/PVP: Improve log (#17698)
(cherry picked from commit ea4e7fec01)
2017-02-11 20:50:39 +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
ariel-
07f2f37329 Core/Spell: fix one logic fail when calculating level penalty
(http://wow.gamepedia.com/index.php?title=Spell_power&oldid=1751770#Spells_learned_before_level_20)

(cherry picked from commit c271e196c8)
2017-02-11 17:58:59 +01:00
Aokromes
16463e4122 DB/Creature: Fix dmgschool for multiple creatures.
(cherry picked from commit ea9b44d749)
2017-02-11 17:56:05 +01:00
Aokromes
c1840dd33e Update PackageList.txt
(cherry picked from commit cb247ea033)
2017-02-11 17:54:38 +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
ariel-
c7d2ca3030 Dep/gSOAP: Update gSOAP to 2.8.33
(cherry picked from commit 3056feb9b2)
2017-02-11 17:43:06 +01:00
ariel-
24847c01ef Dep/gSOAP: Remove pointless diff not valid after d42c048818
(cherry picked from commit f87e65bca8)
2017-02-11 17:42:59 +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
Dr-J
307003fc9c DB/Misc: Various Fixes
1) Add a missing to spell to make http://www.wowhead.com/object=182050/box-of-mushrooms#comments spawn a http://www.wowhead.com/npc=18120/angorosh-mauler when looted
2) http://www.wowhead.com/npc=30718/slumbering-mjordin should not be attackable until gossip selected
3) The Valiant's Challenge - Make the Argent Champion set data on squire danny by creature guid instead of closest creature to prevent credit not being given is player is too far away from squire danny.
4) Add civillian flags to http://www.wowhead.com/npc=18206/wastewalker-captive to prevent these non selectable caged npcs from attacking players
5) http://www.wowhead.com/item=7666/shattered-necklace should have possibility to drop for both factions (not just horde) the item is required for a quest for horde players but starts a different quest which horde cant even accept for alliance.
(cherry picked from commit 36306c40d3)
2017-02-11 17:10:59 +01:00
Aokromes
643beaf943 DB/Gameobject: Respawntimer fix for Quest 11695
Closes #17643 by Tauriella
(cherry picked from commit 5a550f9418)
2017-02-11 17:05:42 +01:00
Killyana
a1dcbfc1b3 DB/Creature: update Drak'aguul script and fix a DB error
Updates #16573

(cherry picked from commit 995f5f1f2b)
2017-02-11 17:03:07 +01:00
Killyana
2ca6c021e1 Creature/SAI: Add Frostbolt to Gordok Ogre-Mage
(cherry picked from commit eb496e22eb)
2017-02-11 17:01:32 +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
treeston
e30cbb960e Core/Spell: Quick readability change. Functionality not altered.
(cherry picked from commit 03bef35500)

# Conflicts:
#	src/server/game/Spells/Spell.cpp
2017-02-11 16:59:44 +01:00
ariel-
3532173ee3 Core/Vehicle: delay position update in Vehicles, this may be deleted on UpdatePosition, generating a crash
Closes #17634

(cherry picked from commit 6b3067f978)

# Conflicts:
#	src/server/game/Entities/Vehicle/Vehicle.cpp
2017-02-11 16:56:07 +01:00
Killyana
611bc7d838 Core/Entities: Remove wrong immunity
Closes #17363

(cherry picked from commit 0be0606593)
2017-02-11 16:49:56 +01:00
Killyana
28a029c440 DB/SAI: Kilix the Unraveler event
Closes #16538
By Rushor

(cherry picked from commit cdf8f3c2e1)
2017-02-11 16:48:03 +01:00
Killyana
09740ec4c3 DB/SAI: Drak'aguul
Closes #16573

(cherry picked from commit fc2fa483b7)
2017-02-11 16:42:28 +01:00
ariel-
781891a857 Core/Handlers: actually check allowed trainer classes and races to avoid spoofing
Closes #14586

(cherry picked from commit f87f7619aa)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Handlers/NPCHandler.cpp
2017-02-11 16:39:45 +01:00
ariel-
e56633dbd9 Update ItemPrototype.cpp, codestyle and indentation cleanup
(cherry picked from commit a6005d98e7)

# Conflicts:
#	src/server/game/Entities/Item/ItemPrototype.cpp
2017-02-11 15:57:08 +01:00
Killyana
3e33e5bf78 DB/Quest: The Keeper's Favor
Fix spell target and cast type
Closes #17623

(cherry picked from commit 10ac7a06de)
2017-02-11 15:53:55 +01:00
ariel-
c827443d4a Core/Player: Misc codestyle
(cherry picked from commit bdbd5b0961)
2017-02-11 15:49:32 +01:00
Killyana
bc690f9cb0 SAI: Gordok Ogre-Mage
Closes #17627

(cherry picked from commit 9e46786288)
2017-02-11 15:48:14 +01:00
Killyana
d5677655f2 DB/NPC: Quartermaster Bartlett
Closes #17611

(cherry picked from commit c2e29a34eb)
2017-02-11 15:35:44 +01:00
ForesterDev
19df05d86d Core/UnitAI: Removed unneccessary null checks in SpellTargetSelector. CID 1357405 (#17630)
(cherry picked from commit a2495002e5)

# Conflicts:
#	src/server/game/AI/CoreAI/UnitAI.cpp
2017-02-11 15:34:48 +01:00