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

Core/DB: Utgarde Keep - Corrections

Browse Source
This commit is contained in:
Gacko
2012-11-10 17:52:23 +01:00
parent cc0842f46b
commit a2748fde4b
3 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
sql/updates/world/2012_09_22_00_world_utgarde.sql
View File

@@ -102,42 +102,3 @@ INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`)
INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`)
SELECT `guid`*10,2,`position_x`,`position_y`,`position_z` FROM `creature` WHERE `guid` IN (125940,125934,125915,125920,125914,125936,125937,125922);
-- Areatrigger script
DELETE FROM `areatrigger_scripts` WHERE `entry`=4838;
INSERT INTO `areatrigger_scripts`(`entry`,`ScriptName`) VALUES
(4838,'SmartTrigger');
DELETE FROM `smart_scripts` WHERE `entryorguid`=4838 AND `source_type`=2;
INSERT INTO `smart_scripts`(`entryorguid`,`source_type`,`event_type`,`event_param1`,`action_type`,`action_param1`,`action_param2`,`target_type`,`target_param1`,`comment`) VALUES
(4838,2,46,4838,45,28,6,10,125946,'Areatrigger in Utgarde Keep near Ingvar - On trigger - Set data of Enslaved Proto Drake');
-- Template updates for proto drake and rider
UPDATE `creature_template` SET `AIName`='',`ScriptName`='npc_enslaved_proto_drake' WHERE `entry`=24083; -- Proto drake non heroic
UPDATE `creature_template` SET `InhabitType`=3 WHERE `entry` IN (24849,31676); -- Proto drake rider
-- Waypoints for core script
DELETE FROM `waypoint_data` WHERE `id`=125946;
INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`,`move_flag`) VALUES
(125946,1,210.92,-185.92,203.729,1),
(125946,2,215.397,-181.239,205.773,1),
(125946,3,219.674,-176.469,202.97,1),
(125946,4,223.183,-172.761,200.058,1),
(125946,5,228.007,-168.952,196.713,1),
(125946,6,230.514,-167.104,195.116,1),
(125946,7,235.687,-163.455,192.13,1),
(125946,8,239.569,-161.025,190.346,1);
-- Mount the rider to the drake
DELETE FROM `vehicle_template_accessory` WHERE `entry`=24083;
INSERT INTO `vehicle_template_accessory`(`entry`,`accessory_entry`,`seat_id`,`minion`,`description`,`summontype`,`summontimer`) VALUES
(24083,24849,0,0,'Proto Drake Rider mounted to Enslaved Proto Drake',6,30000);
-- Create required spellclick information
DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=24083;
INSERT INTO `npc_spellclick_spells`(`npc_entry`,`spell_id`,`cast_flags`) VALUES
(24083,55074,1);
-- Remove no longer needed data
DELETE FROM `creature` WHERE `guid`=125912 AND `map`=574 AND `id`=24849;
DELETE FROM `creature_ai_scripts` WHERE `creature_id`=24083;

38
sql/updates/world/2012_11_10_00_world_utgarde.sql Normal file
View File

@@ -0,0 +1,38 @@
-- Areatrigger script
DELETE FROM `areatrigger_scripts` WHERE `entry`=4838;
INSERT INTO `areatrigger_scripts`(`entry`,`ScriptName`) VALUES
(4838,'SmartTrigger');
DELETE FROM `smart_scripts` WHERE `entryorguid`=4838 AND `source_type`=2;
INSERT INTO `smart_scripts`(`entryorguid`,`source_type`,`event_type`,`event_param1`,`action_type`,`action_param1`,`action_param2`,`target_type`,`target_param1`,`comment`) VALUES
(4838,2,46,4838,45,28,6,10,125946,'Areatrigger in Utgarde Keep near Ingvar - On trigger - Set data of Enslaved Proto Drake');
-- Template updates for proto drake and rider
UPDATE `creature_template` SET `AIName`='',`ScriptName`='npc_enslaved_proto_drake' WHERE `entry`=24083; -- Proto drake non heroic
UPDATE `creature_template` SET `InhabitType`=3 WHERE `entry` IN (24849,31676); -- Proto drake rider
-- Waypoints for core script
DELETE FROM `waypoint_data` WHERE `id`=125946;
INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`,`move_flag`) VALUES
(125946,1,210.92,-185.92,203.729,1),
(125946,2,215.397,-181.239,205.773,1),
(125946,3,219.674,-176.469,202.97,1),
(125946,4,223.183,-172.761,200.058,1),
(125946,5,228.007,-168.952,196.713,1),
(125946,6,230.514,-167.104,195.116,1),
(125946,7,235.687,-163.455,192.13,1),
(125946,8,239.569,-161.025,190.346,1);
-- Mount the rider to the drake
DELETE FROM `vehicle_template_accessory` WHERE `entry`=24083;
INSERT INTO `vehicle_template_accessory`(`entry`,`accessory_entry`,`seat_id`,`minion`,`description`,`summontype`,`summontimer`) VALUES
(24083,24849,0,0,'Proto Drake Rider mounted to Enslaved Proto Drake',6,30000);
-- Create required spellclick information
DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=24083;
INSERT INTO `npc_spellclick_spells`(`npc_entry`,`spell_id`,`cast_flags`) VALUES
(24083,55074,1);
-- Remove no longer needed data
DELETE FROM `creature` WHERE `guid`=125912 AND `map`=574 AND `id`=24849;
DELETE FROM `creature_ai_scripts` WHERE `creature_id`=24083;

