From 6f541ab570003a095e5230d0f1293b604a60e5d5 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 18 May 2023 15:02:26 -0400 Subject: [PATCH] v2.1.0: fixed sickle and scythe using 1 charge instead of 2 --- .../shatteredpixeldungeon/items/weapon/melee/Sickle.java | 4 ++++ .../shatteredpixeldungeon/items/weapon/melee/WarScythe.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sickle.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sickle.java index 8ef9e7b14..c957c99cc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sickle.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sickle.java @@ -53,6 +53,10 @@ public class Sickle extends MeleeWeapon { lvl*(tier+1); //scaling unchanged } + public float abilityChargeUse(Hero hero, Char target) { + return 2*super.abilityChargeUse(hero, target); + } + @Override public String targetingPrompt() { return Messages.get(this, "prompt"); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarScythe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarScythe.java index 690c68989..cc8ff2a1b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarScythe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarScythe.java @@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; @@ -43,6 +44,10 @@ public class WarScythe extends MeleeWeapon { lvl*(tier+1); //scaling unchanged } + public float abilityChargeUse(Hero hero, Char target) { + return 2*super.abilityChargeUse(hero, target); + } + @Override public String targetingPrompt() { return Messages.get(this, "prompt");