aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/updates/world/2015_10_30_30_world_2015_09_21_09.sql95
-rw-r--r--sql/updates/world/2015_10_30_30_world_2015_09_21_10.sql (renamed from sql/updates/world/2015_10_30_31_world_2015_09_21_10.sql)0
-rw-r--r--src/server/scripts/World/npcs_special.cpp69
3 files changed, 1 insertions, 163 deletions
diff --git a/sql/updates/world/2015_10_30_30_world_2015_09_21_09.sql b/sql/updates/world/2015_10_30_30_world_2015_09_21_09.sql
deleted file mode 100644
index 0736c60db89..00000000000
--- a/sql/updates/world/2015_10_30_30_world_2015_09_21_09.sql
+++ /dev/null
@@ -1,95 +0,0 @@
---
-UPDATE `creature_template` SET `npcflag`=4194305 WHERE `entry`=9988;
-UPDATE `conditions` SET `ConditionValue1` =4 WHERE `SourceGroup`=9576 AND `SourceTypeOrReferenceId`=15;
-UPDATE `creature_template` SET `npcflag`=4194305 WHERE `npcflag`=4194304 ;
-UPDATE `creature_template` SET `npcflag`=4194307 WHERE `npcflag`=4194306 ;
-UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry` IN (9976,9978,9979,9982,9985,9986,10048,10049,10051,10052,10057,10058,11105,13616,15131,16094,16586,16656,16824,17896,18984,19018,21336,21517,22469,9896,19325,22551,22577,23392,24905,24974,25037,25519,29251,30155,31991,32105,35290);
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14) AND `SourceGroup`=9821;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`, `NegativeCondition`) VALUES
-(14, 9821, 13557, 0, 15, 4, 0, 0, 0, '', 'Show gossip text if player is a hunter', 0),
-(14, 9821, 13584, 0, 15, 4, 0, 0, 0, '', 'Show gossip text if player is not a hunter', 1);
-
-UPDATE `gossip_menu_option` SET `option_id`=1, `npc_option_npcflag`=1, `action_menu_id`=9820 WHERE `menu_id`=9821 AND `id`=1;
-
-DELETE FROM `gossip_menu` WHERE `entry`=11971 AND `text_id`=16788;
-INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (11971,16788);
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14) AND `SourceGroup`=11971;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`, `NegativeCondition`) VALUES
-(14, 11971, 16788, 0, 15, 4, 0, 0, 0, '', 'Show gossip text if player is a hunter', 0),
-(14, 11971, 16789, 0, 15, 4, 0, 0, 0, '', 'Show gossip text if player is not a hunter', 1);
-
-DELETE FROM `npc_text` WHERE id=16788;
-INSERT INTO `npc_text` (`ID`, `BroadcastTextID0`, `Probability0`) VALUES
-(16788, 45395, 1);
-
-DELETE FROM `gossip_menu_option` WHERE `menu_id` = 11971;
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`OptionBroadcastTextID`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`,`BoxBroadcastTextID`) VALUES
-(11971,0,0,'I''d like to stable my pet here.',30181,14,4194304,0,0,0,0,'',0),
-(11971,1,1,'I''m looking for a lost companion.',56613,1,1,9820,0,0,0,'',0);
-
-DELETE FROM `gossip_menu` WHERE `entry`=9864 AND `text_id`=13662;
-INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (9864,13662);
-
-UPDATE `npc_text` SET `BroadcastTextID0`=30667 WHERE `ID`=13662;
-
-DELETE FROM `gossip_menu_option` WHERE `menu_id` = 9864;
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`OptionBroadcastTextID`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`,`BoxBroadcastTextID`) VALUES
-(9864,0,0,'I''d like to stable my pet here.',30181,14,4194304,0,0,0,0,'',0),
-(9864,1,1,'I''m looking for a lost companion.',56613,1,1,9820,0,0,0,'',0);
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14) AND `SourceGroup`=9864;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`, `NegativeCondition`) VALUES
-(14, 9864, 13662, 0, 15, 4, 0, 0, 0, '', 'Show gossip text if player is a hunter', 0),
-(14, 9864, 13661, 0, 15, 4, 0, 0, 0, '', 'Show gossip text if player is not a hunter', 1);
-
-DELETE FROM `gossip_menu_option` WHERE `menu_id` = 9212 AND `id`=1;
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`OptionBroadcastTextID`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`,`BoxBroadcastTextID`) VALUES
-(9212,1,0,'I''d like to stable my pet here.',30181,14,4194304,0,0,0,0,'',0);
-
-DELETE FROM `gossip_menu` WHERE `entry`=9820 AND `text_id`=13584;
-INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (9820,13584);
-
-DELETE FROM `gossip_menu_option` WHERE `menu_id` = 9820;
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`OptionBroadcastTextID`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`,`BoxBroadcastTextID`) VALUES
-(9820,0,0,'I''ve lost Miniwing.',30182,1,1,0,0,0,0,'',0),
-(9820,1,0,'I''ve lost my Jubling.',30183,1,1,0,0,0,0,'',0),
-(9820,2,0,'I''ve lost my sprite darter hatchling.',30192,1,1,0,0,0,0,'',0),
-(9820,3,0,'I''ve lost my worg pup.',30196,1,1,0,0,0,0,'',0),
-(9820,4,0,'I''ve lost my Smolderweb hatchling.',30197,1,1,0,0,0,0,'',0),
-(9820,5,0,'I''ve lost my Prairie Chicken.',30217,1,1,0,0,0,0,'',0),
-(9820,6,0,'I''ve lost my wolpertinger.',30224,1,1,0,0,0,0,'',0);
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup`=9820;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`, `NegativeCondition`) VALUES
-(15, 9820, 0, 0, 8, 10898, 0, 0, 0, '', 'Show the gossip option if the player rewarded the quest', 0),
-(15, 9820, 0, 0, 2, 31760, 1, 1, 0, '', 'Show the gossip option if the player Didn''t have the item', 1),
-(15, 9820, 0, 0, 25, 39181, 0, 0, 0, '', 'Show the gossip option if the player Didn''t lear the spell', 1),
-(15, 9820, 1, 0, 8, 7946, 0, 0, 0, '', 'Show the gossip option if the player rewarded the quest', 0),
-(15, 9820, 1, 0, 2, 19450, 1, 1, 0, '', 'Show the gossip option if the player Didn''t have the item', 1),
-(15, 9820, 1, 0, 2, 19462, 1, 1, 0, '', 'Show the gossip option if the player Didn''t have the item', 1),
-(15, 9820, 1, 0, 25, 23811, 0, 0, 0, '', 'Show the gossip option if the player Didn''t lear the spell', 1),
-(15, 9820, 2, 0, 8, 4298, 0, 0, 0, '', 'Show the gossip option if the player rewarded the quest', 0),
-(15, 9820, 2, 0, 2, 11474, 1, 1, 0, '', 'Show the gossip option if the player Didn''t have the item', 1),
-(15, 9820, 2, 0, 25, 15067, 0, 0, 0, '', 'Show the gossip option if the player Didn''t lear the spell', 1),
-(15, 9820, 3, 0, 8, 4729, 0, 0, 0, '', 'Show the gossip option if the player rewarded the quest', 0),
-(15, 9820, 3, 0, 2, 12264, 1, 1, 0, '', 'Show the gossip option if the player Didn''t have the item', 1),
-(15, 9820, 3, 0, 25, 15999, 0, 0, 0, '', 'Show the gossip option if the player Didn''t lear the spell', 1),
-(15, 9820, 4, 0, 8, 4862, 0, 0, 0, '', 'Show the gossip option if the player rewarded the quest', 0),
-(15, 9820, 4, 0, 2, 12529, 1, 1, 0, '', 'Show the gossip option if the player Didn''t have the item', 1),
-(15, 9820, 4, 0, 25, 16450, 0, 0, 0, '', 'Show the gossip option if the player Didn''t lear the spell', 1),
-(15, 9820, 5, 0, 8, 3861, 0, 0, 0, '', 'Show the gossip option if the player rewarded the quest', 0),
-(15, 9820, 5, 0, 2, 11110, 1, 1, 0, '', 'Show the gossip option if the player Didn''t have the item', 1),
-(15, 9820, 5, 0, 25, 13548, 0, 0, 0, '', 'Show the gossip option if the player Didn''t lear the spell', 1),
-(15, 9820, 5, 1, 8, 13840, 0, 0, 0, '', 'Show the gossip option if the player rewarded the quest', 0),
-(15, 9820, 5, 1, 2, 11110, 1, 1, 0, '', 'Show the gossip option if the player Didn''t have the item', 1),
-(15, 9820, 5, 1, 25, 13548, 0, 0, 0, '', 'Show the gossip option if the player Didn''t lear the spell', 1),
-(15, 9820, 6, 0, 8, 11117, 0, 0, 0, '', 'Show the gossip option if the player rewarded the quest', 0),
-(15, 9820, 6, 0, 2, 32233, 1, 1, 0, '', 'Show the gossip option if the player Didn''t have the item', 1),
-(15, 9820, 6, 0, 25, 39709, 0, 0, 0, '', 'Show the gossip option if the player Didn''t lear the spell', 1),
-(15, 9820, 6, 1, 8, 11431, 0, 0, 0, '', 'Show the gossip option if the player rewarded the quest', 0),
-(15, 9820, 6, 1, 2, 32233, 1, 1, 0, '', 'Show the gossip option if the player Didn''t have the item', 1),
-(15, 9820, 6, 1, 25, 39709, 0, 0, 0, '', 'Show the gossip option if the player Didn''t lear the spell', 1);
-
-UPDATE `creature_template` SET `ScriptName`="npc_stable_master" WHERE `entry` IN (10052, 9978, 33854, 16764, 9986, 9987, 9989, 10045, 10046, 10047, 10048, 10049, 10050, 10051, 10053, 10054, 10055, 10056, 10057, 10058, 10059, 10060, 10061, 10062, 10063, 10085, 11069, 11104, 11105, 11117, 11119, 13616, 9983, 9982, 15131, 9981, 16094, 16185, 9985, 16656, 9980, 16824, 17485, 17666, 17896, 18244, 18250, 18984, 19018, 9979, 19368, 19476, 21336, 21517, 21518, 22468, 22469, 9896, 19325, 23392, 24905, 24974, 25037, 27010, 27385, 24066, 24067, 24154, 24350, 25519, 9977, 16586, 9976, 26597, 26721, 9984, 6749, 27056, 27065, 27068, 27150, 27183, 27194, 27948, 28057, 28690, 28790, 29250, 29251, 29658, 29740, 29906, 29948, 29959, 29967, 35344, 30039, 30155, 30304, 35290, 35291, 30008, 9988);
diff --git a/sql/updates/world/2015_10_30_31_world_2015_09_21_10.sql b/sql/updates/world/2015_10_30_30_world_2015_09_21_10.sql
index e7938cdf352..e7938cdf352 100644
--- a/sql/updates/world/2015_10_30_31_world_2015_09_21_10.sql
+++ b/sql/updates/world/2015_10_30_30_world_2015_09_21_10.sql
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index db1785748de..e72e094ea06 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -53,11 +53,10 @@ EndContentData */
#include "GridNotifiersImpl.h"
#include "Cell.h"
#include "CellImpl.h"
-#include "SpellHistory.h"
#include "SpellAuras.h"
#include "Pet.h"
#include "CreatureTextMgr.h"
-#include "SmartAI.h"
+#include "SpellHistory.h"
/*########
# npc_air_force_bots
@@ -2324,71 +2323,6 @@ public:
}
};
-enum StableMasters
-{
- SPELL_MINIWING = 54573,
- SPELL_JUBLING = 54611,
- SPELL_DARTER = 54619,
- SPELL_WORG = 54631,
- SPELL_SMOLDERWEB = 54634,
- SPELL_CHIKEN = 54677,
- SPELL_WOLPERTINGER = 54688,
-
- STABLE_MASTER_GOSSIP_SUB_MENU = 9820
-};
-
-class npc_stable_master : public CreatureScript
-{
- public:
- npc_stable_master() : CreatureScript("npc_stable_master") { }
-
- struct npc_stable_masterAI : public SmartAI
- {
- npc_stable_masterAI(Creature* creature) : SmartAI(creature) { }
-
- void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
- {
- SmartAI::sGossipSelect(player, menuId, gossipListId);
- if (menuId != STABLE_MASTER_GOSSIP_SUB_MENU)
- return;
-
- switch (gossipListId)
- {
- case 0:
- player->CastSpell(player, SPELL_MINIWING, false);
- break;
- case 1:
- player->CastSpell(player, SPELL_JUBLING, false);
- break;
- case 2:
- player->CastSpell(player, SPELL_DARTER, false);
- break;
- case 3:
- player->CastSpell(player, SPELL_WORG, false);
- break;
- case 4:
- player->CastSpell(player, SPELL_SMOLDERWEB, false);
- break;
- case 5:
- player->CastSpell(player, SPELL_CHIKEN, false);
- break;
- case 6:
- player->CastSpell(player, SPELL_WOLPERTINGER, false);
- break;
- default:
- return;
- }
-
- player->PlayerTalkClass->SendCloseGossip();
- }
- };
-
- CreatureAI* GetAI(Creature* creature) const override
- {
- return new npc_stable_masterAI(creature);
- }
-};
-
void AddSC_npcs_special()
{
new npc_air_force_bots();
@@ -2411,5 +2345,4 @@ void AddSC_npcs_special()
new npc_firework();
new npc_spring_rabbit();
new npc_imp_in_a_ball();
- new npc_stable_master();
}