(7788ec72a) Test issuing orders automatically.

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:03:49 +03:00
parent d00e2975ba
commit 60f52375e6
202 changed files with 2714 additions and 5825 deletions
+23 -6
View File
@@ -63,6 +63,13 @@ namespace Barotrauma
return "Hull";
}
}
[Editable, Serialize("", true)]
public string RoomName
{
get;
set;
}
public string DisplayName
{
@@ -417,6 +424,11 @@ namespace Barotrauma
public void AddFireSource(FireSource fireSource)
{
FireSources.Add(fireSource);
if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer && !IdFreed)
{
GameMain.NetworkMember.CreateEntityEvent(this);
}
}
public override void Update(float deltaTime, Camera cam)
@@ -584,6 +596,11 @@ namespace Barotrauma
public void RemoveFire(FireSource fire)
{
FireSources.Remove(fire);
if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer && !Removed && !IdFreed)
{
GameMain.NetworkMember.CreateEntityEvent(this);
}
}
public IEnumerable<Hull> GetConnectedHulls(int? searchDepth)
@@ -800,17 +817,17 @@ namespace Barotrauma
}
if (roomItems.Contains("reactor"))
return "RoomName.ReactorRoom";
return TextManager.Get("ReactorRoom");
else if (roomItems.Contains("engine"))
return "RoomName.EngineRoom";
return TextManager.Get("EngineRoom");
else if (roomItems.Contains("steering") && roomItems.Contains("sonar"))
return "RoomName.CommandRoom";
return TextManager.Get("CommandRoom");
else if (roomItems.Contains("ballast"))
return "RoomName.Ballast";
return TextManager.Get("Ballast");
if (ConnectedGaps.Any(g => !g.IsRoomToRoom && g.ConnectedDoor != null))
{
return "RoomName.Airlock";
return TextManager.Get("Airlock");
}
Rectangle subRect = Submarine.CalculateDimensions();
@@ -830,7 +847,7 @@ namespace Barotrauma
else
roomPos |= Alignment.Right;
return "RoomName.Sub" + roomPos.ToString();
return TextManager.Get("Sub" + roomPos.ToString());
}
public static Hull Load(XElement element, Submarine submarine)