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

v0.9.4: adjusted hero talent blinking to sync up with guidebook blinking

Browse Source
This commit is contained in:
Evan Debenham 2021-08-07 23:12:29 -04:00
parent 89c6ea8063
commit f0572abcca
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java
View File

@ -54,6 +54,8 @@ public class StatusPane extends Component {
public static float talentBlink; public static float talentBlink;
private float warning; private float warning;
private static final float FLASH_RATE = (float)(Math.PI*1.5f); //1.5 blinks per second
private int lastTier = 0; private int lastTier = 0;
private Image rawShielding; private Image rawShielding;
@ -217,9 +219,9 @@ public class StatusPane extends Component {
warning += Game.elapsed * 5f *(0.4f - (health/(float)max)); warning += Game.elapsed * 5f *(0.4f - (health/(float)max));
warning %= 1f; warning %= 1f;
avatar.tint(ColorMath.interpolate(warning, warningColors), 0.5f ); avatar.tint(ColorMath.interpolate(warning, warningColors), 0.5f );
} else if (talentBlink > 0){ } else if (talentBlink > 0.33f){ //stops early so it doesn't end in the middle of a blink
talentBlink -= Game.elapsed; talentBlink -= Game.elapsed;
avatar.tint(1, 1, 0, (float)Math.abs(Math.sin(2*talentBlink)/2f)); avatar.tint(1, 1, 0, (float)Math.abs(Math.cos(talentBlink*FLASH_RATE))/2f);
} else { } else {
avatar.resetColor(); avatar.resetColor();
} }
@ -281,7 +283,7 @@ public class StatusPane extends Component {
private Image journalIcon; private Image journalIcon;
private KeyDisplay keyIcon; private KeyDisplay keyIcon;
private String flashingPage = Document.GUIDE_INTRO_PAGE; private String flashingPage = null;
public JournalButton() { public JournalButton() {
super(); super();
@ -329,7 +331,6 @@ public class StatusPane extends Component {
} }
private float time; private float time;
private static final float FLASH_RATE = (float)(Math.PI*1.5f); //1.5 blinks per second
@Override @Override
public void update() { public void update() {