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

v0.3.5: fixed spears being able to attack through walls

Browse Source
This commit is contained in:
Evan Debenham 2016-04-22 02:30:52 -04:00
parent b731569f85
commit 6e1bab6e89
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
View File

@ -171,10 +171,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
public void onSelect(Integer cell) {
if (cell == null) return;
final Char enemy = Actor.findChar( cell );
int userPos = target.pos;
if (enemy == null || userPos == cell || (Dungeon.hero.belongings.weapon != null ?
Level.distance( userPos, enemy.pos ) > Dungeon.hero.belongings.weapon.reachFactor(Dungeon.hero)
: !Level.adjacent( userPos, enemy.pos ))){
if (enemy == null || !((Hero)target).canAttack(enemy) || target.isCharmedBy( enemy )){
GLog.w( Messages.get(Combo.class, "bad_target") );
} else {
target.sprite.attack(cell, new Callback() {

29
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -95,6 +95,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.AttackIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndResurrect;
@ -103,6 +104,7 @@ import com.watabou.noosa.Camera;
import com.watabou.noosa.Game;
import com.watabou.noosa.audio.Sample;
import com.watabou.utils.Bundle;
import com.watabou.utils.PathFinder;
import com.watabou.utils.Random;
import java.util.ArrayList;
@ -356,6 +358,27 @@ public class Hero extends Char {
}
}
public boolean canAttack(Char enemy){
if (enemy == null || pos == enemy.pos)
return false;
//can always attack adjacent enemies
if (Level.adjacent(pos, enemy.pos))
return true;
KindOfWeapon wep = Dungeon.hero.belongings.weapon;
if (wep != null && Level.distance( pos, enemy.pos ) <= wep.reachFactor(this)){
PathFinder.buildDistanceMap(enemy.pos, BArray.not(Level.solid, null), wep.reachFactor(this));
return PathFinder.distance[pos] <= wep.reachFactor(this);
} else {
return false;
}
}
public float attackDelay() {
KindOfWeapon wep = rangedWeapon != null ? rangedWeapon : belongings.weapon;
if (wep != null) {
@ -804,11 +827,7 @@ public class Hero extends Char {
enemy = action.target;
boolean inRange = belongings.weapon != null ?
Level.distance( pos, enemy.pos ) <= belongings.weapon.reachFactor(this)
: Level.adjacent( pos, enemy.pos );
if (inRange && enemy.isAlive() && !isCharmedBy( enemy )) {
if (enemy.isAlive() && canAttack( enemy ) && !isCharmedBy( enemy )) {
spend( attackDelay() );
sprite.attack( enemy.pos );

6
src/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
View File

@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.ui;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.watabou.noosa.Game;
@ -97,14 +96,11 @@ public class AttackIndicator extends Tag {
private void checkEnemies() {
int heroPos = Dungeon.hero.pos;
candidates.clear();
int v = Dungeon.hero.visibleEnemies();
for (int i=0; i < v; i++) {
Mob mob = Dungeon.hero.visibleEnemy( i );
if (Dungeon.hero.belongings.weapon != null ?
Level.distance( heroPos, mob.pos ) <= Dungeon.hero.belongings.weapon.reachFactor(Dungeon.hero)
: Level.adjacent( heroPos, mob.pos )) {
if ( Dungeon.hero.canAttack( mob) ) {
candidates.add( mob );
}
}