From e4f2f4fc8f4e73e1726dffbc830ae15f48292a4c Mon Sep 17 00:00:00 2001
From: Numin <xnuminousx@gmail.com>
Date: Sat, 29 Feb 2020 02:01:32 -0600
Subject: [PATCH] Add configurable particle amounts to Smokescreen (#1043)

## Misc. Changes
* Made the particle amount for Smokescreen configurable.
    > * [Trello link](https://trello.com/c/V8UMd6Qj/942-add-config-option-or-something-else-to-low-amount-of-particles-of-smokescreen)
* Cleaned up the smokescreen particle code. Changes give them more dimension.
---
 .../projectkorra/chiblocking/Smokescreen.java | 24 ++++---------------
 .../configuration/ConfigManager.java          |  1 +
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/com/projectkorra/projectkorra/chiblocking/Smokescreen.java b/src/com/projectkorra/projectkorra/chiblocking/Smokescreen.java
index bfa1af99..447e0af4 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/Smokescreen.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/Smokescreen.java
@@ -21,6 +21,7 @@ public class Smokescreen extends ChiAbility {
 	private static final Map<Integer, Smokescreen> SNOWBALLS = new ConcurrentHashMap<>();
 	private static final Map<String, Long> BLINDED_TIMES = new ConcurrentHashMap<>();
 	private static final Map<String, Smokescreen> BLINDED_TO_ABILITY = new ConcurrentHashMap<>();
+	private static int particleAmount;
 
 	@Attribute(Attribute.DURATION)
 	private int duration;
@@ -37,6 +38,7 @@ public class Smokescreen extends ChiAbility {
 		this.cooldown = getConfig().getLong("Abilities.Chi.Smokescreen.Cooldown");
 		this.duration = getConfig().getInt("Abilities.Chi.Smokescreen.Duration");
 		this.radius = getConfig().getDouble("Abilities.Chi.Smokescreen.Radius");
+		particleAmount = getConfig().getInt("Abilities.Chi.Smokescreen.ParticleAmount");
 		this.start();
 	}
 
@@ -48,29 +50,13 @@ public class Smokescreen extends ChiAbility {
 	}
 
 	public static void playEffect(final Location loc) {
-		int z = -2;
-		int x = -2;
-		final int y = 0;
-
-		for (int i = 0; i < 125; i++) {
-			final Location newLoc = new Location(loc.getWorld(), loc.getX() + x, loc.getY() + y, loc.getZ() + z);
-			for (int direction = 0; direction < 8; direction++) {
-				ParticleEffect.SMOKE_NORMAL.display(newLoc, 4, 0.5, 0.5, 0.5);
-			}
-			if (z == 2) {
-				z = -2;
-			}
-			if (x == 2) {
-				x = -2;
-				z++;
-			}
-			x++;
-		}
+		for (int i = 0; i < 125; i++)
+			ParticleEffect.SMOKE_NORMAL.display(loc, particleAmount, Math.random() + 0.7, Math.random() + 0.5, Math.random() + 0.7);
 	}
 
 	public void applyBlindness(final Entity entity) {
 		if (entity instanceof Player) {
-			if (Commands.invincible.contains(((Player) entity).getName())) {
+			if (Commands.invincible.contains(entity.getName())) {
 				return;
 			} else if (GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation())) {
 				return;
diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
index f3408e79..49806a1e 100644
--- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
+++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
@@ -1516,6 +1516,7 @@ public class ConfigManager {
 			config.addDefault("Abilities.Chi.Smokescreen.Cooldown", 25000);
 			config.addDefault("Abilities.Chi.Smokescreen.Radius", 4);
 			config.addDefault("Abilities.Chi.Smokescreen.Duration", 12);
+			config.addDefault("Abilities.Chi.Smokescreen.ParticleAmount", 5);
 
 			config.addDefault("Abilities.Chi.WarriorStance.Enabled", true);
 			config.addDefault("Abilities.Chi.WarriorStance.Cooldown", 0);