Endworm attacks working, itemlabel text saving bugfix, deconstructors & fabricators need power, engine sprite, disable wire node dragging in character mode, only hit with one meleeweapon at a time, fixrequirement text overflow fix, mapentities can hace multiple categories, Gap.FindHull fix, Waypoint ladder & gap saving, stuff

2016-01-18 20:09:38 +02:00
parent 5f1cb194ab
commit 1a5b3fa66a
39 changed files with 206 additions and 152 deletions
@@ -196,10 +196,20 @@ namespace Barotrauma
            
            FireProof = ToolBox.GetAttributeBool(element, "fireproof", false);

-            MapEntityCategory category;
-            Enum.TryParse(ToolBox.GetAttributeString(element, "category", "Misc"), out category);
-            Category = category;

+            string categoriesStr = ToolBox.GetAttributeString(element, "category", "Misc");
+            string[] categories = categoriesStr.Split(',');
+
+            for (int i = 0; i<categories.Length; i++)
+            {
+
+                MapEntityCategory category;
+                if (Enum.TryParse(ToolBox.GetAttributeString(element, "category", "Misc"), out category))
+                {
+                    Category = i == 0 ? category : Category | category;
+                }
+            }
+            
            string spriteColorStr = ToolBox.GetAttributeString(element, "spritecolor", "1.0,1.0,1.0,1.0");
            SpriteColor = new Color(ToolBox.ParseToVector4(spriteColorStr));