Feature missile

editor/js/component.js

@@ -193,7 +193,8 @@ var Mechanic = {
  WARP_SWAP: { name: 'Warp Swap', container: false, construct: MechanicWarpSwap },
  WARP_TARGET: { name: 'Warp Target', container: false, construct: MechanicWarpTarget },
  WARP_VALUE: { name: 'Warp Value', container: false, construct: MechanicWarpValue },
- WOLF: { name: 'Wolf', container: true, construct: MechanicWolf }
+ WOLF: { name: 'Wolf', container: true, construct: MechanicWolf },
+ SET_GLOW: { name: 'Set Glow', container: false, construct: MechanicSetGlow }
 };
 
 var saveIndex;
@@ -2504,6 +2505,9 @@ function MechanicParticleProjectile()
  .setTooltip('How long in seconds before the projectile will expire in case it doesn\'t hit anything')
  );
 
+ //Add missile options (homing projectile)
+ addMissileOptions(this, true);
+
  addEffectOptions(this, true);
 }
 
@@ -3239,6 +3243,21 @@ function MechanicWolf()
  );
 }
 
+extend('MechanicSetGlow', 'Component');
+function MechanicSetGlow()
+{
+ this.super('Set Glow', Type.MECHANIC, false);
+
+ this.description = 'glow target with color (only caster can see it)';
+
+ this.data.push(new ListValue('Glow Color', 'color', getGlowColors(), 'White')
+ .setTooltip('The color of glowing')
+ );
+ this.data.push(new AttributeValue('Duration', 'seconds', 10, 0)
+ .setTooltip('How long should it glow for')
+ );
+}
+
 // The active component being edited or added to
 var activeComponent = undefined;
 
@@ -3391,7 +3410,29 @@ function addParticleOptions(component) {
  component.data.push(new DoubleValue('Speed', 'speed', 0.1).setTooltip('Speed of the particle. For some particles controls other parameters, such as size.')
  );
 }
+function addMissileOptions(component, optional)
+{
+ var opt = appendNone;
+ if(optional){
+ opt = appendMissileOptional;
+ component.data.push(new ListValue('Use Missile', 'use-missile', [ 'True', 'False' ], 'False')
+ .setTooltip('Whether or not to use the missile (homing projectile)..')
+ );
+ }
 
+ component.data.push(opt(new StringValue('Missile Target', 'missile_target', "none")
+ .setTooltip('The target you would like to home at'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Threshold', 'missile_threshold', 3)
+ .setTooltip('The threshold of the missile'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Angle', 'missile_angle', 3)
+ .setTooltip('The angle of the missile will turn'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Delay', 'missile_delay', 0)
+ .setTooltip('The delay before auto homing the target'))
+ );
+}
 function addEffectOptions(component, optional)
 {
  var opt = appendNone;
@@ -3469,6 +3510,11 @@ function appendOptional(value)
  value.requireValue('use-effect', [ 'True' ]);
  return value;
 }
+function appendMissileOptional(value)
+{
+ value.requireValue('use-missile', [ 'True' ]);
+ return value;
+}
 
 function appendNone(value)
 {

editor/js/data/data.js

@@ -66,6 +66,9 @@ function getBadPotions() {
 function getDyes() {
  return DYES;
 }
+function getGlowColors(){
+ return GLOW_COLORS;
+}
 
 const GOOD_POTIONS = [
  "Speed",
@@ -118,4 +121,22 @@ const DYES = [
  'RED',
  'WHITE',
  'YELLOW'
+];
+const GLOW_COLORS = ['BLACK',
+ 'DARK_BLUE',
+ 'DARK_GREEN',
+ 'DARK_AQUA',
+ 'DARK_RED',
+ 'DARK_PURPLE',
+ 'GOLD',
+ 'GRAY',
+ 'DARK_GRAY',
+ 'BLUE',
+ 'GREEN',
+ 'AQUA',
+ 'RED',
+ 'PURPLE',
+ 'YELLOW',
+ 'WHITE',
+ 'NONE'
 ];

pom.xml

@@ -142,9 +142,16 @@
  <dependency>
  <groupId>LibsDisguises</groupId>
  <artifactId>LibsDisguises</artifactId>
- <version>10.0.19</version>
+ <version>10.0.26</version>
  <scope>provided</scope>
  </dependency>
+ <dependency>
+ <groupId>com.github.InventivetalentDev</groupId>
+ <artifactId>GlowAPI</artifactId>
+ <version>1.4.6-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/GlowAPI_v1.4.6-SNAPSHOT.jar</systemPath>
+ </dependency>
  <dependency>
  <groupId>me.clip</groupId>
  <artifactId>placeholderapi</artifactId>

src/main/java/com/sucy/skill/SkillAPI.java

@@ -74,7 +74,7 @@
  * <p>You can retrieve a reference to this through Bukkit the same way as any other plugin.</p>
  */
 public class SkillAPI extends JavaPlugin {
-private static SkillAPI singleton;
+public static SkillAPI singleton;
 
  private final HashMap<String, Skill> skills = new HashMap<>();
  private final HashMap<String, RPGClass> classes = new HashMap<>();

src/main/java/com/sucy/skill/api/projectile/ParticleProjectile.java

@@ -26,6 +26,7 @@
  */
 package com.sucy.skill.api.projectile;
 
+import com.sucy.skill.SkillAPI;
 import com.sucy.skill.api.Settings;
 import com.sucy.skill.api.event.ParticleProjectileExpireEvent;
 import com.sucy.skill.api.event.ParticleProjectileHitEvent;
@@ -34,8 +35,10 @@
 import com.sucy.skill.api.util.ParticleHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
@@ -75,7 +78,12 @@ public class ParticleProjectile extends CustomProjectile
  private int freq;
  private int life;
  private Vector gravity;
- private boolean pierce;
+ private boolean pierce;
+ private Entity missileTarget;
+ private double missileThreshold;
+ private double missileAngle;
+ private double missileDelay;
+ private boolean missileStarted = false;
 
  /**
  * Constructor
@@ -96,10 +104,42 @@ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Setting
  this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
  this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
  this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = null;
+ steps = (int) Math.ceil(vel.length() * 2);
+ vel.multiply(1.0 / steps);
+ gravity.multiply(1.0 / steps);
+ Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
+ }
+ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Settings settings, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
+ {
+ super(shooter);
 
+ this.loc = loc;
+ this.settings = settings;
+ this.vel = loc.getDirection().multiply(settings.getAttr(SPEED, level, 1.0));
+ this.freq = (int) (20 * settings.getDouble(FREQUENCY, 0.5));
+ this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
+ this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
+ this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = missileTarget;
+ this.missileThreshold = missileThreshold;
+ this.missileAngle = missileAngle;
+ this.missileDelay = missileDelay;
  steps = (int) Math.ceil(vel.length() * 2);
  vel.multiply(1.0 / steps);
  gravity.multiply(1.0 / steps);
+ //Missile delay
+ if(missileDelay == 0){
+ missileStarted = true;
+ }else {
+ new BukkitRunnable() {
+
+ @Override
+ public void run() {
+ missileStarted = true;
+ }
+ }.runTaskLater(SkillAPI.singleton, Math.round(missileDelay * 20));
+ }
  Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
  }
 
@@ -224,6 +264,28 @@ public void run()
  cancel();
  Bukkit.getPluginManager().callEvent(new ParticleProjectileExpireEvent(this));
  }
+
+ //Missile
+ if(missileTarget!=null && missileStarted){
+ final Vector vel = getVelocity();
+ final double speed = vel.length();
+ final Vector dir = vel.multiply(1 / speed);
+ final Vector towards = missileTarget.getLocation().toVector().subtract(getLocation().toVector());
+ final Vector targetDir = towards.normalize();
+ final double dot = dir.dot(targetDir);//degree of inaccurate
+ if (dot >= missileThreshold) {
+ setVelocity(targetDir.multiply(speed));
+ } else {
+ Vector currentDir = vel.normalize();
+ Vector sum = currentDir.add(targetDir);
+ Vector newDir = sum.divide(new Vector(2,2,2));
+ Vector normalizedNewDir = newDir.normalize();
+ setVelocity(normalizedNewDir.multiply(speed));
+ //final double m = Math.sin()
+ //baseProjectile.setVelocity(result);
+ }
+
+ }
  }
 
  /**
@@ -240,15 +302,15 @@ public void run()
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  ArrayList<Vector> dirs = calcSpread(center, angle, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Vector dir : dirs)
  {
  Location l = loc.clone();
  l.setDirection(dir);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }
@@ -269,15 +331,15 @@ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int lev
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  Vector vel = new Vector(0, 1, 0);
  ArrayList<Location> locs = calcRain(center, radius, height, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Location l : locs)
  {
  l.setDirection(vel);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }

src/main/java/com/sucy/skill/dynamic/ComponentRegistry.java

@@ -291,5 +291,6 @@ private static void register(final EffectComponent component) {
  register(new WarpTargetMechanic());
  register(new WarpValueMechanic());
  register(new WolfMechanic());
+ register(new SetGlowMechanic());
  }
 }

src/main/java/com/sucy/skill/dynamic/mechanic/ParticleProjectileMechanic.java

@@ -40,6 +40,7 @@
 import com.sucy.skill.cast.IndicatorType;
 import com.sucy.skill.cast.ProjectileIndicator;
 import com.sucy.skill.dynamic.TempEntity;
+import com.sucy.skill.dynamic.target.RememberTarget;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -66,6 +67,13 @@ public class ParticleProjectileMechanic extends MechanicComponent implements Pro
  private static final String UPWARD = "upward";
  private static final String FORWARD = "forward";
 
+ //Missile
+ private static final String MISSILE_TARGET = "missile_target";
+ private static final String MISSILE_THRESHOLD = "missile_threshold";
+ private static final String MISSILE_ANGLE = "missile_angle";
+ private static final String MISSILE_DELAY = "missile_delay";
+
+ //Effect
  private static final String USE_EFFECT = "use-effect";
  private static final String EFFECT_KEY = "effect-key";
 
@@ -144,6 +152,18 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy.set(ParticleProjectile.SPEED, parseValues(caster, ParticleProjectile.SPEED, level, 1), 0);
  copy.set(ParticleHelper.PARTICLES_KEY, parseValues(caster, ParticleHelper.PARTICLES_KEY, level, 1), 0);
  copy.set(ParticleHelper.RADIUS_KEY, parseValues(caster, ParticleHelper.RADIUS_KEY, level, 0), 0);
+ final List<LivingEntity> missileTargets = RememberTarget.remember(caster, settings.getString(MISSILE_TARGET, "_none"));
+
+ LivingEntity missileTarget = null;
+ double missileThreshold = 0;
+ double missileAngle = 0;
+ double missileDelay = 0;
+ if(missileTargets.size() > 0) {
+ missileTarget = missileTargets.get(0);
+ missileThreshold = settings.getDouble(MISSILE_THRESHOLD);
+ missileAngle = settings.getDouble(MISSILE_ANGLE);
+ missileDelay = settings.getDouble(MISSILE_DELAY);
+ }
 
  // Fire from each target
  for (LivingEntity target : targets) {
@@ -154,7 +174,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  if (spread.equals("rain")) {
  double radius = parseValues(caster, RADIUS, level, 2.0);
  double height = parseValues(caster, HEIGHT, level, 8.0);
- list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this);
+ list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this, missileTarget, missileThreshold, missileAngle, missileDelay);
  } else {
  Vector dir = target.getLocation().getDirection();
 
@@ -179,7 +199,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy,
  angle,
  amount,
- this
+ this, missileTarget, missileThreshold, missileAngle, missileDelay
  );
  }
 

editor/js/component.js

@@ -193,7 +193,8 @@ var Mechanic = {
  WARP_SWAP: { name: 'Warp Swap', container: false, construct: MechanicWarpSwap },
  WARP_TARGET: { name: 'Warp Target', container: false, construct: MechanicWarpTarget },
  WARP_VALUE: { name: 'Warp Value', container: false, construct: MechanicWarpValue },
- WOLF: { name: 'Wolf', container: true, construct: MechanicWolf }
+ WOLF: { name: 'Wolf', container: true, construct: MechanicWolf },
+ SET_GLOW: { name: 'Set Glow', container: false, construct: MechanicSetGlow }
 };
 
 var saveIndex;
@@ -2504,6 +2505,9 @@ function MechanicParticleProjectile()
  .setTooltip('How long in seconds before the projectile will expire in case it doesn\'t hit anything')
  );
 
+ //Add missile options (homing projectile)
+ addMissileOptions(this, true);
+
  addEffectOptions(this, true);
 }
 
@@ -3239,6 +3243,21 @@ function MechanicWolf()
  );
 }
 
+extend('MechanicSetGlow', 'Component');
+function MechanicSetGlow()
+{
+ this.super('Set Glow', Type.MECHANIC, false);
+
+ this.description = 'glow target with color (only caster can see it)';
+
+ this.data.push(new ListValue('Glow Color', 'color', getGlowColors(), 'White')
+ .setTooltip('The color of glowing')
+ );
+ this.data.push(new AttributeValue('Duration', 'seconds', 10, 0)
+ .setTooltip('How long should it glow for')
+ );
+}
+
 // The active component being edited or added to
 var activeComponent = undefined;
 
@@ -3391,7 +3410,29 @@ function addParticleOptions(component) {
  component.data.push(new DoubleValue('Speed', 'speed', 0.1).setTooltip('Speed of the particle. For some particles controls other parameters, such as size.')
  );
 }
+function addMissileOptions(component, optional)
+{
+ var opt = appendNone;
+ if(optional){
+ opt = appendMissileOptional;
+ component.data.push(new ListValue('Use Missile', 'use-missile', [ 'True', 'False' ], 'False')
+ .setTooltip('Whether or not to use the missile (homing projectile)..')
+ );
+ }
 
+ component.data.push(opt(new StringValue('Missile Target', 'missile_target', "none")
+ .setTooltip('The target you would like to home at'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Threshold', 'missile_threshold', 3)
+ .setTooltip('The threshold of the missile'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Angle', 'missile_angle', 3)
+ .setTooltip('The angle of the missile will turn'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Delay', 'missile_delay', 0)
+ .setTooltip('The delay before auto homing the target'))
+ );
+}
 function addEffectOptions(component, optional)
 {
  var opt = appendNone;
@@ -3469,6 +3510,11 @@ function appendOptional(value)
  value.requireValue('use-effect', [ 'True' ]);
  return value;
 }
+function appendMissileOptional(value)
+{
+ value.requireValue('use-missile', [ 'True' ]);
+ return value;
+}
 
 function appendNone(value)
 {

editor/js/data/data.js

@@ -66,6 +66,9 @@ function getBadPotions() {
 function getDyes() {
  return DYES;
 }
+function getGlowColors(){
+ return GLOW_COLORS;
+}
 
 const GOOD_POTIONS = [
  "Speed",
@@ -118,4 +121,22 @@ const DYES = [
  'RED',
  'WHITE',
  'YELLOW'
+];
+const GLOW_COLORS = ['BLACK',
+ 'DARK_BLUE',
+ 'DARK_GREEN',
+ 'DARK_AQUA',
+ 'DARK_RED',
+ 'DARK_PURPLE',
+ 'GOLD',
+ 'GRAY',
+ 'DARK_GRAY',
+ 'BLUE',
+ 'GREEN',
+ 'AQUA',
+ 'RED',
+ 'PURPLE',
+ 'YELLOW',
+ 'WHITE',
+ 'NONE'
 ];

pom.xml

@@ -142,9 +142,16 @@
  <dependency>
  <groupId>LibsDisguises</groupId>
  <artifactId>LibsDisguises</artifactId>
- <version>10.0.19</version>
+ <version>10.0.26</version>
  <scope>provided</scope>
  </dependency>
+ <dependency>
+ <groupId>com.github.InventivetalentDev</groupId>
+ <artifactId>GlowAPI</artifactId>
+ <version>1.4.6-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/GlowAPI_v1.4.6-SNAPSHOT.jar</systemPath>
+ </dependency>
  <dependency>
  <groupId>me.clip</groupId>
  <artifactId>placeholderapi</artifactId>

src/main/java/com/sucy/skill/SkillAPI.java

@@ -74,7 +74,7 @@
  * <p>You can retrieve a reference to this through Bukkit the same way as any other plugin.</p>
  */
 public class SkillAPI extends JavaPlugin {
-private static SkillAPI singleton;
+public static SkillAPI singleton;
 
  private final HashMap<String, Skill> skills = new HashMap<>();
  private final HashMap<String, RPGClass> classes = new HashMap<>();

src/main/java/com/sucy/skill/api/projectile/ParticleProjectile.java

@@ -26,6 +26,7 @@
  */
 package com.sucy.skill.api.projectile;
 
+import com.sucy.skill.SkillAPI;
 import com.sucy.skill.api.Settings;
 import com.sucy.skill.api.event.ParticleProjectileExpireEvent;
 import com.sucy.skill.api.event.ParticleProjectileHitEvent;
@@ -34,8 +35,10 @@
 import com.sucy.skill.api.util.ParticleHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
@@ -75,7 +78,12 @@ public class ParticleProjectile extends CustomProjectile
  private int freq;
  private int life;
  private Vector gravity;
- private boolean pierce;
+ private boolean pierce;
+ private Entity missileTarget;
+ private double missileThreshold;
+ private double missileAngle;
+ private double missileDelay;
+ private boolean missileStarted = false;
 
  /**
  * Constructor
@@ -96,10 +104,42 @@ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Setting
  this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
  this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
  this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = null;
+ steps = (int) Math.ceil(vel.length() * 2);
+ vel.multiply(1.0 / steps);
+ gravity.multiply(1.0 / steps);
+ Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
+ }
+ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Settings settings, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
+ {
+ super(shooter);
 
+ this.loc = loc;
+ this.settings = settings;
+ this.vel = loc.getDirection().multiply(settings.getAttr(SPEED, level, 1.0));
+ this.freq = (int) (20 * settings.getDouble(FREQUENCY, 0.5));
+ this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
+ this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
+ this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = missileTarget;
+ this.missileThreshold = missileThreshold;
+ this.missileAngle = missileAngle;
+ this.missileDelay = missileDelay;
  steps = (int) Math.ceil(vel.length() * 2);
  vel.multiply(1.0 / steps);
  gravity.multiply(1.0 / steps);
+ //Missile delay
+ if(missileDelay == 0){
+ missileStarted = true;
+ }else {
+ new BukkitRunnable() {
+
+ @Override
+ public void run() {
+ missileStarted = true;
+ }
+ }.runTaskLater(SkillAPI.singleton, Math.round(missileDelay * 20));
+ }
  Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
  }
 
@@ -224,6 +264,28 @@ public void run()
  cancel();
  Bukkit.getPluginManager().callEvent(new ParticleProjectileExpireEvent(this));
  }
+
+ //Missile
+ if(missileTarget!=null && missileStarted){
+ final Vector vel = getVelocity();
+ final double speed = vel.length();
+ final Vector dir = vel.multiply(1 / speed);
+ final Vector towards = missileTarget.getLocation().toVector().subtract(getLocation().toVector());
+ final Vector targetDir = towards.normalize();
+ final double dot = dir.dot(targetDir);//degree of inaccurate
+ if (dot >= missileThreshold) {
+ setVelocity(targetDir.multiply(speed));
+ } else {
+ Vector currentDir = vel.normalize();
+ Vector sum = currentDir.add(targetDir);
+ Vector newDir = sum.divide(new Vector(2,2,2));
+ Vector normalizedNewDir = newDir.normalize();
+ setVelocity(normalizedNewDir.multiply(speed));
+ //final double m = Math.sin()
+ //baseProjectile.setVelocity(result);
+ }
+
+ }
  }
 
  /**
@@ -240,15 +302,15 @@ public void run()
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  ArrayList<Vector> dirs = calcSpread(center, angle, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Vector dir : dirs)
  {
  Location l = loc.clone();
  l.setDirection(dir);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }
@@ -269,15 +331,15 @@ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int lev
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  Vector vel = new Vector(0, 1, 0);
  ArrayList<Location> locs = calcRain(center, radius, height, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Location l : locs)
  {
  l.setDirection(vel);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }

src/main/java/com/sucy/skill/dynamic/ComponentRegistry.java

@@ -291,5 +291,6 @@ private static void register(final EffectComponent component) {
  register(new WarpTargetMechanic());
  register(new WarpValueMechanic());
  register(new WolfMechanic());
+ register(new SetGlowMechanic());
  }
 }

src/main/java/com/sucy/skill/dynamic/mechanic/ParticleProjectileMechanic.java

@@ -40,6 +40,7 @@
 import com.sucy.skill.cast.IndicatorType;
 import com.sucy.skill.cast.ProjectileIndicator;
 import com.sucy.skill.dynamic.TempEntity;
+import com.sucy.skill.dynamic.target.RememberTarget;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -66,6 +67,13 @@ public class ParticleProjectileMechanic extends MechanicComponent implements Pro
  private static final String UPWARD = "upward";
  private static final String FORWARD = "forward";
 
+ //Missile
+ private static final String MISSILE_TARGET = "missile_target";
+ private static final String MISSILE_THRESHOLD = "missile_threshold";
+ private static final String MISSILE_ANGLE = "missile_angle";
+ private static final String MISSILE_DELAY = "missile_delay";
+
+ //Effect
  private static final String USE_EFFECT = "use-effect";
  private static final String EFFECT_KEY = "effect-key";
 
@@ -144,6 +152,18 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy.set(ParticleProjectile.SPEED, parseValues(caster, ParticleProjectile.SPEED, level, 1), 0);
  copy.set(ParticleHelper.PARTICLES_KEY, parseValues(caster, ParticleHelper.PARTICLES_KEY, level, 1), 0);
  copy.set(ParticleHelper.RADIUS_KEY, parseValues(caster, ParticleHelper.RADIUS_KEY, level, 0), 0);
+ final List<LivingEntity> missileTargets = RememberTarget.remember(caster, settings.getString(MISSILE_TARGET, "_none"));
+
+ LivingEntity missileTarget = null;
+ double missileThreshold = 0;
+ double missileAngle = 0;
+ double missileDelay = 0;
+ if(missileTargets.size() > 0) {
+ missileTarget = missileTargets.get(0);
+ missileThreshold = settings.getDouble(MISSILE_THRESHOLD);
+ missileAngle = settings.getDouble(MISSILE_ANGLE);
+ missileDelay = settings.getDouble(MISSILE_DELAY);
+ }
 
  // Fire from each target
  for (LivingEntity target : targets) {
@@ -154,7 +174,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  if (spread.equals("rain")) {
  double radius = parseValues(caster, RADIUS, level, 2.0);
  double height = parseValues(caster, HEIGHT, level, 8.0);
- list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this);
+ list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this, missileTarget, missileThreshold, missileAngle, missileDelay);
  } else {
  Vector dir = target.getLocation().getDirection();
 
@@ -179,7 +199,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy,
  angle,
  amount,
- this
+ this, missileTarget, missileThreshold, missileAngle, missileDelay
  );
  }
 

editor/js/component.js

@@ -193,7 +193,8 @@ var Mechanic = {
  WARP_SWAP: { name: 'Warp Swap', container: false, construct: MechanicWarpSwap },
  WARP_TARGET: { name: 'Warp Target', container: false, construct: MechanicWarpTarget },
  WARP_VALUE: { name: 'Warp Value', container: false, construct: MechanicWarpValue },
- WOLF: { name: 'Wolf', container: true, construct: MechanicWolf }
+ WOLF: { name: 'Wolf', container: true, construct: MechanicWolf },
+ SET_GLOW: { name: 'Set Glow', container: false, construct: MechanicSetGlow }
 };
 
 var saveIndex;
@@ -2504,6 +2505,9 @@ function MechanicParticleProjectile()
  .setTooltip('How long in seconds before the projectile will expire in case it doesn\'t hit anything')
  );
 
+ //Add missile options (homing projectile)
+ addMissileOptions(this, true);
+
  addEffectOptions(this, true);
 }
 
@@ -3239,6 +3243,21 @@ function MechanicWolf()
  );
 }
 
+extend('MechanicSetGlow', 'Component');
+function MechanicSetGlow()
+{
+ this.super('Set Glow', Type.MECHANIC, false);
+
+ this.description = 'glow target with color (only caster can see it)';
+
+ this.data.push(new ListValue('Glow Color', 'color', getGlowColors(), 'White')
+ .setTooltip('The color of glowing')
+ );
+ this.data.push(new AttributeValue('Duration', 'seconds', 10, 0)
+ .setTooltip('How long should it glow for')
+ );
+}
+
 // The active component being edited or added to
 var activeComponent = undefined;
 
@@ -3391,7 +3410,29 @@ function addParticleOptions(component) {
  component.data.push(new DoubleValue('Speed', 'speed', 0.1).setTooltip('Speed of the particle. For some particles controls other parameters, such as size.')
  );
 }
+function addMissileOptions(component, optional)
+{
+ var opt = appendNone;
+ if(optional){
+ opt = appendMissileOptional;
+ component.data.push(new ListValue('Use Missile', 'use-missile', [ 'True', 'False' ], 'False')
+ .setTooltip('Whether or not to use the missile (homing projectile)..')
+ );
+ }
 
+ component.data.push(opt(new StringValue('Missile Target', 'missile_target', "none")
+ .setTooltip('The target you would like to home at'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Threshold', 'missile_threshold', 3)
+ .setTooltip('The threshold of the missile'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Angle', 'missile_angle', 3)
+ .setTooltip('The angle of the missile will turn'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Delay', 'missile_delay', 0)
+ .setTooltip('The delay before auto homing the target'))
+ );
+}
 function addEffectOptions(component, optional)
 {
  var opt = appendNone;
@@ -3469,6 +3510,11 @@ function appendOptional(value)
  value.requireValue('use-effect', [ 'True' ]);
  return value;
 }
+function appendMissileOptional(value)
+{
+ value.requireValue('use-missile', [ 'True' ]);
+ return value;
+}
 
 function appendNone(value)
 {

editor/js/data/data.js

@@ -66,6 +66,9 @@ function getBadPotions() {
 function getDyes() {
  return DYES;
 }
+function getGlowColors(){
+ return GLOW_COLORS;
+}
 
 const GOOD_POTIONS = [
  "Speed",
@@ -118,4 +121,22 @@ const DYES = [
  'RED',
  'WHITE',
  'YELLOW'
+];
+const GLOW_COLORS = ['BLACK',
+ 'DARK_BLUE',
+ 'DARK_GREEN',
+ 'DARK_AQUA',
+ 'DARK_RED',
+ 'DARK_PURPLE',
+ 'GOLD',
+ 'GRAY',
+ 'DARK_GRAY',
+ 'BLUE',
+ 'GREEN',
+ 'AQUA',
+ 'RED',
+ 'PURPLE',
+ 'YELLOW',
+ 'WHITE',
+ 'NONE'
 ];

pom.xml

@@ -142,9 +142,16 @@
  <dependency>
  <groupId>LibsDisguises</groupId>
  <artifactId>LibsDisguises</artifactId>
- <version>10.0.19</version>
+ <version>10.0.26</version>
  <scope>provided</scope>
  </dependency>
+ <dependency>
+ <groupId>com.github.InventivetalentDev</groupId>
+ <artifactId>GlowAPI</artifactId>
+ <version>1.4.6-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/GlowAPI_v1.4.6-SNAPSHOT.jar</systemPath>
+ </dependency>
  <dependency>
  <groupId>me.clip</groupId>
  <artifactId>placeholderapi</artifactId>

src/main/java/com/sucy/skill/SkillAPI.java

@@ -74,7 +74,7 @@
  * <p>You can retrieve a reference to this through Bukkit the same way as any other plugin.</p>
  */
 public class SkillAPI extends JavaPlugin {
-private static SkillAPI singleton;
+public static SkillAPI singleton;
 
  private final HashMap<String, Skill> skills = new HashMap<>();
  private final HashMap<String, RPGClass> classes = new HashMap<>();

src/main/java/com/sucy/skill/api/projectile/ParticleProjectile.java

@@ -26,6 +26,7 @@
  */
 package com.sucy.skill.api.projectile;
 
+import com.sucy.skill.SkillAPI;
 import com.sucy.skill.api.Settings;
 import com.sucy.skill.api.event.ParticleProjectileExpireEvent;
 import com.sucy.skill.api.event.ParticleProjectileHitEvent;
@@ -34,8 +35,10 @@
 import com.sucy.skill.api.util.ParticleHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
@@ -75,7 +78,12 @@ public class ParticleProjectile extends CustomProjectile
  private int freq;
  private int life;
  private Vector gravity;
- private boolean pierce;
+ private boolean pierce;
+ private Entity missileTarget;
+ private double missileThreshold;
+ private double missileAngle;
+ private double missileDelay;
+ private boolean missileStarted = false;
 
  /**
  * Constructor
@@ -96,10 +104,42 @@ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Setting
  this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
  this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
  this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = null;
+ steps = (int) Math.ceil(vel.length() * 2);
+ vel.multiply(1.0 / steps);
+ gravity.multiply(1.0 / steps);
+ Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
+ }
+ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Settings settings, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
+ {
+ super(shooter);
 
+ this.loc = loc;
+ this.settings = settings;
+ this.vel = loc.getDirection().multiply(settings.getAttr(SPEED, level, 1.0));
+ this.freq = (int) (20 * settings.getDouble(FREQUENCY, 0.5));
+ this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
+ this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
+ this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = missileTarget;
+ this.missileThreshold = missileThreshold;
+ this.missileAngle = missileAngle;
+ this.missileDelay = missileDelay;
  steps = (int) Math.ceil(vel.length() * 2);
  vel.multiply(1.0 / steps);
  gravity.multiply(1.0 / steps);
+ //Missile delay
+ if(missileDelay == 0){
+ missileStarted = true;
+ }else {
+ new BukkitRunnable() {
+
+ @Override
+ public void run() {
+ missileStarted = true;
+ }
+ }.runTaskLater(SkillAPI.singleton, Math.round(missileDelay * 20));
+ }
  Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
  }
 
@@ -224,6 +264,28 @@ public void run()
  cancel();
  Bukkit.getPluginManager().callEvent(new ParticleProjectileExpireEvent(this));
  }
+
+ //Missile
+ if(missileTarget!=null && missileStarted){
+ final Vector vel = getVelocity();
+ final double speed = vel.length();
+ final Vector dir = vel.multiply(1 / speed);
+ final Vector towards = missileTarget.getLocation().toVector().subtract(getLocation().toVector());
+ final Vector targetDir = towards.normalize();
+ final double dot = dir.dot(targetDir);//degree of inaccurate
+ if (dot >= missileThreshold) {
+ setVelocity(targetDir.multiply(speed));
+ } else {
+ Vector currentDir = vel.normalize();
+ Vector sum = currentDir.add(targetDir);
+ Vector newDir = sum.divide(new Vector(2,2,2));
+ Vector normalizedNewDir = newDir.normalize();
+ setVelocity(normalizedNewDir.multiply(speed));
+ //final double m = Math.sin()
+ //baseProjectile.setVelocity(result);
+ }
+
+ }
  }
 
  /**
@@ -240,15 +302,15 @@ public void run()
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  ArrayList<Vector> dirs = calcSpread(center, angle, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Vector dir : dirs)
  {
  Location l = loc.clone();
  l.setDirection(dir);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }
@@ -269,15 +331,15 @@ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int lev
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  Vector vel = new Vector(0, 1, 0);
  ArrayList<Location> locs = calcRain(center, radius, height, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Location l : locs)
  {
  l.setDirection(vel);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }

src/main/java/com/sucy/skill/dynamic/ComponentRegistry.java

@@ -291,5 +291,6 @@ private static void register(final EffectComponent component) {
  register(new WarpTargetMechanic());
  register(new WarpValueMechanic());
  register(new WolfMechanic());
+ register(new SetGlowMechanic());
  }
 }

src/main/java/com/sucy/skill/dynamic/mechanic/ParticleProjectileMechanic.java

@@ -40,6 +40,7 @@
 import com.sucy.skill.cast.IndicatorType;
 import com.sucy.skill.cast.ProjectileIndicator;
 import com.sucy.skill.dynamic.TempEntity;
+import com.sucy.skill.dynamic.target.RememberTarget;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -66,6 +67,13 @@ public class ParticleProjectileMechanic extends MechanicComponent implements Pro
  private static final String UPWARD = "upward";
  private static final String FORWARD = "forward";
 
+ //Missile
+ private static final String MISSILE_TARGET = "missile_target";
+ private static final String MISSILE_THRESHOLD = "missile_threshold";
+ private static final String MISSILE_ANGLE = "missile_angle";
+ private static final String MISSILE_DELAY = "missile_delay";
+
+ //Effect
  private static final String USE_EFFECT = "use-effect";
  private static final String EFFECT_KEY = "effect-key";
 
@@ -144,6 +152,18 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy.set(ParticleProjectile.SPEED, parseValues(caster, ParticleProjectile.SPEED, level, 1), 0);
  copy.set(ParticleHelper.PARTICLES_KEY, parseValues(caster, ParticleHelper.PARTICLES_KEY, level, 1), 0);
  copy.set(ParticleHelper.RADIUS_KEY, parseValues(caster, ParticleHelper.RADIUS_KEY, level, 0), 0);
+ final List<LivingEntity> missileTargets = RememberTarget.remember(caster, settings.getString(MISSILE_TARGET, "_none"));
+
+ LivingEntity missileTarget = null;
+ double missileThreshold = 0;
+ double missileAngle = 0;
+ double missileDelay = 0;
+ if(missileTargets.size() > 0) {
+ missileTarget = missileTargets.get(0);
+ missileThreshold = settings.getDouble(MISSILE_THRESHOLD);
+ missileAngle = settings.getDouble(MISSILE_ANGLE);
+ missileDelay = settings.getDouble(MISSILE_DELAY);
+ }
 
  // Fire from each target
  for (LivingEntity target : targets) {
@@ -154,7 +174,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  if (spread.equals("rain")) {
  double radius = parseValues(caster, RADIUS, level, 2.0);
  double height = parseValues(caster, HEIGHT, level, 8.0);
- list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this);
+ list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this, missileTarget, missileThreshold, missileAngle, missileDelay);
  } else {
  Vector dir = target.getLocation().getDirection();
 
@@ -179,7 +199,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy,
  angle,
  amount,
- this
+ this, missileTarget, missileThreshold, missileAngle, missileDelay
  );
  }
 

editor/js/component.js

@@ -193,7 +193,8 @@ var Mechanic = {
  WARP_SWAP: { name: 'Warp Swap', container: false, construct: MechanicWarpSwap },
  WARP_TARGET: { name: 'Warp Target', container: false, construct: MechanicWarpTarget },
  WARP_VALUE: { name: 'Warp Value', container: false, construct: MechanicWarpValue },
- WOLF: { name: 'Wolf', container: true, construct: MechanicWolf }
+ WOLF: { name: 'Wolf', container: true, construct: MechanicWolf },
+ SET_GLOW: { name: 'Set Glow', container: false, construct: MechanicSetGlow }
 };
 
 var saveIndex;
@@ -2504,6 +2505,9 @@ function MechanicParticleProjectile()
  .setTooltip('How long in seconds before the projectile will expire in case it doesn\'t hit anything')
  );
 
+ //Add missile options (homing projectile)
+ addMissileOptions(this, true);
+
  addEffectOptions(this, true);
 }
 
@@ -3239,6 +3243,21 @@ function MechanicWolf()
  );
 }
 
+extend('MechanicSetGlow', 'Component');
+function MechanicSetGlow()
+{
+ this.super('Set Glow', Type.MECHANIC, false);
+
+ this.description = 'glow target with color (only caster can see it)';
+
+ this.data.push(new ListValue('Glow Color', 'color', getGlowColors(), 'White')
+ .setTooltip('The color of glowing')
+ );
+ this.data.push(new AttributeValue('Duration', 'seconds', 10, 0)
+ .setTooltip('How long should it glow for')
+ );
+}
+
 // The active component being edited or added to
 var activeComponent = undefined;
 
@@ -3391,7 +3410,29 @@ function addParticleOptions(component) {
  component.data.push(new DoubleValue('Speed', 'speed', 0.1).setTooltip('Speed of the particle. For some particles controls other parameters, such as size.')
  );
 }
+function addMissileOptions(component, optional)
+{
+ var opt = appendNone;
+ if(optional){
+ opt = appendMissileOptional;
+ component.data.push(new ListValue('Use Missile', 'use-missile', [ 'True', 'False' ], 'False')
+ .setTooltip('Whether or not to use the missile (homing projectile)..')
+ );
+ }
 
+ component.data.push(opt(new StringValue('Missile Target', 'missile_target', "none")
+ .setTooltip('The target you would like to home at'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Threshold', 'missile_threshold', 3)
+ .setTooltip('The threshold of the missile'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Angle', 'missile_angle', 3)
+ .setTooltip('The angle of the missile will turn'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Delay', 'missile_delay', 0)
+ .setTooltip('The delay before auto homing the target'))
+ );
+}
 function addEffectOptions(component, optional)
 {
  var opt = appendNone;
@@ -3469,6 +3510,11 @@ function appendOptional(value)
  value.requireValue('use-effect', [ 'True' ]);
  return value;
 }
+function appendMissileOptional(value)
+{
+ value.requireValue('use-missile', [ 'True' ]);
+ return value;
+}
 
 function appendNone(value)
 {

editor/js/data/data.js

@@ -66,6 +66,9 @@ function getBadPotions() {
 function getDyes() {
  return DYES;
 }
+function getGlowColors(){
+ return GLOW_COLORS;
+}
 
 const GOOD_POTIONS = [
  "Speed",
@@ -118,4 +121,22 @@ const DYES = [
  'RED',
  'WHITE',
  'YELLOW'
+];
+const GLOW_COLORS = ['BLACK',
+ 'DARK_BLUE',
+ 'DARK_GREEN',
+ 'DARK_AQUA',
+ 'DARK_RED',
+ 'DARK_PURPLE',
+ 'GOLD',
+ 'GRAY',
+ 'DARK_GRAY',
+ 'BLUE',
+ 'GREEN',
+ 'AQUA',
+ 'RED',
+ 'PURPLE',
+ 'YELLOW',
+ 'WHITE',
+ 'NONE'
 ];

pom.xml

@@ -142,9 +142,16 @@
  <dependency>
  <groupId>LibsDisguises</groupId>
  <artifactId>LibsDisguises</artifactId>
- <version>10.0.19</version>
+ <version>10.0.26</version>
  <scope>provided</scope>
  </dependency>
+ <dependency>
+ <groupId>com.github.InventivetalentDev</groupId>
+ <artifactId>GlowAPI</artifactId>
+ <version>1.4.6-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/GlowAPI_v1.4.6-SNAPSHOT.jar</systemPath>
+ </dependency>
  <dependency>
  <groupId>me.clip</groupId>
  <artifactId>placeholderapi</artifactId>

src/main/java/com/sucy/skill/SkillAPI.java

@@ -74,7 +74,7 @@
  * <p>You can retrieve a reference to this through Bukkit the same way as any other plugin.</p>
  */
 public class SkillAPI extends JavaPlugin {
-private static SkillAPI singleton;
+public static SkillAPI singleton;
 
  private final HashMap<String, Skill> skills = new HashMap<>();
  private final HashMap<String, RPGClass> classes = new HashMap<>();

src/main/java/com/sucy/skill/api/projectile/ParticleProjectile.java

@@ -26,6 +26,7 @@
  */
 package com.sucy.skill.api.projectile;
 
+import com.sucy.skill.SkillAPI;
 import com.sucy.skill.api.Settings;
 import com.sucy.skill.api.event.ParticleProjectileExpireEvent;
 import com.sucy.skill.api.event.ParticleProjectileHitEvent;
@@ -34,8 +35,10 @@
 import com.sucy.skill.api.util.ParticleHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
@@ -75,7 +78,12 @@ public class ParticleProjectile extends CustomProjectile
  private int freq;
  private int life;
  private Vector gravity;
- private boolean pierce;
+ private boolean pierce;
+ private Entity missileTarget;
+ private double missileThreshold;
+ private double missileAngle;
+ private double missileDelay;
+ private boolean missileStarted = false;
 
  /**
  * Constructor
@@ -96,10 +104,42 @@ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Setting
  this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
  this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
  this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = null;
+ steps = (int) Math.ceil(vel.length() * 2);
+ vel.multiply(1.0 / steps);
+ gravity.multiply(1.0 / steps);
+ Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
+ }
+ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Settings settings, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
+ {
+ super(shooter);
 
+ this.loc = loc;
+ this.settings = settings;
+ this.vel = loc.getDirection().multiply(settings.getAttr(SPEED, level, 1.0));
+ this.freq = (int) (20 * settings.getDouble(FREQUENCY, 0.5));
+ this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
+ this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
+ this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = missileTarget;
+ this.missileThreshold = missileThreshold;
+ this.missileAngle = missileAngle;
+ this.missileDelay = missileDelay;
  steps = (int) Math.ceil(vel.length() * 2);
  vel.multiply(1.0 / steps);
  gravity.multiply(1.0 / steps);
+ //Missile delay
+ if(missileDelay == 0){
+ missileStarted = true;
+ }else {
+ new BukkitRunnable() {
+
+ @Override
+ public void run() {
+ missileStarted = true;
+ }
+ }.runTaskLater(SkillAPI.singleton, Math.round(missileDelay * 20));
+ }
  Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
  }
 
@@ -224,6 +264,28 @@ public void run()
  cancel();
  Bukkit.getPluginManager().callEvent(new ParticleProjectileExpireEvent(this));
  }
+
+ //Missile
+ if(missileTarget!=null && missileStarted){
+ final Vector vel = getVelocity();
+ final double speed = vel.length();
+ final Vector dir = vel.multiply(1 / speed);
+ final Vector towards = missileTarget.getLocation().toVector().subtract(getLocation().toVector());
+ final Vector targetDir = towards.normalize();
+ final double dot = dir.dot(targetDir);//degree of inaccurate
+ if (dot >= missileThreshold) {
+ setVelocity(targetDir.multiply(speed));
+ } else {
+ Vector currentDir = vel.normalize();
+ Vector sum = currentDir.add(targetDir);
+ Vector newDir = sum.divide(new Vector(2,2,2));
+ Vector normalizedNewDir = newDir.normalize();
+ setVelocity(normalizedNewDir.multiply(speed));
+ //final double m = Math.sin()
+ //baseProjectile.setVelocity(result);
+ }
+
+ }
  }
 
  /**
@@ -240,15 +302,15 @@ public void run()
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  ArrayList<Vector> dirs = calcSpread(center, angle, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Vector dir : dirs)
  {
  Location l = loc.clone();
  l.setDirection(dir);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }
@@ -269,15 +331,15 @@ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int lev
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  Vector vel = new Vector(0, 1, 0);
  ArrayList<Location> locs = calcRain(center, radius, height, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Location l : locs)
  {
  l.setDirection(vel);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }

src/main/java/com/sucy/skill/dynamic/ComponentRegistry.java

@@ -291,5 +291,6 @@ private static void register(final EffectComponent component) {
  register(new WarpTargetMechanic());
  register(new WarpValueMechanic());
  register(new WolfMechanic());
+ register(new SetGlowMechanic());
  }
 }

src/main/java/com/sucy/skill/dynamic/mechanic/ParticleProjectileMechanic.java

@@ -40,6 +40,7 @@
 import com.sucy.skill.cast.IndicatorType;
 import com.sucy.skill.cast.ProjectileIndicator;
 import com.sucy.skill.dynamic.TempEntity;
+import com.sucy.skill.dynamic.target.RememberTarget;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -66,6 +67,13 @@ public class ParticleProjectileMechanic extends MechanicComponent implements Pro
  private static final String UPWARD = "upward";
  private static final String FORWARD = "forward";
 
+ //Missile
+ private static final String MISSILE_TARGET = "missile_target";
+ private static final String MISSILE_THRESHOLD = "missile_threshold";
+ private static final String MISSILE_ANGLE = "missile_angle";
+ private static final String MISSILE_DELAY = "missile_delay";
+
+ //Effect
  private static final String USE_EFFECT = "use-effect";
  private static final String EFFECT_KEY = "effect-key";
 
@@ -144,6 +152,18 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy.set(ParticleProjectile.SPEED, parseValues(caster, ParticleProjectile.SPEED, level, 1), 0);
  copy.set(ParticleHelper.PARTICLES_KEY, parseValues(caster, ParticleHelper.PARTICLES_KEY, level, 1), 0);
  copy.set(ParticleHelper.RADIUS_KEY, parseValues(caster, ParticleHelper.RADIUS_KEY, level, 0), 0);
+ final List<LivingEntity> missileTargets = RememberTarget.remember(caster, settings.getString(MISSILE_TARGET, "_none"));
+
+ LivingEntity missileTarget = null;
+ double missileThreshold = 0;
+ double missileAngle = 0;
+ double missileDelay = 0;
+ if(missileTargets.size() > 0) {
+ missileTarget = missileTargets.get(0);
+ missileThreshold = settings.getDouble(MISSILE_THRESHOLD);
+ missileAngle = settings.getDouble(MISSILE_ANGLE);
+ missileDelay = settings.getDouble(MISSILE_DELAY);
+ }
 
  // Fire from each target
  for (LivingEntity target : targets) {
@@ -154,7 +174,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  if (spread.equals("rain")) {
  double radius = parseValues(caster, RADIUS, level, 2.0);
  double height = parseValues(caster, HEIGHT, level, 8.0);
- list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this);
+ list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this, missileTarget, missileThreshold, missileAngle, missileDelay);
  } else {
  Vector dir = target.getLocation().getDirection();
 
@@ -179,7 +199,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy,
  angle,
  amount,
- this
+ this, missileTarget, missileThreshold, missileAngle, missileDelay
  );
  }
 

editor/js/component.js

@@ -193,7 +193,8 @@ var Mechanic = {
  WARP_SWAP: { name: 'Warp Swap', container: false, construct: MechanicWarpSwap },
  WARP_TARGET: { name: 'Warp Target', container: false, construct: MechanicWarpTarget },
  WARP_VALUE: { name: 'Warp Value', container: false, construct: MechanicWarpValue },
- WOLF: { name: 'Wolf', container: true, construct: MechanicWolf }
+ WOLF: { name: 'Wolf', container: true, construct: MechanicWolf },
+ SET_GLOW: { name: 'Set Glow', container: false, construct: MechanicSetGlow }
 };
 
 var saveIndex;
@@ -2504,6 +2505,9 @@ function MechanicParticleProjectile()
  .setTooltip('How long in seconds before the projectile will expire in case it doesn\'t hit anything')
  );
 
+ //Add missile options (homing projectile)
+ addMissileOptions(this, true);
+
  addEffectOptions(this, true);
 }
 
@@ -3239,6 +3243,21 @@ function MechanicWolf()
  );
 }
 
+extend('MechanicSetGlow', 'Component');
+function MechanicSetGlow()
+{
+ this.super('Set Glow', Type.MECHANIC, false);
+
+ this.description = 'glow target with color (only caster can see it)';
+
+ this.data.push(new ListValue('Glow Color', 'color', getGlowColors(), 'White')
+ .setTooltip('The color of glowing')
+ );
+ this.data.push(new AttributeValue('Duration', 'seconds', 10, 0)
+ .setTooltip('How long should it glow for')
+ );
+}
+
 // The active component being edited or added to
 var activeComponent = undefined;
 
@@ -3391,7 +3410,29 @@ function addParticleOptions(component) {
  component.data.push(new DoubleValue('Speed', 'speed', 0.1).setTooltip('Speed of the particle. For some particles controls other parameters, such as size.')
  );
 }
+function addMissileOptions(component, optional)
+{
+ var opt = appendNone;
+ if(optional){
+ opt = appendMissileOptional;
+ component.data.push(new ListValue('Use Missile', 'use-missile', [ 'True', 'False' ], 'False')
+ .setTooltip('Whether or not to use the missile (homing projectile)..')
+ );
+ }
 
+ component.data.push(opt(new StringValue('Missile Target', 'missile_target', "none")
+ .setTooltip('The target you would like to home at'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Threshold', 'missile_threshold', 3)
+ .setTooltip('The threshold of the missile'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Angle', 'missile_angle', 3)
+ .setTooltip('The angle of the missile will turn'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Delay', 'missile_delay', 0)
+ .setTooltip('The delay before auto homing the target'))
+ );
+}
 function addEffectOptions(component, optional)
 {
  var opt = appendNone;
@@ -3469,6 +3510,11 @@ function appendOptional(value)
  value.requireValue('use-effect', [ 'True' ]);
  return value;
 }
+function appendMissileOptional(value)
+{
+ value.requireValue('use-missile', [ 'True' ]);
+ return value;
+}
 
 function appendNone(value)
 {

editor/js/data/data.js

@@ -66,6 +66,9 @@ function getBadPotions() {
 function getDyes() {
  return DYES;
 }
+function getGlowColors(){
+ return GLOW_COLORS;
+}
 
 const GOOD_POTIONS = [
  "Speed",
@@ -118,4 +121,22 @@ const DYES = [
  'RED',
  'WHITE',
  'YELLOW'
+];
+const GLOW_COLORS = ['BLACK',
+ 'DARK_BLUE',
+ 'DARK_GREEN',
+ 'DARK_AQUA',
+ 'DARK_RED',
+ 'DARK_PURPLE',
+ 'GOLD',
+ 'GRAY',
+ 'DARK_GRAY',
+ 'BLUE',
+ 'GREEN',
+ 'AQUA',
+ 'RED',
+ 'PURPLE',
+ 'YELLOW',
+ 'WHITE',
+ 'NONE'
 ];

pom.xml

@@ -142,9 +142,16 @@
  <dependency>
  <groupId>LibsDisguises</groupId>
  <artifactId>LibsDisguises</artifactId>
- <version>10.0.19</version>
+ <version>10.0.26</version>
  <scope>provided</scope>
  </dependency>
+ <dependency>
+ <groupId>com.github.InventivetalentDev</groupId>
+ <artifactId>GlowAPI</artifactId>
+ <version>1.4.6-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/GlowAPI_v1.4.6-SNAPSHOT.jar</systemPath>
+ </dependency>
  <dependency>
  <groupId>me.clip</groupId>
  <artifactId>placeholderapi</artifactId>

src/main/java/com/sucy/skill/SkillAPI.java

@@ -74,7 +74,7 @@
  * <p>You can retrieve a reference to this through Bukkit the same way as any other plugin.</p>
  */
 public class SkillAPI extends JavaPlugin {
-private static SkillAPI singleton;
+public static SkillAPI singleton;
 
  private final HashMap<String, Skill> skills = new HashMap<>();
  private final HashMap<String, RPGClass> classes = new HashMap<>();

src/main/java/com/sucy/skill/api/projectile/ParticleProjectile.java

@@ -26,6 +26,7 @@
  */
 package com.sucy.skill.api.projectile;
 
+import com.sucy.skill.SkillAPI;
 import com.sucy.skill.api.Settings;
 import com.sucy.skill.api.event.ParticleProjectileExpireEvent;
 import com.sucy.skill.api.event.ParticleProjectileHitEvent;
@@ -34,8 +35,10 @@
 import com.sucy.skill.api.util.ParticleHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
@@ -75,7 +78,12 @@ public class ParticleProjectile extends CustomProjectile
  private int freq;
  private int life;
  private Vector gravity;
- private boolean pierce;
+ private boolean pierce;
+ private Entity missileTarget;
+ private double missileThreshold;
+ private double missileAngle;
+ private double missileDelay;
+ private boolean missileStarted = false;
 
  /**
  * Constructor
@@ -96,10 +104,42 @@ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Setting
  this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
  this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
  this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = null;
+ steps = (int) Math.ceil(vel.length() * 2);
+ vel.multiply(1.0 / steps);
+ gravity.multiply(1.0 / steps);
+ Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
+ }
+ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Settings settings, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
+ {
+ super(shooter);
 
+ this.loc = loc;
+ this.settings = settings;
+ this.vel = loc.getDirection().multiply(settings.getAttr(SPEED, level, 1.0));
+ this.freq = (int) (20 * settings.getDouble(FREQUENCY, 0.5));
+ this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
+ this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
+ this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = missileTarget;
+ this.missileThreshold = missileThreshold;
+ this.missileAngle = missileAngle;
+ this.missileDelay = missileDelay;
  steps = (int) Math.ceil(vel.length() * 2);
  vel.multiply(1.0 / steps);
  gravity.multiply(1.0 / steps);
+ //Missile delay
+ if(missileDelay == 0){
+ missileStarted = true;
+ }else {
+ new BukkitRunnable() {
+
+ @Override
+ public void run() {
+ missileStarted = true;
+ }
+ }.runTaskLater(SkillAPI.singleton, Math.round(missileDelay * 20));
+ }
  Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
  }
 
@@ -224,6 +264,28 @@ public void run()
  cancel();
  Bukkit.getPluginManager().callEvent(new ParticleProjectileExpireEvent(this));
  }
+
+ //Missile
+ if(missileTarget!=null && missileStarted){
+ final Vector vel = getVelocity();
+ final double speed = vel.length();
+ final Vector dir = vel.multiply(1 / speed);
+ final Vector towards = missileTarget.getLocation().toVector().subtract(getLocation().toVector());
+ final Vector targetDir = towards.normalize();
+ final double dot = dir.dot(targetDir);//degree of inaccurate
+ if (dot >= missileThreshold) {
+ setVelocity(targetDir.multiply(speed));
+ } else {
+ Vector currentDir = vel.normalize();
+ Vector sum = currentDir.add(targetDir);
+ Vector newDir = sum.divide(new Vector(2,2,2));
+ Vector normalizedNewDir = newDir.normalize();
+ setVelocity(normalizedNewDir.multiply(speed));
+ //final double m = Math.sin()
+ //baseProjectile.setVelocity(result);
+ }
+
+ }
  }
 
  /**
@@ -240,15 +302,15 @@ public void run()
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  ArrayList<Vector> dirs = calcSpread(center, angle, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Vector dir : dirs)
  {
  Location l = loc.clone();
  l.setDirection(dir);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }
@@ -269,15 +331,15 @@ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int lev
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  Vector vel = new Vector(0, 1, 0);
  ArrayList<Location> locs = calcRain(center, radius, height, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Location l : locs)
  {
  l.setDirection(vel);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }

src/main/java/com/sucy/skill/dynamic/ComponentRegistry.java

@@ -291,5 +291,6 @@ private static void register(final EffectComponent component) {
  register(new WarpTargetMechanic());
  register(new WarpValueMechanic());
  register(new WolfMechanic());
+ register(new SetGlowMechanic());
  }
 }

src/main/java/com/sucy/skill/dynamic/mechanic/ParticleProjectileMechanic.java

@@ -40,6 +40,7 @@
 import com.sucy.skill.cast.IndicatorType;
 import com.sucy.skill.cast.ProjectileIndicator;
 import com.sucy.skill.dynamic.TempEntity;
+import com.sucy.skill.dynamic.target.RememberTarget;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -66,6 +67,13 @@ public class ParticleProjectileMechanic extends MechanicComponent implements Pro
  private static final String UPWARD = "upward";
  private static final String FORWARD = "forward";
 
+ //Missile
+ private static final String MISSILE_TARGET = "missile_target";
+ private static final String MISSILE_THRESHOLD = "missile_threshold";
+ private static final String MISSILE_ANGLE = "missile_angle";
+ private static final String MISSILE_DELAY = "missile_delay";
+
+ //Effect
  private static final String USE_EFFECT = "use-effect";
  private static final String EFFECT_KEY = "effect-key";
 
@@ -144,6 +152,18 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy.set(ParticleProjectile.SPEED, parseValues(caster, ParticleProjectile.SPEED, level, 1), 0);
  copy.set(ParticleHelper.PARTICLES_KEY, parseValues(caster, ParticleHelper.PARTICLES_KEY, level, 1), 0);
  copy.set(ParticleHelper.RADIUS_KEY, parseValues(caster, ParticleHelper.RADIUS_KEY, level, 0), 0);
+ final List<LivingEntity> missileTargets = RememberTarget.remember(caster, settings.getString(MISSILE_TARGET, "_none"));
+
+ LivingEntity missileTarget = null;
+ double missileThreshold = 0;
+ double missileAngle = 0;
+ double missileDelay = 0;
+ if(missileTargets.size() > 0) {
+ missileTarget = missileTargets.get(0);
+ missileThreshold = settings.getDouble(MISSILE_THRESHOLD);
+ missileAngle = settings.getDouble(MISSILE_ANGLE);
+ missileDelay = settings.getDouble(MISSILE_DELAY);
+ }
 
  // Fire from each target
  for (LivingEntity target : targets) {
@@ -154,7 +174,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  if (spread.equals("rain")) {
  double radius = parseValues(caster, RADIUS, level, 2.0);
  double height = parseValues(caster, HEIGHT, level, 8.0);
- list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this);
+ list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this, missileTarget, missileThreshold, missileAngle, missileDelay);
  } else {
  Vector dir = target.getLocation().getDirection();
 
@@ -179,7 +199,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy,
  angle,
  amount,
- this
+ this, missileTarget, missileThreshold, missileAngle, missileDelay
  );
  }
 

editor/js/component.js

@@ -193,7 +193,8 @@ var Mechanic = {
  WARP_SWAP: { name: 'Warp Swap', container: false, construct: MechanicWarpSwap },
  WARP_TARGET: { name: 'Warp Target', container: false, construct: MechanicWarpTarget },
  WARP_VALUE: { name: 'Warp Value', container: false, construct: MechanicWarpValue },
- WOLF: { name: 'Wolf', container: true, construct: MechanicWolf }
+ WOLF: { name: 'Wolf', container: true, construct: MechanicWolf },
+ SET_GLOW: { name: 'Set Glow', container: false, construct: MechanicSetGlow }
 };
 
 var saveIndex;
@@ -2504,6 +2505,9 @@ function MechanicParticleProjectile()
  .setTooltip('How long in seconds before the projectile will expire in case it doesn\'t hit anything')
  );
 
+ //Add missile options (homing projectile)
+ addMissileOptions(this, true);
+
  addEffectOptions(this, true);
 }
 
@@ -3239,6 +3243,21 @@ function MechanicWolf()
  );
 }
 
+extend('MechanicSetGlow', 'Component');
+function MechanicSetGlow()
+{
+ this.super('Set Glow', Type.MECHANIC, false);
+
+ this.description = 'glow target with color (only caster can see it)';
+
+ this.data.push(new ListValue('Glow Color', 'color', getGlowColors(), 'White')
+ .setTooltip('The color of glowing')
+ );
+ this.data.push(new AttributeValue('Duration', 'seconds', 10, 0)
+ .setTooltip('How long should it glow for')
+ );
+}
+
 // The active component being edited or added to
 var activeComponent = undefined;
 
@@ -3391,7 +3410,29 @@ function addParticleOptions(component) {
  component.data.push(new DoubleValue('Speed', 'speed', 0.1).setTooltip('Speed of the particle. For some particles controls other parameters, such as size.')
  );
 }
+function addMissileOptions(component, optional)
+{
+ var opt = appendNone;
+ if(optional){
+ opt = appendMissileOptional;
+ component.data.push(new ListValue('Use Missile', 'use-missile', [ 'True', 'False' ], 'False')
+ .setTooltip('Whether or not to use the missile (homing projectile)..')
+ );
+ }
 
+ component.data.push(opt(new StringValue('Missile Target', 'missile_target', "none")
+ .setTooltip('The target you would like to home at'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Threshold', 'missile_threshold', 3)
+ .setTooltip('The threshold of the missile'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Angle', 'missile_angle', 3)
+ .setTooltip('The angle of the missile will turn'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Delay', 'missile_delay', 0)
+ .setTooltip('The delay before auto homing the target'))
+ );
+}
 function addEffectOptions(component, optional)
 {
  var opt = appendNone;
@@ -3469,6 +3510,11 @@ function appendOptional(value)
  value.requireValue('use-effect', [ 'True' ]);
  return value;
 }
+function appendMissileOptional(value)
+{
+ value.requireValue('use-missile', [ 'True' ]);
+ return value;
+}
 
 function appendNone(value)
 {

editor/js/data/data.js

@@ -66,6 +66,9 @@ function getBadPotions() {
 function getDyes() {
  return DYES;
 }
+function getGlowColors(){
+ return GLOW_COLORS;
+}
 
 const GOOD_POTIONS = [
  "Speed",
@@ -118,4 +121,22 @@ const DYES = [
  'RED',
  'WHITE',
  'YELLOW'
+];
+const GLOW_COLORS = ['BLACK',
+ 'DARK_BLUE',
+ 'DARK_GREEN',
+ 'DARK_AQUA',
+ 'DARK_RED',
+ 'DARK_PURPLE',
+ 'GOLD',
+ 'GRAY',
+ 'DARK_GRAY',
+ 'BLUE',
+ 'GREEN',
+ 'AQUA',
+ 'RED',
+ 'PURPLE',
+ 'YELLOW',
+ 'WHITE',
+ 'NONE'
 ];

pom.xml

@@ -142,9 +142,16 @@
  <dependency>
  <groupId>LibsDisguises</groupId>
  <artifactId>LibsDisguises</artifactId>
- <version>10.0.19</version>
+ <version>10.0.26</version>
  <scope>provided</scope>
  </dependency>
+ <dependency>
+ <groupId>com.github.InventivetalentDev</groupId>
+ <artifactId>GlowAPI</artifactId>
+ <version>1.4.6-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/GlowAPI_v1.4.6-SNAPSHOT.jar</systemPath>
+ </dependency>
  <dependency>
  <groupId>me.clip</groupId>
  <artifactId>placeholderapi</artifactId>

src/main/java/com/sucy/skill/SkillAPI.java

@@ -74,7 +74,7 @@
  * <p>You can retrieve a reference to this through Bukkit the same way as any other plugin.</p>
  */
 public class SkillAPI extends JavaPlugin {
-private static SkillAPI singleton;
+public static SkillAPI singleton;
 
  private final HashMap<String, Skill> skills = new HashMap<>();
  private final HashMap<String, RPGClass> classes = new HashMap<>();

src/main/java/com/sucy/skill/api/projectile/ParticleProjectile.java

@@ -26,6 +26,7 @@
  */
 package com.sucy.skill.api.projectile;
 
+import com.sucy.skill.SkillAPI;
 import com.sucy.skill.api.Settings;
 import com.sucy.skill.api.event.ParticleProjectileExpireEvent;
 import com.sucy.skill.api.event.ParticleProjectileHitEvent;
@@ -34,8 +35,10 @@
 import com.sucy.skill.api.util.ParticleHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
@@ -75,7 +78,12 @@ public class ParticleProjectile extends CustomProjectile
  private int freq;
  private int life;
  private Vector gravity;
- private boolean pierce;
+ private boolean pierce;
+ private Entity missileTarget;
+ private double missileThreshold;
+ private double missileAngle;
+ private double missileDelay;
+ private boolean missileStarted = false;
 
  /**
  * Constructor
@@ -96,10 +104,42 @@ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Setting
  this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
  this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
  this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = null;
+ steps = (int) Math.ceil(vel.length() * 2);
+ vel.multiply(1.0 / steps);
+ gravity.multiply(1.0 / steps);
+ Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
+ }
+ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Settings settings, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
+ {
+ super(shooter);
 
+ this.loc = loc;
+ this.settings = settings;
+ this.vel = loc.getDirection().multiply(settings.getAttr(SPEED, level, 1.0));
+ this.freq = (int) (20 * settings.getDouble(FREQUENCY, 0.5));
+ this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
+ this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
+ this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = missileTarget;
+ this.missileThreshold = missileThreshold;
+ this.missileAngle = missileAngle;
+ this.missileDelay = missileDelay;
  steps = (int) Math.ceil(vel.length() * 2);
  vel.multiply(1.0 / steps);
  gravity.multiply(1.0 / steps);
+ //Missile delay
+ if(missileDelay == 0){
+ missileStarted = true;
+ }else {
+ new BukkitRunnable() {
+
+ @Override
+ public void run() {
+ missileStarted = true;
+ }
+ }.runTaskLater(SkillAPI.singleton, Math.round(missileDelay * 20));
+ }
  Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
  }
 
@@ -224,6 +264,28 @@ public void run()
  cancel();
  Bukkit.getPluginManager().callEvent(new ParticleProjectileExpireEvent(this));
  }
+
+ //Missile
+ if(missileTarget!=null && missileStarted){
+ final Vector vel = getVelocity();
+ final double speed = vel.length();
+ final Vector dir = vel.multiply(1 / speed);
+ final Vector towards = missileTarget.getLocation().toVector().subtract(getLocation().toVector());
+ final Vector targetDir = towards.normalize();
+ final double dot = dir.dot(targetDir);//degree of inaccurate
+ if (dot >= missileThreshold) {
+ setVelocity(targetDir.multiply(speed));
+ } else {
+ Vector currentDir = vel.normalize();
+ Vector sum = currentDir.add(targetDir);
+ Vector newDir = sum.divide(new Vector(2,2,2));
+ Vector normalizedNewDir = newDir.normalize();
+ setVelocity(normalizedNewDir.multiply(speed));
+ //final double m = Math.sin()
+ //baseProjectile.setVelocity(result);
+ }
+
+ }
  }
 
  /**
@@ -240,15 +302,15 @@ public void run()
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  ArrayList<Vector> dirs = calcSpread(center, angle, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Vector dir : dirs)
  {
  Location l = loc.clone();
  l.setDirection(dir);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }
@@ -269,15 +331,15 @@ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int lev
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  Vector vel = new Vector(0, 1, 0);
  ArrayList<Location> locs = calcRain(center, radius, height, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Location l : locs)
  {
  l.setDirection(vel);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }

src/main/java/com/sucy/skill/dynamic/ComponentRegistry.java

@@ -291,5 +291,6 @@ private static void register(final EffectComponent component) {
  register(new WarpTargetMechanic());
  register(new WarpValueMechanic());
  register(new WolfMechanic());
+ register(new SetGlowMechanic());
  }
 }

src/main/java/com/sucy/skill/dynamic/mechanic/ParticleProjectileMechanic.java

@@ -40,6 +40,7 @@
 import com.sucy.skill.cast.IndicatorType;
 import com.sucy.skill.cast.ProjectileIndicator;
 import com.sucy.skill.dynamic.TempEntity;
+import com.sucy.skill.dynamic.target.RememberTarget;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -66,6 +67,13 @@ public class ParticleProjectileMechanic extends MechanicComponent implements Pro
  private static final String UPWARD = "upward";
  private static final String FORWARD = "forward";
 
+ //Missile
+ private static final String MISSILE_TARGET = "missile_target";
+ private static final String MISSILE_THRESHOLD = "missile_threshold";
+ private static final String MISSILE_ANGLE = "missile_angle";
+ private static final String MISSILE_DELAY = "missile_delay";
+
+ //Effect
  private static final String USE_EFFECT = "use-effect";
  private static final String EFFECT_KEY = "effect-key";
 
@@ -144,6 +152,18 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy.set(ParticleProjectile.SPEED, parseValues(caster, ParticleProjectile.SPEED, level, 1), 0);
  copy.set(ParticleHelper.PARTICLES_KEY, parseValues(caster, ParticleHelper.PARTICLES_KEY, level, 1), 0);
  copy.set(ParticleHelper.RADIUS_KEY, parseValues(caster, ParticleHelper.RADIUS_KEY, level, 0), 0);
+ final List<LivingEntity> missileTargets = RememberTarget.remember(caster, settings.getString(MISSILE_TARGET, "_none"));
+
+ LivingEntity missileTarget = null;
+ double missileThreshold = 0;
+ double missileAngle = 0;
+ double missileDelay = 0;
+ if(missileTargets.size() > 0) {
+ missileTarget = missileTargets.get(0);
+ missileThreshold = settings.getDouble(MISSILE_THRESHOLD);
+ missileAngle = settings.getDouble(MISSILE_ANGLE);
+ missileDelay = settings.getDouble(MISSILE_DELAY);
+ }
 
  // Fire from each target
  for (LivingEntity target : targets) {
@@ -154,7 +174,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  if (spread.equals("rain")) {
  double radius = parseValues(caster, RADIUS, level, 2.0);
  double height = parseValues(caster, HEIGHT, level, 8.0);
- list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this);
+ list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this, missileTarget, missileThreshold, missileAngle, missileDelay);
  } else {
  Vector dir = target.getLocation().getDirection();
 
@@ -179,7 +199,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy,
  angle,
  amount,
- this
+ this, missileTarget, missileThreshold, missileAngle, missileDelay
  );
  }
 

editor/js/component.js

@@ -193,7 +193,8 @@ var Mechanic = {
  WARP_SWAP: { name: 'Warp Swap', container: false, construct: MechanicWarpSwap },
  WARP_TARGET: { name: 'Warp Target', container: false, construct: MechanicWarpTarget },
  WARP_VALUE: { name: 'Warp Value', container: false, construct: MechanicWarpValue },
- WOLF: { name: 'Wolf', container: true, construct: MechanicWolf }
+ WOLF: { name: 'Wolf', container: true, construct: MechanicWolf },
+ SET_GLOW: { name: 'Set Glow', container: false, construct: MechanicSetGlow }
 };
 
 var saveIndex;
@@ -2504,6 +2505,9 @@ function MechanicParticleProjectile()
  .setTooltip('How long in seconds before the projectile will expire in case it doesn\'t hit anything')
  );
 
+ //Add missile options (homing projectile)
+ addMissileOptions(this, true);
+
  addEffectOptions(this, true);
 }
 
@@ -3239,6 +3243,21 @@ function MechanicWolf()
  );
 }
 
+extend('MechanicSetGlow', 'Component');
+function MechanicSetGlow()
+{
+ this.super('Set Glow', Type.MECHANIC, false);
+
+ this.description = 'glow target with color (only caster can see it)';
+
+ this.data.push(new ListValue('Glow Color', 'color', getGlowColors(), 'White')
+ .setTooltip('The color of glowing')
+ );
+ this.data.push(new AttributeValue('Duration', 'seconds', 10, 0)
+ .setTooltip('How long should it glow for')
+ );
+}
+
 // The active component being edited or added to
 var activeComponent = undefined;
 
@@ -3391,7 +3410,29 @@ function addParticleOptions(component) {
  component.data.push(new DoubleValue('Speed', 'speed', 0.1).setTooltip('Speed of the particle. For some particles controls other parameters, such as size.')
  );
 }
+function addMissileOptions(component, optional)
+{
+ var opt = appendNone;
+ if(optional){
+ opt = appendMissileOptional;
+ component.data.push(new ListValue('Use Missile', 'use-missile', [ 'True', 'False' ], 'False')
+ .setTooltip('Whether or not to use the missile (homing projectile)..')
+ );
+ }
 
+ component.data.push(opt(new StringValue('Missile Target', 'missile_target', "none")
+ .setTooltip('The target you would like to home at'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Threshold', 'missile_threshold', 3)
+ .setTooltip('The threshold of the missile'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Angle', 'missile_angle', 3)
+ .setTooltip('The angle of the missile will turn'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Delay', 'missile_delay', 0)
+ .setTooltip('The delay before auto homing the target'))
+ );
+}
 function addEffectOptions(component, optional)
 {
  var opt = appendNone;
@@ -3469,6 +3510,11 @@ function appendOptional(value)
  value.requireValue('use-effect', [ 'True' ]);
  return value;
 }
+function appendMissileOptional(value)
+{
+ value.requireValue('use-missile', [ 'True' ]);
+ return value;
+}
 
 function appendNone(value)
 {

editor/js/data/data.js

@@ -66,6 +66,9 @@ function getBadPotions() {
 function getDyes() {
  return DYES;
 }
+function getGlowColors(){
+ return GLOW_COLORS;
+}
 
 const GOOD_POTIONS = [
  "Speed",
@@ -118,4 +121,22 @@ const DYES = [
  'RED',
  'WHITE',
  'YELLOW'
+];
+const GLOW_COLORS = ['BLACK',
+ 'DARK_BLUE',
+ 'DARK_GREEN',
+ 'DARK_AQUA',
+ 'DARK_RED',
+ 'DARK_PURPLE',
+ 'GOLD',
+ 'GRAY',
+ 'DARK_GRAY',
+ 'BLUE',
+ 'GREEN',
+ 'AQUA',
+ 'RED',
+ 'PURPLE',
+ 'YELLOW',
+ 'WHITE',
+ 'NONE'
 ];

pom.xml

@@ -142,9 +142,16 @@
  <dependency>
  <groupId>LibsDisguises</groupId>
  <artifactId>LibsDisguises</artifactId>
- <version>10.0.19</version>
+ <version>10.0.26</version>
  <scope>provided</scope>
  </dependency>
+ <dependency>
+ <groupId>com.github.InventivetalentDev</groupId>
+ <artifactId>GlowAPI</artifactId>
+ <version>1.4.6-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/GlowAPI_v1.4.6-SNAPSHOT.jar</systemPath>
+ </dependency>
  <dependency>
  <groupId>me.clip</groupId>
  <artifactId>placeholderapi</artifactId>

src/main/java/com/sucy/skill/SkillAPI.java

@@ -74,7 +74,7 @@
  * <p>You can retrieve a reference to this through Bukkit the same way as any other plugin.</p>
  */
 public class SkillAPI extends JavaPlugin {
-private static SkillAPI singleton;
+public static SkillAPI singleton;
 
  private final HashMap<String, Skill> skills = new HashMap<>();
  private final HashMap<String, RPGClass> classes = new HashMap<>();

src/main/java/com/sucy/skill/api/projectile/ParticleProjectile.java

@@ -26,6 +26,7 @@
  */
 package com.sucy.skill.api.projectile;
 
+import com.sucy.skill.SkillAPI;
 import com.sucy.skill.api.Settings;
 import com.sucy.skill.api.event.ParticleProjectileExpireEvent;
 import com.sucy.skill.api.event.ParticleProjectileHitEvent;
@@ -34,8 +35,10 @@
 import com.sucy.skill.api.util.ParticleHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
@@ -75,7 +78,12 @@ public class ParticleProjectile extends CustomProjectile
  private int freq;
  private int life;
  private Vector gravity;
- private boolean pierce;
+ private boolean pierce;
+ private Entity missileTarget;
+ private double missileThreshold;
+ private double missileAngle;
+ private double missileDelay;
+ private boolean missileStarted = false;
 
  /**
  * Constructor
@@ -96,10 +104,42 @@ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Setting
  this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
  this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
  this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = null;
+ steps = (int) Math.ceil(vel.length() * 2);
+ vel.multiply(1.0 / steps);
+ gravity.multiply(1.0 / steps);
+ Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
+ }
+ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Settings settings, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
+ {
+ super(shooter);
 
+ this.loc = loc;
+ this.settings = settings;
+ this.vel = loc.getDirection().multiply(settings.getAttr(SPEED, level, 1.0));
+ this.freq = (int) (20 * settings.getDouble(FREQUENCY, 0.5));
+ this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
+ this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
+ this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = missileTarget;
+ this.missileThreshold = missileThreshold;
+ this.missileAngle = missileAngle;
+ this.missileDelay = missileDelay;
  steps = (int) Math.ceil(vel.length() * 2);
  vel.multiply(1.0 / steps);
  gravity.multiply(1.0 / steps);
+ //Missile delay
+ if(missileDelay == 0){
+ missileStarted = true;
+ }else {
+ new BukkitRunnable() {
+
+ @Override
+ public void run() {
+ missileStarted = true;
+ }
+ }.runTaskLater(SkillAPI.singleton, Math.round(missileDelay * 20));
+ }
  Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
  }
 
@@ -224,6 +264,28 @@ public void run()
  cancel();
  Bukkit.getPluginManager().callEvent(new ParticleProjectileExpireEvent(this));
  }
+
+ //Missile
+ if(missileTarget!=null && missileStarted){
+ final Vector vel = getVelocity();
+ final double speed = vel.length();
+ final Vector dir = vel.multiply(1 / speed);
+ final Vector towards = missileTarget.getLocation().toVector().subtract(getLocation().toVector());
+ final Vector targetDir = towards.normalize();
+ final double dot = dir.dot(targetDir);//degree of inaccurate
+ if (dot >= missileThreshold) {
+ setVelocity(targetDir.multiply(speed));
+ } else {
+ Vector currentDir = vel.normalize();
+ Vector sum = currentDir.add(targetDir);
+ Vector newDir = sum.divide(new Vector(2,2,2));
+ Vector normalizedNewDir = newDir.normalize();
+ setVelocity(normalizedNewDir.multiply(speed));
+ //final double m = Math.sin()
+ //baseProjectile.setVelocity(result);
+ }
+
+ }
  }
 
  /**
@@ -240,15 +302,15 @@ public void run()
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  ArrayList<Vector> dirs = calcSpread(center, angle, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Vector dir : dirs)
  {
  Location l = loc.clone();
  l.setDirection(dir);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }
@@ -269,15 +331,15 @@ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int lev
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  Vector vel = new Vector(0, 1, 0);
  ArrayList<Location> locs = calcRain(center, radius, height, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Location l : locs)
  {
  l.setDirection(vel);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }

src/main/java/com/sucy/skill/dynamic/ComponentRegistry.java

@@ -291,5 +291,6 @@ private static void register(final EffectComponent component) {
  register(new WarpTargetMechanic());
  register(new WarpValueMechanic());
  register(new WolfMechanic());
+ register(new SetGlowMechanic());
  }
 }

src/main/java/com/sucy/skill/dynamic/mechanic/ParticleProjectileMechanic.java

@@ -40,6 +40,7 @@
 import com.sucy.skill.cast.IndicatorType;
 import com.sucy.skill.cast.ProjectileIndicator;
 import com.sucy.skill.dynamic.TempEntity;
+import com.sucy.skill.dynamic.target.RememberTarget;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -66,6 +67,13 @@ public class ParticleProjectileMechanic extends MechanicComponent implements Pro
  private static final String UPWARD = "upward";
  private static final String FORWARD = "forward";
 
+ //Missile
+ private static final String MISSILE_TARGET = "missile_target";
+ private static final String MISSILE_THRESHOLD = "missile_threshold";
+ private static final String MISSILE_ANGLE = "missile_angle";
+ private static final String MISSILE_DELAY = "missile_delay";
+
+ //Effect
  private static final String USE_EFFECT = "use-effect";
  private static final String EFFECT_KEY = "effect-key";
 
@@ -144,6 +152,18 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy.set(ParticleProjectile.SPEED, parseValues(caster, ParticleProjectile.SPEED, level, 1), 0);
  copy.set(ParticleHelper.PARTICLES_KEY, parseValues(caster, ParticleHelper.PARTICLES_KEY, level, 1), 0);
  copy.set(ParticleHelper.RADIUS_KEY, parseValues(caster, ParticleHelper.RADIUS_KEY, level, 0), 0);
+ final List<LivingEntity> missileTargets = RememberTarget.remember(caster, settings.getString(MISSILE_TARGET, "_none"));
+
+ LivingEntity missileTarget = null;
+ double missileThreshold = 0;
+ double missileAngle = 0;
+ double missileDelay = 0;
+ if(missileTargets.size() > 0) {
+ missileTarget = missileTargets.get(0);
+ missileThreshold = settings.getDouble(MISSILE_THRESHOLD);
+ missileAngle = settings.getDouble(MISSILE_ANGLE);
+ missileDelay = settings.getDouble(MISSILE_DELAY);
+ }
 
  // Fire from each target
  for (LivingEntity target : targets) {
@@ -154,7 +174,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  if (spread.equals("rain")) {
  double radius = parseValues(caster, RADIUS, level, 2.0);
  double height = parseValues(caster, HEIGHT, level, 8.0);
- list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this);
+ list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this, missileTarget, missileThreshold, missileAngle, missileDelay);
  } else {
  Vector dir = target.getLocation().getDirection();
 
@@ -179,7 +199,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy,
  angle,
  amount,
- this
+ this, missileTarget, missileThreshold, missileAngle, missileDelay
  );
  }
 

editor/js/component.js

@@ -193,7 +193,8 @@ var Mechanic = {
  WARP_SWAP: { name: 'Warp Swap', container: false, construct: MechanicWarpSwap },
  WARP_TARGET: { name: 'Warp Target', container: false, construct: MechanicWarpTarget },
  WARP_VALUE: { name: 'Warp Value', container: false, construct: MechanicWarpValue },
- WOLF: { name: 'Wolf', container: true, construct: MechanicWolf }
+ WOLF: { name: 'Wolf', container: true, construct: MechanicWolf },
+ SET_GLOW: { name: 'Set Glow', container: false, construct: MechanicSetGlow }
 };
 
 var saveIndex;
@@ -2504,6 +2505,9 @@ function MechanicParticleProjectile()
  .setTooltip('How long in seconds before the projectile will expire in case it doesn\'t hit anything')
  );
 
+ //Add missile options (homing projectile)
+ addMissileOptions(this, true);
+
  addEffectOptions(this, true);
 }
 
@@ -3239,6 +3243,21 @@ function MechanicWolf()
  );
 }
 
+extend('MechanicSetGlow', 'Component');
+function MechanicSetGlow()
+{
+ this.super('Set Glow', Type.MECHANIC, false);
+
+ this.description = 'glow target with color (only caster can see it)';
+
+ this.data.push(new ListValue('Glow Color', 'color', getGlowColors(), 'White')
+ .setTooltip('The color of glowing')
+ );
+ this.data.push(new AttributeValue('Duration', 'seconds', 10, 0)
+ .setTooltip('How long should it glow for')
+ );
+}
+
 // The active component being edited or added to
 var activeComponent = undefined;
 
@@ -3391,7 +3410,29 @@ function addParticleOptions(component) {
  component.data.push(new DoubleValue('Speed', 'speed', 0.1).setTooltip('Speed of the particle. For some particles controls other parameters, such as size.')
  );
 }
+function addMissileOptions(component, optional)
+{
+ var opt = appendNone;
+ if(optional){
+ opt = appendMissileOptional;
+ component.data.push(new ListValue('Use Missile', 'use-missile', [ 'True', 'False' ], 'False')
+ .setTooltip('Whether or not to use the missile (homing projectile)..')
+ );
+ }
 
+ component.data.push(opt(new StringValue('Missile Target', 'missile_target', "none")
+ .setTooltip('The target you would like to home at'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Threshold', 'missile_threshold', 3)
+ .setTooltip('The threshold of the missile'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Angle', 'missile_angle', 3)
+ .setTooltip('The angle of the missile will turn'))
+ );
+ component.data.push(opt(new DoubleValue('Missile Delay', 'missile_delay', 0)
+ .setTooltip('The delay before auto homing the target'))
+ );
+}
 function addEffectOptions(component, optional)
 {
  var opt = appendNone;
@@ -3469,6 +3510,11 @@ function appendOptional(value)
  value.requireValue('use-effect', [ 'True' ]);
  return value;
 }
+function appendMissileOptional(value)
+{
+ value.requireValue('use-missile', [ 'True' ]);
+ return value;
+}
 
 function appendNone(value)
 {

editor/js/data/data.js

@@ -66,6 +66,9 @@ function getBadPotions() {
 function getDyes() {
  return DYES;
 }
+function getGlowColors(){
+ return GLOW_COLORS;
+}
 
 const GOOD_POTIONS = [
  "Speed",
@@ -118,4 +121,22 @@ const DYES = [
  'RED',
  'WHITE',
  'YELLOW'
+];
+const GLOW_COLORS = ['BLACK',
+ 'DARK_BLUE',
+ 'DARK_GREEN',
+ 'DARK_AQUA',
+ 'DARK_RED',
+ 'DARK_PURPLE',
+ 'GOLD',
+ 'GRAY',
+ 'DARK_GRAY',
+ 'BLUE',
+ 'GREEN',
+ 'AQUA',
+ 'RED',
+ 'PURPLE',
+ 'YELLOW',
+ 'WHITE',
+ 'NONE'
 ];

pom.xml

@@ -142,9 +142,16 @@
  <dependency>
  <groupId>LibsDisguises</groupId>
  <artifactId>LibsDisguises</artifactId>
- <version>10.0.19</version>
+ <version>10.0.26</version>
  <scope>provided</scope>
  </dependency>
+ <dependency>
+ <groupId>com.github.InventivetalentDev</groupId>
+ <artifactId>GlowAPI</artifactId>
+ <version>1.4.6-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/GlowAPI_v1.4.6-SNAPSHOT.jar</systemPath>
+ </dependency>
  <dependency>
  <groupId>me.clip</groupId>
  <artifactId>placeholderapi</artifactId>

src/main/java/com/sucy/skill/SkillAPI.java

@@ -74,7 +74,7 @@
  * <p>You can retrieve a reference to this through Bukkit the same way as any other plugin.</p>
  */
 public class SkillAPI extends JavaPlugin {
-private static SkillAPI singleton;
+public static SkillAPI singleton;
 
  private final HashMap<String, Skill> skills = new HashMap<>();
  private final HashMap<String, RPGClass> classes = new HashMap<>();

src/main/java/com/sucy/skill/api/projectile/ParticleProjectile.java

@@ -26,6 +26,7 @@
  */
 package com.sucy.skill.api.projectile;
 
+import com.sucy.skill.SkillAPI;
 import com.sucy.skill.api.Settings;
 import com.sucy.skill.api.event.ParticleProjectileExpireEvent;
 import com.sucy.skill.api.event.ParticleProjectileHitEvent;
@@ -34,8 +35,10 @@
 import com.sucy.skill.api.util.ParticleHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
@@ -75,7 +78,12 @@ public class ParticleProjectile extends CustomProjectile
  private int freq;
  private int life;
  private Vector gravity;
- private boolean pierce;
+ private boolean pierce;
+ private Entity missileTarget;
+ private double missileThreshold;
+ private double missileAngle;
+ private double missileDelay;
+ private boolean missileStarted = false;
 
  /**
  * Constructor
@@ -96,10 +104,42 @@ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Setting
  this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
  this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
  this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = null;
+ steps = (int) Math.ceil(vel.length() * 2);
+ vel.multiply(1.0 / steps);
+ gravity.multiply(1.0 / steps);
+ Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
+ }
+ public ParticleProjectile(LivingEntity shooter, int level, Location loc, Settings settings, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
+ {
+ super(shooter);
 
+ this.loc = loc;
+ this.settings = settings;
+ this.vel = loc.getDirection().multiply(settings.getAttr(SPEED, level, 1.0));
+ this.freq = (int) (20 * settings.getDouble(FREQUENCY, 0.5));
+ this.life = (int) (settings.getDouble(LIFESPAN, 2) * 20);
+ this.gravity = new Vector(0, settings.getDouble(GRAVITY, 0), 0);
+ this.pierce = settings.getBool(PIERCE, false);
+ this.missileTarget = missileTarget;
+ this.missileThreshold = missileThreshold;
+ this.missileAngle = missileAngle;
+ this.missileDelay = missileDelay;
  steps = (int) Math.ceil(vel.length() * 2);
  vel.multiply(1.0 / steps);
  gravity.multiply(1.0 / steps);
+ //Missile delay
+ if(missileDelay == 0){
+ missileStarted = true;
+ }else {
+ new BukkitRunnable() {
+
+ @Override
+ public void run() {
+ missileStarted = true;
+ }
+ }.runTaskLater(SkillAPI.singleton, Math.round(missileDelay * 20));
+ }
  Bukkit.getPluginManager().callEvent(new ParticleProjectileLaunchEvent(this));
  }
 
@@ -224,6 +264,28 @@ public void run()
  cancel();
  Bukkit.getPluginManager().callEvent(new ParticleProjectileExpireEvent(this));
  }
+
+ //Missile
+ if(missileTarget!=null && missileStarted){
+ final Vector vel = getVelocity();
+ final double speed = vel.length();
+ final Vector dir = vel.multiply(1 / speed);
+ final Vector towards = missileTarget.getLocation().toVector().subtract(getLocation().toVector());
+ final Vector targetDir = towards.normalize();
+ final double dot = dir.dot(targetDir);//degree of inaccurate
+ if (dot >= missileThreshold) {
+ setVelocity(targetDir.multiply(speed));
+ } else {
+ Vector currentDir = vel.normalize();
+ Vector sum = currentDir.add(targetDir);
+ Vector newDir = sum.divide(new Vector(2,2,2));
+ Vector normalizedNewDir = newDir.normalize();
+ setVelocity(normalizedNewDir.multiply(speed));
+ //final double m = Math.sin()
+ //baseProjectile.setVelocity(result);
+ }
+
+ }
  }
 
  /**
@@ -240,15 +302,15 @@ public void run()
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int level, Vector center, Location loc, Settings settings, double angle, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  ArrayList<Vector> dirs = calcSpread(center, angle, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Vector dir : dirs)
  {
  Location l = loc.clone();
  l.setDirection(dir);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }
@@ -269,15 +331,15 @@ public static ArrayList<ParticleProjectile> spread(LivingEntity shooter, int lev
  *
  * @return list of fired projectiles
  */
- public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback)
+ public static ArrayList<ParticleProjectile> rain(LivingEntity shooter, int level, Location center, Settings settings, double radius, double height, int amount, ProjectileCallback callback, Entity missileTarget, double missileThreshold, double missileAngle, double missileDelay)
  {
  Vector vel = new Vector(0, 1, 0);
  ArrayList<Location> locs = calcRain(center, radius, height, amount);
  ArrayList<ParticleProjectile> list = new ArrayList<ParticleProjectile>();
  for (Location l : locs)
  {
  l.setDirection(vel);
- ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings);
+ ParticleProjectile p = new ParticleProjectile(shooter, level, l, settings, missileTarget, missileThreshold, missileAngle, missileDelay);
  p.setCallback(callback);
  list.add(p);
  }

src/main/java/com/sucy/skill/dynamic/ComponentRegistry.java

@@ -291,5 +291,6 @@ private static void register(final EffectComponent component) {
  register(new WarpTargetMechanic());
  register(new WarpValueMechanic());
  register(new WolfMechanic());
+ register(new SetGlowMechanic());
  }
 }

src/main/java/com/sucy/skill/dynamic/mechanic/ParticleProjectileMechanic.java

@@ -40,6 +40,7 @@
 import com.sucy.skill.cast.IndicatorType;
 import com.sucy.skill.cast.ProjectileIndicator;
 import com.sucy.skill.dynamic.TempEntity;
+import com.sucy.skill.dynamic.target.RememberTarget;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -66,6 +67,13 @@ public class ParticleProjectileMechanic extends MechanicComponent implements Pro
  private static final String UPWARD = "upward";
  private static final String FORWARD = "forward";
 
+ //Missile
+ private static final String MISSILE_TARGET = "missile_target";
+ private static final String MISSILE_THRESHOLD = "missile_threshold";
+ private static final String MISSILE_ANGLE = "missile_angle";
+ private static final String MISSILE_DELAY = "missile_delay";
+
+ //Effect
  private static final String USE_EFFECT = "use-effect";
  private static final String EFFECT_KEY = "effect-key";
 
@@ -144,6 +152,18 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy.set(ParticleProjectile.SPEED, parseValues(caster, ParticleProjectile.SPEED, level, 1), 0);
  copy.set(ParticleHelper.PARTICLES_KEY, parseValues(caster, ParticleHelper.PARTICLES_KEY, level, 1), 0);
  copy.set(ParticleHelper.RADIUS_KEY, parseValues(caster, ParticleHelper.RADIUS_KEY, level, 0), 0);
+ final List<LivingEntity> missileTargets = RememberTarget.remember(caster, settings.getString(MISSILE_TARGET, "_none"));
+
+ LivingEntity missileTarget = null;
+ double missileThreshold = 0;
+ double missileAngle = 0;
+ double missileDelay = 0;
+ if(missileTargets.size() > 0) {
+ missileTarget = missileTargets.get(0);
+ missileThreshold = settings.getDouble(MISSILE_THRESHOLD);
+ missileAngle = settings.getDouble(MISSILE_ANGLE);
+ missileDelay = settings.getDouble(MISSILE_DELAY);
+ }
 
  // Fire from each target
  for (LivingEntity target : targets) {
@@ -154,7 +174,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  if (spread.equals("rain")) {
  double radius = parseValues(caster, RADIUS, level, 2.0);
  double height = parseValues(caster, HEIGHT, level, 8.0);
- list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this);
+ list = ParticleProjectile.rain(caster, level, loc, copy, radius, height, amount, this, missileTarget, missileThreshold, missileAngle, missileDelay);
  } else {
  Vector dir = target.getLocation().getDirection();
 
@@ -179,7 +199,7 @@ public boolean execute(LivingEntity caster, int level, List<LivingEntity> target
  copy,
  angle,
  amount,
- this
+ this, missileTarget, missileThreshold, missileAngle, missileDelay
  );
  }