Halloween tracker update

thezerothcat · Oct 7, 2019 · 2ac978e · 2ac978e
1 parent c05570f
commit 2ac978e
Show file tree

Hide file tree

Showing 15 changed files with 938 additions and 790 deletions.
diff --git a/App.config b/App.config
@@ -23,9 +23,6 @@
             <setting name="Panel4Contents" serializeAs="String">
                 <value>Whip,Knife,Axe,Katana,Shield,Gauntlet,Pistol,Shuriken,Rolling Shuriken,Caltrops,Flare Gun,Chakram,Earth Spear,Bomb</value>
             </setting>
-            <setting name="Panel5Contents" serializeAs="String">
-                <value>Philosopher's Ocarina,Mantra/Djed Pillar,Vessel/Medicine,Key Sword,Lamp of Time,Maps,Ankh Jewels</value>
-            </setting>
             <setting name="BackgroundColor" serializeAs="String">
                 <value>Control</value>
             </setting>
@@ -65,6 +62,9 @@
             <setting name="ItemColor" serializeAs="String">
                 <value>Black</value>
             </setting>
+            <setting name="Panel5Contents" serializeAs="String">
+                <value>Philosopher's Ocarina,Mantra/Djed Pillar,Vessel/Medicine,Key Sword,Lamp of Time,Maps,Ankh Jewels,Halloween Item</value>
+            </setting>
         </LMRItemTracker.Properties.Settings>
         <LMRItemTracker.Settings1>
             <setting name="panel1Contents" serializeAs="String">

diff --git a/LMRItemTracker.csproj b/LMRItemTracker.csproj
@@ -944,6 +944,15 @@
   <ItemGroup>
     <None Include="Resources\Icon_keyfairy_solid.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Icon_halloween_solid.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Icon_halloween.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Icon_halloween_blank.png" />
+  </ItemGroup>
   <Import Project="EyeOfTruth.Shared\EyeOfTruth.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/LaMulanaItemTrackerForm.Designer.cs b/LaMulanaItemTrackerForm.Designer.cs
diff --git a/LaMulanaItemTrackerForm.cs b/LaMulanaItemTrackerForm.cs
@@ -76,6 +76,7 @@ private void InitializePossibleItems()
             this.allItems.Add("reader.exe");
             this.allItems.Add("Grapple Claw");
             this.allItems.Add("guild.exe");
+            this.allItems.Add("Halloween Item");
             this.allItems.Add("Hand Scanner");
             this.allItems.Add("Heatproof Case");
             this.allItems.Add("Helmet");
@@ -643,6 +644,10 @@ private String getItemName(String flagName)
             {
                 return "Ankh Jewels";
             }
+            else if ("halloween-candy".Equals(flagName))
+            {
+                return "Halloween Item";
+            }
             else if ("shield-buckler".Equals(flagName))
             {
                 return "Buckler";
@@ -1077,6 +1082,11 @@ public void SetAmmoCount(string flagName, int newCount)
                 ankhJewelPanel.Item.Collected = newCount != 0;
                 ankhJewelPanel.UpdateCount(newCount);
             }
+            else if ("halloween-candy".Equals(flagName))
+            {
+                halloweenCandyPanel.Item.Collected = newCount != 0;
+                halloweenCandyPanel.UpdateCount(newCount);
+            }
         }
 
         public void UpdateDeathCount(bool isAdd)
@@ -1104,7 +1114,7 @@ private void LaMulanaItemTrackerForm_Load(object sender, EventArgs e)
                 Properties.Settings.Default.Panel2Contents = Properties.Settings.Default.Panel2Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
                 Properties.Settings.Default.Panel3Contents = Properties.Settings.Default.Panel3Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
                 Properties.Settings.Default.Panel4Contents = Properties.Settings.Default.Panel4Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
-                Properties.Settings.Default.Panel5Contents = Properties.Settings.Default.Panel5Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
+                Properties.Settings.Default.Panel5Contents = Properties.Settings.Default.Panel5Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe") + ",Halloween Item";
                 Properties.Settings.Default.Panel6Contents = Properties.Settings.Default.Panel6Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
                 Properties.Settings.Default.Save();
             }
@@ -1430,6 +1440,10 @@ private System.Drawing.Bitmap getFoundImage(string flagName)
             {
                 return global::LMRItemTracker.Properties.Resources.Icon_ankhjewel;
             }
