Skip to content

Patch 3.0.0 leftovers #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
TheLazzoro wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Patch 3.0.0 leftovers #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 56 additions & 6 deletions src/War3Net.Build.Core/Script/TriggerData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
}

var split = line.Split('=', 2);
if (split.Length != 2)
{
// Skip malformed lines, e.g. "_BlzSetHDWaterMinOpacityBJ_Defaults0" in Blizzard's TriggerData.txt.
continue;
}

var key = split[0];
var values = split[1].Split(',', 3);
Expand Down Expand Up @@ -155,6 +160,11 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
}

var split = line.Split('=', 2);
if (split.Length != 2)
{
// Skip malformed lines, e.g. "_BlzSetHDWaterMinOpacityBJ_Defaults0" in Blizzard's TriggerData.txt.
continue;
}

var key = split[0];
var values = split[1].Split(',', 7);
Expand Down Expand Up @@ -196,6 +206,11 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
}

var split = line.Split('=', 2);
if (split.Length != 2)
{
// Skip malformed lines, e.g. "_BlzSetHDWaterMinOpacityBJ_Defaults0" in Blizzard's TriggerData.txt.
continue;
}

var key = split[0];
var values = split[1].Split(',', 2);
Expand Down Expand Up @@ -232,6 +247,11 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
}

var split = line.Split('=', 2);
if (split.Length != 2)
{
// Skip malformed lines, e.g. "_BlzSetHDWaterMinOpacityBJ_Defaults0" in Blizzard's TriggerData.txt.
continue;
}

var key = split[0];
var values = split[1].Split(',', 4);
Expand All @@ -243,7 +263,8 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
values[2],
values[3]);

builder.Add(key, triggerParam);
// Blizzard's TriggerData.txt contains duplicate keys (e.g. UnitOrderChallengingCall), so last one wins.
builder[key] = triggerParam;
}
}

Expand Down Expand Up @@ -277,13 +298,19 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
}

var split = line.Split('=', 2);
if (split.Length != 2)
{
// Skip malformed lines, e.g. "_BlzSetHDWaterMinOpacityBJ_Defaults0" in Blizzard's TriggerData.txt.
continue;
}
var key = split[0];

if (key.StartsWith('_'))
{
if (triggerEventBuilder is null || !key.StartsWith($"_{triggerEventBuilder.FunctionName}_", StringComparison.Ordinal))
{
throw new InvalidDataException(line);
// Skip properties that don't belong to the current function, e.g. "_SetSoundFacialAnimationSetFilepathv_Defaults" in Blizzard's TriggerData.txt.
continue;
}

switch (key.Split('_', 2, StringSplitOptions.RemoveEmptyEntries)[1])
Expand Down Expand Up @@ -344,13 +371,19 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
}

var split = line.Split('=', 2);
if (split.Length != 2)
{
// Skip malformed lines, e.g. "_BlzSetHDWaterMinOpacityBJ_Defaults0" in Blizzard's TriggerData.txt.
continue;
}
var key = split[0];

if (key.StartsWith('_'))
{
if (triggerConditionBuilder is null || !key.StartsWith($"_{triggerConditionBuilder.FunctionName}_", StringComparison.Ordinal))
{
throw new InvalidDataException(line);
// Skip properties that don't belong to the current function, e.g. "_SetSoundFacialAnimationSetFilepathv_Defaults" in Blizzard's TriggerData.txt.
continue;
}

switch (key.Split('_', 2, StringSplitOptions.RemoveEmptyEntries)[1])
Expand Down Expand Up @@ -412,13 +445,19 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
}

var split = line.Split('=', 2);
if (split.Length != 2)
{
// Skip malformed lines, e.g. "_BlzSetHDWaterMinOpacityBJ_Defaults0" in Blizzard's TriggerData.txt.
continue;
}
var key = split[0];

if (key.StartsWith('_'))
{
if (triggerActionBuilder is null || !key.StartsWith($"_{triggerActionBuilder.FunctionName}_", StringComparison.OrdinalIgnoreCase))
{
throw new InvalidDataException(line);
// Skip properties that don't belong to the current function, e.g. "_SetSoundFacialAnimationSetFilepathv_Defaults" in Blizzard's TriggerData.txt.
continue;
}

switch (key.Split('_', 2, StringSplitOptions.RemoveEmptyEntries)[1])
Expand Down Expand Up @@ -491,7 +530,8 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
{
if (triggerCallBuilder is null || !key.StartsWith($"_{triggerCallBuilder.FunctionName}", StringComparison.Ordinal))
{
throw new InvalidDataException(line);
// Skip properties that don't belong to the current function, e.g. "_SetSoundFacialAnimationSetFilepathv_Defaults" in Blizzard's TriggerData.txt.
continue;
}

var keys = key.Split('_', 2, StringSplitOptions.RemoveEmptyEntries);
Expand Down Expand Up @@ -528,7 +568,7 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
triggerCallBuilder = new TriggerCall.Builder(
key,
int.Parse(values[0], CultureInfo.InvariantCulture),
int.Parse(values[1], CultureInfo.InvariantCulture).ToBool(),
int.Parse(values[1], CultureInfo.InvariantCulture) != 0, // Some entries use 2 (e.g. UnitItemInEquipmentSlotBJ).
values[2],
values[3..].ToImmutableArray());
}
Expand Down Expand Up @@ -558,6 +598,11 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
}

var split = line.Split('=', 2);
if (split.Length != 2)
{
// Skip malformed lines, e.g. "_BlzSetHDWaterMinOpacityBJ_Defaults0" in Blizzard's TriggerData.txt.
continue;
}

var key = split[0];
var value = split[1];
Expand Down Expand Up @@ -604,6 +649,11 @@ internal bool TryGetNextSection(StringReader reader, out string? result)
}

var split = line.Split('=', 2);
if (split.Length != 2)
{
// Skip malformed lines, e.g. "_BlzSetHDWaterMinOpacityBJ_Defaults0" in Blizzard's TriggerData.txt.
continue;
}

var key = split[0];
var value = split[1];
Expand Down
Loading