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

v1.2.2: fixed wild magic processing very quickly with some wands

Browse Source
This commit is contained in:
Evan Debenham 2022-04-04 17:02:37 -04:00
parent 9c8b6d44f5
commit d51fed0f4d
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/WildMagic.java
View File

@ -37,6 +37,8 @@ import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon; import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.Game;
import com.watabou.noosa.tweeners.Delayer;
import com.watabou.utils.Callback; import com.watabou.utils.Callback;
import com.watabou.utils.Random; import com.watabou.utils.Random;
@ -124,29 +126,48 @@ public class WildMagic extends ArmorAbility {
public static class WildMagicTracker extends FlavourBuff{}; public static class WildMagicTracker extends FlavourBuff{};
private void zapWand( ArrayList<Wand> wands, Hero hero, int target){ private void zapWand( ArrayList<Wand> wands, Hero hero, int cell){
Wand cur = wands.remove(0); Wand cur = wands.remove(0);
Ballistica aim = new Ballistica(hero.pos, target, cur.collisionProperties(target)); Ballistica aim = new Ballistica(hero.pos, cell, cur.collisionProperties(cell));
hero.sprite.zap(target); hero.sprite.zap(cell);
float startTime = Game.timeTotal;
if (!cur.cursed) { if (!cur.cursed) {
cur.fx(aim, new Callback() { cur.fx(aim, new Callback() {
@Override @Override
public void call() { public void call() {
cur.onZap(aim); cur.onZap(aim);
afterZap(cur, wands, hero, target); if (Game.timeTotal - startTime < 0.33f){
hero.sprite.parent.add(new Delayer(0.33f - (Game.timeTotal - startTime)) {
@Override
protected void onComplete() {
afterZap(cur, wands, hero, cell);
}
});
} else {
afterZap(cur, wands, hero, cell);
}
} }
}); });
} else { } else {
CursedWand.cursedZap(cur, CursedWand.cursedZap(cur,
hero, hero,
new Ballistica(hero.pos, target, Ballistica.MAGIC_BOLT), new Ballistica(hero.pos, cell, Ballistica.MAGIC_BOLT),
new Callback() { new Callback() {
@Override @Override
public void call() { public void call() {
afterZap(cur, wands, hero, target); if (Game.timeTotal - startTime < 0.33f){
hero.sprite.parent.add(new Delayer(0.33f - (Game.timeTotal - startTime)) {
@Override
protected void onComplete() {
afterZap(cur, wands, hero, cell);
}
});
} else {
afterZap(cur, wands, hero, cell);
}
} }
}); });
} }