LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V0.2.1 : Clarified actor order of behaviour

Browse Source
This commit is contained in:
Evan Debenham 2014-10-02 00:31:25 -04:00
parent d0227aebc8
commit 13cf972982
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
View File

@ -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;
}