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

Core/Objects: increase sight range of all Infinite, Gigantic and Large objects & correct general default visibility distance

Browse Source
This commit is contained in:
hondacrx
2019-01-16 19:42:22 -05:00
parent 055e9d1776
commit ec7807eaac
9 changed files with 186 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Globals/ObjectManager.cs
+20 -6
View File
@@ -1913,8 +1913,8 @@ namespace Game
public void LoadCreatureTemplateAddons()
{
var time = Time.GetMSTime();
// 0 1 2 3 4 5 6 7 8 9
SQLResult result = DB.World.Query("SELECT entry, path_id, mount, bytes1, bytes2, emote, aiAnimKit, movementAnimKit, meleeAnimKit, auras FROM creature_template_addon");
// 0 1 2 3 4 5 6 7 8 9 10
SQLResult result = DB.World.Query("SELECT entry, path_id, mount, bytes1, bytes2, emote, aiAnimKit, movementAnimKit, meleeAnimKit, visibilityDistanceType, auras FROM creature_template_addon");
if (result.IsEmpty())
{
@@ -1941,8 +1941,9 @@ namespace Game
creatureAddon.aiAnimKit = result.Read<ushort>(6);
creatureAddon.movementAnimKit = result.Read<ushort>(7);
creatureAddon.meleeAnimKit = result.Read<ushort>(8);
creatureAddon.visibilityDistanceType = (VisibilityDistanceType)result.Read<byte>(9);
var tokens = new StringArray(result.Read<string>(9), ' ');
var tokens = new StringArray(result.Read<string>(10), ' ');
creatureAddon.auras = new uint[tokens.Length];
byte i = 0;
@@ -2004,6 +2005,12 @@ namespace Game
creatureAddon.meleeAnimKit = 0;
}
if (creatureAddon.visibilityDistanceType >= VisibilityDistanceType.Max)
{
Log.outError(LogFilter.Sql, $"Creature (Entry: {entry}) has invalid visibilityDistanceType ({creatureAddon.visibilityDistanceType}) defined in `creature_template_addon`.");
creatureAddon.visibilityDistanceType = VisibilityDistanceType.Normal;
}
creatureTemplateAddonStorage.Add(entry, creatureAddon);
count++;
}
@@ -2013,8 +2020,8 @@ namespace Game
public void LoadCreatureAddons()
{
var time = Time.GetMSTime();
// 0 1 2 3 4 5 6 7 8 9
SQLResult result = DB.World.Query("SELECT guid, path_id, mount, bytes1, bytes2, emote, aiAnimKit, movementAnimKit, meleeAnimKit, auras FROM creature_addon");
// 0 1 2 3 4 5 6 7 8 9 10
SQLResult result = DB.World.Query("SELECT guid, path_id, mount, bytes1, bytes2, emote, aiAnimKit, movementAnimKit, meleeAnimKit, visibilityDistanceType, auras FROM creature_addon");
if (result.IsEmpty())
{
@@ -2049,8 +2056,9 @@ namespace Game
creatureAddon.aiAnimKit = result.Read<ushort>(6);
creatureAddon.movementAnimKit = result.Read<ushort>(7);
creatureAddon.meleeAnimKit = result.Read<ushort>(8);
creatureAddon.visibilityDistanceType = (VisibilityDistanceType)result.Read<byte>(9);
var tokens = new StringArray(result.Read<string>(9), ' ');
var tokens = new StringArray(result.Read<string>(10), ' ');
byte i = 0;
creatureAddon.auras = new uint[tokens.Length];
for (var c = 0; c < tokens.Length; ++c)
@@ -2112,6 +2120,12 @@ namespace Game
creatureAddon.meleeAnimKit = 0;
}
if (creatureAddon.visibilityDistanceType >= VisibilityDistanceType.Max)
{
Log.outError(LogFilter.Sql, $"Creature (GUID: {guid}) has invalid visibilityDistanceType ({creatureAddon.visibilityDistanceType}) defined in `creature_addon`.");
creatureAddon.visibilityDistanceType = VisibilityDistanceType.Normal;
}
creatureAddonStorage.Add(guid, creatureAddon);
count++;
} while (result.NextRow());