Unstable 0.1500.1.0 (BaroDev edition)

2021-09-03 21:56:31 +09:00
parent 501e02c026
commit e7b7c1a748
143 changed files with 2928 additions and 1356 deletions
@@ -395,12 +395,18 @@ namespace Barotrauma

            if (character.IsHusk && character.Params.UseHuskAppendage)
            {
+                bool inEditor = false;
+#if CLIENT
+                inEditor = Screen.Selected == GameMain.CharacterEditorScreen;
+#endif
+
                var characterPrefab = CharacterPrefab.FindByFilePath(character.ConfigPath);
                if (characterPrefab?.XDocument != null)
                {
                    var mainElement = characterPrefab.XDocument.Root.IsOverride() ? characterPrefab.XDocument.Root.FirstElement() : characterPrefab.XDocument.Root;
                    foreach (var huskAppendage in mainElement.GetChildElements("huskappendage"))
                    {
+                        if (!inEditor && huskAppendage.GetAttributeBool("onlyfromafflictions", false)) { continue; }
                        AfflictionHusk.AttachHuskAppendage(character, huskAppendage.GetAttributeString("affliction", string.Empty), huskAppendage, ragdoll: this);
                    }
                }