From e36fe36a9edc3e6d99544cbcae5b515022dfa847 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 11 Nov 2015 18:30:47 -0800
Subject: [PATCH] Implement map visualization of entities

---
 pk3DS/Properties/Resources.Designer.cs |  65 ++++++++++++++++++++++++-
 pk3DS/Properties/Resources.resx        |  15 ++++++
 pk3DS/Resources/img/F.png              | Bin 0 -> 160 bytes
 pk3DS/Resources/img/N.png              | Bin 0 -> 164 bytes
 pk3DS/Resources/img/T1.png             | Bin 0 -> 153 bytes
 pk3DS/Resources/img/T2.png             | Bin 0 -> 170 bytes
 pk3DS/Resources/img/W.png              | Bin 0 -> 158 bytes
 pk3DS/Subforms/MapPermView.cs          |  25 ++++++++--
 pk3DS/Subforms/OWSE.cs                 |   6 +--
 pk3DS/pk3DS.csproj                     |  15 ++++++
 10 files changed, 119 insertions(+), 7 deletions(-)
 create mode 100644 pk3DS/Resources/img/F.png
 create mode 100644 pk3DS/Resources/img/N.png
 create mode 100644 pk3DS/Resources/img/T1.png
 create mode 100644 pk3DS/Resources/img/T2.png
 create mode 100644 pk3DS/Resources/img/W.png

