diff --git a/gradle.properties b/gradle.properties index 43c7265bd..6cdd5aafc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,5 +13,5 @@ mod_description=A Warfare Mod minecraft_version=1.20.1 jei_version=15.2.0.27 cloth_config_version=11.1.106 -mod_version=0.5.0 +mod_version=0.5.1 mod_authors=Atsuishio, Roki27, Light_Quanta \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/config/server/ExplosionConfig.java b/src/main/java/com/atsuishio/superbwarfare/config/server/ExplosionConfig.java index 7c4b4adce..70f38b4c6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/config/server/ExplosionConfig.java +++ b/src/main/java/com/atsuishio/superbwarfare/config/server/ExplosionConfig.java @@ -24,6 +24,10 @@ public class ExplosionConfig { public static ForgeConfigSpec.IntValue C4_EXPLOSION_DAMAGE; public static ForgeConfigSpec.IntValue C4_EXPLOSION_RADIUS; + public static ForgeConfigSpec.IntValue WIRE_GUIDE_MISSILE_DAMAGE; + public static ForgeConfigSpec.IntValue WIRE_GUIDE_MISSILE_EXPLOSION_DAMAGE; + public static ForgeConfigSpec.IntValue WIRE_GUIDE_MISSILE_EXPLOSION_RADIUS; + public static void init(ForgeConfigSpec.Builder builder) { builder.push("explosion"); @@ -93,6 +97,19 @@ public class ExplosionConfig { C4_EXPLOSION_RADIUS = builder.defineInRange("c4_explosion_radius", 14, 1, Integer.MAX_VALUE); builder.pop(); + + builder.push("Wire_Guide_Missile"); + + builder.comment("The damage of wire guide missile"); + WIRE_GUIDE_MISSILE_DAMAGE = builder.defineInRange("wire_guide_missile_damage", 500, 1, Integer.MAX_VALUE); + + builder.comment("The explosion damage of wire guide missile"); + WIRE_GUIDE_MISSILE_EXPLOSION_DAMAGE = builder.defineInRange("wire_guide_missile_explosion_damage", 60, 1, Integer.MAX_VALUE); + + builder.comment("The explosion radius of wre guide missile"); + WIRE_GUIDE_MISSILE_EXPLOSION_RADIUS = builder.defineInRange("wire_guide_missile_explosion_radius", 6, 1, Integer.MAX_VALUE); + + builder.pop(); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/config/server/VehicleConfig.java b/src/main/java/com/atsuishio/superbwarfare/config/server/VehicleConfig.java index 6a5c4ae5c..0c07294f9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/config/server/VehicleConfig.java +++ b/src/main/java/com/atsuishio/superbwarfare/config/server/VehicleConfig.java @@ -222,10 +222,10 @@ public class VehicleConfig { builder.comment("The cannon damage of Bmp_2"); BMP_2_CANNON_DAMAGE = builder.defineInRange("bmp_2_cannon_damage", 55, 1, 10000000); - builder.comment("The rocket explosion damage of Bmp_2"); + builder.comment("The cannon explosion damage of Bmp_2"); BMP_2_CANNON_EXPLOSION_DAMAGE = builder.defineInRange("bmp_2_cannon_explosion_damage", 15, 1, 10000000); - builder.comment("The rocket explosion radius of Bmp_2"); + builder.comment("The cannon explosion radius of Bmp_2"); BMP_2_CANNON_EXPLOSION_RADIUS = builder.defineInRange("bmp_2_cannon_explosion_radius", 3.2d, 1d, 10000000d); builder.pop(); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java index 238e765c3..49b075c55 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java @@ -439,6 +439,10 @@ public class Ah6Entity extends ContainerMobileEntity implements GeoEntity, IHeli Vector4f worldPosition = transformPosition(transform, x, y, z); passenger.setPos(worldPosition.x, worldPosition.y, worldPosition.z); callback.accept(passenger, worldPosition.x, worldPosition.y, worldPosition.z); + } else if (i == 1) { + Vector4f worldPosition = transformPosition(transform, -x, y, z); + passenger.setPos(worldPosition.x, worldPosition.y, worldPosition.z); + callback.accept(passenger, worldPosition.x, worldPosition.y, worldPosition.z); } if (passenger != this.getFirstPassenger()) { diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java index 6248d8a17..a8b3119eb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.entity.vehicle; import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.ExplosionDestroyConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; @@ -455,9 +456,9 @@ public class Bmp2Entity extends ContainerMobileEntity implements GeoEntity, ICha Vector4f worldPosition = transformPosition(transformT, 0, 1, 0); WgMissileEntity wgMissileEntity = new WgMissileEntity(player, player.level(), - 500, - 60, - 6); + ExplosionConfig.WIRE_GUIDE_MISSILE_DAMAGE.get(), + ExplosionConfig.WIRE_GUIDE_MISSILE_EXPLOSION_DAMAGE.get(), + ExplosionConfig.WIRE_GUIDE_MISSILE_EXPLOSION_RADIUS.get()); wgMissileEntity.setPos(worldPosition.x, worldPosition.y, worldPosition.z); wgMissileEntity.shoot(getBarrelVector(1).x, 0, getBarrelVector(1).z, 2f, 0f); diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index fab9020ed..8542a2e19 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -639,7 +639,7 @@ public class ClientEventHandler { if (charged.get()) { SoundEvent sound1p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, "sentinel_charge_fire_1p")); if (sound1p != null) { - player.playSound(sound1p, 1f, 1); + player.playSound(sound1p, 2f, 1); } return; } @@ -656,7 +656,7 @@ public class ClientEventHandler { SoundEvent sound1p = ForgeRegistries.SOUND_EVENTS.getValue(ModUtils.loc(name + (barrelType == 2 ? "_fire_1p_s" : "_fire_1p"))); if (sound1p != null) { - player.playSound(sound1p, 1f, 1); + player.playSound(sound1p, 2f, 1); } double shooterHeight = player.getEyePosition().distanceTo((Vec3.atLowerCornerOf(player.level().clip(new ClipContext(player.getEyePosition(), player.getEyePosition().add(new Vec3(0, -1, 0).scale(10)), diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/LungeMineAttackMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/LungeMineAttackMessage.java index 604eb3131..6deaeba50 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/LungeMineAttackMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/LungeMineAttackMessage.java @@ -57,7 +57,7 @@ public class LungeMineAttackMessage { } Entity lookingEntity = EntityFindUtil.findEntity(player.level(), String.valueOf(message.uuid)); if (lookingEntity != null) { - lookingEntity.hurt(ModDamageTypes.causeLungeMineDamage(player.level().registryAccess(), player, player), lookingEntity instanceof VehicleEntity ? 400 : 150); + lookingEntity.hurt(ModDamageTypes.causeLungeMineDamage(player.level().registryAccess(), player, player), lookingEntity instanceof VehicleEntity ? 450 : 150); causeLungeMineExplode(player.level(), player, lookingEntity); } } else if (message.type == 1) { diff --git a/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_fire_1p.ogg b/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_fire_1p.ogg index 44ac8a43b..43474eb37 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_fire_1p.ogg and b/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_fire_1p.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_fire_3p.ogg b/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_fire_3p.ogg index 9d578cf3a..2662379e3 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_fire_3p.ogg and b/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_fire_3p.ogg differ diff --git a/src/main/resources/data/superbwarfare/guns/javelin.json b/src/main/resources/data/superbwarfare/guns/javelin.json index 6091ebcba..3db439e9d 100644 --- a/src/main/resources/data/superbwarfare/guns/javelin.json +++ b/src/main/resources/data/superbwarfare/guns/javelin.json @@ -4,7 +4,7 @@ "Magazine": 1, "Weight": 10, "EmptyReloadTime": 78, - "Damage": 250, + "Damage": 450, "ExplosionDamage": 50, "ExplosionRadius": 4 } \ No newline at end of file