Skip to content

Commit

Permalink
secret treasure of life
Browse files Browse the repository at this point in the history
  • Loading branch information
thezerothcat committed Mar 31, 2019
1 parent 468ff3b commit 8d45146
Show file tree
Hide file tree
Showing 13 changed files with 143 additions and 50 deletions.
2 changes: 1 addition & 1 deletion App.config
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<value>Hermes' Boots,Grapple Claw,Feather,Hand Scanner,reader.exe,Holy Grail,mirai.exe</value>
</setting>
<setting name="Panel2Contents" serializeAs="String">
<value>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</value>
<value>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,Secret Treasure of Life</value>
</setting>
<setting name="Panel3Contents" serializeAs="String">
<value>Origin Seal,Birth Seal,Life Seal,Death Seal,Book of the Dead,Ring,Fairy Clothes,Mobile Super X2,Scriptures,Crucifix,Perfume,Glove,Bracelet,Spaulder</value>
Expand Down
9 changes: 9 additions & 0 deletions LMRItemTracker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,15 @@
<ItemGroup>
<None Include="Resources\Icon_keyfairy_solid.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Icon_secrettreasureoflife.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Icon_secrettreasureoflife_blank.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Icon_secrettreasureoflife_solid.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.
Expand Down
110 changes: 66 additions & 44 deletions LaMulanaItemTrackerForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 23 additions & 1 deletion LaMulanaItemTrackerForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ private void InitializePossibleItems()
this.allItems.Add("Rolling Shuriken");
this.allItems.Add("Scalesphere");
this.allItems.Add("Scriptures");
this.allItems.Add("Secret Treasure of Life");
this.allItems.Add("Serpent Staff");
this.allItems.Add("Shield");
this.allItems.Add("Shell Horn");
Expand Down Expand Up @@ -391,6 +392,10 @@ private String getItemName(String flagName)
{
return "Spaulder";
}
else if ("w-secrettroflife".Equals(flagName))
{
return "Secret Treasure of Life";
}
else if ("w-icecape".Equals(flagName))
{
return "Ice Cape";
Expand Down Expand Up @@ -679,7 +684,7 @@ public void toggleItem(string flagName, bool isAdd)
|| "w-clothes".Equals(flagName) || "w-scriptures".Equals(flagName) || "w-hermes".Equals(flagName)
|| "w-fruit".Equals(flagName) || "w-twin-statue".Equals(flagName) || "w-bracelet".Equals(flagName)
|| "w-perfume".Equals(flagName) || "w-spaulder".Equals(flagName) || "w-dimension-key".Equals(flagName)
|| "w-icecape".Equals(flagName) || "w-forbidden".Equals(flagName))
|| "w-icecape".Equals(flagName) || "w-forbidden".Equals(flagName) || "w-secrettroflife".Equals(flagName))
{
// Non-usable items with no special image handling
SetImage(flagName, isAdd);
Expand Down Expand Up @@ -1128,6 +1133,7 @@ private void LaMulanaItemTrackerForm_Load(object sender, EventArgs e)
// Upgrade settings from 1.0.11 where item names were different.
Properties.Settings.Default.Panel1Contents = Properties.Settings.Default.Panel1Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
Properties.Settings.Default.Panel2Contents = Properties.Settings.Default.Panel2Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
Properties.Settings.Default.Panel2Contents = Properties.Settings.Default.Panel2Contents + ",Secret Treasure of Life";
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");
Expand Down Expand Up @@ -1534,6 +1540,10 @@ private System.Drawing.Bitmap getFoundImage(string flagName)
{
return global::LMRItemTracker.Properties.Resources.Icon_spaulder;
}
else if ("w-secrettroflife".Equals(flagName))
{
return global::LMRItemTracker.Properties.Resources.Icon_secrettreasureoflife;
}
else if ("w-icecape".Equals(flagName))
{
return global::LMRItemTracker.Properties.Resources.Icon_icecape;
Expand Down Expand Up @@ -1822,6 +1832,10 @@ private System.Drawing.Bitmap getFoundImage(string flagName)
{
return global::LMRItemTracker.Properties.Resources.Icon_swimsuit;
}
else if ("w-secrettroflife".Equals(flagName))
{
return global::LMRItemTracker.Properties.Resources.Icon_secrettreasureoflife;
}
else if ("whip".Equals(flagName))
{
return global::LMRItemTracker.Properties.Resources.Icon_whip;
Expand Down Expand Up @@ -1907,6 +1921,10 @@ private String getFlagName(string itemName)
{
return "w-spaulder";
}
else if ("Secret Treasure of Life".Equals(itemName))
{
return "w-secrettroflife";
}
else if ("Ice Cape".Equals(itemName))
{
return "w-icecape";
Expand Down Expand Up @@ -2580,6 +2598,10 @@ public Control GetControl(String itemName)
{
return ankhJewelPanel;
}
if ("Secret Treasure of Life".Equals(itemName))
{
return secretTreasureOfLife;
}
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.18")]
[assembly: AssemblyVersion("1.0.17.1")]
Loading

0 comments on commit 8d45146

Please sign in to comment.