forked from Upstream/mmocore
!'magical' -> 'magic'
This commit is contained in:
parent
5eadfc0b85
commit
34935e83b7
@ -46,7 +46,7 @@ public enum StatType {
|
|||||||
ADDITIONAL_EXPERIENCE,
|
ADDITIONAL_EXPERIENCE,
|
||||||
COOLDOWN_REDUCTION,
|
COOLDOWN_REDUCTION,
|
||||||
|
|
||||||
MAGICAL_DAMAGE,
|
MAGIC_DAMAGE,
|
||||||
PHYSICAL_DAMAGE,
|
PHYSICAL_DAMAGE,
|
||||||
PROJECTILE_DAMAGE,
|
PROJECTILE_DAMAGE,
|
||||||
WEAPON_DAMAGE,
|
WEAPON_DAMAGE,
|
||||||
|
@ -136,7 +136,7 @@ public class Fire_Rage 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() + ignite));
|
target.setFireTicks((int) (target.getFireTicks() + ignite));
|
||||||
MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGICAL));
|
MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC));
|
||||||
cancel();
|
cancel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ public class Fire_Storm extends Skill {
|
|||||||
new ParabolicProjectile(data.getPlayer().getLocation().add(0, 1, 0), target.getLocation().add(0, target.getHeight() / 2, 0), randomVector(data.getPlayer()), () -> {
|
new ParabolicProjectile(data.getPlayer().getLocation().add(0, 1, 0), target.getLocation().add(0, target.getHeight() / 2, 0), randomVector(data.getPlayer()), () -> {
|
||||||
target.getWorld().playSound(target.getLocation(), VersionSound.ENTITY_FIREWORK_ROCKET_TWINKLE.toSound(), 1, 2);
|
target.getWorld().playSound(target.getLocation(), VersionSound.ENTITY_FIREWORK_ROCKET_TWINKLE.toSound(), 1, 2);
|
||||||
target.getWorld().spawnParticle(Particle.SMOKE_NORMAL, target.getLocation().add(0, target.getHeight() / 2, 0), 8, 0, 0, 0, .15);
|
target.getWorld().spawnParticle(Particle.SMOKE_NORMAL, target.getLocation().add(0, target.getHeight() / 2, 0), 8, 0, 0, 0, .15);
|
||||||
MMOLib.plugin.getDamage().damage(data.getPlayer(), target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGICAL));
|
MMOLib.plugin.getDamage().damage(data.getPlayer(), target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC));
|
||||||
target.setFireTicks(ignite);
|
target.setFireTicks(ignite);
|
||||||
|
|
||||||
}, 2, Particle.FLAME);
|
}, 2, Particle.FLAME);
|
||||||
|
@ -66,7 +66,7 @@ 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.MAGICAL));
|
MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) target, new AttackResult(cast.getModifier("damage"), DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC));
|
||||||
cancel();
|
cancel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ public class Ice_Spikes extends Skill {
|
|||||||
Line3D line = new Line3D(loc.toVector(), loc.toVector().add(new Vector(0, 1, 0)));
|
Line3D line = new Line3D(loc.toVector(), loc.toVector().add(new Vector(0, 1, 0)));
|
||||||
for (Entity entity : MMOCoreUtils.getNearbyChunkEntities(loc1))
|
for (Entity entity : MMOCoreUtils.getNearbyChunkEntities(loc1))
|
||||||
if (line.distanceSquared(entity.getLocation().toVector()) < 3 && Math.abs(entity.getLocation().getY() - loc1.getY()) < 10 && MMOCoreUtils.canTarget(data.getPlayer(), entity)) {
|
if (line.distanceSquared(entity.getLocation().toVector()) < 3 && Math.abs(entity.getLocation().getY() - loc1.getY()) < 10 && MMOCoreUtils.canTarget(data.getPlayer(), entity)) {
|
||||||
MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) entity, new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL));
|
MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) entity, new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC));
|
||||||
((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.SLOW, slow, 0));
|
((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.SLOW, slow, 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -117,7 +117,7 @@ public class Power_Mark extends Skill implements Listener {
|
|||||||
if (entity.getLocation().distanceSquared(loc) < 25 && MMOCoreUtils.canTarget(data.getPlayer(), entity)) {
|
if (entity.getLocation().distanceSquared(loc) < 25 && MMOCoreUtils.canTarget(data.getPlayer(), entity)) {
|
||||||
entity.setVelocity(format(entity.getLocation().subtract(loc).toVector().setY(0)).setY(.3));
|
entity.setVelocity(format(entity.getLocation().subtract(loc).toVector().setY(0)).setY(.3));
|
||||||
((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.SLOW, (int) (stun * 20), 10, false, false));
|
((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.SLOW, (int) (stun * 20), 10, false, false));
|
||||||
stats.damage((LivingEntity) entity, accumulate, DamageType.SKILL, DamageType.MAGICAL);
|
stats.damage((LivingEntity) entity, accumulate, DamageType.SKILL, DamageType.MAGIC);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -26,5 +26,5 @@ intelligence:
|
|||||||
name: Intelligence
|
name: Intelligence
|
||||||
max-points: 40
|
max-points: 40
|
||||||
buff:
|
buff:
|
||||||
magical_damage: 2
|
magic_damage: 2
|
||||||
cooldown_reduction: 1
|
cooldown_reduction: 1
|
||||||
|
@ -64,7 +64,7 @@ items:
|
|||||||
- '&7Current {name}: &6&l{current}'
|
- '&7Current {name}: &6&l{current}'
|
||||||
- ''
|
- ''
|
||||||
- '&8When Leveled Up:'
|
- '&8When Leveled Up:'
|
||||||
- '&7 +{buff_magical_damage}% Magical Damage (&a+{total_magical_damage}%&7)'
|
- '&7 +{buff_magic_damage}% Magic Damage (&a+{total_magic_damage}%&7)'
|
||||||
- '&7 +{buff_cooldown_reduction}% Cooldown Reduction (&a+{total_cooldown_reduction}%&7)'
|
- '&7 +{buff_cooldown_reduction}% Cooldown Reduction (&a+{total_cooldown_reduction}%&7)'
|
||||||
- ''
|
- ''
|
||||||
- '&eClick to level up for 1 attribute point.'
|
- '&eClick to level up for 1 attribute point.'
|
||||||
|
@ -69,8 +69,8 @@ default:
|
|||||||
base: 0
|
base: 0
|
||||||
per-level: 0
|
per-level: 0
|
||||||
|
|
||||||
# Magical skill damage
|
# Magic skill damage
|
||||||
MAGICAL_DAMAGE:
|
MAGIC_DAMAGE:
|
||||||
base: 0
|
base: 0
|
||||||
per-level: 0
|
per-level: 0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user