Merge branch 'fix-buff-icons'

src/arkhados/CharacterInteraction.java

@@ -19,6 +19,8 @@
 import arkhados.controls.CInfluenceInterface;
 import arkhados.gamemode.GameMode;
 import arkhados.spell.buffs.AbstractBuff;
+import arkhados.spell.buffs.AbstractBuffBuilder;
+import arkhados.util.Builder;
 import arkhados.util.RoundStats;
 import arkhados.util.UserDataStrings;
 import com.jme3.scene.Spatial;
@@ -40,7 +42,7 @@ public class CharacterInteraction {
 
     public static void harm(CInfluenceInterface attacker,
             CInfluenceInterface target, final float rawDamage,
-            List<AbstractBuff> buffs, boolean canBreakCC) {
+            List<AbstractBuffBuilder> buffBuilders, boolean canBreakCC) {
 
         if (target == null) {
             return;
@@ -90,12 +92,17 @@ public static void harm(CInfluenceInterface attacker,
             gameMode.playerDied(targetPlayerId, latestDamagerId);
         }
 
-        if (buffs != null) {
-            for (AbstractBuff buff : buffs) {
-                if (buff != null && !buff.isFriendly()) {
-                    buff.attachToCharacter(target);
-                } else if (buff == null) {
+        if (buffBuilders != null) {
+            for (Builder<AbstractBuff> buffBuilder : buffBuilders) {
+                AbstractBuff buff = buffBuilder.build();
+
+                if (buff == null) {
                     System.out.println("Null in buff-list");
+                    continue;
+                }
+
+                if (!buff.isFriendly()) {
+                    buff.attachToCharacter(target);
                 }
             }
         }
@@ -119,7 +126,7 @@ public static void heal(CInfluenceInterface healer,
     }
 
     public static void startNewRound() {
-        final RoundStats roundStats = new RoundStats();
+        RoundStats roundStats = new RoundStats();
         roundStats.initialize();
         roundStatList.add(roundStats);
     }
@@ -128,7 +135,7 @@ public static void addPlayer(int playerId) {
         RoundStats round = roundStatList.get(roundStatList.size() - 1);
         round.addPlayer(playerId);
     }
-    
+
     public static void removePlayer(int playerId) {
         RoundStats round = roundStatList.get(roundStatList.size() - 1);
         round.removePlayer(playerId);

src/arkhados/ServerWorldCollisionListener.java

@@ -150,7 +150,7 @@ private void projectileCharacterCollision(CProjectile projectile,
                 return;
             }
 
-            final CSpellBuff buffControl = projectile.getSpatial()
+            CSpellBuff buffControl = projectile.getSpatial()
                     .getControl(CSpellBuff.class);
 
             final boolean canBreakCC = damage > 0f ? true : false;

src/arkhados/actions/ACharge.java

@@ -22,6 +22,7 @@
 import arkhados.controls.CCharacterPhysics;
 import arkhados.controls.CInfluenceInterface;
 import arkhados.spell.buffs.AbstractBuff;
+import arkhados.spell.buffs.AbstractBuffBuilder;
 import arkhados.util.UserDataStrings;
 import com.jme3.bullet.collision.PhysicsCollisionEvent;
 import com.jme3.bullet.collision.PhysicsCollisionListener;
@@ -49,7 +50,7 @@ public class ACharge extends EntityAction
     private Vector3f direction;
     private GhostControl ghost;
     private Node ghostNode;
-    private List<AbstractBuff> buffs = new ArrayList<>();
+    private List<AbstractBuffBuilder> buffs = new ArrayList<>();
     private boolean hasCollided = false;
     private Spatial collidedWith = null;
     private float hitDamage;
@@ -58,7 +59,7 @@ public ACharge(float range) {
         this.range = range;
     }
 
-    public void addBuff(AbstractBuff buff) {
+    public void addBuff(AbstractBuffBuilder buff) {
         buffs.add(buff);
     }
 

src/arkhados/actions/ASplash.java

@@ -19,7 +19,7 @@
 import arkhados.controls.CCharacterPhysics;
 import arkhados.controls.CInfluenceInterface;
 import arkhados.controls.CSpellBuff;
-import arkhados.spell.buffs.AbstractBuff;
+import arkhados.spell.buffs.AbstractBuffBuilder;
 import arkhados.util.DistanceScaling;
 import arkhados.util.Selector;
 import arkhados.util.UserDataStrings;
@@ -31,24 +31,24 @@
 
 /**
  *
- * @author william TODO: Currently SplashAction seems to be meant for negative things only. There
- * could be healing splash too or something like that.
+ * @author william TODO: Currently SplashAction seems to be meant for negative
+ * things only. There could be healing splash too or something like that.
  */
 public class ASplash extends EntityAction {
 
     private float radius;
     private float baseDamage;
     private Float customImpulse;
     private DistanceScaling damageDistance;
-    private List<AbstractBuff> splashBuffs;
+    private List<AbstractBuffBuilder> splashBuffs;
     private boolean splashBuffsOnly = false;
     private List<Spatial> excluded = new ArrayList<>();
     private Integer excludedTeam = null;
-
     private CInfluenceInterface casterInterface;
 
-    public ASplash(float radius, float baseDamage, DistanceScaling damageDistanceScaling,
-            List<AbstractBuff> splashBuffs) {
+    public ASplash(float radius, float baseDamage,
+            DistanceScaling damageDistanceScaling,
+            List<AbstractBuffBuilder> splashBuffs) {
         this.radius = radius;
         this.baseDamage = baseDamage;
         this.damageDistance = damageDistanceScaling;
@@ -58,7 +58,8 @@ public ASplash(float radius, float baseDamage, DistanceScaling damageDistanceSca
     }
 
     public ASplash(float radius, float baseDamage, float impulse,
-            DistanceScaling damageDistance, List<AbstractBuff> splashBuffs) {
+            DistanceScaling damageDistance,
+            List<AbstractBuffBuilder> splashBuffs) {
         this.radius = radius;
         this.baseDamage = baseDamage;
         this.customImpulse = impulse;
@@ -68,8 +69,8 @@ public ASplash(float radius, float baseDamage, float impulse,
 
     @Override
     public boolean update(float tpf) {
-        List<SpatialDistancePair> spatialsOnDistance =
-                Selector.getSpatialsWithinDistance(new ArrayList<SpatialDistancePair>(),
+        List<SpatialDistancePair> spatialsOnDistance = Selector
+                .getSpatialsWithinDistance(new ArrayList<SpatialDistancePair>(),
                 spatial, radius);
 
         for (SpatialDistancePair pair : spatialsOnDistance) {
@@ -96,11 +97,11 @@ public boolean update(float tpf) {
             }
             final float damage = baseDamage * damageDistanceFactor;
 
-            List<AbstractBuff> buffsToApply;
+            List<AbstractBuffBuilder> buffsToApply;
             if (splashBuffsOnly) {
                 buffsToApply = splashBuffs;
             } else {
-                final CSpellBuff buffControl = spatial.getControl(CSpellBuff.class);
+                CSpellBuff buffControl = spatial.getControl(CSpellBuff.class);
                 if (buffControl != null) {
                     buffsToApply = buffControl.getBuffs();
                     if (splashBuffs != null) {
@@ -111,27 +112,33 @@ public boolean update(float tpf) {
                 }
             }
 
-            CharacterInteraction.harm(casterInterface, targetInterface, damage, buffsToApply, true);
+            CharacterInteraction.harm(casterInterface, targetInterface, damage,
+                    buffsToApply, true);
 
             CCharacterPhysics physics =
                     pair.spatial.getControl(CCharacterPhysics.class);
             Float impulseFactor;
             if (customImpulse == null) {
-                impulseFactor = spatial.getUserData(UserDataStrings.IMPULSE_FACTOR);
+                impulseFactor =
+                        spatial.getUserData(UserDataStrings.IMPULSE_FACTOR);
             } else {
                 impulseFactor = customImpulse;
             }
             Vector3f impulse;
 
-            RigidBodyControl colliderPhysics = spatial.getControl(RigidBodyControl.class);
+            RigidBodyControl colliderPhysics =
+                    spatial.getControl(RigidBodyControl.class);
 
             if (colliderPhysics != null && !colliderPhysics.isKinematic()) {
                 impulse = pair.spatial.getLocalTranslation()
-                        .subtract(colliderPhysics.getPhysicsLocation().setY(0)).normalizeLocal()
+                        .subtract(colliderPhysics.getPhysicsLocation().setY(0))
+                        .normalizeLocal()
                         .multLocal(impulseFactor);
             } else {
-                impulse = pair.spatial.getLocalTranslation().subtract(spatial.getLocalTranslation())
-                        .normalizeLocal().multLocal(impulseFactor).multLocal(distanceFactor);
+                impulse = pair.spatial.getLocalTranslation()
+                        .subtract(spatial.getLocalTranslation())
+                        .normalizeLocal().multLocal(impulseFactor)
+                        .multLocal(distanceFactor);
             }
 
             physics.applyImpulse(impulse);

src/arkhados/actions/castspellactions/ACastOnGround.java

@@ -21,6 +21,7 @@
 import arkhados.controls.CSpellCast;
 import arkhados.spell.Spell;
 import arkhados.spell.buffs.AbstractBuff;
+import arkhados.spell.buffs.AbstractBuffBuilder;
 import arkhados.util.UserDataStrings;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
@@ -36,7 +37,8 @@ public class ACastOnGround extends EntityAction {
 
     private WorldManager worldManager;
     private Spell spell;
-    private final List<AbstractBuff> additionalEnterBuffs = new ArrayList<>();
+    private final List<AbstractBuffBuilder> additionalEnterBuffs
+            = new ArrayList<>();
     // NOTE: Add additionalExitBuffs -list if needed
 
     public ACastOnGround(WorldManager worldManager, Spell spell) {
@@ -57,15 +59,15 @@ public boolean update(float tpf) {
         Spatial entity = worldManager.getEntity(entityId);
         CAreaEffect aoeControl =
                 entity.getControl(CAreaEffect.class);
-        aoeControl.setOwnerInterface(spatial.getControl(
-                CInfluenceInterface.class));
-        for (AbstractBuff buff : additionalEnterBuffs) {
+        aoeControl.setOwnerInterface(
+                spatial.getControl(CInfluenceInterface.class));
+        for (AbstractBuffBuilder buff : additionalEnterBuffs) {
             aoeControl.addEnterBuff(buff);
         }
         return false;
     }
 
-    public void addEnterBuff(final AbstractBuff buff) {
+    public void addEnterBuff(AbstractBuffBuilder buff) {
         if (buff == null) {
             throw new IllegalArgumentException(
                     "Nulls not allowed in containers");

src/arkhados/actions/castspellactions/ACastProjectile.java

@@ -23,6 +23,7 @@
 import arkhados.controls.CSpellBuff;
 import arkhados.spell.Spell;
 import arkhados.spell.buffs.AbstractBuff;
+import arkhados.spell.buffs.AbstractBuffBuilder;
 import arkhados.util.UserDataStrings;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
@@ -38,24 +39,26 @@ public class ACastProjectile extends EntityAction {
 
     private final Spell spell;
     private final WorldManager worldManager;
-    private final List<AbstractBuff> additionalBuffs = new ArrayList<>();
+    private final List<AbstractBuffBuilder> additionalBuffs = new ArrayList<>();
 
     public ACastProjectile(Spell spell, WorldManager worldManager) {
         this.spell = spell;
         this.worldManager = worldManager;
     }
 
-    public void addBuff(final AbstractBuff buff) {
+    public void addBuff(AbstractBuffBuilder buff) {
         additionalBuffs.add(buff);
     }
 
     @Override
     public boolean update(float tpf) {
-        CCharacterPhysics physicsControl = spatial.getControl(CCharacterPhysics.class);
+        CCharacterPhysics physicsControl = 
+                spatial.getControl(CCharacterPhysics.class);
         Vector3f targetLocation = physicsControl.getTargetLocation();
         Vector3f viewDirection = targetLocation.subtract(
                 spatial.getLocalTranslation()).normalizeLocal();
-        spatial.getControl(CCharacterPhysics.class).setViewDirection(viewDirection);
+        spatial.getControl(CCharacterPhysics.class)
+                .setViewDirection(viewDirection);
 
         float characterRadius = spatial.getUserData(UserDataStrings.RADIUS);
         Vector3f spawnLocation = spatial.getLocalTranslation().add(
@@ -90,8 +93,8 @@ public boolean update(float tpf) {
 
         CSpellBuff buffControl =
                 projectile.getControl(CSpellBuff.class);
-        for (AbstractBuff buff : additionalBuffs) {
-            buffControl.addBuff(buff);
+        for (AbstractBuffBuilder buffBuilder : additionalBuffs) {
+            buffControl.addBuff(buffBuilder);
         }
 
         return false;

src/arkhados/actions/castspellactions/ACastSelfBuff.java

@@ -17,6 +17,7 @@
 import arkhados.actions.EntityAction;
 import arkhados.controls.CInfluenceInterface;
 import arkhados.spell.buffs.AbstractBuff;
+import arkhados.spell.buffs.AbstractBuffBuilder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,19 +27,22 @@
  */
 public class ACastSelfBuff extends EntityAction {
 
-    private List<AbstractBuff> buffs = new ArrayList<>();
+    private List<AbstractBuffBuilder> buffs = new ArrayList<>();
 
     @Override
-    public boolean update(float tpf) {
+    public boolean update(float tpf) {        
         CInfluenceInterface target =
                 spatial.getControl(CInfluenceInterface.class);
-        for (AbstractBuff buff : buffs) {
+        for (AbstractBuffBuilder builder : buffs) {
+            AbstractBuff buff = builder.build();
+            buff.setOwnerInterface(target);
             buff.attachToCharacter(target);
         }
+
         return false;
     }
 
-    public void addBuff(AbstractBuff buff) {
+    public void addBuff(AbstractBuffBuilder buff) {
         buffs.add(buff);
     }
 }

src/arkhados/actions/castspellactions/AMeleeAttack.java

@@ -22,6 +22,7 @@
 import arkhados.controls.CCharacterPhysics;
 import arkhados.controls.CInfluenceInterface;
 import arkhados.spell.buffs.AbstractBuff;
+import arkhados.spell.buffs.AbstractBuffBuilder;
 import arkhados.util.Predicate;
 import arkhados.util.Selector;
 import arkhados.util.UserDataStrings;
@@ -35,7 +36,7 @@
  */
 public class AMeleeAttack extends EntityAction {
 
-    private List<AbstractBuff> buffs = new ArrayList<>();
+    private List<AbstractBuffBuilder> buffs = new ArrayList<>();
     private float damage;
     private float range;
 
@@ -44,7 +45,7 @@ public AMeleeAttack(float damage, float range) {
         this.range = range;
     }
 
-    public void addBuff(AbstractBuff buff) {
+    public void addBuff(AbstractBuffBuilder buff) {
         buffs.add(buff);
     }