Commit Graph
30130 Commits
Author SHA1 Message Date
ariel- 07e8fe115f Core/Player: Do not kick AFK player from BG if it's a GM
(cherry picked from commit 82517ef46277170cc8db703d9e3a22078a4acb66)
2017-02-12 15:32:57 +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
Chaouki Dhib 66d36839f0 Core/Units: Fixed melee range check (#17693)
* Split Spell::CheckRange() into 2 methods since that method had more than one responsibility.
* Moved melee range logic into its own function
* Moved melee range logic method GetMeleeRange from Spell to Unit class. Unit::IsWithinMeleeRange() and Spell::GetMinMaxRange() both use that method.
(cherry picked from commit d7600f1126d2780fecdfcdfc66a598a48cee0136)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Entities/Unit/Unit.h
#	src/server/game/Spells/Spell.cpp
2017-02-12 15:32:29 +01:00
Gerhood 2560066b84 Core/Auras: Increase number of auras sent to client except for group updates (#17604)
(cherry picked from commit 4a38773e3e74af329aa13e2a506ef824f2a6e4d3)

# Conflicts:
#	src/server/game/Handlers/GroupHandler.cpp
#	src/server/game/Spells/Auras/SpellAuraDefines.h
#	src/server/game/Spells/Auras/SpellAuras.cpp
2017-02-12 15:21:05 +01:00
Aokromes 15531e1740 DB/Creature: missing spawn creature 40405 Kieupid <Pet Trainer>
Closes #17747 by tkrokli
(cherry picked from commit 9796ee5b14bb5cf5baeda4eada345dc708e63142)
2017-02-12 15:16:59 +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
robinsch d94f0f3427 Core/Spell: Remove all raid auras on party leave (#17663)
(cherry picked from commit dd67f4ed966875e6e68f6b0a8d56cdf190d0f352)
2017-02-12 15:11:20 +01:00
Dr-J a71aa14d3e DB/Misc: Updates
1) Update to conditions for Zombiefest as previous conditions appear to have stopped working correctly
2) Update for Dark Subjugator to prevent these becoming bugged, also correct unit flags for the sentrys to prevent these from agroing player if too close and dropping immune subjugator if killed
3) Conditions to prevent console spam from Bone Warrior closes #17655
(cherry picked from commit c515cdc636beefa83bb1a022a18f34ca053dcd53)
2017-02-12 14:54:00 +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
treeston 78748bff93 Entities/Player: Fixed an edge case bug that could cause a character to get stuck in forced recustomization indefinitely if two or more appearance properties were out of bounds.
(cherry picked from commit d08efca201888e988f95e5761f31e9a890948091)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
2017-02-12 14:47:27 +01:00
ShinDarth 7f38c2759a Core/Worldstates: move WS_ARENA_DISTRIBUTION_TIME declaration
(cherry picked from commit 54a7b8358e1a75ecf990e39d9e2697348d744ff1)
2017-02-12 14:23:09 +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
Aokromes 011a7c56d3 Core/Arena: Teams don't lose rating after arena draw (#17515)
By Raydor, closes #16865
(cherry picked from commit 43c3f3a235925475075bb4e1776aac04026b6e8c)
2017-02-12 13:29:10 +01:00
Shauren 26bb056542 Core/GameObjects: Enable using GAMEOBJECT_TYPE_GATHERING_NODE
Closes #18378
2017-02-12 11:49:28 +01:00
joschiwald ecda7cef7f Fixed Build 2017-02-11 23:23:13 +01:00
Aokromes d2dd5f9f02 Core/Logs: Fine tune more logs
And move others to more logical appenders
(cherry picked from commit 1ad24352acebbc4d7c8829cd111a2f3ba010891a)

