Skip to content

Commit cac0500

Browse files
author
gpn39f
committed
fix quest 12720 and move script from chapter2 to zone_the_scarlet_enclave
1 parent bdfa45e commit cac0500

File tree

5 files changed

+313
-142
lines changed

5 files changed

+313
-142
lines changed

‎sql/updates/world/2015_08_21_00_world.sql

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
UPDATE locales_quest SET EndText_loc3="" WHERE Id=12716;
3+
4+
UPDATE creature_template SET InhabitType=4 WHERE entry=28906;
5+
6+
update creature_text set BroadcastTextID=28770 where entry=28942 and groupid=0 and id=0;
7+
update creature_text set BroadcastTextID=29078 where entry=28942 and groupid=0 and id=1;
8+
update creature_text set BroadcastTextID=28765 where entry=28942 and groupid=0 and id=2;
9+
update creature_text set BroadcastTextID=28769 where entry=28942 and groupid=0 and id=3;
10+
update creature_text set BroadcastTextID=29085 where entry=28942 and groupid=0 and id=4;
11+
update creature_text set BroadcastTextID=29086 where entry=28942 and groupid=0 and id=5;
12+
update creature_text set BroadcastTextID=29088 where entry=28942 and groupid=0 and id=6;
13+
update creature_text set BroadcastTextID=29074 where entry=28942 and groupid=0 and id=7;
14+
update creature_text set BroadcastTextID=28788 where entry=28942 and groupid=1 and id=0;
15+
update creature_text set BroadcastTextID=28789 where entry=28942 and groupid=1 and id=1;
16+
update creature_text set BroadcastTextID=28791 where entry=28942 and groupid=1 and id=2;
17+
update creature_text set BroadcastTextID=28792 where entry=28942 and groupid=1 and id=3;
18+
update creature_text set BroadcastTextID=28793 where entry=28942 and groupid=1 and id=4;
19+
update creature_text set BroadcastTextID=28790 where entry=28942 and groupid=1 and id=5;
20+
21+
UPDATE quest_template SET Method=2, Flags=8328, SpecialFlags=1 WHERE Id=12718;
22+
23+
UPDATE locales_quest SET EndText_loc3="" WHERE Id=12718;
24+
25+
update creature_template set AIName="", ScriptName="npc_crusade_persuaded_28610" where entry in (28610, 28939, 28940);
26+
27+
28+
29+
30+

