sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(DB/SAI):Twilight Discipline and Twilight Thug scripts(talks an… (#8023)

Browse Source 
Co-authored-by: Skjalf <47818697+Nyeriah@users.noreply.github.com>
This commit is contained in:
Ragelezz
2021-11-05 06:51:13 +02:00
committed by GitHub
parent 79d40424f5
commit 10ec5a802d
2 changed files with 129 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sql/updates/pending_db_world/rev_1632248054324754400.sql
+12
View File
@@ -0,0 +1,12 @@
INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1632248054324754400');
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 2338) AND (`source_type` = 0) AND (`id` IN (2, 3));
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
(2338, 0, 2, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Disciple - On Aggro - Talk 0'),
(2338, 0, 3, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Disciple - On Death - Talk 1');
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 2339) AND (`source_type` = 0) AND (`id` IN (3, 4));
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
(2339, 0, 3, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Thug - On Aggro - Talk 0'),
(2339, 0, 4, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Thug - On Death - Talk 1');
src/server/scripts/Kalimdor/zone_darkshore.cpp
+10 -10
View File
@@ -28,11 +28,11 @@ npc_prospector_remtravel
EndContentData */
#include "Player.h"
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "ScriptedEscortAI.h"
#include "ScriptedFollowerAI.h"
#include "ScriptedGossip.h"
#include "ScriptMgr.h"
#include "SpellInfo.h"
// Ours
@@ -52,7 +52,7 @@ enum murkdeep
class npc_murkdeep : public CreatureScript
{
public:
npc_murkdeep() : CreatureScript("npc_murkdeep") { }
npc_murkdeep() : CreatureScript("npc_murkdeep") {}
CreatureAI* GetAI(Creature* creature) const override
{
@@ -183,11 +183,11 @@ enum Kerlonian
class npc_kerlonian : public CreatureScript
{
public:
npc_kerlonian() : CreatureScript("npc_kerlonian") { }
npc_kerlonian() : CreatureScript("npc_kerlonian") {}
struct npc_kerlonianAI : public FollowerAI
{
npc_kerlonianAI(Creature* creature) : FollowerAI(creature) { }
npc_kerlonianAI(Creature* creature) : FollowerAI(creature) {}
uint32 FallAsleepTimer;
@@ -321,13 +321,13 @@ enum Remtravel
class npc_prospector_remtravel : public CreatureScript
{
public:
npc_prospector_remtravel() : CreatureScript("npc_prospector_remtravel") { }
npc_prospector_remtravel() : CreatureScript("npc_prospector_remtravel") {}
struct npc_prospector_remtravelAI : public npc_escortAI
{
npc_prospector_remtravelAI(Creature* creature) : npc_escortAI(creature) { }
npc_prospector_remtravelAI(Creature* creature) : npc_escortAI(creature) {}
void Reset() override { }
void Reset() override {}
void EnterCombat(Unit* who) override
{
@@ -337,8 +337,8 @@ public:
void JustSummoned(Creature* /*pSummoned*/) override
{
//unsure if it should be any
//pSummoned->AI()->AttackStart(me);
// unsure if it should be any
// pSummoned->AI()->AttackStart(me);
}
void WaypointReached(uint32 waypointId) override
@@ -361,7 +361,7 @@ public:
Talk(SAY_REM_RAMP1_2, player);
break;
case 14:
//depend quest rewarded?
// depend quest rewarded?
Talk(SAY_REM_BOOK, player);
break;
case 15: