Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

# Conflicts:
#	TimeHACK.Main/bin/Release/TimeHACK.Engine.dll
#	TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb
#	TimeHACK.Main/bin/Release/TimeHACK.application
#	TimeHACK.Main/bin/Release/TimeHACK.exe
#	TimeHACK.Main/bin/Release/TimeHACK.exe.manifest
#	TimeHACK.Main/bin/Release/TimeHACK.pdb
#	TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe

#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
#	TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt
#	TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache

#	TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
#	TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources
#	TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources
#	TimeHACK.Main/obj/Release/TimeHACK.application
#	TimeHACK.Main/obj/Release/TimeHACK.exe
#	TimeHACK.Main/obj/Release/TimeHACK.exe.manifest
#	TimeHACK.Main/obj/Release/TimeHACK.pdb

1 files changed, 20 insertions, 4 deletions

diff --git a/TimeHACK.Main/WinClassicForms/WinClassicDownloader.cs b/TimeHACK.Main/WinClassicForms/WinClassicDownloader.cs
index b5aa521..4cdcd43 100644
--- a/TimeHACK.Main/WinClassicForms/WinClassicDownloader.cs
+++ b/TimeHACK.Main/WinClassicForms/WinClassicDownloader.cs
@@ -9,9 +9,20 @@ namespace TimeHACK.WinClassicForms
         public WinClassicDownloader()
         {
             InitializeComponent();
+
+        }
+
+        private string DownloadSpeed(string str)
+        {
+            Random rnd = new Random();
+            int dl1 = rnd.Next(7, 9);
+            int dl2 = rnd.Next(1, 9);
+            int dl3 = rnd.Next(1, 9);
+            string speed = dl1.ToString() + "." + dl2.ToString() + dl3.ToString();
+            return speed;
         }
+
         int amountToDL = 100;
-        int downloadSpeed = 8;
         int amountDLed = 0;
         Windows95 Windows95 = new Windows95();
 
@@ -19,13 +30,13 @@ namespace TimeHACK.WinClassicForms
         private void WinClassicDownloader_Load(object sender, EventArgs e)
         {
             dlTimer.Start();
-            transferLbl.Text = ("Transfer speed: " + downloadSpeed + " KB/s");
+            dlSpeed.Start();
         }
 
         private void dlTimer_Tick(object sender, EventArgs e)
         {
-            amountDLed = amountDLed + downloadSpeed;
-            if(downloadSpeed > amountToDL - amountDLed){
+            amountDLed = amountDLed + 8;
+            if(8 > amountToDL - amountDLed){
                 progBar.Value = 100;
                 amountLbl.Text = ("Downloaded " + amountDLed + " KB out of " + amountToDL + " KB");
 
@@ -67,5 +78,10 @@ namespace TimeHACK.WinClassicForms
             }
             amountLbl.Text = ("Downloaded " + amountDLed + " KB out of " + amountToDL);
         }
+
+        private void dlSpeed_Tick(object sender, EventArgs e)
+        {
+            transferLbl.Text = ("Transfer speed: " + DownloadSpeed("") + " KB/s");
+        }
     }
 }