‎sql/updates/world/2015_08_21_01_world.sql

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
2+
DELETE FROM creature_text WHERE entry=28610;
3+
INSERT INTO creature_text (entry, groupid, id, text, type, language, probability, emote, duration, sound, BroadcastTextID, comment) VALUES
4+
(28610, 1, 0, "What is the \"Crimson Dawn?\"", 12, 0, 100, 0, 0, 0, 29133, "player SAY_PERSUADE1"),
5+
(28610, 1, 1, "Tell me what you know about \"Crimson Dawn\" or the beatings will continue!", 12, 0, 100, 0, 0, 0, 29134, "player SAY_PERSUADE2"),
6+
(28610, 1, 2, "I'm through being courteous with your kind, human! What is the \"Crimson Dawn?\"", 12, 0, 100, 0, 0, 0, 29135, "player SAY_PERSUADE3"),
7+
(28610, 1, 3, "\"Crimson Dawn!\" What is it! Speak!", 12, 0, 100, 0, 0, 0, 29136, "player SAY_PERSUADE4"),
8+
(28610, 1, 4, "I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn!\"", 12, 0, 100, 0, 0, 0, 29137, "player SAY_PERSUADE5"),
9+
(28610, 1, 5, "I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!", 12, 0, 100, 0, 0, 0, 29138, "player SAY_PERSUADE6"),
10+
(28610, 1, 6, "Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly.", 12, 0, 100, 0, 0, 0, 29139, "player SAY_PERSUADE7"),
11+
(28610, 1, 7, "I grow tired of these games, human. Tell me of the \"Crimson Dawn\" or I will tear your spine out with my bare hands!", 12, 0, 100, 0, 0, 0, 29140, "player SAY_PERSUADE8"),
12+
13+
(28610, 2, 0, "I'll tell you nothing, Scourge filth!", 12, 0, 100, 0, 0, 0, 29141, "crusader SAY_CRUSADER1"),
14+
(28610, 2, 1, "You'll have to kill me, monster! I will tell you NOTHING!", 12, 0, 100, 0, 0, 0, 29142, "crusader SAY_CRUSADER2"),
15+
(28610, 2, 2, "Argh... The pain... The pain is almost as unbearable as the lashings I received in grammar school when I was but a child.", 12, 0, 100, 0, 0, 0, 29143, "crusader SAY_CRUSADER3"),
16+
(28610, 2, 3, "You... You'll get nothing... And like it...", 12, 0, 100, 0, 0, 0, 29144, "crusader SAY_CRUSADER4"),
17+
(28610, 2, 4, "Do you think this to be pain? To be suffering? HAH! Destroy this mortal shell so that I may ascend to the heavens!", 12, 0, 100, 0, 0, 0, 29145, "crusader SAY_CRUSADER5"),
18+
(28610, 2, 5, "You hit like a girl. Honestly. Is that the best you can do?", 12, 0, 100, 0, 0, 0, 29146, "crusader SAY_CRUSADER6"),
19+
(28610, 2, 6, "The crimson what? Never heard of it...", 12, 0, 100, 0, 0, 0, 29147, "crusader SAY_CRUSADER7"),
20+
(28610, 2, 7, "The pain is momentary. It pales in comparison to what the High General would do to me...", 12, 0, 100, 0, 0, 0, 29148, "crusader SAY_CRUSADER8"),
21+
(28610, 2, 8, "You'll be hanging in the gallows shortly, Scourge fiend!", 12, 0, 100, 0, 0, 0, 29160, "crusader SAY_CRUSADER9"),
22+
(28610, 2, 9, "I used to work for Grand Inquisitor Isillien! Your idea of pain is a normal mid-afternoon for me!", 12, 0, 100, 0, 0, 0, 29161, "crusader SAY_CRUSADER10"),
23+
(28610, 2, 10, "ARGH! You burned my last good tabard!", 12, 0, 100, 0, 0, 0, 29162, "crusader SAY_CRUSADER11"),
24+
(28610, 2, 11, "You know nothing of pain, monster!", 12, 0, 100, 0, 0, 0, 29155, "crusader SAY_CRUSADER12"),
25+
(28610, 2, 12, "HAH! I've survived three separate inquisitions! This is nothing in comparison!", 12, 0, 100, 0, 0, 0, 29156, "crusader SAY_CRUSADER13"),
26+
(28610, 2, 13, "Look out! There's a bee loose and it's on a stinging rampage!", 12, 0, 100, 0, 0, 0, 29157, "crusader SAY_CRUSADER14"),
27+
(28610, 2, 14, "That one tickled...", 12, 0, 100, 0, 0, 0, 29158, "crusader SAY_CRUSADER15"),
28+
(28610, 2, 15, "I'm going to send you back to the Lich King in pieces!", 12, 0, 100, 0, 0, 0, 29159, "crusader SAY_CRUSADER16"),
29+
30+
(28610, 3, 0, "I'll tell you everything! STOP! PLEASE!", 12, 0, 100, 0, 0, 0, 29149, "break crusader SAY_PERSUADED1"),
31+
(28610, 4, 0, "We... We have only been told that the \"Crimson Dawn\" is an awakening. You see, the Light speaks to the High General. It is the Light...", 12, 0, 100, 0, 0, 0, 29150, "break crusader SAY_PERSUADED2"),
32+
(28610, 5, 0, "The Light that guides us. The movement was set in motion before you came... We... We do as we are told. It is what must be done.", 12, 0, 100, 0, 0, 0, 29151, "break crusader SAY_PERSUADED3"),
33+
(28610, 6, 0, "I know very little else... The High General chooses who may go and who must stay behind. There's nothing else... You must believe me!", 12, 0, 100, 0, 0, 0, 29152, "break crusader SAY_PERSUADED4"),
34+
(28610, 7, 0, "LIES! The pain you are about to endure will be talked about for years to come!", 12, 0, 100, 0, 0, 0, 29163, "break player SAY_PERSUADED5"),
35+
(28610, 8, 0, "NO! PLEASE! There is one more thing that I forgot to mention... A courier comes soon... From Hearthglen. It...", 12, 0, 100, 0, 0, 0, 29153, "break crusader SAY_PERSUADED6"),
36+
(28610, 9, 0, "%s dies from the torture.", 16, 0, 100, 0, 0, 0, 29154, "dead crusader");
37+
38+
DELETE FROM creature_text WHERE entry=28939;
39+
INSERT INTO creature_text (entry, groupid, id, text, type, language, probability, emote, duration, sound, BroadcastTextID, comment) VALUES
40+
(28939, 1, 0, "What is the \"Crimson Dawn?\"", 12, 0, 100, 0, 0, 0, 29133, "player SAY_PERSUADE1"),
41+
(28939, 1, 1, "Tell me what you know about \"Crimson Dawn\" or the beatings will continue!", 12, 0, 100, 0, 0, 0, 29134, "player SAY_PERSUADE2"),
42+
(28939, 1, 2, "I'm through being courteous with your kind, human! What is the \"Crimson Dawn?\"", 12, 0, 100, 0, 0, 0, 29135, "player SAY_PERSUADE3"),
43+
(28939, 1, 3, "\"Crimson Dawn!\" What is it! Speak!", 12, 0, 100, 0, 0, 0, 29136, "player SAY_PERSUADE4"),
44+
(28939, 1, 4, "I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn!\"", 12, 0, 100, 0, 0, 0, 29137, "player SAY_PERSUADE5"),
45+
(28939, 1, 5, "I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!", 12, 0, 100, 0, 0, 0, 29138, "player SAY_PERSUADE6"),
46+
(28939, 1, 6, "Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly.", 12, 0, 100, 0, 0, 0, 29139, "player SAY_PERSUADE7"),
47+
(28939, 1, 7, "I grow tired of these games, human. Tell me of the \"Crimson Dawn\" or I will tear your spine out with my bare hands!", 12, 0, 100, 0, 0, 0, 29140, "player SAY_PERSUADE8"),
48+
49+
(28939, 2, 0, "I'll tell you nothing, Scourge filth!", 12, 0, 100, 0, 0, 0, 29141, "crusader SAY_CRUSADER1"),
50+
(28939, 2, 1, "You'll have to kill me, monster! I will tell you NOTHING!", 12, 0, 100, 0, 0, 0, 29142, "crusader SAY_CRUSADER2"),
51+
(28939, 2, 2, "Argh... The pain... The pain is almost as unbearable as the lashings I received in grammar school when I was but a child.", 12, 0, 100, 0, 0, 0, 29143, "crusader SAY_CRUSADER3"),
52+
(28939, 2, 3, "You... You'll get nothing... And like it...", 12, 0, 100, 0, 0, 0, 29144, "crusader SAY_CRUSADER4"),
53+
(28939, 2, 4, "Do you think this to be pain? To be suffering? HAH! Destroy this mortal shell so that I may ascend to the heavens!", 12, 0, 100, 0, 0, 0, 29145, "crusader SAY_CRUSADER5"),
54+
(28939, 2, 5, "You hit like a girl. Honestly. Is that the best you can do?", 12, 0, 100, 0, 0, 0, 29146, "crusader SAY_CRUSADER6"),
55+
(28939, 2, 6, "The crimson what? Never heard of it...", 12, 0, 100, 0, 0, 0, 29147, "crusader SAY_CRUSADER7"),
56+
(28939, 2, 7, "The pain is momentary. It pales in comparison to what the High General would do to me...", 12, 0, 100, 0, 0, 0, 29148, "crusader SAY_CRUSADER8"),
57+
(28939, 2, 8, "You'll be hanging in the gallows shortly, Scourge fiend!", 12, 0, 100, 0, 0, 0, 29160, "crusader SAY_CRUSADER9"),
58+
(28939, 2, 9, "I used to work for Grand Inquisitor Isillien! Your idea of pain is a normal mid-afternoon for me!", 12, 0, 100, 0, 0, 0, 29161, "crusader SAY_CRUSADER10"),
59+
(28939, 2, 10, "ARGH! You burned my last good tabard!", 12, 0, 100, 0, 0, 0, 29162, "crusader SAY_CRUSADER11"),
60+
(28939, 2, 11, "You know nothing of pain, monster!", 12, 0, 100, 0, 0, 0, 29155, "crusader SAY_CRUSADER12"),
61+
(28939, 2, 12, "HAH! I've survived three separate inquisitions! This is nothing in comparison!", 12, 0, 100, 0, 0, 0, 29156, "crusader SAY_CRUSADER13"),
62+
(28939, 2, 13, "Look out! There's a bee loose and it's on a stinging rampage!", 12, 0, 100, 0, 0, 0, 29157, "crusader SAY_CRUSADER14"),
63+
(28939, 2, 14, "That one tickled...", 12, 0, 100, 0, 0, 0, 29158, "crusader SAY_CRUSADER15"),
64+
(28939, 2, 15, "I'm going to send you back to the Lich King in pieces!", 12, 0, 100, 0, 0, 0, 29159, "crusader SAY_CRUSADER16"),
65+
66+
(28939, 3, 0, "I'll tell you everything! STOP! PLEASE!", 12, 0, 100, 0, 0, 0, 29149, "break crusader SAY_PERSUADED1"),
67+
(28939, 4, 0, "We... We have only been told that the \"Crimson Dawn\" is an awakening. You see, the Light speaks to the High General. It is the Light...", 12, 0, 100, 0, 0, 0, 29150, "break crusader SAY_PERSUADED2"),
68+
(28939, 5, 0, "The Light that guides us. The movement was set in motion before you came... We... We do as we are told. It is what must be done.", 12, 0, 100, 0, 0, 0, 29151, "break crusader SAY_PERSUADED3"),
69+
(28939, 6, 0, "I know very little else... The High General chooses who may go and who must stay behind. There's nothing else... You must believe me!", 12, 0, 100, 0, 0, 0, 29152, "break crusader SAY_PERSUADED4"),
70+
(28939, 7, 0, "LIES! The pain you are about to endure will be talked about for years to come!", 12, 0, 100, 0, 0, 0, 29163, "break player SAY_PERSUADED5"),
71+
(28939, 8, 0, "NO! PLEASE! There is one more thing that I forgot to mention... A courier comes soon... From Hearthglen. It...", 12, 0, 100, 0, 0, 0, 29153, "break crusader SAY_PERSUADED6"),
72+
(28939, 9, 0, "%s dies from the torture.", 16, 0, 100, 0, 0, 0, 29154, "dead crusader");
73+
74+
DELETE FROM creature_text WHERE entry=28940;
75+
INSERT INTO creature_text (entry, groupid, id, text, type, language, probability, emote, duration, sound, BroadcastTextID, comment) VALUES
76+
(28940, 1, 0, "What is the \"Crimson Dawn?\"", 12, 0, 100, 0, 0, 0, 29133, "player SAY_PERSUADE1"),
77+
(28940, 1, 1, "Tell me what you know about \"Crimson Dawn\" or the beatings will continue!", 12, 0, 100, 0, 0, 0, 29134, "player SAY_PERSUADE2"),
78+
(28940, 1, 2, "I'm through being courteous with your kind, human! What is the \"Crimson Dawn?\"", 12, 0, 100, 0, 0, 0, 29135, "player SAY_PERSUADE3"),
79+
(28940, 1, 3, "\"Crimson Dawn!\" What is it! Speak!", 12, 0, 100, 0, 0, 0, 29136, "player SAY_PERSUADE4"),
80+
(28940, 1, 4, "I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn!\"", 12, 0, 100, 0, 0, 0, 29137, "player SAY_PERSUADE5"),
81+
(28940, 1, 5, "I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!", 12, 0, 100, 0, 0, 0, 29138, "player SAY_PERSUADE6"),
82+
(28940, 1, 6, "Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly.", 12, 0, 100, 0, 0, 0, 29139, "player SAY_PERSUADE7"),
83+
(28940, 1, 7, "I grow tired of these games, human. Tell me of the \"Crimson Dawn\" or I will tear your spine out with my bare hands!", 12, 0, 100, 0, 0, 0, 29140, "player SAY_PERSUADE8"),
84+
85+
(28940, 2, 0, "I'll tell you nothing, Scourge filth!", 12, 0, 100, 0, 0, 0, 29141, "crusader SAY_CRUSADER1"),
86+
(28940, 2, 1, "You'll have to kill me, monster! I will tell you NOTHING!", 12, 0, 100, 0, 0, 0, 29142, "crusader SAY_CRUSADER2"),
87+
(28940, 2, 2, "Argh... The pain... The pain is almost as unbearable as the lashings I received in grammar school when I was but a child.", 12, 0, 100, 0, 0, 0, 29143, "crusader SAY_CRUSADER3"),
88+
(28940, 2, 3, "You... You'll get nothing... And like it...", 12, 0, 100, 0, 0, 0, 29144, "crusader SAY_CRUSADER4"),
89+
(28940, 2, 4, "Do you think this to be pain? To be suffering? HAH! Destroy this mortal shell so that I may ascend to the heavens!", 12, 0, 100, 0, 0, 0, 29145, "crusader SAY_CRUSADER5"),
90+
(28940, 2, 5, "You hit like a girl. Honestly. Is that the best you can do?", 12, 0, 100, 0, 0, 0, 29146, "crusader SAY_CRUSADER6"),
91+
(28940, 2, 6, "The crimson what? Never heard of it...", 12, 0, 100, 0, 0, 0, 29147, "crusader SAY_CRUSADER7"),
92+
(28940, 2, 7, "The pain is momentary. It pales in comparison to what the High General would do to me...", 12, 0, 100, 0, 0, 0, 29148, "crusader SAY_CRUSADER8"),
93+
(28940, 2, 8, "You'll be hanging in the gallows shortly, Scourge fiend!", 12, 0, 100, 0, 0, 0, 29160, "crusader SAY_CRUSADER9"),
94+
(28940, 2, 9, "I used to work for Grand Inquisitor Isillien! Your idea of pain is a normal mid-afternoon for me!", 12, 0, 100, 0, 0, 0, 29161, "crusader SAY_CRUSADER10"),
95+
(28940, 2, 10, "ARGH! You burned my last good tabard!", 12, 0, 100, 0, 0, 0, 29162, "crusader SAY_CRUSADER11"),
96+
(28940, 2, 11, "You know nothing of pain, monster!", 12, 0, 100, 0, 0, 0, 29155, "crusader SAY_CRUSADER12"),
97+
(28940, 2, 12, "HAH! I've survived three separate inquisitions! This is nothing in comparison!", 12, 0, 100, 0, 0, 0, 29156, "crusader SAY_CRUSADER13"),
98+
(28940, 2, 13, "Look out! There's a bee loose and it's on a stinging rampage!", 12, 0, 100, 0, 0, 0, 29157, "crusader SAY_CRUSADER14"),
99+
(28940, 2, 14, "That one tickled...", 12, 0, 100, 0, 0, 0, 29158, "crusader SAY_CRUSADER15"),
100+
(28940, 2, 15, "I'm going to send you back to the Lich King in pieces!", 12, 0, 100, 0, 0, 0, 29159, "crusader SAY_CRUSADER16"),
101+
102+
(28940, 3, 0, "I'll tell you everything! STOP! PLEASE!", 12, 0, 100, 0, 0, 0, 29149, "break crusader SAY_PERSUADED1"),
103+
(28940, 4, 0, "We... We have only been told that the \"Crimson Dawn\" is an awakening. You see, the Light speaks to the High General. It is the Light...", 12, 0, 100, 0, 0, 0, 29150, "break crusader SAY_PERSUADED2"),
104+
(28940, 5, 0, "The Light that guides us. The movement was set in motion before you came... We... We do as we are told. It is what must be done.", 12, 0, 100, 0, 0, 0, 29151, "break crusader SAY_PERSUADED3"),
105+
(28940, 6, 0, "I know very little else... The High General chooses who may go and who must stay behind. There's nothing else... You must believe me!", 12, 0, 100, 0, 0, 0, 29152, "break crusader SAY_PERSUADED4"),
106+
(28940, 7, 0, "LIES! The pain you are about to endure will be talked about for years to come!", 12, 0, 100, 0, 0, 0, 29163, "break player SAY_PERSUADED5"),
107+
(28940, 8, 0, "NO! PLEASE! There is one more thing that I forgot to mention... A courier comes soon... From Hearthglen. It...", 12, 0, 100, 0, 0, 0, 29153, "break crusader SAY_PERSUADED6"),
108+
(28940, 9, 0, "%s dies from the torture.", 16, 0, 100, 0, 0, 0, 29154, "dead crusader");
109+
110+
111+
112+
113+

