Skip to content

Commit bdee22c

Browse files
NeatElvesxfurry
NeatElves
authored and
xfurry
committed
[2689] Drop gossip for npcs 3442 and 7564. Will be handled in DB
Signed-off-by: Xfurry <xfurry@scriptdev2.com>
1 parent 265eb8c commit bdee22c

5 files changed

Lines changed: 5 additions & 70 deletions

File tree

‎scripts/kalimdor/tanaris.cpp‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
/* ScriptData
1818
SDName: Tanaris
1919
SD%Complete: 80
20-
SDComment: Quest support: 648, 1560, 2954, 4005, 10277. Noggenfogger vendor
20+
SDComment: Quest support: 648, 1560, 2954, 4005, 10277.
2121
SDCategory: Tanaris
2222
EndScriptData */
2323

2424
/* ContentData
2525
mob_aquementas
2626
npc_custodian_of_time
27-
npc_marin_noggenfogger
2827
npc_oox17tn
2928
npc_stone_watcher_of_norgannon
3029
npc_tooga
@@ -218,31 +217,6 @@ CreatureAI* GetAI_npc_custodian_of_time(Creature* pCreature)
218217
return new npc_custodian_of_timeAI(pCreature);
219218
}
220219

221-
/*######
222-
## npc_marin_noggenfogger
223-
######*/
224-
225-
bool GossipHello_npc_marin_noggenfogger(Player* pPlayer, Creature* pCreature)
226-
{
227-
if (pCreature->isQuestGiver())
228-
pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
229-
230-
if (pCreature->isVendor() && pPlayer->GetQuestRewardStatus(2662))
231-
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
232-
233-
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
234-
235-
return true;
236-
}
237-
238-
bool GossipSelect_npc_marin_noggenfogger(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
239-
{
240-
if (uiAction == GOSSIP_ACTION_TRADE)
241-
pPlayer->SEND_VENDORLIST(pCreature->GetObjectGuid());
242-
243-
return true;
244-
}
245-
246220
/*######
247221
## npc_oox17tn
248222
######*/
@@ -574,12 +548,6 @@ void AddSC_tanaris()
574548
pNewScript->GetAI = &GetAI_npc_custodian_of_time;
575549
pNewScript->RegisterSelf();
576550

577-
pNewScript = new Script;
578-
pNewScript->Name = "npc_marin_noggenfogger";
579-
pNewScript->pGossipHello = &GossipHello_npc_marin_noggenfogger;
580-
pNewScript->pGossipSelect = &GossipSelect_npc_marin_noggenfogger;
581-
pNewScript->RegisterSelf();
582-
583551
pNewScript = new Script;
584552
pNewScript->Name = "npc_oox17tn";
585553
pNewScript->GetAI = &GetAI_npc_oox17tn;

‎scripts/kalimdor/the_barrens.cpp‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
/* ScriptData
1818
SDName: The_Barrens
1919
SD%Complete: 90
20-
SDComment: Quest support: 863, 898, 1719, 2458, 4921, 6981
20+
SDComment: Quest support: 863, 898, 1719, 2458, 4921.
2121
SDCategory: Barrens
2222
EndScriptData */
2323

2424
/* ContentData
2525
npc_beaten_corpse
2626
npc_gilthares
27-
npc_sputtervalve
2827
npc_taskmaster_fizzule
2928
npc_twiggy_flathead
3029
at_twiggy_flathead
@@ -163,32 +162,6 @@ bool QuestAccept_npc_gilthares(Player* pPlayer, Creature* pCreature, const Quest
163162
return true;
164163
}
165164

166-
/*######
167-
## npc_sputtervalve
168-
######*/
169-
170-
bool GossipHello_npc_sputtervalve(Player* pPlayer, Creature* pCreature)
171-
{
172-
if (pCreature->isQuestGiver())
173-
pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
174-
175-
if (pPlayer->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE)
176-
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,"Can you tell me about this shard?",GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF);
177-
178-
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
179-
return true;
180-
}
181-
182-
bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
183-
{
184-
if (uiAction == GOSSIP_ACTION_INFO_DEF)
185-
{
186-
pPlayer->SEND_GOSSIP_MENU(2013, pCreature->GetObjectGuid());
187-
pPlayer->AreaExploredOrEventHappens(6981);
188-
}
189-
return true;
190-
}
191-
192165
/*######
193166
## npc_taskmaster_fizzule
194167
######*/
@@ -664,12 +637,6 @@ void AddSC_the_barrens()
664637
pNewScript->pQuestAcceptNPC = &QuestAccept_npc_gilthares;
665638
pNewScript->RegisterSelf();
666639

667-
pNewScript = new Script;
668-
pNewScript->Name = "npc_sputtervalve";
669-
pNewScript->pGossipHello = &GossipHello_npc_sputtervalve;
670-
pNewScript->pGossipSelect = &GossipSelect_npc_sputtervalve;
671-
pNewScript->RegisterSelf();
672-
673640
pNewScript = new Script;
674641
pNewScript->Name = "npc_taskmaster_fizzule";
675642
pNewScript->GetAI = &GetAI_npc_taskmaster_fizzule;

‎sd2_revision_nr.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#ifndef __SD2_REVISION_NR_H__
22
#define __SD2_REVISION_NR_H__
3-
#define SD2_REVISION_NR "2688"
3+
#define SD2_REVISION_NR "2689"
44
#endif // __SD2_REVISION_NR_H__

‎sql/mangos_scriptname_full.sql‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ UPDATE creature_template SET ScriptName='npc_magwin' WHERE entry=17312;
273273
/* BARRENS */
274274
UPDATE creature_template SET ScriptName='npc_beaten_corpse' WHERE entry=10668;
275275
UPDATE creature_template SET ScriptName='npc_gilthares' WHERE entry=3465;
276-
UPDATE creature_template SET ScriptName='npc_sputtervalve' WHERE entry=3442;
277276
UPDATE creature_template SET ScriptName='npc_taskmaster_fizzule' WHERE entry=7233;
278277
UPDATE creature_template SET ScriptName='npc_twiggy_flathead' WHERE entry=6248;
279278
DELETE FROM scripted_areatrigger WHERE entry=522;
@@ -1065,7 +1064,6 @@ UPDATE creature_template SET ScriptName='npc_galen_goodward' WHERE entry=5391;
10651064
/* TANARIS */
10661065
UPDATE creature_template SET ScriptName='mob_aquementas' WHERE entry=9453;
10671066
UPDATE creature_template SET ScriptName='npc_custodian_of_time' WHERE entry=20129;
1068-
UPDATE creature_template SET ScriptName='npc_marin_noggenfogger' WHERE entry=7564;
10691067
UPDATE creature_template SET ScriptName='npc_oox17tn' WHERE entry=7784;
10701068
UPDATE creature_template SET ScriptName='npc_stone_watcher_of_norgannon' WHERE entry=7918;
10711069
UPDATE creature_template SET ScriptName='npc_tooga' WHERE entry=5955;

‎sql/updates/r2689_mangos.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
UPDATE creature_template SET ScriptName='' WHERE entry=3442;
2+
UPDATE creature_template SET ScriptName='' WHERE entry=7564;

0 commit comments

Comments
 (0)