JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Halloween balance (slightly easier)

Browse Source 
Giant hitbox improved
This commit is contained in:
Chiss 2013-10-27 15:24:28 +11:00
parent 7948fa6f71
commit 4974fc17aa
15 changed files with 60 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
View File

@ -21,6 +21,7 @@ import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Giant;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
@ -329,9 +330,21 @@ public class UtilEnt
}
}
else
if (loc.getY() > ent.getLocation().getY() && loc.getY() < ent.getLocation().getY() + 2)
if (UtilMath.offset2d(loc, ent.getLocation()) < 0.5 * mult)
return true;
{
if (ent instanceof Giant)
{
if (loc.getY() > ent.getLocation().getY() && loc.getY() < ent.getLocation().getY() + 12)
if (UtilMath.offset2d(loc, ent.getLocation()) < 4)
return true;
}
else
{
if (loc.getY() > ent.getLocation().getY() && loc.getY() < ent.getLocation().getY() + 2)
if (UtilMath.offset2d(loc, ent.getLocation()) < 0.5 * mult)
return true;
}
}
return false;

4
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -570,10 +570,10 @@ public class HubManager extends MiniClientPlugin<HubClient>
UtilParticle.PlayParticle(other, ParticleType.HEART, player.getLocation().add(0, 1, 0), 0.25f, 0.5f, 0.25f, 0, 1);
else if (player.getName().equalsIgnoreCase("defek7"))
UtilParticle.PlayParticle(other, ParticleType.ANGRY_VILLAGER, player.getLocation().add(0, 1, 0), 0.25f, 0.5f, 0.25f, 0, 1);
UtilParticle.PlayParticle(other, ParticleType.FIREWORKS_SPARK, player.getLocation().add(0, 1, 0), 0.25f, 0.5f, 0.25f, 0, 2);
else if (player.getName().equalsIgnoreCase("Spu_"))
UtilParticle.PlayParticle(other, ParticleType.NOTE, player.getLocation().add(0, 1, 0), 0.25f, 0.5f, 0.25f, 0, 1);
UtilParticle.PlayParticle(other, ParticleType.FLAME, player.getLocation().add(0, 1, 0), 0.25f, 0.5f, 0.25f, 0, 2);
else if (player.getName().equalsIgnoreCase("sterling_"))
UtilParticle.PlayParticle(other, ParticleType.WITCH_MAGIC, player.getLocation().add(0, 1, 0), 0.25f, 0.5f, 0.25f, 0, 2);

1
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/Fire.java
View File

@ -79,7 +79,6 @@ public class Fire extends MiniPlugin
continue;
}
if (!UtilEnt.hitBox(fire.getLocation(), ent, 1.5, null))
continue;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGiant.java
View File

@ -88,7 +88,7 @@ public class MobGiant extends CreatureBase<Giant>
_tpLoc.setPitch(UtilAlg.GetPitch(dir));
_tpLoc.setYaw(UtilAlg.GetYaw(dir));
double speed = Math.min(0.35, 0.1 + (GetEntity().getTicksLived() / 8000d));
double speed = Math.min(0.35, 0.1 + (GetEntity().getTicksLived() / 12000d));
_tpLoc.add(dir.multiply(speed));

10
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/PumpkinKing.java
View File

