修改维持生计效果
This commit is contained in:
parent
233bdf6998
commit
cc78351b2f
2 changed files with 26 additions and 1 deletions
|
@ -665,7 +665,32 @@ public class LivingEventHandler {
|
|||
cap.handgunAmmo -= ammoFinal;
|
||||
}
|
||||
data.ammo.set(Math.min(mag, ammo + ammoFinal));
|
||||
} else if (stack.is(ModTags.Items.USE_SHOTGUN_AMMO)) {
|
||||
int ammoFinal = Math.min(cap.handgunAmmo, ammoNeed);
|
||||
if (flag) {
|
||||
ammoFinal = ammoNeed;
|
||||
} else {
|
||||
cap.shotgunAmmo -= ammoFinal;
|
||||
}
|
||||
data.ammo.set(Math.min(mag, ammo + ammoFinal));
|
||||
} else if (stack.is(ModTags.Items.USE_SNIPER_AMMO)) {
|
||||
int ammoFinal = Math.min(cap.handgunAmmo, ammoNeed);
|
||||
if (flag) {
|
||||
ammoFinal = ammoNeed;
|
||||
} else {
|
||||
cap.sniperAmmo -= ammoFinal;
|
||||
}
|
||||
data.ammo.set(Math.min(mag, ammo + ammoFinal));
|
||||
} else if (stack.is(ModTags.Items.USE_HEAVY_AMMO)) {
|
||||
int ammoFinal = Math.min(cap.heavyAmmo, ammoNeed);
|
||||
if (flag) {
|
||||
ammoFinal = ammoNeed;
|
||||
} else {
|
||||
cap.heavyAmmo -= ammoFinal;
|
||||
}
|
||||
data.ammo.set(Math.min(mag, ammo + ammoFinal));
|
||||
}
|
||||
|
||||
data.save();
|
||||
player.setData(ModAttachments.PLAYER_VARIABLE, cap);
|
||||
cap.sync(player);
|
||||
|
|
|
@ -48,10 +48,10 @@ public class PerkHelper {
|
|||
case AMMO -> !perk.descriptionId.equals("butterfly_bullet") && perk != ModPerks.MICRO_MISSILE.get()
|
||||
&& perk != ModPerks.LONGER_WIRE.get();
|
||||
case FUNCTIONAL -> perk == ModPerks.HEAL_CLIP.get()
|
||||
|| perk == ModPerks.SUBSISTENCE.get()
|
||||
|| perk == ModPerks.FOURTH_TIMES_CHARM.get()
|
||||
|| perk == ModPerks.POWERFUL_ATTRACTION.get()
|
||||
|| perk == ModPerks.INTELLIGENT_CHIP.get();
|
||||
|
||||
case DAMAGE -> perk == ModPerks.KILL_CLIP.get()
|
||||
|| perk == ModPerks.MONSTER_HUNTER.get()
|
||||
|| perk == ModPerks.VORPAL_WEAPON.get();
|
||||
|
|
Loading…
Add table
Reference in a new issue