Commit Graph

14814 Commits

Author SHA1 Message Date
tkrokli
34d310aff8 Core/Scripts: remove hardcoded text from npc_sayge
- remove hardcoded (and wrong) text from the script
- copy valid text from broadcast_text to gossip_menu_option
- gossip_menu / npc_text is already correct in TDB 335.61
- sort + clean up core script enum list and add new entries
- keep gossip handling unchanged in the script (low prio)

(cherry picked from commit 582af02509)

Core/Scripts/DB: move npc_gregan_brewspewer to DB

- Remove npc_gregan_brewspewer, thereby removing hardcoded text
`#define GOSSIP_HELLO "Buy somethin', will ya?"`
- Move all gossip handling to DB (gossip texts already exist in TDB)
(cherry picked from commit 3acf6f36d1)

Core/Scripts: npc_grandmother gossip text moved to DB

Removing one more hardcoded text line from core scripts.
Also adding correct gossip to the npc_grandmother script.

Gossip changes in this script:
- remove hardcoded text from core script
- use existing npc_text IDs in gossip enum
- add missing text rows to gossip_menu_option
- use values from gossip_menu_option in enum
- replace spawn coordinates 0.0f with GetPosition()
(cherry picked from commit c214f987d7)

Core/Scripts: remove hardcoded text from npc_locksmith

- remove hardcoded text from script
- move the gossip handling to DB SQL
- move the script conditions to DB SQL
- use correct gossip from broadcast_text
- remove options not existing in broadcast_text
- add Key to Searing Gorge option (related spell)
- add The Eye of Haramad option (related spell)
(cherry picked from commit e6ee6e2ae8)
2017-01-12 23:37:37 +01:00
Snapper
36a896e28a Core/SmartAI: delay SMART_ACTION_FLEE_FOR_ASSIST if creature is rooted/stunned.
Prevents creatures from teleporting around when fleeing while stunned/rooted.

(cherry picked from commit aaf10dccb0)
2017-01-12 23:17:37 +01:00
tkrokli
4e00321970 Core/Scripts: boss_majordomo hardcoded text
2 more text lines removed in the ongoing series:
"Remove hardcoded text from core scripts".

Core script for boss Majordomo Executus:
- add missing gossip_menu_option entries
- link the options via the table gossip_menu
- remove hardcoded text from the script
- minor enum line order sorting cleanup
- replace OnGossipSelect() with sGossipSelect()

The scripted events are unchanged.
If the script is inaccurate, make a new PR.
(cherry picked from commit b6d43623a2)
2017-01-12 23:16:41 +01:00
joschiwald
2b5d7eef3a Core/SpellScripts: Added helper method to validate spells 2017-01-12 23:03:08 +01:00
Shauren
f8fe750b5e build fix 2017-01-12 20:00:02 +01:00
Shauren
73e61fa652 Core/DBLayer: Refine new query callback for chaining 2017-01-12 19:40:33 +01:00
tkrokli
52d0ec3ccb Core/Scripts: move npc_mountaineer_pebblebitty to DB
- move gossip text to DB and add quest condition
- remove core script npc_mountaineer_pebblebitty,
- thereby removing the file zone_loch_modan.cpp
- because the original core script dialog is incorrect

This version of the dialog can be verified from the following web pages:
- http://wow.gamepedia.com/Key_to_Searing_Gorge_quest_chain
- http://www.wowhead.com/npc=3836/mountaineer-pebblebitty#comments:id=332234

(cherry picked from commit 25881de7d3)
2017-01-12 03:40:16 +01:00
joschiwald
71ffdccb5a Core/Movement: enable item use and spell cast when dismounting
Remove error message and allow spell cast or item use from
mounted state on ground, especially when sitting on
a landed flying mount. Current behavior is that the player
will get the error message "You can't do that while moving"
when trying to cast a spell or pick up an item
while sitting on a flying mount after having landed.

By joschiwald, closes #6236

(cherry picked from commit 19aac66bc2)
2017-01-12 03:36:32 +01:00
treeston
e2710bc232 Scripts/Instances: Fix a bug that would cause the Hodir encounter to never properly begin. Tagging issue #17302.
(cherry picked from commit e5382ee215)
2017-01-12 03:19:38 +01:00
treeston
95902126a3 Scripts/Outland: Fix a potential crash. Closes #17308.
(cherry picked from commit 96c05dbec0)
2017-01-12 03:18:07 +01:00
jackpoz
98d16d82be Core/Player: Fix duel edge case crash
Fix a crash that could be triggered if an aura removed after duel finished would have caused damage to one of the players.

