vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unstable 0.17.1.0

Browse Source
This commit is contained in:
Markus Isberg
2022-03-17 01:25:04 +09:00
parent 3974067915
commit 6d410cc1b7
302 changed files with 5878 additions and 3317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Map/StructurePrefab.cs
+19 -22
View File
@@ -34,7 +34,7 @@ namespace Barotrauma
public override Sprite Sprite { get; }
public override string OriginalName => Name.Value;
public override string OriginalName { get; }
public override ImmutableHashSet<Identifier> Tags { get; }
@@ -132,7 +132,7 @@ namespace Barotrauma
public StructurePrefab(ContentXElement element, StructureFile file) : base(element, file)
{
Name = element.GetAttributeString("name", "");
OriginalName = element.GetAttributeString("name", "");
ConfigElement = element;
var parentType = element.Parent?.GetAttributeIdentifier("prefabtype", Identifier.Empty) ?? Identifier.Empty;
@@ -144,20 +144,16 @@ namespace Barotrauma
Identifier descriptionIdentifier = element.GetAttributeIdentifier("descriptionidentifier", "");
if (Name.IsNullOrEmpty())
{
Name = TextManager.Get($"EntityName.{Identifier}");
if (!nameIdentifier.IsEmpty)
{
Name = TextManager.Get($"EntityName.{nameIdentifier}").Fallback(Name);
}
Name = TextManager.Get(nameIdentifier.IsEmpty
? $"EntityName.{Identifier}"
: $"EntityName.{nameIdentifier}",
$"EntityName.{fallbackNameIdentifier}");
if (!fallbackNameIdentifier.IsEmpty)
{
Name = Name.Fallback(TextManager.Get($"EntityName.{fallbackNameIdentifier}"));
}
if (parentType == "wrecked")
{
Name = TextManager.GetWithVariable("wreckeditemformat", "[name]", Name);
}
var tags = new HashSet<Identifier>();
string joinedTags = element.GetAttributeString("tags", "");
if (string.IsNullOrEmpty(joinedTags)) joinedTags = element.GetAttributeString("Tags", "");
@@ -251,14 +247,6 @@ namespace Barotrauma
DecorativeSpriteGroups = decorativeSpriteGroups.Select(kvp => (kvp.Key, kvp.Value.ToImmutableArray())).ToImmutableDictionary();
#endif
if (parentType == "wrecked")
{
if (!Name.IsNullOrEmpty())
{
Name = TextManager.GetWithVariable("wreckeditemformat", "[name]", Name);
}
}
string categoryStr = element.GetAttributeString("category", "Structure");
if (!Enum.TryParse(categoryStr, true, out MapEntityCategory category))
{
@@ -323,6 +311,15 @@ namespace Barotrauma
DebugConsole.ThrowError(
"Structure prefab \"" + Name + "\" has no identifier. All structure prefabs have a unique identifier string that's used to differentiate between items during saving and loading.");
}
#if DEBUG
if (!Category.HasFlag(MapEntityCategory.Legacy) && !HideInMenus)
{
if (!string.IsNullOrEmpty(OriginalName))
{
DebugConsole.AddWarning($"Structure \"{(Identifier == Identifier.Empty ? Name : Identifier.Value)}\" has a hard-coded name, and won't be localized to other languages.");
}
}
#endif
Tags = tags.ToImmutableHashSet();
AllowedLinks = Enumerable.Empty<Identifier>().ToImmutableHashSet();