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

v2.0.2: further small improvements to action indicator for Monk

Browse Source
This commit is contained in:
Evan Debenham
2023-04-10 16:45:54 -04:00
parent 5916125121
commit 1cc91bf038
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java
+6 -2
View File
@@ -261,14 +261,18 @@ public class MonkEnergy extends Buff implements ActionIndicator.Action {
public Visual secondaryVisual() { public Visual secondaryVisual() {
BitmapText txt = new BitmapText(PixelScene.pixelFont); BitmapText txt = new BitmapText(PixelScene.pixelFont);
txt.text( Integer.toString((int)energy) ); txt.text( Integer.toString((int)energy) );
if (abilitiesEmpowered(Dungeon.hero)) txt.hardlight(CharSprite.POSITIVE); txt.hardlight(CharSprite.POSITIVE);
txt.measure(); txt.measure();
return txt; return txt;
} }
@Override @Override
public int indicatorColor() { public int indicatorColor() {
return 0xA08840; if (abilitiesEmpowered(Dungeon.hero)){
return 0x99CC33;
} else {
return 0xA08840;
}
} }
@Override @Override
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java
+2
View File
@@ -285,6 +285,7 @@ public class BuffIndicator extends Component {
//round up to the nearest pixel if <50% faded, otherwise round down //round up to the nearest pixel if <50% faded, otherwise round down
if (!large || buff.iconTextDisplay().isEmpty()) { if (!large || buff.iconTextDisplay().isEmpty()) {
text.visible = false; text.visible = false;
grey.visible = true;
float fadeHeight = buff.iconFadePercent() * icon.height(); float fadeHeight = buff.iconFadePercent() * icon.height();
float zoom = (camera() != null) ? camera().zoom : 1; float zoom = (camera() != null) ? camera().zoom : 1;
if (fadeHeight < icon.height() / 2f) { if (fadeHeight < icon.height() / 2f) {
@@ -293,6 +294,7 @@ public class BuffIndicator extends Component {
grey.scale.set(icon.width(), (float) Math.floor(zoom * fadeHeight) / zoom); grey.scale.set(icon.width(), (float) Math.floor(zoom * fadeHeight) / zoom);
} }
} else if (!buff.iconTextDisplay().isEmpty()) { } else if (!buff.iconTextDisplay().isEmpty()) {
text.visible = true;
grey.visible = false; grey.visible = false;
if (buff.type == Buff.buffType.POSITIVE) text.hardlight(CharSprite.POSITIVE); if (buff.type == Buff.buffType.POSITIVE) text.hardlight(CharSprite.POSITIVE);
else if (buff.type == Buff.buffType.NEGATIVE) text.hardlight(CharSprite.NEGATIVE); else if (buff.type == Buff.buffType.NEGATIVE) text.hardlight(CharSprite.NEGATIVE);