From 73d5edfafa6de27609f66d2f6f3310d691efe4b8 Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Sun, 15 May 2022 12:57:07 -0300 Subject: [PATCH] GUI and skill registers --- Barotrauma/BarotraumaShared/Lua/DefaultLib/LibClient.lua | 1 + Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua | 1 + .../Lua/DefaultRegister/RegisterClient.lua | 2 ++ .../Lua/DefaultRegister/RegisterShared.lua | 7 +++++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibClient.lua b/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibClient.lua index 63b18c5ac..57821cca4 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibClient.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibClient.lua @@ -34,6 +34,7 @@ defaultLib["GUI"] = { NumberInput = CreateStatic("Barotrauma.GUINumberInput", true), MessageBox = CreateStatic("Barotrauma.GUIMessageBox", true), ColorPicker = CreateStatic("Barotrauma.GUIColorPicker", true), + ProgressBar = CreateStatic("Barotrauma.GUIProgressBar", true), Screen = CreateStatic("Barotrauma.Screen"), diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua b/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua index fd13585a7..7bc3f1f56 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua @@ -57,6 +57,7 @@ defaultLib["Level"] = CreateStatic("Barotrauma.Level") defaultLib["Job"] = CreateStatic("Barotrauma.Job", true) defaultLib["JobPrefab"] = CreateStatic("Barotrauma.JobPrefab", true) defaultLib["AfflictionPrefab"] = CreateStatic("Barotrauma.AfflictionPrefab", true) +defaultLib["SkillSettings"] = CreateStatic("Barotrauma.SkillSettings", true) defaultLib["ChatMessage"] = CreateStatic("Barotrauma.Networking.ChatMessage") defaultLib["Structure"] = CreateStatic("Barotrauma.Structure", true) defaultLib["Hull"] = CreateStatic("Barotrauma.Hull", true) diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua index e548f0443..73b1023db 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua @@ -22,6 +22,7 @@ RegisterBarotrauma("PlayerInput") RegisterBarotrauma("ScalableFont") Register("Microsoft.Xna.Framework.Graphics.Texture2D") +Register("EventInput.KeyboardDispatcher") Register("EventInput.KeyEventArgs") Register("Microsoft.Xna.Framework.Input.Keys") Register("Microsoft.Xna.Framework.Input.KeyboardState") @@ -47,5 +48,6 @@ RegisterBarotrauma("GUIMessageBox") RegisterBarotrauma("GUIFont") RegisterBarotrauma("GUIFontPrefab") RegisterBarotrauma("GUIColorPicker") +RegisterBarotrauma("GUIProgressBar") RegisterBarotrauma("Inventory+SlotReference") \ No newline at end of file diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua index 85c407707..f1558582b 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua @@ -34,7 +34,6 @@ RegisterBarotrauma("CharacterParams+HealthParams") RegisterBarotrauma("CharacterParams+ParticleParams") RegisterBarotrauma("CharacterParams+SoundParams") - RegisterBarotrauma("Item") RegisterBarotrauma("DeconstructItem") RegisterBarotrauma("Submarine") @@ -194,6 +193,8 @@ Register("System.Net.IPAddress") RegisterBarotrauma("Skill") RegisterBarotrauma("SkillPrefab") +RegisterBarotrauma("SkillSettings") + RegisterBarotrauma("TraitorMissionPrefab") RegisterBarotrauma("TraitorMissionResult") @@ -213,6 +214,8 @@ RegisterBarotrauma("PrefabCollection`1[[Barotrauma.TalentPrefab]]") RegisterBarotrauma("PrefabCollection`1[[Barotrauma.TalentTree]]") RegisterBarotrauma("PrefabCollection`1[[Barotrauma.OrderPrefab]]") +RegisterBarotrauma("PrefabSelector`1[[Barotrauma.SkillSettings]]") + RegisterBarotrauma("Pair`2[[Barotrauma.JobPrefab],[System.Int32]]") RegisterBarotrauma("Range`1[System.Single]") @@ -229,4 +232,4 @@ Register("Microsoft.Xna.Framework.Vector4") Register("Microsoft.Xna.Framework.Color") Register("Microsoft.Xna.Framework.Point") Register("Microsoft.Xna.Framework.Rectangle") -Register("Microsoft.Xna.Framework.Matrix") +Register("Microsoft.Xna.Framework.Matrix") \ No newline at end of file