fix(DB/Core): Emotes / reaction during quest "The Taste Test" (#1795)
- Just a small adjustment to the core script handling the reaction of the NPCs during the quest
This commit is contained in:
@@ -0,0 +1,3 @@
|
|||||||
|
INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1556980489509436556');
|
||||||
|
|
||||||
|
UPDATE `creature_text` SET `Emote` = 92 WHERE `GroupID` = 1 AND `CreatureID` IN (27986,28047,28568);
|
||||||
@@ -852,10 +852,15 @@ public:
|
|||||||
## npc_jungle_punch_target
|
## npc_jungle_punch_target
|
||||||
#####*/
|
#####*/
|
||||||
|
|
||||||
#define SAY_OFFER "Care to try Grimbooze Thunderbrew's new jungle punch?"
|
|
||||||
|
|
||||||
enum JunglePunch
|
enum JunglePunch
|
||||||
{
|
{
|
||||||
|
SAY_OFFER = 28558,
|
||||||
|
ITEM_TANKARD = 2705,
|
||||||
|
|
||||||
|
NPC_HEMET = 27986,
|
||||||
|
NPC_HADRIUS = 28047,
|
||||||
|
|
||||||
|
SPELL_KNOCKDOWN = 42963,
|
||||||
SPELL_OFFER = 51962,
|
SPELL_OFFER = 51962,
|
||||||
QUEST_TASTE_TEST = 12645,
|
QUEST_TASTE_TEST = 12645,
|
||||||
|
|
||||||
@@ -977,8 +982,25 @@ public:
|
|||||||
|
|
||||||
if (sayTimer < diff)
|
if (sayTimer < diff)
|
||||||
{
|
{
|
||||||
|
if (sayStep == 2)
|
||||||
|
{
|
||||||
|
me->SetSheath(SHEATH_STATE_MELEE);
|
||||||
|
SetEquipmentSlots(false, ITEM_TANKARD, EQUIP_UNEQUIP, EQUIP_UNEQUIP);
|
||||||
|
}
|
||||||
|
else if (sayStep == 3)
|
||||||
|
{
|
||||||
|
if (me->GetEntry() == NPC_HEMET)
|
||||||
|
me->SetSheath(SHEATH_STATE_RANGED);
|
||||||
|
else if (me->GetEntry() == NPC_HADRIUS)
|
||||||
|
{
|
||||||
|
me->SetSheath(SHEATH_STATE_UNARMED);
|
||||||
|
me->CastSpell(me,SPELL_KNOCKDOWN,false);
|
||||||
|
}
|
||||||
|
SetEquipmentSlots(true);
|
||||||
|
}
|
||||||
|
|
||||||
Talk(SAY_HEMET_HADRIUS_TAMARA_1 + sayStep - 1);
|
Talk(SAY_HEMET_HADRIUS_TAMARA_1 + sayStep - 1);
|
||||||
sayTimer = 3000;
|
sayTimer = 6000;
|
||||||
sayStep++;
|
sayStep++;
|
||||||
|
|
||||||
if (sayStep > 3) // end
|
if (sayStep > 3) // end
|
||||||
@@ -1014,7 +1036,7 @@ public:
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
player->KilledMonsterCredit(me->GetEntry(), 0);
|
player->KilledMonsterCredit(me->GetEntry(), 0);
|
||||||
player->Say(SAY_OFFER, LANG_UNIVERSAL);
|
player->MonsterSay(SAY_OFFER, LANG_UNIVERSAL, me);
|
||||||
sayStep = 1;
|
sayStep = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user