From 673f024c1752eca3cd8eb52b8b474c47d090c404 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 5 Apr 2015 12:55:03 -0400 Subject: [PATCH] v0.3.0: enforce consistency on naming for the recharging buff --- .../items/scrolls/ScrollOfRecharging.java | 4 ++-- .../shatteredpixeldungeon/ui/BuffIndicator.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java index 570e6216b..2b59492b6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java @@ -74,7 +74,7 @@ public class ScrollOfRecharging extends Scroll { @Override public int icon() { - return BuffIndicator.CHARGE; + return BuffIndicator.RECHARGING; } @Override @@ -88,7 +88,7 @@ public class ScrollOfRecharging extends Scroll { //if this buff is still attached, must instead directly check its remaining time, and act accordingly. //otherwise this causes inconsistent behaviour where this may detach before, or after, a wand charger acts. public float remainder() { - return Math.min( 1f, this.cooldown()); + return Math.min(1f, this.cooldown()); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java index 138a9452c..f7672942e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java @@ -67,7 +67,7 @@ public class BuffIndicator extends Component { public static final int THORNS = 31; public static final int FORESIGHT = 32; public static final int VERTIGO = 33; - public static final int CHARGE = 34; + public static final int RECHARGING = 34; public static final int LOCKED_FLOOR= 35; public static final int SIZE = 7;