@ -81,7 +81,7 @@ public class PumpkinKing extends CreatureBase<Skeleton>
ent.setSkeletonType(SkeletonType.WITHER);
ent.getEquipment().setHelmet(new ItemStack(Material.PUMPKIN));
ent.setMaxHealth(500);
ent.setMaxHealth(400);
ent.setHealth(ent.getMaxHealth());
ent.getWorld().strikeLightningEffect(ent.getLocation());
@ -109,8 +109,8 @@ public class PumpkinKing extends CreatureBase<Skeleton>
UtilPlayer.message(event.GetDamagerPlayer(true), F.main("Boss", "You must destroy " + F.elem("Pumpkin Minions") + " first!"));
}
if (event.GetCause() == DamageCause.ENTITY_EXPLOSION)
event.SetCancelled("Explosion Resist");
if (event.GetDamagerPlayer(true) == null)
event.SetCancelled("Non-Player");
event.SetKnockback(false);
}
@ -506,7 +506,7 @@ public class PumpkinKing extends CreatureBase<Skeleton>
shieldIterator.remove();
}
if (!UtilTime.elapsed(_shieldSpawn, 8000))
if (!UtilTime.elapsed(_shieldSpawn, 10000))
return;
if (_shields.size() >= _shieldsMax)
@ -650,7 +650,7 @@ public class PumpkinKing extends CreatureBase<Skeleton>
}
else if (GetState() == 3)
{
if (UtilTime.elapsed(_stateTime, 15000))
if (UtilTime.elapsed(_stateTime, 20000))
{
SetState(0);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/kits/KitFinn.java
View File

@ -35,7 +35,7 @@ public class KitFinn extends SmashKit
{
new PerkInfernoFinn(),
new PerkBlizzardFinn(),
new PerkFletcher(3, 4, true),
new PerkFletcher(1, 4, true),
},
EntityType.ZOMBIE, new ItemStack(Material.GOLD_SWORD));

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/kits/KitRobinHood.java
View File

@ -32,9 +32,9 @@ public class KitRobinHood extends SmashKit
},
new Perk[]
{
new PerkFletcher(1, 4, true),
new PerkBarrage(4, 250, true, true),
{
new PerkFletcher(1, 8, true),
new PerkBarrage(8, 125, true, true),
new PerkQuickshotRobinHood()
},

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/kits/KitThor.java
View File

@ -35,7 +35,7 @@ public class KitThor extends SmashKit
new Perk[]
{
new PerkKnockbackAttack(2),
new PerkFletcher(3, 4, true),
new PerkFletcher(1, 4, true),
new PerkSeismicHammer(),
new PerkHammerThrow(),
},

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/waves/Wave4.java
View File

@ -11,7 +11,7 @@ public class Wave4 extends WaveBase
{
public Wave4(Halloween host)
{
super(host, "Ghasts and friends!", 60000, host.GetSpawnSet(3));
super(host, "Ghasts and friends!", 80000, host.GetSpawnSet(3));
}
@Override

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/waves/Wave5.java
View File

@ -9,7 +9,7 @@ public class Wave5 extends WaveBase
{
public Wave5(Halloween host)
{
super(host, "Double the Giants! Double the fun!", 60000, host.GetSpawnSet(1));
super(host, "Double the Giants! Double the fun!", 80000, host.GetSpawnSet(1));
}
@Override

35
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlizzardFinn.java
View File

@ -47,27 +47,27 @@ public class PerkBlizzardFinn extends Perk
{
if (event.isCancelled())
return;
if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK)
return;
if (UtilBlock.usable(event.getClickedBlock()))
return;
if (!event.getPlayer().getItemInHand().getType().toString().contains("DIAMOND_SWORD"))
return;
Player player = event.getPlayer();
if (!Kit.HasKit(player))
return;
if (!Recharge.Instance.use(player, GetName(), 4000, true))
if (!Recharge.Instance.use(player, GetName(), 2000, true))
return;
_active.put(player, System.currentTimeMillis());
}
@EventHandler
public void Update(UpdateEvent event)
{
@ -78,14 +78,14 @@ public class PerkBlizzardFinn extends Perk
{
if (!_active.containsKey(player))
continue;
if (!player.isBlocking())
{
_active.remove(player);
continue;
}
if (UtilTime.elapsed(_active.get(player), 2000))
if (UtilTime.elapsed(_active.get(player), 1000))
{
_active.remove(player);
continue;
@ -124,20 +124,13 @@ public class PerkBlizzardFinn extends Perk
LivingEntity damagee = event.GetDamageeEntity();
if (damagee == null) return;
event.SetCancelled("Blizzard");
event.SetCancelled("Snowball Damage");
if (damagee instanceof Player)
return;
damagee.setVelocity(proj.getVelocity().multiply(0.15).add(new Vector(0, 0.15, 0)));
//Damage Event
if (damagee instanceof Player)
if (Recharge.Instance.use((Player)damagee, GetName(), 250, false))
Manager.GetDamage().NewDamageEvent(damagee, event.GetDamagerEntity(true), null,
DamageCause.PROJECTILE, 1.5, false, true, false,
UtilEnt.getName(event.GetDamagerEntity(true)), GetName());
}
@EventHandler

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHammerThrow.java
View File

@ -7,6 +7,7 @@ import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Giant;
import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
@ -127,9 +128,13 @@ public class PerkHammerThrow extends Perk implements IThrown
if (target == null)
return;
double damage = 16;
if (target instanceof Giant)
damage = 8;
//Damage Event
Manager.GetDamage().NewDamageEvent(target, data.GetThrower(), null,
DamageCause.LIGHTNING, 16, true, true, false,
DamageCause.LIGHTNING, damage, true, true, false,
UtilEnt.getName(data.GetThrower()), GetName());
}

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkInfernoFinn.java
View File

@ -55,7 +55,7 @@ public class PerkInfernoFinn extends Perk
if (!Kit.HasKit(player))
return;
if (!Recharge.Instance.use(player, "Inferno", 4000, true))
if (!Recharge.Instance.use(player, "Inferno", 2000, true))
return;
_active.put(player, System.currentTimeMillis());
@ -78,7 +78,7 @@ public class PerkInfernoFinn extends Perk
continue;
}
if (UtilTime.elapsed(_active.get(cur), 1500))
if (UtilTime.elapsed(_active.get(cur), 1000))
{
_active.remove(cur);
continue;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicHammer.java
View File

@ -61,7 +61,7 @@ public class PerkSeismicHammer extends Perk
//Action
int damage = 8;
double range = 8;
double range = 10;
HashMap<LivingEntity, Double> targets = UtilEnt.getInRadius(player.getLocation(), range);
for (LivingEntity cur : targets.keySet())

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
View File

@ -3,6 +3,8 @@ package nautilus.game.arcade.managers;
import mineplex.core.common.Rank;
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.UtilMath;
import mineplex.core.common.util.UtilPlayer;
@ -664,12 +666,14 @@ public class GameFlagManager implements Listener
{
UtilPlayer.message(player, C.cRed + C.Bold + "WARNING: " + C.cWhite + C.Bold +"RETURN TO PLAYABLE AREA!");
UtilAction.velocity(player, UtilAlg.getTrajectory2d(player.getLocation(), game.GetSpectatorLocation()), 1, true, 0.4, 0, 10, true);
Manager.GetDamage().NewDamageEvent(player, null, null,
DamageCause.VOID, 4, true, false, false,
DamageCause.VOID, 4, false, false, false,
"Void", "Void Damage");
player.getWorld().playSound(player.getLocation(), Sound.NOTE_BASS, 2f, 1f);
player.getWorld().playSound(player.getLocation(), Sound.NOTE_BASS, 2f, 1f);
player.getWorld().playSound(player.getLocation(), Sound.NOTE_BASS, 2f, 1f);
}
}
}