Spectating, fire, damaged limb sprites, water detector, engineer jumpsuit, new signal comp sprites, resharper cleanup (god knows what else, commit more often)

This commit is contained in:
Regalis
2015-11-10 22:22:26 +02:00
parent cd48d12be6
commit 4d949e3be1
89 changed files with 977 additions and 622 deletions
@@ -47,6 +47,11 @@ namespace Barotrauma
get { return endMessage; }
}
public GameModePreset Preset
{
get { return preset; }
}
public GameMode(GameModePreset preset)
{
this.preset = preset;
@@ -12,7 +12,7 @@ namespace Barotrauma
{
//private const int StartCharacterAmount = 3;
public readonly CrewManager CrewManager;
//public readonly CrewManager CrewManager;
//public readonly HireManager hireManager;
private GUIButton endShiftButton;
@@ -36,14 +36,18 @@ namespace Barotrauma
public int Money
{
get { return CrewManager.Money; }
set { CrewManager.Money = value; }
get { return GameMain.GameSession.CrewManager.Money; }
set { GameMain.GameSession.CrewManager.Money = value; }
}
private CrewManager CrewManager
{
get { return GameMain.GameSession.CrewManager; }
}
public SinglePlayerMode(GameModePreset preset)
: base(preset)
{
CrewManager = new CrewManager();
CargoManager = new CargoManager();
@@ -86,7 +90,7 @@ namespace Barotrauma
{
if (subElement.Name.ToString().ToLower() != "crew") continue;
CrewManager = new CrewManager(subElement);
GameMain.GameSession.CrewManager = new CrewManager(subElement);
}
savedOnStart = true;
@@ -23,7 +23,7 @@ namespace Barotrauma
GameMain.GameSession.StartShift("tuto");
GameMain.GameSession.taskManager.Tasks.Clear();
GameMain.GameSession.TaskManager.Tasks.Clear();
GameMain.GameScreen.Select();
}
@@ -255,7 +255,6 @@ namespace Barotrauma
infoBox = CreateInfoFrame("You can see the equipped wire at the middle of the connection panel. Drag it to the power connector.");
var steeringConnection = steering.Item.Connections.Find(c => c.Name.Contains("power"));
var junctionConnection = junctionBox.Item.Connections.Find(c => c.Name.Contains("power"));
while (steeringConnection.Wires.FirstOrDefault(w => w != null) == null)
{