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

v2.3.0: standardized healing over time buff behaviours:

Browse Source 
- only show healing when healing occurs
- only interrupt hero when they reach HT or when buff expires
This commit is contained in:
Evan Debenham
2023-12-10 16:46:57 -05:00
parent 0c27cc8b6f
commit 3ae042f3ac
6 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Healing.java
+3
View File
@@ -59,6 +59,9 @@ public class Healing extends Buff {
healingLeft -= healingThisTick(); healingLeft -= healingThisTick();
if (healingLeft <= 0){ if (healingLeft <= 0){
if (target instanceof Hero) {
((Hero) target).resting = false;
}
detach(); detach();
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WellFed.java
+10 -2
View File
@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Challenges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.FloatingText; import com.shatteredpixel.shatteredpixeldungeon.effects.FloatingText;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
@@ -43,10 +44,17 @@ public class WellFed extends Buff {
left --; left --;
if (left < 0){ if (left < 0){
detach(); detach();
if (target instanceof Hero) {
((Hero) target).resting = false;
}
return true; return true;
} else if (left % 18 == 0){ } else if (left % 18 == 0 && target.HP < target.HT){
target.HP = Math.min(target.HT, target.HP + 1); target.HP += 1;
target.sprite.showStatusWithIcon(CharSprite.POSITIVE, "1", FloatingText.HEALING); target.sprite.showStatusWithIcon(CharSprite.POSITIVE, "1", FloatingText.HEALING);
if (target.HP == target.HT && target instanceof Hero) {
((Hero) target).resting = false;
}
} }
spend(TICK); spend(TICK);
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java
+5 -1
View File
@@ -168,9 +168,13 @@ public class ChaliceOfBlood extends Artifact {
if (Random.Float() < heal%1){ if (Random.Float() < heal%1){
heal++; heal++;
} }
if (heal >= 1f) { if (heal >= 1f && target.HP < target.HT) {
target.HP = Math.min(target.HT, target.HP + (int)heal); target.HP = Math.min(target.HT, target.HP + (int)heal);
target.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString((int)heal), FloatingText.HEALING); target.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString((int)heal), FloatingText.HEALING);
if (target.HP == target.HT && target instanceof Hero) {
((Hero) target).resting = false;
}
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
+1 -1
View File
@@ -310,7 +310,7 @@ public class DriedRose extends Artifact {
} }
updateQuickslot(); updateQuickslot();
} }
} else { } else if (ghost.HP < ghost.HT) {
int heal = Math.round((1 + level()/3f)*amount); int heal = Math.round((1 + level()/3f)*amount);
ghost.HP = Math.min( ghost.HT, ghost.HP + heal); ghost.HP = Math.min( ghost.HT, ghost.HP + heal);
ghost.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(heal), FloatingText.HEALING); ghost.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(heal), FloatingText.HEALING);
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfAquaticRejuvenation.java
+13 -3
View File
@@ -83,14 +83,24 @@ public class ElixirOfAquaticRejuvenation extends Elixir {
} else { } else {
healAmt = (float)Math.floor(healAmt); healAmt = (float)Math.floor(healAmt);
} }
target.HP += healAmt; target.HP += (int)healAmt;
left -= healAmt; left -= (int)healAmt;
target.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 ); target.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 );
target.sprite.showStatusWithIcon( CharSprite.POSITIVE, "1", FloatingText.HEALING ); target.sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString((int)healAmt), FloatingText.HEALING );
if (target.HP >= target.HT) {
target.HP = target.HT;
if (target instanceof Hero) {
((Hero) target).resting = false;
}
}
} }
if (left <= 0){ if (left <= 0){
detach(); detach();
if (target instanceof Hero) {
((Hero) target).resting = false;
}
} else { } else {
spend(TICK); spend(TICK);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
+13 -8
View File
@@ -92,15 +92,20 @@ public class Sungrass extends Plant {
partialHeal += (40 + target.HT)/150f; partialHeal += (40 + target.HT)/150f;
if (partialHeal > 1){ if (partialHeal > 1){
target.HP += (int)partialHeal; int healThisTurn = (int)partialHeal;
level -= (int)partialHeal; partialHeal -= healThisTurn;
partialHeal -= (int)partialHeal; level -= healThisTurn;
target.sprite.showStatusWithIcon(CharSprite.POSITIVE, "1", FloatingText.HEALING);
if (target.HP >= target.HT) { if (target.HP < target.HT) {
target.HP = target.HT;
if (target instanceof Hero){ target.HP += healThisTurn;
((Hero)target).resting = false; target.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(healThisTurn), FloatingText.HEALING);
if (target.HP >= target.HT) {
target.HP = target.HT;
if (target instanceof Hero) {
((Hero) target).resting = false;
}
} }
} }
} }