kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

调整数据

Browse source
This commit is contained in:
Atsuihsio 2024-06-03 18:27:55 +08:00
parent baa4e216cd
commit 8cc758d01d
22 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/mcreator/target/event/GunEventHandler.java
View file

@ -397,7 +397,7 @@ public class GunEventHandler {
projectile.beast(); 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"), 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())); (float) player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()));
player.level().addFreshEntity(projectile); player.level().addFreshEntity(projectile);

4
src/main/java/net/mcreator/target/event/PlayerEventHandler.java
View file

@ -329,9 +329,9 @@ public class PlayerEventHandler {
recoil = recoil + 0.017 * (2.1 - recoil); recoil = recoil + 0.017 * (2.1 - recoil);
double sinRes = 0; 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.setXRot(newPitch);
player.xRotO = player.getXRot(); player.xRotO = player.getXRot();

4
src/main/resources/data/target/guns/aa_12.json
View file

@ -2,8 +2,8 @@
"zoom_speed": 0.95, "zoom_speed": 0.95,
"zoom": 1.25, "zoom": 1.25,
"dev": 3.5, "dev": 3.5,
"recoil_x": 0.016, "recoil_x": 0.006,
"recoil_y": 0.007, "recoil_y": 0.018,
"damage": 1.5, "damage": 1.5,
"headshot": 1.5, "headshot": 1.5,
"velocity": 16, "velocity": 16,

2
src/main/resources/data/target/guns/abekiri.json
View file

@ -6,7 +6,7 @@
"recoil_y": 0.026, "recoil_y": 0.026,
"damage": 2.5, "damage": 2.5,
"headshot": 1.5, "headshot": 1.5,
"velocity": 15, "velocity": 12,
"mag": 2, "mag": 2,
"projectile_amount": 8, "projectile_amount": 8,
"fire_interval": 2, "fire_interval": 2,

2
src/main/resources/data/target/guns/ak_47.json
View file

@ -6,7 +6,7 @@
"recoil_y": 0.012, "recoil_y": 0.012,
"damage": 8.5, "damage": 8.5,
"headshot": 1.75, "headshot": 1.75,
"velocity": 30, "velocity": 35,
"mag": 30, "mag": 30,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 2, "fire_interval": 2,

2
src/main/resources/data/target/guns/devotion.json
View file

@ -7,7 +7,7 @@
"recoil_y": 0.01, "recoil_y": 0.01,
"damage": 7, "damage": 7,
"headshot": 2, "headshot": 2,
"velocity": 40, "velocity": 42.4,
"mag": 55, "mag": 55,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 5, "fire_interval": 5,

2
src/main/resources/data/target/guns/hk_416.json
View file

@ -6,7 +6,7 @@
"recoil_y": 0.009, "recoil_y": 0.009,
"damage": 7.5, "damage": 7.5,
"headshot": 2, "headshot": 2,
"velocity": 45, "velocity": 44,
"mag": 30, "mag": 30,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 1, "fire_interval": 1,

2
src/main/resources/data/target/guns/hunting_rifle.json
View file

@ -6,7 +6,7 @@
"recoil_y": 0.03, "recoil_y": 0.03,
"damage": 40, "damage": 40,
"headshot": 3, "headshot": 3,
"velocity": 50, "velocity": 38,
"mag": 1, "mag": 1,
"projectile_amount": 1, "projectile_amount": 1,
"weight": 1, "weight": 1,

4
src/main/resources/data/target/guns/kraber.json
View file

@ -1,5 +1,5 @@
{ {
"zoom_speed": 0.8, "zoom_speed": 0.6,
"zoom": 6, "zoom": 6,
"bipod": 1, "bipod": 1,
"dev": 6, "dev": 6,
@ -7,7 +7,7 @@
"recoil_y": 0.018, "recoil_y": 0.018,
"damage": 70, "damage": 70,
"headshot": 3, "headshot": 3,
"velocity": 40, "velocity": 32.5,
"projectile_amount": 1, "projectile_amount": 1,
"mag": 4, "mag": 4,
"fire_interval": 10, "fire_interval": 10,

2
src/main/resources/data/target/guns/m_4.json
View file

@ -6,7 +6,7 @@
"recoil_y": 0.011, "recoil_y": 0.011,
"damage": 7, "damage": 7,
"headshot": 2, "headshot": 2,
"velocity": 45, "velocity": 44,
"mag": 30, "mag": 30,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 1, "fire_interval": 1,

2
src/main/resources/data/target/guns/m_60.json
View file

@ -7,7 +7,7 @@
"recoil_y": 0.014, "recoil_y": 0.014,
"damage": 9, "damage": 9,
"headshot": 2, "headshot": 2,
"velocity": 40, "velocity": 42.5,
"mag": 100, "mag": 100,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 2, "fire_interval": 2,

4
src/main/resources/data/target/guns/m_870.json
View file

@ -4,9 +4,9 @@
"dev": 3, "dev": 3,
"recoil_x": 0.009, "recoil_x": 0.009,
"recoil_y": 0.03, "recoil_y": 0.03,
"damage": 2, "damage": 2.4,
"headshot": 1.5, "headshot": 1.5,
"velocity": 20, "velocity": 16,
"mag": 8, "mag": 8,
"force_stop_reloading": 1, "force_stop_reloading": 1,
"projectile_amount": 12, "projectile_amount": 12,

6
src/main/resources/data/target/guns/m_98b.json
View file

@ -1,12 +1,12 @@
{ {
"zoom_speed": 0.85, "zoom_speed": 0.75,
"zoom": 8, "zoom": 8,
"dev": 6, "dev": 6,
"recoil_x": 0.007, "recoil_x": 0.007,
"recoil_y": 0.013, "recoil_y": 0.013,
"damage": 28, "damage": 38,
"headshot": 3, "headshot": 3,
"velocity": 55, "velocity": 47.2,
"projectile_amount": 1, "projectile_amount": 1,
"mag": 5, "mag": 5,
"fire_interval": 6, "fire_interval": 6,

2
src/main/resources/data/target/guns/marlin.json
View file

@ -6,7 +6,7 @@
"recoil_y": 0.011, "recoil_y": 0.011,
"damage": 16, "damage": 16,
"headshot": 2.5, "headshot": 2.5,
"velocity": 27, "velocity": 38,
"mag": 8, "mag": 8,
"force_stop_reloading": 1, "force_stop_reloading": 1,
"projectile_amount": 1, "projectile_amount": 1,

8
src/main/resources/data/target/guns/minigun.json
View file

@ -1,11 +1,11 @@
{ {
"zoom": 1, "zoom": 1,
"dev": 5, "dev": 3.5,
"recoil_x": 0.024, "recoil_x": 0.012,
"recoil_y": 0.005, "recoil_y": 0.011,
"damage": 8, "damage": 8,
"headshot": 2, "headshot": 2,
"velocity": 40, "velocity": 48,
"fire_interval": 1, "fire_interval": 1,
"weight": 2, "weight": 2,
"fire_mode": 2, "fire_mode": 2,

4
src/main/resources/data/target/guns/mk_14.json
View file

@ -1,5 +1,5 @@
{ {
"zoom_speed": 0.9, "zoom_speed": 0.85,
"zoom": 4, "zoom": 4,
"dev": 6, "dev": 6,
"bipod": 1, "bipod": 1,
@ -7,7 +7,7 @@
"recoil_y": 0.014, "recoil_y": 0.014,
"damage": 12, "damage": 12,
"headshot": 2.5, "headshot": 2.5,
"velocity": 45, "velocity": 42.5,
"mag": 20, "mag": 20,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 2, "fire_interval": 2,

2
src/main/resources/data/target/guns/rpk.json
View file

@ -7,7 +7,7 @@
"recoil_y": 0.012, "recoil_y": 0.012,
"damage": 8.75, "damage": 8.75,
"headshot": 2, "headshot": 2,
"velocity": 35, "velocity": 37,
"mag": 75, "mag": 75,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 2, "fire_interval": 2,

4
src/main/resources/data/target/guns/sentinel.json
View file

@ -4,11 +4,11 @@
"dev": 6, "dev": 6,
"recoil_x": 0.007, "recoil_x": 0.007,
"recoil_y": 0.018, "recoil_y": 0.018,
"damage": 25, "damage": 35,
"mag": 5, "mag": 5,
"projectile_amount": 1, "projectile_amount": 1,
"headshot": 2, "headshot": 2,
"velocity": 50, "velocity": 39,
"fire_interval": 2, "fire_interval": 2,
"bolt_action_time": 22, "bolt_action_time": 22,
"weight": 1, "weight": 1,

2
src/main/resources/data/target/guns/sks.json
View file

@ -6,7 +6,7 @@
"recoil_y": 0.015, "recoil_y": 0.015,
"damage": 9.5, "damage": 9.5,
"headshot": 1.75, "headshot": 1.75,
"velocity": 40, "velocity": 36.5,
"mag": 20, "mag": 20,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 3, "fire_interval": 3,

4
src/main/resources/data/target/guns/svd.json
View file

@ -5,8 +5,8 @@
"recoil_x": 0.008, "recoil_x": 0.008,
"recoil_y": 0.015, "recoil_y": 0.015,
"damage": 18, "damage": 18,
"headshot": 2.5, "headshot": 2,
"velocity": 50, "velocity": 41.5,
"mag": 10, "mag": 10,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 5, "fire_interval": 5,

2
src/main/resources/data/target/guns/trachelium.json
View file

@ -6,7 +6,7 @@
"recoil_y": 0.022, "recoil_y": 0.022,
"damage": 18, "damage": 18,
"headshot": 1.5, "headshot": 1.5,
"velocity": 60, "velocity": 18,
"mag": 8, "mag": 8,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 5, "fire_interval": 5,

2
src/main/resources/data/target/guns/vector.json
View file

@ -6,7 +6,7 @@
"recoil_y": 0.004, "recoil_y": 0.004,
"damage": 4.5, "damage": 4.5,
"headshot": 1.5, "headshot": 1.5,
"velocity": 22, "velocity": 14,
"mag": 33, "mag": 33,
"projectile_amount": 1, "projectile_amount": 1,
"fire_interval": 1, "fire_interval": 1,