Lobbyscreen store fixes, sub name textbox & save button in sub editor, transitioncinematic on crew death, saving reactor state, radar marker position fix, minimap fix, button sounds, artifact positioning fix, better LegUp prevention method, some music clips when round ends

This commit is contained in:
Regalis
2016-01-03 01:13:32 +02:00
parent 8717a2259f
commit cb1513f5e6
32 changed files with 277 additions and 160 deletions
@@ -116,6 +116,8 @@ namespace Barotrauma
endTimer = 5.0f;
isRunning = true;
CrewManager.StartShift();
shiftSummary = new ShiftSummary(GameMain.GameSession);
@@ -141,7 +143,7 @@ namespace Barotrauma
public override void Draw(SpriteBatch spriteBatch)
{
base.Draw(spriteBatch);
if (!isRunning) return;
CrewManager.Draw(spriteBatch);
@@ -166,6 +168,8 @@ namespace Barotrauma
public override void Update(float deltaTime)
{
if (!isRunning) return;
base.Update(deltaTime);
CrewManager.Update(deltaTime);
@@ -174,16 +178,13 @@ namespace Barotrauma
if (!crewDead)
{
if (CrewManager.characters.Find(c => !c.IsDead) == null)
{
crewDead = true;
}
if (!CrewManager.characters.Any(c => !c.IsDead)) crewDead = true;
}
else
{
endTimer -= deltaTime;
if (endTimer <= 0.0f) End("");
if (endTimer <= 0.0f) EndShift(null, null);
}
}
@@ -192,8 +193,6 @@ namespace Barotrauma
isRunning = false;
GameMain.GameSession.EndShift("");
//if (endMessage != "" || this.endMessage == null) this.endMessage = endMessage;
GUIFrame summaryFrame = shiftSummary.CreateSummaryFrame();
@@ -211,8 +210,6 @@ namespace Barotrauma
}
SaveUtil.SaveGame(GameMain.GameSession.SaveFile);
}
else
{
@@ -223,6 +220,8 @@ namespace Barotrauma
msgBox.Buttons[1].OnClicked += msgBox.Close;
}
GameMain.GameSession.EndShift("");
CrewManager.EndShift();
for (int i = Character.CharacterList.Count - 1; i >= 0; i--)
{
@@ -234,8 +233,12 @@ namespace Barotrauma
private bool EndShift(GUIButton button, object obj)
{
isRunning = false;
var cinematic = new TransitionCinematic(Submarine.Loaded, GameMain.GameScreen.Cam);
SoundPlayer.OverrideMusicType = CrewManager.characters.Any(c => !c.IsDead) ? "endshift" : "crewdead";
CoroutineManager.StartCoroutine(EndCinematic(cinematic));
return true;
@@ -250,6 +253,10 @@ namespace Barotrauma
End("");
yield return new WaitForSeconds(18.0f);
SoundPlayer.OverrideMusicType = null;
yield return CoroutineStatus.Success;
}