shiftos-archive/ShiftOS-C-
1
0
Fork 0
mirror of https://github.com/seriocomedy/ShiftOS-C-.git synced 2025-01-22 02:22:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Couple Bugs and Crashes

Browse source 
- Fixed: Crash when Hacking With No Tools
- Fixed: Accessing directories outside of C:\ShiftOS using 'ls' command
- Added Small Features
This commit is contained in:
carverh 2016-07-20 20:47:35 -07:00
parent 4fe0de40aa
commit 2747ec98b7
3 changed files with 74 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/WindowsFormsApplication1/Apps/Terminal.cs
View file

@ -1378,8 +1378,15 @@ public string GetPath(string path)
public string GetParent(string path)
{
var d = new DirectoryInfo(path);
return d.Parent.FullName;
if (new DirectoryInfo(path).Parent.FullName.Contains("ShiftOS"))
{
var d = new DirectoryInfo(path);
return d.Parent.FullName;
}
else
{
return path;
}
}
public void DoCommand()

111
source/WindowsFormsApplication1/Gameplay/Hacking.cs
View file

@ -373,62 +373,71 @@ public static void StartHack(int cid, string upgrade)
{
StartHack(cid, GetRandomHack());
}
else {
var h = Tools[cid];
switch(h.Name)
else
{
if (Tools.Count <= cid)
{
case "Destabilizer Attack":
var t = new Timer();
t.Interval = 1000 / h.Effectiveness;
var rnd = new Random();
t.Tick += (object s, EventArgs a) =>
{
int r = rnd.Next(0, 100);
if(r == 90)
API.CreateInfoboxSession("Failed!", "No Hacking Tools Avalible!", infobox.InfoboxMode.Info);
return;
}
else
{
HackTool h = Tools[cid];
switch (h.Name)
{
case "Destabilizer Attack":
var t = new Timer();
t.Interval = 1000 / h.Effectiveness;
var rnd = new Random();
t.Tick += (object s, EventArgs a) =>
{
t.Stop();
API.CreateInfoboxSession("Hack complete.", "The hack has been completed.", infobox.InfoboxMode.Info);
GiveUpgrade(upgrade);
}
else
{
int p = rnd.Next(0, 10);
switch(p)
int r = rnd.Next(0, 100);
if (r == 90)
{
case 1:
API.OpenProgram("shiftorium");
break;
case 2:
API.OpenProgram("ki");
break;
case 3:
API.CreateInfoboxSession(API.Encryption.Encrypt("Praise Lord Michael"), API.Encryption.Encrypt("You will bow down to me."), infobox.InfoboxMode.Info);
break;
case 4:
API.PlaySound(Properties.Resources._3beepvirus);
break;
case 5:
API.CurrentSession.BackColor = Color.White;
break;
case 6:
API.CurrentSession.BackColor = Color.Black;
break;
case 7:
API.PlaySound(Properties.Resources.dial_up_modem_02);
break;
case 8:
API.PlaySound(Properties.Resources.writesound);
break;
case 9:
API.PlaySound(Properties.Resources.typesound);
break;
t.Stop();
API.CreateInfoboxSession("Hack complete.", "The hack has been completed.", infobox.InfoboxMode.Info);
GiveUpgrade(upgrade);
}
}
};
t.Start();
else
{
int p = rnd.Next(0, 10);
switch (p)
{
case 1:
API.OpenProgram("shiftorium");
break;
case 2:
API.OpenProgram("ki");
break;
case 3:
API.CreateInfoboxSession(API.Encryption.Encrypt("Praise Lord Michael"), API.Encryption.Encrypt("You will bow down to me."), infobox.InfoboxMode.Info);
break;
case 4:
API.PlaySound(Properties.Resources._3beepvirus);
break;
case 5:
API.CurrentSession.BackColor = Color.White;
break;
case 6:
API.CurrentSession.BackColor = Color.Black;
break;
case 7:
API.PlaySound(Properties.Resources.dial_up_modem_02);
break;
case 8:
API.PlaySound(Properties.Resources.writesound);
break;
case 9:
API.PlaySound(Properties.Resources.typesound);
break;
}
}
};
t.Start();
break;
break;
}
}
}
}

17
source/WindowsFormsApplication1/Resources/Credits.txt
View file

@ -1,18 +1,11 @@
ShiftOS #VER#
== Developers ==
Philip Adams
Michael VanOverbeek
Carver (www.harri.cf)
A game by Michael VanOverbeek
== External Libraries / Dependencies ==
== External Libraries / Dependencies ==
JSON.NET - Version 8.0.2
By James Newton-King