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

v0.9.4: wild magic now works properly with cursed wands

Browse Source
This commit is contained in:
Evan Debenham 2021-07-30 23:39:12 -04:00
parent 8be67e9e20
commit d776e83bb5
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.CursedWand;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
@ -128,27 +129,43 @@ public class WildMagic extends ArmorAbility {
Ballistica aim = new Ballistica(hero.pos, target, cur.collisionProperties(target)); Ballistica aim = new Ballistica(hero.pos, target, cur.collisionProperties(target));
hero.sprite.zap(target); hero.sprite.zap(target);
cur.fx(aim, new Callback() {
@Override if (!cur.cursed) {
public void call() { cur.fx(aim, new Callback() {
cur.onZap(aim); @Override
cur.partialCharge -= (float)Math.pow(0.67f, hero.pointsInTalent(Talent.CONSERVED_MAGIC)); public void call() {
if (cur.partialCharge < 0){ afterZap(cur, wands, hero, target);
cur.partialCharge++;
cur.curCharges--;
}
if (!wands.isEmpty()){
zapWand(wands, hero, target);
} else {
if (hero.buff(WildMagicTracker.class) != null){
hero.buff(WildMagicTracker.class).detach();
}
Item.updateQuickslot();
Invisibility.dispel();
hero.spendAndNext(Actor.TICK);
} }
});
} else {
CursedWand.cursedZap(cur,
hero,
new Ballistica(hero.pos, target, Ballistica.MAGIC_BOLT),
new Callback() {
@Override
public void call() {
afterZap(cur, wands, hero, target);
}
});
}
}
private void afterZap( Wand cur, ArrayList<Wand> wands, Hero hero, int target){
cur.partialCharge -= (float) Math.pow(0.67f, hero.pointsInTalent(Talent.CONSERVED_MAGIC));
if (cur.partialCharge < 0) {
cur.partialCharge++;
cur.curCharges--;
}
if (!wands.isEmpty()) {
zapWand(wands, hero, target);
} else {
if (hero.buff(WildMagicTracker.class) != null) {
hero.buff(WildMagicTracker.class).detach();
} }
}); Item.updateQuickslot();
Invisibility.dispel();
hero.spendAndNext(Actor.TICK);
}
} }
@Override @Override