From 54b49209edd592fac4b5b5511ffb1e0d8592be88 Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Thu, 22 Apr 2021 13:59:27 -0300 Subject: [PATCH] fixes --- .../ServerSource/Lua/LuaClasses.cs | 2 +- .../GameSession/GameModes/GameMode.cs | 89 ++++++++++--------- 2 files changed, 47 insertions(+), 44 deletions(-) diff --git a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs index 65ef51feb..b9fc3b9cd 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs @@ -39,7 +39,7 @@ namespace Barotrauma public static CharacterInfo CreateCharacterInfo(string speciesName, string name = "", JobPrefab jobPrefab = null, string ragdollFileName = null, int variant = 0, Rand.RandSync randSync = Rand.RandSync.Unsynced) { - return new CharacterInfo(speciesName, name, jobPrefab, ragdollFileName, variant, randSync); + return new CharacterInfo(speciesName, name, name, jobPrefab, ragdollFileName, variant, randSync); } public static void SetClientCharacter(Client client, Character character) diff --git a/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/GameMode.cs b/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/GameMode.cs index dfc8516ab..7d935f587 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/GameMode.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/GameMode.cs @@ -1,71 +1,74 @@ using System; using System.Collections.Generic; +using System.Linq; #if SERVER using MoonSharp.Interpreter; #endif namespace Barotrauma { - partial class GameMode - { - public static List PresetList = new List(); + partial class GameMode + { + public static List PresetList = new List(); - protected DateTime startTime; + protected DateTime startTime; - protected GameModePreset preset; + protected GameModePreset preset; - public CrewManager CrewManager - { - get { return GameMain.GameSession?.CrewManager; } - } + public CrewManager CrewManager + { + get { return GameMain.GameSession?.CrewManager; } + } - public virtual Mission Mission - { - get { return null; } - } + public virtual IEnumerable Missions + { + get { return Enumerable.Empty(); } + } - public bool IsSinglePlayer - { - get { return preset.IsSinglePlayer; } - } + public bool IsSinglePlayer + { + get { return preset.IsSinglePlayer; } + } - public string Name - { - get { return preset.Name; } - } + public string Name + { + get { return preset.Name; } + } - public virtual bool Paused - { - get { return false; } - } + public virtual bool Paused + { + get { return false; } + } - public virtual void UpdateWhilePaused(float deltaTime) { } + public virtual void UpdateWhilePaused(float deltaTime) { } - public GameModePreset Preset - { - get { return preset; } - } + public GameModePreset Preset + { + get { return preset; } + } - public GameMode(GameModePreset preset) - { - this.preset = preset; - } + public GameMode(GameModePreset preset) + { + this.preset = preset; + } - public virtual void Start() - { - startTime = DateTime.Now; - } + public virtual void Start() + { + startTime = DateTime.Now; + } - public virtual void ShowStartMessage() { } + public virtual void ShowStartMessage() { } - public virtual void AddToGUIUpdateList() - { + public virtual void AddExtraMissions(LevelData levelData) { } + + public virtual void AddToGUIUpdateList() + { #if CLIENT GameMain.GameSession?.CrewManager.AddToGUIUpdateList(); #endif - } + } - public virtual void Update(float deltaTime) + public virtual void Update(float deltaTime) { CrewManager?.Update(deltaTime);