Follow-up to commit 33194a0ae6d5543119a15e18155f906ebf57eeea
- Remove some gameobjects still remaining in gameobject & gameobject_addon
(cherry picked from commit 6feee74c5aa5e5724e80bbbf546c4779ec1e648a)
- corrected the comment "1205-2002 - free" to "1205-1999 - free"
- increased the main indent by 2 spaces to get more lines aligned
- corrected the enum LANG_DO_NOT_USE_6X_DEBUG_AREATRIGGER_LEFT from 1999 to 1199
Ref. commit 5f541491074765a346c7d0a83edb5f1fbf9240b1
(cherry picked from commit ba5f6a861652f522dd10fbe31f5e25272a3cd237)
File missed in main 2018 copyright update, commit f6b6f57a6da909426e3171d09f989c554f20b43d
- revert link from collab.kpsn.org back to www.trinitycore.info for branch consistency
- also some minor whitespace edits
(cherry picked from commit e2666fff35b3fe468739eb40b811b2fc1b8c1cea)
These are quests where I have found text content issues during
my attempts to get the achievement Loremaster of Kalimdor (horde).
The quest texts contain variables like $c (class) or $r (race)
in wrong places or has missing and/or incorrect text content.
Closes#20448
(cherry picked from commit b135663dd9a7e866d647199cd64b4e50960e8978)
- remove hardcoded text from script npc_beaten_corpse
- remove OnGossipHello() hook, gossip text moved to DB
- use sGossipSelect() hook instead of OnGossipSelect()
- add npc_text 3557 and 3558 as text_id to gossip_menu
- add gossip_menu_option 2871 to NPC 10668 Beaten Corpse
- add condition for gossip_menu_option 2871 in Quest ID 4921
Tested on 4 different characters/classes, male & female.
Thanks to joschiwald for the sGossipSelect() script change.
(cherry picked from commit d82534a7bbd401f4b672786749f10f5a95f6e76c)
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)
- move npcs_rutgar_and_frankal to DB/SAI
- move hardcoded text from go_wind_stone to DB
- additional enum cleanup in zone_silithus.cpp
- also solves a $r issue in SAY_TEMPLAR_AGGRO
(cherry picked from commit b7abaed1996608f9a318a22ff657c5261a7acdfb)
# Conflicts:
# src/server/scripts/Kalimdor/zone_silithus.cpp
File: zone_borean_tundra.cpp
Script: npc_hidden_cultist
Quest: The Hunt is On, 11794
NPC: Tom Hegger, 25827
Before this change, Tom Hegger does not target player when saying his
aggro text "You don't know who you're messing with, $c! Death beckons!"
and hence the text $c will be shown instead of the player class.
(cherry picked from commit 736843fbb5442b1338ec888c8a702d666c95a76b)
English grammar and syntax corrections in DBUpdater.cpp
- string texts corrected, source code unchanged
- comments improved and checked for typos
(cherry picked from commit 8fe85017125803a4ca8fd1d972b128930cd364b9)
Improve English text in strings and comments in UpdateFetcher.cpp
- replace incorrect text with the intended words in some output strings
- corrections in the comments to point out the intention of the code
This line is missing from authserver.conf.dist :
`# MySQL server and their own thread on the MySQL server.`
I have copied this description text line from the matching description in
`worldserver.conf.dist` (line 108 in the 3.3.5 worldserver source file).
This line is also missing in bnetserver.conf.dist , but the files are different
in line number, filename and folder, so bnetserver needs a separate commit.
(cherry picked from commit 329006d31095ec4d151d37d11db5b994f381fab8)
# Conflicts:
# src/server/authserver/authserver.conf.dist
tkrokli