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

Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes

Browse Source
This commit is contained in:
Sarah 2015-12-19 00:59:15 +01:00
parent dab2416ccd
commit b3afa0094e
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/Minion.java
View File

@ -79,7 +79,7 @@ public class Minion
"Conquest", "Province", "Overflow", "Graceful", "Negative", "Doctrine", "Charger", "Carrots", "Spirits", "Robbers", "Conquest", "Province", "Overflow", "Graceful", "Negative", "Doctrine", "Charger", "Carrots", "Spirits", "Robbers",
"Karambit", "Solution", "Sandwich", "Catapult", "Positive", "Firework", "Ukulele", "Dragons", "Cobwebs", "Drawing", "Karambit", "Solution", "Sandwich", "Catapult", "Positive", "Firework", "Ukulele", "Dragons", "Cobwebs", "Drawing",
"Internal", "Japanese", "Atronomy", "Villager", "Tranquil", "Compress", "Glasses", "Nursing", "College", "Magenta", "Internal", "Japanese", "Atronomy", "Villager", "Tranquil", "Compress", "Glasses", "Nursing", "College", "Magenta",
"Trillion", "Standard", "Atrology", "Infringe", "Fortress", "Prisoner", "Daisies", "Soldier", "Courses", "Serpent", "Trillion", "Standard", "Astrology", "Infringe", "Fortress", "Prisoner", "Daisies", "Soldier", "Courses", "Serpent",
"Carnival", "Parasite", "Porridge", "Variable", "Charcoal", "Decision", "Hazards", "Jupiter", "Buttons", "Camping", "Carnival", "Parasite", "Porridge", "Variable", "Charcoal", "Decision", "Hazards", "Jupiter", "Buttons", "Camping",
"Concrete", "Carriage", "Pressure", "Practice", "Commerce", "Windmill", "Cheetah", "Mercury", "Octopus", "Canyons", "Concrete", "Carriage", "Pressure", "Practice", "Commerce", "Windmill", "Cheetah", "Mercury", "Octopus", "Canyons",
"Pavement", "Auxilary", "Demolish", "Maintain", "Barbeque", "Parmesan", "Vulture", "America", "Printer", "Seventy", "Pavement", "Auxilary", "Demolish", "Maintain", "Barbeque", "Parmesan", "Vulture", "America", "Printer", "Seventy",

34
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
View File

@ -711,8 +711,12 @@ public class TypeWars extends TeamGame
Location loc = giant.getLocation().clone(); Location loc = giant.getLocation().clone();
loc.setYaw(UtilAlg.GetYaw(new Vector(minion.getEntity().getLocation().getBlockX() - loc.getBlockX(), minion.getEntity().getLocation().getBlockY() - loc.getBlockY(), minion.getEntity().getLocation().getBlockZ() - loc.getBlockZ()))); loc.setYaw(UtilAlg.GetYaw(new Vector(minion.getEntity().getLocation().getBlockX() - loc.getBlockX(), minion.getEntity().getLocation().getBlockY() - loc.getBlockY(), minion.getEntity().getLocation().getBlockZ() - loc.getBlockZ())));
giant.teleport(loc); giant.teleport(loc);
giant.getWorld().playSound(giant.getLocation(), Sound.ZOMBIE_WOODBREAK, 100, 1); for(Player player : team.GetPlayers(false))
giant.getWorld().playSound(giant.getLocation(), Sound.ZOMBIE_IDLE, 1, 1); {
player.playSound(giant.getLocation(), Sound.ZOMBIE_WOODBREAK, 100, 1);
player.playSound(giant.getLocation(), Sound.ZOMBIE_IDLE, 1, 1);
}
UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, minion.getEntity().getLocation(), 0, 0, 0, 1, 1, ViewDist.LONG, UtilServer.getPlayers()); UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, minion.getEntity().getLocation(), 0, 0, 0, 1, 1, ViewDist.LONG, UtilServer.getPlayers());
minion.despawn(null, true); minion.despawn(null, true);
@ -754,12 +758,9 @@ public class TypeWars extends TeamGame
_giants.get(team).damage(damage); _giants.get(team).damage(damage);
} }
} }
if(_giantsAttacked.containsKey(team)) if(!_giantsAttacked.containsKey(team) || UtilTime.elapsed(_giantsAttacked.get(team), 10000))
{
if(_giantsAttacked.get(team) != null)
{
if(UtilTime.elapsed(_giantsAttacked.get(team), 10000))
{ {
_giantsAttacked.put(team, System.currentTimeMillis());
for(Player player : GetPlayers(true)) for(Player player : GetPlayers(true))
{ {
if(GetTeam(player) == team) if(GetTeam(player) == team)
@ -770,8 +771,6 @@ public class TypeWars extends TeamGame
} }
} }
} }
}
}
@EventHandler @EventHandler
public void minionAnimation(UpdateEvent event) public void minionAnimation(UpdateEvent event)
@ -1257,6 +1256,23 @@ public class TypeWars extends TeamGame
_deadMinions.add(minion); _deadMinions.add(minion);
} }
} }
Iterator<Minion> finishedMinionIterator = _finishedMinions.iterator();
while(finishedMinionIterator.hasNext())
{
Minion minion = finishedMinionIterator.next();
if(minion.getTeam() == team)
continue;
if(UtilMath.offset(location, minion.getEntity().getLocation()) > 3)
continue;
minion.despawn(player, true);
if(!minion.hasLives())
{
minionIterator.remove();
_deadMinions.add(minion);
}
}
i++; i++;
} }
_nukeFrame++; _nukeFrame++;

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/kits/KitTypeWarsBase.java
View File

@ -63,6 +63,9 @@ public abstract class KitTypeWarsBase extends Kit
@EventHandler @EventHandler
public void activateSpell(PlayerInteractEvent event) public void activateSpell(PlayerInteractEvent event)
{ {
if(!Manager.GetGame().IsLive())
return;
if(event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK) if(event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK)
return; return;