diff --git a/pk3DS/Properties/Resources.Designer.cs b/pk3DS/Properties/Resources.Designer.cs
index b8c84b1..a68c377 100644
--- a/pk3DS/Properties/Resources.Designer.cs
+++ b/pk3DS/Properties/Resources.Designer.cs
@@ -10451,7 +10451,20 @@ internal class Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to .
+        ///   Looks up a localized string similar to pk3DS - By Kaphotics
+        ///http://projectpokemon.org/
+        ///http://projectpokemon.org/forums/showthread.php?44950
+        ///
+        ///A package of Pokémon X/Y/OR/AS tools by various contributors.
+        ///
+        ///GARCTool (Backbone): Kaphotics
+        ///Text Editing (xytext): Kaphotics
+        ///Wild Editor (**WE): SciresM &amp; Kaphotics
+        ///Trainer Editor (**TE): SciresM, Kaphotics, and KazoWAR
+        ///Personal Editor: SciresM
+        ///Mega Evolution Editor (MEE): SciresM
+        ///Evolutions, Moves, Items, Maison, Title Screen Editors: Kaphotics
+        ///ExeFS Editors: Kaphotics (thanks Drayano and m [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string changelog {
             get {
@@ -10489,6 +10502,16 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap F {
+            get {
+                object obj = ResourceManager.GetObject("F", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -14719,6 +14742,16 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap N {
+            get {
+                object obj = ResourceManager.GetObject("N", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -14739,6 +14772,26 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap T1 {
+            get {
+                object obj = ResourceManager.GetObject("T1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap T2 {
+            get {
+                object obj = ResourceManager.GetObject("T2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -14749,6 +14802,16 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap W {
+            get {
+                object obj = ResourceManager.GetObject("W", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
diff --git a/pk3DS/Properties/Resources.resx b/pk3DS/Properties/Resources.resx
index 97e9e9d..c59aa8d 100644
--- a/pk3DS/Properties/Resources.resx
+++ b/pk3DS/Properties/Resources.resx
@@ -4525,4 +4525,19 @@
   <data name="changelog" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Misc\changelog.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="F" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\F.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="N" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\N.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="T1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\T1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="T2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\T2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="W" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\W.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/pk3DS/Resources/img/F.png b/pk3DS/Resources/img/F.png
new file mode 100644
index 0000000000000000000000000000000000000000..675286d856e001508ac406d8e5e59faf2b641626
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYi^#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!psA;eV~9j}azezHNB`B?Ojtxx8ax^zGC1@M
zKR?q>X>nzDk<wz^&YZ!}#j=U@g^<Nthsg{KU!PZLZ+uv>6leg0r>mdKI;Vst0G!S&
A8~^|S

literal 0
HcmV?d00001

diff --git a/pk3DS/Resources/img/N.png b/pk3DS/Resources/img/N.png
new file mode 100644
index 0000000000000000000000000000000000000000..f649e7fc97d07f8252201cc259f8b9aa96d2cfe4
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYi^#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV~9j}@{j+Wjfoe#XPU<!6r8{<#FAuU
z*}^h~^>VvXqfWaL;}!<JcD+U&_N_8ELj|5js66<^5YAS8*j0Xy7tjy}Pgg&ebxsLQ
E0F_KF$^ZZW

literal 0
HcmV?d00001

diff --git a/pk3DS/Resources/img/T1.png b/pk3DS/Resources/img/T1.png
new file mode 100644
index 0000000000000000000000000000000000000000..aae77c9107721ecdf970c8e35f19cb9ab70a1a09
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYi^#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pq{6TV~9j}azexxCTpgyfB%m(v^jWv^mOQH
s%5ajf{`^c^!D(7USAYVexoi>}!-*Z`Yy0i5fsAADboFyt=akR{0LAhuy#N3J

literal 0
HcmV?d00001

diff --git a/pk3DS/Resources/img/T2.png b/pk3DS/Resources/img/T2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a592b64da3c9f305a6b98fdfb272585bc6d81723
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYi^#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!puMMyV~9j}a>%V0hZ}e|FtEO#x4TzuY0i>U
zEuoeH69n@_T;v0ET{KVM-M>}AuGlz6+l6I$po<5CZ+kR@2^YhnWqflUu8NokG>XB~
L)z4*}Q$iB}@hvdD

literal 0
HcmV?d00001

diff --git a/pk3DS/Resources/img/W.png b/pk3DS/Resources/img/W.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d126a35f43c51729849dca51dd90e7a1fcef591
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYi^#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV~9j}@{j+Wjfoe#XPU<!6r8{<w8Via
zgXxHm$YKSVj*TrU3qE;RE%+tSc8HhpHVeZ%<BDph-COShwKI6S`njxgN@xNA$vQ3F

literal 0
HcmV?d00001

diff --git a/pk3DS/Subforms/MapPermView.cs b/pk3DS/Subforms/MapPermView.cs
index 5f069c3..3a2a00e 100644
--- a/pk3DS/Subforms/MapPermView.cs
+++ b/pk3DS/Subforms/MapPermView.cs
@@ -2,6 +2,7 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
+using pk3DS.Properties;
 
 namespace pk3DS.Subforms
 {
@@ -20,7 +21,7 @@ public void drawMap(int Map)
             DrawMap = Map;
             PB_Map.Image = (CHK_AutoDraw.Checked) ? getMapImage() : null;
         }
-        public Image getMapImage(bool crop = false)
+        public Image getMapImage(bool crop = false, bool entity = true)
         {
             // Load MM
             byte[][] MM = CTR.mini.unpackMini(File.ReadAllBytes(OWSE.MapMatrixes[DrawMap]), "MM");
@@ -34,10 +35,25 @@ public Image getMapImage(bool crop = false)
                 byte[][] GR = CTR.mini.unpackMini(File.ReadAllBytes(OWSE.MapGRs[mm.EntryList[i]]), "GR");
                 mm.Entries[i] = new MapMatrix.Entry(GR[0]);
             }
-            Image img = mm.Preview((int)NUD_Scale.Value, (int)NUD_Flavor.Value);
+            mapScale = (int)NUD_Scale.Value;
+            Image img = mm.Preview(mapScale, (int)NUD_Flavor.Value);
+
+            if (entity && mapScale == 8)
+            {
+                // Overlay every... overworld entity
+                foreach (var f in OWSE.CurrentZone.Entities.Furniture)
+                    try { Util.LayerImage(img, Resources.F, f.X * mapScale, f.Y * mapScale, 0.8); } catch {}
+                foreach (var f in OWSE.CurrentZone.Entities.NPCs)
+                    try { Util.LayerImage(img, Resources.N, f.X * mapScale, f.Y * mapScale, 0.8); } catch {}
+                foreach (var f in OWSE.CurrentZone.Entities.Warps)
+                    try { Util.LayerImage(img, Resources.W, (int)(f.pX * mapScale), (int)(f.pY * mapScale), 0.8); } catch {}
+                foreach (var f in OWSE.CurrentZone.Entities.Triggers1)
+                    try { Util.LayerImage(img, Resources.T1, f.X * mapScale, f.Y * mapScale, 0.8); } catch {}
+                foreach (var f in OWSE.CurrentZone.Entities.Triggers2)
+                    try { Util.LayerImage(img, Resources.T2, f.X * mapScale, f.Y * mapScale, 0.8); } catch { }
+            }
             if (crop)
                 img = Util.TrimBitmap((Bitmap)img);
-            mapScale = (int)NUD_Scale.Value;
             OWSE.mm = mm;
             return img;
         }
@@ -48,6 +64,9 @@ private void hoverMap(object sender, MouseEventArgs e)
             if (mapScale < 0)
                 return;
 
+            if (PB_Map.Image == null)
+                return;
+
             int X = e.X / (mapScale);
             int Y = e.Y / (mapScale);
 
diff --git a/pk3DS/Subforms/OWSE.cs b/pk3DS/Subforms/OWSE.cs
index 5fc7ff2..0a5a969 100644
--- a/pk3DS/Subforms/OWSE.cs
+++ b/pk3DS/Subforms/OWSE.cs
@@ -28,7 +28,7 @@ public OWSE()
         private string[] filepaths;
         private string[] gameLocations = Main.getText((Main.oras) ? 90 : 72);
         private string[] zdLocations;
-        
+
         internal static Random rand = new Random();
         internal static uint rnd32()
         {
@@ -67,8 +67,9 @@ private void openQuick(string[] encdata)
             NUD_WMap.Maximum = zdLocations.Length; // Cap map warp destinations to the amount of maps.
         }
 
+        internal static Zone CurrentZone;
+        internal static MapMatrix mm;
         private int entry = -1;
-        private Zone CurrentZone;
         private byte[][] locationData;
         private string[] rawLocations;
         private void CB_LocationID_SelectedIndexChanged(object sender, EventArgs e)
@@ -560,7 +561,6 @@ private void B_DumpUnk_Click(object sender, EventArgs e)
             CB_LocationID.SelectedIndex = 0;
         }
 
-        internal static MapMatrix mm;
         private void B_DumpMaps_Click(object sender, EventArgs e)
         {
             if (Util.Prompt(MessageBoxButtons.YesNoCancel, "Export all MapImages?") != DialogResult.Yes)
diff --git a/pk3DS/pk3DS.csproj b/pk3DS/pk3DS.csproj
index 06ff86e..b5e2ac3 100644
--- a/pk3DS/pk3DS.csproj
+++ b/pk3DS/pk3DS.csproj
@@ -4749,6 +4749,21 @@
   <ItemGroup>
     <None Include="Misc\changelog.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\T2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\T1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\N.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\W.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\F.png" />
+  </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.