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 cdadf655f..a7571efbd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java @@ -156,7 +156,6 @@ public abstract class GunItem extends Item implements CustomRendererItem { } private static final ResourceLocation SPEED_ID = Mod.loc("gun_movement_speed"); - private static final ResourceLocation DAMAGE_ID = Mod.loc("gun_melee_damage"); @Override public @NotNull ItemAttributeModifiers getDefaultAttributeModifiers(@NotNull ItemStack stack) { @@ -177,7 +176,7 @@ public abstract class GunItem extends Item implements CustomRendererItem { if (data.meleeDamage() > 0) { list.add(new ItemAttributeModifiers.Entry( Attributes.ATTACK_DAMAGE, - new AttributeModifier(DAMAGE_ID, data.meleeDamage(), AttributeModifier.Operation.ADD_VALUE), + new AttributeModifier(BASE_ATTACK_DAMAGE_ID, data.meleeDamage(), AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND )); } diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java b/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java index 8267b6748..86668f981 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java @@ -27,7 +27,14 @@ public class FourthTimesCharm extends Perk { tag.remove("FourthTimesCharmCount"); int mag = data.magazine(); - data.ammo.set(Math.min(mag, data.ammo.get() + 2)); + if (mag > 0) { + data.ammo.set(Math.min(mag, data.ammo.get() + 2)); + } else if (living != null) { + var ammoType = data.ammoTypeInfo().playerAmmoType(); + if (ammoType != null) { + ammoType.add(living, 2); + } + } } } diff --git a/src/main/resources/data/superbwarfare/guns/aurelia_sceptre.json b/src/main/resources/data/superbwarfare/guns/aurelia_sceptre.json index 099277c0a..9f2bc082d 100644 --- a/src/main/resources/data/superbwarfare/guns/aurelia_sceptre.json +++ b/src/main/resources/data/superbwarfare/guns/aurelia_sceptre.json @@ -3,13 +3,15 @@ "Spread": 1.5, "RecoilX": 0.0005, "RecoilY": 0.0001, - "Damage": 11, + "Damage": 5.5, + "ProjectileAmount": 2, "Headshot": 1.5, "Velocity": 8, "Weight": 1, + "MeleeDamage": 10, "NormalReloadTime": 20, "EmptyReloadTime": 20, - "BypassesArmor": 0.44, + "BypassesArmor": 0.26, "SoundRadius": 2, "RPM": 1100, "ShootDelay": 10, @@ -21,13 +23,11 @@ "AmmoType": "@HandgunAmmo", "AvailablePerks": [ "@Ammo", - "superbwarfare:heal_clip", "superbwarfare:field_doctor", "superbwarfare:fourth_times_charm", - "superbwarfare:subsistence", "superbwarfare:powerful_attraction", "superbwarfare:intelligent_chip", - "superbwarfare:kill_clip", + "superbwarfare:killing_tally", "superbwarfare:gutshot_straight", "superbwarfare:monster_hunter", "superbwarfare:vorpal_weapon",