Commit Graph
707 Commits
Author SHA1 Message Date
treeston f46a0e7eb3 Instance/SunkenTemple: Some cleanup. 2016-03-04 17:52:07 +01:00
durotar 768a5cf354 Scripts/SunkenTemple: Quest 3447 Secret of the Circle Thanks to Tkrokli, Kilyana and Nayd Closes #808
Signed-off-by: MitchesD

Closes https://github.com/TrinityCore/TrinityCore/pull/16367
2016-03-04 00:05:52 +01:00
Nyeriah ecd9dec384 Scripts/Karazhan: Use the correct method to access Opera's side entrance door 2016-03-01 12:38:09 -03:00
tkrokli c897988a7e Core/Scripts/Zul'Aman: sound handled in creature_text
- Sound playback is handled via creature_text
- remove `DoPlaySoundToSet()` to avoid duplicate playback
- remove redundant 'me' parameter from `Talk()` entries
2016-02-29 19:31:47 +01:00
Aokromes b646bcbb91 Update boss_nalorakk.cpp 2016-02-29 03:45:14 +01:00
tkrokli 9806f7812a Core/Scripts: Zul'Aman boss script text cleanup
Replacing more hardcoded text with DB entries.
A little bit extra enum alignment and sorting.
2016-02-29 03:16:23 +01:00
Nyeriah f9eff81388 Scripts/Karazhan: Clean up instance script
Closes: #16533
2016-02-28 11:49:48 -03:00
Aokromes 5accd69863 Merge pull request #16692 from tkrokli/headless_horseman_emote
Core/Scripts/boss_headless_horseman: remove hardcoded text
2016-02-28 13:32:54 +01:00
tkrokli 6ffac018dd Core/Scripts: triple zone cleanup
Remove hardcoded (as well as deprecated) text in the following places:
- blackrock_depths.cpp
- zone_burning_steppes.cpp
- zone_stormwind_city.cpp

Updates https://github.com/velinath/TrinityCore/issues/2
2016-02-28 12:25:23 +01:00
tkrokli 1602be1253 Core/Scripts/boss_headless_horseman: remove hardcoded text
Remove the old
`#define EMOTE_LAUGHS    "Headless Horseman laughs"`

No emote is ever used on retail. It would have created log spam.
2016-02-28 03:23:36 +01:00
tkrokli 7c9a26c608 Core/Scripts: move npc_tirion_fordring to DB/SAI
This removes the current core script npc_tirion_fordring
and replaces it with database entries in:

- `conditions` 9 (quest taken) + 41 (unit_state)
- `gossip_menu_option` (3502,3681,3682,3683)
- `smart_scripts` (SmartAI)

Gossip text / `npc_text` is already in the database.

Closes  #16430 (my old attempt at removing hardcoded text)
2016-02-25 20:06:16 +01:00
Naios 9e43365b3d Core/Scripts: Split the huge scriptloader into smaller pieces
* Each subdirectory contains it's own translation unit now
  which is responsible for loading it's directory
* Improves merging & decoupling between 3.3.5 <-> 6.x
* Removes unused Battleground loader
* Ref #15671

(cherry picked from commit 5534915f743c707c07cb977bca67c2ff15487597)
2016-02-22 16:25:54 +01:00
Kittnz 2d753cd783 Merge pull request #16132 from henhouse/smitefix
Scripts/Deadmines: Fix #6624 Mr. Smite's event text, and phase switch…
2016-02-18 20:07:22 +01:00
Henry 5ee2be21bf Scripts/Deadmines: Fix #6624 Mr. Smite's event text, and phase switching.
* Fixes Mr. Smite announcing to instance once doors have been destroyed.
* Add missing dialogue to encounter phases.
* Now properly runs in front of his chest, kneels down and equips items, stands, and reengages like he's supposed to.
* Fix weapon model for first phase when he switched to double axes.
2016-02-16 17:07:09 -05:00
treeston cfed2d7a3d Merge remote-tracking branch 'Eliminationzx/FixJumpDestOrientation' into 3.3.5 (PR #16450) with some minor CS adjustments 2016-02-10 17:41:19 +01:00
Elimination ff80f249a7 Fix jump dest orientation 2016-02-10 20:25:29 +07:00
Nyeriah e9db04a92c Scripts: Fix no-PCH build MKII
Bah
(cherry picked from commit 781152a30c526ff94638a2b10845d1686edb5e62)
2016-02-10 04:07:33 -02:00
Nyeriah 130f744c29 Scripts: Fix no-PCH 2016-02-10 03:19:02 -02:00
Nyeriah 6a56ede179 Scripts/Magister's Terrace: Script Kalecgos' appearance after using the Scryer's Orb
- Added missing waypoints, spells, emotes, proper timing... and prevent him from being summoned multiple times
Closes #13208, #16522
2016-02-10 03:03:59 -02:00
treeston e5e97bedc0 Merge remote-tracking branch 'sirikfoll/npcMyranda' into 3.3.5 (PR #16438) 2016-02-09 23:44:01 +01:00
sirikfoll 9f78dc37f7 Core/Scripts/DB Move script npc_myranda_the_hag to SAI
Moves the entire NPC script to the database and corrects a logic error where players who have rewarded the quest Scarlet Subterfuge and lost the disguise before taking the quest In Dreams were no longer able to get the disguise.
2016-02-09 20:16:41 -02:00
Rushor 86a821561a Scripts/Karazhan: Implement Optional Boss Spawn
* closes #15756
2016-02-06 22:03:44 +01:00
tkrokli 627ec0e35e Core/Scripts/Uldaman: change hardcoded text to enum
Change #define to enum {with brackets}

Possibly the smallest change so far in this series of core script changes.
2016-02-01 22:07:47 +01:00
treeston d795bd8040 Merge remote-tracking branch 'tkrokli/npc_parqual_fintallas' into 3.3.5-base (PR #16384) 2016-01-30 00:31:38 +01:00
jackpoz d75469e31f Scripts/Deadmines: Fix issues reported by static analysis
Fix Coverity issue id 1022474
2016-01-30 00:13:22 +01:00
tkrokli 7a101bcf00 [3.3.5] Core/Scripts/DB: move core script 'npc_parqual_fintallas' to SAI
Additional change: menu options are changed from containing only names
to include the text " is my answer.", based on the lines in `broadcast_text`.

- replaced core text with DB SAI script
- created DB creature_text entries for Parqual Fintallas
- created DB gossip_menu_option entries for the NPC
- implemented NPC say lines in reply to all the answers
- added conditions for which gossip should show, depending on quest status
- added conditions to avoid exploits in the time it takes for NPC to say his texts

This PR is tested several times on a horde character (horde-only quest).
It now works as originally intended, with option-specific NPC replies.
2016-01-29 23:26:08 +01:00
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