Fix stamina modifier not being applied

valheimPlus · Dec 6, 2022 · cf058f9 · cf058f9
1 parent 3d9337a
commit cf058f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/ValheimPlus/GameClasses/Attack.cs b/ValheimPlus/GameClasses/Attack.cs
@@ -53,6 +53,9 @@ private static void Postfix(ref Attack __instance, ref float __result)
                         case Skills.SkillType.Pickaxes:
                             __result = Helper.applyModifierValue(__result, Configuration.Current.StaminaUsage.pickaxes);
                             break;
+                        case Skills.SkillType.Bows:
+                            __result = Helper.applyModifierValue(__result, Configuration.Current.StaminaUsage.bows);
+                            break;
                         default:
                             break;
                     }

diff --git a/ValheimPlus/GameClasses/Player.cs b/ValheimPlus/GameClasses/Player.cs
@@ -381,8 +381,7 @@ private static void Prefix(ref Player __instance, ref float v)
                         v = Helper.applyModifierValue(v, Configuration.Current.StaminaUsage.fishing);
                     }
                 }
-
-                if (methodName.Contains(nameof(Player.UpdatePlacement)) || methodName.Contains(nameof(Player.Repair)) || methodName.Contains(nameof(Player.RemovePiece)))
+                else if (methodName.Contains(nameof(Player.UpdatePlacement)) || methodName.Contains(nameof(Player.Repair)) || methodName.Contains(nameof(Player.RemovePiece)))
                 {
                     string itemName = __instance.GetRightItem()?.m_shared.m_name;
                     if (itemName == "$item_hammer")
@@ -398,13 +397,9 @@ private static void Prefix(ref Player __instance, ref float v)
                         v = Helper.applyModifierValue(v, Configuration.Current.StaminaUsage.cultivator);
                     }
                 }
-                else if (methodName.Equals(nameof(Player.PlayerAttackInput)))
+                else if (methodName.Equals(nameof(Player.UpdateAttackBowDraw)))
                 {
-                    ItemDrop.ItemData item = __instance.GetCurrentWeapon();
-                    if (item?.m_shared.m_skillType == Skills.SkillType.Bows)
-                    {
-                        v = Helper.applyModifierValue(v, Configuration.Current.StaminaUsage.bows);
-                    }
+                    v = Helper.applyModifierValue(v, Configuration.Current.StaminaUsage.bows);
                 }
                 else if (methodName.Equals(nameof(Player.BlockAttack)))
                 {