This commit is contained in:
Evil Factory
2021-04-22 13:59:27 -03:00
parent 08ecfb0098
commit 54b49209ed
2 changed files with 47 additions and 44 deletions
@@ -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)
@@ -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<GameModePreset> PresetList = new List<GameModePreset>();
partial class GameMode
{
public static List<GameModePreset> PresetList = new List<GameModePreset>();
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<Mission> Missions
{
get { return Enumerable.Empty<Mission>(); }
}
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);