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

v3.0.1: standardized logic for shield buffs that don't detach at 0

Browse Source
This commit is contained in:
Evan Debenham
2025-03-07 14:08:26 -05:00
parent 123bb44121
commit 1a46ae3af2
3 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,8 @@ import com.watabou.utils.Bundle;
public abstract class ShieldBuff extends Buff {
private int shielding;
protected boolean detachesAtZero = true;
@Override
public boolean attachTo(Char target) {
@@ -85,7 +87,7 @@ public abstract class ShieldBuff extends Buff {
dmg -= shielding;
shielding = 0;
}
if (shielding == 0){
if (shielding <= 0 && detachesAtZero){
detach();
}
if (target != null) target.needsShieldUpdate = true;

17
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/AscendedForm.java
View File

@@ -75,6 +75,8 @@ public class AscendedForm extends ArmorAbility {
{
type = buffType.POSITIVE;
detachesAtZero = true;
}
public static float DURATION = 10f;
@@ -114,21 +116,6 @@ public class AscendedForm extends ArmorAbility {
left += amt;
}
@Override
//logic edited slightly as buff should not detach
public int absorbDamage(int dmg) {
if (shielding() <= 0) return dmg;
if (shielding() >= dmg){
decShield(dmg);
dmg = 0;
} else {
dmg -= shielding();
decShield(shielding());
}
return dmg;
}
@Override
public boolean act() {
left--;

19
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java
View File

@@ -212,6 +212,10 @@ public class BrokenSeal extends Item {
public static class WarriorShield extends ShieldBuff {
{
detachesAtZero = false;
}
private Armor armor;
private float partialShield;
@@ -256,20 +260,5 @@ public class BrokenSeal extends Item {
return 0;
}
}
@Override
//logic edited slightly as buff should not detach
public int absorbDamage(int dmg) {
if (shielding() <= 0) return dmg;
if (shielding() >= dmg){
decShield(dmg);
dmg = 0;
} else {
dmg -= shielding();
decShield(shielding());
}
return dmg;
}
}
}