diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index 7708853d3..13a389ca6 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -397,7 +397,7 @@ public class GunEventHandler { projectile.beast(); } - projectile.setPos(player.getX() - 0.1 * player.getLookAngle().x, player.getEyeY() - 0.2 - 0.1 * player.getLookAngle().y, player.getZ() + -0.1 * player.getLookAngle().z); + projectile.setPos(player.getX() - 0.1 * player.getLookAngle().x, player.getEyeY() - 0.07 - 0.1 * player.getLookAngle().y, player.getZ() + -0.1 * player.getLookAngle().z); projectile.shoot(player.getLookAngle().x, player.getLookAngle().y + 0.003f , player.getLookAngle().z, 1 * (float) heldItem.getOrCreateTag().getDouble("velocity"), (float) player.getAttributeBaseValue(TargetModAttributes.SPREAD.get())); player.level().addFreshEntity(projectile); diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java index fa7b02000..49cd47397 100644 --- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java @@ -329,9 +329,9 @@ public class PlayerEventHandler { recoil = recoil + 0.017 * (2.1 - recoil); double sinRes = 0; - sinRes = 0.35 * Math.sin(Math.PI * (1.5 * recoil)) * (3 - Math.pow(recoil , 2)) + 0.044; + sinRes = 0.35 * Math.sin(Math.PI * (1.5 * recoil)) * (3 - Math.pow(recoil , 2)) + 0.054; - float newPitch = ((float) (player.getXRot() - 7.5f * recoilY * ry * (sinRes + Mth.clamp(0.75 - recoil,0,0.5)))); + float newPitch = ((float) (player.getXRot() - 7.5f * recoilY * ry * (sinRes + Mth.clamp(0.75 - recoil,0,0.7)))); player.setXRot(newPitch); player.xRotO = player.getXRot(); diff --git a/src/main/resources/data/target/guns/aa_12.json b/src/main/resources/data/target/guns/aa_12.json index 8e6880a51..02f39e900 100644 --- a/src/main/resources/data/target/guns/aa_12.json +++ b/src/main/resources/data/target/guns/aa_12.json @@ -2,8 +2,8 @@ "zoom_speed": 0.95, "zoom": 1.25, "dev": 3.5, - "recoil_x": 0.016, - "recoil_y": 0.007, + "recoil_x": 0.006, + "recoil_y": 0.018, "damage": 1.5, "headshot": 1.5, "velocity": 16, diff --git a/src/main/resources/data/target/guns/abekiri.json b/src/main/resources/data/target/guns/abekiri.json index 00193b6ec..89b6cfbf3 100644 --- a/src/main/resources/data/target/guns/abekiri.json +++ b/src/main/resources/data/target/guns/abekiri.json @@ -6,7 +6,7 @@ "recoil_y": 0.026, "damage": 2.5, "headshot": 1.5, - "velocity": 15, + "velocity": 12, "mag": 2, "projectile_amount": 8, "fire_interval": 2, diff --git a/src/main/resources/data/target/guns/ak_47.json b/src/main/resources/data/target/guns/ak_47.json index a2e3ebdc0..1acd5a3e8 100644 --- a/src/main/resources/data/target/guns/ak_47.json +++ b/src/main/resources/data/target/guns/ak_47.json @@ -6,7 +6,7 @@ "recoil_y": 0.012, "damage": 8.5, "headshot": 1.75, - "velocity": 30, + "velocity": 35, "mag": 30, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/target/guns/devotion.json b/src/main/resources/data/target/guns/devotion.json index 768b6623e..a2397eeb4 100644 --- a/src/main/resources/data/target/guns/devotion.json +++ b/src/main/resources/data/target/guns/devotion.json @@ -7,7 +7,7 @@ "recoil_y": 0.01, "damage": 7, "headshot": 2, - "velocity": 40, + "velocity": 42.4, "mag": 55, "projectile_amount": 1, "fire_interval": 5, diff --git a/src/main/resources/data/target/guns/hk_416.json b/src/main/resources/data/target/guns/hk_416.json index f59fac19b..dc9992bc4 100644 --- a/src/main/resources/data/target/guns/hk_416.json +++ b/src/main/resources/data/target/guns/hk_416.json @@ -6,7 +6,7 @@ "recoil_y": 0.009, "damage": 7.5, "headshot": 2, - "velocity": 45, + "velocity": 44, "mag": 30, "projectile_amount": 1, "fire_interval": 1, diff --git a/src/main/resources/data/target/guns/hunting_rifle.json b/src/main/resources/data/target/guns/hunting_rifle.json index d21509d7f..0032971cc 100644 --- a/src/main/resources/data/target/guns/hunting_rifle.json +++ b/src/main/resources/data/target/guns/hunting_rifle.json @@ -6,7 +6,7 @@ "recoil_y": 0.03, "damage": 40, "headshot": 3, - "velocity": 50, + "velocity": 38, "mag": 1, "projectile_amount": 1, "weight": 1, diff --git a/src/main/resources/data/target/guns/kraber.json b/src/main/resources/data/target/guns/kraber.json index d0e8b445e..e0afd8f98 100644 --- a/src/main/resources/data/target/guns/kraber.json +++ b/src/main/resources/data/target/guns/kraber.json @@ -1,5 +1,5 @@ { - "zoom_speed": 0.8, + "zoom_speed": 0.6, "zoom": 6, "bipod": 1, "dev": 6, @@ -7,7 +7,7 @@ "recoil_y": 0.018, "damage": 70, "headshot": 3, - "velocity": 40, + "velocity": 32.5, "projectile_amount": 1, "mag": 4, "fire_interval": 10, diff --git a/src/main/resources/data/target/guns/m_4.json b/src/main/resources/data/target/guns/m_4.json index bf7e0abd4..9d234684e 100644 --- a/src/main/resources/data/target/guns/m_4.json +++ b/src/main/resources/data/target/guns/m_4.json @@ -6,7 +6,7 @@ "recoil_y": 0.011, "damage": 7, "headshot": 2, - "velocity": 45, + "velocity": 44, "mag": 30, "projectile_amount": 1, "fire_interval": 1, diff --git a/src/main/resources/data/target/guns/m_60.json b/src/main/resources/data/target/guns/m_60.json index 1e5413f6a..015317f3f 100644 --- a/src/main/resources/data/target/guns/m_60.json +++ b/src/main/resources/data/target/guns/m_60.json @@ -7,7 +7,7 @@ "recoil_y": 0.014, "damage": 9, "headshot": 2, - "velocity": 40, + "velocity": 42.5, "mag": 100, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/target/guns/m_870.json b/src/main/resources/data/target/guns/m_870.json index 7032afe57..39ecac30c 100644 --- a/src/main/resources/data/target/guns/m_870.json +++ b/src/main/resources/data/target/guns/m_870.json @@ -4,9 +4,9 @@ "dev": 3, "recoil_x": 0.009, "recoil_y": 0.03, - "damage": 2, + "damage": 2.4, "headshot": 1.5, - "velocity": 20, + "velocity": 16, "mag": 8, "force_stop_reloading": 1, "projectile_amount": 12, diff --git a/src/main/resources/data/target/guns/m_98b.json b/src/main/resources/data/target/guns/m_98b.json index 72dc293b0..fa2d99c8b 100644 --- a/src/main/resources/data/target/guns/m_98b.json +++ b/src/main/resources/data/target/guns/m_98b.json @@ -1,12 +1,12 @@ { - "zoom_speed": 0.85, + "zoom_speed": 0.75, "zoom": 8, "dev": 6, "recoil_x": 0.007, "recoil_y": 0.013, - "damage": 28, + "damage": 38, "headshot": 3, - "velocity": 55, + "velocity": 47.2, "projectile_amount": 1, "mag": 5, "fire_interval": 6, diff --git a/src/main/resources/data/target/guns/marlin.json b/src/main/resources/data/target/guns/marlin.json index 8be509942..d1713fba1 100644 --- a/src/main/resources/data/target/guns/marlin.json +++ b/src/main/resources/data/target/guns/marlin.json @@ -6,7 +6,7 @@ "recoil_y": 0.011, "damage": 16, "headshot": 2.5, - "velocity": 27, + "velocity": 38, "mag": 8, "force_stop_reloading": 1, "projectile_amount": 1, diff --git a/src/main/resources/data/target/guns/minigun.json b/src/main/resources/data/target/guns/minigun.json index 46020a08c..8f44c9950 100644 --- a/src/main/resources/data/target/guns/minigun.json +++ b/src/main/resources/data/target/guns/minigun.json @@ -1,11 +1,11 @@ { "zoom": 1, - "dev": 5, - "recoil_x": 0.024, - "recoil_y": 0.005, + "dev": 3.5, + "recoil_x": 0.012, + "recoil_y": 0.011, "damage": 8, "headshot": 2, - "velocity": 40, + "velocity": 48, "fire_interval": 1, "weight": 2, "fire_mode": 2, diff --git a/src/main/resources/data/target/guns/mk_14.json b/src/main/resources/data/target/guns/mk_14.json index 6215bcf2a..8ba89e2dc 100644 --- a/src/main/resources/data/target/guns/mk_14.json +++ b/src/main/resources/data/target/guns/mk_14.json @@ -1,5 +1,5 @@ { - "zoom_speed": 0.9, + "zoom_speed": 0.85, "zoom": 4, "dev": 6, "bipod": 1, @@ -7,7 +7,7 @@ "recoil_y": 0.014, "damage": 12, "headshot": 2.5, - "velocity": 45, + "velocity": 42.5, "mag": 20, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/target/guns/rpk.json b/src/main/resources/data/target/guns/rpk.json index 9d6f144d0..40e99791f 100644 --- a/src/main/resources/data/target/guns/rpk.json +++ b/src/main/resources/data/target/guns/rpk.json @@ -7,7 +7,7 @@ "recoil_y": 0.012, "damage": 8.75, "headshot": 2, - "velocity": 35, + "velocity": 37, "mag": 75, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/target/guns/sentinel.json b/src/main/resources/data/target/guns/sentinel.json index b63d4f860..448e60a4e 100644 --- a/src/main/resources/data/target/guns/sentinel.json +++ b/src/main/resources/data/target/guns/sentinel.json @@ -4,11 +4,11 @@ "dev": 6, "recoil_x": 0.007, "recoil_y": 0.018, - "damage": 25, + "damage": 35, "mag": 5, "projectile_amount": 1, "headshot": 2, - "velocity": 50, + "velocity": 39, "fire_interval": 2, "bolt_action_time": 22, "weight": 1, diff --git a/src/main/resources/data/target/guns/sks.json b/src/main/resources/data/target/guns/sks.json index bc1620baa..ee28a4eaa 100644 --- a/src/main/resources/data/target/guns/sks.json +++ b/src/main/resources/data/target/guns/sks.json @@ -6,7 +6,7 @@ "recoil_y": 0.015, "damage": 9.5, "headshot": 1.75, - "velocity": 40, + "velocity": 36.5, "mag": 20, "projectile_amount": 1, "fire_interval": 3, diff --git a/src/main/resources/data/target/guns/svd.json b/src/main/resources/data/target/guns/svd.json index e52a33ea0..43567a8bd 100644 --- a/src/main/resources/data/target/guns/svd.json +++ b/src/main/resources/data/target/guns/svd.json @@ -5,8 +5,8 @@ "recoil_x": 0.008, "recoil_y": 0.015, "damage": 18, - "headshot": 2.5, - "velocity": 50, + "headshot": 2, + "velocity": 41.5, "mag": 10, "projectile_amount": 1, "fire_interval": 5, diff --git a/src/main/resources/data/target/guns/trachelium.json b/src/main/resources/data/target/guns/trachelium.json index 84d062c94..24228efcb 100644 --- a/src/main/resources/data/target/guns/trachelium.json +++ b/src/main/resources/data/target/guns/trachelium.json @@ -6,7 +6,7 @@ "recoil_y": 0.022, "damage": 18, "headshot": 1.5, - "velocity": 60, + "velocity": 18, "mag": 8, "projectile_amount": 1, "fire_interval": 5, diff --git a/src/main/resources/data/target/guns/vector.json b/src/main/resources/data/target/guns/vector.json index f9b16e2e0..79d70fbee 100644 --- a/src/main/resources/data/target/guns/vector.json +++ b/src/main/resources/data/target/guns/vector.json @@ -6,7 +6,7 @@ "recoil_y": 0.004, "damage": 4.5, "headshot": 1.5, - "velocity": 22, + "velocity": 14, "mag": 33, "projectile_amount": 1, "fire_interval": 1,