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

v1.2.6.0 (Winter Update)

Browse Source
This commit is contained in:
Regalis11
2023-12-14 16:11:27 +02:00
parent af8cc89fce
commit b91e85559d
375 changed files with 7771 additions and 2874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Traitors/TraitorEvent.cs
+2 -2
View File
@@ -96,8 +96,8 @@ namespace Barotrauma
traitor.Character.IsTraitor = true;
AddTarget(Tags.Traitor, traitor.Character);
AddTarget(Tags.AnyTraitor, traitor.Character);
AddTargetPredicate(Tags.NonTraitor, e => e is Character c && (c.IsPlayer || c.IsBot) && !c.IsTraitor && c.TeamID == traitor.TeamID && !c.IsIncapacitated);
AddTargetPredicate(Tags.NonTraitorPlayer, e => e is Character c && c.IsPlayer && !c.IsTraitor && c.IsOnPlayerTeam && !c.IsIncapacitated);
AddTargetPredicate(Tags.NonTraitor, TargetPredicate.EntityType.Character, e => e is Character c && (c.IsPlayer || c.IsBot) && !c.IsTraitor && c.TeamID == traitor.TeamID && !c.IsIncapacitated);
AddTargetPredicate(Tags.NonTraitorPlayer, TargetPredicate.EntityType.Character, e => e is Character c && c.IsPlayer && !c.IsTraitor && c.IsOnPlayerTeam && !c.IsIncapacitated);
}
public void SetSecondaryTraitors(IEnumerable<Client> traitors)
Barotrauma/BarotraumaShared/SharedSource/Traitors/TraitorEventPrefab.cs
+3 -2
View File
@@ -25,7 +25,8 @@ namespace Barotrauma
MissionType = element.GetAttributeEnum(nameof(MissionType), MissionType.None);
if (MissionIdentifier.IsEmpty && MissionTag.IsEmpty && MissionType == MissionType.None)
{
DebugConsole.ThrowError($"Error in traitor event \"{prefab.Identifier}\". Mission requirement with no {nameof(MissionIdentifier)}, {nameof(MissionTag)} or {nameof(MissionType)}.");
DebugConsole.ThrowError($"Error in traitor event \"{prefab.Identifier}\". Mission requirement with no {nameof(MissionIdentifier)}, {nameof(MissionTag)} or {nameof(MissionType)}.",
contentPackage: prefab.ContentPackage);
}
}
@@ -72,7 +73,7 @@ namespace Barotrauma
//feels a little weird to have something this specific here, but couldn't think of a better way to implement this
public ImmutableArray<PropertyConditional> RequiredItemConditionals;
public LevelRequirement(XElement element, TraitorEventPrefab prefab)
public LevelRequirement(ContentXElement element, TraitorEventPrefab prefab)
{
levelType = element.GetAttributeEnum(nameof(LevelType), LevelType.Any);
LocationTypes = element.GetAttributeIdentifierArray("locationtype", Array.Empty<Identifier>()).ToImmutableArray();