icon is updated

killswitch connected to necrobot status new snipe website is added minor bug fixed (about gui detection)
msx752 · Nov 20, 2016 · b297881 · b297881
1 parent 0e9be53
commit b297881
Show file tree

Hide file tree

Showing 8 changed files with 288 additions and 545 deletions.
diff --git a/MSniper/MSniper.csproj b/MSniper/MSniper.csproj
@@ -143,7 +143,6 @@
     <EmbeddedResource Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\msniper.ico" />
     <EmbeddedResource Include="Resources\Newtonsoft.Json.dll" />
   </ItemGroup>
   <ItemGroup>
@@ -161,6 +160,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\msniper.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/MSniper/Properties/Resources.Designer.cs b/MSniper/Properties/Resources.Designer.cs
diff --git a/MSniper/Properties/Resources.resx b/MSniper/Properties/Resources.resx
@@ -118,9 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="msniper" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\msniper.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Newtonsoft_Json" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Newtonsoft.Json.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -148,4 +145,7 @@
   <data name="translation_zh_TW" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\settings\localization\languages\translation.zh-tw.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
+  <data name="msniper" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\msniper.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/MSniper/Resources/msniper.ico b/MSniper/Resources/msniper.ico
diff --git a/MSniper/Variables.cs b/MSniper/Variables.cs
@@ -16,7 +16,8 @@ public static class Variables
         public static string FileLink => $"{GithubProjectUri}/releases/download/{{0}}/{ProgramName}.v{{0}}.zip";
         public static string GithubProjectUri => $"https://github.com/{By}/{ProgramName}";
         public static string GithubRawUri => $"https://raw.githubusercontent.com/{By}/{ProgramName}";
-        public static string GithubIoUri => $"https://{By}.github.io/{ProgramName}/";
+        public static string GithubIoUri => $"https://github.com/{By}/{ProgramName}/";
+        //
         public static string SnipeWebsite => $"http://msniper.com/";
         public static string MinRequireVersion => "1.0.0.0";
         public static string ProgramName => "MSniper";
@@ -26,7 +27,8 @@ public static class Variables
         public static string StartupPath => Path.GetDirectoryName(ExecutablePath);
 
         public static string StrKillSwitchUri =
-            $"https://raw.githubusercontent.com/{By}/{ProgramName}/master/KillSwitch.txt";
+            "https://raw.githubusercontent.com/Necrobot-Private/NecroBot/master/KillSwitch.txt";
+            //$"https://raw.githubusercontent.com/{By}/{ProgramName}/master/KillSwitch.txt";
 
         public static List<CultureInfo> SupportedLanguages => new List<CultureInfo>()
         {

diff --git a/MSniper/WFConsole/FWindow.Designer.cs b/MSniper/WFConsole/FWindow.Designer.cs
diff --git a/MSniper/WFConsole/FWindow.cs b/MSniper/WFConsole/FWindow.cs
@@ -56,6 +56,10 @@ public FWindow()
             {
                 Process.Start("http://msniper.com");
             };
+            myPogoSnipersToolStripMenuItem.Click += delegate (object sender, EventArgs e)
+            {
+                Process.Start("http://mypogosnipers.com");
+            };
             necroBotLatestToolStripMenuItem.Click += delegate (object sender, EventArgs e)
             {
                 Process.Start("https://github.com/Necrobot-Private/NecroBot/releases/latest");
@@ -111,7 +115,13 @@ private void FWindow_Load(object sender, EventArgs e)
 
         public Process[] GetNecroBotProcesses()
         {
-            var plist = Process.GetProcesses().Where(x => x.ProcessName.ToLower().StartsWith(Variables.BotExeName) && !x.ProcessName.ToLower().EndsWith(".vshost")).ToArray();
+            var plist = Process.GetProcesses()
+                .Where(x => 
+                x.ProcessName.ToLower().StartsWith(Variables.BotExeName) &&
+                !x.ProcessName.ToLower().EndsWith(".vshost") &&
+                !x.ProcessName.ToLower().EndsWith(".gui") &&
+                !x.ProcessName.ToLower().EndsWith(".guı")
+                ).ToArray();
             BotCount = plist.Count();
             return plist;
         }
@@ -200,6 +210,9 @@ public void Helper(bool withParams)
             Console.WriteLine(Culture.GetTranslation(TranslationString.SnipeWebsite,
                 Variables.SnipeWebsite),
                 Config.Warning);
+            Console.WriteLine(Culture.GetTranslation(TranslationString.SnipeWebsite,
+               "http://mypogosnipers.com/"),
+                Config.Warning);
             Console.Write(Culture.GetTranslation(TranslationString.CurrentVersion,
                 Assembly.GetEntryAssembly().GetName().Version.ToString()),
                 Config.Highlight);