Commit Graph
681 Commits
Author SHA1 Message Date
treeston 81baffec80 Merge remote-tracking branch 'tkrokli/npcs_dithers_and_arbington' into 3.3.5-base (PR #16276) 2016-01-28 12:39:51 +01:00
tkrokli 29c2a42324 Core/Scripts/DB: remove hardcoded text from 'npcs_dithers_and_arbington'
- created DB gossip_menu_option entries for both NPCs
- added enum section instead of "magic numbers" in script
- replaced core text with pointers to DB text
- zone_western_plaguelands.cpp is now cleaned up
2016-01-21 15:02:38 +01:00
Nick a35a6279fe Core/Scripts: Change door ID in Blackwing Lair
as per 7d454c66f7

Change the name as well.
2016-01-19 22:18:32 +01:00
DDuarte ac727ab208 Scripts: Add override to CheckInRoom() definitions
Fixes -Winconsistent-missing-override
2016-01-19 13:06:04 +00:00
treeston 2da458c56d Scripts/Instances: Complete rewrite of the boundary system.
- Migrate boundary logic to Maps/AreaBoundary instead of having it sit in InstanceScript (to possibly allow use for other purposes).
- Implement the first five boundary types in Maps/AreaBoundary.cpp.
- Add boundary checks to Creature's update logic
- Add boundary data for all Northrend raids
- Add boundary initialization structures and methods to InstanceScript
- Modify EnterEvadeMode signature. It now passes a value from the EvadeReason enum as parameter to allow special casing depending on evade reason
- Remove previous (weird) boundary code that had them linked to GO spawns
2016-01-12 22:24:23 +01:00
treeston 3ea6324507 Merge remote-tracking branch 'tkrokli/npc_myranda_the_hag' into 3.3.5-base 2016-01-12 19:18:13 +01:00
treeston 9091451818 Merge remote-tracking branch 'tkrokli/gossip_accept_duel' into 3.3.5-base 2016-01-12 19:17:39 +01:00
tkrokli 76d5dbad4b [3.3.5] Core/Script: move Myranda the Hag's gossip option to DB
Removing hardcoded text from the core script and into the DB:
"I am ready for the illusion, Myranda."

This quest is 3.3.5 *only*. Removed in patch 4.0.3a.

Addendum: enum ILLUSION_GOSSIP = 4773 , instead of "magic number".
2016-01-12 17:37:18 +01:00
tkrokli 22dd523c1f Core/Scripts: move GOSSIP_ACCEPT_DUEL to DB
Another attempt to shorten the list of hardcoded gossip menu options.

This is the gossip menu option of the NPC ID 28406, Death Knight Initiate
in Death's Breach in the Scarlet Enclave, the death knight starting area.
This gossip is tied to the quest "Death's Challenge".

Removing this text in the core script: "I challenge you, death knight!"
(#define GOSSIP_ACCEPT_DUEL) and using `ADD_GOSSIP_ITEM_DB()`
to pull the gossip_menu_option 9765 from the database instead.
2016-01-12 10:18:44 +01:00
tkrokli 95a2eec923 Core/Scripts: move npc_shadowfang_prisoner gossip option to DB
Getting rid of one more incorrect and hardcoded text
which now will be read correct and from the DB instead.

Wrong text: "Thanks, I'll follow you to the door." (core)
Correct text: "Please unlock the courtyard door." (DB)

Thanks to @Aokromes, @r00ty, @velinath, @Nayd, @Treeston, @Zedron
and lots of other regular TrinityCore developers and members for the
inspiration and motivation, as well as helpfulness along the way.
2016-01-12 09:50:04 +01:00
Rushor 923a368ac7 Update copyright note for 2016 2016-01-01 12:02:33 +01:00
jackpoz 3267c90102 Core/Unit: Add Unit::KillSelf() overload
Add Unit::KillSelf() function as overload of Unit::Kill(this) . Use KillSelf() whenever the killer and the victim are the same to clearly state the Unit is going to kill itself.
2015-12-07 20:06:02 +01:00
tkrokli 66073e4403 Core/Scripts: remove redundant script npc_anchorite_truuen
The cpp script npc_anchorite_truuen has become redundant
because it has been replaced by a SAI script in commit 2cecc7b.

This script currently causes an error line in DBErrors.log:
```
Script named 'npc_anchorite_truuen' does not have a script name assigned in database.
```
2015-11-27 04:02:30 +01:00
Incorrect d98037a75d Core/Misc: Remove unneeded files
These 3 BlackRock Mountain scripts can be removed from source:

- boss_anubshiah.cpp
- boss_gorosh_the_dervish.cpp
- boss_grizzle.cpp

They already removed from the creatures in DB, and are currently causing
DBErrors.
2015-11-02 02:11:52 +02:00
joschiwald 36a205ec00 Core: fixed warning introduced in last commit
(cherry picked from commit fe0c07a6fe4dea8772e69ec8ad491bdda7f61746)
2015-10-31 19:13:05 +01:00
joschiwald df88c7f278 Core/Misc: removed some useless map checks
(cherry picked from commit cf1e80e3d09067ca4d0078a8113a09227a9f91ae)
2015-10-31 19:11:41 +01:00
David Carlos Manuelda a410072d6d Removed unneeded nullptr check
(cherry picked from commit 20215a8c421fd93d00233213966399a0c76e626a)
2015-10-31 18:22:55 +01:00
David Carlos Manuelda 8dc10022a6 Fixed boss evade and doors closed by cr4st.
Should close #6377 and #15239

(cherry picked from commit e430f3f61ae45ca0e8e251f96a1605bdb9299eb1)
2015-10-31 18:21:23 +01:00
tkrokli 89107c3a8e Core/Scripts: The Endless Hunger & Death's Challenge, creature text
This PR solves the following say text issues:
In quest ID 12733, Death's Challenge, the creature script npc_death_knight_initiate is supposed to target the player and refer to the player character's name in the following 2 lines from `creature_text`.`entry` 28406:

- "You don't stand a chance, $n." (`BroadcastTextId` 29267)
- "Remember this day, $n, for it is the day that you will be thoroughly owned." (`BroadcastTextId` 29270)

In quest ID 12848, The Endless Hunger, the creature script npc_unworthy_initiate is supposed to target the player and refer to the player character's race in the following 2 lines from `creature_text`.`entry` 29519, 29520, 29565, 29566 and 29567:

- "You are hopelessly outmatched, $r."  (`BroadcastTextId` 30212)
- "Sate your hunger on cold steel, $r!" (`BroadcastTextId` 30214)

The untargeted variables $r and $n appear in the say lines because the existing script assigns the text to the player character instead of the creatures. This does not produce any race or name information in /say or chat.

This Pull Request closes issue #14700 and replaces PR  #15678.
2015-10-10 14:57:49 +02:00
joschiwald ad38c27124 Core/Misc: renamed sGossipSelect parameters 2015-10-04 16:16:56 +02:00
CreshandKesh 359df54b79 Core/Scripts: Salanar the Horseman, Into the Realm of Shadows
- Show gossip_menu_option 9739 only if quest 12687 is accepted & not completed
- Cast spell 52693, SPELL_REALM_OF_SHADOWS, when gossip option is selected

Core script by @CreshandKesh (with some modifications)
SQL part by @CreshandKesh and @tkrokli, condition adjustment by @Killyana.

Closes #15603
Closes #15657
2015-10-04 15:10:29 +02:00
joschiwald 05429b3593 Scripts/BWL: cleanup instancescript 2015-08-29 18:20:59 +02:00
joschiwald df21162fe4 Scripts/VioletHold: rewrote the whole instance
thanks @MitchesD for help
2015-08-23 14:43:11 +02:00
Nyeriah 8b27b61978 Scripts\MoltenCore: Disable Ragnaros' combat movement 2015-08-21 23:20:45 -03:00
jackpoz 2f92a2f58e Scripts/Misc: Replace some unsafe WorldObject* class members in scripts with ObjectGuid
Replace some unsafe WorldObject* class members and derived types in scripts with ObjectGuid.
Code cleanup.
2015-08-16 22:29:56 +02:00
David Carlos Manuelda e3c3b8f08f Core/Misc: Added some missing overrides 2015-08-11 12:44:35 +02:00
Kittnz b42cf8755b Core/Script: Fix Corporal Keeshan 2015-08-01 13:53:32 +02:00
Kittnz 93ca42759d Core/Script: Set Faction at start of escort for Corporal Keeshan
Request by DRJ
2015-08-01 13:38:10 +02:00
Shauren b4adf3f5dd Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176)

Conflicts:
	cmake/compiler/msvc/settings.cmake
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Garrison/Garrison.cpp
	src/server/game/Garrison/GarrisonMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Server/Packets/ChannelPackets.h
	src/server/game/Server/Packets/PartyPackets.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/scripts/Commands/cs_list.cpp
2015-07-24 11:51:48 +01:00
DDuarte 3c4484d782 Scripts/ScarletEnclave: Add weapons to Unworthy Initiate
Closes #14954
Closes #14955

(cherry picked from commit 673648ee6507597837bd2c8a7a78f425d139baea)
2015-07-20 01:16:47 +01:00
MitchesD db8fdd94ed Merge pull request #14782 from doctaweeks/fixes-for-6.x
Minor fixes for 6.x
(cherry picked from commit 0cf02097414ddf7a370bd2efef5b892616e8de93)

Conflicts:
	src/server/bnetserver/Main.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
	src/server/game/Battlegrounds/Zones/BattlegroundTP.h
	src/server/game/Chat/Channels/Channel.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.h
	src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
	src/server/shared/Cryptography/SHA256.h
2015-06-01 00:39:56 +01:00
Kittnz 3e588acfe9 Scripts: trying to fix non-pch 2015-04-25 09:15:27 +02:00
Kittnz cf286ea9cd Scripts/Uldaman: Fix build & fix some movement suggested by josch 2015-04-25 08:44:16 +02:00
Kittnz 9cb4cb52d8 Scripts/Uldaman: Instance update
- Fixup Boss Ironaya
- Add the freeze animation for minions and archaedas
- Fix attack target for minions who wake up
2015-04-24 23:11:02 +02:00
click a09eafa104 Core: Whitespace/tab2spaces cleanup 2015-04-10 04:12:06 +02:00
Carbenium c0b77fc216 Switch abs to std::abs
(cherry picked from commit 8476c2ac5a3cad03bc26b12fcc8b3f4f32854b65)
2015-04-05 00:41:39 +02:00
Carbenium aa1971964b Add missing override keyword in scripts
(cherry picked from commit b948a4275e90c59db2599a1961937d62f17736ce)

Conflicts:
	src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
2015-04-05 00:41:21 +02:00
Nyeriah a76722ccef Scripts/Undercity: Update Lady Sylvanas' script and also implement few missing things to Journey to Undercity's quest end event
Closes https://github.com/TrinityCore/TrinityCore/pull/14094
Thans to @Killyana @Rushor @jaredjones and all others who helped with this
2015-03-17 20:18:09 -03:00
Rushor eee10edb56 Merge pull request #13997 from Rushor/malfurion
Scripts/SunkenTemple: Add Eventsupport for NPC: Malfurion Stormrage
2015-03-15 15:41:27 +01:00
click a8a5fae4f9 Core/Scripts: INFO-DEBUG changes in scripts (gawd) 2015-03-08 06:34:49 +01:00
joschiwald 2478bbcdb8 Merge pull request #14144 from Rushor/ZulAman
Scripts/ZulAman: Enable Script for Gazakroth
2015-02-13 22:37:30 +01:00
Rushor ca60ae6d19 Scripts/ZulAman: Enable Script for Gazakroth
*removes one more startuperror from #13707
2015-02-13 22:22:22 +01:00
Sarah Alexander 15718b639f Merge pull request #14080 from Rushor/Action
Scripts/Redridge Mountains: Corporal Keeshan - Complete Escortquest for all Groupmember
2015-02-11 13:43:51 -02:00
Noeliel 80d9524b1c Scripts/ScarletEnclave: Add missing WorldObject parameter for Talk() overload (player race contained in some spoken texts) 2015-02-11 16:16:20 +01:00
Rushor c86761ccd6 Scripts/Redridge Mountains: Corporal Keeshan - Complete Escortquest for all Groupmember
closes #13711
2015-02-09 12:24:17 +01:00
Nyeriah 1e3247f00e Scripts/SunwellPlateau: Fix a typo that caused M'uru's phase transition to fail on some rare cases 2015-02-08 03:42:53 -02:00
Rushor fa3d059737 Scripts/SunkenTemple: Add Eventsupport for NPC: Malfurion Stormrage 2015-01-31 18:36:41 +01:00
Nyeriah 9bd7b0e571 Scripts/SunwellPlateau: Correct a summon group entry and misc clean up 2015-01-18 23:05:18 -02:00
MitchesD f94cfc6577 Scripts/Misc: some random changes after recent commits and cleanup 2015-01-10 22:58:03 +01:00
Rushor db849e7fcc Scripts/Stratholme: Move Maleki the Pallid to Eventmaps
Closes #13871
2015-01-10 05:19:59 +00:00