Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/GameObjects: Allow setting GameObject anim kits in database

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/8ce9b69de3c820ce056a3fde7858f0c4d5f6b0a4)
This commit is contained in:
hondacrx
2021-01-26 19:45:25 -05:00
parent 2dccaa10be
commit 8938e21432
5 changed files with 104 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/GameObject/GameObject.cs
+17 -8
View File
@@ -263,6 +263,9 @@ namespace Game.Entities
m_updateFlag.GameObject = true;
SetWorldEffectID(m_goTemplateAddon.WorldEffectID);
}
if (m_goTemplateAddon.AIAnimKitID != 0)
_animKitId = (ushort)m_goTemplateAddon.AIAnimKitID;
}
SetEntry(goInfo.entry);
@@ -358,16 +361,22 @@ namespace Game.Entities
break;
}
if (gameObjectAddon != null && gameObjectAddon.invisibilityValue != 0)
if (gameObjectAddon != null)
{
m_invisibility.AddFlag(gameObjectAddon.invisibilityType);
m_invisibility.AddValue(gameObjectAddon.invisibilityType, gameObjectAddon.invisibilityValue);
}
if (gameObjectAddon.invisibilityValue != 0)
{
m_invisibility.AddFlag(gameObjectAddon.invisibilityType);
m_invisibility.AddValue(gameObjectAddon.invisibilityType, gameObjectAddon.invisibilityValue);
}
if (gameObjectAddon != null && gameObjectAddon.WorldEffectID != 0)
{
m_updateFlag.GameObject = true;
SetWorldEffectID(gameObjectAddon.WorldEffectID);
if (gameObjectAddon.WorldEffectID != 0)
{
m_updateFlag.GameObject = true;
SetWorldEffectID(gameObjectAddon.WorldEffectID);
}
if (gameObjectAddon.AIAnimKitID != 0)
_animKitId = (ushort)gameObjectAddon.AIAnimKitID;
}
LastUsedScriptID = GetGoInfo().ScriptId;
Source/Game/Entities/GameObject/GameObjectData.cs
+2
View File
@@ -1360,6 +1360,7 @@ namespace Game.Entities
public uint mingold;
public uint maxgold;
public uint WorldEffectID;
public uint AIAnimKitID;
}
public class GameObjectLocale
@@ -1375,6 +1376,7 @@ namespace Game.Entities
public InvisibilityType invisibilityType;
public uint invisibilityValue;
public uint WorldEffectID;
public uint AIAnimKitID;
}
public class GameObjectData : SpawnData
Source/Game/Globals/ObjectManager.cs
+20 -7
View File
@@ -2991,7 +2991,7 @@ namespace Game
if (spell.ReqSkillLine != 0 && !CliDB.SkillLineStorage.ContainsKey(spell.ReqSkillLine))
{
Log.outError(LogFilter.Sql, $"Table `trainer_spell` references non-existing skill (ReqSkillLine: {spell.ReqSkillLine}) for TrainerId {spell.SpellId} and SpellId {trainerId}, ignoring");
Log.outError(LogFilter.Sql, $"Table `trainer_spell` references non-existing skill (ReqSkillLine: {spell.ReqSkillLine}) for TrainerId {trainerId} and SpellId {spell.SpellId}, ignoring");
continue;
}
@@ -3001,7 +3001,7 @@ namespace Game
uint requiredSpell = spell.ReqAbility[i];
if (requiredSpell != 0 && !Global.SpellMgr.HasSpellInfo(requiredSpell, Difficulty.None))
{
Log.outError(LogFilter.Sql, $"Table `trainer_spell` references non-existing spell (ReqAbility {i + 1}: {requiredSpell}) for TrainerId {spell.SpellId} and SpellId {trainerId}, ignoring");
Log.outError(LogFilter.Sql, $"Table `trainer_spell` references non-existing spell (ReqAbility {i + 1}: {requiredSpell}) for TrainerId {trainerId} and SpellId {spell.SpellId}, ignoring");
allReqValid = false;
}
}
@@ -3864,9 +3864,8 @@ namespace Game
{
uint oldMSTime = Time.GetMSTime();
// 0 1 2 3 4 5
SQLResult result = DB.World.Query("SELECT entry, faction, flags, mingold, maxgold, WorldEffectID FROM gameobject_template_addon");
// 0 1 2 3 4 5 6
SQLResult result = DB.World.Query("SELECT entry, faction, flags, mingold, maxgold, WorldEffectID, AIAnimKitID FROM gameobject_template_addon");
if (result.IsEmpty())
{
Log.outInfo(LogFilter.ServerLoading, "Loaded 0 gameobject template addon definitions. DB table `gameobject_template_addon` is empty.");
@@ -3891,6 +3890,7 @@ namespace Game
gameObjectAddon.mingold = result.Read<uint>(3);
gameObjectAddon.maxgold = result.Read<uint>(4);
gameObjectAddon.WorldEffectID = result.Read<uint>(5);
gameObjectAddon.AIAnimKitID = result.Read<uint>(6);
// checks
if (gameObjectAddon.faction != 0 && !CliDB.FactionTemplateStorage.ContainsKey(gameObjectAddon.faction))
@@ -3915,6 +3915,12 @@ namespace Game
gameObjectAddon.WorldEffectID = 0;
}
if (gameObjectAddon.AIAnimKitID != 0 && !CliDB.AnimKitStorage.ContainsKey(gameObjectAddon.AIAnimKitID))
{
Log.outError(LogFilter.Sql, $"GameObject (Entry: {entry}) has invalid AIAnimKitID ({gameObjectAddon.AIAnimKitID}) defined in `gameobject_template_addon`, set to 0.");
gameObjectAddon.AIAnimKitID = 0;
}
_gameObjectTemplateAddonStorage[entry] = gameObjectAddon;
++count;
}
@@ -4150,8 +4156,8 @@ namespace Game
_gameObjectAddonStorage.Clear();
// 0 1 2 3 4 5 6 7
SQLResult result = DB.World.Query("SELECT guid, parent_rotation0, parent_rotation1, parent_rotation2, parent_rotation3, invisibilityType, invisibilityValue, WorldEffectID FROM gameobject_addon");
// 0 1 2 3 4 5 6 7 8
SQLResult result = DB.World.Query("SELECT guid, parent_rotation0, parent_rotation1, parent_rotation2, parent_rotation3, invisibilityType, invisibilityValue, WorldEffectID, AIAnimKitID FROM gameobject_addon");
if (result.IsEmpty())
{
Log.outInfo(LogFilter.ServerLoading, "Loaded 0 gameobject addon definitions. DB table `gameobject_addon` is empty.");
@@ -4175,6 +4181,7 @@ namespace Game
gameObjectAddon.invisibilityType = (InvisibilityType)result.Read<byte>(5);
gameObjectAddon.invisibilityValue = result.Read<uint>(6);
gameObjectAddon.WorldEffectID = result.Read<uint>(7);
gameObjectAddon.AIAnimKitID = result.Read<uint>(8);
if (gameObjectAddon.invisibilityType >= InvisibilityType.Max)
{
@@ -4201,6 +4208,12 @@ namespace Game
gameObjectAddon.WorldEffectID = 0;
}
if (gameObjectAddon.AIAnimKitID != 0 && !CliDB.AnimKitStorage.ContainsKey(gameObjectAddon.AIAnimKitID))
{
Log.outError(LogFilter.Sql, $"GameObject (GUID: {guid}) has invalid AIAnimKitID ({gameObjectAddon.AIAnimKitID}) in `gameobject_addon`, set to 0.");
gameObjectAddon.AIAnimKitID = 0;
}
_gameObjectAddonStorage[guid] = gameObjectAddon;
++count;
}