[KMS] Tooltip (12)

KENNYSOFT · Jul 21, 2017 · 07dd56e · 07dd56e
1 parent 9941348
commit 07dd56e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/WzComparerR2.Common/CharaSim/ItemStringHelper.cs b/WzComparerR2.Common/CharaSim/ItemStringHelper.cs
@@ -268,7 +268,7 @@ public static string GetGearTypeString(GearType type)
                 case GearType.knuckle: return "너클";
                 case GearType.gun: return "총";
                 case GearType.android: return "안드로이드";
-                case GearType.machineHeart: return "기계심장";
+                case GearType.machineHeart: return "기계 심장";
                 case GearType.pickaxe: return "채광 도구";
                 case GearType.shovel: return "약초채집 도구";
                 case GearType.pocket: return "포켓 아이템";
@@ -650,11 +650,16 @@ public static string GetJobName(int jobCode)
 
 
                 case 6000: return "카이저";
+                case 6001: return "엔젤릭버스터";
+                case 6002: return "카데나";
                 case 6100: return "카이저(1차)";
                 case 6110: return "카이저(2차)";
                 case 6111: return "카이저(3차)";
                 case 6112: return "카이저(4차)";
-                case 6001: return "엔젤릭버스터";
+                case 6400: return "카데나(1차)";
+                case 6410: return "카데나(2차)";
+                case 6411: return "카데나(3차)";
+                case 6412: return "카데나(4차)";
                 case 6500: return "엔젤릭버스터(1차)";
                 case 6510: return "엔젤릭버스터(2차)";
                 case 6511: return "엔젤릭버스터(3차)";

diff --git a/WzComparerR2/CharaSimControl/GearTooltipRender2.cs b/WzComparerR2/CharaSimControl/GearTooltipRender2.cs
@@ -231,7 +231,7 @@ private Bitmap RenderBase(out int picH)
                 }
             }
 
-            if (Gear.Props.TryGetValue(GearPropType.royalSpecial, out value) && value > 0)
+            if (Gear.Props.TryGetValue(GearPropType.royalSpecial, out value) && value != 0)
             {
                 switch (value)
                 {
@@ -807,7 +807,7 @@ private Bitmap RenderBase(out int picH)
                 }
                 if (!string.IsNullOrEmpty(sr.Desc))
                 {
-                    GearGraphics.DrawString(g, sr.Desc.Replace("#"," #"), GearGraphics.EquipDetailFont2, 13, 243, ref picH, 15, null, ((SolidBrush)GearGraphics.OrangeBrush2).Color);
+                    GearGraphics.DrawString(g, sr.Desc.Replace("#", " #"), GearGraphics.EquipDetailFont2, 13, 243, ref picH, 15, null, ((SolidBrush)GearGraphics.OrangeBrush2).Color);
                 }
                 foreach (string str in desc)
                 {
@@ -1121,6 +1121,10 @@ private List<string> GetGearAttributeString()
                     tags.Add(ItemStringHelper.GetGearPropString(GearPropType.accountSharable, value));
                 }
             }
+            if (Gear.Props.TryGetValue(GearPropType.onlyEquip, out value) && value != 0)
+            {
+                tags.Add(ItemStringHelper.GetGearPropString(GearPropType.onlyEquip, value));
+            }
             if (Gear.Props.TryGetValue(GearPropType.blockGoldHammer, out value) && value != 0)
             {
                 tags.Add(ItemStringHelper.GetGearPropString(GearPropType.blockGoldHammer, value));
@@ -1133,10 +1137,6 @@ private List<string> GetGearAttributeString()
             {
                 tags.Add(ItemStringHelper.GetGearPropString(GearPropType.fixedPotential, value));
             }
-            if (Gear.Props.TryGetValue(GearPropType.onlyEquip, out value) && value != 0)
-            {
-                tags.Add(ItemStringHelper.GetGearPropString(GearPropType.onlyEquip, value));
-            }
             if (Gear.Props.TryGetValue(GearPropType.notExtend, out value) && value != 0)
             {
                 tags.Add(ItemStringHelper.GetGearPropString(GearPropType.notExtend, value));

diff --git a/WzComparerR2/CharaSimControl/SetItemTooltipRender.cs b/WzComparerR2/CharaSimControl/SetItemTooltipRender.cs
@@ -175,7 +175,7 @@ private Bitmap RenderSetItem(out int picHeight)
                     itemName = itemName ?? string.Empty;
                     typeName = typeName ?? "장비";
 
-                    if (!Regex.IsMatch(typeName, @"^(\(.*\)|（.*）)$"))
+                    if (!Regex.IsMatch(typeName, @"^(\(.*\)|（.*）)$") && !Regex.IsMatch(typeName, @"^(\[.*\]|（.*）)$"))
                     {
                         typeName = "(" + typeName + ")";
                     }
@@ -238,15 +238,15 @@ private Bitmap RenderSetItem(out int picHeight)
                         List<Potential> ops = (List<Potential>)prop.Value;
                         foreach (Potential p in ops)
                         {
-                            GearGraphics.DrawPlainText(g, p.ConvertSummary(), GearGraphics.EquipDetailFont2, color, 10, 244, ref picHeight, 15);
+                            GearGraphics.DrawString(g, p.ConvertSummary(), GearGraphics.EquipDetailFont2, 10, 244, ref picHeight, 15, color);
                         }
                     }
                     else if (prop.Key == GearPropType.OptionToMob)
                     {
                         List<SetItemOptionToMob> ops = (List<SetItemOptionToMob>)prop.Value;
                         foreach (SetItemOptionToMob p in ops)
                         {
-                            GearGraphics.DrawPlainText(g, p.ConvertSummary(), GearGraphics.EquipDetailFont2, color, 10, 244, ref picHeight, 15);
+                            GearGraphics.DrawString(g, p.ConvertSummary(), GearGraphics.EquipDetailFont2, 10, 244, ref picHeight, 15, color);
                         }
                     }
                     else if (prop.Key == GearPropType.activeSkill)
@@ -261,13 +261,13 @@ private Bitmap RenderSetItem(out int picHeight)
                                 sr.Name = p.SkillID.ToString();
                             }
                             string summary = "<" + sr.Name.Replace(Environment.NewLine, "") + "> 스킬 사용 가능";
-                            GearGraphics.DrawPlainText(g, summary, GearGraphics.EquipDetailFont2, color, 10, 244, ref picHeight, 15);
+                            GearGraphics.DrawString(g, summary, GearGraphics.EquipDetailFont2, 10, 244, ref picHeight, 15, color);
                         }
                     }
                     else
                     {
                         var summary = ItemStringHelper.GetGearPropString(prop.Key, Convert.ToInt32(prop.Value));
-                        GearGraphics.DrawPlainText(g, summary, GearGraphics.EquipDetailFont2, color, 10, 244, ref picHeight, 15);
+                        GearGraphics.DrawString(g, summary, GearGraphics.EquipDetailFont2, 10, 244, ref picHeight, 15, color);
                     }
                 }
             }