+            else if ("halloween-candy".Equals(flagName))
+            {
+                return global::LMRItemTracker.Properties.Resources.Icon_halloween;
+            }
             else if ("w-scanner".Equals(flagName))
             {
                 return global::LMRItemTracker.Properties.Resources.Icon_handscanner;
@@ -1987,6 +2001,10 @@ private String getFlagName(string itemName)
             {
                 return "ankh-jewels";
             }
+            else if ("Halloween Item".Equals(itemName))
+            {
+                return "halloween-candy";
+            }
             else if ("Waterproof Case".Equals(itemName))
             {
                 return "w-water-case";
@@ -2552,6 +2570,10 @@ public Control GetControl(String itemName)
             {
                 return ankhJewelPanel;
             }
+            if ("Halloween Item".Equals(itemName))
+            {
+                return halloweenCandyPanel;
+            }
             return null;
         }
 
@@ -2671,6 +2693,7 @@ private void UpdateTextColor()
 
             mapCount.UpdateTextColor();
             ankhJewelCount.UpdateTextColor();
+            halloweenCandyCount.UpdateTextColor();
             translationTablets.UpdateTextColor();
             shurikenAmmoCount.UpdateTextColor();
             rollingShurikenAmmoCount.UpdateTextColor();
@@ -2697,7 +2720,7 @@ private void RestoreDefaultSettings(object sender, EventArgs e)
             Properties.Settings.Default.Panel2Contents = "Bronze Mirror,Fruit of Eden,Twin Statue,Key of Eternity,Helmet,Plane Model,Crystal Skull,Dimensional Key,Pochette Key,Ice Cape,Scalesphere,Cog of the Soul,Dragon Bone,Serpent Staff,Mulana Talisman,Woman Statue,Pepper,Talisman,Diary,Mini Doll,Treasures,Anchor,Key Fairy Combo,Isis' Pendant,Eye of Truth,Magatama Jewel,torude.exe,Shrine Wall Removal";
             Properties.Settings.Default.Panel3Contents = "Origin Seal,Birth Seal,Life Seal,Death Seal,Book of the Dead,Ring,Fairy Clothes,Mobile Super X2,Scriptures,Crucifix,Perfume,Glove,Bracelet,Spaulder";
             Properties.Settings.Default.Panel4Contents = "Whip,Knife,Axe,Katana,Shield,Gauntlet,Pistol,Shuriken,Rolling Shuriken,Caltrops,Flare Gun,Chakram,Earth Spear,Bomb";
-            Properties.Settings.Default.Panel5Contents = "Philosopher's Ocarina,Mantra/Djed Pillar,Vessel/Medicine,Key Sword,Lamp of Time,Maps,Ankh Jewels";
+            Properties.Settings.Default.Panel5Contents = "Philosopher's Ocarina,Mantra/Djed Pillar,Vessel/Medicine,Key Sword,Lamp of Time,Maps,Ankh Jewels,Halloween Item";
             Properties.Settings.Default.BackgroundColor = System.Drawing.SystemColors.Control;
             Properties.Settings.Default.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(200)))));
             Properties.Settings.Default.FormWidth = 356;

diff --git a/LaMulanaItemTrackerForm.resx b/LaMulanaItemTrackerForm.resx
@@ -196,6 +196,9 @@
         /1v8h3paWv8DfAvmFXFJIaAAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="itemColorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>342, 10</value>
+  </metadata>
   <data name="xmailer.SolidImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
@@ -874,9 +877,6 @@
         CVkcJSX/B7fq7Fz2WDn2AAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="itemColorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>342, 10</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>79</value>
   </metadata>

diff --git a/Program.cs b/Program.cs
@@ -163,6 +163,23 @@ static void changed(object cur, object old, string name, LMRItemTracker.LaMulana
                     laMulanaItemTrackerForm.UpdateLastItem(displayname);
                 }
             }
+            else if(displayname.Equals("halloween-candy"))
+            {
+                int ammoCount = 0;
+                if (cur is ushort)
+                {
+                    ammoCount = (ushort)cur;
+                }
+                else if (cur is short)
+                {
+                    ammoCount = (short)cur;
+                }
+                else if(cur is byte)
+                {
+                    ammoCount = (byte)cur;
+                }
+                laMulanaItemTrackerForm.SetAmmoCount(displayname, ammoCount);
+            }
             else if (displayname.Equals("invtr-grailfull") || displayname.Equals("invtr-grailbr"))
             {
                 laMulanaItemTrackerForm.ToggleGrail(displayname, (ushort)cur >= 1);

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.17")]
+[assembly: AssemblyVersion("1.0.18.1")]
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
@@ -970,4 +970,13 @@
   <data name="Icon_keyfairy_solid" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Icon_keyfairy_solid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Icon_halloween" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Icon_halloween.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Icon_halloween_blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Icon_halloween_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Icon_halloween_solid" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Icon_halloween_solid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
@@ -14,9 +14,6 @@
     <Setting Name="Panel4Contents" Type="System.String" Scope="User">
       <Value Profile="(Default)">Whip,Knife,Axe,Katana,Shield,Gauntlet,Pistol,Shuriken,Rolling Shuriken,Caltrops,Flare Gun,Chakram,Earth Spear,Bomb</Value>
     </Setting>
-    <Setting Name="Panel5Contents" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Philosopher's Ocarina,Mantra/Djed Pillar,Vessel/Medicine,Key Sword,Lamp of Time,Maps,Ankh Jewels</Value>
-    </Setting>
     <Setting Name="BackgroundColor" Type="System.Drawing.Color" Scope="User">
       <Value Profile="(Default)">Control</Value>
     </Setting>
@@ -56,5 +53,8 @@
     <Setting Name="ItemColor" Type="System.Drawing.Color" Scope="User">
       <Value Profile="(Default)">Black</Value>
     </Setting>
+    <Setting Name="Panel5Contents" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Philosopher's Ocarina,Mantra/Djed Pillar,Vessel/Medicine,Key Sword,Lamp of Time,Maps,Ankh Jewels,Halloween Item</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/Resources/Icon_halloween.png b/Resources/Icon_halloween.png
diff --git a/Resources/Icon_halloween_blank.png b/Resources/Icon_halloween_blank.png
diff --git a/Resources/Icon_halloween_solid.png b/Resources/Icon_halloween_solid.png
diff --git a/names.xml b/names.xml
@@ -187,6 +187,7 @@
 	<item id="byte-08d" value="recent-angel" />
 	<item id="byte-a90" value="recent-fake" />
 	<item id="word-013" value="ankh-jewels" />
+	<item id="byte-aca" value="halloween-candy" />
     <item id="word-019" value="invus-lamp-lit" />
     <item id="word-046" value="maps" />
     <item id="word-047" value="invtr-treasures" />