Skip to content

Commit

Permalink
Merge pull request #16699 from tkrokli/triple_zone_cleanup
Browse files Browse the repository at this point in the history 
Core/Scripts: triple zone cleanup
  • Loading branch information
@Aokromes
Aokromes committed Feb 28, 2016
2 parents 59d0232 + 6ffac01 commit 2387dbd
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 254 deletions.
2 changes: 2 additions & 0 deletions sql/updates/world/2016_02_28_CLEAN-UP_world.sql
View file
@@ -0,0 +1,2 @@
-- remove script from core requires removing ScriptName from creature_template
UPDATE `creature_template` SET `ScriptName`= '' WHERE `entry`IN (1749,2708);
77 changes: 7 additions & 70 deletions src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
View file
Expand Up @@ -508,19 +508,11 @@ class npc_kharan_mighthammer : public CreatureScript
};

// npc_lokhtos_darkbargainer
enum LokhtosItems
enum Lokhtos
{
QUEST_A_BINDING_CONTRACT = 7604,
ITEM_SULFURON_INGOT = 17203,
ITEM_THRORIUM_BROTHERHOOD_CONTRACT = 18628,
ITEM_SULFURON_INGOT = 17203
};

enum LokhtosQuests
{
QUEST_A_BINDING_CONTRACT = 7604
};

enum LokhtosSpells
{
SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND = 23059
};

Expand Down Expand Up @@ -570,67 +562,12 @@ class npc_lokhtos_darkbargainer : public CreatureScript
}
};

// npc_dughal_stormwing
enum DughalQuests
{
QUEST_JAIL_BREAK = 4322
};

#define SAY_DUGHAL_FREE "Thank you, $N! I'm free!!!"
#define GOSSIP_DUGHAL "You're free, Dughal! Get out of here!"

// npc_marshal_windsor
#define SAY_WINDSOR_AGGRO1 "You locked up the wrong Marshal. Prepare to be destroyed!"
#define SAY_WINDSOR_AGGRO2 "I bet you're sorry now, aren't you !?!!"
#define SAY_WINDSOR_AGGRO3 "You better hold me back $N or they are going to feel some prison house beatings."
#define SAY_WINDSOR_1 "Let's get a move on. My gear should be in the storage area up this way..."
#define SAY_WINDSOR_4_1 "Check that cell, $N. If someone is alive in there, we need to get them out."
#define SAY_WINDSOR_4_2 "Get him out of there!"
#define SAY_WINDSOR_4_3 "Good work! We're almost there, $N. This way."
#define SAY_WINDSOR_6 "This is it, $N. My stuff should be in that room. Cover me, I'm going in!"
#define SAY_WINDSOR_9 "Ah, there it is!"

enum MarshalWindsor
{
NPC_REGINALD_WINDSOR = 9682
};

// npc_marshal_reginald_windsor
#define SAY_REGINALD_WINDSOR_0_1 "Can you feel the power, $N??? It's time to ROCK!"
#define SAY_REGINALD_WINDSOR_0_2 "Now we just have to free Tobias and we can get out of here. This way!"
#define SAY_REGINALD_WINDSOR_5_1 "Open it."
#define SAY_REGINALD_WINDSOR_5_2 "I never did like those two. Let's get moving."
#define SAY_REGINALD_WINDSOR_7_1 "Open it and be careful this time!"
#define SAY_REGINALD_WINDSOR_7_2 "That intolerant dirtbag finally got what was coming to him. Good riddance!"
#define SAY_REGINALD_WINDSOR_7_3 "Alright, let's go."
#define SAY_REGINALD_WINDSOR_13_1 "Open it. We need to hurry up. I can smell those Dark Irons coming a mile away and I can tell you one thing, they're COMING!"
#define SAY_REGINALD_WINDSOR_13_2 "Administering fists of fury on Crest Killer!"
#define SAY_REGINALD_WINDSOR_13_3 "He has to be in the last cell. Unless... they killed him."
#define SAY_REGINALD_WINDSOR_14_1 "Get him out of there!"
#define SAY_REGINALD_WINDSOR_14_2 "Excellent work, $N. Let's find the exit. I think I know the way. Follow me!"
#define SAY_REGINALD_WINDSOR_20_1 "We made it!"
#define SAY_REGINALD_WINDSOR_20_2 "Meet me at Maxwell's encampment. We'll go over the next stages of the plan there and figure out a way to decode my tablets without the decryption ring."

