Unstable 0.1300.0.4

This commit is contained in:
Markus Isberg
2021-03-30 15:51:49 +03:00
parent 58c50a235d
commit 862221635c
108 changed files with 907 additions and 378 deletions
@@ -66,5 +66,10 @@ namespace Barotrauma
return (Event)instance;
}
public override string ToString()
{
return $"EventPrefab ({Identifier})";
}
}
}
@@ -299,6 +299,13 @@ namespace Barotrauma
System.Diagnostics.Debug.Assert(spawnPoint.ParentRuin == chosenPosition.Ruin);
spawnPos = spawnPoint.WorldPosition;
}
else
{
//no suitable position found, disable the event
spawnPos = null;
Finished();
return;
}
}
else if ((chosenPosition.PositionType == Level.PositionType.MainPath || chosenPosition.PositionType == Level.PositionType.SidePath)
&& offset > 0)
@@ -22,7 +22,7 @@ namespace Barotrauma
public override string ToString()
{
return "ScriptedEvent (" + prefab.EventType.ToString() +")";
return $"ScriptedEvent ({prefab.Identifier})";
}
public ScriptedEvent(EventPrefab prefab) : base(prefab)