Build 0.18.0.0

This commit is contained in:
Markus Isberg
2022-05-13 00:55:52 +09:00
parent 15d18e6ff6
commit 7547a9b78a
218 changed files with 3881 additions and 2192 deletions
@@ -173,14 +173,14 @@ namespace Barotrauma
if (!Actions.Any())
{
Finished();
Finish();
return;
}
var currentAction = Actions[CurrentActionIndex];
if (!currentAction.CanBeFinished())
{
Finished();
Finish();
return;
}
@@ -207,7 +207,7 @@ namespace Barotrauma
if (CurrentActionIndex >= Actions.Count || CurrentActionIndex < 0)
{
Finished();
Finish();
}
}
else
@@ -232,9 +232,9 @@ namespace Barotrauma
return false;
}
public override void Finished()
public override void Finish()
{
base.Finished();
base.Finish();
GameAnalyticsManager.AddDesignEvent($"ScriptedEvent:{prefab.Identifier}:Finished:{CurrentActionIndex}");
}
}