yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Script): Remove hardcoded Loch Modan texts (#3111)

Browse Source
This commit is contained in:
gengarshadowball
2020-08-02 20:45:16 +01:00
committed by GitHub
parent f56ef239de
commit e949ab27b7
4 changed files with 40 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
data/sql/updates/pending_db_world/rev_1591204377400264600.sql Normal file
View File

@@ -0,0 +1,40 @@
INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1591204377400264600');
-- Quest 3181 must not be taken for this gossip to take place
UPDATE `creature_template` SET `gossip_menu_id`=50000 , `ScriptName`='' WHERE `entry`=3836;
DELETE FROM `gossip_menu` WHERE `MenuID` IN (50000, 50001, 50002, 50003, 50004, 50005, 50006, 50007);
INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES
(50007, 1839),
(50006, 1838),
(50005, 1837),
(50004, 1836),
(50003, 1835),
(50002, 1834),
(50001, 1833),
(50000, 1833);
DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (50000, 50001, 50002, 50003, 50004, 50005, 50006);
INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES
(50003, 0, 0, "Doesn't matter, I'm invulnerable!", 0, 1, 1, 50004, 0, 0, 0, NULL, 0, 0),
(50004, 0, 0, "Yes...", 0, 1, 1, 50005, 0, 0, 0, NULL, 0, 0),
(50005, 0, 0, "Ok, I'll try to remember that.", 0, 1, 1, 50006, 0, 0, 0, NULL, 0, 0),
(50006, 0, 0, "A key? Ok!", 0, 1, 1, 0, 0, 0, 0, NULL, 0, 0),
(50002, 0, 0, "Ok, so what is this other way?", 0, 1, 1, 50003, 0, 0, 0, NULL, 0, 0),
(50001, 0, 0, "But I need to get there, now open the gate!", 0, 1, 1, 50002, 0, 0, 0, NULL, 0, 0),
(50000, 0, 0, "Open the gate please, I need to get to Searing Gorge", 0, 1, 1, 50001, 0, 0, 0, NULL, 0, 0),
(50000, 1, 0, "Umm... Pebblebitty... the gate is open.", 0, 1, 1, 50007, 0, 0, 0, NULL, 0, 0);
DELETE FROM `npc_text` WHERE `ID`=1839;
INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `Probability0`, `em0_0`, `em0_1`, `em0_2`, `em0_3`, `em0_4`, `em0_5`, `text1_0`, `text1_1`, `BroadcastTextID1`, `lang1`, `Probability1`, `em1_0`, `em1_1`, `em1_2`, `em1_3`, `em1_4`, `em1_5`, `text2_0`, `text2_1`, `BroadcastTextID2`, `lang2`, `Probability2`, `em2_0`, `em2_1`, `em2_2`, `em2_3`, `em2_4`, `em2_5`, `text3_0`, `text3_1`, `BroadcastTextID3`, `lang3`, `Probability3`, `em3_0`, `em3_1`, `em3_2`, `em3_3`, `em3_4`, `em3_5`, `text4_0`, `text4_1`, `BroadcastTextID4`, `lang4`, `Probability4`, `em4_0`, `em4_1`, `em4_2`, `em4_3`, `em4_4`, `em4_5`, `text5_0`, `text5_1`, `BroadcastTextID5`, `lang5`, `Probability5`, `em5_0`, `em5_1`, `em5_2`, `em5_3`, `em5_4`, `em5_5`, `text6_0`, `text6_1`, `BroadcastTextID6`, `lang6`, `Probability6`, `em6_0`, `em6_1`, `em6_2`, `em6_3`, `em6_4`, `em6_5`, `text7_0`, `text7_1`, `BroadcastTextID7`, `lang7`, `Probability7`, `em7_0`, `em7_1`, `em7_2`, `em7_3`, `em7_4`, `em7_5`, `VerifiedBuild`) VALUES
(1839, NULL, "Ahh... so it is, so it is. Carry on then. Carry on t'yer death.", 0, 0, 1, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
DELETE FROM `conditions` WHERE `SourceGroup`=50000 AND `SourceTypeOrReferenceId`=15;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(15, 50000, 0, 0, 0, 14, 0, 3181, 0, 0, 0, 0, 0, '', "Show Gossip 50000 if 'The Horn of the Beast' is rewarded AND"),
(15, 50000, 1, 0, 0, 8, 0, 3201, 0, 0, 0, 0, 0, '', "Show Gossip 50000 if 'At Last!' is not taken");
DELETE FROM `smart_scripts` WHERE `entryorguid`=3836 AND `source_type`=0 AND `id`=0 AND `link`=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
(3836, 0, 0, 0, 62, 0, 100, 0, 50006, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, "Mountaineer Pebblebitty - On Gossip Option 0 Selected - Close Gossip");

1
src/server/scripts/EasternKingdoms/CMakeLists.txt
View File

@@ -126,7 +126,6 @@ set(scripts_STAT_SRCS
${AC_SCRIPTS_DIR}/EasternKingdoms/zone_duskwood.cpp ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_duskwood.cpp
${AC_SCRIPTS_DIR}/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp ${AC_SCRIPTS_DIR}/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
${AC_SCRIPTS_DIR}/EasternKingdoms/zone_undercity.cpp ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_undercity.cpp
${AC_SCRIPTS_DIR}/EasternKingdoms/zone_loch_modan.cpp
${AC_SCRIPTS_DIR}/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp ${AC_SCRIPTS_DIR}/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
${AC_SCRIPTS_DIR}/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h ${AC_SCRIPTS_DIR}/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
${AC_SCRIPTS_DIR}/EasternKingdoms/zone_burning_steppes.cpp ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_burning_steppes.cpp

94
src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
View File

@@ -1,94 +0,0 @@
/*
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-GPL2
* Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*/
/* ScriptData
SDName: Loch_Modan
SD%Complete: 100
SDComment: Quest support: 3181
SDCategory: Loch Modan
EndScriptData */
/* ContentData
npc_mountaineer_pebblebitty
EndContentData */
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "ScriptedGossip.h"
#include "Player.h"
/*######
## npc_mountaineer_pebblebitty
######*/
#define GOSSIP_MP "Open the gate please, i need to get to Searing Gorge"
#define GOSSIP_MP1 "But i need to get there, now open the gate!"
#define GOSSIP_MP2 "Ok, so what is this other way?"
#define GOSSIP_MP3 "Doesn't matter, i'm invulnerable."
#define GOSSIP_MP4 "Yes..."
#define GOSSIP_MP5 "Ok, i'll try to remember that."
#define GOSSIP_MP6 "A key? Ok!"
class npc_mountaineer_pebblebitty : public CreatureScript
{
public:
npc_mountaineer_pebblebitty() : CreatureScript("npc_mountaineer_pebblebitty") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override
{
ClearGossipMenuFor(player);
switch (action)
{
case GOSSIP_ACTION_INFO_DEF+1:
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
SendGossipMenuFor(player, 1833, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+2:
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_MP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
SendGossipMenuFor(player, 1834, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+3:
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_MP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
SendGossipMenuFor(player, 1835, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_MP4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
SendGossipMenuFor(player, 1836, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_MP5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
SendGossipMenuFor(player, 1837, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+6:
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_MP6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
SendGossipMenuFor(player, 1838, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+7:
CloseGossipMenuFor(player);
break;
}
return true;
}
bool OnGossipHello(Player* player, Creature* creature) override
{
if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (!player->GetQuestRewardStatus(3181) == 1)
AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_MP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
SendGossipMenuFor(player, player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
};
void AddSC_loch_modan()
{
new npc_mountaineer_pebblebitty();
}

2
src/server/scripts/ScriptLoader.cpp
View File

@@ -213,7 +213,6 @@ void AddSC_ghostlands();
void AddSC_hinterlands(); void AddSC_hinterlands();
void AddSC_ironforge(); void AddSC_ironforge();
void AddSC_isle_of_queldanas(); void AddSC_isle_of_queldanas();
void AddSC_loch_modan();
void AddSC_redridge_mountains(); void AddSC_redridge_mountains();
void AddSC_silverpine_forest(); void AddSC_silverpine_forest();
void AddSC_stormwind_city(); void AddSC_stormwind_city();
@@ -803,7 +802,6 @@ void AddEasternKingdomsScripts()
AddSC_hinterlands(); AddSC_hinterlands();
AddSC_ironforge(); AddSC_ironforge();
AddSC_isle_of_queldanas(); AddSC_isle_of_queldanas();
AddSC_loch_modan();
AddSC_redridge_mountains(); AddSC_redridge_mountains();
AddSC_silverpine_forest(); AddSC_silverpine_forest();
AddSC_stormwind_city(); AddSC_stormwind_city();