From 589a1bc4ad8730c788bf728234f68d1398d046f6 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 23 Nov 2017 18:12:44 +0100 Subject: [PATCH 1/5] Core/Movement: Fixed creature hover Closes #15177 --- .../game/Entities/Creature/Creature.cpp | 11 +-- src/server/game/Entities/Object/Object.cpp | 88 +++++++------------ src/server/game/Entities/Unit/Unit.cpp | 17 +--- src/server/game/Entities/Unit/Unit.h | 7 +- src/server/game/Handlers/MovementHandler.cpp | 4 +- src/server/game/Maps/Map.cpp | 12 --- src/server/game/Movement/MotionMaster.cpp | 6 +- .../HomeMovementGenerator.cpp | 1 + .../TargetedMovementGenerator.cpp | 13 ++- 9 files changed, 60 insertions(+), 99 deletions(-) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 3a061c816bc18..9cdef4266d4ac 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -404,6 +404,7 @@ void Creature::RemoveCorpse(bool setSpawnTime, bool destroyForNearbyPlayers) transport->CalculatePassengerPosition(x, y, z, &o); } + UpdateAllowedPositionZ(x, y, z); SetHomePosition(x, y, z, o); GetMap()->CreatureRelocation(this, x, y, z, o); } @@ -1096,11 +1097,7 @@ bool Creature::Create(ObjectGuid::LowType guidlow, Map* map, uint32 phaseMask, u } //! Need to be called after LoadCreaturesAddon - MOVEMENTFLAG_HOVER is set there - if (HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) - { - //! Relocate again with updated Z coord - m_positionZ += GetFloatValue(UNIT_FIELD_HOVERHEIGHT); - } + m_positionZ += GetHoverOffset(); LastUsedScriptID = GetScriptId(); @@ -1631,7 +1628,7 @@ bool Creature::LoadFromDB(ObjectGuid::LowType spawnId, Map* map, bool addToMap, return false; //We should set first home position, because then AI calls home movement - SetHomePosition(data->spawnPoint); + SetHomePosition(*this); m_deathState = ALIVE; @@ -2975,7 +2972,7 @@ void Creature::UpdateMovementFlags() // Set the movement flags if the creature is in that mode. (Only fly if actually in air, only swim if in water, etc) float ground = GetFloorZ(); - bool isInAir = (G3D::fuzzyGt(GetPositionZMinusOffset(), ground + GROUND_HEIGHT_TOLERANCE) || G3D::fuzzyLt(GetPositionZMinusOffset(), ground - GROUND_HEIGHT_TOLERANCE)); // Can be underground too, prevent the falling + bool isInAir = (G3D::fuzzyGt(GetPositionZ(), ground + GROUND_HEIGHT_TOLERANCE) || G3D::fuzzyLt(GetPositionZ(), ground - GROUND_HEIGHT_TOLERANCE)); // Can be underground too, prevent the falling if (GetCreatureTemplate()->InhabitType & INHABIT_AIR && isInAir && !IsFalling()) { diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 61d2da10c88c9..4f124f96e157d 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -390,9 +390,6 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const *data << object->GetPositionX(); *data << object->GetPositionY(); - if (isType(TYPEMASK_UNIT)) - *data << unit->GetPositionZMinusOffset(); - else *data << object->GetPositionZ(); if (transport) @@ -405,9 +402,6 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const { *data << object->GetPositionX(); *data << object->GetPositionY(); - if (isType(TYPEMASK_UNIT)) - *data << unit->GetPositionZMinusOffset(); - else *data << object->GetPositionZ(); } @@ -1463,7 +1457,9 @@ Position WorldObject::GetRandomPoint(Position const& srcPos, float distance) con void WorldObject::UpdateGroundPositionZ(float x, float y, float &z) const { - z = GetMapHeight(x, y, z); + float new_z = GetMapHeight(x, y, z); + if (new_z > INVALID_HEIGHT) + z = new_z + (isType(TYPEMASK_UNIT) ? static_cast(this)->GetHoverOffset() : 0.0f); } void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const @@ -1472,66 +1468,44 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const if (GetTransport()) return; - switch (GetTypeId()) + if (Unit const* unit = ToUnit()) { - case TYPEID_UNIT: + if (!unit->CanFly()) { - // non fly unit don't must be in air - // non swim unit must be at ground (mostly speedup, because it don't must be in water and water level check less fast - if (!ToCreature()->CanFly()) - { - bool canSwim = ToCreature()->CanSwim(); - float ground_z = z; - float max_z = canSwim - ? GetMapWaterOrGroundLevel(x, y, z, &ground_z) - : (ground_z = GetMapHeight(x, y, z)); - if (max_z > INVALID_HEIGHT) - { - if (z > max_z) - z = max_z; - else if (z < ground_z) - z = ground_z; - } - } - else - { - float ground_z = GetMapHeight(x, y, z); - if (std::fabs(z - ground_z) < GetCollisionHeight()) - z = ground_z; - } - break; - } - case TYPEID_PLAYER: - { - // for server controlled moves playr work same as creature (but it can always swim) - if (!ToPlayer()->CanFly()) - { - float ground_z = z; - float max_z = GetMapWaterOrGroundLevel(x, y, z, &ground_z); - if (max_z > INVALID_HEIGHT) - { - if (z > max_z) - z = max_z; - else if (z < ground_z) - z = ground_z; - } - } + bool canSwim = unit->CanSwim(); + float ground_z = z; + float max_z; + if (canSwim) + max_z = GetMapWaterOrGroundLevel(x, y, z, &ground_z); else + max_z = ground_z = GetMapHeight(x, y, z); + + if (max_z > INVALID_HEIGHT) { - float ground_z = GetMapHeight(x, y, z); - if (std::fabs(z - ground_z) < GetCollisionHeight()) + // hovering units cannot go below their hover height + float hoverOffset = unit->GetHoverOffset(); + max_z += hoverOffset; + ground_z += hoverOffset; + + if (z > max_z) + z = max_z; + else if (z < ground_z) z = ground_z; } - break; } - default: + else { - float ground_z = GetMapHeight(x, y, z); - if (ground_z > INVALID_HEIGHT) + float ground_z = GetMapHeight(x, y, z) + unit->GetHoverOffset(); + if (z < ground_z) z = ground_z; - break; } } + else + { + float ground_z = GetMapHeight(x, y, z); + if (ground_z > INVALID_HEIGHT) + z = ground_z; + } } float WorldObject::GetGridActivationRange() const @@ -2322,7 +2296,7 @@ float WorldObject::SelectBestZForDestination(float x, float y, float z, bool exc if (Unit const* unit = ToUnit()) { float const ground = GetFloorZ(); - bool const isInAir = (G3D::fuzzyGt(unit->GetPositionZMinusOffset(), ground + GROUND_HEIGHT_TOLERANCE) || G3D::fuzzyLt(unit->GetPositionZMinusOffset(), ground - GROUND_HEIGHT_TOLERANCE)); + bool const isInAir = (G3D::fuzzyGt(unit->GetPositionZ(), ground + GROUND_HEIGHT_TOLERANCE) || G3D::fuzzyLt(unit->GetPositionZ(), ground - GROUND_HEIGHT_TOLERANCE)); if (unit->IsFlying() && isInAir) return z; } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index e811a87e227a5..c55e6f4945909 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -545,7 +545,7 @@ bool Unit::IsWithinMeleeRange(Unit const* obj) const float dx = GetPositionX() - obj->GetPositionX(); float dy = GetPositionY() - obj->GetPositionY(); - float dz = GetPositionZMinusOffset() - obj->GetPositionZMinusOffset(); + float dz = GetPositionZ() - obj->GetPositionZ(); float distsq = dx*dx + dy*dy + dz*dz; float maxdist = GetMeleeRange(obj); @@ -11979,15 +11979,6 @@ bool Unit::InitTamedPet(Pet* pet, uint8 level, uint32 spell_id) } } -float Unit::GetPositionZMinusOffset() const -{ - float offset = 0.0f; - if (HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) - offset = GetFloatValue(UNIT_FIELD_HOVERHEIGHT); - - return GetPositionZ() - offset; -} - void Unit::SetControlled(bool apply, UnitState state) { if (apply) @@ -13549,7 +13540,7 @@ void Unit::_ExitVehicle(Position const* exitPosition) void Unit::BuildMovementPacket(ByteBuffer *data) const { - Unit::BuildMovementPacket(Position(GetPositionX(), GetPositionY(), GetPositionZMinusOffset(), GetOrientation()), m_movementInfo.transport.pos, m_movementInfo, data); + Unit::BuildMovementPacket(*this, m_movementInfo.transport.pos, m_movementInfo, data); } void Unit::BuildMovementPacket(Position const& pos, Position const& transportPos, MovementInfo const& movementInfo, ByteBuffer* data) @@ -13959,7 +13950,7 @@ void Unit::SetFacingTo(float ori, bool force) return; Movement::MoveSplineInit init(this); - init.MoveTo(GetPositionX(), GetPositionY(), GetPositionZMinusOffset(), false); + init.MoveTo(GetPositionX(), GetPositionY(), GetPositionZ(), false); if (HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && GetTransGUID()) init.DisableTransportPathTransformations(); // It makes no sense to target global orientation init.SetFacing(ori); @@ -13974,7 +13965,7 @@ void Unit::SetFacingToObject(WorldObject const* object, bool force) /// @todo figure out under what conditions creature will move towards object instead of facing it where it currently is. Movement::MoveSplineInit init(this); - init.MoveTo(GetPositionX(), GetPositionY(), GetPositionZMinusOffset(), false); + init.MoveTo(GetPositionX(), GetPositionY(), GetPositionZ(), false); init.SetFacing(GetAngle(object)); // when on transport, GetAngle will still return global coordinates (and angle) that needs transforming init.Launch(); } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index d464861f2eabe..9186551a23d8d 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1596,8 +1596,6 @@ class TC_GAME_API Unit : public WorldObject uint16 GetExtraUnitMovementFlags() const { return m_movementInfo.flags2; } void SetExtraUnitMovementFlags(uint16 f) { m_movementInfo.flags2 = f; } - float GetPositionZMinusOffset() const; - void SetControlled(bool apply, UnitState state); void ApplyControlStatesIfNeeded(); @@ -1675,6 +1673,11 @@ class TC_GAME_API Unit : public WorldObject bool IsFalling() const; virtual bool CanSwim() const; + float GetHoverOffset() const + { + return HasUnitMovementFlag(MOVEMENTFLAG_HOVER) ? GetFloatValue(UNIT_FIELD_HOVERHEIGHT) : 0.0f; + } + void RewardRage(uint32 damage, uint32 weaponSpeedHitFactor, bool attacker); virtual float GetFollowAngle() const { return static_cast(M_PI/2); } diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 5f641d6951d38..720733249e3a0 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -86,9 +86,7 @@ void WorldSession::HandleMoveWorldportAck() return; } - float z = loc.GetPositionZ(); - if (GetPlayer()->HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) - z += GetPlayer()->GetFloatValue(UNIT_FIELD_HOVERHEIGHT); + float z = loc.GetPositionZ() + GetPlayer()->GetHoverOffset(); GetPlayer()->Relocate(loc.GetPositionX(), loc.GetPositionY(), z, loc.GetOrientation()); GetPlayer()->SetFallInformation(0, GetPlayer()->GetPositionZ()); diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 589dce1ed32e0..347882d34c6d6 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1029,12 +1029,6 @@ void Map::PlayerRelocation(Player* player, float x, float y, float z, float orie Cell old_cell(player->GetPositionX(), player->GetPositionY()); Cell new_cell(x, y); - //! If hovering, always increase our server-side Z position - //! Client automatically projects correct position based on Z coord sent in monster move - //! and UNIT_FIELD_HOVERHEIGHT sent in object updates - if (player->HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) - z += player->GetFloatValue(UNIT_FIELD_HOVERHEIGHT); - player->Relocate(x, y, z, orientation); if (player->IsVehicle()) player->GetVehicleKit()->RelocatePassengers(); @@ -1065,12 +1059,6 @@ void Map::CreatureRelocation(Creature* creature, float x, float y, float z, floa if (!respawnRelocationOnFail && !getNGrid(new_cell.GridX(), new_cell.GridY())) return; - //! If hovering, always increase our server-side Z position - //! Client automatically projects correct position based on Z coord sent in monster move - //! and UNIT_FIELD_HOVERHEIGHT sent in object updates - if (creature->HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) - z += creature->GetFloatValue(UNIT_FIELD_HOVERHEIGHT); - // delay creature move for grid/cell to grid/cell moves if (old_cell.DiffCell(new_cell) || old_cell.DiffGrid(new_cell)) { diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 131c96cce22e9..c10870703faaf 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -356,7 +356,7 @@ void MotionMaster::MoveCloserAndStop(uint32 id, Unit* target, float distance) { // we are already close enough. We just need to turn toward the target without changing position. Movement::MoveSplineInit init(_owner); - init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZMinusOffset()); + init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ()); init.SetFacing(target); init.Launch(); Mutate(new EffectMovementGenerator(id), MOTION_SLOT_ACTIVE); @@ -499,7 +499,7 @@ void MotionMaster::MoveCirclePath(float x, float y, float z, float radius, bool if (_owner->IsFlying()) point.z = z; else - point.z = _owner->GetMapHeight(point.x, point.y, z); + point.z = _owner->GetMapHeight(point.x, point.y, z) + _owner->GetHoverOffset(); init.Path().push_back(point); } @@ -600,7 +600,7 @@ void MotionMaster::MoveFall(uint32 id /*=0*/) } Movement::MoveSplineInit init(_owner); - init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), tz, false); + init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), tz + _owner->GetHoverOffset(), false); init.SetFall(); init.Launch(); Mutate(new EffectMovementGenerator(id), MOTION_SLOT_CONTROLLED); diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp index 809c8b8bccda0..dd72838c247b4 100644 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp @@ -52,6 +52,7 @@ void HomeMovementGenerator::SetTargetLocation(Creature* owner) owner->GetHomePosition(x, y, z, o); init.SetFacing(o); } + owner->UpdateAllowedPositionZ(x, y, z); init.MoveTo(x, y, z); init.SetWalk(false); init.Launch(); diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index de0a16e1910c3..4de930e56b660 100644 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -125,29 +125,38 @@ void TargetedMovementGenerator::SetTargetLocation(T* owner, bool updateDes float x, y, z; if (updateDestination || !_path) { + float size = owner->GetCombatReach(); + float hoverDiff = owner->GetHoverOffset() - GetTarget()->GetHoverOffset(); if (!_offset) { if (GetTarget()->IsWithinDistInMap(owner, CONTACT_DISTANCE)) return; - GetTarget()->GetContactPoint(owner, x, y, z); + if (hoverDiff) + size = size > hoverDiff ? std::sqrt(size * size - hoverDiff * hoverDiff) : 0.0f; + + GetTarget()->GetNearPoint(owner, x, y, z, size, CONTACT_DISTANCE, GetTarget()->GetAngle(owner)); } else { float distance = _offset + 1.0f; - float size = owner->GetCombatReach(); if (owner->IsPet() && GetTarget()->GetTypeId() == TYPEID_PLAYER) { distance = 1.0f; size = 1.0f; } + else if (hoverDiff) + size = size > hoverDiff ? std::sqrt(size * size - hoverDiff * hoverDiff) : 0.0f; if (GetTarget()->IsWithinDistInMap(owner, distance)) return; GetTarget()->GetClosePoint(x, y, z, size, _offset, _angle); } + + if (owner->IsHovering()) + owner->UpdateAllowedPositionZ(x, y, z); } else { From bc6c52e0318aa670fdf8a6604da073fc12e8fa3f Mon Sep 17 00:00:00 2001 From: Chaouki Dhib Date: Thu, 23 Nov 2017 18:17:03 +0100 Subject: [PATCH 2/5] Scripts/Misc: Hover script fixes --- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 1 + .../TrialOfTheCrusader/trial_of_the_crusader.cpp | 4 ++-- src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 8f07b4db44216..b8516fd4eac02 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -237,6 +237,7 @@ struct boss_twin_baseAI : public BossAI void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); + me->SetHover(false); if (Creature* pSister = GetSister()) { if (!pSister->IsAlive()) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 3927e7c449ba2..0729f1508c211 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -190,8 +190,8 @@ Position const ToCCommonLoc[] = { 550.955933f, 195.338888f, 395.14000f, 0.0f }, // 4 - Left { 563.833008f, 195.244995f, 394.585561f, 0.0f }, // 5 - Center { 573.500000f, 180.500000f, 395.14f, 0.0f }, // 6 Move 0 Right - { 553.5f, 180.5f, 395.14f, 0 }, // 7 Move 0 Left - { 573.0f, 170.0f, 395.14f, 0 }, // 8 Move 1 Right + { 553.5f, 180.5f, 400.5521f, 0 }, // 7 Move 0 Left + { 573.0f, 170.0f, 400.5521f, 0 }, // 8 Move 1 Right { 549.5139f, 170.1389f, 394.7965f, 5.009095f }, // 9 Move 1 Left { 563.8f, 216.1f, 395.1f, 0 }, // 10 Behind the door diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index cffe94206fee7..f26ddedd8f303 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -350,7 +350,7 @@ Position const VehicleRelocation[] = }; Position const VX001SummonPos = { 2744.431f, 2569.385f, 364.3968f, 3.141593f }; -Position const ACUSummonPos = { 2744.650f, 2569.460f, 380.0000f, 0.0f }; +Position const ACUSummonPos = { 2744.650f, 2569.460f, 380.0000f, 3.141593f }; static bool IsEncounterFinished(Unit* who) { @@ -613,7 +613,7 @@ class boss_mimiron : public CreatureScript { if (Creature* aerial = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_AERIAL_COMMAND_UNIT))) { - aerial->GetMotionMaster()->MoveLand(0, (aerial->GetPositionX(), aerial->GetPositionY(), aerial->GetPositionZMinusOffset())); + aerial->GetMotionMaster()->MoveLand(0, (aerial->GetPositionX(), aerial->GetPositionY(), aerial->GetPositionZ())); aerial->SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER, 0); aerial->CastSpell(vx001, SPELL_MOUNT_VX_001); aerial->CastSpell(aerial, SPELL_HALF_HEAL); @@ -1164,6 +1164,8 @@ class boss_aerial_command_unit : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetImmuneToPC(false); me->SetReactState(REACT_AGGRESSIVE); + me->SetHover(true); + me->SetDisableGravity(false); events.SetPhase(PHASE_AERIAL_COMMAND_UNIT); events.ScheduleEvent(EVENT_SUMMON_JUNK_BOT, 5000, 0, PHASE_AERIAL_COMMAND_UNIT); From 6eb3b142149d79f46b0e2375b07a31d5a7235a70 Mon Sep 17 00:00:00 2001 From: joschiwald Date: Sun, 26 Nov 2017 13:21:26 +0100 Subject: [PATCH 3/5] Scripts/Misc: Fixed hover movement for Stormcaller Brundir --- .../Ulduar/Ulduar/boss_assembly_of_iron.cpp | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 74bdae5051277..ec6ef75d3a015 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -133,9 +133,6 @@ enum Misc DATA_PHASE_3 = 1 }; -#define FLOOR_Z 427.28f -#define FINAL_FLIGHT_Z 435.0f - class boss_steelbreaker : public CreatureScript { public: @@ -476,7 +473,7 @@ class boss_stormcaller_brundir : public CreatureScript _Reset(); Initialize(); me->RemoveAllAuras(); - me->SetDisableGravity(false); + me->SetHover(false); me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_INTERRUPT, false); // Should be interruptable unless overridden by spell (Overload) me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_STUN, false); // Reset immumity, Brundir should be stunnable by default } @@ -547,10 +544,6 @@ class boss_stormcaller_brundir : public CreatureScript if (Steelbreaker->IsAlive()) Steelbreaker->AI()->DoAction(ACTION_SUPERCHARGE); } - - // Prevent to have Brundir somewhere in the air when he die in Air phase - if (me->GetPositionZ() > FLOOR_Z) - me->GetMotionMaster()->MoveFall(); } void KilledUnit(Unit* who) override @@ -598,9 +591,7 @@ class boss_stormcaller_brundir : public CreatureScript DoCast(me, SPELL_LIGHTNING_TENDRILS); DoCast(me, SPELL_LIGHTNING_TENDRILS_VISUAL); me->AttackStop(); - //me->SetLevitate(true); - me->GetMotionMaster()->Initialize(); - me->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), FINAL_FLIGHT_Z); + me->SetHover(true); events.DelayEvents(35000); events.ScheduleEvent(EVENT_FLIGHT, 2500); events.ScheduleEvent(EVENT_ENDFLIGHT, 32500); @@ -608,24 +599,22 @@ class boss_stormcaller_brundir : public CreatureScript break; case EVENT_FLIGHT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - me->GetMotionMaster()->MovePoint(0, target->GetPositionX(), target->GetPositionY(), FINAL_FLIGHT_Z); + me->GetMotionMaster()->MovePoint(0, *target); events.ScheduleEvent(EVENT_FLIGHT, 6000); break; case EVENT_ENDFLIGHT: me->GetMotionMaster()->Initialize(); - me->GetMotionMaster()->MovePoint(0, 1586.920166f, 119.848984f, FINAL_FLIGHT_Z); + me->GetMotionMaster()->MovePoint(0, 1586.920166f, 119.848984f, me->GetPositionZ()); events.CancelEvent(EVENT_FLIGHT); events.CancelEvent(EVENT_ENDFLIGHT); events.ScheduleEvent(EVENT_LAND, 4000); break; case EVENT_LAND: - me->GetMotionMaster()->Initialize(); - me->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), FLOOR_Z); + me->SetHover(false); events.CancelEvent(EVENT_LAND); events.ScheduleEvent(EVENT_GROUND, 2500); break; case EVENT_GROUND: - //me->SetLevitate(false); me->RemoveAurasDueToSpell(sSpellMgr->GetSpellIdForDifficulty(SPELL_LIGHTNING_TENDRILS, me)); me->RemoveAurasDueToSpell(SPELL_LIGHTNING_TENDRILS_VISUAL); DoStartMovement(me->GetVictim()); @@ -637,11 +626,11 @@ class boss_stormcaller_brundir : public CreatureScript { float x = float(irand(-25, 25)); float y = float(irand(-25, 25)); - me->GetMotionMaster()->MovePoint(0, me->GetPositionX() + x, me->GetPositionY() + y, FLOOR_Z); + me->GetMotionMaster()->MovePoint(0, me->GetPositionX() + x, me->GetPositionY() + y, me->GetPositionZ()); // Prevention to go outside the room or into the walls if (Creature* trigger = me->FindNearestCreature(NPC_WORLD_TRIGGER, 100.0f, true)) if (me->GetDistance(trigger) >= 50.0f) - me->GetMotionMaster()->MovePoint(0, trigger->GetPositionX(), trigger->GetPositionY(), FLOOR_Z); + me->GetMotionMaster()->MovePoint(0, *trigger); } events.ScheduleEvent(EVENT_MOVE_POSITION, urand(7500, 10000)); break; From 91fb2eef31b4ad1d13de971458b7710136810183 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 26 Nov 2017 16:37:51 +0100 Subject: [PATCH 4/5] Core/Creatures: Reworked setting move types in database * Each move type has its own field instead of trying to combine everything in InhabitType * Allow overriding movement separately for each spawn --- sql/base/auth_database.sql | 7 +- sql/updates/auth/3.3.5/2018_03_08_00_auth.sql | 7 ++ .../world/3.3.5/2018_03_08_11_world.sql | 34 ++++++ .../Database/Implementation/WorldDatabase.cpp | 2 +- src/server/game/Accounts/RBAC.h | 1 + .../game/Entities/Creature/Creature.cpp | 50 ++++++-- src/server/game/Entities/Creature/Creature.h | 9 +- .../game/Entities/Creature/CreatureData.h | 37 +++++- src/server/game/Globals/ObjectMgr.cpp | 111 ++++++++++++++---- src/server/game/Globals/ObjectMgr.h | 4 + src/server/game/Miscellaneous/Language.h | 2 +- src/server/game/World/World.cpp | 3 + src/server/scripts/Commands/cs_npc.cpp | 2 +- src/server/scripts/Commands/cs_reload.cpp | 10 ++ 14 files changed, 232 insertions(+), 47 deletions(-) create mode 100644 sql/updates/auth/3.3.5/2018_03_08_00_auth.sql create mode 100644 sql/updates/world/3.3.5/2018_03_08_11_world.sql diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 47e4d03143934..11ff05d219cbb 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -820,6 +820,7 @@ INSERT INTO `rbac_linked_permissions` VALUES (196,870), (196,871), (196,872), +(196,873), (197,232), (197,236), (197,237), @@ -1714,7 +1715,8 @@ INSERT INTO `rbac_permissions` VALUES (867,'Command: reload quest_greeting_locale'), (870,'Command: debug threatinfo'), (871,'Command: debug instancespawn'), -(872,'Command: server debug'); +(872,'Command: server debug'), +(873,'Command: reload creature_movement_override'); /*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */; UNLOCK TABLES; @@ -1836,7 +1838,8 @@ INSERT INTO `updates` VALUES ('2018_01_09_00_auth.sql','A5D4EC8FCFAB4F2DCE70EDCAD1ACBFB484FD68D5','ARCHIVED','2018-01-09 00:00:00',69), ('2018_01_24_00_auth.sql','167B17D8A253D62A8112F8A7EB21C6E99CAEF1E4','ARCHIVED','2018-01-24 00:00:00',73), ('2018_02_19_00_auth.sql','80E50F9C7F1EE7BA62789EA4C4F009170B79E6C9','RELEASED','2018-02-18 19:49:37',62), -('2018_03_06_00_auth.sql','2D71E93DF7419A30D0D21D8A80CF05698302575A','RELEASED','2018-03-06 00:00:00',0); +('2018_03_06_00_auth.sql','2D71E93DF7419A30D0D21D8A80CF05698302575A','RELEASED','2018-03-06 00:00:00',0), +('2018_03_08_00_auth.sql','624C58A07E0B4DDC4C1347E8BA8EFEEFD5B43DA7','RELEASED','2018-01-12 15:10:11',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/auth/3.3.5/2018_03_08_00_auth.sql b/sql/updates/auth/3.3.5/2018_03_08_00_auth.sql new file mode 100644 index 0000000000000..8b0e18b1e6cdc --- /dev/null +++ b/sql/updates/auth/3.3.5/2018_03_08_00_auth.sql @@ -0,0 +1,7 @@ +DELETE FROM `rbac_permissions` WHERE `id` = 873; +INSERT INTO `rbac_permissions` (`id`,`name`) VALUES +(873, 'Command: reload creature_movement_override'); + +DELETE FROM `rbac_linked_permissions` WHERE `linkedId` = 873; +INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES +(196, 873); diff --git a/sql/updates/world/3.3.5/2018_03_08_11_world.sql b/sql/updates/world/3.3.5/2018_03_08_11_world.sql new file mode 100644 index 0000000000000..7376263974701 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_03_08_11_world.sql @@ -0,0 +1,34 @@ +DROP TABLE IF EXISTS `creature_template_movement`; +CREATE TABLE `creature_template_movement` ( + `CreatureId` int(10) unsigned NOT NULL DEFAULT '0', + `Ground` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Swim` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Flight` tinyint(3) unsigned NOT NULL DEFAULT '0', + `Rooted` tinyint(3) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`CreatureId`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS `creature_movement_override`; +CREATE TABLE `creature_movement_override` ( + `SpawnId` int(10) unsigned NOT NULL DEFAULT '0', + `Ground` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Swim` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Flight` tinyint(3) unsigned NOT NULL DEFAULT '0', + `Rooted` tinyint(3) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`SpawnId`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `creature_template_movement` SELECT `entry`,0,0,0,0 FROM `creature_template` WHERE `InhabitType`!=3; +UPDATE `creature_template_movement` SET `Ground`=1 WHERE `CreatureId` IN (SELECT `entry` FROM `creature_template` WHERE `InhabitType` & 1); +UPDATE `creature_template_movement` SET `Swim`=1 WHERE `CreatureId` IN (SELECT `entry` FROM `creature_template` WHERE `InhabitType` & 2); +UPDATE `creature_template_movement` SET `Flight`=1 WHERE `CreatureId` IN (SELECT `entry` FROM `creature_template` WHERE (`InhabitType` & 5) = 4); +UPDATE `creature_template_movement` SET `Flight`=2 WHERE `CreatureId` IN (SELECT `entry` FROM `creature_template` WHERE (`InhabitType` & 5) = 5); +UPDATE `creature_template_movement` SET `Rooted`=1 WHERE `CreatureId` IN (SELECT `entry` FROM `creature_template` WHERE `InhabitType` & 8); + +ALTER TABLE `creature_template` DROP `InhabitType`; + +UPDATE `trinity_string` SET `content_default`='Movement type: %s' WHERE `entry`=11008; + +DELETE FROM `command` WHERE `name`='reload creature_movement_override'; +INSERT INTO `command` (`name`,`permission`,`help`) VALUES +('reload creature_movement_override',873,'Syntax: .reload creature_movement_override\nReload creature_movement_override table.'); diff --git a/src/server/database/Database/Implementation/WorldDatabase.cpp b/src/server/database/Database/Implementation/WorldDatabase.cpp index fcedfbb7202cb..40c63a0c527a5 100644 --- a/src/server/database/Database/Implementation/WorldDatabase.cpp +++ b/src/server/database/Database/Implementation/WorldDatabase.cpp @@ -78,7 +78,7 @@ void WorldDatabaseConnection::DoPrepareStatements() PrepareStatement(WORLD_SEL_WAYPOINT_SCRIPT_ID_BY_GUID, "SELECT id FROM waypoint_scripts WHERE guid = ?", CONNECTION_SYNCH); PrepareStatement(WORLD_DEL_CREATURE, "DELETE FROM creature WHERE guid = ?", CONNECTION_ASYNC); PrepareStatement(WORLD_SEL_COMMANDS, "SELECT name, permission, help FROM command", CONNECTION_SYNCH); - PrepareStatement(WORLD_SEL_CREATURE_TEMPLATE, "SELECT entry, difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction, npcflag, speed_walk, speed_run, scale, rank, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, unit_class, unit_flags, unit_flags2, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, InhabitType, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, movementId, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, ScriptName FROM creature_template WHERE entry = ?", CONNECTION_SYNCH); + PrepareStatement(WORLD_SEL_CREATURE_TEMPLATE, "SELECT entry, difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction, npcflag, speed_walk, speed_run, scale, rank, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, unit_class, unit_flags, unit_flags2, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, movementId, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, ScriptName FROM creature_template ct LEFT JOIN creature_template_movement ctm ON ct.entry = ctm.CreatureId WHERE entry = ?", CONNECTION_SYNCH); PrepareStatement(WORLD_SEL_WAYPOINT_SCRIPT_BY_ID, "SELECT guid, delay, command, datalong, datalong2, dataint, x, y, z, o FROM waypoint_scripts WHERE id = ?", CONNECTION_SYNCH); PrepareStatement(WORLD_SEL_ITEM_TEMPLATE_BY_NAME, "SELECT entry FROM item_template WHERE name = ?", CONNECTION_SYNCH); PrepareStatement(WORLD_SEL_CREATURE_BY_ID, "SELECT guid FROM creature WHERE id = ?", CONNECTION_SYNCH); diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h index d9e5bb106d897..522ab23f330dd 100644 --- a/src/server/game/Accounts/RBAC.h +++ b/src/server/game/Accounts/RBAC.h @@ -778,6 +778,7 @@ enum RBACPermissions RBAC_PERM_COMMAND_DEBUG_THREATINFO = 870, RBAC_PERM_COMMAND_DEBUG_INSTANCESPAWN = 871, RBAC_PERM_COMMAND_SERVER_DEBUG = 872, + RBAC_PERM_COMMAND_RELOAD_CREATURE_MOVEMENT_OVERRIDE = 873, // // IF YOU ADD NEW PERMISSIONS, ADD THEM IN MASTER BRANCH AS WELL! // diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 9cdef4266d4ac..c536e24312b95 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -53,6 +53,22 @@ #include "WorldPacket.h" #include +std::string CreatureMovementData::ToString() const +{ + char const* const GroundStates[] = { "None", "Run", "Hover" }; + char const* const FlightStates[] = { "None", "DisableGravity", "CanFly" }; + + std::ostringstream str; + str << std::boolalpha + << "Ground: " << GroundStates[AsUnderlyingType(Ground)] + << ", Swim: " << Swim + << ", Flight: " << FlightStates[AsUnderlyingType(Flight)]; + if (Rooted) + str << ", Rooted"; + + return str.str(); +} + VendorItemCount::VendorItemCount(uint32 _item, uint32 _count) : itemId(_item), count(_count), lastIncrementTime(GameTime::GetGameTime()) { } @@ -610,7 +626,7 @@ bool Creature::UpdateEntry(uint32 entry, CreatureData const* data /*= nullptr*/, ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); } - if (cInfo->InhabitType & INHABIT_ROOT) + if (GetMovementTemplate().IsRooted()) SetControlled(true, UNIT_STATE_ROOT); UpdateMovementFlags(); @@ -2454,7 +2470,7 @@ bool Creature::CanCreatureAttack(Unit const* victim, bool /*force*/) const dist += GetCombatReach() + victim->GetCombatReach(); // to prevent creatures in air ignore attacks because distance is already too high... - if (GetCreatureTemplate()->InhabitType & INHABIT_AIR) + if (GetMovementTemplate().IsFlightAllowed()) return victim->IsInDist2d(&m_homePosition, dist); else return victim->IsInDist(&m_homePosition, dist); @@ -2501,7 +2517,7 @@ bool Creature::LoadCreaturesAddon() //! Check using InhabitType as movement flags are assigned dynamically //! basing on whether the creature is in air or not //! Set MovementFlag_Hover. Otherwise do nothing. - if (GetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER) & UNIT_BYTE1_FLAG_HOVER && !(GetCreatureTemplate()->InhabitType & INHABIT_AIR)) + if (CanHover()) AddUnitMovementFlag(MOVEMENTFLAG_HOVER); } @@ -2612,6 +2628,14 @@ void Creature::GetRespawnPosition(float &x, float &y, float &z, float* ori, floa } } +CreatureMovementData const& Creature::GetMovementTemplate() const +{ + if (CreatureMovementData const* movementOverride = sObjectMgr->GetCreatureMovementOverride(m_spawnId)) + return *movementOverride; + + return GetCreatureTemplate()->Movement; +} + void Creature::AllLootRemovedFromCorpse() { if (loot.loot_type != LOOT_SKINNING && !IsPet() && GetCreatureTemplate()->SkinLootId && hasLootRecipient()) @@ -2879,12 +2903,6 @@ bool Creature::SetHover(bool enable, bool packetOnly /*= false*/) if (!packetOnly && !Unit::SetHover(enable)) return false; - //! Unconfirmed for players: - if (enable) - SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_HOVER); - else - RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_HOVER); - if (!movespline->Initialized()) return true; @@ -2972,25 +2990,31 @@ void Creature::UpdateMovementFlags() // Set the movement flags if the creature is in that mode. (Only fly if actually in air, only swim if in water, etc) float ground = GetFloorZ(); - bool isInAir = (G3D::fuzzyGt(GetPositionZ(), ground + GROUND_HEIGHT_TOLERANCE) || G3D::fuzzyLt(GetPositionZ(), ground - GROUND_HEIGHT_TOLERANCE)); // Can be underground too, prevent the falling + bool canHover = CanHover(); + bool isInAir = (G3D::fuzzyGt(GetPositionZ(), ground + (canHover ? GetFloatValue(UNIT_FIELD_HOVERHEIGHT) : 0.0f) + GROUND_HEIGHT_TOLERANCE) || G3D::fuzzyLt(GetPositionZ(), ground - GROUND_HEIGHT_TOLERANCE)); // Can be underground too, prevent the falling - if (GetCreatureTemplate()->InhabitType & INHABIT_AIR && isInAir && !IsFalling()) + if (GetMovementTemplate().IsFlightAllowed() && isInAir && !IsFalling()) { - if (GetCreatureTemplate()->InhabitType & INHABIT_GROUND) + if (GetMovementTemplate().Flight == CreatureFlightMovementType::CanFly) SetCanFly(true); else SetDisableGravity(true); + + if (!HasAuraType(SPELL_AURA_HOVER)) + SetHover(false); } else { SetCanFly(false); SetDisableGravity(false); + if (CanHover() || HasAuraType(SPELL_AURA_HOVER)) + SetHover(true); } if (!isInAir) RemoveUnitMovementFlag(MOVEMENTFLAG_FALLING); - SetSwim(GetCreatureTemplate()->InhabitType & INHABIT_WATER && IsInWater()); + SetSwim(GetMovementTemplate().IsSwimAllowed() && IsInWater()); } void Creature::SetObjectScale(float scale) diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 0aa74aabf58ed..c46e2022b01a4 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -91,9 +91,12 @@ class TC_GAME_API Creature : public Unit, public GridObject, public Ma bool IsCivilian() const { return (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_CIVILIAN) != 0; } bool IsTrigger() const { return (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER) != 0; } bool IsGuard() const { return (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_GUARD) != 0; } - bool CanWalk() const { return (GetCreatureTemplate()->InhabitType & INHABIT_GROUND) != 0; } - bool CanSwim() const override { return (GetCreatureTemplate()->InhabitType & INHABIT_WATER) != 0 || IsPet(); } - bool CanFly() const override { return (GetCreatureTemplate()->InhabitType & INHABIT_AIR) != 0; } + CreatureMovementData const& GetMovementTemplate() const; + bool CanWalk() const { return GetMovementTemplate().IsGroundAllowed(); } + bool CanSwim() const override { return GetMovementTemplate().IsSwimAllowed() || IsPet(); } + bool CanFly() const override { return GetMovementTemplate().IsFlightAllowed(); } + bool CanHover() const { return GetMovementTemplate().Ground == CreatureGroundMovementType::Hover; } + bool IsDungeonBoss() const { return (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_DUNGEON_BOSS) != 0; } bool IsAffectedByDiminishingReturns() const override { return Unit::IsAffectedByDiminishingReturns() || (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_ALL_DIMINISH) != 0; } diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h index 1305a412bf465..2fc9158078a8c 100644 --- a/src/server/game/Entities/Creature/CreatureData.h +++ b/src/server/game/Entities/Creature/CreatureData.h @@ -74,6 +74,41 @@ enum CreatureFlagsExtra : uint32 CREATURE_FLAG_EXTRA_DB_ALLOWED = (0xFFFFFFFF & ~(CREATURE_FLAG_EXTRA_UNUSED | CREATURE_FLAG_EXTRA_DUNGEON_BOSS)) }; +enum class CreatureGroundMovementType : uint8 +{ + None, + Run, + Hover, + + Max +}; + +enum class CreatureFlightMovementType : uint8 +{ + None, + DisableGravity, + CanFly, + + Max +}; + +struct TC_GAME_API CreatureMovementData +{ + CreatureMovementData() : Ground(CreatureGroundMovementType::Run), Flight(CreatureFlightMovementType::None), Swim(true), Rooted(false) { } + + CreatureGroundMovementType Ground; + CreatureFlightMovementType Flight; + bool Swim; + bool Rooted; + + bool IsGroundAllowed() const { return Ground != CreatureGroundMovementType::None; } + bool IsSwimAllowed() const { return Swim; } + bool IsFlightAllowed() const { return Flight != CreatureFlightMovementType::None; } + bool IsRooted() const { return Rooted; } + + std::string ToString() const; +}; + static const uint32 CREATURE_REGEN_INTERVAL = 2 * IN_MILLISECONDS; static const uint32 PET_FOCUS_REGEN_INTERVAL = 4 * IN_MILLISECONDS; static const uint32 CREATURE_NOPATH_EVADE_TIME = 5 * IN_MILLISECONDS; @@ -133,7 +168,7 @@ struct TC_GAME_API CreatureTemplate uint32 maxgold; std::string AIName; uint32 MovementType; - uint32 InhabitType; + CreatureMovementData Movement; float HoverHeight; float ModHealth; float ModMana; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 1b207d4912e35..0cda1e3111344 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -373,11 +373,11 @@ void ObjectMgr::LoadCreatureTemplates() "type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, " // 49 50 51 52 53 54 55 56 57 58 59 60 61 "spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, " - // 62 63 64 65 66 67 68 69 - "InhabitType, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, " - // 70 71 72 73 74 75 - "movementId, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, ScriptName " - "FROM creature_template"); + // 62 63 64 65 66 67 68 69 70 + "ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, " + // 71 72 73 74 75 76 77 78 + "ExperienceModifier, RacialLeader, movementId, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, ScriptName " + "FROM creature_template ct LEFT JOIN creature_template_movement ctm ON ct.entry = ctm.CreatureId"); if (!result) { @@ -461,21 +461,28 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields) creatureTemplate.maxgold = fields[59].GetUInt32(); creatureTemplate.AIName = fields[60].GetString(); creatureTemplate.MovementType = fields[61].GetUInt8(); - creatureTemplate.InhabitType = fields[62].GetUInt8(); - creatureTemplate.HoverHeight = fields[63].GetFloat(); - creatureTemplate.ModHealth = fields[64].GetFloat(); - creatureTemplate.ModMana = fields[65].GetFloat(); - creatureTemplate.ModArmor = fields[66].GetFloat(); - creatureTemplate.ModDamage = fields[67].GetFloat(); - creatureTemplate.ModExperience = fields[68].GetFloat(); - creatureTemplate.RacialLeader = fields[69].GetBool(); - - creatureTemplate.movementId = fields[70].GetUInt32(); - creatureTemplate.RegenHealth = fields[71].GetBool(); - creatureTemplate.MechanicImmuneMask = fields[72].GetUInt32(); - creatureTemplate.SpellSchoolImmuneMask = fields[73].GetUInt32(); - creatureTemplate.flags_extra = fields[74].GetUInt32(); - creatureTemplate.ScriptID = GetScriptId(fields[75].GetString()); + if (!fields[62].IsNull()) + creatureTemplate.Movement.Ground = static_cast(fields[62].GetUInt8()); + + creatureTemplate.Movement.Swim = fields[63].GetBool(); + if (!fields[64].IsNull()) + creatureTemplate.Movement.Flight = static_cast(fields[64].GetUInt8()); + + creatureTemplate.Movement.Rooted = fields[65].GetBool(); + creatureTemplate.HoverHeight = fields[66].GetFloat(); + creatureTemplate.ModHealth = fields[67].GetFloat(); + creatureTemplate.ModMana = fields[68].GetFloat(); + creatureTemplate.ModArmor = fields[69].GetFloat(); + creatureTemplate.ModDamage = fields[70].GetFloat(); + creatureTemplate.ModExperience = fields[71].GetFloat(); + creatureTemplate.RacialLeader = fields[72].GetBool(); + + creatureTemplate.movementId = fields[73].GetUInt32(); + creatureTemplate.RegenHealth = fields[74].GetBool(); + creatureTemplate.MechanicImmuneMask = fields[75].GetUInt32(); + creatureTemplate.SpellSchoolImmuneMask = fields[76].GetUInt32(); + creatureTemplate.flags_extra = fields[77].GetUInt32(); + creatureTemplate.ScriptID = GetScriptId(fields[78].GetString()); } void ObjectMgr::LoadCreatureTemplateAddons() @@ -929,11 +936,7 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) const_cast(cInfo)->family = CREATURE_FAMILY_NONE; } - if (cInfo->InhabitType <= 0 || cInfo->InhabitType > INHABIT_ANYWHERE) - { - TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has wrong value (%u) in `InhabitType`, creature will not correctly walk/swim/fly.", cInfo->Entry, cInfo->InhabitType); - const_cast(cInfo)->InhabitType = INHABIT_ANYWHERE; - } + CheckCreatureMovement("creature_template_movement", cInfo->Entry, const_cast(cInfo)->Movement); if (cInfo->HoverHeight < 0.0f) { @@ -997,6 +1000,23 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) const_cast(cInfo)->ModDamage *= Creature::_GetDamageMod(cInfo->rank); } +void ObjectMgr::CheckCreatureMovement(char const* table, uint64 id, CreatureMovementData& creatureMovement) +{ + if (creatureMovement.Ground >= CreatureGroundMovementType::Max) + { + TC_LOG_ERROR("sql.sql", "`%s`.`Ground` wrong value (%u) for Id " UI64FMTD ", setting to Run.", + table, uint32(creatureMovement.Ground), id); + creatureMovement.Ground = CreatureGroundMovementType::Run; + } + + if (creatureMovement.Flight >= CreatureFlightMovementType::Max) + { + TC_LOG_ERROR("sql.sql", "`%s`.`Flight` wrong value (%u) for Id " UI64FMTD ", setting to None.", + table, uint32(creatureMovement.Flight), id); + creatureMovement.Flight = CreatureFlightMovementType::None; + } +} + void ObjectMgr::LoadCreatureAddons() { uint32 oldMSTime = getMSTime(); @@ -1169,6 +1189,11 @@ CreatureAddon const* ObjectMgr::GetCreatureTemplateAddon(uint32 entry) const return nullptr; } +CreatureMovementData const* ObjectMgr::GetCreatureMovementOverride(ObjectGuid::LowType spawnId) const +{ + return Trinity::Containers::MapGetValuePtr(_creatureMovementOverrides, spawnId); +} + EquipmentInfo const* ObjectMgr::GetEquipmentInfo(uint32 entry, int8& id) const { EquipmentInfoContainer::const_iterator itr = _equipmentInfoStore.find(entry); @@ -1272,6 +1297,42 @@ void ObjectMgr::LoadEquipmentTemplates() TC_LOG_INFO("server.loading", ">> Loaded %u equipment templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); } +void ObjectMgr::LoadCreatureMovementOverrides() +{ + uint32 oldMSTime = getMSTime(); + + _creatureMovementOverrides.clear(); + + QueryResult result = WorldDatabase.Query("SELECT SpawnId, Ground, Swim, Flight, Rooted from creature_movement_override"); + if (!result) + { + TC_LOG_INFO("server.loading", ">> Loaded 0 creature movement overrides. DB table `creature_movement_override` is empty!"); + return; + } + + do + { + Field* fields = result->Fetch(); + ObjectGuid::LowType spawnId = fields[0].GetUInt32(); + if (!GetCreatureData(spawnId)) + { + TC_LOG_ERROR("sql.sql", "Creature (GUID: %u) does not exist but has a record in `creature_movement_override`", spawnId); + continue; + } + + CreatureMovementData& movement = _creatureMovementOverrides[spawnId]; + movement.Ground = static_cast(fields[1].GetUInt8()); + movement.Swim = fields[2].GetBool(); + movement.Flight = static_cast(fields[3].GetUInt8()); + movement.Rooted = fields[4].GetBool(); + + CheckCreatureMovement("creature_movement_override", spawnId, movement); + } + while (result->NextRow()); + + TC_LOG_INFO("server.loading", ">> Loaded " SZFMTD " movement overrides in %u ms", _creatureMovementOverrides.size(), GetMSTimeDiffToNow(oldMSTime)); +} + CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelId) const { CreatureModelContainer::const_iterator itr = _creatureModelStore.find(modelId); diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 70610ed67a160..6c5c69ad22679 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -943,6 +943,7 @@ class TC_GAME_API ObjectMgr GameObjectTemplateAddon const* GetGameObjectTemplateAddon(uint32 entry) const; GameObjectOverride const* GetGameObjectOverride(ObjectGuid::LowType spawnId) const; CreatureAddon const* GetCreatureTemplateAddon(uint32 entry) const; + CreatureMovementData const* GetCreatureMovementOverride(ObjectGuid::LowType spawnId) const; ItemTemplate const* GetItemTemplate(uint32 entry) const; ItemTemplateContainer const& GetItemTemplateStore() const { return _itemTemplateStore; } @@ -1139,6 +1140,7 @@ class TC_GAME_API ObjectMgr void LoadCreatureTemplateAddons(); void LoadCreatureTemplate(Field* fields); void CheckCreatureTemplate(CreatureTemplate const* cInfo); + void CheckCreatureMovement(char const* table, uint64 id, CreatureMovementData& creatureMovement); void LoadGameObjectQuestItems(); void LoadCreatureQuestItems(); void LoadTempSummons(); @@ -1149,6 +1151,7 @@ class TC_GAME_API ObjectMgr void LoadGameObjectAddons(); void LoadCreatureModelInfo(); void LoadEquipmentTemplates(); + void LoadCreatureMovementOverrides(); void LoadGameObjectLocales(); void LoadGameObjects(); void LoadSpawnGroupTemplates(); @@ -1628,6 +1631,7 @@ class TC_GAME_API ObjectMgr CreatureModelContainer _creatureModelStore; CreatureAddonContainer _creatureAddonStore; CreatureTemplateAddonContainer _creatureTemplateAddonStore; + std::unordered_map _creatureMovementOverrides; GameObjectAddonContainer _gameObjectAddonStore; GameObjectQuestItemMap _gameObjectQuestItemStore; CreatureQuestItemMap _creatureQuestItemStore; diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index d11604174f3b8..873b27798846d 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1137,7 +1137,7 @@ enum TrinityStrings LANG_BAN_ACCOUNT_YOUBANNEDMESSAGE_WORLD = 11006, LANG_BAN_ACCOUNT_YOUPERMBANNEDMESSAGE_WORLD = 11007, - LANG_NPCINFO_INHABIT_TYPE = 11008, + LANG_NPCINFO_MOVEMENT_DATA = 11008, LANG_NPCINFO_FLAGS_EXTRA = 11009, LANG_INSTANCE_LOGIN_GAMEMASTER_EXCEPTION = 11010, diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 376a430d28abf..da625cb56258d 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1741,6 +1741,9 @@ void World::SetInitialWorldSettings() TC_LOG_INFO("server.loading", "Loading Creature Addon Data..."); sObjectMgr->LoadCreatureAddons(); // must be after LoadCreatureTemplates() and LoadCreatures() + TC_LOG_INFO("server.loading", "Loading Creature Movement Overrides..."); + sObjectMgr->LoadCreatureMovementOverrides(); // must be after LoadCreatures() + TC_LOG_INFO("server.loading", "Loading Gameobject Data..."); sObjectMgr->LoadGameObjects(); diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 524e07ddfeda0..0fb22ba7c05d1 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -793,7 +793,7 @@ class npc_commandscript : public CommandScript handler->PSendSysMessage(LANG_NPCINFO_LEVEL, target->getLevel()); handler->PSendSysMessage(LANG_NPCINFO_EQUIPMENT, target->GetCurrentEquipmentId(), target->GetOriginalEquipmentId()); handler->PSendSysMessage(LANG_NPCINFO_HEALTH, target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth()); - handler->PSendSysMessage(LANG_NPCINFO_INHABIT_TYPE, cInfo->InhabitType); + handler->PSendSysMessage(LANG_NPCINFO_MOVEMENT_DATA, target->GetMovementTemplate().ToString().c_str()); handler->PSendSysMessage(LANG_NPCINFO_UNIT_FIELD_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS)); for (uint8 i = 0; i < MAX_UNIT_FLAGS; ++i) diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 533502390323d..660af91ed6e34 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -88,6 +88,7 @@ class reload_commandscript : public CommandScript { "creature_questender", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_QUESTENDER, true, &HandleReloadCreatureQuestEnderCommand, "" }, { "creature_linked_respawn", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_LINKED_RESPAWN, true, &HandleReloadLinkedRespawnCommand, "" }, { "creature_loot_template", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_LOOT_TEMPLATE, true, &HandleReloadLootTemplatesCreatureCommand, "" }, + { "creature_movement_override", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_MOVEMENT_OVERRIDE, true, &HandleReloadCreatureMovementOverrideCommand, "" }, { "creature_onkill_reputation", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_ONKILL_REPUTATION, true, &HandleReloadOnKillReputationCommand, "" }, { "creature_queststarter", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_QUESTSTARTER, true, &HandleReloadCreatureQuestStarterCommand, "" }, { "creature_summon_groups", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_SUMMON_GROUPS, true, &HandleReloadCreatureSummonGroupsCommand, "" }, @@ -198,6 +199,7 @@ class reload_commandscript : public CommandScript HandleReloadTrinityStringCommand(handler, ""); HandleReloadGameTeleCommand(handler, ""); + HandleReloadCreatureMovementOverrideCommand(handler, ""); HandleReloadCreatureSummonGroupsCommand(handler, ""); HandleReloadVehicleAccessoryCommand(handler, ""); @@ -567,6 +569,14 @@ class reload_commandscript : public CommandScript return true; } + static bool HandleReloadCreatureMovementOverrideCommand(ChatHandler* handler, char const* /*args*/) + { + TC_LOG_INFO("misc", "Re-Loading Creature movement overrides..."); + sObjectMgr->LoadCreatureMovementOverrides(); + handler->SendGlobalGMSysMessage("DB table `creature_movement_override` reloaded."); + return true; + } + static bool HandleReloadLootTemplatesDisenchantCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`disenchant_loot_template`)"); From 75c91fc15c88e0260cf317c978b95479e798851c Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 26 Nov 2017 16:52:42 +0100 Subject: [PATCH 5/5] Core/Creatures: Remove hover on death --- src/server/game/Entities/Creature/Creature.cpp | 7 +++++-- src/server/game/Entities/Unit/Unit.cpp | 3 ++- src/server/game/Globals/ObjectMgr.cpp | 8 ++++++-- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 1 - 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index c536e24312b95..d2ffa1624367f 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1992,7 +1992,10 @@ void Creature::setDeathState(DeathState s) if (m_formation && m_formation->GetLeader() == this) m_formation->FormationReset(true); - if ((CanFly() || IsFlying())) + bool needsFalling = IsFlying() || IsHovering(); + SetHover(false); + + if (needsFalling) GetMotionMaster()->MoveFall(); Unit::setDeathState(CORPSE); @@ -3007,7 +3010,7 @@ void Creature::UpdateMovementFlags() { SetCanFly(false); SetDisableGravity(false); - if (CanHover() || HasAuraType(SPELL_AURA_HOVER)) + if (IsAlive() && (CanHover() || HasAuraType(SPELL_AURA_HOVER))) SetHover(true); } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index c55e6f4945909..d27d6b89917bd 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14065,7 +14065,8 @@ bool Unit::SetHover(bool enable, bool /*packetOnly = false*/) else { RemoveUnitMovementFlag(MOVEMENTFLAG_HOVER); - if (hoverHeight) + //! Dying creatures will MoveFall from setDeathState + if (hoverHeight && (!isDying() || GetTypeId() != TYPEID_UNIT)) { float newZ = GetPositionZ() - hoverHeight; UpdateAllowedPositionZ(GetPositionX(), GetPositionY(), newZ); diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 0cda1e3111344..c6fc79a51d039 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -464,11 +464,15 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields) if (!fields[62].IsNull()) creatureTemplate.Movement.Ground = static_cast(fields[62].GetUInt8()); - creatureTemplate.Movement.Swim = fields[63].GetBool(); + if (!fields[63].IsNull()) + creatureTemplate.Movement.Swim = fields[63].GetBool(); + if (!fields[64].IsNull()) creatureTemplate.Movement.Flight = static_cast(fields[64].GetUInt8()); - creatureTemplate.Movement.Rooted = fields[65].GetBool(); + if (!fields[65].IsNull()) + creatureTemplate.Movement.Rooted = fields[65].GetBool(); + creatureTemplate.HoverHeight = fields[66].GetFloat(); creatureTemplate.ModHealth = fields[67].GetFloat(); creatureTemplate.ModMana = fields[68].GetFloat(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index b8516fd4eac02..8f07b4db44216 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -237,7 +237,6 @@ struct boss_twin_baseAI : public BossAI void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); - me->SetHover(false); if (Creature* pSister = GetSister()) { if (!pSister->IsAlive())