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

V0.2.0: Tweaked behaviour relating to order of actions, fixes a bug: when a buff is first attached it randomly acts twice instead of once.

Browse Source
This commit is contained in:
Evan Debenham 2014-08-27 00:53:22 -04:00
parent 9231e99838
commit 3c471b3e19
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.watabou.utils.Bundlable; import com.watabou.utils.Bundlable;
@ -149,7 +150,8 @@ public abstract class Actor implements Bundlable {
Arrays.fill( chars, null ); Arrays.fill( chars, null );
for (Actor actor : all) { for (Actor actor : all) {
if (actor.time < now) { //if multiple things act at the same time, hero should go first.
if (actor.time < now || (actor instanceof Hero && actor.time == now)) {
now = actor.time; now = actor.time;
current = actor; current = actor;
} }