v0.3.0: added a visual indicator when a mob is surprised.

This commit is contained in:
Evan Debenham 2015-04-24 02:29:07 -04:00
parent 155b275cf8
commit 539d2442a4
4 changed files with 83 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -29,6 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sleep;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.effects.Surprise;
import com.shatteredpixel.shatteredpixeldungeon.effects.Wound;
import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
@ -346,9 +347,13 @@ public abstract class Mob extends Char {
@Override
public int defenseProc( Char enemy, int damage ) {
if (!enemySeen && enemy == Dungeon.hero && ((Hero)enemy).subClass == HeroSubClass.ASSASSIN) {
damage *= 1.34f;
Wound.hit( this );
if (!enemySeen && enemy == Dungeon.hero) {
if (((Hero)enemy).subClass == HeroSubClass.ASSASSIN) {
damage *= 1.34f;
Wound.hit(this);
} else {
Surprise.hit(this);
}
}
return damage;
}

View File

@ -26,6 +26,7 @@ public class Effects {
RIPPLE,
LIGHTNING,
WOUND,
EXCLAMATION,
DEATH_RAY,
LIGHT_RAY
};
@ -42,6 +43,9 @@ public class Effects {
case WOUND:
icon.frame(icon.texture.uvRect(16, 8, 32, 16));
break;
case EXCLAMATION:
icon.frame(icon.texture.uvRect(0, 16, 6, 25));
break;
case DEATH_RAY:
icon.frame(icon.texture.uvRect(16, 16, 32, 24));
break;

View File

@ -0,0 +1,71 @@
package com.shatteredpixel.shatteredpixeldungeon.effects;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.watabou.noosa.Game;
import com.watabou.noosa.Group;
import com.watabou.noosa.Image;
/**
* Created by Evan on 20/04/2015.
*/
public class Surprise extends Image {
private static final float TIME_TO_FADE = 0.8f;
private float time;
public Surprise() {
super(Effects.get(Effects.Type.EXCLAMATION));
origin.set(width / 2, height / 2);
}
public void reset(int p) {
revive();
x = (p % Level.WIDTH) * DungeonTilemap.SIZE + (DungeonTilemap.SIZE - width) / 2;
y = (p / Level.WIDTH) * DungeonTilemap.SIZE + (DungeonTilemap.SIZE - height) / 2;
time = TIME_TO_FADE;
}
@Override
public void update() {
super.update();
if ((time -= Game.elapsed) <= 0) {
kill();
} else {
float p = time / TIME_TO_FADE;
alpha(p);
scale.y = 1 + p/2;
}
}
public static void hit(Char ch) {
hit(ch, 0);
}
public static void hit(Char ch, float angle) {
if (ch.sprite.parent != null) {
Surprise s = (Surprise) ch.sprite.parent.recycle(Surprise.class);
ch.sprite.parent.bringToFront(s);
s.reset(ch.pos);
s.angle = angle;
}
}
public static void hit(int pos) {
hit(pos, 0);
}
public static void hit(int pos, float angle) {
Group parent = Dungeon.hero.sprite.parent;
Wound w = (Wound) parent.recycle(Wound.class);
parent.bringToFront(w);
w.reset(pos);
w.angle = angle;
}
}