josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blackfathom Deeps: Corrected says in Kelris script.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maanuel
2009-12-20 23:20:47 -03:00
parent 89fa7cf367
commit af83219083
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/FULL/world_script_texts.sql
+3
View File
@@ -464,6 +464,9 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
(4508,-1047010,'Many thanks for your help.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'Willix'), (4508,-1047010,'Many thanks for your help.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'Willix'),
-- -1 048 000 BLACKFATHOM DEEPS -- -1 048 000 BLACKFATHOM DEEPS
(4832,-1048000,'Just...Dust...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5803,1,0,0,''),
(4832,-1048001,'Sleep...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5804,1,0,0,''),
(4832,-1048002,'Who dares disturb my meditation!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5805,1,0,0,''),
-- -1 060 000 863_world_scripts.sql -- -1 060 000 863_world_scripts.sql
(0,-1060005,'REUSE',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'REUSE'), (0,-1060005,'REUSE',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'REUSE'),
sql/updates/6683_world_script_texts.sql
+5
View File
@@ -0,0 +1,5 @@
DELETE FROM `script_texts` WHERE `entry` IN (-1048000,-1048001,-1048002);
INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
(4832,-1048000,'Just...Dust...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5803,1,0,0,''),
(4832,-1048001,'Sleep...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5804,1,0,0,''),
(4832,-1048002,'Who dares disturb my meditation!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5805,1,0,0,'');
src/bindings/scripts/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp
+13 -13
View File
@@ -28,9 +28,9 @@ enum Spells
//Id's from ACID //Id's from ACID
enum Yells enum Yells
{ {
SAY_AGGRO = -566, SAY_AGGRO = -1048002,
SAY_SLEEP = -567, SAY_SLEEP = -1048001,
SAY_DEATH = -568 SAY_DEATH = -1048000
}; };
struct TRINITY_DLL_DECL boss_kelrisAI : public ScriptedAI struct TRINITY_DLL_DECL boss_kelrisAI : public ScriptedAI
@@ -39,12 +39,12 @@ struct TRINITY_DLL_DECL boss_kelrisAI : public ScriptedAI
{ {
pInstance = c->GetInstanceData(); pInstance = c->GetInstanceData();
} }
uint32 uiMindBlastTimer; uint32 uiMindBlastTimer;
uint32 uiSleepTimer; uint32 uiSleepTimer;
ScriptedInstance *pInstance; ScriptedInstance *pInstance;
void Reset() void Reset()
{ {
uiMindBlastTimer = urand(2000,5000); uiMindBlastTimer = urand(2000,5000);
@@ -52,26 +52,26 @@ struct TRINITY_DLL_DECL boss_kelrisAI : public ScriptedAI
if (pInstance) if (pInstance)
pInstance->SetData(TYPE_KELRIS, NOT_STARTED); pInstance->SetData(TYPE_KELRIS, NOT_STARTED);
} }
void EnterCombat(Unit* who) void EnterCombat(Unit* who)
{ {
DoScriptText(SAY_AGGRO, m_creature); DoScriptText(SAY_AGGRO, m_creature);
if (pInstance) if (pInstance)
pInstance->SetData(TYPE_KELRIS, IN_PROGRESS); pInstance->SetData(TYPE_KELRIS, IN_PROGRESS);
} }
void JustDied(Unit* killer) void JustDied(Unit* killer)
{ {
DoScriptText(SAY_DEATH, m_creature); DoScriptText(SAY_DEATH, m_creature);
if (pInstance) if (pInstance)
pInstance->SetData(TYPE_KELRIS, DONE); pInstance->SetData(TYPE_KELRIS, DONE);
} }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
{ {
if (!UpdateVictim()) if (!UpdateVictim())
return; return;
if (uiMindBlastTimer < diff) if (uiMindBlastTimer < diff)
{ {
DoCastVictim(SPELL_MIND_BLAST); DoCastVictim(SPELL_MIND_BLAST);
@@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL boss_kelrisAI : public ScriptedAI
} }
uiSleepTimer = urand(15000,20000); uiSleepTimer = urand(15000,20000);
} else uiSleepTimer -= diff; } else uiSleepTimer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
}; };
@@ -100,9 +100,9 @@ CreatureAI* GetAI_boss_kelris(Creature* pCreature)
void AddSC_boss_kelris() void AddSC_boss_kelris()
{ {
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "boss_kelris"; newscript->Name = "boss_kelris";
newscript->GetAI = &GetAI_boss_kelris; newscript->GetAI = &GetAI_boss_kelris;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }