OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-24 12:20:42 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Pull Request #78: fix getting stuck in combat when animations are disabled

Browse Source
This commit is contained in:
Nut.andor
2024-11-19 17:13:02 +01:00
parent e3b03fa3e5 3faf696f46
commit a8e2462e47
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
View File

@@ -26,8 +26,6 @@ import java.util.List;
public final class VisualEffectController {
private static final long EFFECT_UPDATE_INTERVAL = 25;
private int effectCount = 0;
private final ControllerContext controllers;
private final WorldContext world;
private final VisualEffectCollection effectTypes;
@@ -46,7 +44,6 @@ public final class VisualEffectController {
}
public void startEffect(Coord position, VisualEffectCollection.VisualEffectID effectID, String displayValue, VisualEffectCompletedCallback callback, int callbackValue) {
++effectCount;
VisualEffectAnimation animation = new VisualEffectAnimation(effectTypes.getVisualEffect(effectID), position, displayValue, callback, callbackValue);
animation.start();
}
@@ -74,7 +71,6 @@ public final class VisualEffectController {
if (controllers.preferences.attackspeed_milliseconds <= 0 || animation.currentFrame >= animation.effect.lastFrame) {
animation.onCompleted();
activeAnimations.remove(i);
effectCount--;
i--;
}
}
@@ -101,7 +97,6 @@ public final class VisualEffectController {
}
public void startActorMoveEffect(Actor actor, PredefinedMap map, Coord origin, Coord destination, int duration, VisualEffectCompletedCallback callback, int callbackValue) {
++effectCount;
(new SpriteMoveAnimation(origin, destination, duration, actor, map, callback, callbackValue))
.start();
}
@@ -136,7 +131,6 @@ public final class VisualEffectController {
}
private void onCompleted() {
--effectCount;
actor.hasVFXRunning = false;
if (callback != null) callback.onVisualEffectCompleted(callbackValue);
visualEffectFrameListeners.onSpriteMoveCompleted(this);
@@ -235,7 +229,7 @@ public final class VisualEffectController {
}
public boolean isRunningVisualEffect() {
return effectCount > 0;
return !activeAnimations.isEmpty();
}