From b6dff54e9509b3348997a4da9652b152a3033cdd Mon Sep 17 00:00:00 2001 From: Aren Date: Wed, 8 Feb 2017 18:22:02 +0100 Subject: [PATCH] Fixed #50 and errors during Oobe will no longer restart the entire step. --- ShiftOS.WinForms/FakeSetupScreen.cs | 8 ++++---- ShiftOS.WinForms/Oobe.cs | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ShiftOS.WinForms/FakeSetupScreen.cs b/ShiftOS.WinForms/FakeSetupScreen.cs index dd93a55..6831f5e 100644 --- a/ShiftOS.WinForms/FakeSetupScreen.cs +++ b/ShiftOS.WinForms/FakeSetupScreen.cs @@ -82,7 +82,7 @@ So make sure your password is secure enough that it can't be guessed, but easy f { TextType("You must specify a valid username!"); currentPage--; - SetupUI(); + //SetupUI(); break; } @@ -90,7 +90,7 @@ So make sure your password is secure enough that it can't be guessed, but easy f { TextType("A password would seriously be recommended."); currentPage--; - SetupUI(); + //SetupUI(); break; } @@ -98,7 +98,7 @@ So make sure your password is secure enough that it can't be guessed, but easy f { TextType("You must name your computer."); currentPage--; - SetupUI(); + //SetupUI(); break; } @@ -109,7 +109,7 @@ So make sure your password is secure enough that it can't be guessed, but easy f { TextType("I have just verified that your username and password already exists on my end. Please choose another."); currentPage--; - SetupUI(); + //SetupUI(); } else diff --git a/ShiftOS.WinForms/Oobe.cs b/ShiftOS.WinForms/Oobe.cs index 8ff1b53..5ce6bff 100644 --- a/ShiftOS.WinForms/Oobe.cs +++ b/ShiftOS.WinForms/Oobe.cs @@ -186,11 +186,14 @@ namespace ShiftOS.WinForms Thread.Sleep(500); TextType("Your user account is stored on a server of mine called the multi-user domain. It holds every single user account, every script, every application, every thing within ShiftOS."); Thread.Sleep(600); - TextType("Every time you boot ShiftOS, if you are connected to the Internet, you will immediately connect to the multi-user domain and ShiftOS will attempt to authenticate using the last successful username and password pair."); + TextType("Every time you boot ShiftOS, if you are connected to the Internet, you will immediately connect to the multi-user domain and ShiftOS will attempt to authenticate using the last "); + TextType("successful username and password pair."); Thread.Sleep(500); - TextType("When you are in the MUD, you are in the middle of a free-for-all. I don't want it to be this way, it just is. I've employed you to help me develop and test the MUD and ShiftOS, but you have a secondary task if you choose to accept it."); + TextType("When you are in the MUD, you are in the middle of a free-for-all. I don't want it to be this way, it just is. I've employed you to help me develop and test the MUD and ShiftOS, "); + TextType("but you have a secondary task if you choose to accept it."); Thread.Sleep(500); - TextType("There have been a few rebelious groups in the MUD - who have cracked ShiftOS's security barriers - and they're using these exploits to steal others' Codepoints, upgrades, and even spread damaging viruses."); + TextType("There have been a few rebelious groups in the MUD - who have cracked ShiftOS's security barriers - and they're using these exploits to steal others' Codepoints, upgrades, "); + TextType("and even spread damaging viruses."); Thread.Sleep(500); TextType("I want you to stop them."); Thread.Sleep(500);