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

优化NBT#Velocity

Browse source
This commit is contained in:
17146 2024-12-24 15:31:04 +08:00
parent 207368b9bb
commit 676d825f2e
33 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
View file

@ -187,7 +187,7 @@ public class GunEventHandler {
if (!player.level().isClientSide()) { if (!player.level().isClientSide()) {
float headshot = (float) GunsTool.getGunDoubleTag(heldItem, "Headshot", 0); float headshot = (float) GunsTool.getGunDoubleTag(heldItem, "Headshot", 0);
float damage = (float) (heldItem.getOrCreateTag().getDouble("damage") + heldItem.getOrCreateTag().getDouble("sentinelChargeDamage")) * (float) perkDamage(heldItem); float damage = (float) (heldItem.getOrCreateTag().getDouble("damage") + heldItem.getOrCreateTag().getDouble("sentinelChargeDamage")) * (float) perkDamage(heldItem);
float velocity = (float) ((heldItem.getOrCreateTag().getDouble("velocity") + heldItem.getOrCreateTag().getDouble("CustomVelocity")) * perkSpeed(heldItem)); float velocity = (float) ((GunsTool.getGunDoubleTag(heldItem, "Velocity", 0) + heldItem.getOrCreateTag().getDouble("CustomVelocity")) * perkSpeed(heldItem));
int projectileAmount = GunsTool.getGunIntTag(heldItem, "ProjectileAmount", 1); int projectileAmount = GunsTool.getGunIntTag(heldItem, "ProjectileAmount", 1);
float bypassArmorRate = (float) heldItem.getOrCreateTag().getDouble("BypassesArmor"); float bypassArmorRate = (float) heldItem.getOrCreateTag().getDouble("BypassesArmor");
boolean zoom = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).zoom; boolean zoom = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).zoom;

6
src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java
View file

@ -340,7 +340,7 @@ public class FireMessage {
TaserBulletProjectileEntity taserBulletProjectile = new TaserBulletProjectileEntity(player, level, (float) stack.getOrCreateTag().getDouble("damage"), volt, wireLength); TaserBulletProjectileEntity taserBulletProjectile = new TaserBulletProjectileEntity(player, level, (float) stack.getOrCreateTag().getDouble("damage"), volt, wireLength);
taserBulletProjectile.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); taserBulletProjectile.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ());
taserBulletProjectile.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) stack.getOrCreateTag().getDouble("velocity"), taserBulletProjectile.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) GunsTool.getGunDoubleTag(stack, "Velocity", 0),
(float) (zoom ? 0.1 : spread)); (float) (zoom ? 0.1 : spread));
level.addFreshEntity(taserBulletProjectile); level.addFreshEntity(taserBulletProjectile);
} }
@ -380,7 +380,7 @@ public class FireMessage {
} }
gunGrenadeEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); gunGrenadeEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ());
gunGrenadeEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) stack.getOrCreateTag().getDouble("velocity"), gunGrenadeEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) GunsTool.getGunDoubleTag(stack, "Velocity", 0),
(float) (zoom ? 0.1 : spread)); (float) (zoom ? 0.1 : spread));
level.addFreshEntity(gunGrenadeEntity); level.addFreshEntity(gunGrenadeEntity);
} }
@ -431,7 +431,7 @@ public class FireMessage {
} }
rocketEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); rocketEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ());
rocketEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) tag.getDouble("velocity"), rocketEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) GunsTool.getGunDoubleTag(stack, "Velocity", 0),
(float) (zoom ? 0.1 : spread)); (float) (zoom ? 0.1 : spread));
level.addFreshEntity(rocketEntity); level.addFreshEntity(rocketEntity);
} }

2
src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
View file

