v1.4.4.1 (Blood in the Water Update)

This commit is contained in:
Regalis11
2024-04-24 18:09:05 +03:00
parent 89b91d1c3e
commit ff1b8951a7
397 changed files with 15250 additions and 6479 deletions
@@ -172,7 +172,7 @@ namespace Barotrauma
var allTexts = TextPacks[GameSettings.CurrentConfig.Language]
.SelectMany(p => p.Texts.TryGetValue(tag, out var value)
? (IEnumerable<TextPack.Text>)value
: Array.Empty<TextPack.Text>());
: Array.Empty<TextPack.Text>()).ToList();
var firstOverride = allTexts.FirstOrDefault(t => t.IsOverride);
if (firstOverride != default)
@@ -190,17 +190,25 @@ namespace Barotrauma
var allTexts = TextPacks[GameSettings.CurrentConfig.Language]
.SelectMany(p => p.Texts);
var firstOverride = allTexts.SelectMany(kvp => kvp.Value).FirstOrDefault(t => t.IsOverride);
if (firstOverride != default)
foreach (var textList in allTexts)
{
return allTexts
.Where(kvp => kvp.Value.Any(t => t.IsOverride && t.TextPack == firstOverride.TextPack))
.SelectMany(kvp => kvp.Value.Select(v => new KeyValuePair<Identifier, string>(kvp.Key, v.String)));
}
else
{
return allTexts
.SelectMany(kvp => kvp.Value.Select(v => new KeyValuePair<Identifier, string>(kvp.Key, v.String)));
var firstOverride = textList.Value.FirstOrDefault(t => t.IsOverride);
if (firstOverride != default)
{
//if there's any overrides for this tag, only return the overrides
foreach (var text in textList.Value)
{
if (!text.IsOverride) { continue; }
yield return new KeyValuePair<Identifier, string>(textList.Key, text.String);
}
}
else
{
foreach (var text in textList.Value)
{
yield return new KeyValuePair<Identifier, string>(textList.Key, text.String);
}
}
}
}