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

v2.1.0: made artif recharge more visually consistent with wand recharge

Browse Source
This commit is contained in:
Evan Debenham
2023-04-28 13:07:55 -04:00
parent 70340c335b
commit 1c7a7b6a96
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArtifactRecharge.java
View File

@@ -45,20 +45,22 @@ public class ArtifactRecharge extends Buff {
if (target instanceof Hero) {
float chargeAmount = Math.min(1, left);
for (Buff b : target.buffs()) {
if (b instanceof Artifact.ArtifactBuff) {
if (b instanceof HornOfPlenty.hornRecharge && ignoreHornOfPlenty){
continue;
}
if (!((Artifact.ArtifactBuff) b).isCursed()) {
((Artifact.ArtifactBuff) b).charge((Hero) target, chargeAmount);
if (chargeAmount > 0){
for (Buff b : target.buffs()) {
if (b instanceof Artifact.ArtifactBuff) {
if (b instanceof HornOfPlenty.hornRecharge && ignoreHornOfPlenty){
continue;
}
if (!((Artifact.ArtifactBuff) b).isCursed()) {
((Artifact.ArtifactBuff) b).charge((Hero) target, chargeAmount);
}
}
}
}
}
left--;
if (left <= 0){
if (left < 0){ // we expire after 0 to be more consistent with wand recharging visually
detach();
} else {
spend(TICK);
@@ -98,7 +100,7 @@ public class ArtifactRecharge extends Buff {
@Override
public String iconTextDisplay() {
return Integer.toString((int)left);
return Integer.toString((int)left+1);
}
@Override