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

v0.9.4: fixed magical charge and scroll empower interacting incorrectly

Browse Source
This commit is contained in:
Evan Debenham 2021-07-09 17:54:03 -04:00
parent 0661a224a3
commit ed5d5a56ee
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
View File

@ -369,14 +369,19 @@ public abstract class Wand extends Item {
curCharges -= cursed ? 1 : chargesPerCast(); curCharges -= cursed ? 1 : chargesPerCast();
//remove magic charge at a higher priority, if we are benefiting from it are and not the
//wand that just applied it
WandOfMagicMissile.MagicCharge buff = curUser.buff(WandOfMagicMissile.MagicCharge.class);
if (buff != null
&& buff.wandJustApplied() != this
&& buff.level() == buffedLvl()
&& buffedLvl() > super.buffedLvl()){
buff.detach();
} else {
ScrollEmpower empower = curUser.buff(ScrollEmpower.class); ScrollEmpower empower = curUser.buff(ScrollEmpower.class);
if (empower != null){ if (empower != null){
empower.detach(); empower.detach();
} }
WandOfMagicMissile.MagicCharge buff = curUser.buff(WandOfMagicMissile.MagicCharge.class);
if (buff != null && buff.level() > super.buffedLvl()){
buff.detach();
} }
//if the wand is owned by the hero, but not in their inventory, it must be in the staff //if the wand is owned by the hero, but not in their inventory, it must be in the staff

17
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java
View File

@ -67,7 +67,7 @@ public class WandOfMagicMissile extends DamageWand {
//apply the magic charge buff if we have another wand in inventory of a lower level, or already have the buff //apply the magic charge buff if we have another wand in inventory of a lower level, or already have the buff
for (Wand.Charger wandCharger : curUser.buffs(Wand.Charger.class)){ for (Wand.Charger wandCharger : curUser.buffs(Wand.Charger.class)){
if (wandCharger.wand().buffedLvl() < buffedLvl() || curUser.buff(MagicCharge.class) != null){ if (wandCharger.wand().buffedLvl() < buffedLvl() || curUser.buff(MagicCharge.class) != null){
Buff.prolong(curUser, MagicCharge.class, MagicCharge.DURATION).setLevel(buffedLvl()); Buff.prolong(curUser, MagicCharge.class, MagicCharge.DURATION).setup(this);
break; break;
} }
} }
@ -102,9 +102,13 @@ public class WandOfMagicMissile extends DamageWand {
public static float DURATION = 4f; public static float DURATION = 4f;
private int level = 0; private int level = 0;
private Wand wandJustApplied; //we don't bundle this as it's only used right as the buff is applied
public void setLevel(int level){ public void setup(Wand wand){
this.level = Math.max(level, this.level); if (level < wand.buffedLvl()){
this.level = wand.buffedLvl();
this.wandJustApplied = wand;
}
} }
@Override @Override
@ -117,6 +121,13 @@ public class WandOfMagicMissile extends DamageWand {
return this.level; return this.level;
} }
//this is used briefly so that a wand of magic missile can't clear the buff it just applied
public Wand wandJustApplied(){
Wand result = this.wandJustApplied;
this.wandJustApplied = null;
return result;
}
@Override @Override
public int icon() { public int icon() {
return BuffIndicator.UPGRADE; return BuffIndicator.UPGRADE;