yolinlin/mod-individual-progression
1
0
Fork 0
mirror of https://github.com/ZhengPeiRu21/mod-individual-progression synced 2025-11-29 23:44:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ZhengPeiRu21/mod-individual-progression

Browse Source
This commit is contained in:
郑佩茹
2023-04-05 11:22:53 -06:00
parent 814fdb4659 d1be7a74ce
commit 62da2cf268
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
optional/dbc.zip
View File

Binary file not shown.

2
sql/world/base/naxx40_omarian.sql
View File

@@ -1,5 +1,5 @@
-- Handle gossip with cpp script
UPDATE `creature_template` SET `ScriptName`='npc_omarion_gossip',`gossip_menu_id`=0 WHERE `entry` = 16365;
UPDATE `creature_template` SET `ScriptName`='npc_omarion_gossip',`gossip_menu_id`=0, `faction`=1766 WHERE `entry` = 16365;
SET @ID:= 24400;
-- Set correct text when gossip tailor/leatherwork/blacksmith option

14
src/naxx40Scripts/instance_naxxramas.cpp
View File

@@ -724,6 +724,16 @@ public:
return true;
}
void Load(const char* data) override
{
_horsemanLoadDoneState = true;
InstanceScript::Load(data);
if (GetBossState(BOSS_HORSEMAN) != DONE)
{
_horsemanLoadDoneState = false;
}
}
bool SetBossState(uint32 bossId, EncounterState state) override
{
// pull all the trash if not killed
@@ -743,9 +753,9 @@ public:
}
// Horseman handling
if (bossId == BOSS_HORSEMAN && !_horsemanLoadDoneState)
if (bossId == BOSS_HORSEMAN)
{
if (state == DONE)
if (state == DONE && !_horsemanLoadDoneState)
{
_horsemanTimer++;
_horsemanKilled++;