调整事不过四的功能,海月权杖的属性
This commit is contained in:
parent
d7d3431c70
commit
414abdd871
3 changed files with 14 additions and 8 deletions
|
@ -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 SPEED_ID = Mod.loc("gun_movement_speed");
|
||||||
private static final ResourceLocation DAMAGE_ID = Mod.loc("gun_melee_damage");
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NotNull ItemAttributeModifiers getDefaultAttributeModifiers(@NotNull ItemStack stack) {
|
public @NotNull ItemAttributeModifiers getDefaultAttributeModifiers(@NotNull ItemStack stack) {
|
||||||
|
@ -177,7 +176,7 @@ public abstract class GunItem extends Item implements CustomRendererItem {
|
||||||
if (data.meleeDamage() > 0) {
|
if (data.meleeDamage() > 0) {
|
||||||
list.add(new ItemAttributeModifiers.Entry(
|
list.add(new ItemAttributeModifiers.Entry(
|
||||||
Attributes.ATTACK_DAMAGE,
|
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
|
EquipmentSlotGroup.MAINHAND
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,14 @@ public class FourthTimesCharm extends Perk {
|
||||||
tag.remove("FourthTimesCharmCount");
|
tag.remove("FourthTimesCharmCount");
|
||||||
|
|
||||||
int mag = data.magazine();
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,13 +3,15 @@
|
||||||
"Spread": 1.5,
|
"Spread": 1.5,
|
||||||
"RecoilX": 0.0005,
|
"RecoilX": 0.0005,
|
||||||
"RecoilY": 0.0001,
|
"RecoilY": 0.0001,
|
||||||
"Damage": 11,
|
"Damage": 5.5,
|
||||||
|
"ProjectileAmount": 2,
|
||||||
"Headshot": 1.5,
|
"Headshot": 1.5,
|
||||||
"Velocity": 8,
|
"Velocity": 8,
|
||||||
"Weight": 1,
|
"Weight": 1,
|
||||||
|
"MeleeDamage": 10,
|
||||||
"NormalReloadTime": 20,
|
"NormalReloadTime": 20,
|
||||||
"EmptyReloadTime": 20,
|
"EmptyReloadTime": 20,
|
||||||
"BypassesArmor": 0.44,
|
"BypassesArmor": 0.26,
|
||||||
"SoundRadius": 2,
|
"SoundRadius": 2,
|
||||||
"RPM": 1100,
|
"RPM": 1100,
|
||||||
"ShootDelay": 10,
|
"ShootDelay": 10,
|
||||||
|
@ -21,13 +23,11 @@
|
||||||
"AmmoType": "@HandgunAmmo",
|
"AmmoType": "@HandgunAmmo",
|
||||||
"AvailablePerks": [
|
"AvailablePerks": [
|
||||||
"@Ammo",
|
"@Ammo",
|
||||||
"superbwarfare:heal_clip",
|
|
||||||
"superbwarfare:field_doctor",
|
"superbwarfare:field_doctor",
|
||||||
"superbwarfare:fourth_times_charm",
|
"superbwarfare:fourth_times_charm",
|
||||||
"superbwarfare:subsistence",
|
|
||||||
"superbwarfare:powerful_attraction",
|
"superbwarfare:powerful_attraction",
|
||||||
"superbwarfare:intelligent_chip",
|
"superbwarfare:intelligent_chip",
|
||||||
"superbwarfare:kill_clip",
|
"superbwarfare:killing_tally",
|
||||||
"superbwarfare:gutshot_straight",
|
"superbwarfare:gutshot_straight",
|
||||||
"superbwarfare:monster_hunter",
|
"superbwarfare:monster_hunter",
|
||||||
"superbwarfare:vorpal_weapon",
|
"superbwarfare:vorpal_weapon",
|
||||||
|
|
Loading…
Add table
Reference in a new issue