aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroffl <offl@users.noreply.github.com>2020-06-26 22:40:13 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-19 20:54:24 +0100
commit306e08cc31178fc17dd61e60039bc604d16f73ff (patch)
tree6d37dcf9ccb29bbee86de9961d1296e94e2d4719
parente6f5cfcd23e4ffe7ccc0b86df9de83d522fe69c3 (diff)
DB/Quest: Convert & update support for 'Scratches' to SAI
Closes #24824 (cherry picked from commit d526d5d1765a6468d9acb585b3e60c08352edf55)
-rw-r--r--sql/updates/world/master/2022_01_19_01_world_2020_06_26_08_world.sql34
-rw-r--r--src/server/scripts/Outland/zone_blades_edge_mountains.cpp51
2 files changed, 35 insertions, 50 deletions
diff --git a/sql/updates/world/master/2022_01_19_01_world_2020_06_26_08_world.sql b/sql/updates/world/master/2022_01_19_01_world_2020_06_26_08_world.sql
new file mode 100644
index 00000000000..440ddbddbb7
--- /dev/null
+++ b/sql/updates/world/master/2022_01_19_01_world_2020_06_26_08_world.sql
@@ -0,0 +1,34 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4546 AND `source_type` = 2;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4546,2,0,1,46,0,100,0,4546,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Sylvanaar) - On Trigger - Store Targetlist"),
+(4546,2,1,2,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,21469,0,0,0,0,0,0,0,"Areatrigger (Sylvanaar) - On Link - Send Target 1 (Daranelle)"),
+(4546,2,2,0,61,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,21469,0,0,0,0,0,0,0,"Areatrigger (Sylvanaar) - On Link - Set Data 0 1 (Daranelle)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4546;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4546,"SmartTrigger");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4546 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,4546,2,0,1,0,36904,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if player does have aura 'Lashh'an Channeling'"),
+-- Nothing will happen without the guardian https://youtu.be/ckevGJXt-sk?t=45
+(22,1,4546,2,0,29,0,21468,20,0,0,0,0,"","Group 0: Execute SAI (Action 0) if creature 'Kaliri Totem' is near");
+
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = 21469;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 21469 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(21469,0,0,1,38,0,100,0,0,1,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Daranelle - On Data Set 0 1 - Say Line 0"),
+(21469,0,1,2,61,0,100,0,0,0,0,0,0,11,37028,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Daranelle - On Link - Cast 'Dispelling Analysis'"),
+(21469,0,2,0,61,0,100,0,0,0,0,0,0,11,37013,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daranelle - On Link - Cast 'Despawn Kaliri Totem'");
+
+-- Spawned only by Effect 2 (Spell 36904)
+DELETE FROM `event_scripts` WHERE `id` = 12890;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 37013;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,37013,0,0,31,0,3,21468,0,0,0,0,"","Group 0: Spell 'Despawn Kaliri Totem' targets creature 'Kaliri Totem'");
+
+DELETE FROM `spell_scripts` WHERE `id` = 37013;
+INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(37013,0,0,18,1000,0,0,0,0,0,0);
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index 05bea7679df..d9b011ba098 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -18,13 +18,12 @@
/* ScriptData
SDName: Blades_Edge_Mountains
SD%Complete: 90
-SDComment: Quest support: 10503, 10504, 10556, 10594, 10609, 10821. Ogri'la->Skettis Flight. (npc_daranelle needs bit more work before consider complete)
+SDComment: Quest support: 10503, 10504, 10594, 10609, 10821. Ogri'la->Skettis Flight.
SDCategory: Blade's Edge Mountains
EndScriptData */
/* ContentData
npc_nether_drake
-npc_daranelle
go_legion_obelisk
EndContentData */
@@ -231,53 +230,6 @@ public:
}
};
-/*######
-## npc_daranelle
-######*/
-
-enum Daranelle
-{
- SAY_SPELL_INFLUENCE = 0,
- SPELL_LASHHAN_CHANNEL = 36904,
- SPELL_DISPELLING_ANALYSIS = 37028
-};
-
-class npc_daranelle : public CreatureScript
-{
-public:
- npc_daranelle() : CreatureScript("npc_daranelle") { }
-
- struct npc_daranelleAI : public ScriptedAI
- {
- npc_daranelleAI(Creature* creature) : ScriptedAI(creature) { }
-
- void Reset() override { }
-
- void JustEngagedWith(Unit* /*who*/) override { }
-
- void MoveInLineOfSight(Unit* who) override
-
- {
- if (who->GetTypeId() == TYPEID_PLAYER)
- {
- if (who->HasAura(SPELL_LASHHAN_CHANNEL) && me->IsWithinDistInMap(who, 10.0f))
- {
- Talk(SAY_SPELL_INFLUENCE, who);
- /// @todo Move the below to updateAI and run if this statement == true
- DoCast(who, SPELL_DISPELLING_ANALYSIS, true);
- }
- }
-
- ScriptedAI::MoveInLineOfSight(who);
- }
- };
-
- CreatureAI* GetAI(Creature* creature) const override
- {
- return new npc_daranelleAI(creature);
- }
-};
-
//Support for quest: You're Fired! (10821)
bool obelisk_one, obelisk_two, obelisk_three, obelisk_four, obelisk_five;
@@ -1062,7 +1014,6 @@ class spell_oscillating_field : public SpellScriptLoader
void AddSC_blades_edge_mountains()
{
new npc_nether_drake();
- new npc_daranelle();
new go_legion_obelisk();
new npc_simon_bunny();
new go_simon_cluster();