nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-24 22:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(SAI/Script): Move Lady Jaina Proudmoore to SAI. (#9426)

Browse Source
This commit is contained in:
Malcrom
2021-12-06 04:47:51 -04:00
committed by GitHub
parent 16cac81e5a
commit 34fa817e6b
2 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
data/sql/updates/pending_db_world/rev_1638293367351399374.sql Normal file
View File

@@ -0,0 +1,33 @@
INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1638293367351399374');
-- SAI from TC for Lady Jaina Proudmoore
UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=4968;
DELETE FROM `smart_scripts` WHERE `entryorguid`=4968 AND `source_type`=0;
DELETE FROM `smart_scripts` WHERE `entryorguid`=496800 AND `source_type`=9;
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
(4968,0,0,0,4,0,100,0,0,0,0,0,0,4,5882,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Aggro - Play Sound 5882'),
(4968,0,1,0,0,0,100,0,0,0,2000,3500,0,11,20692,64,0,0,0,0,2,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - In Combat - Cast \'Fireball\''),
(4968,0,2,0,0,0,100,0,4000,5000,45000,55000,0,11,20681,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - In Combat - Cast \'Summon Water Elementals\''),
(4968,0,3,0,0,0,100,0,5000,9000,15000,17000,0,11,20679,0,0,0,0,0,2,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - In Combat - Cast \'Fire Blast\''),
(4968,0,4,0,0,0,100,0,8000,12000,25000,28000,0,11,20680,0,0,0,0,0,4,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - In Combat - Cast \'Blizzard\''),
(4968,0,5,0,2,0,100,0,0,50,14000,21000,0,11,20682,0,0,0,0,0,2,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - Between 0-50% Health - Cast \'Teleport\''),
(4968,0,6,0,20,0,100,0,11142,0,0,0,0,80,496800,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Quest \'Survey Alcaz Island\' Finished - Run Script'),
(4968,0,7,8,62,0,100,0,2465,0,0,0,0,11,23122,0,0,0,0,0,7,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Gossip Option 0 Selected - Cast \'Jaina\'s Autograph\''),
(4968,0,8,0,61,0,100,0,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Gossip Option 0 Selected - Close Gossip'),
(496800,9,0,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Script - Set Orientation Invoker'),
(496800,9,1,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Script - Remove Npc Flag Questgiver'),
(496800,9,2,0,0,0,100,0,2000,2000,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Script - Say Line 0'),
(496800,9,3,0,0,0,100,0,5000,5000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Script - Say Line 1'),
(496800,9,4,0,0,0,100,0,6000,6000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Script - Say Line 2'),
(496800,9,5,0,0,0,100,0,6000,6000,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Script - Say Line 3'),
(496800,9,6,0,0,0,100,0,7000,7000,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Script - Say Line 4'),
(496800,9,7,0,0,0,100,0,6000,6000,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Script - Say Line 5'),
(496800,9,8,0,0,0,100,0,4000,4000,0,0,0,5,5,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Script - Play Emote 5'),
(496800,9,9,0,0,0,100,0,6000,6000,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,'Lady Jaina Proudmoore - On Script - Add Npc Flag Questgiver');
-- Condition for Lady Jaina Proudmoore gossip
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=2465 AND `SourceEntry`=3158 AND `SourceId`=0;
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=2465 AND `SourceEntry`=0 AND `SourceId`=0;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(14,2465,3158,0,0,8,0,1267,0,0,0,0,0,'','Lady Jaina Proudmoore Shows gossip text 3158 if quest \'The Missing Diplomat (Part 17)\' is rewarded'),
(15,2465,0,0,0,47,0,558,10,0,0,0,0,'','Lady Jaina Proudmoore Shows gossip option 2465 if player has quest Jaina\'s Autograph');

46
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
View File

@@ -18,12 +18,11 @@
/* ScriptData
SDName: Dustwallow_Marsh
SD%Complete: 95
SDComment: Quest support: 11180, 558, 11126, 11142, 11174, Vendor Nat Pagle
SDComment: Quest support: 11180, 11126, 11174, Vendor Nat Pagle
SDCategory: Dustwallow Marsh
EndScriptData */
/* ContentData
npc_lady_jaina_proudmoore
npc_nat_pagle
npc_cassa_crimsonwing - handled by npc_taxi
EndContentData */
@@ -35,48 +34,6 @@ EndContentData */
#include "SpellScript.h"
#include "WorldSession.h"
/*######
## npc_lady_jaina_proudmoore
######*/
enum LadyJaina
{
QUEST_JAINAS_AUTOGRAPH = 558,
SPELL_JAINAS_AUTOGRAPH = 23122
};
#define GOSSIP_ITEM_JAINA "I know this is rather silly but i have a young ward who is a bit shy and would like your autograph."
class npc_lady_jaina_proudmoore : public CreatureScript
{
public:
npc_lady_jaina_proudmoore() : CreatureScript("npc_lady_jaina_proudmoore") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override
{
ClearGossipMenuFor(player);
if (action == GOSSIP_SENDER_INFO)
{
SendGossipMenuFor(player, 7012, creature->GetGUID());
player->CastSpell(player, SPELL_JAINAS_AUTOGRAPH, false);
}
return true;
}
bool OnGossipHello(Player* player, Creature* creature) override
{
if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (player->GetQuestStatus(QUEST_JAINAS_AUTOGRAPH) == QUEST_STATUS_INCOMPLETE)
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
SendGossipMenuFor(player, player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
};
/*######
## npc_nat_pagle
######*/
@@ -328,7 +285,6 @@ public:
void AddSC_dustwallow_marsh()
{
new npc_lady_jaina_proudmoore();
new npc_nat_pagle();
new npc_zelfrax();
new spell_ooze_zap();