kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

优化维持生计弹药消耗

Browse source
This commit is contained in:
Light_Quanta 2025-04-18 21:31:57 +08:00
parent 532f380612
commit ad2db9c888
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java
View file

@ -649,30 +649,22 @@ public class LivingEventHandler {
float rate = level * 0.1f + (stack.is(ModTags.Items.SMG) || stack.is(ModTags.Items.RIFLE) ? 0.07f : 0f); float rate = level * 0.1f + (stack.is(ModTags.Items.SMG) || stack.is(ModTags.Items.RIFLE) ? 0.07f : 0f);
var cap = player.getData(ModAttachments.PLAYER_VARIABLE).watch();
int mag = data.magazine(); int mag = data.magazine();
int ammo = data.ammo.get(); int ammo = data.ammo.get();
int ammoReload = (int) Math.min(mag, mag * rate); int ammoReload = (int) Math.min(mag, mag * rate);
int ammoNeed = Math.min(mag - ammo, ammoReload); int ammoNeed = Math.min(mag - ammo, ammoReload);
boolean flag = InventoryTool.hasCreativeAmmoBox(player); boolean flag = player.isCreative() || InventoryTool.hasCreativeAmmoBox(player);
var ammoType = data.ammoTypeInfo().playerAmmoType(); int ammoFinal = Math.min(data.countBackupAmmo(player), ammoNeed);
if (ammoType != null) {
int ammoFinal = Math.min(ammoType.get(cap), ammoNeed);
if (flag) { if (flag) {
ammoFinal = ammoNeed; ammoFinal = ammoNeed;
} else { } else {
ammoType.add(cap, -ammoFinal); data.consumeBackupAmmo(player, ammoFinal);
} }
data.ammo.set(Math.min(mag, ammo + ammoFinal)); data.ammo.set(Math.min(mag, ammo + ammoFinal));
}
data.save(); data.save();
player.setData(ModAttachments.PLAYER_VARIABLE, cap);
cap.sync(player);
} }

2
src/main/java/com/atsuishio/superbwarfare/item/gun/data/GunData.java
View file

@ -369,7 +369,7 @@ public class GunData {
* 消耗额外弹药（不影响枪内弹药） * 消耗额外弹药（不影响枪内弹药）
*/ */
public void consumeBackupAmmo(Player player, int count) { public void consumeBackupAmmo(Player player, int count) {
if (player.isCreative() || InventoryTool.hasCreativeAmmoBox(player)) return; if (player.isCreative() || InventoryTool.hasCreativeAmmoBox(player) || count <= 0) return;
var info = ammoTypeInfo(); var info = ammoTypeInfo();
switch (info.type()) { switch (info.type()) {