From e2e9a250507f940d8a2583f7c082f19c2d7722c6 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 13 Oct 2014 17:04:15 -0400 Subject: [PATCH] V0.2.1 : Finalized visuals for Gnoll Trickster --- AndroidManifest.xml | 2 +- assets/gnoll.png | Bin 5351 -> 5470 bytes .../actors/mobs/npcs/Ghost.java | 4 ++-- .../sprites/GnollTricksterSprite.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) 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 a19acdbbc15a2abdf7dbdbefaf87446e8a2eeeda..50372e590deb5a79fb254f1f41615a2bfab3d3d0 100644 GIT binary patch delta 2787 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 Z{trQB@R7D8GBf}H002ovPDHLkV1lX0CN}^8 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();