diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d55c01fa3..a73263201 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/assets/gnoll.png b/assets/gnoll.png index a19acdbbc..50372e590 100644 Binary files a/assets/gnoll.png and b/assets/gnoll.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java index 192e5deac..20b7c4283 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java @@ -539,10 +539,10 @@ public class Ghost extends Mob.NPC { public String description() { return "A strange looking creature, even by gnoll standards. It hunches forward with a wicked grin, " + - "almost cradling the satchel hanging at its side. Its eyes are wide with a strange mix of " + + "almost cradling the satchel hanging over its shoulder. Its eyes are wide with a strange mix of " + "fear and excitement.\n\n" + "There is a large collection of poorly made darts in its satchel, they all seem to be " + - "tipped with various poisonous and flammable substances."; + "tipped with various harmful substances."; } private static final String COMBO = "combo"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollTricksterSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollTricksterSprite.java index a39d6f17a..3210f871d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollTricksterSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollTricksterSprite.java @@ -1,7 +1,7 @@ package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.shatteredpixel.shatteredpixeldungeon.Assets; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.IncendiaryDart; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.CurareDart; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.watabou.noosa.MovieClip; import com.watabou.noosa.TextureFilm; @@ -43,7 +43,7 @@ public class GnollTricksterSprite extends MobSprite { if (!Level.adjacent(cell, ch.pos)) { ((MissileSprite)parent.recycle( MissileSprite.class )). - reset( ch.pos, cell, new IncendiaryDart(), new Callback() { + reset( ch.pos, cell, new CurareDart(), new Callback() { @Override public void call() { ch.onAttackComplete();