LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.0: enforce consistency on naming for the recharging buff

Browse Source
This commit is contained in:
Evan Debenham 2015-04-05 12:55:03 -04:00
parent 4e34e81365
commit 673f024c17
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java
View File

@ -74,7 +74,7 @@ public class ScrollOfRecharging extends Scroll {
@Override @Override
public int icon() { public int icon() {
return BuffIndicator.CHARGE; return BuffIndicator.RECHARGING;
} }
@Override @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. //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. //otherwise this causes inconsistent behaviour where this may detach before, or after, a wand charger acts.
public float remainder() { public float remainder() {
return Math.min( 1f, this.cooldown()); return Math.min(1f, this.cooldown());
} }
} }

2
src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java
View File

@ -67,7 +67,7 @@ public class BuffIndicator extends Component {
public static final int THORNS = 31; public static final int THORNS = 31;
public static final int FORESIGHT = 32; public static final int FORESIGHT = 32;
public static final int VERTIGO = 33; 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 LOCKED_FLOOR= 35;
public static final int SIZE = 7; public static final int SIZE = 7;