v0.4.0: implemented new glyphs

This commit is contained in:
Evan Debenham
2016-06-04 21:54:37 -04:00
parent 14a8fbdd63
commit 6172b46175
23 changed files with 568 additions and 177 deletions
@@ -173,7 +173,7 @@ public abstract class Wand extends Item {
return sb.toString();
}
@Override
public String info() {
return (cursed && cursedKnown) ?
@@ -382,7 +382,7 @@ public abstract class Wand extends Item {
}
};
protected class Charger extends Buff {
public class Charger extends Buff {
private static final float BASE_CHARGE_DELAY = 10f;
private static final float SCALING_CHARGE_ADDITION = 40f;
@@ -402,7 +402,7 @@ public abstract class Wand extends Item {
@Override
public boolean act() {
if (curCharges < maxCharges)
gainCharge();
recharge();
if (partialCharge >= 1 && curCharges < maxCharges) {
partialCharge--;
@@ -415,7 +415,7 @@ public abstract class Wand extends Item {
return true;
}
private void gainCharge(){
private void recharge(){
int missingCharges = maxCharges - curCharges;
float turnsToCharge = (float) (BASE_CHARGE_DELAY
@@ -431,6 +431,16 @@ public abstract class Wand extends Item {
}
}
public void gainCharge(float charge){
partialCharge += charge;
while (partialCharge >= 1f){
curCharges++;
partialCharge--;
}
curCharges = Math.min(curCharges, maxCharges);
updateQuickslot();
}
private void setScaleFactor(float value){
this.scalingFactor = value;
}