diff --git a/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java index f9a347569..8df18778f 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java @@ -367,13 +367,11 @@ public class GunEventHandler { projectile.bypassArmorRate(bypassArmorRate); - if (heldItem.getOrCreateTag().getBoolean("beast")) { - projectile.beast(); - } - if (perk == ModPerks.SILVER_BULLET.get()) { int level = PerkHelper.getItemPerkLevel(perk, heldItem); projectile.undeadMultiple(1.0f + 0.5f * level); + } else if (perk == ModPerks.BEAST_BULLET.get()) { + projectile.beast(); } projectile.setPos(player.getX() - 0.1 * player.getLookAngle().x, player.getEyeY() - 0.1 - 0.1 * player.getLookAngle().y, player.getZ() + -0.1 * player.getLookAngle().z); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java b/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java index 18657dcd1..da194b48f 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java @@ -23,9 +23,11 @@ public class ModPerks { public static final RegistryObject SILVER_BULLET = PERKS.register("silver_bullet", () -> new AmmoPerk(new AmmoPerk.Builder("silver_bullet", Perk.Type.AMMO).bypassArmorRate(0.1f).rgb(231, 251, 255))); + public static final RegistryObject BEAST_BULLET = PERKS.register("beast_bullet", + () -> new AmmoPerk(new AmmoPerk.Builder("beast_bullet", Perk.Type.AMMO).bypassArmorRate(0.0f).rgb(134, 65, 14))); - public static final RegistryObject FOURTH_TIMES_CHARM = PERKS.register("fourth_times_charm", () -> new Perk("fourth_times_charm", Perk.Type.FUNCTIONAL)); public static final RegistryObject HEAL_CLIP = PERKS.register("heal_clip", () -> new Perk("heal_clip", Perk.Type.FUNCTIONAL)); + public static final RegistryObject FOURTH_TIMES_CHARM = PERKS.register("fourth_times_charm", () -> new Perk("fourth_times_charm", Perk.Type.FUNCTIONAL)); public static final RegistryObject KILL_CLIP = PERKS.register("kill_clip", () -> new Perk("kill_clip", Perk.Type.DAMAGE)); public static final RegistryObject GUTSHOT_STRAIGHT = PERKS.register("gutshot_straight", () -> new Perk("gutshot_straight", Perk.Type.DAMAGE)); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 92db68dee..12095d998 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -174,18 +174,22 @@ "item.superbwarfare.galena": "Raw Galena", "item.superbwarfare.scheelite": "Raw Galena", - "item.superbwarfare.kill_clip": "Kill Clip", - "des.superbwarfare.kill_clip": "Increases the damage of weapon after dealing a final blow", + "item.superbwarfare.silver_bullet": "Silver Bullet", + "des.superbwarfare.silver_bullet": "Causes extra damage to undead entities", + "item.superbwarfare.beast_bullet": "Beast Bullet", + "des.superbwarfare.beast_bullet": "Kills every living entity", + "item.superbwarfare.heal_clip": "Heal Clip", "des.superbwarfare.heal_clip": "Reloading after dealing a final blow will heal you and your nearby allies", + "item.superbwarfare.fourth_times_charm": "Fourth Time's The Charm", + "des.superbwarfare.fourth_times_charm": "Rapidly landing precision hits will return two rounds to the magazine", + + "item.superbwarfare.kill_clip": "Kill Clip", + "des.superbwarfare.kill_clip": "Increases the damage of weapon after dealing a final blow", "item.superbwarfare.killing_tally": "Killing Tally", "des.superbwarfare.killing_tally": "Kill increases the weapon's damage until it is stowed or reloaded", "item.superbwarfare.gutshot_straight": "Gutshot Straight", "des.superbwarfare.gutshot_straight": "Aiming down sights increases body shot damage", - "item.superbwarfare.fourth_times_charm": "Fourth Time's The Charm", - "des.superbwarfare.fourth_times_charm": "Rapidly landing precision hits will return two rounds to the magazine", - "item.superbwarfare.silver_bullet": "Silver Bullet", - "des.superbwarfare.silver_bullet": "Causes extra damage to undead entities", "perk.superbwarfare.tips": "[Perks]", "perk.superbwarfare.slot": "Type: ", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index cff26cdb2..dd1996ca4 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -174,18 +174,22 @@ "item.superbwarfare.galena": "粗方铅矿", "item.superbwarfare.scheelite": "白钨矿", - "item.superbwarfare.kill_clip": "杀戮弹匣", - "des.superbwarfare.kill_clip": "完成击杀后填装可提升武器伤害", + "item.superbwarfare.silver_bullet": "银弹", + "des.superbwarfare.silver_bullet": "对亡灵生物造成额外伤害", + "item.superbwarfare.beast_bullet": "野兽弹", + "des.superbwarfare.beast_bullet": "秒杀一切生物", + "item.superbwarfare.heal_clip": "治疗弹匣", "des.superbwarfare.heal_clip": "最后一击后短时间内填装，可治疗自身和附近队友", + "item.superbwarfare.fourth_times_charm": "事不过四", + "des.superbwarfare.fourth_times_charm": "快速精准命中目标会向弹匣中返还两枚弹药", + + "item.superbwarfare.kill_clip": "杀戮弹匣", + "des.superbwarfare.kill_clip": "完成击杀后填装可提升武器伤害", "item.superbwarfare.killing_tally": "击杀记录", "des.superbwarfare.killing_tally": "完成击杀可提高此武器的伤害，效果持续至切换或填装武器", "item.superbwarfare.gutshot_straight": "直击要害", "des.superbwarfare.gutshot_straight": "瞄准时增加身体射击伤害", - "item.superbwarfare.fourth_times_charm": "事不过四", - "des.superbwarfare.fourth_times_charm": "快速精准命中目标会向弹匣中返还两枚弹药", - "item.superbwarfare.silver_bullet": "银弹", - "des.superbwarfare.silver_bullet": "对亡灵生物造成额外伤害", "perk.superbwarfare.tips": "[武器模组]", "perk.superbwarfare.slot": "类型: ",