From 5748d09b54a4183c4e54893b77753cf0006992cb Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 10 Mar 2023 09:18:43 +0800
Subject: [PATCH] fix particle effect initial position - move the offset
 calculation inside MapActor

---
 .../forge/adventure/character/MapActor.java   | 20 ++++++++++++++++---
 .../src/forge/adventure/stage/MapStage.java   |  4 +---
 .../src/forge/adventure/stage/WorldStage.java |  4 +---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/forge-gui-mobile/src/forge/adventure/character/MapActor.java b/forge-gui-mobile/src/forge/adventure/character/MapActor.java
index 304b8a2d52c..ffe50e1e676 100644
--- a/forge-gui-mobile/src/forge/adventure/character/MapActor.java
+++ b/forge-gui-mobile/src/forge/adventure/character/MapActor.java
@@ -63,6 +63,7 @@ public class MapActor extends Actor {
     {
         ParticleEffect effect = new ParticleEffect();
         effect.load(Config.instance().getFile(path),Config.instance().getFile(path).parent());
+        effect.setPosition(getCenterX(), getCenterY());
         effects.add(new CurrentEffect(path, effect, offset, overlay));
         if(duration!=0)//ParticleEffect.setDuration uses an integer for some reason
         {
@@ -147,16 +148,29 @@ public class MapActor extends Actor {
                 effect.effect.draw(batch);
         }
     }
+    float getCenterX() {
+        float scale = 1f;
+        if (this instanceof EnemySprite) {
+            scale = ((EnemySprite) this).getData().scale;
+        }
+        return getX()+(getWidth()*scale)/2;
+    }
+    float getCenterY() {
+        float scale = 1f;
+        if (this instanceof EnemySprite) {
+            scale = ((EnemySprite) this).getData().scale;
+        }
+        return getY()+(getHeight()*scale)/2;
+    }
+
     @Override
     public void act(float delta) {
         super.act(delta);
-
-
         for(int i=0;i<effects.size;i++)
         {
             CurrentEffect effect=effects.get(i);
             effect.effect.update(delta);
-            effect.effect.setPosition(getX()+getHeight()/2+effect.offset.x,getY()+getWidth()/2+effect.offset.y);
+            effect.effect.setPosition(getCenterX()+effect.offset.x,getCenterY()+effect.offset.y);
             if(effect.effect.isComplete())
             {
                 effects.removeIndex(i);
diff --git a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
index 5c61b4fcbf1..e2713511cef 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
@@ -798,9 +798,7 @@ public class MapStage extends GameStage {
 
             Current.player().win();
             player.setAnimation(CharacterSprite.AnimationTypes.Attack);
-            float vx = currentMob.getData().scale == 1f ? 0f : -((currentMob.getWidth()*currentMob.getData().scale)/2);
-            float vy = currentMob.getData().scale == 1f ? 0f : -((currentMob.getHeight()*currentMob.getData().scale)/2);
-            currentMob.playEffect(Paths.EFFECT_BLOOD, 0.5f, true, new Vector2(vx, vy));
+            currentMob.playEffect(Paths.EFFECT_BLOOD, 0.5f);
             Timer.schedule(new Timer.Task() {
                 @Override
                 public void run() {
diff --git a/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java b/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
index ba0e45ddddf..047e4b9804b 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
@@ -156,9 +156,7 @@ public class WorldStage extends GameStage implements SaveFileContent {
         if (playerIsWinner) {
             Current.player().win();
             player.setAnimation(CharacterSprite.AnimationTypes.Attack);
-            float vx = currentMob.getData().scale == 1f ? 0f : -((currentMob.getWidth()*currentMob.getData().scale)/2);
-            float vy = currentMob.getData().scale == 1f ? 0f : -((currentMob.getHeight()*currentMob.getData().scale)/2);
-            currentMob.playEffect(Paths.EFFECT_BLOOD, 0.5f, true, new Vector2(vx, vy));
+            currentMob.playEffect(Paths.EFFECT_BLOOD, 0.5f);
             Timer.schedule(new Timer.Task() {
                 @Override
                 public void run() {