From 13cf9729824b9cb7843abe3e4eff652ec456b764 Mon Sep 17 00:00:00 2001 From: Evan Debenham <Evan.SHPX@gmail.com> Date: Thu, 2 Oct 2014 00:31:25 -0400 Subject: [PATCH] V0.2.1 : Clarified actor order of behaviour --- .../shatteredpixeldungeon/actors/Actor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java index 3e8cdab35..a296881c6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java @@ -150,8 +150,12 @@ public abstract class Actor implements Bundlable { Arrays.fill( chars, null ); for (Actor actor : all) { - //if multiple things act at the same time, hero should go first. - if (actor.time < now || (actor instanceof Hero && actor.time == now)) { + //Order of actions when time is equal: + //1. Hero + //2. Other Chars + //3. Other Actors (e.g. blobs) + if (actor.time < now || (actor instanceof Hero && actor.time == now) + || (actor instanceof Char && actor.time == now && !(current instanceof Hero))) { now = actor.time; current = actor; }