update to 1.8.5

+ Ignore card missing for Deck Extractor ( expansion support )
ekaomk · Nov 26, 2015 · 4bf98b7 · 4bf98b7
1 parent 38b0f19
commit 4bf98b7
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 33 deletions.
diff --git a/YGOPro Tweaker/App.config b/YGOPro Tweaker/App.config
@@ -28,10 +28,10 @@
     -->
     <DbProviderFactories>
 
-      <remove invariant="System.Data.SQLite" />
+
       <remove invariant="System.Data.SQLite.EF6" />
       <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
-    <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
+    <remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
   </system.data>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

diff --git a/YGOPro Tweaker/CLanguage.cs b/YGOPro Tweaker/CLanguage.cs
@@ -63,6 +63,7 @@ public class Thai
                 public String Information_Text { get { return "ข้อมูล"; } }
                 public String Error_Text { get { return "เกิดข้อผิดพลาด"; } }
                 public String Replay_Error_Text { get { return "รีเพล์ผิดพลาดหรือเป็นเวอร์ชันเก่า. โปรแกรมหาไอดีการ์ดนี้ไม่พบ.{0}ไอดีการ์ด : {1}"; } }
+                public String Ignore_Card_Missing_Text { get { return "ไม่สนใจหากการ์ดหาย ( สำหรับ Expansion )"; } }
             }
 
             public class English

diff --git a/YGOPro Tweaker/Properties/AssemblyInfo.cs b/YGOPro Tweaker/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.7.0.0")]
-[assembly: AssemblyFileVersion("1.7.0.0")]
+[assembly: AssemblyVersion("1.8.5.0")]
+[assembly: AssemblyFileVersion("1.8.5.0")]
diff --git a/YGOPro Tweaker/YGOPro Tweaker.csproj b/YGOPro Tweaker/YGOPro Tweaker.csproj
@@ -46,8 +46,12 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.97.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.97.0\lib\net20\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.98.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.98.1\lib\net20\System.Data.SQLite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.98.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.98.1\lib\net20\System.Data.SQLite.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Deployment" />
@@ -136,12 +140,12 @@
     <None Include="Resources\Thailand-Flag-icon.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.97.0\build\net20\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.97.0\build\net20\System.Data.SQLite.Core.targets')" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.98.1\build\net20\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.98.1\build\net20\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.97.0\build\net20\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.97.0\build\net20\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.98.1\build\net20\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.98.1\build\net20\System.Data.SQLite.Core.targets'))" />
   </Target>
   <!-- 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.

diff --git a/YGOPro Tweaker/frmDeckExtractor.Designer.cs b/YGOPro Tweaker/frmDeckExtractor.Designer.cs
diff --git a/YGOPro Tweaker/frmDeckExtractor.cs b/YGOPro Tweaker/frmDeckExtractor.cs
@@ -134,6 +134,8 @@ private void frmDeckExtractor_Load(object sender, EventArgs e)
                     lbPlayer.Text = String.Format(thaiLanguage.Player_Text, "?");
                     lbDrawFor.Text = String.Format(thaiLanguage.Draw_For_Text, "?");
 
+                    cbIgnoreCardMissing.Text = thaiLanguage.Ignore_Card_Missing_Text;
+
                     this.Text = thaiLanguage.Title;
                     break;
                 default: break;
@@ -213,7 +215,7 @@ private void ReadDeck(StringBuilder PlayerDeck)
             {
                 string CardID = Replay.DataReader.ReadInt32().ToString(System.Globalization.CultureInfo.InvariantCulture);
                 string CardName = GetCardName(Convert.ToInt32(CardID));
-                if (CardName == "")
+                if (CardName == "" && !cbIgnoreCardMissing.Checked)
                 {
                     MessageBox.Show(String.Format(Replay_Error_Text, Environment.NewLine, CardID.ToString()
                         ), Error_Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -229,7 +231,8 @@ private void ReadDeck(StringBuilder PlayerDeck)
                     int CardNumber = Convert.ToInt32(PlayerMainDeckText[index].Substring(PlayerMainDeckText[index].Length - 1, 1));
 
                     CardNumber++;
-                    PlayerMainDeckText[index] = (CardName + " x" + CardNumber.ToString());
+
+                    PlayerMainDeckText[index] = ((CardName == string.Empty ? "UNKNOW CARD": CardName) + " x" + CardNumber.ToString());
                 }
                 else
                 {
@@ -245,7 +248,7 @@ private void ReadDeck(StringBuilder PlayerDeck)
             {
                 string CardID = Replay.DataReader.ReadInt32().ToString(System.Globalization.CultureInfo.InvariantCulture);
                 string CardName = GetCardName(Convert.ToInt32(CardID));
-                if (CardName == "")
+                if (CardName == "" && !cbIgnoreCardMissing.Checked)
                 {
                     MessageBox.Show(String.Format(Replay_Error_Text, Environment.NewLine, CardID.ToString()
                         ), Error_Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -259,7 +262,7 @@ private void ReadDeck(StringBuilder PlayerDeck)
                 {
                     int CardNumber = Convert.ToInt32(PlayerExtraDeckText[index].Substring(PlayerExtraDeckText[index].Length - 1, 1));
 
-                    PlayerExtraDeckText[index] = (CardName + " x" + (++CardNumber).ToString());
+                    PlayerExtraDeckText[index] = ((CardName == string.Empty ? "UNKNOW CARD" : CardName) + " x" + (++CardNumber).ToString());
                 }
                 else
                 {

diff --git a/YGOPro Tweaker/frmDeckExtractor.resx b/YGOPro Tweaker/frmDeckExtractor.resx
@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAkAAAAAAAEAIACYfwEAlgAAAICAAAABACAAKAgBAC6AAQBgYAAAAQAgAKiUAABWiAIASEgAAAEA

diff --git a/YGOPro Tweaker/packages.config b/YGOPro Tweaker/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="SevenZipSharp" version="0.64" targetFramework="net2" />
-  <package id="System.Data.SQLite" version="1.0.97.0" targetFramework="net2" />
-  <package id="System.Data.SQLite.Core" version="1.0.97.0" targetFramework="net2" />
+  <package id="System.Data.SQLite" version="1.0.98.1" targetFramework="net2" />
+  <package id="System.Data.SQLite.Core" version="1.0.98.1" targetFramework="net2" />
   <package id="System.Data.SQLite.EF6" version="1.0.94.0" targetFramework="net45" />
-  <package id="System.Data.SQLite.Linq" version="1.0.97.0" targetFramework="net2" />
+  <package id="System.Data.SQLite.Linq" version="1.0.98.1" targetFramework="net2" />
 </packages>