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

v0.9.1: cleaned up shield buff code a bit

Browse Source
This commit is contained in:
Evan Debenham 2020-11-18 13:05:37 -05:00
parent fea825d2ee
commit 157b2cab44
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barrier.java
View File

@ -34,7 +34,19 @@ public class Barrier extends ShieldBuff {
} }
float partialLostShield; float partialLostShield;
@Override
public void incShield(int amt) {
super.incShield(amt);
partialLostShield = 0;
}
@Override
public void setShield(int shield) {
super.setShield(shield);
if (shielding() == shield) partialLostShield = 0;
}
@Override @Override
public boolean act() { public boolean act() {

19
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ShieldBuff.java
View File

@ -49,41 +49,26 @@ public abstract class ShieldBuff extends Buff {
} }
public void setShield( int shield ) { public void setShield( int shield ) {
setShield(shield, 0);
}
public void setShield( int shield, float delay ) {
if (this.shielding <= shield) this.shielding = shield; if (this.shielding <= shield) this.shielding = shield;
if (target != null) target.needsShieldUpdate = true; if (target != null) target.needsShieldUpdate = true;
spend(delay);
} }
public void incShield(){ public void incShield(){
incShield(1); incShield(1);
} }
public void incShield( int amt ){
incShield(amt, 0);
}
public void incShield( int amt, float delay ){ public void incShield( int amt ){
shielding += amt; shielding += amt;
if (target != null) target.needsShieldUpdate = true; if (target != null) target.needsShieldUpdate = true;
spend(delay);
} }
public void decShield(){ public void decShield(){
decShield(1); decShield(1);
} }
public void decShield( int amt ){
decShield(amt, 0);
}
public void decShield( int amt, float delay ){ public void decShield( int amt ){
shielding -= amt; shielding -= amt;
if (target != null) target.needsShieldUpdate = true; if (target != null) target.needsShieldUpdate = true;
spend(delay);
} }
//returns the amount of damage leftover //returns the amount of damage leftover