# Conflicts:
#	src/server/authserver/Server/AuthSession.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Handlers/AuctionHouseHandler.cpp
#	src/server/game/Handlers/CharacterHandler.cpp
#	src/server/game/Handlers/GuildHandler.cpp
#	src/server/game/Handlers/LootHandler.cpp
#	src/server/game/Handlers/PetitionsHandler.cpp
#	src/server/game/Handlers/QuestHandler.cpp
#	src/server/game/Handlers/SpellHandler.cpp
#	src/server/game/Spells/SpellEffects.cpp
2017-02-11 23:15:24 +01:00
Dr-J 9fffe777ec DB/Misc: Fixes
1) Make http://www.wowhead.com/quest=13125/the-air-stands-still and http://www.wowhead.com/quest=13235/the-flesh-giant-champion so player only has to tag the elite to receive credit so that if those op elites which assist player does more damage than player they still receive credit.
2) An update to previous script for Murloc Pets
(cherry picked from commit 375593761167ba1bf8ef16bbe345cb569ad1e00b)
2017-02-11 23:01:56 +01:00
Treeston 62e7d7042c Core/Creature: Fix health regeneration. Creatures immediately reset to full health upon reaching home, rather than slowly regaining it over multiple seconds, which allows players to re-engage them at less than max health. (#17756)
(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)
2017-02-11 22:58:58 +01:00
Nyeriah e57efc201a DB/Misc: Fix a couple of start up errors and allow the mounted version of Attumen the Huntsmen to skip player damage check
(cherry picked from commit 358af1ccc2eda1732cdaf1584682a7be18c900d8)
2017-02-11 22:45:21 +01:00
ariel- 03afe0dd35 Update ObjectMgr.cpp
(cherry picked from commit ac3bfd111d60bc4a11ef41855113c8a10fba8ff1)

# Conflicts:
#	src/server/game/Globals/ObjectMgr.cpp
2017-02-11 22:44:00 +01:00
Aokromes a77263da10 Core/Log: Move log to more logical loglevel
(cherry picked from commit e4ad88245ae00d5ac62f378ee2c6efdb0bda25b3)

# Conflicts:
#	src/server/game/Achievements/AchievementMgr.cpp
2017-02-11 22:43:15 +01:00
Aokromes 0ff577853e Core/Logs: Fine tune more logs
And move others to more logical appenders
(cherry picked from commit b65d26b5b450ec60dfe2ac1b923289eafb6946c6)

# Conflicts:
#	src/server/game/Handlers/PetHandler.cpp
2017-02-11 22:42:34 +01:00
Aokromes 0096945c07 Core/Logs: Fine tune another log
(cherry picked from commit e1cbd2c34affc49941db16879a083af7c6c1c352)

# Conflicts:
#	src/server/game/Movement/Spline/MoveSpline.cpp
2017-02-11 22:38:01 +01:00
treeston d2b5af3a52 Core/Conditions: Add new CONDITION_PET_TYPE (45). Matches target player's pet against specified (value1) bitmask.
(cherry picked from commit e9d4bbc74effad4b16de1a5514cea531f4e5e444)
2017-02-11 22:37:07 +01:00
treeston 12b58eae40 Core/Conditions: Add new CONDITION_CHARMED (44). Does what it says on the tin.
(cherry picked from commit 97855469678bce6101a927c3d0666267c7e4acc2)

# Conflicts:
#	src/server/game/Conditions/ConditionMgr.cpp
2017-02-11 22:36:54 +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
Aokromes db668cde46 Core/Logs: Fine tunning some logs
(cherry picked from commit b51409a5d3201e86bd189d1ea7dfd1dc1ca8a35f)

# Conflicts:
#	src/server/game/Texts/CreatureTextMgr.cpp
2017-02-11 22:35:00 +01:00
Dr-J a49cdc8488 DB/Creature: Father Kamaros
1) Add the missing second http://www.wowhead.com/npc=32800/father-kamaros (only http://www.wowhead.com/npc=31279/father-kamaros is spawned
2) Quests http://www.wowhead.com/quest=13221/im-not-dead-yet and http://www.wowhead.com/quest=13229/im-not-dead-yet should become available once  http://www.wowhead.com/quest=13120/deaths-gaze and http://www.wowhead.com/quest=13119/destroying-the-altars become available not once http://www.wowhead.com/quest=13144/killing-two-scourge-with-one-skeleton is rewarded.
3) Quests http://www.wowhead.com/quest=13482/lets-get-out-of-here and http://www.wowhead.com/quest=13481/lets-get-out-of-here should become available once http://www.wowhead.com/quest=13144/killing-two-scourge-with-one-skeleton is rewarded.
4) Both quests I'm Not Dead Yet and Let's Get Out of Here should be exclusive grouped which player gets depends on what phase they are in when they encounter Father Kamaros
5) Script and texts and wp are identical for this quest as confirmed from sniff so duplicating script from 31279
(cherry picked from commit 60c142fd3b466b31ab65babddc8ee2925f78bfbb)
2017-02-11 22:34:59 +01:00
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 152b3ad5b997f4be06c5bb55ddb15c57a8e28c3b)

# 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 91b2351876bbe13a898dcf5698c7a37cc38e56f5)
2017-02-11 22:34:59 +01:00
Killyana 0b3af66403 DB: Blood elf start location / Sunstrider isle fixes
By msoky

(cherry picked from commit dde5389673203358b01818b870b16bb83695fe0b)
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 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
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 2c0b0b6afa7c088e0d16e9b9a76130c0bf5de132)

Fix deleting some gameobjects
(cherry picked from commit 74bf937865dca0908c688bd1e54ddcacb564e46f)
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 https://github.com/TrinityCore/TrinityCore/commit/cdf8f3c2e1f0363b6d0b7ce82221c813d633a62c areatrigger_involvedrelation does not like sai triggers
(cherry picked from commit 9977bf74790b25caeb4141122fa5c4cb19393017)
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 884736b3b279737c44b0954ca3fe0f193085fbb3)
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 4b15369378c24784de46fbf4f9591efd1015be36)

# 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 153b797182b0682cf81d333b879ad99280060025)
2017-02-11 21:37:42 +01:00
Aokromes 81c5da722d DB/Misc: Fix on startup error
(cherry picked from commit ca99b688edb7a6f8676ed9bf87f91fe913713666)
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 e7cfb08cb5dce8c99d2e4f70d287a76deba70a98)
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 33fbc453d236d943c24fb10522ac0720c3174c3d)

# 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 bcfa47c0514b51690a5dd222b3b1ac5f20379232)
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 cf8276845d9a26542fb18ca2e56b4957b61e4c73)

# 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 80a463bccb4275f77ce5dd6cd4ae33ee2ba90862)
2017-02-11 21:09:01 +01:00
Aokromes 5264374fd6 Core/Player: New PartyLevelReq setting (#17707)
(cherry picked from commit bfda0ba91d2b686177f471052637f837f8a6c1c4)

Typo fix
(cherry picked from commit 35f06ccb5568becadc6f4becdb6760cf0485d9aa)
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 0d91ccf6bd066d64283e4b31fc005584682c4107)
2017-02-11 20:59:21 +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