enum MarshalReginaldWindor
{
NPC_SHILL_DINGER = 9678,
NPC_CREST_KILLER = 9680
};

// npc_rocknot
enum RocknotSays
{
SAY_GOT_BEER = 0
};

enum RocknotSpells
{
SPELL_DRUNKEN_RAGE = 14872
};

enum RocknotQuests
enum Rocknot
{
QUEST_ALE = 4295
SAY_GOT_BEER = 0,
QUEST_ALE = 4295,
SPELL_DRUNKEN_RAGE = 14872
};

class npc_rocknot : public CreatureScript
Expand Down
87 changes: 7 additions & 80 deletions src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
View file
Expand Up @@ -19,7 +19,7 @@
/* ScriptData
SDName: Burning_Steppes
SD%Complete: 100
SDComment: Quest support: 4224, 4866
SDComment: Quest support: 4866
SDCategory: Burning Steppes
EndScriptData */

Expand All @@ -36,25 +36,11 @@ EndContentData */
## npc_ragged_john
######*/

#define GOSSIP_HELLO "Official buisness, John. I need some information about Marsha Windsor. Tell me about the last time you saw him."
#define GOSSIP_SELECT1 "So what did you do?"
#define GOSSIP_SELECT2 "Start making sense, dwarf. I don't want to have anything to do with your cracker, your pappy, or any sort of 'discreditin'."
#define GOSSIP_SELECT3 "Ironfoe?"
#define GOSSIP_SELECT4 "Interesting... continue John."
#define GOSSIP_SELECT5 "So that's how Windsor died..."
#define GOSSIP_SELECT6 "So how did he die?"
#define GOSSIP_SELECT7 "Ok so where the hell is he? Wait a minute! Are you drunk?"
#define GOSSIP_SELECT8 "WHY is he in Blackrock Depths?"
#define GOSSIP_SELECT9 "300? So the Dark Irons killed him and dragged him into the Depths?"
#define GOSSIP_SELECT10 "Ahh... Ironfoe"
#define GOSSIP_SELECT11 "Thanks, Ragged John. Your story was very uplifting and informative"

enum RaggedJohn
{
QUEST_THE_TRUE_MASTERS = 4224,
QUEST_MOTHERS_MILK = 4866,
SPELL_MOTHERS_MILK = 16468,
SPELL_WICKED_MILKING = 16472
QUEST_MOTHERS_MILK = 4866,
SPELL_MOTHERS_MILK = 16468,
SPELL_WICKED_MILKING = 16472
};

class npc_ragged_john : public CreatureScript
Expand Down Expand Up @@ -86,72 +72,13 @@ class npc_ragged_john : public CreatureScript
void EnterCombat(Unit* /*who*/) override { }
};

bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override
{
player->PlayerTalkClass->ClearMenus();
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(2714, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(2715, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(2716, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->SEND_GOSSIP_MENU(2717, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
player->SEND_GOSSIP_MENU(2718, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
player->SEND_GOSSIP_MENU(2719, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
player->SEND_GOSSIP_MENU(2720, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+7:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
player->SEND_GOSSIP_MENU(2721, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+8:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
player->SEND_GOSSIP_MENU(2722, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+9:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
player->SEND_GOSSIP_MENU(2723, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+10:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
player->SEND_GOSSIP_MENU(2725, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+11:
player->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(QUEST_THE_TRUE_MASTERS);
break;
}
return true;
}

bool OnGossipHello(Player* player, Creature* creature) override
{
if (creature->IsQuestGiver())
{
player->PrepareQuestMenu(creature->GetGUID());

if (player->GetQuestStatus(QUEST_THE_TRUE_MASTERS) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);

player->SEND_GOSSIP_MENU(2713, creature->GetGUID());
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
}
return true;
}

Expand Down
114 changes: 10 additions & 104 deletions src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
View file
Expand Up @@ -19,14 +19,12 @@
/* ScriptData
SDName: Stormwind_City
SD%Complete: 100
SDComment: Quest support: 1640, 1447, 4185, 11223, 434.
SDComment: Quest support: 1640, 1447, 434.
SDCategory: Stormwind City
EndScriptData */

/* ContentData
npc_archmage_malin
npc_bartleby
npc_lady_katrana_prestor
npc_tyrion
npc_tyrion_spybot
npc_marzon_silent_blade
Expand All @@ -39,51 +37,14 @@ EndContentData */
#include "ScriptedEscortAI.h"
#include "Player.h"

/*######
## npc_archmage_malin
######*/

#define GOSSIP_ITEM_MALIN "Can you send me to Theramore? I have an urgent message for Lady Jaina from Highlord Bolvar."

class npc_archmage_malin : public CreatureScript
{
public:
npc_archmage_malin() : CreatureScript("npc_archmage_malin") { }

bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override
{
player->PlayerTalkClass->ClearMenus();
if (action == GOSSIP_ACTION_INFO_DEF)
{
player->CLOSE_GOSSIP_MENU();
creature->CastSpell(player, 42711, true);
}

return true;
}

bool OnGossipHello(Player* player, Creature* creature) override
{
if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());

if (player->GetQuestStatus(11223) == QUEST_STATUS_COMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MALIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);

player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());

return true;
}
};

/*######
## npc_bartleby
######*/

enum Bartleby
{
FACTION_ENEMY = 168,
QUEST_BEAT = 1640
FACTION_ENEMY = 168,
QUEST_BEAT = 1640
};

class npc_bartleby : public CreatureScript
Expand Down Expand Up @@ -147,72 +108,19 @@ class npc_bartleby : public CreatureScript
};
};

/*######
## npc_lady_katrana_prestor
######*/

#define GOSSIP_ITEM_KAT_1 "Pardon the intrusion, Lady Prestor, but Highlord Bolvar suggested that I seek your advice."
#define GOSSIP_ITEM_KAT_2 "My apologies, Lady Prestor."
#define GOSSIP_ITEM_KAT_3 "Begging your pardon, Lady Prestor. That was not my intent."
#define GOSSIP_ITEM_KAT_4 "Thank you for your time, Lady Prestor."

class npc_lady_katrana_prestor : public CreatureScript
{
public:
npc_lady_katrana_prestor() : CreatureScript("npc_lady_katrana_prestor") { }

bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override
{
player->PlayerTalkClass->ClearMenus();
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(2694, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(2695, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(2696, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
player->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(4185);
break;
}
return true;
}

bool OnGossipHello(Player* player, Creature* creature) override
{
if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());

if (player->GetQuestStatus(4185) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);

player->SEND_GOSSIP_MENU(2693, creature->GetGUID());

return true;
}
};

/*######
## npc_lord_gregor_lescovar
######*/

enum LordGregorLescovar
{
SAY_GUARD_2 = 0,
SAY_LESCOVAR_2 = 0,
SAY_LESCOVAR_3 = 1,
SAY_LESCOVAR_4 = 2,
SAY_MARZON_1 = 0,
SAY_MARZON_2 = 1,
SAY_TYRION_2 = 1,
SAY_GUARD_2 = 0,
SAY_LESCOVAR_2 = 0,
SAY_LESCOVAR_3 = 1,
SAY_LESCOVAR_4 = 2,
SAY_MARZON_1 = 0,
SAY_MARZON_2 = 1,
SAY_TYRION_2 = 1,

NPC_STORMWIND_ROYAL = 1756,
NPC_MARZON_BLADE = 1755,
Expand Down Expand Up @@ -650,9 +558,7 @@ class npc_tyrion : public CreatureScript

void AddSC_stormwind_city()
{
new npc_archmage_malin();
new npc_bartleby();
new npc_lady_katrana_prestor();
new npc_tyrion();
new npc_tyrion_spybot();
new npc_lord_gregor_lescovar();
Expand Down

0 comments on commit 2387dbd

Please sign in to comment.