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

v0.6.2: Hourglass charge use is now frontloaded to match new cloak

Browse Source
This commit is contained in:
Evan Debenham 2017-09-12 00:07:55 -04:00
parent 75682ea572
commit 50566234c7
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -452,8 +452,11 @@ public class Hero extends Char {
@Override @Override
public void spend( float time ) { public void spend( float time ) {
TimekeepersHourglass.timeFreeze buff = buff(TimekeepersHourglass.timeFreeze.class); TimekeepersHourglass.timeFreeze buff = buff(TimekeepersHourglass.timeFreeze.class);
if (!(buff != null && buff.processTime(time))) if (buff != null){
super.spend( time ); buff.processTime(time);
} else {
super.spend(time);
}
} }
public void spendAndNext( float time ) { public void spendAndNext( float time ) {

12
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java
View File

@ -105,6 +105,7 @@ public class TimekeepersHourglass extends Artifact {
activeBuff = new timeFreeze(); activeBuff = new timeFreeze();
activeBuff.attachTo(Dungeon.hero); activeBuff.attachTo(Dungeon.hero);
((timeFreeze)activeBuff).processTime(0f);
} }
}; };
} }
@ -269,11 +270,11 @@ public class TimekeepersHourglass extends Artifact {
public class timeFreeze extends ArtifactBuff { public class timeFreeze extends ArtifactBuff {
float partialTime = 0f; float partialTime = 1f;
ArrayList<Integer> presses = new ArrayList<Integer>(); ArrayList<Integer> presses = new ArrayList<Integer>();
public boolean processTime(float time){ public void processTime(float time){
partialTime += time; partialTime += time;
while (partialTime >= 1f){ while (partialTime >= 1f){
@ -283,11 +284,10 @@ public class TimekeepersHourglass extends Artifact {
updateQuickslot(); updateQuickslot();
if (charge <= 0){ if (charge < 0){
charge = 0;
detach(); detach();
return false; }
} else
return true;
} }