vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed merge errors

Browse Source
This commit is contained in:
EvilFactory
2024-04-24 12:34:59 -03:00
parent 0a9ff43986
commit 079b0c3648
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua
-2
View File
@@ -43,8 +43,6 @@ defaultLib["ClientPermissions"] = CreateEnum("Barotrauma.Networking.ClientPermis
defaultLib["OrderCategory"] = CreateEnum("Barotrauma.OrderCategory") defaultLib["OrderCategory"] = CreateEnum("Barotrauma.OrderCategory")
defaultLib["WearableType"] = CreateEnum("Barotrauma.WearableType") defaultLib["WearableType"] = CreateEnum("Barotrauma.WearableType")
defaultLib["NumberType"] = CreateEnum("Barotrauma.NumberType") defaultLib["NumberType"] = CreateEnum("Barotrauma.NumberType")
defaultLib["GameDifficulty"] = CreateEnum("Barotrauma.GameDifficulty")
defaultLib["StartingBalanceAmount"] = CreateEnum("Barotrauma.StartingBalanceAmount")
defaultLib["ChatMode"] = CreateEnum("Barotrauma.ChatMode") defaultLib["ChatMode"] = CreateEnum("Barotrauma.ChatMode")
defaultLib["CharacterType"] = CreateEnum("Barotrauma.CharacterType") defaultLib["CharacterType"] = CreateEnum("Barotrauma.CharacterType")
defaultLib["MissionType"] = CreateEnum("Barotrauma.MissionType") defaultLib["MissionType"] = CreateEnum("Barotrauma.MissionType")
Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs
+1
View File
@@ -1120,6 +1120,7 @@ namespace Barotrauma
case "hook": case "hook":
luaHook ??= new List<(string, ContentXElement)>(); luaHook ??= new List<(string, ContentXElement)>();
luaHook.Add((subElement.GetAttributeString("name", ""), subElement)); luaHook.Add((subElement.GetAttributeString("name", ""), subElement));
break;
case "triggeranimation": case "triggeranimation":
AnimationType animType = subElement.GetAttributeEnum("type", def: AnimationType.NotDefined); AnimationType animType = subElement.GetAttributeEnum("type", def: AnimationType.NotDefined);
string fileName = subElement.GetAttributeString("filename", def: null) ?? subElement.GetAttributeString("file", def: null); string fileName = subElement.GetAttributeString("filename", def: null) ?? subElement.GetAttributeString("file", def: null);
luacs-docs/lua/scripts/LuaDocsGenerator/Program.cs
-1
View File
@@ -108,7 +108,6 @@ namespace LuaDocsGenerator
GenerateEnum<BarotraumaClient.Barotrauma.InputType>("InputType.lua"); GenerateEnum<BarotraumaClient.Barotrauma.InputType>("InputType.lua");
GenerateEnum<Barotrauma.Networking.DeliveryMethod>("DeliveryMethod.lua"); GenerateEnum<Barotrauma.Networking.DeliveryMethod>("DeliveryMethod.lua");
GenerateEnum<BarotraumaClient.Barotrauma.NumberType>("NumberType.lua"); GenerateEnum<BarotraumaClient.Barotrauma.NumberType>("NumberType.lua");
GenerateEnum<BarotraumaClient.Barotrauma.GameDifficulty>("GameDifficulty.lua");
GenerateEnum<BarotraumaClient.Barotrauma.Level.PositionType>("PositionType.lua"); GenerateEnum<BarotraumaClient.Barotrauma.Level.PositionType>("PositionType.lua");
GenerateEnum<BarotraumaClient.Barotrauma.AbilityFlags>("AbilityFlags.lua"); GenerateEnum<BarotraumaClient.Barotrauma.AbilityFlags>("AbilityFlags.lua");