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

v0.9.0: prevented reclaim trap from being dropped when a trap is stored

Browse Source
This commit is contained in:
Evan Debenham 2020-09-16 15:26:02 -04:00
parent 0dc3a21436
commit de9d629a7f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java
View File

@ -37,6 +37,8 @@ import com.watabou.noosa.audio.Sample;
import com.watabou.utils.Bundle; import com.watabou.utils.Bundle;
import com.watabou.utils.Reflection; import com.watabou.utils.Reflection;
import java.util.ArrayList;
public class ReclaimTrap extends TargetedSpell { public class ReclaimTrap extends TargetedSpell {
{ {
@ -45,6 +47,17 @@ public class ReclaimTrap extends TargetedSpell {
private Class<?extends Trap> storedTrap = null; private Class<?extends Trap> storedTrap = null;
@Override
public ArrayList<String> actions(Hero hero) {
ArrayList<String> actions = super.actions(hero);
//prevents exploits
if (storedTrap != null){
actions.remove(AC_DROP);
actions.remove(AC_THROW);
}
return actions;
}
@Override @Override
protected void affectTarget(Ballistica bolt, Hero hero) { protected void affectTarget(Ballistica bolt, Hero hero) {
if (storedTrap == null) { if (storedTrap == null) {
@ -80,18 +93,6 @@ public class ReclaimTrap extends TargetedSpell {
return desc; return desc;
} }
@Override
protected void onThrow(int cell) {
storedTrap = null;
super.onThrow(cell);
}
@Override
public void doDrop(Hero hero) {
storedTrap = null;
super.doDrop(hero);
}
private static final ItemSprite.Glowing[] COLORS = new ItemSprite.Glowing[]{ private static final ItemSprite.Glowing[] COLORS = new ItemSprite.Glowing[]{
new ItemSprite.Glowing( 0xFF0000 ), new ItemSprite.Glowing( 0xFF0000 ),
new ItemSprite.Glowing( 0xFF8000 ), new ItemSprite.Glowing( 0xFF8000 ),