Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 04:12:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripting/Storm Peaks: Renamed npc_brann_bronzebeard script because name has already been used.

Browse Source
This commit is contained in:
Malcrom
2013-12-10 00:11:33 -03:30
parent 6af40a28b1
commit 74facef60d
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/2013_12_09_04_world_creature_template.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `creature_template` SET ScriptName = 'npc_brann_bronzebeard_keystone' WHERE `entry`=31810;

27
src/server/scripts/Northrend/zone_storm_peaks.cpp
View File

@@ -452,14 +452,14 @@ enum BrannBronzebeard
EVENT_SCRIPT_13 = 13
};
class npc_brann_bronzebeard : public CreatureScript
class npc_brann_bronzebeard_keystone : public CreatureScript
{
public:
npc_brann_bronzebeard() : CreatureScript("npc_brann_bronzebeard") { }
npc_brann_bronzebeard_keystone() : CreatureScript("npc_brann_bronzebeard_keystone") { }
struct npc_brann_bronzebeardAI : public ScriptedAI
struct npc_brann_bronzebeard_keystoneAI : public ScriptedAI
{
npc_brann_bronzebeardAI(Creature* creature) : ScriptedAI(creature) { }
npc_brann_bronzebeard_keystoneAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE
{
@@ -584,7 +584,7 @@ public:
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_brann_bronzebeardAI(creature);
return new npc_brann_bronzebeard_keystoneAI(creature);
}
};
@@ -643,6 +643,10 @@ enum JokkumScriptcast
{
SPELL_JOKKUM_KILL_CREDIT = 56545,
SPELL_JOKKUM_SUMMON = 56541,
SPELL_RIDE_JOKKUM = 56606,
NPC_KINGJOKKUM = 30331,
SAY_HOLD_ON = 0,
PATH_JOKKUM = 2072200
};
class spell_jokkum_scriptcast : public SpellScriptLoader
@@ -666,6 +670,17 @@ class spell_jokkum_scriptcast : public SpellScriptLoader
{
player->CastSpell(player, SPELL_JOKKUM_KILL_CREDIT, true);
player->CastSpell(player, SPELL_JOKKUM_SUMMON, true);
if (Creature* kingjokkum = GetClosestCreatureWithEntry(player, NPC_KINGJOKKUM, 10.0f))
{
kingjokkum->setFaction(player->getFaction());
player->CastSpell(kingjokkum, SPELL_RIDE_JOKKUM, true);
player->SetUInt64Value(PLAYER_FARSIGHT, player->GetGUID());
kingjokkum->AI()->Talk(0, player->GetGUID());
kingjokkum->ToPlayer()->SetClientControl(kingjokkum, 1);
kingjokkum->GetMotionMaster()->MovePath(PATH_JOKKUM, false);
kingjokkum->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
}
}
}
@@ -689,7 +704,7 @@ void AddSC_storm_peaks()
new npc_freed_protodrake();
new npc_icefang();
new npc_hyldsmeet_protodrake();
new npc_brann_bronzebeard();
new npc_brann_bronzebeard_keystone();
new spell_close_rift();
new spell_jokkum_scriptcast();
}