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

Unstable 1.8.4.0

Browse Source
This commit is contained in:
Markus Isberg
2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Map/MapEntityPrefab.cs
+7 -5
View File
@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Xml.Linq;
using Barotrauma.Extensions;
namespace Barotrauma
@@ -259,7 +260,7 @@ namespace Barotrauma
if (string.IsNullOrWhiteSpace(AllowedUpgrades)) { return Enumerable.Empty<Identifier>(); }
if (allowedUpgradeSet is null || cachedAllowedUpgrades != AllowedUpgrades)
{
allowedUpgradeSet = AllowedUpgrades.Split(",").ToIdentifiers().ToImmutableHashSet();
allowedUpgradeSet = AllowedUpgrades.ToIdentifiers().ToImmutableHashSet();
cachedAllowedUpgrades = AllowedUpgrades;
}
@@ -301,12 +302,13 @@ namespace Barotrauma
protected void LoadDescription(ContentXElement element)
{
Identifier descriptionIdentifier = element.GetAttributeIdentifier("descriptionidentifier", "");
Identifier nameIdentifier = element.GetAttributeIdentifier("nameidentifier", "");
Identifier nameIdentifier = element.GetAttributeIdentifier("nameidentifier", Identifier.Empty);
string originalDescription = Description.Value;
if (descriptionIdentifier != Identifier.Empty)
const string descriptionIdentifierAttributeName = "descriptionidentifier";
XAttribute descriptionIdenfifierAttribute = element.GetAttribute(descriptionIdentifierAttributeName);
if (descriptionIdenfifierAttribute != null)
{
Identifier descriptionIdentifier = element.GetAttributeIdentifier(descriptionIdentifierAttributeName, Identifier.Empty);
Description = TextManager.Get($"EntityDescription.{descriptionIdentifier}");
}
else if (nameIdentifier == Identifier.Empty)