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

Branch merg

Browse Source 
--HG--
branch : trunk
This commit is contained in:
runningnak3d
2010-10-09 01:54:36 -06:00
parent 7a9a9426a7 8f9660fa07
commit 1cdd1a6700
8 changed files with 814 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/scripts/world_script_texts.sql
+10 -2
View File
@@ -2523,8 +2523,16 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
(33350,-1603259,'Combat matrix enhanced. Behold wonderous rapidity!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15630,1,0,0,'Mimiron SAY_YS_HELP'), (33350,-1603259,'Combat matrix enhanced. Behold wonderous rapidity!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15630,1,0,0,'Mimiron SAY_YS_HELP'),
-- Razorscale encounter -- Razorscale encounter
(33210,-1603260,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15647,1,0,0,'Exp. Commander SAY_INTRO'),
(33210,-1603261,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15648,1,0,0,'Exp. Commander SAY_GROUND'), (33186,-1603268, 'Razorscale grounded permanently!', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0, 'EMOTE_PERMA'),
(33186,-1603267, 'Razorscale takes a deep breath...', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0, 'EMOTE_BREATH'),
(33287,-1603266, 'Harpoon Turret is ready for use!', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0, 'EMOTE_HARPOON'),
(33287,-1603265, 'Fires out! Let''s rebuild those turrets!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0, 'SAY_TURRETS'),
(33287,-1603264, 'Ready to move out, keep those dwarves off of our backs!', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0, 'SAY_AGGRO_3'),
(33287,-1603263, 'Be on the lookout! Mole machines will be surfacing soon with those nasty Iron dwarves aboard!', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0, 'SAY_AGGRO_2'),
(33287,-1603262, 'Give us a moment to prepare to build the turrets.', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0, 'SAY_AGGRO_1'),
(33210,-1603260, 'Welcome, champions! All of our attempts at grounding her have failed. We could use a hand in bring her down with these harpoon guns.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15647,0,0,0,'Exp. Commander SAY_INTRO'),
(33210,-1603261, 'Move! Quickly! She won''t remain grounded for long.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15648,1,0,0,'Exp. Commander SAY_GROUND'),
-- Thorim -- Thorim
(33413,-1603270,'Interlopers! You mortals who dare to interfere with my sport will pay... Wait--you...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15733,1,0,0,'Thorim SAY_AGGRO_1'), (33413,-1603270,'Interlopers! You mortals who dare to interfere with my sport will pay... Wait--you...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15733,1,0,0,'Thorim SAY_AGGRO_1'),
sql/scripts/world_scripts_full.sql
+6
View File
@@ -1493,6 +1493,12 @@ UPDATE `creature_template` SET `ScriptName`='boss_ignis' WHERE `entry`=33118;
UPDATE `creature_template` SET `ScriptName`='npc_iron_construct' WHERE `entry`=33121; UPDATE `creature_template` SET `ScriptName`='npc_iron_construct' WHERE `entry`=33121;
UPDATE `creature_template` SET `ScriptName`='npc_scorch_ground' WHERE `entry`=33221; UPDATE `creature_template` SET `ScriptName`='npc_scorch_ground' WHERE `entry`=33221;
UPDATE `creature_template` SET `ScriptName`='boss_razorscale' WHERE `entry`=33186; UPDATE `creature_template` SET `ScriptName`='boss_razorscale' WHERE `entry`=33186;
UPDATE `creature_template` SET `ScriptName`='npc_devouring_flame' WHERE `entry`=34188;
UPDATE `creature_template` SET `ScriptName`='npc_mole_machine_trigger' WHERE `entry`=33245;
UPDATE `creature_template` SET `ScriptName`='npc_expedition_commander' WHERE `entry`=33210;
UPDATE `creature_template` SET `ScriptName`='npc_darkrune_guardian' WHERE `entry`=33388;
UPDATE `creature_template` SET `ScriptName`='npc_darkrune_sentinel' WHERE `entry`=33846;
UPDATE `creature_template` SET `ScriptName`='npc_darkrune_watcher' WHERE `entry`=33453;
UPDATE `creature_template` SET `ScriptName`='boss_xt002' WHERE `entry`=33293; UPDATE `creature_template` SET `ScriptName`='boss_xt002' WHERE `entry`=33293;
UPDATE `creature_template` SET `ScriptName`='mob_xt002_heart' WHERE `entry`=33329; UPDATE `creature_template` SET `ScriptName`='mob_xt002_heart' WHERE `entry`=33329;
UPDATE `creature_template` SET `ScriptName`='mob_scrapbot' WHERE `entry`=33343; UPDATE `creature_template` SET `ScriptName`='mob_scrapbot' WHERE `entry`=33343;
sql/updates/10208_world_script_name.sql
+8
View File
@@ -0,0 +1,8 @@
-- Razorscale
UPDATE `creature_template` SET `ScriptName` = 'boss_razorscale' WHERE `entry`=33186;
UPDATE `creature_template` SET `ScriptName` = 'npc_devouring_flame' WHERE `entry`=34188;
UPDATE `creature_template` SET `ScriptName` = 'npc_mole_machine_trigger' WHERE `entry`=33245;
UPDATE `creature_template` SET `ScriptName` = 'npc_expedition_commander' WHERE `entry`=33210;
UPDATE `creature_template` SET `ScriptName` = 'npc_darkrune_guardian' WHERE `entry`=33388;
UPDATE `creature_template` SET `ScriptName` = 'npc_darkrune_sentinel' WHERE `entry`=33846;
UPDATE `creature_template` SET `ScriptName` = 'npc_darkrune_watcher' WHERE `entry`=33453;
sql/updates/10208_world_script_texts.sql
+16
View File
@@ -0,0 +1,16 @@
DELETE FROM `script_texts` WHERE `entry` IN (-1603268,-1603267,-1603266);
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
(33186, -1603268, 'Razorscale grounded permanently!', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0, 'EMOTE_PERMA'),
(33186, -1603267, 'Razorscale takes a deep breath...', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0, 'EMOTE_BREATH'),
(33287, -1603266, 'Harpoon Turret is ready for use!', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0, 'EMOTE_HARPOON');
DELETE FROM `script_texts` WHERE `entry` IN (-1603265,-1603264,-1603263,-1603262);
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
(33287, -1603265, 'Fires out! Let''s rebuild those turrets!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0, 'SAY_TURRETS'),
(33287, -1603264, 'Ready to move out, keep those dwarves off of our backs!', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0, 'SAY_AGGRO_3'),
(33287, -1603263, 'Be on the lookout! Mole machines will be surfacing soon with those nasty Iron dwarves aboard!', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0, 'SAY_AGGRO_2'),
(33287, -1603262, 'Give us a moment to prepare to build the turrets.', NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0, 'SAY_AGGRO_1');
-- Razorscale emotes
UPDATE `script_texts` SET `content_default` = "Welcome, champions! All of our attempts at grounding her have failed. We could use a hand in bring her down with these harpoon guns.", `type`=0 WHERE `entry`=-1603260;
UPDATE `script_texts` SET `content_default` = "Move! Quickly! She won't remain grounded for long.", `type`=1 WHERE `entry`=-1603261;
src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ public:
std::vector<Creature*> triggers; std::vector<Creature*> triggers;
bool Shattered; bool Shattered;
uint32 SlagPotGUID; uint64 SlagPotGUID;
uint32 EncounterTime; uint32 EncounterTime;
uint32 ConstructTimer; uint32 ConstructTimer;
src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
+714 -219
View File
File diff suppressed because it is too large Load Diff
src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+55 -48
View File
@@ -53,6 +53,7 @@ public:
uint64 uiLeviathanGUID; uint64 uiLeviathanGUID;
uint64 uiIgnisGUID; uint64 uiIgnisGUID;
uint64 uiRazorscaleGUID; uint64 uiRazorscaleGUID;
uint64 uiExpCommanderGUID;
uint64 uiXT002GUID; uint64 uiXT002GUID;
uint64 uiAssemblyGUIDs[3]; uint64 uiAssemblyGUIDs[3];
uint64 uiKologarnGUID; uint64 uiKologarnGUID;
@@ -77,6 +78,7 @@ public:
SetBossNumber(MAX_ENCOUNTER); SetBossNumber(MAX_ENCOUNTER);
uiIgnisGUID = 0; uiIgnisGUID = 0;
uiRazorscaleGUID = 0; uiRazorscaleGUID = 0;
uiExpCommanderGUID = 0;
uiXT002GUID = 0; uiXT002GUID = 0;
uiKologarnGUID = 0; uiKologarnGUID = 0;
uiAuriayaGUID = 0; uiAuriayaGUID = 0;
@@ -123,6 +125,9 @@ public:
case NPC_RAZORSCALE: case NPC_RAZORSCALE:
uiRazorscaleGUID = pCreature->GetGUID(); uiRazorscaleGUID = pCreature->GetGUID();
break; break;
case NPC_EXPEDITION_COMMANDER:
uiExpCommanderGUID = pCreature->GetGUID();
return;
case NPC_XT002: case NPC_XT002:
uiXT002GUID = pCreature->GetGUID(); uiXT002GUID = pCreature->GetGUID();
break; break;
@@ -227,57 +232,57 @@ public:
} }
bool SetBossState(uint32 type, EncounterState state) bool SetBossState(uint32 type, EncounterState state)
{
if (!InstanceScript::SetBossState(type, state))
return false;
switch (type)
{ {
if (!InstanceScript::SetBossState(type, state)) case TYPE_LEVIATHAN:
return false; if (state == IN_PROGRESS)
switch (type)
{ {
case TYPE_LEVIATHAN: for (uint8 uiI = 0; uiI < 7; ++uiI)
if (state == IN_PROGRESS) HandleGameObject(uiLeviathanDoor[uiI],false);
{ }
for (uint8 uiI = 0; uiI < 7; ++uiI) else
HandleGameObject(uiLeviathanDoor[uiI],false); {
} for (uint8 uiI = 0; uiI < 7; ++uiI)
else HandleGameObject(uiLeviathanDoor[uiI],true);
{ }
for (uint8 uiI = 0; uiI < 7; ++uiI) break;
HandleGameObject(uiLeviathanDoor[uiI],true); case TYPE_IGNIS:
} case TYPE_RAZORSCALE:
break; case TYPE_XT002:
case TYPE_IGNIS: case TYPE_ASSEMBLY:
case TYPE_RAZORSCALE: case TYPE_AURIAYA:
case TYPE_XT002: case TYPE_MIMIRON:
case TYPE_ASSEMBLY: case TYPE_VEZAX:
case TYPE_AURIAYA: case TYPE_YOGGSARON:
case TYPE_MIMIRON: break;
case TYPE_VEZAX: case TYPE_KOLOGARN:
case TYPE_YOGGSARON: if (state == DONE)
break; if (GameObject* pGO = instance->GetGameObject(uiKologarnChestGUID))
case TYPE_KOLOGARN: pGO->SetRespawnTime(pGO->GetRespawnDelay());
if (state == DONE) break;
if (GameObject* pGO = instance->GetGameObject(uiKologarnChestGUID)) case TYPE_HODIR:
pGO->SetRespawnTime(pGO->GetRespawnDelay()); if (state == DONE)
break; if (GameObject* pGO = instance->GetGameObject(uiHodirChestGUID))
case TYPE_HODIR: pGO->SetRespawnTime(pGO->GetRespawnDelay());
if (state == DONE) break;
if (GameObject* pGO = instance->GetGameObject(uiHodirChestGUID)) case TYPE_THORIM:
pGO->SetRespawnTime(pGO->GetRespawnDelay()); if (state == DONE)
break; if (GameObject* pGO = instance->GetGameObject(uiThorimChestGUID))
case TYPE_THORIM: pGO->SetRespawnTime(pGO->GetRespawnDelay());
if (state == DONE) break;
if (GameObject* pGO = instance->GetGameObject(uiThorimChestGUID)) case TYPE_FREYA:
pGO->SetRespawnTime(pGO->GetRespawnDelay()); if (state == DONE)
break; if (GameObject* pGO = instance->GetGameObject(uiFreyaChestGUID))
case TYPE_FREYA: pGO->SetRespawnTime(pGO->GetRespawnDelay());
if (state == DONE) break;
if (GameObject* pGO = instance->GetGameObject(uiFreyaChestGUID)) }
pGO->SetRespawnTime(pGO->GetRespawnDelay());
break;
}
return true; return true;
} }
void SetData(uint32 type, uint32 data) void SetData(uint32 type, uint32 data)
{ {
@@ -317,6 +322,8 @@ public:
case TYPE_YOGGSARON: return uiYoggSaronGUID; case TYPE_YOGGSARON: return uiYoggSaronGUID;
case TYPE_ALGALON: return uiAlgalonGUID; case TYPE_ALGALON: return uiAlgalonGUID;
// razorscale expedition commander
case DATA_EXP_COMMANDER: return uiExpCommanderGUID;
// Assembly of Iron // Assembly of Iron
case DATA_STEELBREAKER: return uiAssemblyGUIDs[0]; case DATA_STEELBREAKER: return uiAssemblyGUIDs[0];
case DATA_MOLGEIM: return uiAssemblyGUIDs[1]; case DATA_MOLGEIM: return uiAssemblyGUIDs[1];
src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
+3
View File
@@ -43,10 +43,13 @@ enum eTypes
DATA_BRUNDIR = 22, DATA_BRUNDIR = 22,
DATA_RUNEMASTER_MOLGEIM = 23, DATA_RUNEMASTER_MOLGEIM = 23,
DATA_STORMCALLER_BRUNDIR = 24, DATA_STORMCALLER_BRUNDIR = 24,
DATA_EXP_COMMANDER = 25,
NPC_LEVIATHAN = 33113, NPC_LEVIATHAN = 33113,
NPC_IGNIS = 33118, NPC_IGNIS = 33118,
NPC_RAZORSCALE = 33186, NPC_RAZORSCALE = 33186,
NPC_EXPEDITION_COMMANDER = 33210,
NPC_XT002 = 33293, NPC_XT002 = 33293,
NPC_STEELBREAKER = 32867, NPC_STEELBREAKER = 32867,
NPC_MOLGEIM = 32927, NPC_MOLGEIM = 32927,