From 3f587ffc47cbbe49e2fbe80e87afc7b727f1127c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 3 Jul 2017 23:19:00 -0400 Subject: [PATCH] v0.6.1: small tweak to wand of fireblast logic --- build.gradle | 2 +- .../items/wands/WandOfFireblast.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 125e547bf..e52ed0aca 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java index 985e72b56..ad3993358 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java @@ -73,9 +73,18 @@ public class WandOfFireblast extends DamageWand { protected void onZap( Ballistica bolt ) { for( int cell : affectedCells){ - - if (Level.flamable[cell] || !Dungeon.level.adjacent(bolt.sourcePos, cell)) + + //ignore caster cell + if (cell == bolt.sourcePos){ + continue; + } + + //only ignite cells directly near caster if they are flammable + if (!Dungeon.level.adjacent(bolt.sourcePos, cell) + || Level.flamable[cell]){ GameScene.add( Blob.seed( cell, 1+chargesPerCast(), Fire.class ) ); + } + Char ch = Actor.findChar( cell ); if (ch != null) {