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

Core/AreaTrigger: handle AREATRIGGER_FLAG_HAS_CIRCULAR_MOVEMENT

Browse Source
This commit is contained in:
hondacrx
2018-08-26 01:08:24 -04:00
parent 3ab69a9500
commit 90ee61ae2b
10 changed files with 260 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DataStorage/AreaTriggerDataStorage.cs
+58
View File
@@ -200,6 +200,64 @@ namespace Game.DataStorage
Log.outInfo(LogFilter.ServerLoading, "Loaded 0 Spell AreaTrigger templates. DB table `spell_areatrigger` is empty.");
}
// 0 1 2 3 4 5 6 7
SQLResult circularMovementInfos = DB.World.Query("SELECT SpellMiscId, StartDelay, CircleRadius, BlendFromRadius, InitialAngle, ZOffset, CounterClockwise, CanLoop FROM `spell_areatrigger_circular` ORDER BY `SpellMiscId`");
if (!circularMovementInfos.IsEmpty())
{
do
{
uint spellMiscId = circularMovementInfos.Read<uint>(0);
var atSpellMisc = _areaTriggerTemplateSpellMisc.LookupByKey(spellMiscId);
if (atSpellMisc == null)
{
Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` reference invalid SpellMiscId {spellMiscId}");
continue;
}
AreaTriggerCircularMovementInfo circularMovementInfo = new AreaTriggerCircularMovementInfo();
circularMovementInfo.StartDelay = circularMovementInfos.Read<uint>(1);
circularMovementInfo.Radius = circularMovementInfos.Read<float>(2);
if (!float.IsInfinity(circularMovementInfo.Radius))
{
Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid Radius ({circularMovementInfo.Radius}), set to 0!");
circularMovementInfo.Radius = 0.0f;
}
circularMovementInfo.BlendFromRadius = circularMovementInfos.Read<float>(3);
if (!float.IsInfinity(circularMovementInfo.BlendFromRadius))
{
Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid BlendFromRadius ({circularMovementInfo.BlendFromRadius}), set to 0!");
circularMovementInfo.BlendFromRadius = 0.0f;
}
circularMovementInfo.InitialAngle = circularMovementInfos.Read<float>(4);
if (!float.IsInfinity(circularMovementInfo.InitialAngle))
{
Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid InitialAngle ({circularMovementInfo.InitialAngle}), set to 0!");
circularMovementInfo.InitialAngle = 0.0f;
}
circularMovementInfo.ZOffset = circularMovementInfos.Read<float>(5);
if (!float.IsInfinity(circularMovementInfo.ZOffset))
{
Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid ZOffset ({circularMovementInfo.ZOffset}), set to 0!");
circularMovementInfo.ZOffset = 0.0f;
}
circularMovementInfo.CounterClockwise = circularMovementInfos.Read<bool>(6);
circularMovementInfo.CanLoop = circularMovementInfos.Read<bool>(7);
atSpellMisc.CircularMovementInfo = circularMovementInfo;
}
while (circularMovementInfos.NextRow());
}
else
{
Log.outInfo(LogFilter.ServerLoading, "Loaded 0 AreaTrigger templates circular movement infos. DB table `spell_areatrigger_circular` is empty.");
}
Log.outInfo(LogFilter.ServerLoading, "Loaded {0} spell areatrigger templates in {1} ms.", _areaTriggerTemplateStore.Count, Time.GetMSTimeDiffToNow(oldMSTime));
}
Source/Game/DataStorage/Structs/A_Records.cs
+7 -7
View File
@@ -217,11 +217,11 @@ namespace Game.DataStorage
public class ArtifactTierRecord
{
public uint ID;
public uint ArtifactTier;
public uint MaxNumTraits;
public uint MaxArtifactKnowledge;
public uint KnowledgePlayerCondition;
public uint MinimumEmpowerKnowledge;
public byte ArtifactTier;
public byte MaxNumTraits;
public byte MaxArtifactKnowledge;
public byte KnowledgePlayerCondition;
public byte MinimumEmpowerKnowledge;
}
public class ArtifactUnlockRecord
@@ -230,8 +230,8 @@ namespace Game.DataStorage
public ushort ItemBonusListID;
public byte PowerRank;
public uint PowerID;
public uint PlayerConditionID;
public byte ArtifactID;
public ushort PlayerConditionID;
public uint ArtifactID;
}
public sealed class AuctionHouseRecord