@ -55,7 +55,7 @@ public class GunsTool {
// TODO 临时使用，移植完毕后删除 // TODO 临时使用，移植完毕后删除
private static final Set<String> STRING_SET = Set.of("EmptyReloadTime", "FireMode", "Weight", "SoundRadius", "BurstSize", "ProjectileAmount", private static final Set<String> STRING_SET = Set.of("EmptyReloadTime", "FireMode", "Weight", "SoundRadius", "BurstSize", "ProjectileAmount",
"Spread", "NormalReloadTime", "Headshot", "Semi", "Burst", "Auto", "RecoilX", "RecoilY"); "Spread", "NormalReloadTime", "Headshot", "Semi", "Burst", "Auto", "RecoilX", "RecoilY", "Velocity");
public static void initGun(Level level, ItemStack stack, String location) { public static void initGun(Level level, ItemStack stack, String location) {
if (level.getServer() == null) return; if (level.getServer() == null) return;

2
src/main/resources/data/superbwarfare/guns/aa_12.json
View file

@ -4,7 +4,7 @@
"RecoilY": 0.018, "RecoilY": 0.018,
"damage": 2.5, "damage": 2.5,
"Headshot": 1.5, "Headshot": 1.5,
"velocity": 17, "Velocity": 17,
"mag": 25, "mag": 25,
"ProjectileAmount": 12, "ProjectileAmount": 12,
"Weight": 7, "Weight": 7,

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

@ -4,7 +4,7 @@
"RecoilY": 0.026, "RecoilY": 0.026,
"damage": 5, "damage": 5,
"Headshot": 1.5, "Headshot": 1.5,
"velocity": 15, "Velocity": 15,
"mag": 2, "mag": 2,
"ProjectileAmount": 12, "ProjectileAmount": 12,
"Weight": 1, "Weight": 1,

2
src/main/resources/data/superbwarfare/guns/ak_12.json
View file

@ -6,7 +6,7 @@
"RecoilY": 0.01, "RecoilY": 0.01,
"damage": 7.7, "damage": 7.7,
"Headshot": 2, "Headshot": 2,
"velocity": 44.5, "Velocity": 44.5,
"mag": 30, "mag": 30,
"Weight": 4, "Weight": 4,
"FireMode": 2, "FireMode": 2,

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

@ -6,7 +6,7 @@
"RecoilY": 0.012, "RecoilY": 0.012,
"damage": 8.5, "damage": 8.5,
"Headshot": 2, "Headshot": 2,
"velocity": 36, "Velocity": 36,
"mag": 30, "mag": 30,
"Weight": 5, "Weight": 5,
"FireMode": 2, "FireMode": 2,

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

@ -5,7 +5,7 @@
"RecoilY": 0.01, "RecoilY": 0.01,
"damage": 9.5, "damage": 9.5,
"Headshot": 2, "Headshot": 2,
"velocity": 40, "Velocity": 40,
"mag": 55, "mag": 55,
"Weight": 6, "Weight": 6,
"FireMode": 2, "FireMode": 2,

2
src/main/resources/data/superbwarfare/guns/glock_17.json
View file

@ -4,7 +4,7 @@
"RecoilY": 0.013, "RecoilY": 0.013,
"damage": 5.5, "damage": 5.5,
"Headshot": 1.5, "Headshot": 1.5,
"velocity": 17, "Velocity": 17,
"mag": 17, "mag": 17,
"Weight": 1, "Weight": 1,
"FireMode": 0, "FireMode": 0,

2
src/main/resources/data/superbwarfare/guns/glock_18.json
View file

@ -4,7 +4,7 @@
"RecoilY": 0.013, "RecoilY": 0.013,
"damage": 5.5, "damage": 5.5,
"Headshot": 1.5, "Headshot": 1.5,
"velocity": 17, "Velocity": 17,
"mag": 17, "mag": 17,
"Weight": 1, "Weight": 1,
"FireMode": 2, "FireMode": 2,

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

@ -6,7 +6,7 @@
"RecoilY": 0.009, "RecoilY": 0.009,
"damage": 7.5, "damage": 7.5,
"Headshot": 2, "Headshot": 2,
"velocity": 44, "Velocity": 44,
"mag": 30, "mag": 30,
"Weight": 4, "Weight": 4,
"FireMode": 2, "FireMode": 2,

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

@ -4,7 +4,7 @@
"RecoilY": 0.04, "RecoilY": 0.04,
"damage": 65, "damage": 65,
"Headshot": 3, "Headshot": 3,
"velocity": 38, "Velocity": 38,
"mag": 1, "mag": 1,
"Weight": 5, "Weight": 5,
"FireMode": 0, "FireMode": 0,

2
src/main/resources/data/superbwarfare/guns/k_98.json
View file

@ -4,7 +4,7 @@
"RecoilY": 0.063, "RecoilY": 0.063,
"damage": 35, "damage": 35,
"Headshot": 3, "Headshot": 3,
"velocity": 37.75, "Velocity": 37.75,
"mag": 5, "mag": 5,
"bolt_action_time": 22, "bolt_action_time": 22,
"Weight": 5, "Weight": 5,

2
src/main/resources/data/superbwarfare/guns/m_1911.json
View file

@ -4,7 +4,7 @@
"RecoilY": 0.018, "RecoilY": 0.018,
"damage": 9.5, "damage": 9.5,
"Headshot": 1.5, "Headshot": 1.5,
"velocity": 15, "Velocity": 15,
"mag": 7, "mag": 7,
"Weight": 2, "Weight": 2,
"FireMode": 0, "FireMode": 0,

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

@ -6,7 +6,7 @@
"RecoilY": 0.011, "RecoilY": 0.011,
"damage": 7, "damage": 7,
"Headshot": 2, "Headshot": 2,
"velocity": 44, "Velocity": 44,
"mag": 30, "mag": 30,
"Weight": 4, "Weight": 4,
"FireMode": 2, "FireMode": 2,

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

@ -4,7 +4,7 @@
"RecoilY": 0.014, "RecoilY": 0.014,
"damage": 9, "damage": 9,
"Headshot": 2, "Headshot": 2,
"velocity": 43, "Velocity": 43,
"mag": 100, "mag": 100,
"Weight": 8, "Weight": 8,
"FireMode": 2, "FireMode": 2,

2
src/main/resources/data/superbwarfare/guns/m_79.json
View file

@ -5,7 +5,7 @@
"damage": 40, "damage": 40,
"ExplosionDamage": 80, "ExplosionDamage": 80,
"ExplosionRadius": 5, "ExplosionRadius": 5,
"velocity": 3.75, "Velocity": 3.75,
"mag": 1, "mag": 1,
"Weight": 4, "Weight": 4,
"EmptyReloadTime": 64 "EmptyReloadTime": 64

2
src/main/resources/data/superbwarfare/guns/m_870.json
View file

@ -4,7 +4,7 @@
"RecoilY": 0.04, "RecoilY": 0.04,
"damage": 3, "damage": 3,
"Headshot": 1.5, "Headshot": 1.5,
"velocity": 17, "Velocity": 17,
"mag": 8, "mag": 8,
"force_stop_reloading": 1, "force_stop_reloading": 1,
"ProjectileAmount": 12, "ProjectileAmount": 12,

2
src/main/resources/data/superbwarfare/guns/m_98b.json
View file

@ -7,7 +7,7 @@
"RecoilY": 0.013, "RecoilY": 0.013,
"damage": 38, "damage": 38,
"Headshot": 3, "Headshot": 3,
"velocity": 47.2, "Velocity": 47.2,
"mag": 5, "mag": 5,
"bolt_action_time": 18, "bolt_action_time": 18,
"Weight": 7, "Weight": 7,

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

@ -4,7 +4,7 @@
"RecoilY": 0.031, "RecoilY": 0.031,
"damage": 16, "damage": 16,
"Headshot": 2.5, "Headshot": 2.5,
"velocity": 38, "Velocity": 38,
"mag": 8, "mag": 8,
"force_stop_reloading": 1, "force_stop_reloading": 1,
"Weight": 3, "Weight": 3,

2
src/main/resources/data/superbwarfare/guns/minigun.json
View file

@ -4,7 +4,7 @@
"RecoilY": 0.02, "RecoilY": 0.02,
"damage": 8, "damage": 8,
"Headshot": 2, "Headshot": 2,
"velocity": 46, "Velocity": 46,
"Weight": 10, "Weight": 10,
"FireMode": 2, "FireMode": 2,
"BypassesArmor": 0.3, "BypassesArmor": 0.3,

2
src/main/resources/data/superbwarfare/guns/mk_14.json
View file

@ -6,7 +6,7 @@
"RecoilY": 0.014, "RecoilY": 0.014,
"damage": 12, "damage": 12,
"Headshot": 2.5, "Headshot": 2.5,
"velocity": 42.5, "Velocity": 42.5,
"mag": 20, "mag": 20,
"Weight": 5, "Weight": 5,
"FireMode": 0, "FireMode": 0,

2
src/main/resources/data/superbwarfare/guns/mosin_nagant.json
View file

@ -5,7 +5,7 @@
"RecoilY": 0.063, "RecoilY": 0.063,
"damage": 33, "damage": 33,
"Headshot": 3, "Headshot": 3,
"velocity": 42, "Velocity": 42,
"mag": 5, "mag": 5,
"bolt_action_time": 22, "bolt_action_time": 22,
"Weight": 5, "Weight": 5,

2
src/main/resources/data/superbwarfare/guns/ntw_20.json
View file

@ -5,7 +5,7 @@
"RecoilY": 0.038, "RecoilY": 0.038,
"damage": 140, "damage": 140,
"Headshot": 3, "Headshot": 3,
"velocity": 36, "Velocity": 36,
"mag": 3, "mag": 3,
"bolt_action_time": 37, "bolt_action_time": 37,
"Weight": 10, "Weight": 10,

2
src/main/resources/data/superbwarfare/guns/qbz_95.json
View file

@ -6,7 +6,7 @@
"RecoilY": 0.009, "RecoilY": 0.009,
"damage": 8.25, "damage": 8.25,
"Headshot": 2, "Headshot": 2,
"velocity": 46, "Velocity": 46,
"mag": 30, "mag": 30,
"Weight": 4, "Weight": 4,
"FireMode": 2, "FireMode": 2,

2
src/main/resources/data/superbwarfare/guns/rpg.json
View file

@ -5,7 +5,7 @@
"damage": 200, "damage": 200,
"ExplosionDamage": 150, "ExplosionDamage": 150,
"ExplosionRadius": 10, "ExplosionRadius": 10,
"velocity": 4, "Velocity": 4,
"mag": 1, "mag": 1,
"Weight": 7, "Weight": 7,
"EmptyReloadTime": 103 "EmptyReloadTime": 103

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

@ -4,7 +4,7 @@
"RecoilY": 0.012, "RecoilY": 0.012,
"damage": 8.75, "damage": 8.75,
"Headshot": 2, "Headshot": 2,
"velocity": 38, "Velocity": 38,
"mag": 75, "mag": 75,
"Weight": 6, "Weight": 6,
"FireMode": 2, "FireMode": 2,

2
src/main/resources/data/superbwarfare/guns/sentinel.json
View file

@ -6,7 +6,7 @@
"damage": 35, "damage": 35,
"mag": 5, "mag": 5,
"Headshot": 3, "Headshot": 3,
"velocity": 70, "Velocity": 70,
"bolt_action_time": 22, "bolt_action_time": 22,
"Weight": 7, "Weight": 7,
"FireMode": 0, "FireMode": 0,

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

@ -4,7 +4,7 @@
"RecoilY": 0.015, "RecoilY": 0.015,
"damage": 9.5, "damage": 9.5,
"Headshot": 2, "Headshot": 2,
"velocity": 36, "Velocity": 36,
"mag": 20, "mag": 20,
"Weight": 4, "Weight": 4,
"FireMode": 0, "FireMode": 0,

2
src/main/resources/data/superbwarfare/guns/svd.json
View file

@ -5,7 +5,7 @@
"RecoilY": 0.009, "RecoilY": 0.009,
"damage": 18, "damage": 18,
"Headshot": 2, "Headshot": 2,
"velocity": 42, "Velocity": 42,
"mag": 10, "mag": 10,
"Weight": 5, "Weight": 5,
"FireMode": 0, "FireMode": 0,

2
src/main/resources/data/superbwarfare/guns/taser.json
View file

@ -3,7 +3,7 @@
"RecoilX": 0.0001, "RecoilX": 0.0001,
"RecoilY": 0.002, "RecoilY": 0.002,
"damage": 5, "damage": 5,
"velocity": 3, "Velocity": 3,
"mag": 1, "mag": 1,
"Weight": 1, "Weight": 1,
"EmptyReloadTime": 58 "EmptyReloadTime": 58

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

@ -4,7 +4,7 @@
"RecoilY": 0.032, "RecoilY": 0.032,
"damage": 19, "damage": 19,
"Headshot": 2, "Headshot": 2,
"velocity": 24, "Velocity": 24,
"mag": 6, "mag": 6,
"Weight": 2, "Weight": 2,
"FireMode": 0, "FireMode": 0,

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

@ -4,7 +4,7 @@
"RecoilY": 0.007, "RecoilY": 0.007,
"damage": 6, "damage": 6,
"Headshot": 1.5, "Headshot": 1.5,
"velocity": 16, "Velocity": 16,
"mag": 13, "mag": 13,
"Weight": 3, "Weight": 3,
"FireMode": 2, "FireMode": 2,