Add everything for IoA update

Leanny · Jun 19, 2020 · e7fdeb0 · e7fdeb0
1 parent a921c80
commit e7fdeb0
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 35 deletions.
diff --git a/SeedSearcher/Forms/SeedSearcherGui.Designer.cs b/SeedSearcher/Forms/SeedSearcherGui.Designer.cs
diff --git a/SeedSearcher/Forms/SeedSearcherGui.cs b/SeedSearcher/Forms/SeedSearcherGui.cs
@@ -380,12 +380,19 @@ private void PopulateLanguage(int l)
             dontChange = false;
         }
 
-        private static Bitmap GetNestMap(int x, int y)
+        private static Bitmap GetNestMap(int x, int y, int location)
         {
             Pen redPen = new Pen(Color.Red, 10);
             var map = Resources.map;
-            using (var graphics = Graphics.FromImage(map))
+            if (location >= 17)
+            {
+                map = Resources.map_01;
+                x = (int) ((x - 16) * map.Width / 1178.167);
+                y = (int)((y + 5) * map.Height / 1009.56);
+            }
+            using (var graphics = Graphics.FromImage(map)) { 
                 graphics.DrawArc(redPen, x - 5, y - 5, 15, 15, 0, 360);
+            }
             return map;
         }
 
@@ -403,7 +410,7 @@ private void CB_Den_SelectedIndexChanged(object sender, EventArgs e)
                 if (idx >= 16) idx++;
                 RaidTemplateTable[] tables = CB_Game.SelectedIndex == 0 ? _raidTables.SwordNests : _raidTables.ShieldNests;
                 var detail = NestLocations.Nests[idx];
-                DenMap.BackgroundImage = GetNestMap(detail.MapX, detail.MapY);
+                DenMap.BackgroundImage = GetNestMap(detail.MapX, detail.MapY, detail.Location);
 
                 if (CB_Rarity.SelectedIndex == 0)
                 {
@@ -2285,5 +2292,14 @@ private void notPickedToolStripMenuItem_Click(object sender, EventArgs e)
         {
             SetBadges(9);
         }
+
+        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            // Specify that the link was visited.
+            this.linkLabel1.LinkVisited = true;
+
+            // Navigate to a URL.
+            System.Diagnostics.Process.Start("https://leanny.github.io/seedchecker/#/dens/");
+        }
     }
 }
diff --git a/SeedSearcher/Properties/Resources.Designer.cs b/SeedSearcher/Properties/Resources.Designer.cs
diff --git a/SeedSearcher/Properties/Resources.resx b/SeedSearcher/Properties/Resources.resx
@@ -121,4 +121,7 @@
   <data name="map" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\map.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="map_01" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\map_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/SeedSearcher/Resources/map_01.png b/SeedSearcher/Resources/map_01.png
diff --git a/SeedSearcher/SeedSearcherGui.csproj b/SeedSearcher/SeedSearcherGui.csproj
@@ -17,6 +17,21 @@
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x64</PlatformTarget>
@@ -165,8 +180,21 @@
     <Content Include="alcremie3.ico" />
     <Content Include="deps\PKHeX_Raid_Plugin.dll" />
     <Content Include="FodyWeavers.xml" />
+    <None Include="Resources\map_01.png" />
     <None Include="Resources\map.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Alea.3.0.4\build\Alea.targets" Condition="Exists('..\packages\Alea.3.0.4\build\Alea.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/SeedSearcher/deps/PKHeX_Raid_Plugin.dll b/SeedSearcher/deps/PKHeX_Raid_Plugin.dll