修复亡命之徒perk的问题
This commit is contained in:
parent
83a309053c
commit
30c114af35
2 changed files with 7 additions and 4 deletions
|
@ -203,9 +203,6 @@ public abstract class GunItem extends Item implements CustomRendererItem {
|
||||||
|
|
||||||
perk.reduceCooldown(ModPerks.FOURTH_TIMES_CHARM, "FourthTimesCharmTick");
|
perk.reduceCooldown(ModPerks.FOURTH_TIMES_CHARM, "FourthTimesCharmTick");
|
||||||
|
|
||||||
perk.reduceCooldown(ModPerks.DESPERADO, "DesperadoTime");
|
|
||||||
perk.reduceCooldown(ModPerks.DESPERADO, "DesperadoTimePost");
|
|
||||||
|
|
||||||
if (perk.getLevel(ModPerks.FOURTH_TIMES_CHARM) > 0) {
|
if (perk.getLevel(ModPerks.FOURTH_TIMES_CHARM) > 0) {
|
||||||
var tag = data.perk.getTag(ModPerks.FOURTH_TIMES_CHARM);
|
var tag = data.perk.getTag(ModPerks.FOURTH_TIMES_CHARM);
|
||||||
int count = perk.getTag(ModPerks.FOURTH_TIMES_CHARM).getInt("FourthTimesCharmCount");
|
int count = perk.getTag(ModPerks.FOURTH_TIMES_CHARM).getInt("FourthTimesCharmCount");
|
||||||
|
|
|
@ -14,10 +14,16 @@ public class Desperado extends Perk {
|
||||||
super("desperado", Perk.Type.DAMAGE);
|
super("desperado", Perk.Type.DAMAGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick(GunData data, PerkInstance instance, @Nullable LivingEntity living) {
|
||||||
|
data.perk.reduceCooldown(this, "DesperadoTime");
|
||||||
|
data.perk.reduceCooldown(this, "DesperadoTimePost");
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getModifiedRPM(int rpm, GunData data, PerkInstance instance) {
|
public int getModifiedRPM(int rpm, GunData data, PerkInstance instance) {
|
||||||
if (data.perk.getTag(this).getInt("DesperadoTimePost") > 0) {
|
if (data.perk.getTag(this).getInt("DesperadoTimePost") > 0) {
|
||||||
return rpm * (int) (1.285 + 0.015 * instance.level());
|
return (int) (rpm * (1.285 + 0.015 * instance.level()));
|
||||||
}
|
}
|
||||||
return super.getModifiedRPM(rpm, data, instance);
|
return super.getModifiedRPM(rpm, data, instance);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue