From e7f79aa5bfec4727eb1fd2419d0a106be2ddfb04 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Wed, 3 Sep 2014 11:42:50 -0500 Subject: [PATCH 1/8] Update IntelliJ files for latest changes --- Plugins/.idea/libraries/craftbukkit.xml | 4 ++-- Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml | 1 - Plugins/Mineplex.Core/Mineplex.Core.iml | 1 - Plugins/Mineplex.Hub/Mineplex.Hub.iml | 1 - .../Mineplex.Minecraft.Game.ClassCombat.iml | 1 - .../Mineplex.Minecraft.Game.Core.iml | 1 - Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml | 1 - 7 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Plugins/.idea/libraries/craftbukkit.xml b/Plugins/.idea/libraries/craftbukkit.xml index 4b176a94e..d3750ebca 100644 --- a/Plugins/.idea/libraries/craftbukkit.xml +++ b/Plugins/.idea/libraries/craftbukkit.xml @@ -1,13 +1,13 @@ - + - + \ No newline at end of file diff --git a/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml b/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml index be0d60967..b59695f8a 100644 --- a/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml +++ b/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml @@ -7,7 +7,6 @@ - diff --git a/Plugins/Mineplex.Core/Mineplex.Core.iml b/Plugins/Mineplex.Core/Mineplex.Core.iml index cbebd0c40..14fefcaee 100644 --- a/Plugins/Mineplex.Core/Mineplex.Core.iml +++ b/Plugins/Mineplex.Core/Mineplex.Core.iml @@ -13,7 +13,6 @@ - diff --git a/Plugins/Mineplex.Hub/Mineplex.Hub.iml b/Plugins/Mineplex.Hub/Mineplex.Hub.iml index 6b8306237..dfc217d28 100644 --- a/Plugins/Mineplex.Hub/Mineplex.Hub.iml +++ b/Plugins/Mineplex.Hub/Mineplex.Hub.iml @@ -13,7 +13,6 @@ - diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml b/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml index 0bffff66a..b3324f1c3 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml @@ -10,7 +10,6 @@ - diff --git a/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml b/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml index 569e314c3..6882d9ec9 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml +++ b/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml @@ -9,7 +9,6 @@ - diff --git a/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml b/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml index fbc647369..5955ea339 100644 --- a/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml +++ b/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml @@ -11,7 +11,6 @@ - From 39b46bc8f5b4a3430be9c2d5e32e60db5912cab0 Mon Sep 17 00:00:00 2001 From: CoderTim Date: Wed, 3 Sep 2014 16:53:29 -0400 Subject: [PATCH 2/8] Fixed some NPEs --- .../game/arcade/stats/ParalympicsStatTracker.java | 9 ++++++--- .../game/arcade/stats/SharpShooterStatTracker.java | 2 +- .../game/arcade/stats/TheComebackStatTracker.java | 7 +++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java index 11ced4a3f..1ccd38060 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java @@ -38,10 +38,13 @@ public class ParalympicsStatTracker extends StatTracker { List winners = getGame().getWinners(); - for (Player winner : winners) + if (winners != null) { - if (!_hasLeaped.contains(winner.getUniqueId())) - addStat(winner, "Paralympics", 1, true, false); + for (Player winner : winners) + { + if (!_hasLeaped.contains(winner.getUniqueId())) + addStat(winner, "Paralympics", 1, true, false); + } } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java index bd447e27b..95cd038fa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java @@ -32,7 +32,7 @@ public class SharpShooterStatTracker extends StatTracker if (event.getEntity().getShooter() instanceof Player && event.getEntity() instanceof Arrow) { - Player player = (Player) event.getEntity(); + Player player = (Player) event.getEntity().getShooter(); Integer count = _arrowsShot.get(player.getUniqueId()); count = (count == null ? 0 : count) + 1; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java index 5c07783ab..36346e496 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java @@ -46,8 +46,11 @@ public class TheComebackStatTracker extends StatTracker { if (_hasWentFiveOrBelow.contains(getGame().WinnerTeam)) { - for (Player player : getGame().getWinners()) - addStat(player, "TheComeback", 1, true, false); + if (getGame().getWinners() != null) + { + for (Player player : getGame().getWinners()) + addStat(player, "TheComeback", 1, true, false); + } } } } From aae46bdeda1b197205ef399d73c10e41de2add67 Mon Sep 17 00:00:00 2001 From: CoderTim Date: Wed, 3 Sep 2014 16:58:53 -0400 Subject: [PATCH 3/8] Removed unused intellij module --- Plugins/.idea/modules.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/Plugins/.idea/modules.xml b/Plugins/.idea/modules.xml index 0b686628a..5c820afca 100644 --- a/Plugins/.idea/modules.xml +++ b/Plugins/.idea/modules.xml @@ -12,7 +12,6 @@ - From f6ce9abed8ebc6593a368c5b14696b2c9b9c0876 Mon Sep 17 00:00:00 2001 From: Chiss Date: Fri, 5 Sep 2014 12:28:29 +1000 Subject: [PATCH 4/8] Minestrike - added mixed slow/instant mode - added accurate hitboxes for slow bullets - added many new weapons - removed speed from knife - adjusted gun balance --- .../src/mineplex/hub/HubManager.java | 2 +- .../game/games/minestrike/MineStrike.java | 451 ++++++++++++++---- .../game/games/minestrike/ShopManager.java | 10 +- .../game/games/minestrike/data/Bullet.java | 15 +- .../items/equipment/armor/Helmet.java | 2 +- .../items/equipment/armor/Kevlar.java | 2 +- .../items/grenades/HighExplosive.java | 2 +- .../minestrike/items/grenades/Incendiary.java | 2 +- .../minestrike/items/grenades/Molotov.java | 2 +- .../minestrike/items/grenades/Smoke.java | 2 +- .../game/games/minestrike/items/guns/Gun.java | 87 +++- .../games/minestrike/items/guns/Shotgun.java | 13 +- .../minestrike/items/guns/pistol/CZ75.java | 8 +- .../minestrike/items/guns/pistol/Deagle.java | 8 +- .../minestrike/items/guns/pistol/Glock18.java | 8 +- .../minestrike/items/guns/pistol/P2000.java | 6 +- .../minestrike/items/guns/pistol/P250.java | 27 ++ .../minestrike/items/guns/rifle/AK47.java | 8 +- .../minestrike/items/guns/rifle/AUG.java | 29 ++ .../minestrike/items/guns/rifle/AWP.java | 6 +- .../minestrike/items/guns/rifle/Famas.java | 27 ++ .../minestrike/items/guns/rifle/Galil.java | 27 ++ .../items/guns/rifle/{M4A1.java => M4A4.java} | 12 +- .../minestrike/items/guns/rifle/SG553.java | 29 ++ .../minestrike/items/guns/rifle/SSG08.java | 31 ++ .../minestrike/items/guns/shotgun/Nova.java | 4 +- .../minestrike/items/guns/shotgun/XM1014.java | 26 + .../games/minestrike/items/guns/smg/P90.java | 8 +- .../minestrike/items/guns/smg/PPBizon.java | 27 ++ .../game/arcade/managers/GameFlagManager.java | 5 +- .../game/arcade/managers/GameGemManager.java | 4 +- 31 files changed, 734 insertions(+), 156 deletions(-) create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/P250.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AUG.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/Famas.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/Galil.java rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/{M4A1.java => M4A4.java} (70%) create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/SG553.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/SSG08.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/shotgun/XM1014.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/smg/PPBizon.java diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index 1480ff17a..05c6b7458 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -54,7 +54,7 @@ import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilWorld; -import mineplex.core.treasure.TreasureManager; +import mineplex.core.treasure.TreasureManager; import mineplex.minecraft.game.core.condition.ConditionManager; import mineplex.core.cosmetic.CosmeticManager; import mineplex.core.disguise.DisguiseManager; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java index 2cc7911e0..eba70388a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java @@ -22,6 +22,8 @@ import org.bukkit.entity.Item; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Painting; import org.bukkit.entity.Player; +import org.bukkit.entity.Projectile; +import org.bukkit.entity.Snowball; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityRegainHealthEvent; @@ -51,6 +53,7 @@ import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilAlg; +import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEvent; import mineplex.core.common.util.UtilGear; @@ -87,6 +90,7 @@ import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType; import nautilus.game.arcade.game.games.minestrike.items.equipment.armor.Armor; import nautilus.game.arcade.game.games.minestrike.items.grenades.Grenade; import nautilus.game.arcade.game.games.minestrike.items.guns.Gun; +import nautilus.game.arcade.game.games.minestrike.items.guns.GunType; import nautilus.game.arcade.game.games.minestrike.items.guns.pistol.Glock18; import nautilus.game.arcade.game.games.minestrike.items.guns.pistol.P2000; import nautilus.game.arcade.game.games.minestrike.items.guns.rifle.AWP; @@ -104,8 +108,11 @@ public class MineStrike extends TeamGame private int _roundsToWin = 10; private long _roundTime = 120000; - private boolean _bulletInstant = true; - + private boolean _debug = true; + private int _bulletInstant = 2; //0 = Slow, 1 = Instant, 2 = Mix + private boolean _customHitbox = true; + private boolean _bulletAlternate = false; + //Map Data private ArrayList _bombSites; @@ -123,7 +130,7 @@ public class MineStrike extends TeamGame private HashMap _bullets = new HashMap(); private HashMap _grenadesThrown = new HashMap(); - + private HashMap _incendiary = new HashMap(); private Bomb _bomb = null; @@ -177,7 +184,7 @@ public class MineStrike extends TeamGame this._help = new String[] { - "Tap Crouch when close to an ally to Boost", + //"Tap Crouch when close to an ally to Boost", "Moving decreases accuracy", "Sprinting heavily decreases accuracy", "Jumping massively decreases accuracy", @@ -187,6 +194,8 @@ public class MineStrike extends TeamGame "Left-Click to roll Grenades", "Right-Click to throw Grenades", "Burst Fire for greater accuracy", + "Sniper Rifles are only accurate while scoped", + "Rifles have 30% recoil reduction while scoped", }; } @@ -228,7 +237,7 @@ public class MineStrike extends TeamGame //Sneak disguiseSneak(event.GetPlayer(), team); - + //Armor giveTeamArmor(event.GetPlayer(), Color.fromRGB(255, 0, 0)); } @@ -244,7 +253,7 @@ public class MineStrike extends TeamGame //Sneak disguiseSneak(event.GetPlayer(), team); - + //Armor giveTeamArmor(event.GetPlayer(), Color.fromRGB(0, 0, 255)); } @@ -441,7 +450,7 @@ public class MineStrike extends TeamGame { _grenadesThrown.put(ent, grenade); } - + public void registerIncendiary(Location loc, long endTime) { _incendiary.put(loc, endTime); @@ -652,7 +661,7 @@ public class MineStrike extends TeamGame primaryDropped = true; } } - + //Drop Remaining boolean grenadeDropped = false; for (StrikeItem item : toDrop) @@ -660,14 +669,14 @@ public class MineStrike extends TeamGame //Record Primary Dropped if (item.getType() == StrikeItemType.PRIMARY_WEAPON) continue; - + //Pistol if (item.getType() == StrikeItemType.SECONDARY_WEAPON) { item.drop(this, player, true, primaryDropped); continue; } - + //Grenade if (item.getType() == StrikeItemType.GRENADE) { @@ -675,7 +684,7 @@ public class MineStrike extends TeamGame grenadeDropped = true; continue; } - + //Other item.drop(this, player, true, false); } @@ -761,31 +770,106 @@ public class MineStrike extends TeamGame gun.reduceCone(); } } + + @EventHandler + public void slowBulletHit(final ProjectileHitEvent event) + { + if (!(event.getEntity() instanceof Snowball)) + return; + + Bullet bullet = _bullets.get(event.getEntity()); + + //Particle + if (bullet != null && bullet.Shooter != null) + UtilParticle.PlayParticle(bullet.Shooter, ParticleType.FIREWORKS_SPARK, event.getEntity().getLocation(), 0, 0, 0, 0, 1); + + //Hit Block Sound + event.getEntity().getWorld().playSound(event.getEntity().getLocation(), Sound.ENDERMAN_HIT, 1f, 1f); + + //Block Particle + Location loc = event.getEntity().getLocation().add(event.getEntity().getVelocity().multiply(0.8)); + Block block = loc.getBlock(); + + if (block.getType() == Material.AIR) + { + Block closest = null; + double closestDist = 0; + + for (Block other : UtilBlock.getSurrounding(block, true)) + { + if (other.getType() == Material.AIR) + continue; + + double dist = UtilMath.offset(loc, other.getLocation().add(0.5, 0.5, 0.5)); + + if (closest == null || dist < closestDist) + { + closest = other; + closestDist = dist; + } + } + + if (closest != null) + block = closest; + } + + block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, block.getType()); + } + + @EventHandler + public void slowBulletWhizz(UpdateEvent event) + { + if (event.getType() != UpdateType.TICK) + return; + + for (Entity ent : _bullets.keySet()) + { + if (ent instanceof Snowball) + continue; + + if (ent.getTicksLived() < 10) + continue; + + Bullet bullet = _bullets.get(ent); + + for (Player player : UtilServer.getPlayers()) + { + if (UtilMath.offset(ent, player) < 4) + { + if (!bullet.WhizzSound.contains(player)) + { + player.playSound(ent.getLocation(), Sound.BAT_IDLE, (float)(0.5 + Math.random() * 0.5), 1f); + bullet.WhizzSound.add(player); + } + } + } + } + } @EventHandler(priority = EventPriority.MONITOR) - public void projectileHitParticle(final ProjectileHitEvent event) + public void instantBulletHit(final ProjectileHitEvent event) { if (!(event.getEntity() instanceof Arrow)) return; - + UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(Manager.GetPlugin(), new Runnable() { public void run() { Arrow arrow = (Arrow)event.getEntity(); - + Bullet bullet = _bullets.get(arrow); - + //Particle if (bullet != null && bullet.Shooter != null) UtilParticle.PlayParticle(bullet.Shooter, ParticleType.FIREWORKS_SPARK, arrow.getLocation(), 0, 0, 0, 0, 1); - + //Hit Block Sound arrow.getWorld().playSound(arrow.getLocation(), Sound.ENDERMAN_HIT, 1f, 1f); //Bullet Whiz Sound - bulletWhizzSound(arrow.getLocation(), bullet); - + instantBulletWhizz(arrow.getLocation(), bullet); + //Block Particle try { @@ -810,61 +894,72 @@ public class MineStrike extends TeamGame { e.printStackTrace(); } - + _bullets.remove(arrow); arrow.remove(); } }, 0); } - - private void bulletWhizzSound(Location bulletEndLocation, Bullet bullet) + + private void instantBulletWhizz(Location bulletEndLocation, Bullet bullet) { if (bullet == null) return; - + Location loc = bullet.Origin.clone(); - - HashSet hasPlayedFor = new HashSet(); - + if (bullet.Shooter != null) - hasPlayedFor.add(bullet.Shooter); - + bullet.WhizzSound.add(bullet.Shooter); + //Move between points, check players while (UtilMath.offset(loc, bulletEndLocation) > 1) { //This is used to calculate whether players are between current/end. //Add 5 so you still hear the whizz if it hits just infront of you. double offsetStartToEnd = UtilMath.offset(loc, bulletEndLocation) + 4; - + for (Player player : UtilServer.getPlayers()) { - if (hasPlayedFor.contains(player)) + if (bullet.WhizzSound.contains(player)) continue; - + //Remove players who are not between current/end points if (offsetStartToEnd < UtilMath.offset(player.getEyeLocation(), loc) && - offsetStartToEnd < UtilMath.offset(player.getEyeLocation(), bulletEndLocation)) + offsetStartToEnd < UtilMath.offset(player.getEyeLocation(), bulletEndLocation)) { - hasPlayedFor.add(player); + bullet.WhizzSound.add(player); continue; } - + //Check if (UtilMath.offset(player.getEyeLocation(), loc) < 4) { player.playSound(loc, Sound.BAT_IDLE, (float)(0.5 + Math.random() * 0.5), 1f); - hasPlayedFor.add(player); + bullet.WhizzSound.add(player); } } - + //Move Closer loc.add(UtilAlg.getTrajectory(loc, bulletEndLocation)); } } + + + + @EventHandler(priority=EventPriority.MONITOR) + public void removeArrowsFromPlayer(CustomDamageEvent event) + { + if (event.GetDamageePlayer() != null) + ((CraftPlayer) event.GetDamageePlayer()).getHandle().p(0); + } + @EventHandler(priority=EventPriority.HIGH) public void damage(CustomDamageEvent event) { + if (event.GetDamageePlayer() == null) + return; + if (event.GetCause() == DamageCause.FALL) { event.AddMod(GetName(), "Fall Reduction", -2, false); @@ -927,16 +1022,33 @@ public class MineStrike extends TeamGame return; } - - //Gun Bullet bullet = _bullets.remove(event.GetProjectile()); if (bullet == null) return; + + //Get Hit Area + int hitArea = 0; + + if (_customHitbox) + { + if (event.GetProjectile() instanceof Arrow) + hitArea = getArrowHitArea(event.GetDamageePlayer(), bullet.Origin.clone(), bullet.Direction.clone()); + else + hitArea = getSnowballHitArea(event.GetDamageePlayer(), event.GetProjectile()); + } + + + if (hitArea == -1) + { + event.SetCancelled("Miss"); + return; + } //Bullet Whiz Sound - bulletWhizzSound(event.GetDamageePlayer().getEyeLocation(), bullet); + if (event.GetProjectile() instanceof Arrow) + instantBulletWhizz(event.GetDamageePlayer().getEyeLocation(), bullet); //Wipe previous data! event.GetCancellers().clear(); @@ -945,28 +1057,107 @@ public class MineStrike extends TeamGame if (!Manager.CanHurt(event.GetDamageePlayer(), event.GetDamagerPlayer(true))) event.SetCancelled("Team Damage"); - event.AddMod(GetName(), "Negate Arrow", -event.GetDamageInitial(), false); - - event.AddMod(GetName(), bullet.Gun.getName(), bullet.getDamage(event.GetDamageeEntity().getLocation()), true); + event.AddMod(GetName(), "Negate Default", -event.GetDamageInitial(), false); - if (event.GetDamageePlayer() != null) + //Damage + Dropoff + double damage = bullet.getDamage(); + double damageDropoff = bullet.getDamageDropoff(event.GetDamageeEntity().getLocation()); + + //Add Damages + event.AddMod(bullet.Shooter.getName(), bullet.Gun.getName(), damage, true); + event.AddMod(bullet.Shooter.getName(), "Distance Dropoff", damageDropoff, false); + + //Headshot + if (hitArea == 1) { - //Damage Reduction - if (Armor.isArmor(event.GetDamageePlayer().getInventory().getChestplate())) + event.AddMod(bullet.Shooter.getName(), "Headshot", damage*2, true); + + if (Armor.isArmor(event.GetDamageePlayer().getInventory().getHelmet())) { - event.AddMod(GetName(), "Kevlar", -0.25 * bullet.getDamage(event.GetDamageeEntity().getLocation()), false); + event.AddMod(event.GetDamageePlayer().getName(), "Helmet", -damage*1, false); + event.GetDamageePlayer().getWorld().playSound(event.GetDamageePlayer().getEyeLocation(), Sound.SPIDER_DEATH, 1f, 1f); } - //Mini-Stun else { - event.GetDamageePlayer().setVelocity(new Vector(0,0,0)); + + event.GetDamageePlayer().getWorld().playSound(event.GetDamageePlayer().getEyeLocation(), Sound.SLIME_ATTACK, 1f, 1f); } } - + + //Kevlar - Body Hit + if (hitArea == 0 && Armor.isArmor(event.GetDamageePlayer().getInventory().getChestplate())) + { + double damageArmor = -(1 - bullet.Gun.getArmorPenetration()) * (damage + damageDropoff); + + event.AddMod(event.GetDamageePlayer().getName(), "Kevlar", damageArmor, false); + } + //Mini-Stun + else + { + event.GetDamageePlayer().setVelocity(new Vector(0,0,0)); + } + event.SetKnockback(false); event.SetIgnoreRate(true); event.SetIgnoreArmor(true); } + + public int getArrowHitArea(Player damagee, Location origin, Vector trajectory) + { + //Move to near-player + Location start = origin.clone().add(trajectory.multiply(UtilMath.offset(origin, damagee.getEyeLocation()) - 2)); + + Location loc = start.clone(); + + while (!hitHead(damagee, loc) && !hitBody(damagee, loc) && UtilMath.offset(damagee.getLocation(), loc) < 6) + { + loc.add(trajectory.clone().multiply(0.1)); + } + + if (hitHead(damagee, loc)) + return 1; + + if (hitBody(damagee, loc)) + return 0; + + return -1; + } + + public int getSnowballHitArea(Player damagee, Projectile snowball) + { + //Move to near-player + Location start = snowball.getLocation(); + + Location loc = start.clone(); + + while (!hitHead(damagee, loc) && !hitBody(damagee, loc) && UtilMath.offset(damagee.getLocation(), loc) < 6) + { + loc.add(snowball.getVelocity().clone().multiply(0.1)); + } + + if (hitHead(damagee, loc)) + return 1; + + if (hitBody(damagee, loc)) + return 0; + + return -1; + } + + public boolean hitBody(Player player, Location loc) + { + return UtilMath.offset2d(loc, player.getLocation()) < 0.6 && //0.6 is ideal + loc.getY() > player.getLocation().getY() && + loc.getY() < player.getEyeLocation().getY() - 0.2; + } + + public boolean hitHead(Player player, Location loc) + { + return UtilMath.offset2d(loc, player.getLocation()) < 0.3 && //0.3 is ideal + loc.getY() >= player.getEyeLocation().getY() - 0.2 && + loc.getY() < player.getEyeLocation().getY() + 0.2; + } + @EventHandler public void killReward(CombatDeathEvent event) @@ -1223,6 +1414,8 @@ public class MineStrike extends TeamGame _bombDefuser.setExp(0f); UtilPlayer.message(player, F.main("Game", "You are defusing the Bomb.")); + + _bombDefuser.getWorld().playSound(_bombDefuser.getLocation(), Sound.PISTON_RETRACT, 2f, 1f); } @EventHandler @@ -1251,9 +1444,6 @@ public class MineStrike extends TeamGame _bombDefuser.setExp(Math.min(_bombDefuser.getExp() + defuseRate, 0.99999f)); - if (Math.random() > 0.95) - _bombDefuser.getWorld().playSound(_bombDefuser.getLocation(), Sound.PISTON_RETRACT, 1f, (float)(Math.random() + 1f)); - if (_bombDefuser.getExp() >= 0.98f) { _bomb.defuse(); @@ -1528,6 +1718,28 @@ public class MineStrike extends TeamGame for (GameTeam team : GetTeamList()) for (Player teamMember : team.GetPlayers(true)) GetScoreboard().SetPlayerTeam(teamMember, team.GetName().toUpperCase()); + + //Alternate Bullets + if (_bulletAlternate) + _bulletInstant = (_bulletInstant + 1)%3; + + //Debug Details + if (_debug) + { + Announce(C.cDPurple + C.Bold + "ROUND SETTINGS:"); + + if (_customHitbox) + Announce(C.cPurple + C.Bold + "Hitbox: " + ChatColor.RESET + "Accurate with Headshots"); + else + Announce(C.cPurple + C.Bold + "Hitbox: " + ChatColor.RESET + "Default with No Headshot"); + + if (_bulletInstant == 0) + Announce(C.cPurple + C.Bold + "Bullets: " + ChatColor.RESET + "Slow and Visible"); + else if (_bulletInstant == 1) + Announce(C.cPurple + C.Bold + "Bullets: " + ChatColor.RESET + "Instant and Invisible"); + else + Announce(C.cPurple + C.Bold + "Bullets: " + ChatColor.RESET + "Slow and Visible with Instant Sniper"); + } } public void giveMoney() @@ -1612,7 +1824,7 @@ public class MineStrike extends TeamGame for (Entity ent : _bullets.keySet()) ent.remove(); _bullets.clear(); - + //Incendiary _incendiary.clear(); @@ -1620,6 +1832,10 @@ public class MineStrike extends TeamGame for (Gun gun : _gunsEquipped.keySet()) gun.restockAmmo(_gunsEquipped.get(gun)); + //Health + for (Player player : UtilServer.getPlayers()) + player.setHealth(20); + //Reset Shop for (Player player : UtilServer.getPlayers()) _shopManager.leaveShop(player, false, false); @@ -1628,7 +1844,7 @@ public class MineStrike extends TeamGame @EventHandler(priority = EventPriority.HIGHEST) public void specToTeam(PlayerJoinEvent event) { - if (GetState() == GameState.Recruit) + if (GetState() == GameState.Recruit || GetState() == GameState.Loading) return; //Target Team @@ -1691,7 +1907,7 @@ public class MineStrike extends TeamGame event.setTo(event.getFrom()); } - @EventHandler + //@EventHandler public void boostClimb(PlayerToggleSneakEvent event) { if (!IsLive()) @@ -1742,7 +1958,7 @@ public class MineStrike extends TeamGame if (gun == null) return; - if (!(gun instanceof AWP)) + if (!gun.hasScope()) return; //Enable @@ -1752,9 +1968,11 @@ public class MineStrike extends TeamGame Manager.GetCondition().Factory().Slow("Scope", event.getPlayer(), null, 9999, 2, false, false, false, false); event.getPlayer().getInventory().setHelmet(new ItemStack(Material.PUMPKIN)); - event.getPlayer().getWorld().playSound(event.getPlayer().getEyeLocation(), Sound.GHAST_DEATH, 0.8f, 1f); - - Manager.GetCondition().Factory().Blind("Scope Blind", event.getPlayer(), null, 1, 1, false, false, false); + if (gun.getGunType() == GunType.SNIPER) + { + event.getPlayer().getWorld().playSound(event.getPlayer().getEyeLocation(), Sound.GHAST_DEATH, 0.8f, 1f); + Manager.GetCondition().Factory().Blind("Scope Blind", event.getPlayer(), null, 1, 1, false, false, false); + } } else { @@ -1777,13 +1995,13 @@ public class MineStrike extends TeamGame continue; Gun gun = getGunInHand(player, null); - if (gun == null || !(gun instanceof AWP) || !player.isSneaking()) + if (!gun.hasScope() || !player.isSneaking()) { removeScope(player); } } } - + public void removeScope(Player player) { ItemStack stack = _scoped.remove(player); @@ -1792,8 +2010,8 @@ public class MineStrike extends TeamGame player.getWorld().playSound(player.getEyeLocation(), Sound.GHAST_DEATH, 0.8f, 1f); } - - @EventHandler + + //@EventHandler public void speedUpdate(UpdateEvent event) { if (!IsLive()) @@ -1810,32 +2028,49 @@ public class MineStrike extends TeamGame Manager.GetCondition().EndCondition(player, ConditionType.SPEED, null); } } - + @EventHandler public void incendiaryUpdate(UpdateEvent event) { if (event.getType() == UpdateType.TICK) for (Player player : UtilServer.getPlayers()) player.setFireTicks(0); - + if (event.getType() != UpdateType.SLOW) return; - + Iterator fireIterator = _incendiary.keySet().iterator(); - + while (fireIterator.hasNext()) { Location loc = fireIterator.next(); - + if (_incendiary.get(loc) < System.currentTimeMillis()) fireIterator.remove(); - + else loc.getWorld().playSound(loc, Sound.PIG_DEATH, 1f, 1f); } } - + @EventHandler + public void bombBurnUpdate(UpdateEvent event) + { + if (event.getType() != UpdateType.TICK) + return; + + if (_bombItem == null) + return; + + if (!_bombItem.isValid()) + { + Location loc = _bombItem.getLocation(); + + _bombItem.remove(); + + _bombItem = loc.getWorld().dropItemNaturally(loc, new ItemStack(Material.GOLD_SWORD)); + } + } @Override @EventHandler @@ -2028,6 +2263,9 @@ public class MineStrike extends TeamGame { if (!IsLive()) return; + + if (event.getType() != UpdateType.TICK) + return; Location target = null; if (_bombItem != null) @@ -2113,34 +2351,71 @@ public class MineStrike extends TeamGame event.setCancelled(true); } - public boolean isInstantBullets() + public int getBulletType() { return _bulletInstant; } - @EventHandler - public void debugBullets(PlayerCommandPreprocessEvent event) - { - if (!event.getPlayer().isOp()) - return; - - if (event.getMessage().contains("debugbullets")) - { - _bulletInstant = !_bulletInstant; - - Announce(C.cPurple + C.Bold + "Instant Bullets: " + ChatColor.RESET + _bulletInstant); - - event.setCancelled(true); - } - } - - //Cleans entities that may not have been removed due to unloaded chunks @EventHandler public void debug(PlayerCommandPreprocessEvent event) { if (!event.getPlayer().isOp()) return; + if (event.getMessage().contains("money")) + { + _shopManager.addMoney(event.getPlayer(), 16000, "Debug"); + event.setCancelled(true); + } + + if (event.getMessage().contains("instant")) + { + _bulletInstant = (_bulletInstant + 1)%3; + + if (_bulletInstant == 0) + Announce(C.cPurple + C.Bold + "Bullets: " + ChatColor.RESET + "Slow and Visible"); + else if (_bulletInstant == 1) + Announce(C.cPurple + C.Bold + "Bullets: " + ChatColor.RESET + "Instant and Invisible"); + else + Announce(C.cPurple + C.Bold + "Bullets: " + ChatColor.RESET + "Slow and Visible with Instant Sniper"); + + + event.setCancelled(true); + } + + if (event.getMessage().contains("hitbox")) + { + _customHitbox = !_customHitbox; + + if (_customHitbox) + Announce(C.cPurple + C.Bold + "Hitbox: " + ChatColor.RESET + "Accurate with Headshots"); + else + Announce(C.cPurple + C.Bold + "Hitbox: " + ChatColor.RESET + "Default with No Headshot"); + + event.setCancelled(true); + } + + if (event.getMessage().contains("alternate")) + { + _bulletAlternate = !_bulletAlternate; + + Announce(C.cPurple + C.Bold + "Alternate Bullet Type: " + ChatColor.RESET + _bulletAlternate); + + event.setCancelled(true); + } + + if (event.getMessage().contains("god")) + { + if (HealthSet == 20) + HealthSet = -1; + else + HealthSet = 20; + + Announce(C.cPurple + C.Bold + "God Mode: " + ChatColor.RESET + (HealthSet == 20)); + + event.setCancelled(true); + } + if (event.getMessage().contains("debugplayer")) { Announce(C.Bold + "PLAYER DEBUG:"); @@ -2176,6 +2451,4 @@ public class MineStrike extends TeamGame event.setCancelled(true); } } - - } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/ShopManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/ShopManager.java index 10f1b761d..d7a247f64 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/ShopManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/ShopManager.java @@ -61,19 +61,25 @@ public class ShopManager //Pistols slot = 9; addItem(team.GetColor() == ChatColor.RED ? new Glock18() : new P2000(), player, slot++); + addItem(new P250(), player, slot++); addItem(new CZ75(), player, slot++); addItem(new Deagle(), player, slot++); //Shotgun slot = 18; addItem(new Nova(), player, slot++); - + addItem(new XM1014(), player, slot++); + //SMG + addItem(new PPBizon(), player, slot++); addItem(new P90(), player, slot++); //Rifles slot = 27; - addItem(team.GetColor() == ChatColor.RED ? new AK47() : new M4A1(), player, slot++); + addItem(team.GetColor() == ChatColor.RED ? new Galil() : new Famas(), player, slot++); + addItem(team.GetColor() == ChatColor.RED ? new AK47() : new M4A4(), player, slot++); + addItem(team.GetColor() == ChatColor.RED ? new SG553() : new AUG(), player, slot++); + addItem(new SSG08(), player, slot++); addItem(new AWP(), player, slot++); //Grenades diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/data/Bullet.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/data/Bullet.java index 4ca7d688c..a20d3b8fc 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/data/Bullet.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/data/Bullet.java @@ -1,11 +1,14 @@ package nautilus.game.arcade.game.games.minestrike.data; +import java.util.HashSet; + import nautilus.game.arcade.game.games.minestrike.MineStrike; import nautilus.game.arcade.game.games.minestrike.items.guns.Gun; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; +import org.bukkit.util.Vector; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilTime; @@ -16,15 +19,18 @@ public class Bullet public Entity Bullet; public Gun Gun; public Location Origin; + public Vector Direction; public long LastSound = System.currentTimeMillis() - 100; + public HashSet WhizzSound = new HashSet(); public Bullet(Entity bullet, Gun gun, Player shooter, MineStrike game) { Bullet = bullet; Gun = gun; Origin = shooter.getEyeLocation(); + Direction = shooter.getLocation().getDirection(); Shooter = shooter; } @@ -33,9 +39,14 @@ public class Bullet return Bullet.isValid(); } - public double getDamage(Location destination) + public double getDamage() { - return Gun.getDamage() * (1 - (Gun.getDropOff() * UtilMath.offset(Origin, destination))); + return Gun.getDamage(); + } + + public double getDamageDropoff(Location destination) + { + return -Gun.getDamage() * (Gun.getDropOff() * UtilMath.offset(Origin, destination)); } public boolean bulletSound() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Helmet.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Helmet.java index df3661f47..8ea208326 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Helmet.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Helmet.java @@ -9,7 +9,7 @@ public class Helmet extends Armor { super("Helmet", new String[] { - "Reduces damage from headshots" + "Reduces damage from head shots" }, 350, 0, Material.LEATHER_HELMET); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Kevlar.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Kevlar.java index 329fd4e15..f74cae895 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Kevlar.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Kevlar.java @@ -9,7 +9,7 @@ public class Kevlar extends Armor { super("Kevlar", new String[] { - "Reduces bullet damage by 25%" + "Reduces damage from body shots" }, 650, 0, Material.LEATHER_CHESTPLATE); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java index 920cbd0c9..4bf8f3216 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java @@ -17,7 +17,7 @@ public class HighExplosive extends Grenade { public HighExplosive() { - super("HE Grenade", new String[] + super("High Explosive", new String[] { }, diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Incendiary.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Incendiary.java index cfb9cecf8..dbf3e8475 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Incendiary.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Incendiary.java @@ -6,6 +6,6 @@ public class Incendiary extends FireGrenadeBase { public Incendiary() { - super("Incendiary", 600, 0, Material.PORK, 10000); + super("Incendiary", 600, 0, Material.PORK, 6000); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Molotov.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Molotov.java index f48224fd4..1a5c83f5f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Molotov.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Molotov.java @@ -6,6 +6,6 @@ public class Molotov extends FireGrenadeBase { public Molotov() { - super("Molotov", 400, 0, Material.GRILLED_PORK, 8000); + super("Molotov", 400, 0, Material.GRILLED_PORK, 6000); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java index 9248d1747..dae2365c7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java @@ -12,7 +12,7 @@ public class Smoke extends Grenade { public Smoke() { - super("Smoke Grenade", new String[] + super("Smoke", new String[] { }, diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java index e24527c5d..1c43592d9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java @@ -4,6 +4,7 @@ import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilEnt; +import mineplex.core.common.util.UtilGear; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilPlayer; @@ -24,6 +25,7 @@ import org.bukkit.Sound; import org.bukkit.entity.Arrow; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; +import org.bukkit.entity.Snowball; import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.util.Vector; @@ -40,13 +42,15 @@ public abstract class Gun extends StrikeItem protected long _reloadTime; protected double _damage; protected double _dropOffPerBlock; - protected double _bulletSpeed; + protected double _armorPen; protected Sound _fireSound; protected double _coneMin; protected double _coneMax; protected double _coneReduceRate; protected double _coneIncreaseRate; + + protected boolean _scope = false; //Active Data @@ -60,7 +64,7 @@ public abstract class Gun extends StrikeItem int cost, int gemCost, int clipSize, int clipReserve, long fireRate, long reloadTime, - double damage, double dropOffPerBlock, double bulletSpeed, + double damage, double dropOffPerBlock, double armorPen, double coneMin, double coneMax, double coneIncrease, double coneReduce, Material skin, Sound sound) @@ -80,7 +84,7 @@ public abstract class Gun extends StrikeItem _reloadTime = reloadTime; _damage = damage; _dropOffPerBlock = dropOffPerBlock; - _bulletSpeed = bulletSpeed; + _armorPen = armorPen; _fireSound = sound; @@ -158,8 +162,15 @@ public abstract class Gun extends StrikeItem public Bullet fireBullet(Player player, MineStrike game) { + //Instant? + boolean instant = game.getBulletType() == 1 || (game.getBulletType() == 2 && _gunType == GunType.SNIPER); + //Shoot - Entity bullet = player.launchProjectile(Arrow.class); + Entity bullet; + if (instant) + bullet = player.launchProjectile(Arrow.class); + else + bullet = player.launchProjectile(Snowball.class); //COF double cone = getCone(player); @@ -172,13 +183,19 @@ public abstract class Gun extends StrikeItem cof.add(player.getLocation().getDirection()); cof.normalize(); - bullet.setVelocity(cof.multiply(game.isInstantBullets() ? 200 : _bulletSpeed)); + //Velocity + bullet.setVelocity(cof.multiply(instant ? 200 : 4)); //Increase COF _cone = Math.min(_coneMax, _cone + _coneIncreaseRate); return new Bullet(bullet, this, player, game); } + + public double getArmorPenetration() + { + return _armorPen; + } public double getCone(Player player) { @@ -202,11 +219,20 @@ public abstract class Gun extends StrikeItem //Sniper Zoomed - if (_gunType == GunType.SNIPER) + if (_scope && UtilGear.isMat(player.getInventory().getHelmet(), Material.PUMPKIN)) { - if (player.isSneaking()) + //Snipers Perfectly Accurate if not jumping + if (_gunType == GunType.SNIPER) { - cone -= _cone; + cone = 0; + + if (!UtilEnt.isGrounded(player)) + cone += _gunType.getJumpPenalty(); + } + //30% Recoil Decrease + else + { + cone = cone * 0.7; } } @@ -224,6 +250,11 @@ public abstract class Gun extends StrikeItem return false; } + + public long getReloadTime() + { + return _reloadTime; + } public void reload(Player player) { @@ -242,8 +273,8 @@ public abstract class Gun extends StrikeItem _reserveAmmo = Math.max(0, ammo - _clipSize); //Recharge - Recharge.Instance.useForce(player, getName() + " Shoot", _reloadTime); - Recharge.Instance.use(player, getName() + " Reload", _reloadTime, false, true); + Recharge.Instance.useForce(player, getName() + " Shoot", getReloadTime()); + Recharge.Instance.use(player, getName() + " Reload", getReloadTime(), false, true); //Sound soundReload(player.getLocation()); @@ -268,11 +299,6 @@ public abstract class Gun extends StrikeItem player.getInventory().setItem(_slot, getStack()); } - public double getDamage() - { - return _damage; - } - public double getDropOff() { return _dropOffPerBlock; @@ -363,8 +389,11 @@ public abstract class Gun extends StrikeItem _reserveAmmo = _clipReserve * _clipSize; updateWeaponName(player); - - player.setHealth(20); + } + + public double getDamage() + { + return _damage/5d; } @Override @@ -372,4 +401,28 @@ public abstract class Gun extends StrikeItem { return C.cDGreen + C.Bold + _gunType.getName() + ChatColor.RESET; } + + @Override + public String[] getShopItemCustom() + { + return new String[] + { + C.cYellow + C.Bold + "Clip / Spare Ammo: " + ChatColor.RESET + _clipSize + "/" + _clipReserve*_clipSize, + C.cYellow + C.Bold + "Damage per Bullet: " + ChatColor.RESET + UtilMath.trim(1, getDamage()), + C.cYellow + C.Bold + "Armor Penetration: " + ChatColor.RESET + (int)(_armorPen*100) + "%", + C.cYellow + C.Bold + "Damage Dropoff: " + ChatColor.RESET + (int)(_dropOffPerBlock*1000d) + "% per 10 Blocks", + C.cYellow + C.Bold + "Recoil per Shot: " + ChatColor.RESET + _coneIncreaseRate, + C.cYellow + C.Bold + "Recoil Recovery: " + ChatColor.RESET + _coneReduceRate + " per Second", + }; + } + + public boolean hasScope() + { + return _scope; + } + + public GunType getGunType() + { + return _gunType; + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Shotgun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Shotgun.java index aee4ac52f..70abc67ad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Shotgun.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Shotgun.java @@ -56,8 +56,11 @@ public abstract class Shotgun extends Gun @Override public void soundRefire(Location loc) { - loc.getWorld().playSound(loc, Sound.PISTON_RETRACT, 0.8f, 1.2f); - loc.getWorld().playSound(loc, Sound.PISTON_RETRACT, 0.8f, 1.2f); + if (_fireRate >= 500) + { + loc.getWorld().playSound(loc, Sound.PISTON_RETRACT, 0.8f, 1.2f); + loc.getWorld().playSound(loc, Sound.PISTON_RETRACT, 0.8f, 1.2f); + } } @Override @@ -71,4 +74,10 @@ public abstract class Shotgun extends Gun { } + + @Override + public long getReloadTime() + { + return _reloadTime * Math.min(_reserveAmmo, _clipSize - _loadedAmmo); + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/CZ75.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/CZ75.java index 2df841fd5..cf4463285 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/CZ75.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/CZ75.java @@ -16,12 +16,12 @@ public class CZ75 extends Gun { }, - 300, 0, //Cost, Gem Cost + 500, 0, //Cost, Gem Cost 12, 1, //Clip Size, Spare Ammo 80, 2700, //ROF, Reload Time - 6, 0.01, 3.5, //Damage, Dropoff, Bullet Speed - 0, 0.15, //COF Min, COF Max - 0.06, 0.4, //COF Inc per Bullet, COF Dec per Second + 35, 0.006, 0.77, //Damage, Dropoff, Armor Penetration + 0, 0.25, //COF Min, COF Max + 0.06, 0.3, //COF Inc per Bullet, COF Dec per Second Material.IRON_HOE, Sound.ENDERMAN_DEATH); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/Deagle.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/Deagle.java index 776f094c4..04e909d2b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/Deagle.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/Deagle.java @@ -18,10 +18,10 @@ public class Deagle extends Gun }, 800, 0, //Cost, Gem Cost 7, 5, //Clip Size, Spare Ammo - 300, 2000, //ROF, Reload Time - 9, 0.01, 3.5, //Damage, Dropoff, Bullet Speed - 0, 0.2, //COF Min, COF Max - 0.12, 0.2, //COF Inc per Bullet, COF Dec per Second + 300, 2200, //ROF, Reload Time + 68, 0.007, 0.85, //Damage, Dropoff, Armor Penetration + 0, 0.25, //COF Min, COF Max + 0.18, 0.2, //COF Inc per Bullet, COF Dec per Second Material.GOLD_HOE, Sound.BAT_DEATH); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/Glock18.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/Glock18.java index 937761e0c..28781e449 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/Glock18.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/Glock18.java @@ -18,10 +18,10 @@ public class Glock18 extends Gun }, 200, 0, //Cost, Gem Cost 20, 6, //Clip Size, Spare Ammo - 120, 2000, //ROF, Reload Time - 5, 0.01, 3.5, //Damage, Dropoff, Bullet Speed - 0, 0.15, //COF Min, COF Max - 0.08, 0.3, //COF Inc per Bullet, COF Dec per Second + 120, 2200, //ROF, Reload Time + 28, 0.008, 0.47, //Damage, Dropoff, Armor Penetration + 0, 0.18, //COF Min, COF Max + 0.07, 0.3, //COF Inc per Bullet, COF Dec per Second Material.STONE_HOE, Sound.BAT_LOOP); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/P2000.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/P2000.java index 77f7b0be6..2efb6ed3a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/P2000.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/P2000.java @@ -19,9 +19,9 @@ public class P2000 extends Gun 200, 0, //Cost, Gem Cost 13, 4, //Clip Size, Spare Ammo 130, 2200, //ROF, Reload Time - 6, 0.01, 3.5, //Damage, Dropoff, Bullet Speed - 0, 0.15, //COF Min, COF Max - 0.08, 0.3, //COF Inc per Bullet, COF Dec per Second + 35, 0.008, 0.50, //Damage, Dropoff, Armor Penetration + 0, 0.18, //COF Min, COF Max + 0.07, 0.3, //COF Inc per Bullet, COF Dec per Second Material.WOOD_HOE, Sound.GHAST_SCREAM2); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/P250.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/P250.java new file mode 100644 index 000000000..bfbf103ae --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/pistol/P250.java @@ -0,0 +1,27 @@ +package nautilus.game.arcade.game.games.minestrike.items.guns.pistol; + + +import org.bukkit.Material; +import org.bukkit.Sound; + +import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType; +import nautilus.game.arcade.game.games.minestrike.items.guns.Gun; +import nautilus.game.arcade.game.games.minestrike.items.guns.GunType; + +public class P250 extends Gun +{ + public P250() + { + super(StrikeItemType.SECONDARY_WEAPON, GunType.PISTOL, "P250", new String[] + { + + }, + 300, 0, //Cost, Gem Cost + 13, 4, //Clip Size, Spare Ammo + 130, 2200, //ROF, Reload Time + 35, 0.005, 0.77, //Damage, Dropoff, Armor Penetration + 0, 0.15, //COF Min, COF Max + 0.06, 0.3, //COF Inc per Bullet, COF Dec per Second + Material.DIAMOND_HOE, Sound.SILVERFISH_KILL); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AK47.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AK47.java index 7dabb85ed..5b1217076 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AK47.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AK47.java @@ -18,10 +18,10 @@ public class AK47 extends Gun }, 2700, 5000, //Cost, Gem Cost 30, 3, //Clip Size, Spare Ammo - 80, 3600, //ROF, Reload Time - 7.5, 0.005, 4, //Damage, Dropoff, Bullet Speed - 0, 0.25, //COF Min, COF Max - 0.050, 0.4, //COF Inc per Bullet, COF Dec per Second + 80, 2500, //ROF, Reload Time + 36, 0.004, 0.78, //Damage, Dropoff, Armor Penetration + 0, 0.3, //COF Min, COF Max + 0.051, 0.35, //COF Inc per Bullet, COF Dec per Second Material.WOOD_SPADE, Sound.BURP); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AUG.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AUG.java new file mode 100644 index 000000000..b026021ce --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AUG.java @@ -0,0 +1,29 @@ +package nautilus.game.arcade.game.games.minestrike.items.guns.rifle; + + +import org.bukkit.Material; +import org.bukkit.Sound; + +import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType; +import nautilus.game.arcade.game.games.minestrike.items.guns.Gun; +import nautilus.game.arcade.game.games.minestrike.items.guns.GunType; + +public class AUG extends Gun +{ + public AUG() + { + super(StrikeItemType.PRIMARY_WEAPON, GunType.RIFLE, "Steyr AUG", new String[] + { + + }, + 3300, 5000, //Cost, Gem Cost + 30, 3, //Clip Size, Spare Ammo + 80, 3800, //ROF, Reload Time + 28, 0.004, 0.9, //Damage, Dropoff, Armor Penetration + 0, 0.25, //COF Min, COF Max + 0.05, 0.4, //COF Inc per Bullet, COF Dec per Second + Material.GOLD_PICKAXE, Sound.VILLAGER_DEATH); + + _scope = true; + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AWP.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AWP.java index 8da4b7724..a0231458e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AWP.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/AWP.java @@ -19,10 +19,12 @@ public class AWP extends Gun 4750, 5000, //Cost, Gem Cost 10, 3, //Clip Size, Spare Ammo 1500, 3600, //ROF, Reload Time - 30, 0.002, 4.3, //Damage, Dropoff, Bullet Speed - 0.05, 0.05, //COF Min, COF Max + 115, 0, 0.97, //Damage, Dropoff, Armor Penetration + 0.1, 0.1, //COF Min, COF Max 0, 0, //COF Inc per Bullet, COF Dec per Second Material.GOLD_SPADE, Sound.DRINK); + + _scope = true; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/Famas.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/Famas.java new file mode 100644 index 000000000..e1496c632 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/Famas.java @@ -0,0 +1,27 @@ +package nautilus.game.arcade.game.games.minestrike.items.guns.rifle; + + +import org.bukkit.Material; +import org.bukkit.Sound; + +import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType; +import nautilus.game.arcade.game.games.minestrike.items.guns.Gun; +import nautilus.game.arcade.game.games.minestrike.items.guns.GunType; + +public class Famas extends Gun +{ + public Famas() + { + super(StrikeItemType.PRIMARY_WEAPON, GunType.RIFLE, "FAMAS", new String[] + { + + }, + 2250, 5000, //Cost, Gem Cost + 25, 4, //Clip Size, Spare Ammo + 80, 3300, //ROF, Reload Time + 30, 0.004, 0.7, //Damage, Dropoff, Armor Penetration + 0, 0.28, //COF Min, COF Max + 0.040, 0.30, //COF Inc per Bullet, COF Dec per Second + Material.WOOD_PICKAXE, Sound.WITHER_DEATH); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/Galil.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/Galil.java new file mode 100644 index 000000000..1ba84ee97 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/Galil.java @@ -0,0 +1,27 @@ +package nautilus.game.arcade.game.games.minestrike.items.guns.rifle; + + +import org.bukkit.Material; +import org.bukkit.Sound; + +import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType; +import nautilus.game.arcade.game.games.minestrike.items.guns.Gun; +import nautilus.game.arcade.game.games.minestrike.items.guns.GunType; + +public class Galil extends Gun +{ + public Galil() + { + super(StrikeItemType.PRIMARY_WEAPON, GunType.RIFLE, "Galil AR", new String[] + { + + }, + 2000, 5000, //Cost, Gem Cost + 35, 3, //Clip Size, Spare Ammo + 80, 2600, //ROF, Reload Time + 30, 0.004, 0.75, //Damage, Dropoff, Armor Penetration + 0, 0.30, //COF Min, COF Max + 0.042, 0.30, //COF Inc per Bullet, COF Dec per Second + Material.STONE_PICKAXE, Sound.WITHER_SHOOT); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/M4A1.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/M4A4.java similarity index 70% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/M4A1.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/M4A4.java index afa49b7e9..78c8f7186 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/M4A1.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/M4A4.java @@ -8,9 +8,9 @@ import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType; import nautilus.game.arcade.game.games.minestrike.items.guns.Gun; import nautilus.game.arcade.game.games.minestrike.items.guns.GunType; -public class M4A1 extends Gun +public class M4A4 extends Gun { - public M4A1() + public M4A4() { super(StrikeItemType.PRIMARY_WEAPON, GunType.RIFLE, "M4A4", new String[] { @@ -18,10 +18,10 @@ public class M4A1 extends Gun }, 2900, 5000, //Cost, Gem Cost 30, 3, //Clip Size, Spare Ammo - 80, 3600, //ROF, Reload Time - 7, 0.005, 4, //Damage, Dropoff, Bullet Speed - 0, 0.2, //COF Min, COF Max - 0.048, 0.4, //COF Inc per Bullet, COF Dec per Second + 80, 3000, //ROF, Reload Time + 33, 0.004, 0.7, //Damage, Dropoff, Armor Penetration + 0, 0.26, //COF Min, COF Max + 0.048, 0.35, //COF Inc per Bullet, COF Dec per Second Material.STONE_SPADE, Sound.BAT_TAKEOFF); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/SG553.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/SG553.java new file mode 100644 index 000000000..d2253b050 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/SG553.java @@ -0,0 +1,29 @@ +package nautilus.game.arcade.game.games.minestrike.items.guns.rifle; + + +import org.bukkit.Material; +import org.bukkit.Sound; + +import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType; +import nautilus.game.arcade.game.games.minestrike.items.guns.Gun; +import nautilus.game.arcade.game.games.minestrike.items.guns.GunType; + +public class SG553 extends Gun +{ + public SG553() + { + super(StrikeItemType.PRIMARY_WEAPON, GunType.RIFLE, "SG553", new String[] + { + + }, + 3000, 5000, //Cost, Gem Cost + 30, 3, //Clip Size, Spare Ammo + 80, 3800, //ROF, Reload Time + 30, 0.004, 1.00, //Damage, Dropoff, Armor Penetration + 0, 0.25, //COF Min, COF Max + 0.052, 0.4, //COF Inc per Bullet, COF Dec per Second + Material.IRON_PICKAXE, Sound.WITHER_SPAWN); + + _scope = true; + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/SSG08.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/SSG08.java new file mode 100644 index 000000000..f7abf5639 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/rifle/SSG08.java @@ -0,0 +1,31 @@ +package nautilus.game.arcade.game.games.minestrike.items.guns.rifle; + + +import org.bukkit.Material; +import org.bukkit.Sound; + +import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType; +import nautilus.game.arcade.game.games.minestrike.items.guns.Gun; +import nautilus.game.arcade.game.games.minestrike.items.guns.GunType; + +public class SSG08 extends Gun +{ + public SSG08() + { + super(StrikeItemType.PRIMARY_WEAPON, GunType.SNIPER, "SSG 08", new String[] + { + + }, + 1700, 5000, //Cost, Gem Cost + 10, 6, //Clip Size, Spare Ammo + 1250, 3700, //ROF, Reload Time + 88, 0.001, 0.85, //Damage, Dropoff, Armor Penetration + 0.08, 0.08, //COF Min, COF Max + 0, 0, //COF Inc per Bullet, COF Dec per Second + Material.DIAMOND_PICKAXE, Sound.WOLF_DEATH); + + _scope = true; + } + + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/shotgun/Nova.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/shotgun/Nova.java index 14a3c8b84..16510bbaa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/shotgun/Nova.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/shotgun/Nova.java @@ -17,8 +17,8 @@ public class Nova extends Shotgun }, 1200, 5000, //Cost, Gem Cost 8, 4, //Clip Size, Spare Ammo - 1000, 4000, //ROF, Reload Time - 5, 0.02, 3.5, //Damage, Dropoff, Bullet Speed + 1000, 800, //ROF, Reload Time + 26, 0.01, 0.5, //Damage, Dropoff, Armor Penetration 0.15, 0.15, //COF Min, COF Max 0, 0, //COF Inc per Bullet, COF Dec per Second Material.GOLD_AXE, Sound.BLAZE_DEATH, 9); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/shotgun/XM1014.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/shotgun/XM1014.java new file mode 100644 index 000000000..c7edffcf9 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/shotgun/XM1014.java @@ -0,0 +1,26 @@ +package nautilus.game.arcade.game.games.minestrike.items.guns.shotgun; + + +import org.bukkit.Material; +import org.bukkit.Sound; + +import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType; +import nautilus.game.arcade.game.games.minestrike.items.guns.Shotgun; + +public class XM1014 extends Shotgun +{ + public XM1014() + { + super(StrikeItemType.PRIMARY_WEAPON, "XM1014", new String[] + { + + }, + 2000, 5000, //Cost, Gem Cost + 7, 4, //Clip Size, Spare Ammo + 260, 800, //ROF, Reload Time + 20, 0.01, 0.8, //Damage, Dropoff, Armor Penetration + 0.15, 0.15, //COF Min, COF Max + 0, 0, //COF Inc per Bullet, COF Dec per Second + Material.DIAMOND_AXE, Sound.SKELETON_DEATH, 6); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/smg/P90.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/smg/P90.java index ac8441425..2bcbcd281 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/smg/P90.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/smg/P90.java @@ -18,10 +18,10 @@ public class P90 extends Gun }, 2350, 5000, //Cost, Gem Cost 50, 2, //Clip Size, Spare Ammo - 35, 2800, //ROF, Reload Time - 4, 0.02, 3.5, //Damage, Dropoff, Bullet Speed - 0, 0.2, //COF Min, COF Max - 0.03, 0.4, //COF Inc per Bullet, COF Dec per Second + 35, 3300, //ROF, Reload Time + 22, 0.006, 0.65, //Damage, Dropoff, Armor Penetration + 0, 0.25, //COF Min, COF Max + 0.022, 0.3, //COF Inc per Bullet, COF Dec per Second Material.STONE_AXE, Sound.CREEPER_DEATH); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/smg/PPBizon.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/smg/PPBizon.java new file mode 100644 index 000000000..d2506309a --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/smg/PPBizon.java @@ -0,0 +1,27 @@ +package nautilus.game.arcade.game.games.minestrike.items.guns.smg; + + +import org.bukkit.Material; +import org.bukkit.Sound; + +import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType; +import nautilus.game.arcade.game.games.minestrike.items.guns.Gun; +import nautilus.game.arcade.game.games.minestrike.items.guns.GunType; + +public class PPBizon extends Gun +{ + public PPBizon() + { + super(StrikeItemType.PRIMARY_WEAPON, GunType.SMG, "PP-Bizon", new String[] + { + + }, + 1400, 5000, //Cost, Gem Cost + 64, 2, //Clip Size, Spare Ammo + 60, 2400, //ROF, Reload Time + 27, 0.007, 0.47, //Damage, Dropoff, Armor Penetration + 0, 0.3, //COF Min, COF Max + 0.045, 0.3, //COF Inc per Bullet, COF Dec per Second + Material.WOOD_AXE, Sound.SHEEP_SHEAR); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java index dd1d002af..7aef01506 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java @@ -950,6 +950,9 @@ public class GameFlagManager implements Listener if (event.getType() != UpdateType.SLOWER) return; + + if (Manager.GetGame().GetType() == GameType.MineStrike) + return; for (Player player : UtilServer.getPlayers()) { @@ -961,6 +964,4 @@ public class GameFlagManager implements Listener UtilPlayer.message(player, C.cWhite + C.Bold + "The next game will be starting soon..."); } } - - } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java index 7c3a4b666..9e75bee95 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java @@ -48,7 +48,7 @@ public class GameGemManager implements Listener Game game = Manager.GetGame(); if (game == null) return; - + if (!(event.GetEvent().getEntity() instanceof Player)) return; @@ -109,7 +109,7 @@ public class GameGemManager implements Listener if (event.GetState() != PlayerState.OUT) return; - if (event.GetGame().GetType() == GameType.Paintball) + if (event.GetGame().GetType() == GameType.Paintball || event.GetGame().GetType() == GameType.MineStrike) return; RewardGems(event.GetGame(), event.GetPlayer(), false); From 8c1e0c3e9ecaccac64364965f5579a8fbcfaa51d Mon Sep 17 00:00:00 2001 From: Chiss Date: Fri, 5 Sep 2014 15:45:14 +1000 Subject: [PATCH 5/8] Fletcher data fix Minestrike stuff --- .../mineplex/core/common/util/UtilInv.java | 47 ++++++++++++++----- .../game/games/minestrike/MineStrike.java | 1 + .../minestrike/items/grenades/Grenade.java | 8 ++-- .../items/grenades/HighExplosive.java | 3 +- .../game/games/mineware/order/OrderCraft.java | 2 +- .../games/mineware/order/OrderGather.java | 2 +- .../game/arcade/kit/perks/PerkFletcher.java | 40 +++++++++++----- 7 files changed, 73 insertions(+), 30 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java index bc55eebec..fa2a7fe28 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java @@ -54,6 +54,12 @@ public class UtilInv public static boolean contains(Player player, Material item, byte data, int required) { + return contains(player, null, item, data, required); + } + + public static boolean contains(Player player, String itemNameContains, Material item, byte data, int required) + { + for (int i : player.getInventory().all(item).keySet()) { if (required <= 0) @@ -61,10 +67,21 @@ public class UtilInv ItemStack stack = player.getInventory().getItem(i); - if (stack != null && stack.getAmount() > 0 && (stack.getData() == null || stack.getData().getData() == data)) - { - required -= stack.getAmount(); - } + if (stack == null) + continue; + + if (stack.getAmount() <= 0) + continue; + + if (data >=0 && + stack.getData() != null && stack.getData().getData() != data) + continue; + + if (itemNameContains != null && + (stack.getItemMeta().getDisplayName() == null || !stack.getItemMeta().getDisplayName().contains(itemNameContains))) + continue; + + required -= stack.getAmount(); } if (required <= 0) @@ -196,10 +213,15 @@ public class UtilInv public static boolean IsItem(ItemStack item, Material type, byte data) { - return IsItem(item, type.getId(), data); + return IsItem(item, null, type.getId(), data); } - public static boolean IsItem(ItemStack item, int id, byte data) + public static boolean IsItem(ItemStack item, String name, Material type, byte data) + { + return IsItem(item, name, type.getId(), data); + } + + public static boolean IsItem(ItemStack item, String name, int id, byte data) { if (item == null) return false; @@ -210,6 +232,9 @@ public class UtilInv if (data != -1 && GetData(item) != data) return false; + if (name != null && (item.getItemMeta().getDisplayName() == null || !item.getItemMeta().getDisplayName().contains(name))) + return false; + return true; } @@ -247,12 +272,12 @@ public class UtilInv { boolean match = false; - if (IsItem(event.getCurrentItem(), type, data)) + if (IsItem(event.getCurrentItem(), name, type, data)) match = true; - if (IsItem(event.getWhoClicked().getInventory().getItem(event.getHotbarButton()), type, data)) + if (IsItem(event.getWhoClicked().getInventory().getItem(event.getHotbarButton()), name, type, data)) match = true; - + if (!match) return; @@ -266,10 +291,10 @@ public class UtilInv if (event.getCurrentItem() == null) return; - IsItem(event.getCurrentItem(), type, data); + IsItem(event.getCurrentItem(), name, type, data); //Type - if (!IsItem(event.getCurrentItem(), type, data)) + if (!IsItem(event.getCurrentItem(), name, type, data)) return; //Inform UtilPlayer.message(event.getWhoClicked(), F.main("Inventory", "You cannot move " + F.item(name) + ".")); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java index eba70388a..0f3a1b47e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java @@ -196,6 +196,7 @@ public class MineStrike extends TeamGame "Burst Fire for greater accuracy", "Sniper Rifles are only accurate while scoped", "Rifles have 30% recoil reduction while scoped", + "Pick up better weapons from dead players" }; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Grenade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Grenade.java index 6456810fe..027b14906 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Grenade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Grenade.java @@ -140,8 +140,8 @@ public abstract class Grenade extends StrikeItem */ //X Rebound - if ((_vel.getX() > 0 && ent.getLocation().getX() - _lastLoc.getX() <= 0) || - (_vel.getX() < 0 && ent.getLocation().getX() - _lastLoc.getX() >= 0)) + if ((_vel.getX() > 0.05 && ent.getLocation().getX() - _lastLoc.getX() <= 0) || + (_vel.getX() < 0.05 && ent.getLocation().getX() - _lastLoc.getX() >= 0)) { _vel = _velHistory.get(0); _vel.setX(-_vel.getX()); @@ -153,8 +153,8 @@ public abstract class Grenade extends StrikeItem } //Z Rebound - else if ((_vel.getZ() > 0 && ent.getLocation().getZ() - _lastLoc.getZ() <= 0) || - (_vel.getZ() < 0 && ent.getLocation().getZ() - _lastLoc.getZ() >= 0)) + else if ((_vel.getZ() > 0.05 && ent.getLocation().getZ() - _lastLoc.getZ() <= 0) || + (_vel.getZ() < 0.05 && ent.getLocation().getZ() - _lastLoc.getZ() >= 0)) { _vel = _velHistory.get(0); _vel.setZ(-_vel.getZ()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java index 4bf8f3216..f433fe59a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java @@ -34,8 +34,7 @@ public class HighExplosive extends Grenade ent.getWorld().playSound(ent.getLocation(), Sound.EXPLODE, 3f, 0.8f); - HashMap players = UtilPlayer.getInRadius( - ent.getLocation(), 8); + HashMap players = UtilPlayer.getInRadius(ent.getLocation(), 10); for (Player player : players.keySet()) { if (!game.IsAlive(player)) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderCraft.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderCraft.java index 62905185d..30c1e3530 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderCraft.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderCraft.java @@ -50,7 +50,7 @@ public abstract class OrderCraft extends Order if (event.getSlotType() != SlotType.RESULT) return; - if (!UtilInv.IsItem(event.getCurrentItem(), _id, _data)) + if (!UtilInv.IsItem(event.getCurrentItem(), null, _id, _data)) return; if (!(event.getWhoClicked() instanceof Player)) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderGather.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderGather.java index bc8dd249a..18a4712bf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderGather.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderGather.java @@ -45,7 +45,7 @@ public abstract class OrderGather extends Order @EventHandler public void Pickup(PlayerPickupItemEvent event) { - if (!UtilInv.IsItem(event.getItem().getItemStack(), _id, _data)) + if (!UtilInv.IsItem(event.getItem().getItemStack(), null, _id, _data)) return; if (Has(event.getPlayer())) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFletcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFletcher.java index 1b973259e..8145812e2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFletcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFletcher.java @@ -14,9 +14,12 @@ import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.player.PlayerDropItemEvent; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; import mineplex.core.common.util.C; import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilGear; import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; @@ -45,6 +48,22 @@ public class PerkFletcher extends Perk _max = max; _remove = remove; } + + public boolean isFletchedArrow(ItemStack stack) + { + if (!UtilGear.isMat(stack, Material.ARROW)) + return false; + + ItemMeta meta = stack.getItemMeta(); + + if (meta.getDisplayName() == null) + return false; + + if (!meta.getDisplayName().contains("Fletched Arrow")) + return false; + + return true; + } @EventHandler public void FletchShootBow(EntityShootBowEvent event) @@ -58,12 +77,11 @@ public class PerkFletcher extends Perk return; for (int i=0 ; i<=8 ; i++) - if (player.getInventory().getItem(i) != null) - if (UtilInv.IsItem(player.getInventory().getItem(i), Material.ARROW, (byte)1)) - { - _fletchArrows.add(event.getProjectile()); - return; - } + if (isFletchedArrow(player.getInventory().getItem(i))) + { + _fletchArrows.add(event.getProjectile()); + return; + } } @EventHandler @@ -94,11 +112,11 @@ public class PerkFletcher extends Perk if (!Recharge.Instance.use(cur, GetName(), _time * 1000, false, false)) continue; - if (UtilInv.contains(cur, Material.ARROW, (byte)1, _max)) + if (UtilInv.contains(cur, "Fletched Arrow", Material.ARROW, (byte)0, _max)) continue; //Add - cur.getInventory().addItem(ItemStackFactory.Instance.CreateStack(262, (byte)1, 1, F.item("Fletched Arrow"))); + cur.getInventory().addItem(ItemStackFactory.Instance.CreateStack(262, (byte)0, 1, F.item("Fletched Arrow"))); cur.playSound(cur.getLocation(), Sound.ITEM_PICKUP, 2f, 1f); } @@ -110,7 +128,7 @@ public class PerkFletcher extends Perk if (event.isCancelled()) return; - if (!UtilInv.IsItem(event.getItemDrop().getItemStack(), Material.ARROW, (byte)1)) + if (!isFletchedArrow(event.getItemDrop().getItemStack())) return; //Cancel @@ -126,7 +144,7 @@ public class PerkFletcher extends Perk HashSet remove = new HashSet(); for (org.bukkit.inventory.ItemStack item : event.getDrops()) - if (UtilInv.IsItem(item, Material.ARROW, (byte)1)) + if (isFletchedArrow(item)) remove.add(item); for (org.bukkit.inventory.ItemStack item : remove) @@ -136,7 +154,7 @@ public class PerkFletcher extends Perk @EventHandler public void FletchInvClick(InventoryClickEvent event) { - UtilInv.DisallowMovementOf(event, "Fletched Arrow", Material.ARROW, (byte)1, true); + UtilInv.DisallowMovementOf(event, "Fletched Arrow", Material.ARROW, (byte)0, true); } @EventHandler From abc95853f740535677b2b2fd802bd8b0350dd554 Mon Sep 17 00:00:00 2001 From: Chiss Date: Fri, 5 Sep 2014 15:47:35 +1000 Subject: [PATCH 6/8] sulhpur bomb fix --- .../nautilus/game/arcade/kit/perks/PerkCreeperSulphurBomb.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperSulphurBomb.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperSulphurBomb.java index 18d2e3700..a99825b8f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperSulphurBomb.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperSulphurBomb.java @@ -66,7 +66,7 @@ public class PerkCreeperSulphurBomb extends Perk implements IThrown UtilInv.Update(player); - org.bukkit.entity.Item ent = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.FIREWORK_CHARGE, (byte)6)); + org.bukkit.entity.Item ent = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.COAL, (byte)0)); UtilAction.velocity(ent, player.getLocation().getDirection(), 1, false, 0, 0.2, 10, false); From 4e94bcfd98bf18a83b4b649e0e7f1d76b74222d3 Mon Sep 17 00:00:00 2001 From: Chiss Date: Fri, 5 Sep 2014 17:29:23 +1000 Subject: [PATCH 7/8] Block Hunt winners fix (team/solo) --- .../game/arcade/addons/CompassAddon.java | 2 +- .../nautilus/game/arcade/game/GameTeam.java | 45 ++++++++++--------- .../arcade/game/games/hideseek/HideSeek.java | 27 +++++++++-- .../game/games/minestrike/MineStrike.java | 7 +-- 4 files changed, 51 insertions(+), 30 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/CompassAddon.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/CompassAddon.java index cb7145d74..90115084d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/CompassAddon.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/CompassAddon.java @@ -109,7 +109,7 @@ public class CompassAddon extends MiniPlugin " " + C.cWhite + C.Bold + "Distance: " + targetTeam.GetColor() + UtilMath.trim(1, bestDist) + " " + C.cWhite + C.Bold + "Height: " + targetTeam.GetColor() + UtilMath.trim(1, heightDiff)); stack.setItemMeta(itemMeta); - + player.getInventory().setItem(i, stack); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java index 69ef05849..83c431d4f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java @@ -24,9 +24,9 @@ import org.bukkit.entity.Player; public class GameTeam { private Game Host; - + private double _respawnTime = 0; - + public enum PlayerState { IN("In", ChatColor.GREEN), @@ -66,14 +66,14 @@ public class GameTeam private int _spawnDistance = 0; private boolean _visible = true; - + //Records order players go out in protected ArrayList _places = new ArrayList(); public GameTeam(Game host, String name, ChatColor color, ArrayList spawns) { Host = host; - + _name = name; _color = color; _spawns = spawns; @@ -96,7 +96,7 @@ public class GameTeam public Location GetSpawn() { -// ArrayList valid = new ArrayList(); + // ArrayList valid = new ArrayList(); Location best = null; double bestDist = 0; @@ -119,14 +119,14 @@ public class GameTeam bestDist = closestPlayer; } -// if (closestPlayer > _spawnDistance * _spawnDistance) -// { -// valid.add(loc); -// } + // if (closestPlayer > _spawnDistance * _spawnDistance) + // { + // valid.add(loc); + // } } -// if (valid.size() > 0) -// valid.get(UtilMath.r(valid.size())); + // if (valid.size() > 0) + // valid.get(UtilMath.r(valid.size())); if (best != null) return best; @@ -228,7 +228,7 @@ public class GameTeam { SpawnTeleport(true); } - + public void SpawnTeleport(boolean aliveOnly) { for (Player player : GetPlayers(aliveOnly)) @@ -342,7 +342,7 @@ public class GameTeam { _respawnTime = i; } - + public double GetRespawnTime() { return _respawnTime; @@ -351,32 +351,33 @@ public class GameTeam public void SetPlacement(Player player, PlayerState state) { if (state == PlayerState.OUT) + { if (!_places.contains(player)) - _places.add(0, player); - - else - _places.remove(player); + _places.add(0, player); + } + else + _places.remove(player); } - + public ArrayList GetPlacements(boolean includeAlivePlayers) { if (includeAlivePlayers) { ArrayList placesClone = new ArrayList(); - + for (Player player : _places) { placesClone.add(player); } - + for (Player player : GetPlayers(true)) { placesClone.add(0, player); } - + return placesClone; } - + return _places; } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java index 49e5724de..293e15230 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java @@ -73,6 +73,7 @@ import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.events.PlayerPrepareTeleportEvent; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.TeamGame; +import nautilus.game.arcade.game.GameTeam.PlayerState; import nautilus.game.arcade.game.games.hideseek.forms.BlockForm; import nautilus.game.arcade.game.games.hideseek.forms.CreatureForm; import nautilus.game.arcade.game.games.hideseek.forms.Form; @@ -958,6 +959,10 @@ public class HideSeek extends TeamGame public void SetSeeker(Player player, boolean forced) { + GameTeam pastTeam = GetTeam(player); + if (pastTeam != null && pastTeam.equals(_hiders)) + pastTeam.SetPlacement(player, PlayerState.OUT); + SetPlayerTeam(player, _seekers, true); Manager.GetDisguise().undisguise(player); @@ -1011,12 +1016,25 @@ public class HideSeek extends TeamGame if (_hiders.GetPlayers(true).isEmpty()) { - SetState(GameState.End); - AnnounceEnd(_seekers); + ArrayList places = _hiders.GetPlacements(true); + + AnnounceEnd(_hiders.GetPlacements(true)); + //Gems + if (places.size() >= 1) + AddGems(places.get(0), 20, "1st Place", false); + + if (places.size() >= 2) + AddGems(places.get(1), 15, "2nd Place", false); + + if (places.size() >= 3) + AddGems(places.get(2), 10, "3rd Place", false); + for (Player player : GetPlayers(false)) if (player.isOnline()) AddGems(player, 10, "Participation", false); + + SetState(GameState.End); } } @@ -1084,8 +1102,7 @@ public class HideSeek extends TeamGame if (timeLeft <= 0) { WriteScoreboard(); - - SetState(GameState.End); + AnnounceEnd(_hiders); for (Player player : _hiders.GetPlayers(true)) @@ -1094,6 +1111,8 @@ public class HideSeek extends TeamGame for (Player player : GetPlayers(false)) if (player.isOnline()) AddGems(player, 10, "Participation", false); + + SetState(GameState.End); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java index 0f3a1b47e..03143cbd1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java @@ -108,7 +108,7 @@ public class MineStrike extends TeamGame private int _roundsToWin = 10; private long _roundTime = 120000; - private boolean _debug = true; + private boolean _debug = false; private int _bulletInstant = 2; //0 = Slow, 1 = Instant, 2 = Mix private boolean _customHitbox = true; private boolean _bulletAlternate = false; @@ -185,12 +185,13 @@ public class MineStrike extends TeamGame this._help = new String[] { //"Tap Crouch when close to an ally to Boost", + "Open Inventory at spawn to buy guns", + "Hold Right-Click to Plant Bomb", + "Hold Right-Click with knife to Defuse Bomb", "Moving decreases accuracy", "Sprinting heavily decreases accuracy", "Jumping massively decreases accuracy", "Crouching increases accuracy", - "Hold Right-Click to Plant Bomb", - "Hold Right-Click with knife to Defuse Bomb", "Left-Click to roll Grenades", "Right-Click to throw Grenades", "Burst Fire for greater accuracy", From 91a2266a04ce7c94279858a4502ad37c4d089acb Mon Sep 17 00:00:00 2001 From: CoderTim Date: Fri, 5 Sep 2014 04:00:51 -0400 Subject: [PATCH 8/8] Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking --- .../artifacts/Nautilus_Game_Arcade_jar.xml | 2 + .../artifacts/Nautilus_Game_Arcade_test.xml | 2 + Plugins/.idea/libraries/jooq.xml | 13 + Plugins/.idea/libraries/jooq_codegen.xml | 11 + Plugins/.idea/libraries/mysql_connector.xml | 9 + Plugins/.idea/modules.xml | 2 + Plugins/.idea/runConfigurations/Arcade.xml | 2 +- Plugins/.idea/runConfigurations/Database.xml | 24 + Plugins/.idea/runConfigurations/Hub.xml | 2 +- Plugins/.idea/runConfigurations/MapParser.xml | 2 +- Plugins/Classpath.Dummy/Classpath.Dummy.iml | 13 + Plugins/Libraries/jooq-3.4.2-javadoc.jar | Bin 0 -> 5316268 bytes Plugins/Libraries/jooq-3.4.2-sources.jar | Bin 0 -> 1517317 bytes Plugins/Libraries/jooq-3.4.2.jar | Bin 0 -> 1360539 bytes Plugins/Libraries/jooq-codegen-3.4.2.jar | Bin 0 -> 78800 bytes Plugins/Libraries/jooq-meta-3.4.2.jar | Bin 0 -> 346229 bytes .../mysql-connector-java-5.1.32-bin.jar | Bin 0 -> 969020 bytes Plugins/Mineplex.Core/Mineplex.Core.iml | 2 + .../leaderboard/LeaderboardRepository.java | 68 +++ .../Mineplex.Database/Mineplex.Database.iml | 14 + Plugins/Mineplex.Database/src/jOOQConfig.xml | 47 ++ .../src/mineplex/database/Account.java | 50 ++ .../src/mineplex/database/Keys.java | 128 +++++ .../src/mineplex/database/Tables.java | 75 +++ .../database/tables/AccountFriend.java | 109 ++++ .../database/tables/AccountInventory.java | 117 ++++ .../database/tables/AccountPolls.java | 117 ++++ .../database/tables/AccountPreferences.java | 144 +++++ .../database/tables/AccountStats.java | 117 ++++ .../mineplex/database/tables/Accounts.java | 134 +++++ .../database/tables/ItemCategories.java | 99 ++++ .../src/mineplex/database/tables/Items.java | 117 ++++ .../mineplex/database/tables/PlayerMap.java | 109 ++++ .../src/mineplex/database/tables/Polls.java | 129 +++++ .../src/mineplex/database/tables/Stats.java | 99 ++++ .../tables/TournamentLeaderboard.java | 132 +++++ .../tables/records/AccountFriend.java | 234 ++++++++ .../tables/records/AccountInventory.java | 234 ++++++++ .../database/tables/records/AccountPolls.java | 234 ++++++++ .../tables/records/AccountPreferences.java | 514 ++++++++++++++++++ .../database/tables/records/AccountStats.java | 234 ++++++++ .../database/tables/records/Accounts.java | 434 +++++++++++++++ .../tables/records/ItemCategories.java | 154 ++++++ .../database/tables/records/Items.java | 234 ++++++++ .../database/tables/records/PlayerMap.java | 234 ++++++++ .../database/tables/records/Polls.java | 394 ++++++++++++++ .../database/tables/records/Stats.java | 154 ++++++ .../tables/records/TournamentLeaderboard.java | 354 ++++++++++++ .../mineplex/jooq/AsInDatabaseStrategy.java | 126 +++++ .../nautilus/game/arcade/ArcadeManager.java | 9 + .../nautilus/game/arcade/TournamentType.java | 42 ++ .../src/nautilus/game/arcade/game/Game.java | 26 + 52 files changed, 5497 insertions(+), 3 deletions(-) create mode 100644 Plugins/.idea/libraries/jooq.xml create mode 100644 Plugins/.idea/libraries/jooq_codegen.xml create mode 100644 Plugins/.idea/libraries/mysql_connector.xml create mode 100644 Plugins/.idea/runConfigurations/Database.xml create mode 100644 Plugins/Classpath.Dummy/Classpath.Dummy.iml create mode 100644 Plugins/Libraries/jooq-3.4.2-javadoc.jar create mode 100644 Plugins/Libraries/jooq-3.4.2-sources.jar create mode 100644 Plugins/Libraries/jooq-3.4.2.jar create mode 100644 Plugins/Libraries/jooq-codegen-3.4.2.jar create mode 100644 Plugins/Libraries/jooq-meta-3.4.2.jar create mode 100644 Plugins/Libraries/mysql-connector-java-5.1.32-bin.jar create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/leaderboard/LeaderboardRepository.java create mode 100644 Plugins/Mineplex.Database/Mineplex.Database.iml create mode 100644 Plugins/Mineplex.Database/src/jOOQConfig.xml create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/Account.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/Keys.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/Tables.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/AccountFriend.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/AccountInventory.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/AccountPolls.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/AccountPreferences.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStats.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/Accounts.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/ItemCategories.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/Items.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/PlayerMap.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/Polls.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/Stats.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/TournamentLeaderboard.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountFriend.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountInventory.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountPolls.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountPreferences.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountStats.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/Accounts.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/ItemCategories.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/Items.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/PlayerMap.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/Polls.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/Stats.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/TournamentLeaderboard.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/jooq/AsInDatabaseStrategy.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/TournamentType.java diff --git a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml index 16eb77cde..cd4447b88 100644 --- a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml +++ b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml @@ -16,6 +16,8 @@ + + \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_test.xml b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_test.xml index 8bd2561e4..68645bd5d 100644 --- a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_test.xml +++ b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_test.xml @@ -16,6 +16,8 @@ + + \ No newline at end of file diff --git a/Plugins/.idea/libraries/jooq.xml b/Plugins/.idea/libraries/jooq.xml new file mode 100644 index 000000000..57d4d36ed --- /dev/null +++ b/Plugins/.idea/libraries/jooq.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Plugins/.idea/libraries/jooq_codegen.xml b/Plugins/.idea/libraries/jooq_codegen.xml new file mode 100644 index 000000000..15bbbf812 --- /dev/null +++ b/Plugins/.idea/libraries/jooq_codegen.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Plugins/.idea/libraries/mysql_connector.xml b/Plugins/.idea/libraries/mysql_connector.xml new file mode 100644 index 000000000..34f02f1ee --- /dev/null +++ b/Plugins/.idea/libraries/mysql_connector.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Plugins/.idea/modules.xml b/Plugins/.idea/modules.xml index 5c820afca..b53f9c93a 100644 --- a/Plugins/.idea/modules.xml +++ b/Plugins/.idea/modules.xml @@ -2,9 +2,11 @@ + + diff --git a/Plugins/.idea/runConfigurations/Arcade.xml b/Plugins/.idea/runConfigurations/Arcade.xml index 613c3a843..f57362a28 100644 --- a/Plugins/.idea/runConfigurations/Arcade.xml +++ b/Plugins/.idea/runConfigurations/Arcade.xml @@ -10,7 +10,7 @@