(a00338777) v0.9.2.1

2019-08-26 19:58:19 +03:00
parent 0f63da27b2
commit 80698b58b0
311 changed files with 11763 additions and 4507 deletions
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Barotrauma
+{
+    partial class Traitor
+    {
+        public sealed class GoalHasDuration : Modifier
+        {
+            private readonly float requiredDuration;
+            private readonly bool countTotalDuration;
+            private readonly string durationInfoTextId;
+
+            public override IEnumerable<string> InfoTextKeys => base.InfoTextKeys.Concat(new string[] { "[duration]" });
+
+            public override IEnumerable<string> InfoTextValues => base.InfoTextValues.Concat(new string[] { $"{TimeSpan.FromSeconds(requiredDuration):g}" });
+
+            protected internal override string GetInfoText(Traitor traitor, string textId, IEnumerable<string> keys, IEnumerable<string> values)
+            {
+                var infoText = base.GetInfoText(traitor, textId, keys, values);
+                return !string.IsNullOrEmpty(durationInfoTextId) ? TextManager.FormatServerMessage(durationInfoTextId, new[] { "[infotext]", "[duration]" }, new[] { infoText, $"{TimeSpan.FromSeconds(requiredDuration):g}" }) : infoText;
+            }
+
+            private bool isCompleted = false;
+            public override bool IsCompleted => isCompleted;
+
+            private float remainingDuration = float.NaN;
+
+            public override void Update(float deltaTime)
+            {
+                base.Update(deltaTime);
+                if (Goal.IsCompleted)
+                {
+                    if (!float.IsNaN(remainingDuration))
+                    {
+                        remainingDuration -= deltaTime;
+                    }
+                    else
+                    {
+                        remainingDuration = requiredDuration;
+                    }
+                    isCompleted |= remainingDuration <= 0.0f;
+                }
+                else if (!countTotalDuration)
+                {
+                    remainingDuration = float.NaN;
+                }
+            }
+
+            public GoalHasDuration(Goal goal, float requiredDuration, bool countTotalDuration, string durationInfoTextId) : base(goal)
+            {
+                this.requiredDuration = requiredDuration;
+                this.countTotalDuration = countTotalDuration;
+                this.durationInfoTextId = durationInfoTextId;
+            }
+        }
+    }
+}
+
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Barotrauma
+{
+    partial class Traitor
+    {
+        public sealed class GoalHasTimeLimit : Modifier
+        {
+            private readonly float timeLimit;
+            private readonly string timeLimitInfoTextId;
+
+            public override IEnumerable<string> InfoTextKeys => base.InfoTextKeys.Concat(new string[] { "[timelimit]" });
+            public override IEnumerable<string> InfoTextValues => base.InfoTextValues.Concat(new string[] { $"{TimeSpan.FromSeconds(timeLimit):g}" });
+
+            protected internal override string GetInfoText(Traitor traitor, string textId, IEnumerable<string> keys, IEnumerable<string> values)
+            {
+                var infoText = base.GetInfoText(traitor, textId, keys, values);
+                return !string.IsNullOrEmpty(timeLimitInfoTextId) ? TextManager.FormatServerMessage(timeLimitInfoTextId, new[] { "[infotext]", "[timelimit]" }, new[] { infoText, $"{TimeSpan.FromSeconds(timeLimit):g}" }) : infoText;
+            }
+
+            public override bool CanBeCompleted => base.CanBeCompleted && (!IsStarted || timeRemaining > 0.0f);
+
+            private float timeRemaining;
+
+            public override void Update(float deltaTime)
+            {
+                base.Update(deltaTime);
+                timeRemaining = System.Math.Max(0.0f, timeRemaining - deltaTime);
+            }
+
+            public override bool Start(Traitor traitor)
+            {
+                if (!base.Start(traitor))
+                {
+                    return false;
+                }
+                timeRemaining = timeLimit;
+                return true;
+            }
+
+            public GoalHasTimeLimit(Goal goal, float timeLimit, string timeLimitInfoTextId) : base(goal)
+            {
+                this.timeLimit = timeLimit;
+                this.timeLimitInfoTextId = timeLimitInfoTextId;
+            }
+        }
+    }
+}
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Barotrauma
+{
+    partial class Traitor
+    {
+        public sealed class GoalIsOptional : Modifier
+        {
+            private readonly string optionalInfoTextId;
+
+            public override string StatusValueTextId => (base.IsStarted && !base.CanBeCompleted) ? "failed" : base.StatusValueTextId;
+
+            public override IEnumerable<string> StatusTextValues
+            {
+                get {
+                    var values = base.StatusTextValues.ToArray();
+                    values[1] = TextManager.GetServerMessage(StatusValueTextId);
+                    return values;
+                }
+            }
+
+            public override bool IsCompleted => base.IsCompleted || (base.IsStarted && !base.CanBeCompleted);
+            public override bool CanBeCompleted => true;
+
+            protected internal override string GetInfoText(Traitor traitor, string textId, IEnumerable<string> keys, IEnumerable<string> values)
+            {
+                var infoText = base.GetInfoText(traitor, textId, keys, values);
+                return !string.IsNullOrEmpty(optionalInfoTextId) ? TextManager.FormatServerMessage(optionalInfoTextId, new[] { "[infotext]" }, new[] { infoText }) : infoText;
+            }
+
+            public GoalIsOptional(Goal goal, string optionalInfoTextId) : base(goal)
+            {
+                this.optionalInfoTextId = optionalInfoTextId;
+            }
+        }
+    }
+}
@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Barotrauma
+{
+    partial class Traitor
+    {
+        public abstract class Modifier : Goal
+        {
+            protected Goal Goal { get; }
+
+            public override string StatusValueTextId => Goal.StatusValueTextId;
+
+            public override string StatusTextId
+            {
+                get => Goal.StatusTextId;
+                set => Goal.StatusTextId = value;
+            }
+
+            public override string InfoTextId
+            {
+                get => Goal.InfoTextId;
+                set => Goal.InfoTextId = value;
+            }
+
+            public override string CompletedTextId
+            {
+                get => Goal.CompletedTextId;
+                set => Goal.CompletedTextId = value;
+            }
+
+            public override IEnumerable<string> StatusTextKeys => Goal.StatusTextKeys;
+            public override IEnumerable<string> StatusTextValues => new [] { InfoText, TextManager.FormatServerMessage(StatusValueTextId) };
+
+            public override IEnumerable<string> InfoTextKeys => Goal.InfoTextKeys;
+            public override IEnumerable<string> InfoTextValues => Goal.InfoTextValues;
+
+            public override IEnumerable<string> CompletedTextKeys => Goal.CompletedTextKeys;
+            public override IEnumerable<string> CompletedTextValues => Goal.CompletedTextValues;
+
+            protected internal override string GetStatusText(Traitor traitor, string textId, IEnumerable<string> keys, IEnumerable<string> values) => Goal.GetStatusText(traitor, textId, keys, values);
+            protected internal override string GetInfoText(Traitor traitor, string textId, IEnumerable<string> keys, IEnumerable<string> values) => Goal.GetInfoText(traitor, textId, keys, values);
+            protected internal override string GetCompletedText(Traitor traitor, string textId, IEnumerable<string> keys, IEnumerable<string> values) => Goal.GetCompletedText(traitor, textId, keys, values);
+
+            public override string StatusText => GetStatusText(Traitor, StatusTextId, StatusTextKeys, StatusTextValues);
+            public override string InfoText => GetInfoText(Traitor, InfoTextId, InfoTextKeys, InfoTextValues);
+            public override string CompletedText => CompletedTextId != null ? GetCompletedText(Traitor, CompletedTextId, CompletedTextKeys, CompletedTextValues) : StatusText;
+
+            public override bool IsCompleted => Goal.IsCompleted;
+            public override bool IsStarted => base.IsStarted && Goal.IsStarted;
+            public override bool CanBeCompleted => base.CanBeCompleted && Goal.CanBeCompleted;
+
+            public override bool IsEnemy(Character character) => base.IsEnemy(character) || Goal.IsEnemy(character);
+
+            public override void Update(float deltaTime)
+            {
+                base.Update(deltaTime);
+                Goal.Update(deltaTime);
+            }
+
+            public override bool Start(Traitor traitor)
+            {
+                if (!base.Start(traitor))
+                {
+                    return false;
+                }
+                if (!Goal.Start(traitor))
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            protected Modifier(Goal goal) : base()
+            {
+                Goal = goal;
+            }
+        }
+    }
+}