Skip to content

Commit 85563db

Browse files
NeatElvesxfurry
authored andcommitted
[s2378] Remove script for Lunaclaw Spirit
Signed-off-by: Schmoozerd <[email protected]> (based on commit 5c2daf6)
1 parent d99d71b commit 85563db

4 files changed

Lines changed: 2 additions & 43 deletions

File tree

scripts/world/npcs_special.cpp

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ npc_garments_of_quests 80% NPC's related to all Garments of-quests 5621, 56
3636
npc_injured_patient 100% patients for triage-quests (6622 and 6624)
3737
npc_doctor 100% Gustaf Vanhowzen and Gregory Victor, quest 6622 and 6624 (Triage)
3838
npc_innkeeper 25% ScriptName not assigned. Innkeepers in general.
39-
npc_lunaclaw_spirit 100% Appears at two different locations, quest 6001/6002
4039
npc_mount_vendor 100% Regular mount vendors all over the world. Display gossip if player doesn't meet the requirements to buy
4140
npc_rogue_trainer 80% Scripted trainers, so they are able to offer item 17126 for class quest 6681
4241
npc_sayge 100% Darkmoon event fortune teller, buff player based on answers given
@@ -1098,40 +1097,6 @@ bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature* pCreature, uint32 uiS
10981097
return true;
10991098
}
11001099

1101-
/*######
1102-
## npc_lunaclaw_spirit
1103-
######*/
1104-
1105-
enum
1106-
{
1107-
QUEST_BODY_HEART_A = 6001,
1108-
QUEST_BODY_HEART_H = 6002,
1109-
1110-
TEXT_ID_DEFAULT = 4714,
1111-
TEXT_ID_PROGRESS = 4715
1112-
};
1113-
1114-
#define GOSSIP_ITEM_GRANT "You have thought well, spirit. I ask you to grant me the strength of your body and the strength of your heart."
1115-
1116-
bool GossipHello_npc_lunaclaw_spirit(Player* pPlayer, Creature* pCreature)
1117-
{
1118-
if (pPlayer->GetQuestStatus(QUEST_BODY_HEART_A) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_BODY_HEART_H) == QUEST_STATUS_INCOMPLETE)
1119-
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GRANT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
1120-
1121-
pPlayer->SEND_GOSSIP_MENU(TEXT_ID_DEFAULT, pCreature->GetObjectGuid());
1122-
return true;
1123-
}
1124-
1125-
bool GossipSelect_npc_lunaclaw_spirit(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
1126-
{
1127-
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
1128-
{
1129-
pPlayer->SEND_GOSSIP_MENU(TEXT_ID_PROGRESS, pCreature->GetObjectGuid());
1130-
pPlayer->AreaExploredOrEventHappens((pPlayer->GetTeam() == ALLIANCE) ? QUEST_BODY_HEART_A : QUEST_BODY_HEART_H);
1131-
}
1132-
return true;
1133-
}
1134-
11351100
/*######
11361101
## npc_mount_vendor
11371102
######*/
@@ -1446,12 +1411,6 @@ void AddSC_npcs_special()
14461411
pNewScript->pGossipSelect = &GossipSelect_npc_innkeeper;
14471412
pNewScript->RegisterSelf(false); // script and error report disabled, but script can be used for custom needs, adding ScriptName
14481413

1449-
pNewScript = new Script;
1450-
pNewScript->Name = "npc_lunaclaw_spirit";
1451-
pNewScript->pGossipHello = &GossipHello_npc_lunaclaw_spirit;
1452-
pNewScript->pGossipSelect = &GossipSelect_npc_lunaclaw_spirit;
1453-
pNewScript->RegisterSelf();
1454-
14551414
pNewScript = new Script;
14561415
pNewScript->Name = "npc_mount_vendor";
14571416
pNewScript->pGossipHello = &GossipHello_npc_mount_vendor;

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 "s2377"
3+
#define SD2_REVISION_NR "s2378"
44
#endif // __SD2_REVISION_NR_H__

sql/mangos_scriptname_full.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ UPDATE creature_template SET ScriptName='npc_chicken_cluck' WHERE entry=620;
103103
UPDATE creature_template SET ScriptName='npc_dancing_flames' WHERE entry=25305;
104104
UPDATE creature_template SET ScriptName='npc_garments_of_quests' WHERE entry IN (12429,12423,12427,12430,12428);
105105
UPDATE creature_template SET ScriptName='npc_guardian' WHERE entry=5764;
106-
UPDATE creature_template SET ScriptName='npc_lunaclaw_spirit' WHERE entry=12144;
107106
UPDATE creature_template SET ScriptName='npc_mount_vendor' WHERE entry IN (384,1261,1460,2357,3362,3685,4730,4731,4885,7952,7955,16264,17584);
108107
UPDATE creature_template SET ScriptName='npc_doctor' WHERE entry IN (12939,12920);
109108
UPDATE creature_template SET ScriptName='npc_injured_patient' WHERE entry IN (12936,12937,12938,12923,12924,12925);

sql/updates/r2378_mangos.sql

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

0 commit comments

Comments
 (0)