提取IterativeAmmoLoadTime

This commit is contained in:
Light_Quanta 2025-05-11 23:33:16 +08:00
parent c94db3e33f
commit 5784128a57
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
5 changed files with 10 additions and 15 deletions

View file

@ -294,24 +294,11 @@ public class GunEventHandler {
} }
// 装填 // 装填
if ((stack.getItem() == ModItems.M_870.get() if (data.iterativeAmmoLoadTime() == reload.iterativeLoadTimer.get()) {
|| stack.getItem() == ModItems.MARLIN.get())
&& reload.iterativeLoadTimer.get() == 3
) {
singleLoad(player, data); singleLoad(player, data);
} }
if (stack.getItem() == ModItems.SECONDARY_CATACLYSM.get() && reload.iterativeLoadTimer.get() == 1) { // 二阶段打断
singleLoad(player, data);
}
if ((stack.getItem() == ModItems.K_98.get() || stack.getItem() == ModItems.MOSIN_NAGANT.get())
&& reload.iterativeLoadTimer.get() == 1
) {
singleLoad(player, data);
}
// 二阶段结束
if (reload.iterativeLoadTimer.get() == 1) { if (reload.iterativeLoadTimer.get() == 1) {
// 装满或备弹耗尽结束 // 装满或备弹耗尽结束
if (!data.hasBackupAmmo(player) || data.ammo.get() >= data.magazine()) { if (!data.hasBackupAmmo(player) || data.ammo.get() >= data.magazine()) {

View file

@ -64,6 +64,8 @@ public class DefaultGunData {
public int prepareEmptyTime; public int prepareEmptyTime;
@SerializedName("IterativeTime") @SerializedName("IterativeTime")
public int iterativeTime; public int iterativeTime;
@SerializedName("IterativeAmmoLoadTime")
public int iterativeAmmoLoadTime = 1;
@SerializedName("FinishTime") @SerializedName("FinishTime")
public int finishTime; public int finishTime;

View file

@ -211,6 +211,10 @@ public class GunData {
return defaultGunData().iterativeTime; return defaultGunData().iterativeTime;
} }
public int iterativeAmmoLoadTime() {
return defaultGunData().iterativeAmmoLoadTime;
}
public int defaultPrepareTime() { public int defaultPrepareTime() {
return defaultGunData().prepareTime; return defaultGunData().prepareTime;
} }

View file

@ -14,6 +14,7 @@
"PrepareTime": 7, "PrepareTime": 7,
"PrepareLoadTime": 36, "PrepareLoadTime": 36,
"IterativeTime": 16, "IterativeTime": 16,
"IterativeAmmoLoadTime": 3,
"FinishTime": 12, "FinishTime": 12,
"BypassesArmor": 0.05, "BypassesArmor": 0.05,
"SoundRadius": 16, "SoundRadius": 16,

View file

@ -12,6 +12,7 @@
], ],
"PrepareTime": 7, "PrepareTime": 7,
"IterativeTime": 16, "IterativeTime": 16,
"IterativeAmmoLoadTime": 3,
"FinishTime": 19, "FinishTime": 19,
"BypassesArmor": 0.3, "BypassesArmor": 0.3,
"SoundRadius": 15, "SoundRadius": 15,