josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Creature: Add new db field InteractionPauseTimer (#25880)

Browse Source 
* Core/Creature: Add new db field InteractionPauseTimer

Add new db field InteractionPauseTimer to allow to define different interaction pause timers for each creature (the previous system was a global setting in worldserver.conf Creature.MovingStopTimeForPlayer)

* Set all columns in creature_template_movement as optional (can be NULL, default NULL). Fill only the columns that should override the default C++ value

* Use the InteractionPauseTimer value throughout the code instead of Creature.MovingStopTimeForPlayer

* Handle InteractionPauseTimer set to 0 as "don't stop at all"

* Implement InteractionPauseTimer in creature_movement_override

creature_movement_override allows NULL values, in which case the values from creature_template_movement will be used for those columns that are NULL, falling back to default C++ values if creature_template_movement has NULL values too (or no rows for the creature)

* Read default InteractionPauseTimer from worldserver.conf

* Rename 2021_99_99_99_world.sql to 2021_01_22_00_world.sql

(cherry picked from commit a22bc236ebc038c723774e5b38cd93e814ccc43d)
This commit is contained in:
Giacomo Pozzoni
2022-03-06 00:56:46 +01:00
committed by Shauren
parent f74b4cb265
commit 5180abfb19
9 changed files with 83 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/master/2022_03_05_91_world_2021_01_22_01_world.sql
+16
View File
@@ -0,0 +1,16 @@
--
ALTER TABLE `creature_template_movement` CHANGE `Ground` `Ground` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_template_movement` CHANGE `Swim` `Swim` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_template_movement` CHANGE `Flight` `Flight` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_template_movement` CHANGE `Rooted` `Rooted` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_template_movement` CHANGE `Chase` `Chase` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_template_movement` CHANGE `Random` `Random` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_template_movement` ADD COLUMN `InteractionPauseTimer` INT(10) UNSIGNED DEFAULT NULL NULL COMMENT 'Time (in milliseconds) during which creature will not move after interaction with player' AFTER `Random`;
ALTER TABLE `creature_movement_override` CHANGE `Ground` `Ground` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_movement_override` CHANGE `Swim` `Swim` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_movement_override` CHANGE `Flight` `Flight` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_movement_override` CHANGE `Rooted` `Rooted` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_movement_override` CHANGE `Chase` `Chase` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_movement_override` CHANGE `Random` `Random` TINYINT(3) UNSIGNED DEFAULT NULL NULL;
ALTER TABLE `creature_movement_override` ADD COLUMN `InteractionPauseTimer` INT(10) UNSIGNED DEFAULT NULL NULL COMMENT 'Time (in milliseconds) during which creature will not move after interaction with player' AFTER `Random`;
src/server/database/Database/Implementation/WorldDatabase.cpp
+1 -1
View File
@@ -77,7 +77,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, help FROM command", CONNECTION_SYNCH);
PrepareStatement(WORLD_SEL_CREATURE_TEMPLATE, "SELECT entry, difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, name, femaleName, subname, TitleAlt, IconName, gossip_menu_id, minlevel, maxlevel, HealthScalingExpansion, RequiredExpansion, VignetteID, faction, npcflag, speed_walk, speed_run, scale, `rank`, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, unit_class, unit_flags, unit_flags2, unit_flags3, dynamicflags, family, trainer_class, type, type_flags, type_flags2, lootid, pickpocketloot, skinloot, VehicleId, mingold, maxgold, AIName, MovementType, ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, ctm.Random, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, movementId, CreatureDifficultyID, WidgetSetID, WidgetSetUnitConditionID, 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 = ? OR 1 = ?", CONNECTION_SYNCH);
PrepareStatement(WORLD_SEL_CREATURE_TEMPLATE, "SELECT entry, difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, name, femaleName, subname, TitleAlt, IconName, gossip_menu_id, minlevel, maxlevel, HealthScalingExpansion, RequiredExpansion, VignetteID, faction, npcflag, speed_walk, speed_run, scale, `rank`, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, unit_class, unit_flags, unit_flags2, unit_flags3, dynamicflags, family, trainer_class, type, type_flags, type_flags2, lootid, pickpocketloot, skinloot, VehicleId, mingold, maxgold, AIName, MovementType, ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, ctm.Random, ctm.InteractionPauseTimer, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, movementId, CreatureDifficultyID, WidgetSetID, WidgetSetUnitConditionID, 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 = ? OR 1 = ?", 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_CREATURE_BY_ID, "SELECT guid FROM creature WHERE id = ?", CONNECTION_SYNCH);
PrepareStatement(WORLD_SEL_GAMEOBJECT_NEAREST, "SELECT guid, id, position_x, position_y, position_z, map, (POW(position_x - ?, 2) + POW(position_y - ?, 2) + POW(position_z - ?, 2)) AS order_ FROM gameobject WHERE map = ? AND (POW(position_x - ?, 2) + POW(position_y - ?, 2) + POW(position_z - ?, 2)) <= ? ORDER BY order_", CONNECTION_SYNCH);
src/server/game/Entities/Creature/Creature.cpp
+4
View File
@@ -55,6 +55,9 @@
#include <G3D/g3dmath.h>
#include <sstream>
CreatureMovementData::CreatureMovementData() : Ground(CreatureGroundMovementType::Run), Flight(CreatureFlightMovementType::None), Swim(true), Rooted(false), Chase(CreatureChaseMovementType::Run),
Random(CreatureRandomMovementType::Walk), InteractionPauseTimer(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER)) { }
std::string CreatureMovementData::ToString() const
{
char const* const GroundStates[] = { "None", "Run", "Hover" };
@@ -71,6 +74,7 @@ std::string CreatureMovementData::ToString() const
<< ", Random: " << RandomStates[AsUnderlyingType(Random)];
if (Rooted)
str << ", Rooted";
str << ", InteractionPauseTimer: " << InteractionPauseTimer;
return str.str();
}
src/server/game/Entities/Creature/CreatureData.h
+4 -2
View File
@@ -337,8 +337,7 @@ enum class CreatureRandomMovementType : uint8
struct TC_GAME_API CreatureMovementData
{
CreatureMovementData() : Ground(CreatureGroundMovementType::Run), Flight(CreatureFlightMovementType::None), Swim(true), Rooted(false), Chase(CreatureChaseMovementType::Run),
Random(CreatureRandomMovementType::Walk) { }
CreatureMovementData();
CreatureGroundMovementType Ground;
CreatureFlightMovementType Flight;
@@ -346,6 +345,7 @@ struct TC_GAME_API CreatureMovementData
bool Rooted;
CreatureChaseMovementType Chase;
CreatureRandomMovementType Random;
uint32 InteractionPauseTimer;
bool IsGroundAllowed() const { return Ground != CreatureGroundMovementType::None; }
bool IsSwimAllowed() const { return Swim; }
@@ -355,6 +355,8 @@ struct TC_GAME_API CreatureMovementData
CreatureChaseMovementType GetChase() const { return Chase; }
CreatureRandomMovementType GetRandom() const { return Random; }
uint32 GetInteractionPauseTimer() const { return InteractionPauseTimer; }
std::string ToString() const;
};
src/server/game/Globals/ObjectMgr.cpp
+50 -27
View File
@@ -358,8 +358,8 @@ void ObjectMgr::LoadCreatureTemplates()
// "unit_class, unit_flags, unit_flags2, unit_flags3, dynamicflags, family, trainer_class, type, "
// 36 37 38 39 40 41 42 43 44 45
// "type_flags, type_flags2, lootid, pickpocketloot, skinloot, VehicleId, mingold, maxgold, AIName, MovementType, "
// 46 47 48 49 50 51 52 53 54 55 56 57 58 59
// "ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, ctm.Random, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, "
// 46 47 48 49 50 51 52 53 54 55 56 57 58 59
// "ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, ctm.Random, ctm.InteractionPauseTimer, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, "
// 60 61 62 63 64 65
// "RacialLeader, movementId, CreatureDifficultyID, WidgetSetID, WidgetSetUnitConditionID, RegenHealth, "
// 66 67 68
@@ -476,24 +476,27 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields)
if (!fields[51].IsNull())
creatureTemplate.Movement.Random = static_cast<CreatureRandomMovementType>(fields[51].GetUInt8());
creatureTemplate.HoverHeight = fields[52].GetFloat();
creatureTemplate.ModHealth = fields[53].GetFloat();
creatureTemplate.ModHealthExtra = fields[54].GetFloat();
creatureTemplate.ModMana = fields[55].GetFloat();
creatureTemplate.ModManaExtra = fields[56].GetFloat();
creatureTemplate.ModArmor = fields[57].GetFloat();
creatureTemplate.ModDamage = fields[58].GetFloat();
creatureTemplate.ModExperience = fields[59].GetFloat();
creatureTemplate.RacialLeader = fields[60].GetBool();
creatureTemplate.movementId = fields[61].GetUInt32();
creatureTemplate.CreatureDifficultyID = fields[62].GetInt32();
creatureTemplate.WidgetSetID = fields[63].GetInt32();
creatureTemplate.WidgetSetUnitConditionID = fields[64].GetInt32();
creatureTemplate.RegenHealth = fields[65].GetBool();
creatureTemplate.MechanicImmuneMask = fields[66].GetUInt32();
creatureTemplate.SpellSchoolImmuneMask = fields[67].GetUInt32();
creatureTemplate.flags_extra = fields[68].GetUInt32();
creatureTemplate.ScriptID = GetScriptId(fields[69].GetString());
if (!fields[52].IsNull())
creatureTemplate.Movement.InteractionPauseTimer = fields[52].GetUInt32();
creatureTemplate.HoverHeight = fields[53].GetFloat();
creatureTemplate.ModHealth = fields[54].GetFloat();
creatureTemplate.ModHealthExtra = fields[55].GetFloat();
creatureTemplate.ModMana = fields[56].GetFloat();
creatureTemplate.ModManaExtra = fields[57].GetFloat();
creatureTemplate.ModArmor = fields[58].GetFloat();
creatureTemplate.ModDamage = fields[59].GetFloat();
creatureTemplate.ModExperience = fields[50].GetFloat();
creatureTemplate.RacialLeader = fields[61].GetBool();
creatureTemplate.movementId = fields[62].GetUInt32();
creatureTemplate.CreatureDifficultyID = fields[63].GetInt32();
creatureTemplate.WidgetSetID = fields[64].GetInt32();
creatureTemplate.WidgetSetUnitConditionID = fields[65].GetInt32();
creatureTemplate.RegenHealth = fields[66].GetBool();
creatureTemplate.MechanicImmuneMask = fields[67].GetUInt32();
creatureTemplate.SpellSchoolImmuneMask = fields[68].GetUInt32();
creatureTemplate.flags_extra = fields[69].GetUInt32();
creatureTemplate.ScriptID = GetScriptId(fields[70].GetString());
}
void ObjectMgr::LoadCreatureTemplateResistances()
@@ -1527,7 +1530,19 @@ void ObjectMgr::LoadCreatureMovementOverrides()
_creatureMovementOverrides.clear();
QueryResult result = WorldDatabase.Query("SELECT SpawnId, Ground, Swim, Flight, Rooted, Chase, Random from creature_movement_override");
// Load the data from creature_movement_override and if NULL fallback to creature_template_movement
QueryResult result = WorldDatabase.Query(
"SELECT cmo.SpawnId,"
"COALESCE(cmo.Ground, ctm.Ground),"
"COALESCE(cmo.Swim, ctm.Swim),"
"COALESCE(cmo.Flight, ctm.Flight),"
"COALESCE(cmo.Rooted, ctm.Rooted),"
"COALESCE(cmo.Chase, ctm.Chase),"
"COALESCE(cmo.Random, ctm.Random),"
"COALESCE(cmo.InteractionPauseTimer, ctm.InteractionPauseTimer) "
"FROM creature_movement_override AS cmo "
"LEFT JOIN creature AS c ON c.guid = cmo.SpawnId "
"LEFT JOIN creature_template_movement AS ctm ON ctm.CreatureId = c.id");
if (!result)
{
@@ -1546,12 +1561,20 @@ void ObjectMgr::LoadCreatureMovementOverrides()
}
CreatureMovementData& movement = _creatureMovementOverrides[spawnId];
movement.Ground = static_cast<CreatureGroundMovementType>(fields[1].GetUInt8());
movement.Swim = fields[2].GetBool();
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());
if (!fields[1].IsNull())
movement.Ground = static_cast<CreatureGroundMovementType>(fields[1].GetUInt8());
if (!fields[2].IsNull())
movement.Swim = fields[2].GetBool();
if (!fields[3].IsNull())
movement.Flight = static_cast<CreatureFlightMovementType>(fields[3].GetUInt8());
if (!fields[4].IsNull())
movement.Rooted = fields[4].GetBool();
if (!fields[5].IsNull())
movement.Chase = static_cast<CreatureChaseMovementType>(fields[5].GetUInt8());
if (!fields[6].IsNull())
movement.Random = static_cast<CreatureRandomMovementType>(fields[6].GetUInt8());
if (!fields[7].IsNull())
movement.InteractionPauseTimer = fields[7].GetUInt32();
CheckCreatureMovement("creature_movement_override", spawnId, movement);
}
src/server/game/Handlers/BattleGroundHandler.cpp
+2 -1
View File
@@ -44,7 +44,8 @@ void WorldSession::HandleBattlemasterHelloOpcode(WorldPackets::NPC::Hello& hello
return;
// Stop the npc if moving
unit->PauseMovement(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER));
if (uint32 pause = unit->GetMovementTemplate().GetInteractionPauseTimer())
unit->PauseMovement(pause);
unit->SetHomePosition(unit->GetPosition());
BattlegroundTypeId bgTypeId = sBattlegroundMgr->GetBattleMasterBG(unit->GetEntry());
src/server/game/Handlers/ItemHandler.cpp
+2 -1
View File
@@ -606,7 +606,8 @@ void WorldSession::SendListInventory(ObjectGuid vendorGuid)
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
// Stop the npc if moving
vendor->PauseMovement(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER));
if (uint32 pause = vendor->GetMovementTemplate().GetInteractionPauseTimer())
vendor->PauseMovement(pause);
vendor->SetHomePosition(vendor->GetPosition());
VendorItemData const* vendorItems = vendor->GetVendorItems();
src/server/game/Handlers/NPCHandler.cpp
+2 -1
View File
@@ -161,7 +161,8 @@ void WorldSession::HandleGossipHelloOpcode(WorldPackets::NPC::Hello& packet)
GetPlayer()->RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags::Interacting);
// Stop the npc if moving
unit->PauseMovement(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER));
if (uint32 pause = unit->GetMovementTemplate().GetInteractionPauseTimer())
unit->PauseMovement(pause);
unit->SetHomePosition(unit->GetPosition());
// If spiritguide, no need for gossip menu, just put player into resurrect queue
src/server/game/Handlers/QuestHandler.cpp
+2 -1
View File
@@ -90,7 +90,8 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPackets::Quest::QuestGiverHe
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
// Stop the npc if moving
creature->PauseMovement(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER));
if (uint32 pause = creature->GetMovementTemplate().GetInteractionPauseTimer())
creature->PauseMovement(pause);
creature->SetHomePosition(creature->GetPosition());
_player->PlayerTalkClass->ClearMenus();