diff options
Diffstat (limited to 'ShiftOS.Frontend')
| -rw-r--r-- | ShiftOS.Frontend/Desktop/Desktop.cs | 10 | ||||
| -rw-r--r-- | ShiftOS.Frontend/ShiftOS.cs | 11 |
2 files changed, 19 insertions, 2 deletions
diff --git a/ShiftOS.Frontend/Desktop/Desktop.cs b/ShiftOS.Frontend/Desktop/Desktop.cs index 1bca3f8..43bbf79 100644 --- a/ShiftOS.Frontend/Desktop/Desktop.cs +++ b/ShiftOS.Frontend/Desktop/Desktop.cs @@ -204,7 +204,15 @@ namespace ShiftOS.Frontend.Desktop Width = GetSize().Width; Height = GetSize().Height; var now = DateTime.Now.TimeOfDay; - var newDateTimeString = $"{now.Hours}:{now.Minutes}:{now.Seconds}"; + var newDateTimeString = $"{now.Hours}:{now.Minutes}:{now.Seconds} - "; + if(Hacking.CurrentHackable == null) + { + newDateTimeString += SaveSystem.CurrentSave.SystemName; + } + else + { + newDateTimeString += Hacking.CurrentHackable.Data.SystemName; + } if(newDateTimeString != dateTimeString) { dateTimeString = newDateTimeString; diff --git a/ShiftOS.Frontend/ShiftOS.cs b/ShiftOS.Frontend/ShiftOS.cs index 61a20fb..597c4ff 100644 --- a/ShiftOS.Frontend/ShiftOS.cs +++ b/ShiftOS.Frontend/ShiftOS.cs @@ -252,15 +252,22 @@ namespace ShiftOS.Frontend if (Hacking.CurrentHackable.DoConnectionTimeout) { Hacking.CurrentHackable.MillisecondsCountdown -= gameTime.ElapsedGameTime.TotalMilliseconds; - if(Hacking.CurrentHackable.MillisecondsCountdown <= 0) + shroudOpacity = (float)GUI.ProgressBar.linear(Hacking.CurrentHackable.MillisecondsCountdown, Hacking.CurrentHackable.TotalConnectionTimeMS, 0, 0, 1); + if (Hacking.CurrentHackable.MillisecondsCountdown <= 0) { Hacking.FailHack(); } } } + else + { + shroudOpacity = 0; + } base.Update(gameTime); } + float shroudOpacity = 0.0f; + private GUI.TextControl framerate = new GUI.TextControl(); /// <summary> @@ -292,6 +299,8 @@ namespace ShiftOS.Frontend spriteBatch.Draw(MouseTexture, new Rectangle(mousepos.X+1, mousepos.Y+1, MouseTexture.Width, MouseTexture.Height), Color.Black * 0.5f); spriteBatch.Draw(MouseTexture, new Rectangle(mousepos.X, mousepos.Y, MouseTexture.Width, MouseTexture.Height), Color.White); + spriteBatch.Draw(UIManager.SkinTextures["PureWhite"], new Rectangle(0, 0, UIManager.Viewport.Width, UIManager.Viewport.Height), Color.Red * shroudOpacity); + if(Hacking.CurrentHackable != null) { if (Hacking.CurrentHackable.DoConnectionTimeout) |