From 8a4dd6ce04a5c007d503404f479decd217509781 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 2 Jun 2020 19:34:44 +0200 Subject: [PATCH] Scripts/Misc: corrected movement template data for Battered Red Drakes in preparation for anim tier handlings --- sql/updates/world/4.3.4/2020_06_02_00_world.sql | 11 +++++++++++ .../BastionOfTwilight/boss_halfus_wyrmbreaker.cpp | 4 +--- .../scripts/EasternKingdoms/GrimBatol/grim_batol.cpp | 5 ++--- 3 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 sql/updates/world/4.3.4/2020_06_02_00_world.sql diff --git a/sql/updates/world/4.3.4/2020_06_02_00_world.sql b/sql/updates/world/4.3.4/2020_06_02_00_world.sql new file mode 100644 index 00000000000..0079403628e --- /dev/null +++ b/sql/updates/world/4.3.4/2020_06_02_00_world.sql @@ -0,0 +1,11 @@ +UPDATE `creature_template` SET `flags_extra`= `flags_extra` | 512 WHERE `entry` IN (39294, 44828, 44829, 44826, 44653); +UPDATE `creature_template_movement` SET `Flight`= 0, `Ground`= 1 WHERE `CreatureId` IN (39294, 44828, 44829, 44826, 44653); + +UPDATE `creature_template` SET `flags_extra`= `flags_extra` | 512 WHERE `entry` IN (46221, 46218, 46212, 46215); +UPDATE `creature_template_movement` SET `Flight`= 0, `Ground`= 1 WHERE `CreatureId` IN (46221, 46218, 46212, 46215); + +UPDATE `creature_template` SET `flags_extra`= `flags_extra` | 512 WHERE `entry` IN (46222, 46219, 46213, 46216); +UPDATE `creature_template_movement` SET `Flight`= 0, `Ground`= 1 WHERE `CreatureId` IN (46222, 46219, 46213, 46216); + +UPDATE `creature_template` SET `flags_extra`= `flags_extra` | 512 WHERE `entry` IN (46223, 46220, 46214, 46217); +UPDATE `creature_template_movement` SET `Flight`= 0, `Ground`= 1 WHERE `CreatureId` IN (46223, 46220, 46214, 46217); diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp index 2a0d33814df..3efa20a0bdb 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp @@ -545,9 +545,7 @@ class npc_halfus_enslaved_dragon : public CreatureScript if (me->GetEntry() != NPC_ORPHANED_EMERALD_WELP) { me->SetDisableGravity(true); - me->SendSetPlayHoverAnim(true); - me->AddUnitMovementFlag(MOVEMENTFLAG_HOVER); - me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); + me->SetHover(true); } switch (me->GetEntry()) diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp index 4f0c42942a4..e945e572d3b 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp @@ -184,6 +184,7 @@ struct npc_grim_batol_battered_red_drake: public VehicleAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveAurasDueToSpell(SPELL_NET); DoCastSelf(SPELL_BOMBING_RUN_PROTECTION_TRIGGER); + me->SetDisableGravity(true); // Todo: do not update the anim tier here summon->CastSpell(summon, SPELL_NET_SCRIPT); summon->DespawnOrUnsummon(3s); } @@ -216,6 +217,7 @@ struct npc_grim_batol_battered_red_drake: public VehicleAI _instance->SetData(DATA_START_BATTERED_RED_DRAKE_DESPAWN_EVENT, IN_PROGRESS); me->SetControlled(true, UNIT_STATE_ROOT); me->PlayOneShotAnimKitId(ANIM_KIT_ID_LIFTOFF); + // Todo: set anim tier to fly here player->SetMover(me); _playerGuid = player->GetGUID(); @@ -243,9 +245,6 @@ struct npc_grim_batol_battered_red_drake: public VehicleAI case EVENT_SET_HOVERING: if (Player* player = ObjectAccessor::FindConnectedPlayer(_playerGuid)) DoCast(player, SPELL_GEAR_SCALING_TRIGGER, true); - me->SendSetPlayHoverAnim(true); - me->AddUnitMovementFlag(MOVEMENTFLAG_HOVER); - me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_HOVER); break; case EVENT_PREPARE_BOMBARDMENT: if (Player* player = ObjectAccessor::FindConnectedPlayer(_playerGuid))