Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-01-03 06:37:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lowered amount of particles for thunder/sunfire spirits

Browse Source
This commit is contained in:
Jules 2023-09-18 20:47:46 +02:00
parent 1fc3c4a638
commit 3451982bc3
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/SunfireSpirit.java
View File

@ -25,16 +25,22 @@ public class SunfireSpirit implements StaffAttackHandler {
new BukkitRunnable() {
final Location target = getGround(caster.getPlayer().getTargetBlock(null, (int) range * 2).getLocation()).add(0, 1.2, 0);
final double a = RANDOM.nextDouble() * Math.PI * 2;
final double dt = .02;
final Location loc = target.clone().add(Math.cos(a) * 4, 10, Math.sin(a) * 4);
final Vector vec = target.toVector().subtract(loc.toVector()).multiply(.015);
final Vector vec = target.toVector().subtract(loc.toVector()).multiply(dt);
double ti = 0;
int counter;
public void run() {
loc.getWorld().playSound(loc, Sound.BLOCK_FIRE_AMBIENT, 2, 2);
for (int j = 0; j < 4; j++) {
ti += .015;
if (counter++ % 2 == 0)
loc.getWorld().playSound(loc, Sound.BLOCK_FIRE_AMBIENT, 2, 2);
for (int j = 0; j < 3; j++) {
ti += dt;
loc.add(vec);
loc.getWorld().spawnParticle(Particle.FLAME, loc, 0, .03, 0, .03, 0);
// Projectile explode
if (ti >= 1) {
loc.getWorld().spawnParticle(Particle.FLAME, loc, 24, 0, 0, 0, .12);
loc.getWorld().spawnParticle(Particle.SMOKE_NORMAL, loc, 24, 0, 0, 0, .12);
@ -44,7 +50,7 @@ public class SunfireSpirit implements StaffAttackHandler {
if (UtilityMethods.canTarget(caster.getPlayer(), target, InteractionType.OFFENSE_ACTION) && target.getLocation().distanceSquared(loc) <= 9)
caster.attack((LivingEntity) target, damage, DamageType.WEAPON, DamageType.MAGIC, DamageType.PROJECTILE);
cancel();
break;
return;
}
}
}

17
MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/ThunderSpirit.java
View File

@ -25,16 +25,22 @@ public class ThunderSpirit implements StaffAttackHandler {
new BukkitRunnable() {
final Location target = getGround(caster.getPlayer().getTargetBlock(null, (int) range * 2).getLocation()).add(0, 1.2, 0);
final double a = RANDOM.nextDouble() * Math.PI * 2;
final Location loc = target.clone().add(Math.cos(a) * 4, 10, Math.sin(a) * 4);
final Vector vec = target.toVector().subtract(loc.toVector()).multiply(.015);
final double dt = .02;
double ti = 0;
final Location loc = target.clone().add(Math.cos(a) * 4, 10, Math.sin(a) * 4);
final Vector vec = target.toVector().subtract(loc.toVector()).multiply(dt);
int counter;
public void run() {
loc.getWorld().playSound(loc, VersionSound.BLOCK_NOTE_BLOCK_HAT.toSound(), 2, 2);
for (int j = 0; j < 4; j++) {
ti += .015;
if (counter++ % 2 == 0)
loc.getWorld().playSound(loc, VersionSound.BLOCK_NOTE_BLOCK_HAT.toSound(), 2, 2);
for (int j = 0; j < 3; j++) {
ti += dt;
loc.add(vec);
loc.getWorld().spawnParticle(Particle.FIREWORKS_SPARK, loc, 0, .03, 0, .03, 0);
// Projectile explode
if (ti >= 1) {
loc.getWorld().spawnParticle(Particle.FIREWORKS_SPARK, loc, 24, 0, 0, 0, .12);
loc.getWorld().playSound(loc, VersionSound.ENTITY_FIREWORK_ROCKET_BLAST.toSound(), 2, 2);
@ -42,6 +48,7 @@ public class ThunderSpirit implements StaffAttackHandler {
if (UtilityMethods.canTarget(caster.getPlayer(), target, InteractionType.OFFENSE_ACTION) && target.getLocation().distanceSquared(loc) <= 9)
caster.attack((LivingEntity) target, damage, DamageType.WEAPON, DamageType.MAGIC, DamageType.PROJECTILE);
cancel();
return;
}
}
}