From c76a8390fc2760647ba91e8b92ce64032aba7a2a Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 31 Jan 2018 18:00:49 +0000 Subject: [PATCH] Fix more GI issues --- .../game/games/smash/kits/KitSpider.java | 6 ++-- .../perks/creeper/PerkCreeperSulphurBomb.java | 2 +- .../smash/perks/magmacube/PerkMagmaBlast.java | 33 +++++++------------ .../game/arcade/kit/perks/PerkLazer.java | 4 +-- 4 files changed, 18 insertions(+), 27 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java index aa7bdab00..983ad6f71 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java @@ -80,10 +80,10 @@ public class KitSpider extends SmashKit }; private static final ItemStack[] PLAYER_ARMOR = { - ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS), - null, + ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS), + ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS), ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE), - ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_HELMET), + null, }; public KitSpider(ArcadeManager manager) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperSulphurBomb.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperSulphurBomb.java index 616cbc939..299cda6de 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperSulphurBomb.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperSulphurBomb.java @@ -139,7 +139,7 @@ public class PerkCreeperSulphurBomb extends SmashPerk Item ent = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.COAL, (byte) 0)); UtilAction.velocity(ent, player.getLocation().getDirection(), 1.2, false, 0, 0.2, 10, false); - Manager.GetProjectile().AddThrow(ent, player, _sulphurThrown, -1, true, true, true, true, null, 1f, 1f, null, 1, UpdateType.SLOW, 1); + Manager.GetProjectile().AddThrow(ent, player, _sulphurThrown, -1, true, true, true, true, null, 1f, 1f, null, 1, UpdateType.SLOW, 0.8F); // Inform UtilPlayer.message(player, F.main("Game", "You used " + F.skill(GetName()) + ".")); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/magmacube/PerkMagmaBlast.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/magmacube/PerkMagmaBlast.java index a5ea688f4..569568f7e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/magmacube/PerkMagmaBlast.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/magmacube/PerkMagmaBlast.java @@ -2,7 +2,6 @@ package nautilus.game.arcade.game.games.smash.perks.magmacube; import java.util.HashMap; import java.util.Iterator; -import java.util.List; import java.util.Map; import net.minecraft.server.v1_8_R3.EntityLargeFireball; @@ -50,7 +49,7 @@ public class PerkMagmaBlast extends Perk private int _fireRadius; private int _damage; - private Map _proj = new HashMap<>(); + private final Map _proj = new HashMap<>(); public PerkMagmaBlast() { @@ -151,7 +150,6 @@ public class PerkMagmaBlast extends Perk { projIterator.remove(); proj.remove(); - continue; } } } @@ -180,34 +178,27 @@ public class PerkMagmaBlast extends Perk Player shooter = (Player) proj.getShooter(); // Velocity Players - Map hitMap = UtilPlayer.getInRadius(proj.getLocation(), _velocityRadius); - - List team = TeamSuperSmash.getTeam(Manager, shooter, false); - for (Player cur : hitMap.keySet()) - { - if(team.contains(cur)) - { - continue; - } - - double range = hitMap.get(cur); + Map hitMap = UtilPlayer.getInRadius(proj.getLocation().subtract(0, 1, 0), _velocityRadius); + hitMap.forEach((player, range) -> + { if (range > 0.8) { - range = 1; + range = 1D; } - Manager.GetDamage().NewDamageEvent(cur, shooter, proj, DamageCause.PROJECTILE, range * _damage, false, true, false, shooter.getName(), GetName()); - + Manager.GetDamage().NewDamageEvent(player, shooter, proj, DamageCause.PROJECTILE, range * _damage, false, true, false, shooter.getName(), GetName()); + // Velocity - UtilAction.velocity(cur, UtilAlg.getTrajectory(proj.getLocation().add(0, -0.5, 0), cur.getEyeLocation()), 1 + 2 * range, false, 0, 0.2 + 0.4 * range, 1.2, true); - } + UtilAction.velocity(player, UtilAlg.getTrajectory(proj.getLocation().add(0, -0.5, 0), player.getEyeLocation()), 1 + 2 * range, false, 0, 0.2 + 0.4 * range, 1.2, true); + }); // Particles UtilParticle.PlayParticleToAll(ParticleType.LAVA, proj.getLocation(), 0.1f, 0.1f, 0.1f, 0.1f, 50, ViewDist.LONG); } - - @EventHandler + + //TODO REMOVE METHOD IF FIRE GONE DONT FORGET + //@EventHandler public void damage(CustomDamageEvent event) { if (event.GetProjectile() == null || event.GetDamageeEntity() == null) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkLazer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkLazer.java index c2e9546a1..85d2c40f5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkLazer.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkLazer.java @@ -47,7 +47,7 @@ public class PerkLazer extends Perk private long _recharge; private float _chargePerTick; private float _hitBoxRadius; - private int _damageRadius; + private float _damageRadius; private int _damage; private float _knockbackMagnitude; private double _range; @@ -65,7 +65,7 @@ public class PerkLazer extends Perk _recharge = getPerkTime("Cooldown"); _chargePerTick = getPerkFloat("Charge Per Tick"); _hitBoxRadius = getPerkFloat("Hit Box Radius"); - _damageRadius = getPerkInt("Damage Radius"); + _damageRadius = getPerkFloat("Damage Radius"); _damage = getPerkInt("Damage"); _knockbackMagnitude = getPerkFloat("Knockback Magnitude"); _range = getPerkInt("Range");