diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java index bd2f8a98f..d72a1cb5f 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java @@ -43,6 +43,7 @@ public class CustomExplosion extends Explosion private boolean _dropItems = true; private boolean _damageBlocksEqually; private boolean _createFire; + private boolean _ignoreRate = true; public CustomExplosion(DamageManager manager, Location loc, float explosionSize, String deathCause) { @@ -51,6 +52,12 @@ public class CustomExplosion extends Explosion _manager = manager; _damageReason = deathCause; } + + public CustomExplosion setIgnoreRate(boolean ignoreRate) + { + _ignoreRate = ignoreRate; + return this; + } public CustomExplosion setBlocksDamagedEqually(boolean damageEqually) { @@ -185,7 +192,7 @@ public class CustomExplosion extends Explosion if (entity.getBukkitEntity() instanceof LivingEntity) { _manager.NewDamageEvent((LivingEntity) entity.getBukkitEntity(), _owner, null, - DamageCause.ENTITY_EXPLOSION, damage, true, true, false, _damageReason, _damageReason); + DamageCause.ENTITY_EXPLOSION, damage, true, _ignoreRate, false, _damageReason, _damageReason); } else { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellType.java index 0017563f8..544680909 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellType.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellType.java @@ -293,10 +293,10 @@ public enum SpellType // ❤ 15, // Mana cost 5, // Spell cooldown -2, // Mana cost change per level - -1, // Cooldown change per level + 0, // Cooldown change per level 15, // Item amount in loot - C.cGold + C.Bold + "Damage: " + C.Bold + C.cWhite + "(Spell Level / 2) + 2.5", + C.cGold + C.Bold + "Damage: " + C.Bold + C.cWhite + "(Spell Level / 2) + 2", C.cGold + C.Bold + "Range: " + C.Bold + C.cWhite + "Spell Level x 15", @@ -340,7 +340,7 @@ public enum SpellType // ❤ 0, // Cooldown change per level 10, // Item amount in loot - C.cGold + C.Bold + "Damage: " + C.Bold + C.cWhite + "(Spell Level x 1.5) + 2.5", + C.cGold + C.Bold + "Damage: " + C.Bold + C.cWhite + "Spell Level + 2", C.cGold + C.Bold + "Range: " + C.Bold + C.cWhite + "Spell Level x 10", diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellImplode.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellImplode.java index 0ca6387c2..760f7ab89 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellImplode.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellImplode.java @@ -43,21 +43,6 @@ public class SpellImplode extends Spell implements SpellClick Location centerLocation = centerBlock.getLocation().clone().add(0.5, 0.5, 0.5); int size = (int) (1.5F + (getSpellLevel(p) * 0.7F)); - /* for (Entity entity : centerLocation.getWorld().getEntities()) - { - if (!(entity instanceof Player) || Wizards.IsAlive(entity)) - { - Location loc = entity.getLocation(); - - if (loc.distance(centerLocation) <= size * 2) - { - entity.setVelocity(centerLocation.toVector().subtract(loc.toVector()).normalize() - .multiply((size * 2D) / Math.max(1, loc.distance(centerLocation)))); - entity.setFallDistance(-2); - } - } - }*/ - for (int x = -size * 2; x <= size * 2; x++) { for (int y = -size; y <= size; y++) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLance.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLance.java index a6150c9b9..68928a930 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLance.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLance.java @@ -93,6 +93,8 @@ public class SpellLance extends Spell implements SpellClick explosion.setPlayer(player, false); explosion.setDropItems(false); + + explosion.setIgnoreRate(false); explosion.explode(); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellMagicMissile.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellMagicMissile.java index 80e7f4f41..48ef38ade 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellMagicMissile.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellMagicMissile.java @@ -26,7 +26,7 @@ public class SpellMagicMissile extends Spell implements SpellClick final Vector direction = missileLocation.getDirection().normalize().multiply(0.3); final int maxRange = 15 * getSpellLevel(player); final int maxDings = maxRange * 3; - final int damage = 5 + getSpellLevel(player); + final int damage = 4 + getSpellLevel(player); new BukkitRunnable() { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellRumble.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellRumble.java index 2dcf444f6..bd3f58e73 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellRumble.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellRumble.java @@ -50,7 +50,7 @@ public class SpellRumble extends Spell implements SpellClickBlock, SpellClick final BlockFace moveDirection = _radial[Math.round(player.getEyeLocation().getYaw() / 45f) & 0x7]; final int spellLevel = getSpellLevel(player); - final int damage = 5 + (spellLevel * 3); + final int damage = 4 + (spellLevel * 2); final int maxDist = 10 * spellLevel; player.getWorld().playEffect(target.getLocation(), Effect.STEP_SOUND, target.getTypeId());