diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java index 2a2fcb17a..7616555c5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/AmmoBarOverlay.java @@ -259,7 +259,7 @@ public class AmmoBarOverlay { if (stack.getItem() == ModItems.BOCEK.get()) { return "Arrow"; } - if (stack.getItem() == ModItems.M_79.get()) { + if (stack.getItem() == ModItems.M_79.get() || stack.getItem() == ModItems.SECONDARY_CATACLYSM.get()) { return "40mm Grenade"; } if (stack.getItem() == ModItems.RPG.get()) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java index 9d96e454e..deb99b513 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java @@ -13,6 +13,7 @@ import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; import com.atsuishio.superbwarfare.tools.GunsTool; +import com.atsuishio.superbwarfare.tools.RarityTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -27,7 +28,6 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; import org.jetbrains.annotations.NotNull; @@ -50,7 +50,7 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, AnimatedItem public static ItemDisplayContext transformType; public SecondaryCataclysm() { - super(new Properties().stacksTo(1).fireResistant().rarity(Rarity.EPIC)); + super(new Properties().stacksTo(1).fireResistant().rarity(RarityTool.LEGENDARY)); } @Override diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 4c8a5f2b2..af1764ddb 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -47,7 +47,7 @@ "item.superbwarfare.k_98": "KAR-98K", "item.superbwarfare.mosin_nagant": "Mosin Nagant", "item.superbwarfare.javelin": "FGM-148 Javelin", - "item.superbwarfare.secondary_cataclysm": "Secondary Cataclysm Grenade Launcher", + "item.superbwarfare.secondary_cataclysm": "Secondary Cataclysm", "des.superbwarfare.guns.damage": "Damage: ", "des.superbwarfare.guns.level": "Level: ", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 3074bee6b..a1902a5ce 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -47,7 +47,7 @@ "item.superbwarfare.k_98": "KAR-98K", "item.superbwarfare.mosin_nagant": "莫辛纳甘", "item.superbwarfare.javelin": "FGM-148标枪导弹", - "item.superbwarfare.secondary_cataclysm": "“二次灾变” 榴弹发射器", + "item.superbwarfare.secondary_cataclysm": "二次灾变", "des.superbwarfare.guns.upgrade_point": "升级点数: ", "des.superbwarfare.guns.damage": "伤害: ", diff --git a/src/main/resources/data/superbwarfare/guns/secondary_cataclysm.json b/src/main/resources/data/superbwarfare/guns/secondary_cataclysm.json index 1b623115e..e7c28f7b2 100644 --- a/src/main/resources/data/superbwarfare/guns/secondary_cataclysm.json +++ b/src/main/resources/data/superbwarfare/guns/secondary_cataclysm.json @@ -2,9 +2,9 @@ "Spread": 1.5, "RecoilX": 0.004, "RecoilY": 0.023, - "Damage": 40, - "ExplosionDamage": 80, - "ExplosionRadius": 5, + "Damage": 50, + "ExplosionDamage": 50, + "ExplosionRadius": 7, "Velocity": 3.75, "Magazine": 8, "Weight": 9,