josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Script: Code style and remove unused core.

Browse Source 
Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-03-16 21:41:15 +08:00
parent e5afa4a950
commit d8b4bc590a
17 changed files with 240 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+18 -4
View File
@@ -296,8 +296,11 @@ public:
if (spell->Id == SPELL_FLYING_HEAD)
{
if (Phase < 3) ++Phase;
else Phase = 3;
if (Phase < 3)
++Phase;
else
Phase = 3;
withbody = false;
if (!bodyGUID)
bodyGUID = caster->GetGUID();
@@ -486,12 +489,18 @@ public:
instance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS);
DoZoneInCombat();
}
void AttackStart(Unit* who) {ScriptedAI::AttackStart(who);}
void AttackStart(Unit* who)
{
ScriptedAI::AttackStart(who);
}
void MoveInLineOfSight(Unit* who)
{
if (withhead && Phase != 0)
ScriptedAI::MoveInLineOfSight(who);
}
void KilledUnit(Unit* player)
{
if (player->GetTypeId() == TYPEID_PLAYER)
@@ -596,6 +605,7 @@ public:
if (!headGUID)
headGUID = DoSpawnCreature(HEAD, float(rand()%6), float(rand()%6), 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0)->GetGUID();
Unit* Head = Unit::GetUnit((*me), headGUID);
if (Head && Head->isAlive())
{
@@ -815,7 +825,11 @@ public:
}
}
void JustDied(Unit* /*killer*/) { if (!sprouted) Despawn(); }
void JustDied(Unit* /*killer*/)
{
if (!sprouted)
Despawn();
}
void MoveInLineOfSight(Unit* who)
{
src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+1 -4
View File
@@ -175,10 +175,7 @@ public:
if (uiDarkOffering <= uiDiff)
{
if (Creature* pFriend = me->FindNearestCreature(me->GetEntry(), 25.0f, true))
{
if (pFriend)
DoCast(pFriend, SPELL_DARK_OFFERING);
}
DoCast(pFriend, SPELL_DARK_OFFERING);
else
DoCast(me, SPELL_DARK_OFFERING);
uiDarkOffering = urand(4400, 12500);
src/server/scripts/EasternKingdoms/ghostlands.cpp
+1 -1
View File
@@ -183,7 +183,7 @@ public:
DoScriptText(SAY_END2, me, player);
Unit* CaptainHelios = me->FindNearestCreature(NPC_CAPTAIN_HELIOS, 50);
if (CaptainHelios)
DoScriptText(SAY_CAPTAIN_ANSWER, CaptainHelios, player);
DoScriptText(SAY_CAPTAIN_ANSWER, CaptainHelios, player);
break;
}
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
-3
View File
@@ -59,7 +59,6 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
}
uint32 RainTimer;
@@ -70,7 +69,6 @@ public:
bool enraged;
bool go;
uint32 pos;
void Reset()
{
@@ -115,7 +113,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 7 && instance)
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL));
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
-3
View File
@@ -56,7 +56,6 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
}
uint32 CleaveTimer;
@@ -64,7 +63,6 @@ public:
uint32 MarkTimer;
uint32 MarkTimerBase;
bool go;
uint32 pos;
void Reset()
{
@@ -107,7 +105,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 7 && instance)
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL));
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
-3
View File
@@ -62,7 +62,6 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
}
uint32 FrostArmorTimer;
@@ -70,7 +69,6 @@ public:
uint32 NovaTimer;
uint32 IceboltTimer;
bool go;
uint32 pos;
void Reset()
{
@@ -109,7 +107,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 7 && instance)
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_JAINAPROUDMOORE));
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+18 -30
View File
@@ -405,7 +405,6 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetDisplayId(MODEL_INVIS);
go = false;
pos = 0;
Reset();
}
@@ -413,7 +412,6 @@ public:
bool CanMove;
bool WpEnabled;
bool go;
uint32 pos;
uint32 spawnTimer;
uint32 FlameBuffetTimer;
bool imol;
@@ -429,7 +427,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 0 && instance && !IsOverrun)
{
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
@@ -543,13 +540,11 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
}
bool go;
uint32 KnockDownTimer;
uint32 pos;
void Reset()
{
KnockDownTimer = 10000;
@@ -557,7 +552,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 7 && instance && !IsOverrun)
{
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
@@ -644,13 +638,11 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
}
bool go;
uint32 FrenzyTimer;
uint32 pos;
uint32 MoveTimer;
bool RandomMove;
void Reset()
@@ -662,7 +654,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 7 && instance && !IsOverrun)
{
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
@@ -753,13 +744,13 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
}
SummonList summons;
bool go;
uint32 ShadowBoltTimer;
uint32 pos;
void Reset()
{
ShadowBoltTimer = 1000+rand()%5000;
@@ -773,10 +764,14 @@ public:
summon->Attack(target, false);
summons.Summon(summon);
}
void SummonedCreatureDespawn(Creature* summon) {summons.Despawn(summon);}
void SummonedCreatureDespawn(Creature* summon)
{
summons.Despawn(summon);
}
void WaypointReached(uint32 i)
{
pos = i;
if (i == 7 && instance && !IsOverrun)
{
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
@@ -815,8 +810,10 @@ public:
void UpdateAI(const uint32 diff)
{
hyjal_trashAI::UpdateAI(diff);
if (IsEvent || IsOverrun)
npc_escortAI::UpdateAI(diff);
if (IsEvent)
{
if (!go)
@@ -840,8 +837,10 @@ public:
}
}
}
if (!UpdateVictim())
return;
if (ShadowBoltTimer <= diff)
{
DoCast(me->getVictim(), SPELL_SHADOW_BOLT);
@@ -874,7 +873,6 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
}
@@ -882,7 +880,7 @@ public:
uint32 CourseTimer;
uint32 WailTimer;
uint32 ShellTimer;
uint32 pos;
void Reset()
{
CourseTimer = 20000+rand()%5000;
@@ -892,7 +890,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 7 && instance && !IsOverrun)
{
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
@@ -979,13 +976,12 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
}
bool go;
uint32 WebTimer;
uint32 pos;
void Reset()
{
WebTimer = 20000+rand()%5000;
@@ -993,7 +989,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 7 && instance && !IsOverrun)
{
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
@@ -1071,13 +1066,12 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
}
bool go;
uint32 ManaBurnTimer;
uint32 pos;
void Reset()
{
ManaBurnTimer = 9000+rand()%5000;
@@ -1085,7 +1079,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 7 && instance && !IsOverrun)
{
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
@@ -1163,13 +1156,11 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
}
bool go;
uint32 FrostBreathTimer;
uint32 pos;
uint32 MoveTimer;
void Reset()
@@ -1181,7 +1172,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 2 && instance && !IsOverrun)
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL));
@@ -1280,14 +1270,12 @@ public:
{
instance = creature->GetInstanceScript();
go = false;
pos = 0;
DummyTarget[0] = 0;DummyTarget[1] = 0;DummyTarget[2] = 0;
Reset();
}
bool go;
uint32 StrikeTimer;
uint32 pos;
uint32 MoveTimer;
float Zpos;
bool forcemove;
@@ -1303,7 +1291,6 @@ public:
void WaypointReached(uint32 i)
{
pos = i;
if (i == 2 && instance && !IsOverrun)
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL));
@@ -1382,8 +1369,9 @@ public:
float x, y, z;
me->getVictim()->GetPosition(x, y, z);
me->GetMotionMaster()->MovePoint(0, x, y, z+Zpos);
Zpos-=1.0f;
if (Zpos <= 0)Zpos=0;
Zpos -= 1.0f;
if (Zpos <= 0)
Zpos = 0;
MoveTimer = 2000;
} else MoveTimer-=diff;
}
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
-4
View File
@@ -926,9 +926,7 @@ struct dummy_dragonAI : public ScriptedAI
if (instance && instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
instance->SetData(TYPE_SHADRON_PREKILLED, 1);
if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_SHADRON, 100.0f))
{
pAcolyte->Kill(pAcolyte);
}
break;
case NPC_VESPERON:
iTextId = SAY_VESPERON_DEATH;
@@ -936,9 +934,7 @@ struct dummy_dragonAI : public ScriptedAI
if (instance && instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
instance->SetData(TYPE_VESPERON_PREKILLED, 1);
if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_VESPERON, 100.0f))
{
pAcolyte->Kill(pAcolyte);
}
break;
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+2 -5
View File
@@ -184,11 +184,8 @@ class boss_kologarn : public CreatureScript
if (Creature* rubbleStalker = who->FindNearestCreature(NPC_RUBBLE_STALKER, 70.0f))
{
if (rubbleStalker)
{
rubbleStalker->CastSpell(rubbleStalker, SPELL_FALLING_RUBBLE, true);
rubbleStalker->CastSpell(rubbleStalker, SPELL_SUMMON_RUBBLE, true);
}
rubbleStalker->CastSpell(rubbleStalker, SPELL_FALLING_RUBBLE, true);
rubbleStalker->CastSpell(rubbleStalker, SPELL_SUMMON_RUBBLE, true);
}
if (!right && !left)
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+1 -1
View File
@@ -445,6 +445,7 @@ public:
void AttackStart(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
{
if (uiDespawnTimer <= diff)
@@ -455,7 +456,6 @@ public:
} else uiDespawnTimer -= diff;
}
};
};
void AddSC_boss_ingvar_the_plunderer()
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+5 -1
View File
@@ -1187,7 +1187,11 @@ public:
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void EnterEvadeMode() {}
void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; }
void GetIllidanGUID(uint64 guid)
{
IllidanGUID = guid;
}
void DamageTaken(Unit* done_by, uint32 &damage)
{
src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+8 -2
View File
@@ -121,7 +121,10 @@ public:
struct mob_ashtongue_channelerAI : public ScriptedAI
{
mob_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature) {ShadeGUID = 0;}
mob_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature)
{
ShadeGUID = 0;
}
uint64 ShadeGUID;
@@ -147,7 +150,10 @@ public:
struct mob_ashtongue_sorcererAI : public ScriptedAI
{
mob_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature) {ShadeGUID = 0;}
mob_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature)
{
ShadeGUID = 0;
}
uint64 ShadeGUID;
uint32 CheckTimer;
src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+9 -2
View File
@@ -165,8 +165,15 @@ public:
summons.DespawnAll();
}
void JustSummoned(Creature* summon) {summons.Summon(summon);}
void SummonedCreatureDespawn(Creature* summon) {summons.Despawn(summon);}
void JustSummoned(Creature* summon)
{
summons.Summon(summon);
}
void SummonedCreatureDespawn(Creature* summon)
{
summons.Despawn(summon);
}
Unit* CalculateHatefulStrikeTarget()
{
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+4 -1
View File
@@ -445,7 +445,10 @@ class boss_kaelthas : public CreatureScript
}
}
void SummonedCreatureDespawn(Creature* summon) {summons.Despawn(summon);}
void SummonedCreatureDespawn(Creature* summon)
{
summons.Despawn(summon);
}
void JustDied(Unit* /*Killer*/)
{
src/server/scripts/Outland/netherstorm.cpp
-1
View File
@@ -647,7 +647,6 @@ public:
if (player->isAlive() && player->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE)
{
Creature* Dawnforge = player->FindNearestCreature(CreatureEntry[1], 30.0f);
if (!Dawnforge)
return false;
src/server/scripts/Outland/shadowmoon_valley.cpp
+171 -57
View File
@@ -241,7 +241,6 @@ public:
DoCast(caster, SPELL_FORCE_OF_NELTHARAKU, true);
Unit* Dragonmaw = me->FindNearestCreature(CREATURE_DRAGONMAW_SUBJUGATOR, 50);
if (Dragonmaw)
{
me->AddThreat(Dragonmaw, 100000.0f);
@@ -760,7 +759,6 @@ public:
uint32 NextStep(uint32 Step)
{
Unit* player = Unit::GetUnit((*me), PlayerGUID);
Unit* Illi = Unit::GetUnit((*me), IllidanGUID);
if (!player || !Illi)
@@ -771,27 +769,88 @@ public:
switch (Step)
{
case 0: return 0; break;
case 1: me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f); return 9000; break;
case 2: DoScriptText(OVERLORD_YELL_1, me, player); return 4500; break;
case 3: me->SetInFront(player); return 3200; break;
case 4: DoScriptText(OVERLORD_SAY_2, me, player); return 2000; break;
case 5: Illi->SetVisible(true);
Illi->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return 350; break;
case 0:
return 0;
break;
case 1:
me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f);
return 9000;
break;
case 2:
DoScriptText(OVERLORD_YELL_1, me, player);
return 4500;
break;
case 3:
me->SetInFront(player);
return 3200;
break;
case 4:
DoScriptText(OVERLORD_SAY_2, me, player);
return 2000;
break;
case 5:
Illi->SetVisible(true);
Illi->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
return 350;
break;
case 6:
Illi->CastSpell(Illi, SPELL_ONE, true);
Illi->SetTarget(me->GetGUID());
me->SetTarget(IllidanGUID);
return 2000; break;
case 7: DoScriptText(OVERLORD_YELL_2, me); return 4500; break;
case 8: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); return 2500; break;
case 9: DoScriptText(OVERLORD_SAY_3, me); return 6500; break;
case 10: DoScriptText(LORD_ILLIDAN_SAY_1, Illi); return 5000; break;
case 11: DoScriptText(OVERLORD_SAY_4, me, player); return 6000; break;
case 12: DoScriptText(LORD_ILLIDAN_SAY_2, Illi); return 5500; break;
case 13: DoScriptText(LORD_ILLIDAN_SAY_3, Illi); return 4000; break;
case 14: Illi->SetTarget(PlayerGUID); return 1500; break;
case 15: DoScriptText(LORD_ILLIDAN_SAY_4, Illi); return 1500; break;
return 2000;
break;
case 7:
DoScriptText(OVERLORD_YELL_2, me);
return 4500;
break;
case 8:
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8);
return 2500;
break;
case 9:
DoScriptText(OVERLORD_SAY_3, me);
return 6500;
break;
case 10:
DoScriptText(LORD_ILLIDAN_SAY_1, Illi);
return 5000;
break;
case 11:
DoScriptText(OVERLORD_SAY_4, me, player);
return 6000;
break;
case 12:
DoScriptText(LORD_ILLIDAN_SAY_2, Illi);
return 5500;
break;
case 13:
DoScriptText(LORD_ILLIDAN_SAY_3, Illi);
return 4000;
break;
case 14:
Illi->SetTarget(PlayerGUID);
return 1500;
break;
case 15:
DoScriptText(LORD_ILLIDAN_SAY_4, Illi);
return 1500;
break;
case 16:
if (player)
{
@@ -799,67 +858,124 @@ public:
player->RemoveAurasDueToSpell(SPELL_THREE);
player->RemoveAurasDueToSpell(SPELL_FOUR);
return 5000;
}else{
CAST_PLR(player)->FailQuest(QUEST_LORD_ILLIDAN_STORMRAGE); Step = 30; return 100;
}
else
{
CAST_PLR(player)->FailQuest(QUEST_LORD_ILLIDAN_STORMRAGE);
Step = 30;
return 100;
}
break;
case 17: DoScriptText(LORD_ILLIDAN_SAY_5, Illi); return 5000; break;
case 18: DoScriptText(LORD_ILLIDAN_SAY_6, Illi); return 5000; break;
case 19: DoScriptText(LORD_ILLIDAN_SAY_7, Illi); return 5000; break;
case 17:
DoScriptText(LORD_ILLIDAN_SAY_5, Illi);
return 5000;
break;
case 18:
DoScriptText(LORD_ILLIDAN_SAY_6, Illi);
return 5000;
break;
case 19:
DoScriptText(LORD_ILLIDAN_SAY_7, Illi);
return 5000;
break;
case 20:
Illi->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
Illi->SetDisableGravity(true);
return 500; break;
case 21: DoScriptText(OVERLORD_SAY_5, me); return 500; break;
return 500;
break;
case 21:
DoScriptText(OVERLORD_SAY_5, me);
return 500;
break;
case 22:
Illi->SetVisible(false);
Illi->setDeathState(JUST_DIED);
return 1000; break;
case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); return 2000; break;
case 24: me->SetTarget(PlayerGUID); return 5000; break;
case 25: DoScriptText(OVERLORD_SAY_6, me); return 2000; break;
return 1000;
break;
case 23:
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
return 2000;
break;
case 24:
me->SetTarget(PlayerGUID);
return 5000;
break;
case 25:
DoScriptText(OVERLORD_SAY_6, me);
return 2000;
break;
case 26:
if (player)
CAST_PLR(player)->GroupEventHappens(QUEST_LORD_ILLIDAN_STORMRAGE, me);
return 6000; break;
return 6000;
break;
case 27:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->SetTarget(PlayerGUID);
return 500; }
break;
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->SetTarget(PlayerGUID);
return 500;
}
break;
case 28:
player->RemoveAurasDueToSpell(SPELL_TWO);
player->RemoveAurasDueToSpell(41519);
player->CastSpell(player, SPELL_THREE, true);
player->CastSpell(player, SPELL_FOUR, true);
return 1000; break;
return 1000;
break;
case 29:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
DoScriptText(YARZILL_THE_MERC_SAY, Yarzill, player);
return 5000; }
break;
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
DoScriptText(YARZILL_THE_MERC_SAY, Yarzill, player);
return 5000;
}
break;
case 30:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->SetTarget(0);
return 5000; }
break;
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->SetTarget(0);
return 5000;
}
break;
case 31:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->CastSpell(player, 41540, true);
return 1000;}
break;
case 32: me->GetMotionMaster()->MovePoint(0, -5085.77f, 577.231f, 86.6719f); return 5000; break;
case 33: Reset(); return 100; break;
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->CastSpell(player, 41540, true);
return 1000;
}
break;
default : return 0;
case 32:
me->GetMotionMaster()->MovePoint(0, -5085.77f, 577.231f, 86.6719f); return 5000;
break;
case 33:
Reset();
return 100;
break;
default :
return 0;
break;
}
}
@@ -871,9 +987,7 @@ public:
if (ConversationTimer <= diff)
{
if (Event && IllidanGUID && PlayerGUID)
{
ConversationTimer = NextStep(++Step);
}
} else ConversationTimer -= diff;
}
};
src/server/scripts/World/item_scripts.cpp
+2 -2
View File
@@ -150,6 +150,7 @@ class item_mysterious_egg : public ItemScript
{
public:
item_mysterious_egg() : ItemScript("item_mysterious_egg") { }
bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/)
{
ItemPosCountVec dest;
@@ -335,8 +336,7 @@ public:
if (player->GetQuestStatus(QUEST_CANNOT_HELP_THEMSELVES) != QUEST_STATUS_INCOMPLETE)
return false;
Creature* pMammoth;
pMammoth = player->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF, 5.0f);
Creature* pMammoth = player->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF, 5.0f);
if (!pMammoth)
return false;