konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.3.0: reworked scroll of recharging & battlemage charging mechanics

Browse Source
This commit is contained in:
Evan Debenham
2015-03-30 02:08:57 -04:00
parent ff804668a4
commit 348f16c19b
6 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
+10 -2
View File
@@ -19,6 +19,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import java.util.ArrayList;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@@ -61,7 +62,7 @@ public abstract class Wand extends KindOfWeapon {
public int maxCharges = initialCharges();
public int curCharges = maxCharges;
private float partialCharge = 0f;
protected float partialCharge = 0f;
protected Charger charger;
@@ -123,7 +124,7 @@ public abstract class Wand extends KindOfWeapon {
}
protected abstract void onZap( Ballistica attack );
@Override
public boolean collect( Bag container ) {
if (super.collect( container )) {
@@ -395,6 +396,8 @@ public abstract class Wand extends KindOfWeapon {
private static final float SCALING_CHARGE_ADDITION = 40f;
private static final float NORMAL_SCALE_FACTOR = 0.85f;
private static final float CHARGE_BUFF_BONUS = 0.25f;
float scalingFactor = NORMAL_SCALE_FACTOR;
@Override
@@ -427,6 +430,11 @@ public abstract class Wand extends KindOfWeapon {
+ (SCALING_CHARGE_ADDITION * Math.pow(scalingFactor, missingCharges)));
partialCharge += 1f/turnsToCharge;
ScrollOfRecharging.Recharging bonus = target.buff(ScrollOfRecharging.Recharging.class);
if (bonus != null && bonus.remainder() > 0f){
partialCharge += CHARGE_BUFF_BONUS * bonus.remainder();
}
}
private void setScaleFactor(float value){