diff --git a/data/sql/updates/pending_db_world/rev_1719024661180085554.sql b/data/sql/updates/pending_db_world/rev_1719024661180085554.sql new file mode 100644 index 000000000..37f834556 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1719024661180085554.sql @@ -0,0 +1,5 @@ +-- +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceGroup` = 4) AND (`SourceEntry` = 16609) AND (`ConditionTypeOrReference` IN (27,5)); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 4, 16609, 0, 0, 27, 0, 63, 4, 0, 0, 0, 0, '', 'Warchief\'s Blessing - Player must be level 63 or lower'), +(13, 4, 16609, 0, 0, 5, 0, 528, 240, 0, 0, 0, 0, '', 'Warchief\'s Blessing - Player must be at least Friendly with Orgrimmar'); diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp index 0024ef5d4..2f2b39fbf 100644 --- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp @@ -153,6 +153,8 @@ enum ThrallWarchief : uint32 AREA_CAMP_TAURAJO = 378, AREA_CROSSROADS = 380, + GO_UNADORNED_SPIKE = 175787, + // What the Wind Carries (ID: 6566) QUEST_WHAT_THE_WIND_CARRIES = 6566, GOSSIP_MENU_THRALL = 3664, @@ -247,7 +249,13 @@ public: me->GetMap()->LoadGrid(heraldOfThrallPos.GetPositionX(), heraldOfThrallPos.GetPositionY()); me->SummonCreature(NPC_HERALD_OF_THRALL, heraldOfThrallPos, TEMPSUMMON_TIMED_DESPAWN, 20 * IN_MILLISECONDS); me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); - scheduler.Schedule(2s, [this](TaskContext /*context*/) + scheduler.Schedule(1s, [this](TaskContext /*context*/) + { + if (GameObject* spike = me->FindNearestGameObject(GO_UNADORNED_SPIKE, 10.0f)) + { + spike->SetGoState(GO_STATE_ACTIVE); + } + }).Schedule(2s, [this](TaskContext /*context*/) { Talk(SAY_THRALL_ON_QUEST_REWARD_0); }).Schedule(9s, [this](TaskContext /*context*/)