Fixed merge errors

evilfactory · Apr 24, 2024 · 079b0c3 · 079b0c3
1 parent 0a9ff43
commit 079b0c3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua b/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua
@@ -43,8 +43,6 @@ defaultLib["ClientPermissions"] = CreateEnum("Barotrauma.Networking.ClientPermis
 defaultLib["OrderCategory"] = CreateEnum("Barotrauma.OrderCategory")
 defaultLib["WearableType"] = CreateEnum("Barotrauma.WearableType")
 defaultLib["NumberType"] = CreateEnum("Barotrauma.NumberType")
-defaultLib["GameDifficulty"] = CreateEnum("Barotrauma.GameDifficulty")
-defaultLib["StartingBalanceAmount"] = CreateEnum("Barotrauma.StartingBalanceAmount")
 defaultLib["ChatMode"] = CreateEnum("Barotrauma.ChatMode")
 defaultLib["CharacterType"] = CreateEnum("Barotrauma.CharacterType")
 defaultLib["MissionType"] = CreateEnum("Barotrauma.MissionType")

diff --git a/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs b/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs
@@ -1120,6 +1120,7 @@ protected StatusEffect(ContentXElement element, string parentDebugName)
                     case "hook":
                         luaHook ??= new List<(string, ContentXElement)>();
                         luaHook.Add((subElement.GetAttributeString("name", ""), subElement));
+                        break;
                     case "triggeranimation":
                         AnimationType animType = subElement.GetAttributeEnum("type", def: AnimationType.NotDefined);
                         string fileName = subElement.GetAttributeString("filename", def: null) ?? subElement.GetAttributeString("file", def: null);

diff --git a/luacs-docs/lua/scripts/LuaDocsGenerator/Program.cs b/luacs-docs/lua/scripts/LuaDocsGenerator/Program.cs
@@ -108,7 +108,6 @@ static void Main(string[] args)
             GenerateEnum<BarotraumaClient.Barotrauma.InputType>("InputType.lua");
             GenerateEnum<Barotrauma.Networking.DeliveryMethod>("DeliveryMethod.lua");
             GenerateEnum<BarotraumaClient.Barotrauma.NumberType>("NumberType.lua");
-            GenerateEnum<BarotraumaClient.Barotrauma.GameDifficulty>("GameDifficulty.lua");
             GenerateEnum<BarotraumaClient.Barotrauma.Level.PositionType>("PositionType.lua");
             GenerateEnum<BarotraumaClient.Barotrauma.AbilityFlags>("AbilityFlags.lua");