Fixed Up and Added Features

This commit is contained in:
carverh 2016-07-21 16:00:53 -07:00
parent 05373252f6
commit 3730f2829e
4 changed files with 59 additions and 20 deletions

View file

@ -1,5 +1,5 @@
using Newtonsoft.Json;
using ShiftOS.FinalMission;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -747,6 +747,9 @@ public void DoCommand()
case "timedistorter":
cmd_histacom_timedistorter(args);
break;
case "about":
cmd_about(args);
break;
default:
cmd_default(args);
break;
@ -2037,6 +2040,8 @@ public void cmd_dir(String[] args)
}
public void cmd_cd(String[] args)
{
try
{
if (API.Upgrades["fileskimmer"])
{
@ -2065,6 +2070,12 @@ public void cmd_cd(String[] args)
}
}
}
catch (Exception e)
{
WriteLine("cd: " + e);
}
}
public void cmd_upg(String[] args)
{
@ -2890,6 +2901,9 @@ public void cmd_debug(String[] args)
API.DeveloperMode = false;
WriteLine("Turned off developer mode. Use the passcode to turn it back on.");
break;
case "end":
EndGameHandler.StartGoodEnding();
break;
default:
WriteLine("Invalid argument: " + args[1] + ". Debug can only debug the following: 'shiftnet-story'.");
break;
@ -2996,6 +3010,15 @@ public void cmd_default(String[] args)
}
}
/// <summary>
/// About Box, Created By Carver Harrison
/// </summary>
/// <param name="args">String[] args</param>
public void cmd_about(String[] args)
{
API.CreateInfoboxSession("About ShiftOS", "ShiftOS Version " + ProductVersion + "\n Copyright 2014-2016 ShiftOS Dev Team \n Type 'credits' in Terminal to Show Credits", infobox.InfoboxMode.Info);
}
// HISTACOM REFERENCES, DO NOT REMOVE, CRUCIAL FOR SECRET STORY ARC
public void cmd_histacom_year(String[] args)
{

View file

@ -258,7 +258,7 @@ public static void SetupGUIforCurrent()
mguide.ButtonText = "End DevX";
mguide.OnButtonClick = new Action(() =>
{
//code to run to start uninstall of ShiftOS.
StartGoodEnding();
});
objPrompt = "Firewall, check. Primary server, check. Secondary server, CHECK. Telemetry server, CHECK. Now it's time to disable DevX himself. After all, he IS just code.";
break;
@ -271,5 +271,13 @@ public static void SetupGUIforCurrent()
}
}
#endregion
public static void StartGoodEnding()
{
var room = new FakeChatClient();
room.OtherCharacters = new List<string>();
room.OtherCharacters.Add("TheHiddenHacker");
room.Messages.Add("TheHiddenHacker", "After All This Time...");
}
}
}

View file

@ -181,7 +181,6 @@ static void ExtractDependencies()
MessageBox.Show("Sorry to break the immersion, but we're currently downloading ShiftOS dependencies that'll make the game run MUCH better, such as the Lua engine and Gecko web renderer. Give us a moment. ShiftOS will continue to run while this happens but some things won't work right until we're finished.");
wc.DownloadFileAsync(new Uri("http://playshiftos.ml/shiftos/dependencies/ShiftOS_Dependencies.zip"), zippath);
}
}
}
}

View file

@ -85,6 +85,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="API.cs" />
<Compile Include="Apps\About.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Apps\About.Designer.cs">
<DependentUpon>About.cs</DependentUpon>
</Compile>
<Compile Include="Apps\Appscape.cs">
<SubType>Form</SubType>
</Compile>
@ -401,6 +407,9 @@
<DependentUpon>WindowBorder.cs</DependentUpon>
</Compile>
<Compile Include="SkinEngine\WindowComposition.cs" />
<EmbeddedResource Include="Apps\About.resx">
<DependentUpon>About.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Apps\Appscape.resx">
<DependentUpon>Appscape.cs</DependentUpon>
</EmbeddedResource>