Merge 3.3.5 to npcbots_3.3.5

sql/updates/world/3.3.5/2022_03_22_02_world_335.sql

@@ -0,0 +1,2 @@
+-- Fixed ruRU translation of the objectives field for quest 5624
+UPDATE `quest_template_locale` SET `VerifiedBuild`=0, `Objectives`='Разыщите стражника Робертса и исцелите его раны, пользуясь "Малым исцелением" (уровень 2), а затем одарите его заклинанием "Слово силы: Стойкость", после чего вернитесь в Златоземье к жрице Жозетте.' WHERE `ID`=5624 AND `locale`='ruRU';

sql/updates/world/3.3.5/2022_03_22_04_world.sql

@@ -0,0 +1,17 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 26359 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(26359,0,0,0,8,0,100,0,47431,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Ice Heart Jormungar Spawn - On Spellhit 'Capture Jormungar Spawn' - Despawn"),
+(26359,0,1,0,0,0,100,0,5000,15000,10000,15000,0,11,43358,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Ice Heart Jormungar Spawn - In Combat - Cast 'Gut Rip'");
+
+UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` = 190510;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 190510 AND `source_type` = 1;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(190510,1,0,0,60,0,100,0,3000,3000,3000,3000,0,147,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Captured Jormungar Spawn - On Update - Activate Object (Animate Custom0)");
+
+-- Previous condition allowed to use item only in specific zone, it's wrong at least because it allows to use it even without target
+-- Custom error specifies that it can be used only on Ice Heart Jormungar Spawn but that error looks unused because
+-- when used on wrong target it only throws Invalid target error, nothing else. Keeping for now
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 17 AND `SourceEntry` = 47431;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(17,0,47431,0,0,31,1,3,26359,0,0,172,21,"","Group 0: Spell 'Capture Jormungar Spawn' targets creature 'Ice Heart Jormungar Spawn'");

sql/updates/world/3.3.5/2022_03_22_05_world.sql

@@ -0,0 +1,11 @@
+--
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = 31247;
+
+DELETE FROM `gossip_menu_option` WHERE `MenuID` = 10210 AND `OptionID` = 1;
+INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES
+(10210,1,1,"I hear you sell motorcycle parts.",33010,3,128,0,0,0,0,'',0,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 10210;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15,10210,1,0,0,25,0,60866,0,0,0,0,0,"","Group 0: Show Gossip Option 1 if spell 'Mechano-hog' is learned"),
+(15,10210,1,0,1,25,0,60867,0,0,0,0,0,"","Group 1: Show Gossip Option 1 if spell 'Mekgineer's Chopper' is learned");

sql/updates/world/3.3.5/2022_03_23_00_world.sql

@@ -0,0 +1,19 @@
+--
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 54581;
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_storm_peaks_mammoth_explosion_master','spell_storm_peaks_unstable_explosive_detonation');
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(54581,'spell_storm_peaks_mammoth_explosion_master'),
+(54892,'spell_storm_peaks_unstable_explosive_detonation');
+
+UPDATE `smart_scripts` SET `action_param1` = 2000, `comment` = "Ironwool Mammoth - On Spellhit 'Throw U.D.E.D.' - Delayed Despawn" WHERE `entryorguid` = 29402 AND `source_type` = 0 AND `id` = 2;
+
+UPDATE `smart_scripts` SET `action_type` = 11, `comment` = "U.D.E.D. Dispenser - On Gossip Option 0 Selected - Cast 'Forceitem U.D.E.D.'" WHERE `entryorguid` = 191553 AND `source_type` = 1 AND `id` = 1;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 29524 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(29524,0,0,1,11,0,100,0,0,0,0,0,0,11,54625,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Mammoth Meat Bunny - On Spawn - Cast 'Summon Mammoth Meat'"),
+(29524,0,1,0,61,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Mammoth Meat Bunny - On Spawn - Despawn");
+
+DELETE FROM `gameobject` WHERE `id` = 191567;
+DELETE FROM `spawn_group` WHERE `spawnId` IN (57902,57903,57904,57905,57906,57907) AND `spawnType` = 1;

src/server/game/AI/SmartScripts/SmartScriptMgr.h

@@ -1167,6 +1167,7 @@ struct SmartAction
         struct
         {
             uint32 gameObjectAction;
+            uint32 param; // UNUSED: param reserved for compatibility with master branch
         } activateGameObject;
 
         struct

src/server/game/Entities/Creature/Creature.cpp

@@ -2647,7 +2647,7 @@ bool Creature::LoadCreaturesAddon()
         SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_PET_TALENTS, 0);
         SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_VIS_FLAG, uint8((cainfo->bytes1 >> 16) & 0xFF));
 
-        SetAnimationTier(static_cast<AnimationTier>((cainfo->bytes1 >> 24) & 0xFF));
+        SetAnimTier(static_cast<AnimTier>((cainfo->bytes1 >> 24) & 0xFF));
 
         //! Suspected correlation between UNIT_FIELD_BYTES_1, offset 3, value 0x2:
         //! If no inhabittype_fly (if no MovementFlag_DisableGravity or MovementFlag_CanFly flag found in sniffs)
@@ -3056,21 +3056,21 @@ bool Creature::SetWalk(bool enable)
     return true;
 }
 
-bool Creature::SetDisableGravity(bool disable, bool packetOnly /*=false*/, bool updateAnimationTier /*= true*/)
+bool Creature::SetDisableGravity(bool disable, bool packetOnly /*=false*/, bool updateAnimTier /*= true*/)
 {
     //! It's possible only a packet is sent but moveflags are not updated
     //! Need more research on this
-    if (!packetOnly && !Unit::SetDisableGravity(disable, packetOnly, updateAnimationTier))
+    if (!packetOnly && !Unit::SetDisableGravity(disable, packetOnly, updateAnimTier))
         return false;
 
-    if (updateAnimationTier && IsAlive() && !HasUnitState(UNIT_STATE_ROOT) && !GetMovementTemplate().IsRooted())
+    if (updateAnimTier && IsAlive() && !HasUnitState(UNIT_STATE_ROOT) && !GetMovementTemplate().IsRooted())
     {
         if (IsGravityDisabled())
-            SetAnimationTier(AnimationTier::Fly);
+            SetAnimTier(AnimTier::Fly);
         else if (IsHovering())
-            SetAnimationTier(AnimationTier::Hover);
+            SetAnimTier(AnimTier::Hover);
         else
-            SetAnimationTier(AnimationTier::Ground);
+            SetAnimTier(AnimTier::Ground);
     }
 
     if (!movespline->Initialized())
@@ -3138,19 +3138,19 @@ bool Creature::SetFeatherFall(bool enable, bool packetOnly /* = false */)
     return true;
 }
 
-bool Creature::SetHover(bool enable, bool packetOnly /*= false*/, bool updateAnimationTier /*= true*/)
+bool Creature::SetHover(bool enable, bool packetOnly /*= false*/, bool updateAnimTier /*= true*/)
 {
-    if (!packetOnly && !Unit::SetHover(enable, packetOnly, updateAnimationTier))
+    if (!packetOnly && !Unit::SetHover(enable, packetOnly, updateAnimTier))
         return false;
 
-    if (updateAnimationTier && IsAlive() && !HasUnitState(UNIT_STATE_ROOT) && !GetMovementTemplate().IsRooted())
+    if (updateAnimTier && IsAlive() && !HasUnitState(UNIT_STATE_ROOT) && !GetMovementTemplate().IsRooted())
     {
         if (IsGravityDisabled())
-            SetAnimationTier(AnimationTier::Fly);
+            SetAnimTier(AnimTier::Fly);
         else if (IsHovering())
-            SetAnimationTier(AnimationTier::Hover);
+            SetAnimTier(AnimTier::Hover);
         else
-            SetAnimationTier(AnimationTier::Ground);
+            SetAnimTier(AnimTier::Ground);
     }
 
     if (!movespline->Initialized())

src/server/game/Entities/Creature/Creature.h

@@ -159,12 +159,12 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma
         CreatureAI* AI() const { return reinterpret_cast<CreatureAI*>(GetAI()); }
 
         bool SetWalk(bool enable) override;
-        bool SetDisableGravity(bool disable, bool packetOnly = false, bool updateAnimationTier = true) override;
+        bool SetDisableGravity(bool disable, bool packetOnly = false, bool updateAnimTier = true) override;
         bool SetSwim(bool enable) override;
         bool SetCanFly(bool enable, bool packetOnly = false) override;
         bool SetWaterWalking(bool enable, bool packetOnly = false) override;
         bool SetFeatherFall(bool enable, bool packetOnly = false) override;
-        bool SetHover(bool enable, bool packetOnly = false, bool updateAnimationTier = true) override;
+        bool SetHover(bool enable, bool packetOnly = false, bool updateAnimTier = true) override;
 
         uint32 GetShieldBlockValue() const override;
 

src/server/game/Entities/Object/Object.cpp

@@ -2004,8 +2004,8 @@ void WorldObject::SetZoneScript()
 {
     if (Map* map = FindMap())
     {
-        if (map->IsDungeon())
-            m_zoneScript = (ZoneScript*)((InstanceMap*)map)->GetInstanceScript();
+        if (InstanceMap* instanceMap = map->ToInstanceMap())
+            m_zoneScript = reinterpret_cast<ZoneScript*>(instanceMap->GetInstanceScript());
         else if (!map->IsBattlegroundOrArena())
         {
             if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(GetZoneId()))

src/server/game/Entities/Player/Player.cpp

@@ -26749,9 +26749,9 @@ bool Player::IsInWhisperWhiteList(ObjectGuid guid)
     return false;
 }
 
-bool Player::SetDisableGravity(bool disable, bool packetOnly /*= false*/, bool updateAnimationTier /*= true*/)
+bool Player::SetDisableGravity(bool disable, bool packetOnly /*= false*/, bool updateAnimTier /*= true*/)
 {
-    if (!packetOnly && !Unit::SetDisableGravity(disable, packetOnly, updateAnimationTier))
+    if (!packetOnly && !Unit::SetDisableGravity(disable, packetOnly, updateAnimTier))
         return false;
 
     WorldPacket data(disable ? SMSG_MOVE_GRAVITY_DISABLE : SMSG_MOVE_GRAVITY_ENABLE, 12);
@@ -26788,9 +26788,9 @@ bool Player::SetCanFly(bool apply, bool packetOnly /*= false*/)
         return false;
 }
 
-bool Player::SetHover(bool apply, bool packetOnly /*= false*/, bool updateAnimationTier /*= true*/)
+bool Player::SetHover(bool apply, bool packetOnly /*= false*/, bool updateAnimTier /*= true*/)
 {
-    if (!packetOnly && !Unit::SetHover(apply, packetOnly, updateAnimationTier))
+    if (!packetOnly && !Unit::SetHover(apply, packetOnly, updateAnimTier))
         return false;
 
     WorldPacket data(apply ? SMSG_MOVE_SET_HOVER : SMSG_MOVE_UNSET_HOVER, 12);

src/server/game/Entities/Player/Player.h

@@ -2172,11 +2172,11 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
         bool IsInWhisperWhiteList(ObjectGuid guid);
         void RemoveFromWhisperWhiteList(ObjectGuid guid) { WhisperList.remove(guid); }
 
-        bool SetDisableGravity(bool disable, bool packetOnly /* = false */, bool updateAnimationTier = true) override;
+        bool SetDisableGravity(bool disable, bool packetOnly /* = false */, bool updateAnimTier = true) override;
         bool SetCanFly(bool apply, bool packetOnly = false) override;
         bool SetWaterWalking(bool apply, bool packetOnly = false) override;
         bool SetFeatherFall(bool apply, bool packetOnly = false) override;
-        bool SetHover(bool enable, bool packetOnly = false, bool updateAnimationTier = true) override;
+        bool SetHover(bool enable, bool packetOnly = false, bool updateAnimTier = true) override;
 
         bool CanFly() const override { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_CAN_FLY); }
         bool CanEnterWater() const override { return true; }

src/server/game/Entities/Unit/Unit.cpp

@@ -544,7 +544,7 @@ void Unit::UpdateSplineMovement(uint32 t_diff)
         DisableSpline();
 
         if (movespline->HasAnimation())
-            SetAnimationTier(movespline->GetAnimationTier());
+            SetAnimTier(movespline->GetAnimTier());
     }
 
     UpdateSplinePosition();
@@ -10655,7 +10655,7 @@ bool Unit::IsPolymorphed() const
     return spellInfo->GetSpellSpecific() == SPELL_SPECIFIC_MAGE_POLYMORPH;
 }
 
-void Unit::SetAnimationTier(AnimationTier tier)
+void Unit::SetAnimTier(AnimTier tier)
 {
     if (!IsCreature())
         return;
@@ -13893,7 +13893,7 @@ bool Unit::SetWalk(bool enable)
     return true;
 }
 
-bool Unit::SetDisableGravity(bool disable, bool /*packetOnly = false*/, bool /*updateAnimationTier = true*/)
+bool Unit::SetDisableGravity(bool disable, bool /*packetOnly = false*/, bool /*updateAnimTier = true*/)
 {
     if (disable == IsGravityDisabled())
         return false;
@@ -13960,7 +13960,7 @@ bool Unit::SetFeatherFall(bool enable, bool /*packetOnly = false */)
     return true;
 }
 
-bool Unit::SetHover(bool enable, bool /*packetOnly = false*/, bool /*updateAnimationTier = true*/)
+bool Unit::SetHover(bool enable, bool /*packetOnly = false*/, bool /*updateAnimTier = true*/)
 {
     if (enable == HasUnitMovementFlag(MOVEMENTFLAG_HOVER))
         return false;

src/server/game/Entities/Unit/Unit.h

@@ -959,8 +959,8 @@ class TC_GAME_API Unit : public WorldObject
         bool IsStandState() const;
         void SetStandState(uint8 state);
 
-        void SetAnimationTier(AnimationTier tier);
-        AnimationTier GetAnimationTier() const { return static_cast<AnimationTier>(GetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER)); }
+        void SetAnimTier(AnimTier tier);
+        AnimTier GetAnimTier() const { return static_cast<AnimTier>(GetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER)); }
 
         void SetStandFlags(uint8 flags) { SetByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_VIS_FLAG, flags); }
         void RemoveStandFlags(uint8 flags) { RemoveByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_VIS_FLAG, flags); }
@@ -1166,12 +1166,12 @@ class TC_GAME_API Unit : public WorldObject
         bool IsWalking() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALKING); }
         bool IsHovering() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_HOVER); }
         virtual bool SetWalk(bool enable);
-        virtual bool SetDisableGravity(bool disable, bool packetOnly = false, bool updateAnimationTier = true);
+        virtual bool SetDisableGravity(bool disable, bool packetOnly = false, bool updateAnimTier = true);
         virtual bool SetSwim(bool enable);
         virtual bool SetCanFly(bool enable, bool packetOnly = false);
         virtual bool SetWaterWalking(bool enable, bool packetOnly = false);
         virtual bool SetFeatherFall(bool enable, bool packetOnly = false);
-        virtual bool SetHover(bool enable, bool packetOnly = false, bool updateAnimationTier = true);
+        virtual bool SetHover(bool enable, bool packetOnly = false, bool updateAnimTier = true);
 
         void SetInFront(WorldObject const* target);
         void SetFacingTo(float const ori, bool force = true);

src/server/game/Entities/Unit/UnitDefines.h

@@ -78,7 +78,7 @@ enum UnitBytes2Offsets : uint8
 };
 
 // UNIT_FIELD_BYTES_1 (UNIT_BYTES_1_OFFSET_ANIM_TIER)
-enum class AnimationTier : uint8
+enum class AnimTier : uint8
 {
     Ground      = 0, // plays ground tier animations
     Swim        = 1, // falls back to ground tier animations, not handled by the client, should never appear in sniffs, will prevent tier change animations from playing correctly if used

src/server/game/Movement/MotionMaster.cpp

@@ -699,7 +699,7 @@ void MotionMaster::MoveLand(uint32 id, Position const& pos, Optional<float> velo
 
     Movement::MoveSplineInit init(_owner);
     init.MoveTo(PositionToVector3(pos), false);
-    init.SetAnimation(AnimationTier::Ground);
+    init.SetAnimation(AnimTier::Ground);
     if (velocity)
         init.SetVelocity(*velocity);
     Add(new GenericMovementGenerator(std::move(init), EFFECT_MOTION_TYPE, id));
@@ -711,7 +711,7 @@ void MotionMaster::MoveTakeoff(uint32 id, Position const& pos, Optional<float> v
 
     Movement::MoveSplineInit init(_owner);
     init.MoveTo(PositionToVector3(pos), false);
-    init.SetAnimation(AnimationTier::Hover);
+    init.SetAnimation(AnimTier::Hover);
     if (velocity)
         init.SetVelocity(*velocity);
     Add(new GenericMovementGenerator(std::move(init), EFFECT_MOTION_TYPE, id));
@@ -877,7 +877,7 @@ void MotionMaster::MoveCirclePath(float x, float y, float z, float radius, bool
     {
         init.SetFly();
         init.SetCyclic();
-        init.SetAnimation(AnimationTier::Hover);
+        init.SetAnimation(AnimTier::Hover);
     }
     else
     {

src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp

@@ -351,10 +351,10 @@ void WaypointMovementGenerator<Creature>::StartMove(Creature* owner, bool relaun
     switch (waypoint.moveType)
     {
         case WAYPOINT_MOVE_TYPE_LAND:
-            init.SetAnimation(AnimationTier::Ground);
+            init.SetAnimation(AnimTier::Ground);
             break;
         case WAYPOINT_MOVE_TYPE_TAKEOFF:
-            init.SetAnimation(AnimationTier::Hover);
+            init.SetAnimation(AnimTier::Hover);
             break;
         case WAYPOINT_MOVE_TYPE_RUN:
             init.SetWalk(false);

src/server/game/Movement/Spline/MoveSpline.h

@@ -22,7 +22,7 @@
 #include "MoveSplineInitArgs.h"
 #include <G3D/Vector3.h>
 
-enum class AnimationTier : uint8;
+enum class AnimTier : uint8;
 
 namespace Movement
 {
@@ -126,7 +126,7 @@ namespace Movement
         int32 currentPathIdx() const;
 
         bool HasAnimation() const { return splineflags.animation; }
-        AnimationTier GetAnimationTier() const { return static_cast<AnimationTier>(splineflags.animTier); }
+        AnimTier GetAnimTier() const { return static_cast<AnimTier>(splineflags.animTier); }
 
         bool onTransport;
         std::string ToString() const;

src/server/game/Movement/Spline/MoveSplineFlag.h

@@ -58,7 +58,7 @@ namespace Movement
 
             // Masks
             Mask_Final_Facing   = Final_Point | Final_Target | Final_Angle,
-            // animation ids stored here, see AnimationTier enum, used with Animation flag
+            // animation ids stored here, see AnimTier enum, used with Animation flag
             Mask_Animations     = 0xFF,
             // flags that shouldn't be appended into SMSG_MONSTER_MOVE\SMSG_MONSTER_MOVE_TRANSPORT packet, should be more probably
             Mask_No_Monster_Move = Mask_Final_Facing | Mask_Animations | Done,

src/server/game/Movement/Spline/MoveSplineInit.h

@@ -22,7 +22,7 @@
 
 class Unit;
 
-enum class AnimationTier : uint8;
+enum class AnimTier : uint8;
 
 namespace Movement
 {
@@ -70,7 +70,7 @@ namespace Movement
         /* Plays animation after movement done
          * can't be combined with parabolic movement
          */
-        void SetAnimation(AnimationTier anim);
+        void SetAnimation(AnimTier anim);
 
         /* Adds final facing animation
          * sets unit's facing to specified point/angle after all path done
@@ -161,7 +161,7 @@ namespace Movement
         args.flags.EnableParabolic();
     }
 
-    inline void MoveSplineInit::SetAnimation(AnimationTier anim)
+    inline void MoveSplineInit::SetAnimation(AnimTier anim)
     {
         args.time_perc = 0.f;
         args.flags.EnableAnimation((uint8)anim);