From 30c114af35afecf5de4536561fe645738a89a32c Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Wed, 7 May 2025 12:33:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=A1=E5=91=BD=E4=B9=8B?= =?UTF-8?q?=E5=BE=92perk=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/atsuishio/superbwarfare/item/gun/GunItem.java | 3 --- .../atsuishio/superbwarfare/perk/damage/Desperado.java | 8 +++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java index 0230e0cb2..d575f4cc1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java @@ -203,9 +203,6 @@ public abstract class GunItem extends Item implements CustomRendererItem { 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) { var tag = data.perk.getTag(ModPerks.FOURTH_TIMES_CHARM); int count = perk.getTag(ModPerks.FOURTH_TIMES_CHARM).getInt("FourthTimesCharmCount"); diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java index b3fcfbc1e..8ae4e1032 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java @@ -14,10 +14,16 @@ public class Desperado extends Perk { 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 public int getModifiedRPM(int rpm, GunData data, PerkInstance instance) { 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); }