aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlempamo <[email protected]>2018-02-19 22:19:23 -0500
committerlempamo <[email protected]>2018-02-19 22:19:23 -0500
commit98f107f49d0a20f4bdf28016b586a9fa3636e866 (patch)
tree655f1bff8ad7eadc61fb79e7a27f234750dac47c
parenta3dbe64889bd86262e2824f8741277292071194b (diff)
downloadhistacom2-98f107f49d0a20f4bdf28016b586a9fa3636e866.tar.gz
histacom2-98f107f49d0a20f4bdf28016b586a9fa3636e866.tar.bz2
histacom2-98f107f49d0a20f4bdf28016b586a9fa3636e866.zip
travelling
-rw-r--r--Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs2
-rw-r--r--Histacom2/OS/WinXPBad/Story/Hack4.cs3
-rw-r--r--Histacom2/OS/WinXPBad/WinClassicTimeDistorter3Bad.Designer.cs1
-rw-r--r--Histacom2/OS/WinXPBad/WinClassicTimeDistorter3Bad.cs3
4 files changed, 7 insertions, 2 deletions
diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
index e02fe00..3790d48 100644
--- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
+++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
@@ -765,7 +765,7 @@ namespace Histacom2.OS.Win95.Win95Apps
bool recognized = false;
string description = "";
- if (SaveSystem.CurrentSave.CurrentOS == "2000" || SaveSystem.CurrentSave.CurrentOS == "ME")
+ if (CurrentSave.CurrentOS == "2000" || CurrentSave.CurrentOS == "ME")
{
switch (File.ReadAllText(Path.Combine(CurrentDirectory, mainView.FocusedItem.Text)))
{
diff --git a/Histacom2/OS/WinXPBad/Story/Hack4.cs b/Histacom2/OS/WinXPBad/Story/Hack4.cs
index a6ce09a..d79a4bc 100644
--- a/Histacom2/OS/WinXPBad/Story/Hack4.cs
+++ b/Histacom2/OS/WinXPBad/Story/Hack4.cs
@@ -40,6 +40,7 @@ namespace Histacom2.OS.WinXPBad.Story
await Task.Delay(3500); Console.WriteLine("TheHiddenHacker> 2000 came and went, and when you never showed up");
await Task.Delay(3500); Console.WriteLine("TheHiddenHacker> 12padams refused to believe that his program failed");
await Task.Delay(3500); Console.WriteLine("TheHiddenHacker> and so he thought that you did make it to 2000 and i was hiding you");
+ // TheHiddenHacker> we called out jason for being extremely stupid, then he went ballistic,
await Task.Delay(3000); Console.WriteLine("TheHiddenHacker> and he lost complete trust in me");
await Task.Delay(3500); Console.WriteLine("TheHiddenHacker> later, in march 2001, 12padams made viruses to try to infect my pc");
await Task.Delay(4500); Console.WriteLine("TheHiddenHacker> not only because he lost trust in me, but i also had the latest version of the time distorter");
@@ -132,7 +133,7 @@ namespace Histacom2.OS.WinXPBad.Story
await Task.Delay(5000); Console.WriteLine("TheHiddenHacker> i wont remember because i wont be coming with you, youll be meeting with past me");
await Task.Delay(6000); Console.WriteLine("TheHiddenHacker> also also im really glad you chose 2000, im not sure we could tell 12padams the story and make him believe it");
await Task.Delay(5000); Console.WriteLine("TheHiddenHacker> looks like its almost time");
- await Task.Delay(4000); Console.WriteLine("TheHiddenHacker> bye, and good luck to you");
+ await Task.Delay(4000); Console.WriteLine("TheHiddenHacker> goodbye, and best of luck to you");
await Task.Delay(3000); Console.WriteLine("telnet> 104.27.135.159 Disconnected.");
await Task.Delay(td.secsLeft * 1000);
diff --git a/Histacom2/OS/WinXPBad/WinClassicTimeDistorter3Bad.Designer.cs b/Histacom2/OS/WinXPBad/WinClassicTimeDistorter3Bad.Designer.cs
index f2f9cca..281c89a 100644
--- a/Histacom2/OS/WinXPBad/WinClassicTimeDistorter3Bad.Designer.cs
+++ b/Histacom2/OS/WinXPBad/WinClassicTimeDistorter3Bad.Designer.cs
@@ -111,6 +111,7 @@
//
// timer1
//
+ this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// WinClassicTimeDistorter3Bad
diff --git a/Histacom2/OS/WinXPBad/WinClassicTimeDistorter3Bad.cs b/Histacom2/OS/WinXPBad/WinClassicTimeDistorter3Bad.cs
index e8e30f4..6ff0549 100644
--- a/Histacom2/OS/WinXPBad/WinClassicTimeDistorter3Bad.cs
+++ b/Histacom2/OS/WinXPBad/WinClassicTimeDistorter3Bad.cs
@@ -24,12 +24,15 @@ namespace Histacom2.OS.WinXPBad
buttonXP1.Hide();
buttonXP2.Hide();
timer1.Start();
+ Story.Hack4.Travel2K(this);
}
private void buttonXP2_Click(object sender, EventArgs e)
{
buttonXP1.Hide();
buttonXP2.Hide();
+ timer1.Start();
+ Story.Hack4.TravelME(this);
}
private void timer1_Tick(object sender, EventArgs e)