reverse quality fix

CreepGin · Feb 9, 2013 · 58126e3 · 58126e3
1 parent 06d03dd
commit 58126e3
Show file tree

Hide file tree

Showing 19 changed files with 103 additions and 35 deletions.
diff --git a/Build/D3Bit.dll b/Build/D3Bit.dll
diff --git a/Build/D3BitConsole.exe b/Build/D3BitConsole.exe
diff --git a/Build/D3BitGUI.exe b/Build/D3BitGUI.exe
diff --git a/Build/D3BitGUI.exe.config b/Build/D3BitGUI.exe.config
@@ -40,6 +40,9 @@
             <setting name="ScanLanguage" serializeAs="String">
                 <value>eng</value>
             </setting>
+            <setting name="ReverseQuality" serializeAs="String">
+                <value>False</value>
+            </setting>
         </D3BitGUI.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/Build/D3BitGUI.vshost.exe.config b/Build/D3BitGUI.vshost.exe.config
@@ -40,6 +40,9 @@
             <setting name="ScanLanguage" serializeAs="String">
                 <value>eng</value>
             </setting>
+            <setting name="ReverseQuality" serializeAs="String">
+                <value>False</value>
+            </setting>
         </D3BitGUI.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/D3Bit/Tooltip.cs b/D3Bit/Tooltip.cs
@@ -48,6 +48,11 @@ public string ParseItemName()
         }
 
         public string ParseItemType(out string quality)
+        {
+            return ParseItemType(out quality, false);
+        }
+
+        public string ParseItemType(out string quality, bool reverseQuality)
         {
             string itemType = "Unknown";
             quality = "Unknown";
@@ -74,12 +79,25 @@ public string ParseItemType(out string quality)
                 var words = text.Split(new[] { ' ' });
                 if (words.Length > 1)
                 {
-                    string qualityString = words[0];
-                    quality =
-                        Data.ItemQualities.OrderByDescending(i => qualityString.DiceCoefficient(i.Value)).First().Key;
-                    itemType = String.Join(" ", words.Skip(1));
-                    itemType = Data.ItemTypes.OrderByDescending(i => itemType.DiceCoefficient(i.Value)).First().Key;
-                    return itemType;
+                    if (reverseQuality)
+                    {
+                        string qualityString = words[words.Length - 1];
+                        quality =
+                            Data.ItemQualities.OrderByDescending(i => qualityString.DiceCoefficient(i.Value)).First().Key;
+                        itemType = String.Join(" ", words.Take(words.Length - 1));
+                        itemType = Data.ItemTypes.OrderByDescending(i => itemType.DiceCoefficient(i.Value)).First().Key;
+                        return itemType;
+                    }
+                    else
+                    {
+                        string qualityString = words[0];
+                        quality =
+                            Data.ItemQualities.OrderByDescending(i => qualityString.DiceCoefficient(i.Value)).First().Key;
+                        itemType = String.Join(" ", words.Skip(1));
+                        itemType = Data.ItemTypes.OrderByDescending(i => itemType.DiceCoefficient(i.Value)).First().Key;
+                        return itemType;
+                    }
+
                 }
             }
             catch { }

diff --git a/D3BitGUI/CardForm.cs b/D3BitGUI/CardForm.cs
@@ -98,7 +98,7 @@ void Process()
                 _info["name"] = tooltip.ParseItemName();
                 _progressStep++;
                 string quality = "Unknown";
-                _info["type"] = tooltip.ParseItemType(out quality);
+                _info["type"] = tooltip.ParseItemType(out quality, Properties.Settings.Default.ReverseQuality);
                 _info["quality"] = quality;
                 _progressStep++;
                 _info["meta"] = tooltip.ParseMeta();

diff --git a/D3BitGUI/GUI.Designer.cs b/D3BitGUI/GUI.Designer.cs
diff --git a/D3BitGUI/Properties/Settings.Designer.cs b/D3BitGUI/Properties/Settings.Designer.cs
diff --git a/D3BitGUI/Properties/Settings.settings b/D3BitGUI/Properties/Settings.settings
@@ -35,5 +35,8 @@
     <Setting Name="ScanLanguage" Type="System.String" Scope="User">
       <Value Profile="(Default)">eng</Value>
     </Setting>
+    <Setting Name="ReverseQuality" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/D3BitGUI/UCBatch.cs b/D3BitGUI/UCBatch.cs
@@ -50,7 +50,7 @@ void Process()
                     Tooltip tooltip = new D3Bit.Tooltip(res);
                     string name = tooltip.ParseItemName();
                     string quality = "";
-                    string type = tooltip.ParseItemType(out quality);
+                    string type = tooltip.ParseItemType(out quality, Properties.Settings.Default.ReverseQuality);
                     double dps = tooltip.ParseDPS();
                     string socketBonuses = "";
                     var affixes = tooltip.ParseAffixes(out socketBonuses);

diff --git a/D3BitGUI/UCOptions.Designer.cs b/D3BitGUI/UCOptions.Designer.cs
diff --git a/D3BitGUI/UCOptions.cs b/D3BitGUI/UCOptions.cs
@@ -100,6 +100,12 @@ private void tbLanguage_TextChanged(object sender, EventArgs e)
             Properties.Settings.Default.Save();
         }
 
+        private void cbReverseQuality_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.ReverseQuality = cbReverseQuality.Checked;
+            Properties.Settings.Default.Save();
+        }
+
 
 
     }

diff --git a/D3BitGUI/app.config b/D3BitGUI/app.config
@@ -40,6 +40,9 @@
             <setting name="ScanLanguage" serializeAs="String">
                 <value>eng</value>
             </setting>
+            <setting name="ReverseQuality" serializeAs="String">
+                <value>False</value>
+            </setting>
         </D3BitGUI.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/Release/D3Bit.dll b/Release/D3Bit.dll
diff --git a/Release/D3BitConsole.exe b/Release/D3BitConsole.exe
diff --git a/Release/D3BitGUI.exe b/Release/D3BitGUI.exe
diff --git a/Release/D3BitGUI.exe.config b/Release/D3BitGUI.exe.config
@@ -40,6 +40,9 @@
             <setting name="ScanLanguage" serializeAs="String">
                 <value>eng</value>
             </setting>
+            <setting name="ReverseQuality" serializeAs="String">
+                <value>False</value>
+            </setting>
         </D3BitGUI.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/Release/D3BitGUI.vshost.exe.config b/Release/D3BitGUI.vshost.exe.config
@@ -40,6 +40,9 @@
             <setting name="ScanLanguage" serializeAs="String">
                 <value>eng</value>
             </setting>
+            <setting name="ReverseQuality" serializeAs="String">
+                <value>False</value>
+            </setting>
         </D3BitGUI.Properties.Settings>
     </userSettings>
 </configuration>