Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 05:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dustwallow Marsh: Implemented improvements in scripts to make quest "What's Haunting Witch Hill?" more blizzlike.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
_manuel_
2010-01-15 22:41:56 -03:00
parent b96698beca
commit 4a1276e3d3
3 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/FULL/world_script_texts.sql
View File

@@ -418,6 +418,9 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
(349,-1000466,'The Blackrock infestation is thick in these parts. I will do my best to keep the pace. Let''s go!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
(349,-1000467,'Marshal Marris, sir. Corporal Keeshan of the 12th Sabre Regiment returned from battle and reporting for duty!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
(349,-1000468,'Brave adventurer, thank you for rescuing me! I am sure Marshal Marris will reward your kind deed.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
(23861,-1000469,'It is too late for us, living one. Take yourself and your friend away from here before you both are... claimed...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
(23861,-1000470,'Go away, whoever you are! Witch Hill is mine... mine!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
(23861,-1000471,'It was... terrible... the demon...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
-- -1 033 000 SHADOWFANG KEEP
(0,-1033000,'Follow me and I''ll open the courtyard door for you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,7,1,'prisoner ashcrombe SAY_FREE_AS'),

6
sql/updates/7053_world_script_texts.sql Normal file
View File

@@ -0,0 +1,6 @@
DELETE FROM `script_texts` WHERE entry IN (-1000469,-1000470,-1000471);
INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
(23861,-1000469,'It is too late for us, living one. Take yourself and your friend away from here before you both are... claimed...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
(23861,-1000470,'Go away, whoever you are! Witch Hill is mine... mine!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
(23861,-1000471,'It was... terrible... the demon...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'');

58
src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp
View File

@@ -39,12 +39,15 @@ EndContentData */
enum eHuskSpirit
{
QUEST_WHATS_HAUNTING_WITCH_HILL = 11180,
SPELL_SUMMON_RESTLESS_APPARITION = 42511,
SPELL_CONSUME_FLESH = 37933, //Risen Husk
SPELL_INTANGIBLE_PRESENCE = 43127, //Risen Spirit
NPC_RISEN_HUSK = 23555,
NPC_RISEN_SPIRIT = 23554
QUEST_WHATS_HAUNTING_WITCH_HILL = 11180,
SPELL_SUMMON_RESTLESS_APPARITION = 42511,
SPELL_CONSUME_FLESH = 37933, //Risen Husk
SPELL_INTANGIBLE_PRESENCE = 43127, //Risen Spirit
NPC_RISEN_HUSK = 23555,
NPC_RISEN_SPIRIT = 23554,
NPC_RESTLESS_APPARITION = 23861
};
struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI
@@ -60,15 +63,6 @@ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI
m_uiIntangiblePresence_Timer = 5000;
}
void DamageTaken(Unit* pDoneBy, uint32 &damage)
{
if (pDoneBy->GetTypeId() == TYPEID_PLAYER)
{
if (damage >= m_creature->GetHealth() && CAST_PLR(pDoneBy)->GetQuestStatus(QUEST_WHATS_HAUNTING_WITCH_HILL) == QUEST_STATUS_INCOMPLETE)
DoCast(pDoneBy, SPELL_SUMMON_RESTLESS_APPARITION, false);
}
}
void UpdateAI(const uint32 uiDiff)
{
if (!UpdateVictim())
@@ -96,6 +90,16 @@ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI
DoMeleeAttackIfReady();
}
void JustDied(Unit* pKiller)
{
if (pKiller->GetTypeId() == TYPEID_PLAYER)
if (CAST_PLR(pKiller)->GetQuestStatus(QUEST_WHATS_HAUNTING_WITCH_HILL) == QUEST_STATUS_INCOMPLETE)
{
DoCast(pKiller, SPELL_SUMMON_RESTLESS_APPARITION, true);
CAST_PLR(pKiller)->KilledMonsterCredit(NPC_RESTLESS_APPARITION,0);
}
}
};
CreatureAI* GetAI_mobs_risen_husk_spirit(Creature* pCreature)
@@ -107,14 +111,26 @@ CreatureAI* GetAI_mobs_risen_husk_spirit(Creature* pCreature)
## npc_restless_apparition
######*/
bool GossipHello_npc_restless_apparition(Player* pPlayer, Creature* pCreature)
enum eRestlessApparition
{
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
SAY_RESTLESS_1 = -1000469,
SAY_RESTLESS_2 = -1000470,
SAY_RESTLESS_3 = -1000471
};
pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID());
pCreature->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
struct TRINITY_DLL_DECL npc_restless_apparitionAI : public ScriptedAI
{
npc_restless_apparitionAI(Creature* pCreature) : ScriptedAI(pCreature) {}
return true;
void Reset()
{
DoScriptText(RAND(SAY_RESTLESS_1,SAY_RESTLESS_2,SAY_RESTLESS_3), m_creature);
}
};
CreatureAI* GetAI_npc_restless_apparition(Creature* pCreature)
{
return new npc_restless_apparitionAI (pCreature);
}
/*######
@@ -308,7 +324,7 @@ void AddSC_dustwallow_marsh()
newscript = new Script;
newscript->Name = "npc_restless_apparition";
newscript->pGossipHello = &GossipHello_npc_restless_apparition;
newscript->GetAI = &GetAI_npc_restless_apparition;
newscript->RegisterSelf();
newscript = new Script;