*Merge.
--HG-- branch : trunk
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000205 AND -1000200;
|
||||
INSERT INTO script_texts
|
||||
(`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
|
||||
(-1000200, 'A-Me good.Good A-me.Follow...A-ME follow.Home.A-ME go home.', NULL, NULL, 'A-ME gut.Gut A-Me.Folgen...Heim.A-ME geht heim.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
|
||||
(-1000201, 'Bad Un´Goro Stomper.Stomper evil.', NULL, NULL, 'Böser Stampfer von Un´Goro. Stampfer von Un´Goro böse.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
|
||||
(-1000202, 'Good..good,A-ME. Home. Search way.', NULL, NULL, 'Gut...gut.A-ME.A-ME gut.Heim.Heim suchen.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
|
||||
(-1000203, 'A-Me home.A-ME go home!Tar Lord dont disturb A-ME.', NULL, NULL, 'A-ME daheim.A-ME geht heim!Teerfürst A-ME nicht aufhalten.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
|
||||
(-1000204, 'Tar Lord A-ME no hurt.A-ME good.', NULL, NULL, 'Teerfürst A-ME nicht wehtun.A-ME gut.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
|
||||
(-1000205, 'A-ME at home!A-ME good!Good A-ME.At home.Home.Home', NULL, NULL, 'A-ME daheim!A-ME gut!Gute A-ME.Daheim.Daheim.Daheim', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL);
|
||||
UPDATE `quest_template` SET `QuestFlags` = 2, `SpecialFlags` = 2 WHERE `entry` = 4245;
|
||||
|
||||
UPDATE `creature_template` SET `ScriptName` = 'npc_ame' WHERE `entry` = 9623;
|
||||
@@ -0,0 +1,2 @@
|
||||
update creature_template set scriptname='npc_kayra_longmane' where entry=17969;
|
||||
delete from creature_template_addon where entry=17969;
|
||||
@@ -381,6 +381,7 @@ scripts/zone/uldaman/instance_uldaman.cpp \
|
||||
scripts/zone/uldaman/boss_ironaya.cpp \
|
||||
scripts/zone/uldaman/uldaman.cpp \
|
||||
scripts/zone/undercity/undercity.cpp \
|
||||
scripts/zone/ungoro_crater/ungoro_crater.cpp \
|
||||
scripts/zone/wailing_caverns/instance_wailing_caverns.cpp \
|
||||
scripts/zone/western_plaguelands/western_plaguelands.cpp \
|
||||
scripts/zone/westfall/westfall.cpp \
|
||||
|
||||
@@ -563,6 +563,8 @@ extern void AddSC_instance_uldaman();
|
||||
extern void AddSC_undercity();
|
||||
|
||||
//Un'Goro Crater
|
||||
extern void AddSC_ungoro_crater();
|
||||
|
||||
//Upper blackrock spire
|
||||
//Wailing caverns
|
||||
|
||||
@@ -1770,6 +1772,8 @@ void ScriptsInit()
|
||||
AddSC_undercity();
|
||||
|
||||
//Un'Goro Crater
|
||||
AddSC_ungoro_crater();
|
||||
|
||||
//Upper blackrock spire
|
||||
//Wailing caverns
|
||||
|
||||
|
||||
@@ -1236,6 +1236,10 @@
|
||||
<Filter
|
||||
Name="Un'Goro Crater"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\scripts\zone\ungoro_crater\ungoro_crater.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Aunchindoun"
|
||||
|
||||
@@ -1413,6 +1413,10 @@
|
||||
<Filter
|
||||
Name="Un'Goro Crater"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\scripts\zone\ungoro_crater\ungoro_crater.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Aunchindoun"
|
||||
|
||||
@@ -1406,6 +1406,10 @@
|
||||
<Filter
|
||||
Name="Un'Goro Crater"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\scripts\zone\ungoro_crater\ungoro_crater.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Aunchindoun"
|
||||
|
||||
@@ -368,7 +368,6 @@ bool GossipSelect_npc_skyguard_handler_deesak(Player *player, Creature *_Creatur
|
||||
#define QUEST_EFTW_A 10051
|
||||
#define GO_CAGE 182794
|
||||
#define SPELL_CAT 32447
|
||||
//update creature_template set scriptname='npc_isla_starmane' where entry=18760;
|
||||
|
||||
struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI
|
||||
{
|
||||
|
||||
@@ -0,0 +1,208 @@
|
||||
/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
/* ScriptData
|
||||
SDName: Ungoro Crater
|
||||
SD%Complete: 100
|
||||
SDComment: Support for Quest: 4245
|
||||
SDCategory: Ungoro Crater
|
||||
EndScriptData */
|
||||
|
||||
/* ContentData
|
||||
npc_a-me
|
||||
EndContentData */
|
||||
|
||||
#include "precompiled.h"
|
||||
#include "../../npc/npc_escortAI.h"
|
||||
|
||||
#define SAY_READY -1000200
|
||||
#define SAY_AGGRO1 -1000201
|
||||
#define SAY_SEARCH -1000202
|
||||
#define SAY_AGGRO2 -1000203
|
||||
#define SAY_AGGRO3 -1000204
|
||||
#define SAY_FINISH -1000205
|
||||
|
||||
#define SPELL_DEMORALIZINGSHOUT 13730
|
||||
|
||||
#define QUEST_CHASING_AME 4245
|
||||
#define ENTRY_TARLORD 6519
|
||||
#define ENTRY_TARLORD1 6519
|
||||
#define ENTRY_STOMPER 6513
|
||||
|
||||
|
||||
struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI
|
||||
{
|
||||
npc_ameAI(Creature *c) : npc_escortAI(c) {Reset();}
|
||||
|
||||
uint32 DEMORALIZINGSHOUT_Timer;
|
||||
|
||||
void WaypointReached(uint32 i)
|
||||
{
|
||||
Unit* player = Unit::GetUnit((*m_creature), PlayerGUID);
|
||||
|
||||
if (!player)
|
||||
return;
|
||||
|
||||
switch (i)
|
||||
{
|
||||
|
||||
case 19:
|
||||
m_creature->SummonCreature(ENTRY_STOMPER, -6391.69, -1730.49, -272.83, 4.96, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
|
||||
DoScriptText(SAY_AGGRO1, m_creature, player);
|
||||
break;
|
||||
case 28:
|
||||
DoScriptText(SAY_SEARCH, m_creature, player);
|
||||
break;
|
||||
case 38:
|
||||
m_creature->SummonCreature(ENTRY_TARLORD, -6370.75, -1382.84, -270.51, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
|
||||
DoScriptText(SAY_AGGRO2, m_creature, player);
|
||||
break;
|
||||
case 49:
|
||||
m_creature->SummonCreature(ENTRY_TARLORD1, -6324.44, -1181.05, -270.17, 4.34, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
|
||||
DoScriptText(SAY_AGGRO3, m_creature, player);
|
||||
break;
|
||||
case 55:
|
||||
DoScriptText(SAY_FINISH, m_creature, player);
|
||||
if (player && player->GetTypeId() == TYPEID_PLAYER)
|
||||
((Player*)player)->GroupEventHappens(QUEST_CHASING_AME,m_creature);
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void Reset()
|
||||
{
|
||||
DEMORALIZINGSHOUT_Timer = 5000;
|
||||
}
|
||||
|
||||
void Aggro(Unit* who)
|
||||
{}
|
||||
|
||||
void JustSummoned(Creature* summoned)
|
||||
{
|
||||
summoned->AI()->AttackStart(m_creature);
|
||||
}
|
||||
|
||||
void JustDied(Unit* killer)
|
||||
{
|
||||
if (PlayerGUID)
|
||||
{
|
||||
if (Unit* player = Unit::GetUnit((*m_creature), PlayerGUID))
|
||||
((Player*)player)->FailQuest(QUEST_CHASING_AME);
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateAI(const uint32 diff)
|
||||
{
|
||||
npc_escortAI::UpdateAI(diff);
|
||||
if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
|
||||
return;
|
||||
|
||||
if (DEMORALIZINGSHOUT_Timer < diff)
|
||||
{
|
||||
DoCast(m_creature->getVictim(),SPELL_DEMORALIZINGSHOUT);
|
||||
DEMORALIZINGSHOUT_Timer = 70000;
|
||||
}else DEMORALIZINGSHOUT_Timer -= diff;
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
bool QuestAccept_npc_ame(Player* player, Creature* creature, Quest const* quest)
|
||||
{
|
||||
if (quest->GetQuestId() == QUEST_CHASING_AME)
|
||||
{
|
||||
((npc_escortAI*)(creature->AI()))->Start(false, true, false, player->GetGUID());
|
||||
DoScriptText(SAY_READY, creature, player);
|
||||
// Change faction so mobs attack
|
||||
creature->setFaction(775);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
CreatureAI* GetAI_npc_ame(Creature *_Creature)
|
||||
{
|
||||
npc_ameAI* thisAI = new npc_ameAI(_Creature);
|
||||
|
||||
thisAI->AddWaypoint(1, -6380.38, -1965.14, -258.292, 5000);
|
||||
thisAI->AddWaypoint(2, -6383.06, -1962.9, -258.936);
|
||||
thisAI->AddWaypoint(3, -6391.09, -1956.13, -260.291);
|
||||
thisAI->AddWaypoint(4, -6395.29, -1933.58, -262.949);
|
||||
thisAI->AddWaypoint(5, -6396.58, -1919.93, -263.838);
|
||||
thisAI->AddWaypoint(6, -6389.01, -1912.64, -260.689);
|
||||
thisAI->AddWaypoint(7, -6369.19, -1892.87, -255.924);
|
||||
thisAI->AddWaypoint(8, -6373.77, -1879.36, -259.268);
|
||||
thisAI->AddWaypoint(9, -6377.55, -1869.56, -260.503);
|
||||
thisAI->AddWaypoint(10, -6376.58, -1860.79, -260.026);
|
||||
thisAI->AddWaypoint(11, -6373.13, -1847.22, -259.249);
|
||||
thisAI->AddWaypoint(12, -6370.54, -1837.04, -260.007);
|
||||
thisAI->AddWaypoint(13, -6372.52, -1829.16, -260.071);
|
||||
thisAI->AddWaypoint(14, -6377.13, -1815.94, -262.632);
|
||||
thisAI->AddWaypoint(15, -6380.27, -1806.95, -265.53);
|
||||
thisAI->AddWaypoint(16, -6386.04, -1790.43, -268.546);
|
||||
thisAI->AddWaypoint(17, -6386.72, -1776.29, -269.851);
|
||||
thisAI->AddWaypoint(18, -6385.92, -1762.31, -271.494);
|
||||
thisAI->AddWaypoint(19, -6384.69, -1744.86, -272.196);
|
||||
thisAI->AddWaypoint(20, -6383.8, -1732.66, -272.222);
|
||||
thisAI->AddWaypoint(21, -6382.66, -1716.96, -272.235);
|
||||
thisAI->AddWaypoint(22, -6381.5, -1703.01, -272.964);
|
||||
thisAI->AddWaypoint(23, -6379.96, -1685.58, -272.842);
|
||||
thisAI->AddWaypoint(24, -6379.34, -1678.61, -272.34);
|
||||
thisAI->AddWaypoint(25, -6364.45, -1636.27, -271.065);
|
||||
thisAI->AddWaypoint(26, -6371.85, -1626.36, -272.188);
|
||||
thisAI->AddWaypoint(27, -6383.5, -1629.01, -272.206);
|
||||
thisAI->AddWaypoint(28, -6388.09, -1635.37, -272.105, 5000);
|
||||
thisAI->AddWaypoint(29, -6375.42, -1637.33, -272.193);
|
||||
thisAI->AddWaypoint(30, -6365.46, -1617.25, -272.141);
|
||||
thisAI->AddWaypoint(31, -6353.79, -1603.48, -271.932);
|
||||
thisAI->AddWaypoint(32, -6340.24, -1592.41, -269.435);
|
||||
thisAI->AddWaypoint(33, -6329.45, -1566.89, -269.895);
|
||||
thisAI->AddWaypoint(34, -6312.2, -1499.06, -269.507);
|
||||
thisAI->AddWaypoint(35, -6304.55, -1468.5, -269.431);
|
||||
thisAI->AddWaypoint(36, -6310.36, -1440.94, -268.427);
|
||||
thisAI->AddWaypoint(37, -6321, -1418.91, -266.525);
|
||||
thisAI->AddWaypoint(38, -6358.76, -1389.97, -267.522);
|
||||
thisAI->AddWaypoint(39, -6378.65, -1375.67, -271.749);
|
||||
thisAI->AddWaypoint(40, -6387.22, -1360.95, -272.109);
|
||||
thisAI->AddWaypoint(41, -6406.95, -1323.87, -271.586);
|
||||
thisAI->AddWaypoint(42, -6405, -1311.92, -271.906);
|
||||
thisAI->AddWaypoint(43, -6395.56, -1303.62, -271.902);
|
||||
thisAI->AddWaypoint(44, -6375.97, -1296.08, -271.865);
|
||||
thisAI->AddWaypoint(45, -6364.39, -1281.23, -269.012);
|
||||
thisAI->AddWaypoint(46, -6353.71, -1263.19, -267.95);
|
||||
thisAI->AddWaypoint(47, -6340.09, -1248.65, -267.441);
|
||||
thisAI->AddWaypoint(48, -6338.21, -1237.11, -267.844);
|
||||
thisAI->AddWaypoint(49, -6336.6, -1219.69, -269.196);
|
||||
thisAI->AddWaypoint(50, -6334.44, -1202.33, -271.527);
|
||||
thisAI->AddWaypoint(51, -6329.56, -1189.82, -270.947);
|
||||
thisAI->AddWaypoint(52, -6324.66, -1179.46, -270.103);
|
||||
thisAI->AddWaypoint(53, -6315.08, -1176.74, -269.735);
|
||||
thisAI->AddWaypoint(54, -6308.49, -1179.12, -269.57);
|
||||
thisAI->AddWaypoint(55, -6302.43, -1181.32, -269.328, 5000);
|
||||
thisAI->AddWaypoint(56, -6298.87, -1185.79, -269.278);
|
||||
|
||||
return (CreatureAI*)thisAI;
|
||||
}
|
||||
|
||||
void AddSC_ungoro_crater()
|
||||
{
|
||||
Script *newscript;
|
||||
|
||||
newscript = new Script;
|
||||
newscript->Name = "npc_ame";
|
||||
newscript->GetAI = &GetAI_npc_ame;
|
||||
newscript->pQuestAccept = &QuestAccept_npc_ame;
|
||||
newscript->RegisterSelf();
|
||||
}
|
||||
@@ -17,7 +17,7 @@
|
||||
/* ScriptData
|
||||
SDName: Zangarmarsh
|
||||
SD%Complete: 100
|
||||
SDComment: Quest support: 9785, 9803, 10009. Mark Of ... buffs.
|
||||
SDComment: Quest support: 9785, 9803, 10009, 9752. Mark Of ... buffs.
|
||||
SDCategory: Zangarmarsh
|
||||
EndScriptData */
|
||||
|
||||
@@ -26,9 +26,11 @@ npcs_ashyen_and_keleth
|
||||
npc_cooshcoosh
|
||||
npc_elder_kuruti
|
||||
npc_mortog_steamhead
|
||||
npc_kayra_longmane
|
||||
EndContentData */
|
||||
|
||||
#include "precompiled.h"
|
||||
#include "../../npc/npc_escortAI.h"
|
||||
|
||||
/*######
|
||||
## npcs_ashyen_and_keleth
|
||||
@@ -249,6 +251,126 @@ bool GossipSelect_npc_mortog_steamhead(Player *player, Creature *_Creature, uint
|
||||
return true;
|
||||
}
|
||||
|
||||
/*######
|
||||
## npc_kayra_longmane
|
||||
######*/
|
||||
|
||||
#define SAY_PROGRESS_1 "Is the way clear? Let's get out while we can, $N."
|
||||
#define SAY_PROGRESS_2 "Looks like we won't get away so easy. Get ready!"
|
||||
#define SAY_PROGRESS_3 "Let's keep moving. We're not safe here!"
|
||||
#define SAY_PROGRESS_4 "Look out, $N! Enemies ahead!"
|
||||
#define SAY_PROGRESS_5 "We're almost to the refuge! Let's go."
|
||||
#define SAY_PROGRESS_6 "I can see my fellow druids from here. Thank you, $N. I'm sure Ysiel will reward you for your actions!"
|
||||
|
||||
#define QUEST_EFU 9752
|
||||
#define MOB_AMBUSH 18042
|
||||
|
||||
struct TRINITY_DLL_DECL npc_kayra_longmaneAI : public npc_escortAI
|
||||
{
|
||||
npc_kayra_longmaneAI(Creature* c) : npc_escortAI(c) {Reset();}
|
||||
|
||||
bool Completed;
|
||||
|
||||
void Reset()
|
||||
{
|
||||
Completed = false;
|
||||
}
|
||||
|
||||
void Aggro(Unit* who){}
|
||||
|
||||
void JustSummoned(Creature *summoned)
|
||||
{
|
||||
summoned->AI()->AttackStart(m_creature);
|
||||
summoned->setFaction(14);
|
||||
}
|
||||
|
||||
void WaypointReached(uint32 i)
|
||||
{
|
||||
Unit* player = Unit::GetUnit((*m_creature), PlayerGUID);
|
||||
|
||||
switch(i)
|
||||
{
|
||||
case 0: DoSay(SAY_PROGRESS_1, LANG_UNIVERSAL, player); break;
|
||||
case 5: DoSay(SAY_PROGRESS_2, LANG_UNIVERSAL, player);
|
||||
m_creature->SummonCreature(MOB_AMBUSH, -922.24, 5357.98, 17.93, 5.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
|
||||
m_creature->SummonCreature(MOB_AMBUSH, -922.24, 5357.98, 17.93, 5.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
|
||||
break;
|
||||
case 6: DoSay(SAY_PROGRESS_3, LANG_UNIVERSAL, player);
|
||||
m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
|
||||
break;
|
||||
case 18: DoSay(SAY_PROGRESS_4, LANG_UNIVERSAL, player);
|
||||
m_creature->SummonCreature(MOB_AMBUSH, -671.86, 5379.81, 22.12, 5.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
|
||||
m_creature->SummonCreature(MOB_AMBUSH, -671.86, 5379.81, 22.12, 5.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
|
||||
break;
|
||||
case 19: m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
|
||||
DoSay(SAY_PROGRESS_5, LANG_UNIVERSAL, player); break;
|
||||
case 26: DoSay(SAY_PROGRESS_6, LANG_UNIVERSAL, player);
|
||||
if(player)
|
||||
((Player*)player)->GroupEventHappens(QUEST_EFU, m_creature);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void JustDied(Unit* killer)
|
||||
{
|
||||
if (PlayerGUID)
|
||||
{
|
||||
Unit* player = Unit::GetUnit((*m_creature), PlayerGUID);
|
||||
if (player && !Completed)
|
||||
((Player*)player)->FailQuest(QUEST_EFU);
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateAI(const uint32 diff)
|
||||
{
|
||||
npc_escortAI::UpdateAI(diff);
|
||||
}
|
||||
};
|
||||
|
||||
bool QuestAccept_npc_kayra_longmane(Player* player, Creature* creature, Quest const* quest)
|
||||
{
|
||||
if (quest->GetQuestId() == QUEST_EFU)
|
||||
{
|
||||
((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID());
|
||||
creature->setFaction(775);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
CreatureAI* GetAI_npc_kayra_longmaneAI(Creature* _Creature)
|
||||
{
|
||||
npc_kayra_longmaneAI* thisAI = new npc_kayra_longmaneAI(_Creature);
|
||||
|
||||
thisAI->AddWaypoint(0, -931.88, 5283.56, 23.98);//SAY_PROGRESS_1
|
||||
thisAI->AddWaypoint(1, -930.52, 5287.57, 23.82);
|
||||
thisAI->AddWaypoint(2, -924.98, 5297.94, 17.78);
|
||||
thisAI->AddWaypoint(3, -928.83, 5316.07, 18.18);
|
||||
thisAI->AddWaypoint(4, -930.07, 5323.10, 18.63);
|
||||
thisAI->AddWaypoint(5, -926.58, 5331.24, 18.74, 6000);//SAY_PROGRESS_2
|
||||
thisAI->AddWaypoint(6, -926.58, 5331.24, 18.74, 3000);//SAY_PROGRESS_3 Run to the hills!
|
||||
thisAI->AddWaypoint(7, -931.24, 5358.89, 18.14);
|
||||
thisAI->AddWaypoint(8, -934.43, 5370.20, 22.41);
|
||||
thisAI->AddWaypoint(9, -943.01, 5400.55, 22.74);
|
||||
thisAI->AddWaypoint(10, -929.62, 5417.98, 23.07);
|
||||
thisAI->AddWaypoint(11, -901.92, 5420.38, 24.19);
|
||||
thisAI->AddWaypoint(12, -859.03, 5415.36, 23.64);
|
||||
thisAI->AddWaypoint(13, -808.94, 5401.93, 23.11);
|
||||
thisAI->AddWaypoint(14, -772.74, 5390.53, 22.97);
|
||||
thisAI->AddWaypoint(15, -749.71, 5385.39, 22.75);
|
||||
thisAI->AddWaypoint(16, -721.23, 5380.38, 22.47);
|
||||
thisAI->AddWaypoint(17, -687.96, 5379.08, 22.16);
|
||||
thisAI->AddWaypoint(18, -680.87, 5378.95, 21.99, 6000);//SAY_PROGRESS_4 Summon Ambush
|
||||
thisAI->AddWaypoint(19, -680.87, 5378.95, 21.99, 6000);//SAY_PROGRESS_5
|
||||
thisAI->AddWaypoint(20, -636.14, 5385.25, 22.20);
|
||||
thisAI->AddWaypoint(21, -602.94, 5411.36, 21.48);
|
||||
thisAI->AddWaypoint(22, -566.86, 5421.87, 21.25);
|
||||
thisAI->AddWaypoint(23, -547.27, 5427.87, 21.10);
|
||||
thisAI->AddWaypoint(24, -520.59, 5444.83, 21.15);
|
||||
thisAI->AddWaypoint(25, -488.45, 5447.83, 22.38);
|
||||
thisAI->AddWaypoint(26, -449.65, 5463.78, 21.77, 11000);//SAY_PROGRESS_6
|
||||
|
||||
return (CreatureAI*)thisAI;
|
||||
}
|
||||
/*######
|
||||
## AddSC
|
||||
######*/
|
||||
@@ -280,4 +402,10 @@ void AddSC_zangarmarsh()
|
||||
newscript->pGossipHello = &GossipHello_npc_mortog_steamhead;
|
||||
newscript->pGossipSelect = &GossipSelect_npc_mortog_steamhead;
|
||||
newscript->RegisterSelf();
|
||||
|
||||
newscript = new Script;
|
||||
newscript->Name="npc_kayra_longmane";
|
||||
newscript->GetAI = &GetAI_npc_kayra_longmaneAI;
|
||||
newscript->pQuestAccept = &QuestAccept_npc_kayra_longmane;
|
||||
newscript->RegisterSelf();
|
||||
}
|
||||
|
||||
+6
-1
@@ -385,12 +385,17 @@ inline bool IsAreaAuraEffect(uint32 effect)
|
||||
|
||||
inline bool IsDispelSpell(SpellEntry const *spellInfo)
|
||||
{
|
||||
//spellsteal is also dispel
|
||||
if (spellInfo->Effect[0] == SPELL_EFFECT_DISPEL ||
|
||||
spellInfo->Effect[0] == SPELL_EFFECT_STEAL_BENEFICIAL_BUFF ||
|
||||
spellInfo->Effect[1] == SPELL_EFFECT_DISPEL ||
|
||||
spellInfo->Effect[2] == SPELL_EFFECT_DISPEL )
|
||||
spellInfo->Effect[1] == SPELL_EFFECT_STEAL_BENEFICIAL_BUFF ||
|
||||
spellInfo->Effect[2] == SPELL_EFFECT_DISPEL ||
|
||||
spellInfo->Effect[2] == SPELL_EFFECT_STEAL_BENEFICIAL_BUFF)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
inline bool isSpellBreakStealth(SpellEntry const* spellInfo)
|
||||
{
|
||||
return !(spellInfo->AttributesEx & SPELL_ATTR_EX_NOT_BREAK_STEALTH);
|
||||
|
||||
@@ -36,6 +36,8 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
|
||||
// always do a packet check
|
||||
CHECK_PACKET_SIZE(recv_data, 4*4+1+2*4);
|
||||
|
||||
uint32 map;
|
||||
float x, y, z;
|
||||
std::string ticketText = "";
|
||||
std::string ticketText2 = "";
|
||||
GM_Ticket *ticket = new GM_Ticket;
|
||||
@@ -43,7 +45,12 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
|
||||
WorldPacket data(SMSG_GMTICKET_CREATE, 4);
|
||||
|
||||
// recv Data
|
||||
recv_data >> ticketText;
|
||||
//TODO: Add map coordinates to tickets.
|
||||
recv_data >> map;
|
||||
recv_data >> x;
|
||||
recv_data >> y;
|
||||
recv_data >> z;
|
||||
recv_data >> ticketText;
|
||||
|
||||
// get additional data, rarely used
|
||||
recv_data >> ticketText2;
|
||||
|
||||
@@ -108,6 +108,7 @@ void TicketMgr::DeleteGMTicketPermanently(uint64 ticketGuid)
|
||||
|
||||
void TicketMgr::LoadGMTickets()
|
||||
{
|
||||
InitTicketID();
|
||||
// Delete all out of object holder
|
||||
GM_TicketList.clear();
|
||||
QueryResult *result = CharacterDatabase.Query( "SELECT `guid`, `playerGuid`, `name`, `message`, `timestamp`, `closed`, `assignedto`, `comment` FROM `gm_tickets` WHERE `closed` = '0'" );
|
||||
@@ -190,7 +191,7 @@ void TicketMgr::UpdateGMTicket(GM_Ticket *ticket)
|
||||
SaveGMTicket(ticket);
|
||||
}
|
||||
|
||||
uint64 TicketMgr::GenerateTicketID()
|
||||
void TicketMgr::InitTicketID()
|
||||
{
|
||||
QueryResult *result = CharacterDatabase.Query("SELECT MAX(guid) FROM gm_tickets");
|
||||
if(result)
|
||||
@@ -198,6 +199,9 @@ uint64 TicketMgr::GenerateTicketID()
|
||||
m_ticketid = result->Fetch()[0].GetUInt64() + 1;
|
||||
delete result;
|
||||
}
|
||||
}
|
||||
|
||||
uint64 TicketMgr::GenerateTicketID()
|
||||
{
|
||||
return ++m_ticketid;
|
||||
}
|
||||
@@ -61,6 +61,7 @@ class TicketMgr
|
||||
void SaveGMTicket(GM_Ticket* ticket);
|
||||
|
||||
uint64 GenerateTicketID();
|
||||
void InitTicketID();
|
||||
GM_Ticket* GetGMTicket(uint64 ticketGuid);
|
||||
GM_Ticket* GetGMTicketByPlayer(uint64 playerGuid);
|
||||
GM_Ticket* GetGMTicketByName(const char *name);
|
||||
|
||||
Reference in New Issue
Block a user