‎src/server/game/Spells/Spell.cpp

+11-6
Original file line numberDiff line numberDiff line change
@@ -4737,18 +4737,23 @@ void Spell::HandleEffects(Unit* pUnitTarget, Item* pItemTarget, GameObject* pGOT
47374737
}
47384738
}
47394739

4740-
enum GilneasValues
4741-
{
4742-
NPC_KRENNAN_ARANAS = 35753,
4743-
SPELL_RESCUE_KRENNAN_ARANAS = 68219,
4744-
};
4745-
47464740
SpellCastResult Spell::CheckCast(bool strict)
47474741
{
4742+
enum eCheckCast
4743+
{
4744+
NPC_KRENNAN_ARANAS = 35753,
4745+
SPELL_RESCUE_KRENNAN_ARANAS = 68219,
4746+
};
4747+
47484748
Unit* Target = m_targets.GetUnitTarget();
47494749

47504750
switch (m_spellInfo->Id)
47514751
{
4752+
case 52781:
4753+
if (Player* player = m_caster->ToPlayer())
4754+
if (player->GetQuestStatus(12720) == QUEST_STATUS_INCOMPLETE)
4755+
return SPELL_CAST_OK;
4756+
break;
47524757
case 68219:
47534758
if (Unit* unit = this->GetOriginalCaster())
47544759
if (Vehicle* horse = unit->GetVehicle())

0 commit comments

Comments
 (0)