|
@@ -13,6 +13,7 @@ import com.gmail.nossr50.util.Permissions;
|
|
public class UnarmedCommand extends SkillCommand {
|
|
public class UnarmedCommand extends SkillCommand {
|
|
AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
|
|
AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
|
|
private String berserkLength;
|
|
private String berserkLength;
|
|
|
|
+ private String berserkLengthEndurance;
|
|
private String deflectChance;
|
|
private String deflectChance;
|
|
private String deflectChanceLucky;
|
|
private String deflectChanceLucky;
|
|
private String disarmChance;
|
|
private String disarmChance;
|
|
@@ -32,6 +33,7 @@ public class UnarmedCommand extends SkillCommand {
|
|
private boolean canBonusDamage;
|
|
private boolean canBonusDamage;
|
|
private boolean canDeflect;
|
|
private boolean canDeflect;
|
|
private boolean lucky;
|
|
private boolean lucky;
|
|
|
|
+ private boolean endurance;
|
|
|
|
|
|
public UnarmedCommand() {
|
|
public UnarmedCommand() {
|
|
super(SkillType.UNARMED);
|
|
super(SkillType.UNARMED);
|
|
@@ -42,20 +44,40 @@ public class UnarmedCommand extends SkillCommand {
|
|
DecimalFormat df = new DecimalFormat("0.0");
|
|
DecimalFormat df = new DecimalFormat("0.0");
|
|
float disarmChanceF;
|
|
float disarmChanceF;
|
|
float deflectChanceF;
|
|
float deflectChanceF;
|
|
- berserkLength = String.valueOf(2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel));
|
|
|
|
|
|
+ //Berserk
|
|
|
|
+ int length = 2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel);
|
|
|
|
+ berserkLength = String.valueOf(length);
|
|
|
|
|
|
|
|
+ if (Permissions.activationTwelve(player)) {
|
|
|
|
+ length = length + 12;
|
|
|
|
+ }
|
|
|
|
+ else if (Permissions.activationEight(player)) {
|
|
|
|
+ length = length + 8;
|
|
|
|
+ }
|
|
|
|
+ else if (Permissions.activationFour(player)) {
|
|
|
|
+ length = length + 4;
|
|
|
|
+ }
|
|
|
|
+ int maxLength = SkillType.UNARMED.getAbility().getMaxTicks();
|
|
|
|
+ if (maxLength != 0 && length > maxLength) {
|
|
|
|
+ length = maxLength;
|
|
|
|
+ }
|
|
|
|
+ berserkLengthEndurance = String.valueOf(length);
|
|
|
|
+
|
|
|
|
+ //Disarm
|
|
if (skillValue >= disarmMaxLevel) disarmChanceF = disarmChanceMax;
|
|
if (skillValue >= disarmMaxLevel) disarmChanceF = disarmChanceMax;
|
|
else disarmChanceF = (float) (((double) disarmChanceMax / (double) disarmMaxLevel) * skillValue);
|
|
else disarmChanceF = (float) (((double) disarmChanceMax / (double) disarmMaxLevel) * skillValue);
|
|
disarmChance = df.format(disarmChanceF);
|
|
disarmChance = df.format(disarmChanceF);
|
|
if (disarmChanceF + disarmChanceF * 0.3333D >= 100D) disarmChanceLucky = df.format(100D);
|
|
if (disarmChanceF + disarmChanceF * 0.3333D >= 100D) disarmChanceLucky = df.format(100D);
|
|
else disarmChanceLucky = df.format(disarmChanceF + disarmChanceF * 0.3333D);
|
|
else disarmChanceLucky = df.format(disarmChanceF + disarmChanceF * 0.3333D);
|
|
|
|
|
|
|
|
+ //Deflect
|
|
if (skillValue >= deflectMaxLevel) deflectChanceF = deflectChanceMax;
|
|
if (skillValue >= deflectMaxLevel) deflectChanceF = deflectChanceMax;
|
|
else deflectChanceF = (float) (((double) deflectChanceMax / (double) deflectMaxLevel) * skillValue);
|
|
else deflectChanceF = (float) (((double) deflectChanceMax / (double) deflectMaxLevel) * skillValue);
|
|
deflectChance = df.format(deflectChanceF);
|
|
deflectChance = df.format(deflectChanceF);
|
|
if (deflectChanceF + deflectChanceF * 0.3333D >= 100D) deflectChanceLucky = df.format(100D);
|
|
if (deflectChanceF + deflectChanceF * 0.3333D >= 100D) deflectChanceLucky = df.format(100D);
|
|
else deflectChanceLucky = df.format(deflectChanceF + deflectChanceF * 0.3333D);
|
|
else deflectChanceLucky = df.format(deflectChanceF + deflectChanceF * 0.3333D);
|
|
|
|
|
|
|
|
+ //Iron Arm
|
|
if (skillValue >= 250) ironArmBonus = String.valueOf(ironArmMaxBonus);
|
|
if (skillValue >= 250) ironArmBonus = String.valueOf(ironArmMaxBonus);
|
|
else ironArmBonus = String.valueOf(3 + ((double) skillValue / (double) ironArmIncreaseLevel));
|
|
else ironArmBonus = String.valueOf(3 + ((double) skillValue / (double) ironArmIncreaseLevel));
|
|
}
|
|
}
|
|
@@ -67,6 +89,7 @@ public class UnarmedCommand extends SkillCommand {
|
|
canDeflect = Permissions.deflect(player);
|
|
canDeflect = Permissions.deflect(player);
|
|
canDisarm = Permissions.disarm(player);
|
|
canDisarm = Permissions.disarm(player);
|
|
lucky = Permissions.luckyUnarmed(player);
|
|
lucky = Permissions.luckyUnarmed(player);
|
|
|
|
+ endurance = Permissions.activationTwelve(player) || Permissions.activationEight(player) || Permissions.activationFour(player);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -124,7 +147,10 @@ public class UnarmedCommand extends SkillCommand {
|
|
}
|
|
}
|
|
|
|
|
|
if (canBerserk) {
|
|
if (canBerserk) {
|
|
- player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
|
|
|
|
|
|
+ if (endurance)
|
|
|
|
+ player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { berserkLengthEndurance }));
|
|
|
|
+ else
|
|
|
|
+ player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|