32
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
View File

@@ -146,7 +146,7 @@ public:
return near_f > 0 && near_f < 4 ? near_f : 0;
}
void UpdateAI(const uint32 /*diff*/)
void UpdateAI(uint32 const /* diff */)
{
if (fm_Type == 0)
fm_Type = GetForgeMasterType();
@@ -259,51 +259,51 @@ public:
{
npc_enslaved_proto_drakeAI(Creature* creature) : ScriptedAI(creature)
{
setData = false;
_setData = false;
}
void Reset()
{
events.Reset();
events.ScheduleEvent(EVENT_REND, urand(2000, 3000));
events.ScheduleEvent(EVENT_FLAME_BREATH, urand(5500, 7000));
events.ScheduleEvent(EVENT_KNOCKAWAY, urand(3500, 6000));
_events.Reset();
_events.ScheduleEvent(EVENT_REND, urand(2000, 3000));
_events.ScheduleEvent(EVENT_FLAME_BREATH, urand(5500, 7000));
_events.ScheduleEvent(EVENT_KNOCKAWAY, urand(3500, 6000));
}
void SetData(uint32 type, uint32 data)
{
if (type == TYPE_PROTODRAKE_AT && data == DATA_PROTODRAKE_MOVE && !setData && me->GetDistance(protodrakeCheckPos) < 5.0f)
if (type == TYPE_PROTODRAKE_AT && data == DATA_PROTODRAKE_MOVE && !_setData && me->GetDistance(protodrakeCheckPos) < 5.0f)
{
setData = true;
_setData = true;
me->GetMotionMaster()->MovePath(PATH_PROTODRAKE, false);
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 const diff)
{
if (!UpdateVictim())
return;
events.Update(diff);
_events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
while (uint32 eventid = events.ExecuteEvent())
while (uint32 eventid = _events.ExecuteEvent())
{
switch (eventid)
{
case EVENT_REND:
DoCast(SPELL_REND);
events.ScheduleEvent(EVENT_REND, urand(15000, 20000));
_events.ScheduleEvent(EVENT_REND, urand(15000, 20000));
break;
case EVENT_FLAME_BREATH:
DoCast(SPELL_FLAME_BREATH);
events.ScheduleEvent(EVENT_FLAME_BREATH, urand(11000, 12000));
_events.ScheduleEvent(EVENT_FLAME_BREATH, urand(11000, 12000));
break;
case EVENT_KNOCKAWAY:
DoCast(SPELL_KNOCK_AWAY);
events.ScheduleEvent(EVENT_KNOCKAWAY, urand(7000, 8500));
_events.ScheduleEvent(EVENT_KNOCKAWAY, urand(7000, 8500));
break;
default:
break;
@@ -314,8 +314,8 @@ public:
}
private:
bool setData;
EventMap events;
bool _setData;
EventMap _events;
};