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

v1.2.7.0 (Winter Update hotfix)

Browse Source
This commit is contained in:
Regalis11
2023-12-20 15:00:42 +02:00
parent 7f295c291e
commit ada8d6f260
35 changed files with 181 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/JobPrefab.cs
+10 -2
View File
@@ -13,7 +13,14 @@ namespace Barotrauma
public readonly Identifier Identifier;
public readonly Identifier Option;
public readonly float PriorityModifier;
/// <summary>
/// The order is ignored in outpost levels. Doesn't apply to outpost NPCs.
/// </summary>
public readonly bool IgnoreAtOutpost;
/// <summary>
/// The order is ignored in "normal" non-outpost levels
/// </summary>
public readonly bool IgnoreAtNonOutpost;
public AutonomousObjective(XElement element)
{
@@ -29,6 +36,7 @@ namespace Barotrauma
PriorityModifier = element.GetAttributeFloat("prioritymodifier", 1);
PriorityModifier = MathHelper.Max(PriorityModifier, 0);
IgnoreAtOutpost = element.GetAttributeBool("ignoreatoutpost", false);
IgnoreAtNonOutpost = element.GetAttributeBool("ignoreatnonoutpost", false);
}
}
@@ -244,14 +252,14 @@ namespace Barotrauma
{
if (itemElement.Element("name") != null)
{
DebugConsole.ThrowError("Error in job config \"" + Name + "\" - use identifiers instead of names to configure the items.");
DebugConsole.ThrowErrorLocalized("Error in job config \"" + Name + "\" - use identifiers instead of names to configure the items.");
continue;
}
Identifier itemIdentifier = itemElement.GetAttributeIdentifier("identifier", Identifier.Empty);
if (itemIdentifier.IsEmpty)
{
DebugConsole.ThrowError("Error in job config \"" + Name + "\" - item with no identifier.");
DebugConsole.ThrowErrorLocalized("Error in job config \"" + Name + "\" - item with no identifier.");
}
else
{