Fixing an issue with weapon attack speed display + Beast Tamer skills

PirateIzzy · Dec 13, 2023 · 0156bba · 0156bba
1 parent 67faac3
commit 0156bba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/WzComparerR2/CharaSimControl/GearTooltipRender2.cs b/WzComparerR2/CharaSimControl/GearTooltipRender2.cs
@@ -535,8 +535,6 @@ private Bitmap RenderBase(out int picH)
             //  if (gear.Props.TryGetValue(GearPropType.attackSpeed, out value) && value > 0)
             if (!Gear.Cash && value > 0)
             {
-                TextRenderer.DrawText(g, ": " + ItemStringHelper.GetAttackSpeedString(value),
-                    GearGraphics.EquipDetailFont, new Point(13, picH), Color.White, TextFormatFlags.NoPadding);
                 bool isValidSpeed = (2 <= value && value <= 9);
                 string speedStr = string.Format("Attack Speed: {0}{1}{2}",
                     ItemStringHelper.GetAttackSpeedString(value),

diff --git a/WzComparerR2/CharaSimControl/SkillTooltipRender2.cs b/WzComparerR2/CharaSimControl/SkillTooltipRender2.cs
@@ -211,9 +211,9 @@ private Bitmap RenderSkill(CanvasRegion region, out int picH, out List<int> spli
             {
                 GearGraphics.DrawString(g, "#cCan add Auto Buff Skill#", GearGraphics.ItemDetailFont2, v6SkillSummaryFontColorTable, Skill.Icon.Bitmap == null ? region.LevelDescLeft : region.SkillDescLeft, region.TextRight, ref picH, 16);
             }
-            if (Skill.SkillID / 10000 / 1000 == 10 && Skill.ReqLevel > 0)
+            if ((Skill.SkillID / 10000 / 1000 == 10 || Skill.SkillID / 10000 / 1000 == 11) && Skill.ReqLevel > 0)
             {
-                GearGraphics.DrawString(g, "#c[Level Required: " + Skill.ReqLevel.ToString() + " or above]#", GearGraphics.ItemDetailFont2, v6SkillSummaryFontColorTable, Skill.Icon.Bitmap == null ? region.LevelDescLeft : region.SkillDescLeft, region.TextRight, ref picH, 40);
+                GearGraphics.DrawString(g, "#c(Level Required: " + Skill.ReqLevel.ToString() + " or above)#", GearGraphics.ItemDetailFont2, v6SkillSummaryFontColorTable, Skill.Icon.Bitmap == null ? region.LevelDescLeft : region.SkillDescLeft, region.TextRight, ref picH, 16);
             }
             if (Skill.ReqAmount > 0)
             {

diff --git a/WzComparerR2/Config/CharaSimGearConfig.cs b/WzComparerR2/Config/CharaSimGearConfig.cs
@@ -15,7 +15,7 @@ public bool ShowID
             set { this["showID"] = value; }
         }
 
-        [ConfigurationProperty("showWeaponSpeed", DefaultValue = true)]
+        [ConfigurationProperty("showWeaponSpeed", DefaultValue = false)]
         public bool ShowWeaponSpeed
         {
             get { return (bool)this["showWeaponSpeed"]; }