(cherry picked from commit 7ff0f3c65f)
2017-01-12 03:13:55 +01:00
Aokromes
85b72b7b2b someone lives on the past :P 2017-01-12 03:08:48 +01:00
Aokromes
a28768a9ad Missing part of c76226c 2017-01-12 03:07:19 +01:00
Aokromes
c76226cc41 Script/Quest: Script Quest 24125 Rite of the Winds
By Malcrom, closes #18262
2017-01-12 03:06:14 +01:00
Aokromes
2c1394df84 warning fix 2017-01-12 02:53:09 +01:00
Aokromes
5317a81395 Core/Scripts: Sharpbeak update
By Malcrom
2017-01-12 02:50:07 +01:00
treeston
5e99388981 Scripts/Instances: More #16346 follow-ups. Fixed this time: Halls of Reflection, Ignis the Furnace Master, Mimiron and Rend Blackhand.
(cherry picked from commit 27a3eaab33)

Scripts/MoltenCore: Fix Ragnaros (#16346 follow-up).
(cherry picked from commit 83e5df5638)

Scripts/BlackrockMountain: Nefarian. (#16346 f-u)
(cherry picked from commit 650d7ab596)
2017-01-12 00:28:10 +01:00
jackpoz
954b3c9617 Core/VMaps: Fix some vmap height edge cases
Fix Map::GetWaterOrGroundLevel() checking dynamic object only in phase 1 instead of current Unit phase.
Improve DynamicMapTree::getHeight() dynamic object check by casting the ray at +0.5f from the passed Z coordinate, this value will be tuned to improve even more the results.

(cherry picked from commit 1347d7cf7a)
2017-01-12 00:13:55 +01:00
treeston
1a7b4fbe4d AI/SmartScripts: Add action_param3 "disablePathfinding" to SMART_ACTION_MOVE_TO_POS (69).
(cherry picked from commit 123e45c119)
2017-01-12 00:07:29 +01:00
treeston
1eb9f8edab Scripts/TotC: More follow-up to #16346. Also code style cleanup. Who names all their creature pointers "temp"?
(cherry picked from commit 4407877f36)

Compiler warning fix.
(cherry picked from commit 7fbd70d4c4)
2017-01-12 00:07:19 +01:00
treeston
8b4435c96c Scripts/Instances: Follow-up to #16346. Fix Illidan and Northrend Beasts.
(cherry picked from commit 4e922a5146)

# Conflicts:
#	src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
2017-01-12 00:02:30 +01:00
treeston
20ef64c8d8 AI/PlayerAI: Fix potential edge case crash.
(cherry picked from commit 2d2544fab0)
2017-01-12 00:02:30 +01:00
Trisjdc
781c5a3b82 Core/Creatures: Remove resetting of UNIT_FLAG_IMMUNE_TO_PC on combat clearing
(cherry picked from commit 34ef05ce0b)
2017-01-12 00:02:30 +01:00
Keader
6ca75ef039 Core/Scripts Improve Felflame Infernal of Lord Jaraxxus fight (#16998)
(cherry picked from commit 43855b47d8)

Rename 9999_99_99_world.sql to 2016_06_02_01_world.sql
(cherry picked from commit 7f0e1caf72)
2017-01-12 00:02:29 +01:00
Keader
7f2b5f3859 Core/Scripts Improve Jormungars fight
(cherry picked from commit 0912df258d)

Rename spell_snakes_spray for spell_jormungars_snakes_spray and cleanup
(cherry picked from commit 2c9c8afc0f)

Fixing the issue
(cherry picked from commit 81083a8593)

Changing remove aura method
(cherry picked from commit b88d49be24)

changing creature_text (tk feedback)
(cherry picked from commit 9b444877dd)

Override and tkrokli again :D
(cherry picked from commit 7205b4dd65)

Fix SQL name
(cherry picked from commit cae19692ab)
2017-01-12 00:02:29 +01:00
Snapper
fbb9fc0228 Core/SmartAI: remove unneeded check for SMART_ACTION_FORCE_DESPAWN.
Gameobjects do not need to use SmartAI in order to be targeted by other entities' scripts.

(cherry picked from commit 9803e58392)
2017-01-12 00:02:29 +01:00
Shauren
fcabeed754 Core/DBLayer: Added new async query callback api 2017-01-11 23:45:03 +01:00
treeston
2b3cf3d480 AI/PlayerAI: Code style cleanup.
(cherry picked from commit e3aa19281f)

Build fix for horrendous, outdated, non-standards-compliant compilers. Such as the one in VS 2013. I hate VS 2013.

Closes #17260.
(cherry picked from commit 321d35417d)
2017-01-11 23:24:42 +01:00
treeston & Keader
0897042998 AI/PlayerAI: Finally implement cast logic for controlled players.
(cherry picked from commit 25c5570f47)
2017-01-11 22:41:30 +01:00
DDuarte
237e291c3f Core/World: Remove unused config CONFIG_SIGHT_GUARDER
(cherry picked from commit ca231cba0b)
2017-01-11 21:44:33 +01:00
Aokromes
940c522222 Update zone_hinterlands.cpp 2017-01-11 02:14:23 +01:00
Aokromes
b3f2dd6807 Script/Taxi Sharpbeak Hinterlands
By Malcrom
2017-01-11 02:10:33 +01:00
Shauren
d2c77d823d Core/Groups: Send PartyUpdate to all players leaving group, not only on disband
Closes #18757
2017-01-10 20:19:27 +01:00
joschiwald
e9af56c4a4 Fixed warning 2017-01-10 03:13:13 +01:00
DDuarte
0c511397a4 Revert "Merge pull request #16433 from Tonghost/3.3.5"
This reverts commit e3d52990dd, reversing
changes made to 6d8e39f59c.

Opens #16759

(cherry picked from commit 5aae01986f)
2017-01-09 21:50:49 +01:00
SnapperRy
6444bb9a14 Core/Quests: Remove wrong call to SendQuestComplete(). (#17200)
(cherry picked from commit 9480a210f2)
2017-01-09 21:40:06 +01:00
sirikfoll
04ff2e195f Core/Achievement A-bomb-inable and A-bomb-ination
(cherry picked from commit e016bf8d06)

DB: SQL rename
(cherry picked from commit 71081c2576)
2017-01-09 21:36:03 +01:00
sirikfoll
31e08b9722 Core/Unit Do not allow addition of threat to units in evade mode
(cherry picked from commit 7d769006aa)
2017-01-09 21:33:32 +01:00
Shauren
dad19df69d Core/Units: Renamed and documented UNIT_FLAG_DISABLE_MOVE to prevent people from trying to use this flag to root a creature leaving them wondering why it doesn't do anything
(cherry picked from commit b36da77185)

Core/Scripts: build fix

(cherry picked from commit 258368a2bd)
2017-01-09 21:16:36 +01:00
Shocker
0cddecf2d4 Merge pull request #17138 from ForesterDev/creature_family
Core/Misc: Define CREATURE_FAMILY_NONE to avoid magic numbers in code
(cherry picked from commit 62635f07d0)
2017-01-09 20:52:48 +01:00
Shauren
b999d8c5ac Core/Loot: Fixed resaving looted items from containers
Closes #15299

(cherry picked from commit 4a074ca470)
2017-01-09 02:10:28 +01:00
Shauren
6393e80129 Core/Spells: Implemented SPELL_ATTR1_DISMISS_PET
Closes #7372

(cherry picked from commit 9246189b98)
2017-01-09 02:10:08 +01:00
Golrag
e9e3daa30c Core/Object: Use object edges to calculate LoS
(cherry picked from commit da6065db00)
2017-01-09 02:07:42 +01:00
ForesterDev
5c2705fadc Core: updated creature type flags enum (#17128)
Core/Misc: Update CreatureTypeFlags enum according to TrinityCoreWiki
(cherry picked from commit fb0881398a)

# Conflicts:
#	src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
#	src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
#	src/server/game/AI/SmartScripts/SmartAI.cpp
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Miscellaneous/SharedDefines.h
2017-01-09 02:00:17 +01:00
treeston
dfaf4542e6 Conditions/ConditionMgr: Add a comment so MitchesD can go away.
(cherry picked from commit 759aae56ad)
2017-01-09 02:00:10 +01:00
Shauren
8045907c14 Core/Chat: Don't check item suffix name when validating item links when the item has ITEM_FLAG3_HIDE_NAME_SUFFIX 2017-01-08 23:28:00 +01:00
Shauren
4799e5841d Core/Auras: Fixed cooldowns for procs calling PreventDefaultAction() in aura proc script
* This also fixes proc cooldows unneccessarily being sent to client
* Also removes the need for cooldown hacks when the proc trigger is selected randomly like for Deathbringer's Will

(cherry picked from commit 1e1fcd6847)
2017-01-08 23:24:51 +01:00
mik1893
5a93f2b974 Core/Spells: Proc handler script converions (#17122)
* Blazing Speed (Mage)
* Blessed Recovery (Priest)
* Druid Forms Trinket
* Idol Of Mutilation
* Nature's Guardian (Shaman)
* Nether Protection (Warlock)
* Piercing Shots and Bonus 4P T9 Hunter
* Lightning Shield (Shaman)
* Acclimation (DK)
* Move DK T10 4P Melee Bonus
* Move DK Improved Blood Presence triggered heal (DK)
* Rogue T10 2P Bonus
* Illumination (Paladin)
* Soul Preserver
* Death Choice trinket
* stack trinket scripts (ToC25 Caster Trinket, Lightning Capacitor, Thunder Capacitor)
* Battle Experience (ICC - Gunship)
* Blood Reserve (enchant proc)
* Darkmoon Card Greatness
* Charm of the Amani Witch Doctor
* Mana Drain

(cherry picked from commit 5b8e68ee63)
2017-01-08 22:37:18 +01:00
Alan Deutscher
1c60553df0 Core/Spells Make certain spells (e.g. Mind Control) properly flag the caster for PvP (#17145)
* This issue was caused by PvP-flagging being done calculated after the target's flag was turned off by becoming a pet.

(cherry picked from commit e7a12edb83)
2017-01-08 19:41:37 +01:00
vincent-michael
a2ee7e16ec Core/Quests: Fixed issue reported by static analysis
Coverity defect ID: 1355241

(cherry picked from commit a01fd52267)
2017-01-08 19:35:02 +01:00