Fork/mmocore
1
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

!Improved fireball spell

Browse Source
This commit is contained in:
Indyuce 2020-04-05 14:26:34 +02:00
parent 19ad204814
commit d6a1e12ea0
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/MMOLib.jar
View File

Binary file not shown.

48
src/main/java/net/Indyuce/mmocore/skill/Fireball.java
View File

@ -17,6 +17,7 @@ import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
import net.mmogroup.mmolib.MMOLib; import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.AttackResult; import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType; import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.api.MMORayTraceResult;
import net.mmogroup.mmolib.version.VersionMaterial; import net.mmogroup.mmolib.version.VersionMaterial;
import net.mmogroup.mmolib.version.VersionSound; import net.mmogroup.mmolib.version.VersionSound;
@ -24,11 +25,12 @@ public class Fireball extends Skill {
public Fireball() { public Fireball() {
super(); super();
setMaterial(VersionMaterial.FIRE_CHARGE.toMaterial()); setMaterial(VersionMaterial.FIRE_CHARGE.toMaterial());
setLore("Casts a deadly fireball onto your", "target, dealing &c{damage} &7damage upon contact", "and igniting it for &c{ignite} &7seconds.", "", "Shatters into 3 blazing hot shards which stick", "to walls and explode 3 seconds later, dealing", "33% of the initial spell damage.", "", "&e{cooldown}s Cooldown", "&9Costs {mana} {mana_name}"); setLore("Casts a deadly fireball onto your", "target, dealing &c{damage} &7damage upon contact", "and igniting it for &c{ignite} &7seconds.", "", "Shatters into 3 blazing hot shards which stick", "to walls and explode 3 seconds later, dealing", "&c{ratio}% &7of the initial spell damage.", "", "&e{cooldown}s Cooldown", "&9Costs {mana} {mana_name}");
addModifier("mana", new LinearValue(15, 1)); addModifier("mana", new LinearValue(15, 1));
addModifier("damage", new LinearValue(5, 3)); addModifier("damage", new LinearValue(5, 3));
addModifier("ignite", new LinearValue(2, .1)); addModifier("ignite", new LinearValue(2, .1));
addModifier("ratio", new LinearValue(50, 3));
addModifier("cooldown", new LinearValue(9, -.1, 1, 5)); addModifier("cooldown", new LinearValue(9, -.1, 1, 5));
} }
@ -41,8 +43,8 @@ public class Fireball extends Skill {
data.getPlayer().getWorld().playSound(data.getPlayer().getLocation(), VersionSound.ENTITY_FIREWORK_ROCKET_BLAST.toSound(), 1, 1); data.getPlayer().getWorld().playSound(data.getPlayer().getLocation(), VersionSound.ENTITY_FIREWORK_ROCKET_BLAST.toSound(), 1, 1);
new BukkitRunnable() { new BukkitRunnable() {
int j = 0; int j = 0;
Vector vec = data.getPlayer().getEyeLocation().getDirection(); final Vector vec = data.getPlayer().getEyeLocation().getDirection();
Location loc = data.getPlayer().getLocation().add(0, 1.3, 0); final Location loc = data.getPlayer().getLocation().add(0, 1.3, 0);
public void run() { public void run() {
if (j++ > 40) { if (j++ > 40) {
@ -52,13 +54,10 @@ public class Fireball extends Skill {
loc.add(vec); loc.add(vec);
loc.getWorld().playSound(loc, Sound.BLOCK_FIRE_AMBIENT, 2, 1); if (j % 3 == 0)
// loc.getWorld().spawnParticle(Particle.FLAME, loc, 5, .12, loc.getWorld().playSound(loc, Sound.BLOCK_FIRE_AMBIENT, 2, 1);
// .12, .12, 0);
loc.getWorld().spawnParticle(Particle.FLAME, loc, 4, .02, .02, .02, 0); loc.getWorld().spawnParticle(Particle.FLAME, loc, 4, .02, .02, .02, 0);
loc.getWorld().spawnParticle(Particle.LAVA, loc, 0); loc.getWorld().spawnParticle(Particle.LAVA, loc, 0);
// if (random.nextDouble() < .3)
// loc.getWorld().spawnParticle(Particle.LAVA, loc, 0);
for (Entity target : MMOCoreUtils.getNearbyChunkEntities(loc)) for (Entity target : MMOCoreUtils.getNearbyChunkEntities(loc))
if (MMOLib.plugin.getNMS().isInBoundingBox(target, loc) && MMOCoreUtils.canTarget(data.getPlayer(), target)) { if (MMOLib.plugin.getNMS().isInBoundingBox(target, loc) && MMOCoreUtils.canTarget(data.getPlayer(), target)) {
@ -66,11 +65,42 @@ public class Fireball extends Skill {
loc.getWorld().spawnParticle(Particle.FLAME, loc, 32, 0, 0, 0, .1); loc.getWorld().spawnParticle(Particle.FLAME, loc, 32, 0, 0, 0, .1);
loc.getWorld().playSound(loc, Sound.ENTITY_BLAZE_HURT, 2, 1); loc.getWorld().playSound(loc, Sound.ENTITY_BLAZE_HURT, 2, 1);
target.setFireTicks((int) (target.getFireTicks() + cast.getModifier("ignite") * 20)); target.setFireTicks((int) (target.getFireTicks() + cast.getModifier("ignite") * 20));
MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) target, new AttackResult(cast.getModifier("damage"), DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC)); double damage = cast.getModifier("damage");
MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC));
new BukkitRunnable() {
int i = 0;
@Override
public void run() {
if (i++ > 2) {
cancel();
return;
}
double range = 2.5 * (1 + random.nextDouble());
Vector dir = randomDirection();
loc.getWorld().playSound(loc, Sound.ENTITY_BLAZE_HURT, 2, 1.5f);
MMORayTraceResult result = MMOLib.plugin.getVersion().getWrapper().rayTrace(loc, dir, range, entity -> MMOCoreUtils.canTarget(data.getPlayer(), entity));
if (result.hasHit())
MMOLib.plugin.getDamage().damage(data.getPlayer(), result.getHit(), new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC));
result.draw(loc.clone(), dir, 8, tick -> tick.getWorld().spawnParticle(Particle.FLAME, tick, 0));
}
}.runTaskTimer(MMOCore.plugin, 3, 3);
cancel(); cancel();
return;
} }
} }
}.runTaskTimer(MMOCore.plugin, 0, 1); }.runTaskTimer(MMOCore.plugin, 0, 1);
return cast; return cast;
} }
private Vector randomDirection() {
double x = random.nextDouble() - .5, y = (random.nextDouble() - .2) / 2, z = random.nextDouble() - .5;
Vector dir = new Vector(x, y, z);
return dir.lengthSquared() == 0 ? new Vector(1, 0, 0) : dir.normalize();
}
} }