shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mute the background music during OOBE

Browse source
This commit is contained in:
Michael 2017-02-08 12:59:26 -05:00
parent f66cf31e5d
commit a4b49ab68b
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShiftOS.WinForms/Oobe.cs
View file

@ -171,7 +171,6 @@ namespace ShiftOS.WinForms
TextType("Creating new user: " + MySave.Username);
TextType("...with 0 Codepoints, 0 installed upgrades, no legion, and no user shops...");
MySave.Codepoints = 0;
MySave.Upgrades = new Dictionary<string, bool>();
MySave.CurrentLegions = new List<string>();
MySave.MyShop = "";
TextType("User created successfully.");

11
ShiftOS.WinForms/ShiftOSAudioProvider.cs
View file

@ -26,21 +26,24 @@ namespace ShiftOS.WinForms
get
{
if (SaveSystem.CurrentSave == null)
return 1.0f;
return 0.0f;
if (TutorialManager.IsInTutorial || SaveSystem.CurrentSave.StoryPosition < 1)
return 0.0f;
try
{
return SaveSystem.CurrentSave.Settings.audioVolume;
}
catch
{
SaveSystem.CurrentSave.Settings.audioVolume = 1.0f;
return 1.0f;
SaveSystem.CurrentSave.Settings.audioVolume = 0.45F;
return 0.45F;
}
}
}
set
{
SaveSystem.CurrentSave.Settings.audioVolume = value;
//SaveSystem.SaveGame();
}
}

11
ShiftOS.WinForms/WinformsDesktop.cs
View file

@ -99,11 +99,14 @@ namespace ShiftOS.WinForms
};
time.Tick += (o, a) =>
{
if (SaveSystem.CurrentSave != null && TutorialManager.IsInTutorial == false)
if (Shiftorium.IsInitiated == true)
{
lbtime.Text = Applications.Terminal.GetTime();
lbtime.Left = desktoppanel.Width - lbtime.Width - LoadedSkin.DesktopPanelClockFromRight.X;
lbtime.Top = LoadedSkin.DesktopPanelClockFromRight.Y;
if (SaveSystem.CurrentSave != null && TutorialManager.IsInTutorial == false)
{
lbtime.Text = Applications.Terminal.GetTime();
lbtime.Left = desktoppanel.Width - lbtime.Width - LoadedSkin.DesktopPanelClockFromRight.X;
lbtime.Top = LoadedSkin.DesktopPanelClockFromRight.Y;
}
}
};
time.Start();

4
ShiftOS_TheReturn/Shiftorium.cs
View file

@ -30,6 +30,7 @@ using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using static ShiftOS.Engine.SaveSystem;
using System.Diagnostics;
namespace ShiftOS.Engine
{
@ -242,6 +243,9 @@ namespace ShiftOS.Engine
public ShiftoriumUpgradeLookupException(string id) : base("A shiftorium upgrade of ID \"" + id + "\" was not found in the system.")
{
ID = id;
Debug.WriteLine("UpgradeNotFound: " + id);
}
public string ID { get; private set; }