(2a4bd39c2) Merge branch 'dev' into human-ai

2019-05-16 05:33:13 +03:00
parent a3db11876b
commit e367f900b8
54 changed files with 1092 additions and 297 deletions
@@ -70,7 +70,13 @@ namespace Barotrauma.Tutorials
            }
        }

-        public string Name
+        public string Identifier
+        {
+            get;
+            protected set;
+        }
+
+        public string DisplayName
        {
            get;
            protected set;
@@ -159,8 +165,9 @@ namespace Barotrauma.Tutorials
        public Tutorial(XElement element)
        {
            configElement = element;
-            Name = element.GetAttributeString("name", "Unnamed");
-            completed = GameMain.Config.CompletedTutorialNames.Contains(Name);
+            Identifier = element.GetAttributeString("identifier", "unknown");
+            DisplayName = TextManager.Get(Identifier);
+            completed = GameMain.Config.CompletedTutorialNames.Contains(Identifier);
            playableContentPath = element.GetAttributeString("playablecontentpath", "");

            segments = new List<TutorialSegment>();