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

Merge remote-tracking branch 'origin/clans-beta' into clans-beta

Browse Source
This commit is contained in:
Shaun Bennett 2015-11-26 23:42:22 -05:00
commit a46bed53fa
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MagneticMaul.java
View File

@ -23,6 +23,7 @@ public class MagneticMaul extends LegendaryItem
public static final double PULL_RANGE = 10d;
private double _power;
private double _heat;
public MagneticMaul()
{
@ -49,10 +50,15 @@ public class MagneticMaul extends LegendaryItem
}
else
{
addPower(0.65);
addPower(Math.min(0, 0.65 - (_heat / 150)));
if (_heat > 0)
{
_heat--;
}
}
UtilTextBottom.displayProgress(UtilMath.clamp(_power, .0, 80.) / 60., wielder);
UtilTextBottom.displayProgress(_power / 80., wielder);
}
@ -97,8 +103,6 @@ public class MagneticMaul extends LegendaryItem
}
}
// Do Particles
for (int i=0 ; i<6 ; i++)
{
@ -119,7 +123,8 @@ public class MagneticMaul extends LegendaryItem
1, 0, ViewDist.LONG, UtilServer.getPlayers());
}
removePower(1.5);
removePower(1.75);
_heat++;
}
private void addPower(double power)
@ -134,6 +139,6 @@ public class MagneticMaul extends LegendaryItem
private boolean canPull()
{
return _power >= 20;
return _power >= 10 && _heat < 70;
}
}