Commit Graph
20 Commits
Author SHA1 Message Date
tkrokli 9e4cc26312 [3.3.5] Core/Logs: English text corrections
This is an attempt to proofread standard error messages and system messages
from both core and DB. The corrections span typos, grammar and punctuation.

Because some of these messages can have multiple meanings depending on context,
this PR will stay in "WIP" status until the corrections have been validated and approved.

You are welcome to suggest improvements and files not yet included in this list.

Thanks to @Kinzcool for suggesting this line of work. :)
2016-02-20 10:05:04 +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
tkrokli bc03fedf6d Core/Scripts/DB: remove hardcoded text from 'npc_disciple_of_naralex'
- moved 2 #define text lines to enum, already in npc_text
- new gossip_menu_option for NPC 3678 Disciple of Naralex
- using `ADD_GOSSIP_ITEM_DB` instead of `ADD_GOSSIP_ITEM`

Tested on both alliance and horde characters, works just like before.
2016-02-01 02:31:19 +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
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
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
tkrokli b0da73fc5d Core/Scripts/DB: move Wyrmrest Temple taxi FP to SAI
Closes #15957

Move NPC gossip menu options from core script to DB SAI script
for the 3 local Flight Path NPCs in Wyrmrest Temple:

- 26443, Tariolstrasz (Steward of Wyrmrest Temple)
- 26949, Torastrasza (Majordomo to the Ruling Council)
- 27575, Lord Afrasastrasz (Commander of Wyrmrest Temple Defenses)

Additional positive effect: the NPCs are now using verified Blizzlike text in their gossip.

Extra credits:  @velinath for relevant background information in the issue,
@Helias & @ShinDarth for their excellent Keira2 web-based database editor.
2016-01-02 22:50:18 +01:00
tkrokli 4fbffab5f8 Scripts/Spells: Mine Sweeper achievement
Enable achievement 1428, "Mine Sweeper" in SpellScript

by @Re3os / @ccrs / @sirikfoll . based on original script from @Vincent-Michael

Closes #15938
2015-12-15 04:27:17 +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
tkrokli 95d6f09243 Scripts/Thaddius: Coverity scan Control flow issues (MISSING_BREAK)
Coverity scan defects CID 1339315, 1339316 and 1339317:
- CID 1339315: boss_thaddius.cpp: 542
- CID 1339316: boss_thaddius.cpp: 811
- CID 1339317: boss_thaddius.cpp: 398

Added missing break; statements.
2015-11-14 05:12:25 +01:00
tkrokli 01e0475ab8 contrib/script: error text corrections in check_updates.sh
Fix a factual error in the /contrib/check_updates.sh error message text,
Best shown in an example from the latest travis build error:
```
$ ./contrib/check_updates.sh auth auth
Database Updater check script:
  Checking database 'auth' for missing filenames in tables...

- "sql/updates/2015_10_09_00_auth.sql" is missing in table 'auth'.'updates'

Fatal error:
  The Database Updater is broken for database 'auth
  due to applied update which are missing in the 'auth'.'updates' table.

How to fix:
  Insert the missing names of sql updates which were applied already to
  the 'updates' table of the 'auth' base dump ('sql/base/auth_database.sql').

The command "./contrib/check_updates.sh auth auth" exited with 1.
```
Main fix: `\"sql/updates/${file}\"` -> `\"sql/updates/${name}/${file}\"`

Before this change, the error message claims that the updated SQL file was placed
directly in the `/sql/updates/` directory and not in the subdirectory based on its DB name.

All the other changes are improvements in English grammar and more precise description.
2015-10-10 16:04:58 +02: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
tkrokli 9325f18528 [3.3.5a][ICC/Professor Putricide] Volatile Ooze Eruption fix
by @ManuFe and @Rushor; closes #12336

In the existing source, the rooting aura is removed after the explosion,
therefore the knockback effect does not work because the player is still rooted.
By swapping these 2 lines, the aura is removed, then the explosion happens.

Result: rooting is removed before the knockback effect is cast on the player.
2015-05-27 06:42:14 +02:00
tkrokli 95c07b6270 [Core/DB] Quest: The Exorcism of Colonel Jules
by @danlapps; closes #1524

Thanks to WoW-Studio@0aa81ca for doing most of the work
Thank to @Killyana for SQL walkthrough
Thanks to @Rushor for doing most of the converting work,
Thanks to @Nyeriah for pointers to solutions for all the errors
Thanks to @MitchesD for pointing out missing codestyle and errors
Thanks to @ccrs for supplying the ObjectAccessor lines
Thanks to @DDuarte for making me understand the changes
2015-05-09 01:32:04 +02:00
tkrokli c54cbebf88 Fix: Can cast on fear if rooted [3.3.5a]
by @Xiledria; closes  #13964

Removes the ability to cast while in fear and rooted.
Tested and found working by @Raydor and @Xiledria
2015-05-03 02:08:32 +02:00
tkrokli 8126faccda Fix $n bug in NPC text for quest 11664 Escaping the Mist
Make quest NPC target player character to say the actual name instead of $n

Idea by @DDuarte
Final solution found in similar escort quests.
(Example script: npc_kayra_longmane in zone_zangarmarsh.cpp)
2015-04-12 10:27:38 +02:00
tkrokli 1c8486e1a8 [Quest] Kodo Roundup
by @pete318, closes #12811

Fixes the remaining bugs in the "Kodo Roundup" quest in Desolace:
- removes combat status from creature 11627, Tamed Kodo
- sets normal walking speed as the creature's follow speed
- makes the Tamed Kodo stop at Scrabblescrew's Camp
- enables quest objective count 0/5 -> 5/5, quest complete
- SQL (by @tkrokli) links the missing gossip text in the DB
2015-04-04 15:57:06 +02:00
tkrokli d1221e3433 [Core/Quest] Update quest Objective status Client side
by @untaught; closes #12172

AreaExploredOrEventHappens does not update client side, only server side.
Before adding this fix, it is necessary to complete the required number of kills
to receive the "discovery" Quest Objective Credit in player's Quest Log and on screen.
2015-03-22 06:32:18 +01:00