diff options
Diffstat (limited to 'src/server/scripts')
16 files changed, 14 insertions, 46 deletions
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index b8cba4ac922..5c7482871ed 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -211,7 +211,7 @@ public: switch (pointId) { case POINT_INTRO_START: - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); + me->SetStandState(UNIT_STAND_STATE_STAND); events.ScheduleEvent(EVENT_START_INTRO_PATH, Milliseconds(1)); break; case POINT_INTRO_END: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index 834190258fd..1e206366df3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -1476,7 +1476,7 @@ public: break; case RP5_EVENT_CHROMIE_LAND: if (Creature* chromie = me->FindNearestCreature(NPC_CHROMIE_3, 100.0f, true)) - chromie->SetAnimTier(UNIT_BYTE1_FLAG_NONE, true); + chromie->SetAnimTier(AnimTier::Ground, true); break; case RP5_EVENT_CHROMIE_TRANSFORM: if (Creature* chromie = me->FindNearestCreature(NPC_CHROMIE_3, 100.0f, true)) diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index ca2a8553974..114479343d6 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -230,7 +230,6 @@ public: case 9: me->SetCanFly(false); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); if (Creature* trigger = ObjectAccessor::GetCreature(*me, triggerGUID)) Unit::Kill(me, trigger); me->SetReactState(REACT_AGGRESSIVE); @@ -248,7 +247,6 @@ public: case 10: me->SetCanFly(true); me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); me->SetFacingTo(me->GetOrientation() + float(M_PI)); if (Creature * trigger = me->SummonCreature(NPC_TRIGGER, MiddleRoomLocation, TEMPSUMMON_CORPSE_DESPAWN)) triggerGUID = trigger->GetGUID(); diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index a4b6b251195..3facde1d0b1 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -118,7 +118,6 @@ class boss_slabhide : public CreatureScript me->setActive(true); me->SetCanFly(true); me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); me->SetReactState(REACT_PASSIVE); instance->SetData(DATA_SLABHIDE_INTRO, NOT_STARTED); _isFlying = false; @@ -134,7 +133,6 @@ class boss_slabhide : public CreatureScript me->SetCanFly(false); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); me->SetReactState(REACT_AGGRESSIVE); _isFlying = false; } @@ -197,7 +195,6 @@ class boss_slabhide : public CreatureScript case POINT_SLABHIDE_INTRO_LAND: me->SetCanFly(false); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); me->SetHover(false); me->SetHomePosition(SlabhideIntroLandPos); me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); @@ -261,7 +258,6 @@ class boss_slabhide : public CreatureScript case EVENT_STALACTITE: me->SetCanFly(true); me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); me->SetHover(true); DoCast(me, SPELL_STALACTITE_SUMMON); @@ -278,7 +274,6 @@ class boss_slabhide : public CreatureScript case EVENT_ATTACK: me->SetCanFly(false); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); me->SetHover(false); events.ScheduleEvent(EVENT_LAVA_FISSURE, 6s, 8s); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index 2815f56feb9..b9961ed76df 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -246,7 +246,7 @@ struct boss_jedoga_shadowseeker : public BossAI if (++_initiatesKilled == TWILIGHT_INITIATES_SIZE) { DoCastSelf(SPELL_HOVER_FALL_1); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, true); + me->SetAnimTier(AnimTier::Ground); events.ScheduleEvent(EVENT_START_FIGHT_1, Seconds(1)); } } @@ -318,7 +318,6 @@ struct boss_jedoga_shadowseeker : public BossAI case EVENT_START_FIGHT_2: summons.DespawnEntry(NPC_JEDOGA_CONTROLLER); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, true); me->GetMotionMaster()->MoveLand(POINT_GROUND, JedogaGroundPosition); break; case EVENT_START_PHASE_TWO: @@ -330,7 +329,6 @@ struct boss_jedoga_shadowseeker : public BossAI break; case EVENT_FLY_DELAY: me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), true); me->GetMotionMaster()->MoveTakeoff(POINT_PHASE_TWO_FLY, JedogaFlyPosition); break; case EVENT_CHOOSE_VOLUNTEER: @@ -364,7 +362,6 @@ struct boss_jedoga_shadowseeker : public BossAI summons.DespawnEntry(NPC_JEDOGA_CONTROLLER); DoCastSelf(SPELL_HOVER_FALL_2); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, true); me->GetMotionMaster()->MoveLand(POINT_GROUND, JedogaGroundPosition); break; case EVENT_CYCLONE_STRIKE: diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index b58e2b5a947..5c6167c210e 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -119,7 +119,6 @@ class boss_saviana_ragefire : public CreatureScript case POINT_LAND_GROUND: me->SetCanFly(false); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); me->SetReactState(REACT_AGGRESSIVE); events.ScheduleEvent(EVENT_ENRAGE, Seconds(1), EVENT_GROUP_LAND_PHASE); events.ScheduleEvent(EVENT_FLAME_BREATH, Seconds(2), Seconds(4), EVENT_GROUP_LAND_PHASE); @@ -162,7 +161,6 @@ class boss_saviana_ragefire : public CreatureScript { me->SetCanFly(true); me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); me->SetReactState(REACT_PASSIVE); me->AttackStop(); Position pos; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 3ed5a10b53b..e69c35019de 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -215,7 +215,7 @@ class boss_blood_queen_lana_thel : public CreatureScript if (Creature* minchar = me->FindNearestCreature(NPC_INFILTRATOR_MINCHAR_BQ, 200.0f)) { minchar->SetEmoteState(EMOTE_ONESHOT_NONE); - minchar->SetAnimTier(UNIT_BYTE1_FLAG_NONE, true); + minchar->SetAnimTier(AnimTier::Ground); minchar->SetCanFly(false); minchar->RemoveAllAuras(); minchar->GetMotionMaster()->MoveCharge(4629.3711f, 2782.6089f, 401.5301f, SPEED_CHARGE / 3.0f); @@ -247,7 +247,6 @@ class boss_blood_queen_lana_thel : public CreatureScript else { me->SetDisableGravity(true); - me->SetAnimTier(UNIT_BYTE1_FLAG_ALWAYS_STAND, true); me->GetMotionMaster()->MovePoint(POINT_MINCHAR, mincharPos); } } @@ -262,7 +261,6 @@ class boss_blood_queen_lana_thel : public CreatureScript { _killMinchar = false; me->SetDisableGravity(true); - me->SetAnimTier(UNIT_BYTE1_FLAG_ALWAYS_STAND, true); me->GetMotionMaster()->MovePoint(POINT_MINCHAR, mincharPos); } else @@ -276,7 +274,6 @@ class boss_blood_queen_lana_thel : public CreatureScript void JustReachedHome() override { me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, true); me->SetReactState(REACT_AGGRESSIVE); _JustReachedHome(); Talk(SAY_WIPE); @@ -326,7 +323,6 @@ class boss_blood_queen_lana_thel : public CreatureScript break; case POINT_GROUND: me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, true); me->SetReactState(REACT_AGGRESSIVE); if (Unit* victim = me->SelectVictim()) AttackStart(victim); @@ -408,7 +404,7 @@ class boss_blood_queen_lana_thel : public CreatureScript break; } case EVENT_DELIRIOUS_SLASH: - if (!_offtankGUID.IsEmpty() && !(*me->m_unitData->AnimTier & (UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER))) + if (!_offtankGUID.IsEmpty() && me->GetAnimTier() != AnimTier::Fly) if (Player* _offtank = ObjectAccessor::GetPlayer(*me, _offtankGUID)) DoCast(_offtank, SPELL_DELIRIOUS_SLASH); events.ScheduleEvent(EVENT_DELIRIOUS_SLASH, 20s, 24s, EVENT_GROUP_NORMAL); @@ -456,7 +452,6 @@ class boss_blood_queen_lana_thel : public CreatureScript break; case EVENT_AIR_START_FLYING: me->SetDisableGravity(true); - me->SetAnimTier(UNIT_BYTE1_FLAG_ALWAYS_STAND, true); me->GetMotionMaster()->MovePoint(POINT_AIR, airPos); break; case EVENT_AIR_FLY_DOWN: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 533a564170e..d925b242ac8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -299,7 +299,6 @@ struct boss_sindragosa : public BossAI instance->SetBossState(DATA_SINDRAGOSA, FAIL); me->SetCanFly(false); me->SetDisableGravity(false); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); me->SetReactState(REACT_DEFENSIVE); } @@ -325,7 +324,6 @@ struct boss_sindragosa : public BossAI me->SetFarVisible(true); me->SetCanFly(true); me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); me->SetSpeedRate(MOVE_FLIGHT, 4.0f); me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); Milliseconds moveTime = Milliseconds(uint64(me->GetExactDist(&SindragosaFlyPos) / (me->GetSpeed(MOVE_FLIGHT) * 0.001f))); @@ -360,7 +358,6 @@ struct boss_sindragosa : public BossAI me->SetFarVisible(false); me->SetCanFly(false); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); me->SetHomePosition(SindragosaLandPos); me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetSpeedRate(MOVE_FLIGHT, 2.5f); @@ -392,7 +389,6 @@ struct boss_sindragosa : public BossAI { me->SetCanFly(false); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); me->SetReactState(REACT_DEFENSIVE); _isInAirPhase = false; @@ -499,7 +495,6 @@ struct boss_sindragosa : public BossAI Talk(SAY_AIR_PHASE); me->SetCanFly(true); me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); me->SetReactState(REACT_PASSIVE); me->AttackStop(); Position pos; @@ -720,7 +715,6 @@ struct npc_spinestalker : public ScriptedAI me->SetFarVisible(false); me->SetCanFly(false); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); me->SetHomePosition(SpinestalkerLandPos); me->SetFacingTo(SpinestalkerLandPos.GetOrientation()); me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); @@ -848,7 +842,6 @@ struct npc_rimefang_icc : public ScriptedAI me->SetFarVisible(false); me->SetCanFly(false); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); me->SetHomePosition(RimefangLandPos); me->SetFacingTo(RimefangLandPos.GetOrientation()); me->SetImmuneToPC(false); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 3f47a48ed46..12f051b540d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -528,7 +528,6 @@ struct boss_the_lich_king : public BossAI _JustDied(); DoCastAOE(SPELL_PLAY_MOVIE, false); me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); me->GetMotionMaster()->MoveFall(); if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f)) frostmourne->DespawnOrUnsummon(); @@ -1108,7 +1107,6 @@ struct boss_the_lich_king : public BossAI CreatureTextMgr::SendSound(me, SOUND_PAIN, CHAT_MSG_MONSTER_YELL, 0, TEXT_RANGE_NORMAL, TEAM_OTHER, false); // set flight me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); me->GetMotionMaster()->MovePoint(POINT_LK_OUTRO_2, OutroFlying); break; case EVENT_OUTRO_TALK_7: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 0dd7eaece13..27108645951 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -265,6 +265,11 @@ class instance_icecrown_citadel : public InstanceMapScript case NPC_BLOOD_QUEEN_LANA_THEL: BloodQueenLanaThelGUID = creature->GetGUID(); break; + case NPC_INFILTRATOR_MINCHAR_BQ: + // keep him in air + creature->SetEmoteState(EMOTE_ONESHOT_NONE); + creature->SetDisableGravity(true); + break; case NPC_CROK_SCOURGEBANE: CrokScourgebaneGUID = creature->GetGUID(); break; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 4129145d937..2568c0eefd0 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -372,7 +372,6 @@ public: Initialize(); me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); me->SetImmuneToAll(true); me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); // TO DO: find what in core is making boss slower than in retail (when correct speed data) or find missing movement flag update or forced spline change diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 4f33c919154..39b7190e828 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -620,7 +620,6 @@ class boss_mimiron : public CreatureScript { if (Creature* aerial = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_AERIAL_COMMAND_UNIT))) { - aerial->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); aerial->CastSpell(vx001, SPELL_MOUNT_VX_001); aerial->CastSpell(aerial, SPELL_HALF_HEAL); } @@ -993,7 +992,7 @@ class boss_vx_001 : public CreatureScript me->SetImmuneToPC(false); me->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM); me->SetEmoteState(EMOTE_ONESHOT_NONE); // Remove emotestate. - //me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); Blizzard handles hover animation like this it seems. + //me->SetHover(true); // Blizzard handles hover animation like this it seems. DoCast(me, SPELL_HEAT_WAVE_AURA); events.SetPhase(PHASE_VX_001); @@ -1135,9 +1134,8 @@ class boss_aerial_command_unit : public CreatureScript damage = me->GetHealth() - 1; // Let creature fall to 1 hp, but do not let it die or damage itself with SetHealth(). me->SetReactState(REACT_PASSIVE); me->AttackStop(); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_HOVER | UNIT_BYTE1_FLAG_ALWAYS_STAND), true); - me->SetHover(false); me->SetDisableGravity(true); + me->SetAnimTier(AnimTier::Ground); DoCastSelf(SPELL_VEHICLE_DAMAGED, true); @@ -1171,7 +1169,6 @@ class boss_aerial_command_unit : public CreatureScript events.ScheduleEvent(EVENT_SUMMON_FIRE_BOTS, 1s, 0, PHASE_AERIAL_COMMAND_UNIT); [[fallthrough]]; case DO_START_AERIAL: - me->SetAnimTier(UNIT_BYTE1_FLAG_HOVER, true); me->SetDisableGravity(false); me->SetHover(true); me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE)); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 5f5104b2649..b363bd4ea8a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -310,7 +310,6 @@ struct boss_razorscale : public BossAI _permaGround = false; _flyCount = 0; me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), true); } void Reset() override @@ -360,7 +359,6 @@ struct boss_razorscale : public BossAI summons.DoAction(ACTION_START_FIGHT, DummyEntryCheckPredicate()); events.ScheduleEvent(EVENT_BERSERK, 15min); HandleMusic(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), true); } void ScheduleAirPhaseEvents() @@ -398,7 +396,6 @@ struct boss_razorscale : public BossAI case ACTION_START_PERMA_GROUND: { me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, true); me->RemoveAurasDueToSpell(SPELL_STUN_SELF); Talk(EMOTE_PERMA_GROUND); DoCastSelf(SPELL_WING_BUFFET); @@ -430,7 +427,6 @@ struct boss_razorscale : public BossAI break; case POINT_RAZORSCALE_GROUND: me->SetDisableGravity(false); - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, true); if (!_permaGround) { DoCastSelf(SPELL_STUN_SELF, true); @@ -626,7 +622,6 @@ struct boss_razorscale : public BossAI case EVENT_RESUME_AIR_PHASE: { me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), true); events.SetPhase(PHASE_AIR); me->SetReactState(REACT_PASSIVE); Position pos = me->GetPosition(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 5d13f148e5b..029e24396e2 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -283,7 +283,7 @@ class npc_enslaved_proto_drake : public CreatureScript { if (type == WAYPOINT_MOTION_TYPE && id == POINT_LAST) { - me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false); + me->SetAnimTier(AnimTier::Ground); } } @@ -292,7 +292,7 @@ class npc_enslaved_proto_drake : public CreatureScript if (type == TYPE_PROTODRAKE_AT && data == DATA_PROTODRAKE_MOVE && !_setData && me->GetDistance(protodrakeCheckPos) < 5.0f) { _setData = true; - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); + me->SetAnimTier(AnimTier::Fly); me->GetMotionMaster()->MovePath(PATH_PROTODRAKE, false); } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 9f3059fc043..acd4c27dc7c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -373,7 +373,6 @@ public: me->SetFarVisible(true); me->SetCanFly(true); me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), false); _scheduler.Schedule(Seconds(2), [this](TaskContext /*context*/) { diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index e0339e8d9c3..d7c27b839eb 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -442,7 +442,6 @@ public: me->SetCanFly(true); me->SetDisableGravity(true); - me->SetAnimTier(UnitBytes1_Flags(UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER), true); me->GetMotionMaster()->MoveTakeoff(POINT_MOVE_UP, pos); } } |