Add support for tracking wood sword and bonus caves.

Useful for "Groundhog Day" races.

Author: jpark37

ZeldaRandomizerMap/ImageConstants.cs

@@ -55,7 +55,9 @@ private static Bitmap MakeSolidBitmap(Color color)
         public static readonly Bitmap HintImage = MakeDecal(@"zelda\hint.png");
         public static readonly Bitmap MagicalSwordImage = MakeDecal(@"zelda\magical_sword.png");
         public static readonly Bitmap MoneyImage = MakeDecal(@"zelda\money.png");
+        public static readonly Bitmap HeartImage = MakeDecal(@"zelda\heart.png");
         public static readonly Bitmap PotionImage = MakeDecal(@"zelda\potion.png");
+        public static readonly Bitmap SwordImage = MakeDecal(@"zelda\sword.png");
         public static readonly Bitmap WarpZone1Image = MakeDecal(@"zelda\warp_zone_1.png");
         public static readonly Bitmap WarpZone2Image = MakeDecal(@"zelda\warp_zone_2.png");
         public static readonly Bitmap WarpZone3Image = MakeDecal(@"zelda\warp_zone_3.png");

ZeldaRandomizerMap/MainForm.Designer.cs

@@ -1787,11 +1787,21 @@ private void levelHorizontalWall55_Click(object sender, EventArgs e)
             ToggleHorizontal(7, 6, e);
         }
 
+        private void heartButton_Click(object sender, EventArgs e)
+        {
+            m_overworldTracker.SetNoteHeart();
+        }
+
         private void potionButton_Click(object sender, EventArgs e)
         {
             m_overworldTracker.SetNotePotion();
         }
 
+        private void swordButton_Click(object sender, EventArgs e)
+        {
+            m_overworldTracker.SetNoteSword();
+        }
+
         private void whiteSwordButton_Click(object sender, EventArgs e)
         {
             m_overworldTracker.SetNoteWhiteSword();

ZeldaRandomizerMap/MainForm.cs

@@ -35,7 +35,9 @@ enum ExploreType
             L9,
             LevelUnknown,
             Shop,
+            Heart,
             Potion,
+            Sword,
             WhiteSword,
             MagicalSword,
             WarpZone1,
@@ -221,12 +223,24 @@ public void SetNoteShopBomb()
             UpdateExploredImage();
         }
 
+        public void SetNoteHeart()
+        {
+            m_exploredCells[m_activeRow, m_activeColumn] = ExploreType.Heart;
+            UpdateExploredImage();
+        }
+
         public void SetNotePotion()
         {
             m_exploredCells[m_activeRow, m_activeColumn] = ExploreType.Potion;
             UpdateExploredImage();
         }
 
+        public void SetNoteSword()
+        {
+            m_exploredCells[m_activeRow, m_activeColumn] = ExploreType.Sword;
+            UpdateExploredImage();
+        }
+
         public void SetNoteWhiteSword()
         {
             m_exploredCells[m_activeRow, m_activeColumn] = ExploreType.WhiteSword;
@@ -615,9 +629,15 @@ private void UpdateExploredImage()
                                                 UpdateImageCell(scan0, (offsetX + decalX) * 4, (offsetY + decalY) * stride, ImageConstants.BombImage.GetPixel(decalX, decalY));
                                             }
                                             break;
+                                        case ExploreType.Heart:
+                                            UpdateImageCell(scan0, (offsetX + decalX) * 4, (offsetY + decalY) * stride, ImageConstants.HeartImage.GetPixel(decalX, decalY));
+                                            break;
                                         case ExploreType.Potion:
                                             UpdateImageCell(scan0, (offsetX + decalX) * 4, (offsetY + decalY) * stride, ImageConstants.PotionImage.GetPixel(decalX, decalY));
                                             break;
+                                        case ExploreType.Sword:
+                                            UpdateImageCell(scan0, (offsetX + decalX) * 4, (offsetY + decalY) * stride, ImageConstants.SwordImage.GetPixel(decalX, decalY));
+                                            break;
                                         case ExploreType.WhiteSword:
                                             UpdateImageCell(scan0, (offsetX + decalX) * 4, (offsetY + decalY) * stride, ImageConstants.WhiteSwordImage.GetPixel(decalX, decalY));
                                             break;