Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: Allow using run when moving randomly (#23081)

Browse Source 
* Allow run when moving randomly
This commit is contained in:
Sorikoff
2019-03-03 18:54:07 +00:00
committed by Giacomo Pozzoni
parent 6c5d997161
commit 34cfa69efd
5 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/3.3.5/2019_03_03_03_world.sql Normal file
View File

@@ -0,0 +1,3 @@
--
ALTER TABLE `creature_template_movement` ADD `Random` tinyint(3) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `creature_movement_override` ADD `Random` tinyint(3) UNSIGNED NOT NULL DEFAULT '0';

4
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -58,13 +58,15 @@ std::string CreatureMovementData::ToString() const
char const* const GroundStates[] = { "None", "Run", "Hover" };
char const* const FlightStates[] = { "None", "DisableGravity", "CanFly" };
char const* const ChaseStates[] = { "Run", "CanWalk", "AlwaysWalk" };
char const* const RandomStates[] = { "Walk", "CanRun", "AlwaysRun" };
std::ostringstream str;
str << std::boolalpha
<< "Ground: " << GroundStates[AsUnderlyingType(Ground)]
<< ", Swim: " << Swim
<< ", Flight: " << FlightStates[AsUnderlyingType(Flight)]
<< ", Chase: " << ChaseStates[AsUnderlyingType(Chase)];
<< ", Chase: " << ChaseStates[AsUnderlyingType(Chase)]
<< ", Random: " << RandomStates[AsUnderlyingType(Random)];
if (Rooted)
str << ", Rooted";

14
src/server/game/Entities/Creature/CreatureData.h
View File

@@ -102,16 +102,27 @@ enum class CreatureChaseMovementType : uint8
Max
};
enum class CreatureRandomMovementType : uint8
{
Walk,
CanRun,
AlwaysRun,
Max
};
struct TC_GAME_API CreatureMovementData
{
CreatureMovementData() : Ground(CreatureGroundMovementType::Run), Flight(CreatureFlightMovementType::None),
Swim(true), Rooted(false), Chase(CreatureChaseMovementType::Run) { }
Swim(true), Rooted(false), Chase(CreatureChaseMovementType::Run),
Random(CreatureRandomMovementType::Walk) { }
CreatureGroundMovementType Ground;
CreatureFlightMovementType Flight;
bool Swim;
bool Rooted;
CreatureChaseMovementType Chase;
CreatureRandomMovementType Random;
bool IsGroundAllowed() const { return Ground != CreatureGroundMovementType::None; }
bool IsSwimAllowed() const { return Swim; }
@@ -119,6 +130,7 @@ struct TC_GAME_API CreatureMovementData
bool IsRooted() const { return Rooted; }
CreatureChaseMovementType GetChase() const { return Chase; }
CreatureRandomMovementType GetRandom() const { return Random; }
std::string ToString() const;
};

46
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -371,9 +371,9 @@ void ObjectMgr::LoadCreatureTemplates()
"dynamicflags, family, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, "
// 44 45 46 47 48 49 50 51 52 53 54 55 56 57
"spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, "
// 58 59 60 61 62 63 64 65 66 67
"ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, "
// 68 69 70 71 72 73 74 75
// 58 59 60 61 62 63 64 65 66 67 68
"ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, ctm.Random, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, "
// 69 70 71 72 73 74 75 76
"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");
@@ -470,20 +470,23 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields)
if (!fields[62].IsNull())
creatureTemplate.Movement.Chase = static_cast<CreatureChaseMovementType>(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();
if (!fields[63].IsNull())
creatureTemplate.Movement.Random = static_cast<CreatureRandomMovementType>(fields[63].GetUInt8());
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());
creatureTemplate.HoverHeight = fields[64].GetFloat();
creatureTemplate.ModHealth = fields[65].GetFloat();
creatureTemplate.ModMana = fields[66].GetFloat();
creatureTemplate.ModArmor = fields[67].GetFloat();
creatureTemplate.ModDamage = fields[68].GetFloat();
creatureTemplate.ModExperience = fields[69].GetFloat();
creatureTemplate.RacialLeader = fields[70].GetBool();
creatureTemplate.movementId = fields[71].GetUInt32();
creatureTemplate.RegenHealth = fields[72].GetBool();
creatureTemplate.MechanicImmuneMask = fields[73].GetUInt32();
creatureTemplate.SpellSchoolImmuneMask = fields[74].GetUInt32();
creatureTemplate.flags_extra = fields[75].GetUInt32();
creatureTemplate.ScriptID = GetScriptId(fields[76].GetString());
}
void ObjectMgr::LoadCreatureTemplateAddons()
@@ -995,6 +998,13 @@ void ObjectMgr::CheckCreatureMovement(char const* table, uint64 id, CreatureMove
table, uint32(creatureMovement.Chase), id);
creatureMovement.Chase = CreatureChaseMovementType::Run;
}
if (creatureMovement.Random >= CreatureRandomMovementType::Max)
{
TC_LOG_ERROR("sql.sql", "`%s`.`Random` wrong value (%u) for Id " UI64FMTD ", setting to Walk.",
table, uint32(creatureMovement.Random), id);
creatureMovement.Random = CreatureRandomMovementType::Walk;
}
}
void ObjectMgr::LoadCreatureAddons()
@@ -1291,7 +1301,8 @@ void ObjectMgr::LoadCreatureMovementOverrides()
_creatureMovementOverrides.clear();
QueryResult result = WorldDatabase.Query("SELECT SpawnId, Ground, Swim, Flight, Rooted, Chase from creature_movement_override");
QueryResult result = WorldDatabase.Query("SELECT SpawnId, Ground, Swim, Flight, Rooted, Chase, Random from creature_movement_override");
if (!result)
{
TC_LOG_INFO("server.loading", ">> Loaded 0 creature movement overrides. DB table `creature_movement_override` is empty!");
@@ -1314,6 +1325,7 @@ void ObjectMgr::LoadCreatureMovementOverrides()
movement.Flight = static_cast<CreatureFlightMovementType>(fields[3].GetUInt8());
movement.Rooted = fields[4].GetBool();
movement.Chase = static_cast<CreatureChaseMovementType>(fields[5].GetUInt8());
movement.Random = static_cast<CreatureRandomMovementType>(fields[6].GetUInt8());
CheckCreatureMovement("creature_movement_override", spawnId, movement);
}

15
src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
View File

@@ -116,9 +116,22 @@ void RandomMovementGenerator<Creature>::SetRandomLocation(Creature* owner)
owner->AddUnitState(UNIT_STATE_ROAMING_MOVE);
bool walk = true;
switch (owner->GetMovementTemplate().GetRandom())
{
case CreatureRandomMovementType::CanRun:
walk = owner->IsWalking();
break;
case CreatureRandomMovementType::AlwaysRun:
walk = false;
break;
default:
break;
}
Movement::MoveSplineInit init(owner);
init.MovebyPath(_path->GetPath());
init.SetWalk(true);
init.SetWalk(walk);
int32 traveltime = init.Launch();
_timer.Reset(traveltime + resetTimer);