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

v0.3.0: self-targeting with wands is now impossible

Browse Source
This commit is contained in:
Evan Debenham 2015-03-24 02:44:16 -04:00
parent f564c3478d
commit ec2ba6afca
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
View File

@ -422,17 +422,17 @@ public abstract class Wand extends KindOfWeapon {
public void onSelect( Integer target ) {
if (target != null) {
final Wand curWand = (Wand)Wand.curItem;
final int cell = Ballistica.cast( curUser.pos, target, true, curWand.hitChars );
if (target == curUser.pos) {
if (target == curUser.pos || cell == curUser.pos) {
GLog.i( TXT_SELF_TARGET );
return;
}
final Wand curWand = (Wand)Wand.curItem;
curWand.setKnown();
final int cell = Ballistica.cast( curUser.pos, target, true, curWand.hitChars );
curUser.sprite.zap( cell );
//targets the enemy hit for char-hitting wands, or the cell aimed at for other wands.
@ -441,7 +441,7 @@ public abstract class Wand extends KindOfWeapon {
if (curWand.curCharges > 0) {
curUser.busy();
curWand.fx( cell, new Callback() {
@Override
public void call() {