From 27cde50c086bb58ce9c41405674116c8790cc6a5 Mon Sep 17 00:00:00 2001 From: EvilFactory Date: Tue, 28 Feb 2023 16:57:17 -0300 Subject: [PATCH] Register particles, added Game.Paused which is always false to server-side, and exposed ParticleManager --- .../Lua/DefaultRegister/RegisterClient.lua | 9 +++++++++ .../Lua/DefaultRegister/RegisterShared.lua | 3 +++ .../LuaCs/Lua/LuaClasses/LuaGame.cs | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua index 75abfb243..9f2dfd74c 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua @@ -52,10 +52,19 @@ RegisterBarotrauma("Sounds.LowShelfFilter") RegisterBarotrauma("Sounds.HighShelfFilter") RegisterBarotrauma("Sounds.PeakFilter") +RegisterBarotrauma("Particles.ParticleManager") +RegisterBarotrauma("Particles.Particle") +RegisterBarotrauma("Particles.ParticleEmitterProperties") +RegisterBarotrauma("Particles.ParticleEmitter") +RegisterBarotrauma("Particles.ParticlePrefab") +RegisterBarotrauma("PrefabCollection`1[[Barotrauma.Particles.ParticlePrefab]]") + RegisterBarotrauma("Lights.LightManager") RegisterBarotrauma("Lights.LightSource") RegisterBarotrauma("Lights.LightSourceParams") +RegisterBarotrauma("LevelWallVertexBuffer") +RegisterBarotrauma("LevelRenderer") RegisterBarotrauma("WaterRenderer") RegisterBarotrauma("WaterVertexData") diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua index 9c2d1db19..95ad01c25 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua @@ -4,6 +4,9 @@ local RegisterBarotrauma = LuaSetup.LuaUserData.RegisterTypeBarotrauma Register("System.TimeSpan") Register("System.Exception") +RegisterBarotrauma("Barotrauma.Success`2[[Barotrauma.ContentPackage],[System.Exception]]") +RegisterBarotrauma("Barotrauma.Failure`2[[Barotrauma.ContentPackage],[System.Exception]]") + RegisterBarotrauma("LuaSByte") RegisterBarotrauma("LuaByte") RegisterBarotrauma("LuaInt16") diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs index 8a05c71d0..6cfadb1ad 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs @@ -66,6 +66,22 @@ namespace Barotrauma } } + public MainMenuScreen MainMenuScreen + { + get + { + return GameMain.MainMenuScreen; + } + } + + public Particles.ParticleManager ParticleManager + { + get + { + return GameMain.ParticleManager; + } + } + public bool IsSubEditor { get @@ -90,6 +106,8 @@ namespace Barotrauma return GameMain.Server.ServerPeer is LidgrenServerPeer; } } + + public bool Paused => false; #endif public ServerSettings ServerSettings