降低整体弹速
This commit is contained in:
parent
d640ebb074
commit
026f5d7a9e
21 changed files with 33 additions and 38 deletions
|
@ -129,7 +129,7 @@ public class Ntw20Model extends GeoModel<Ntw20> {
|
||||||
float numR = (float) (1 - 0.92 * data.getDouble("zoom_time"));
|
float numR = (float) (1 - 0.92 * data.getDouble("zoom_time"));
|
||||||
float numP = (float) (1 - 0.88 * data.getDouble("zoom_time"));
|
float numP = (float) (1 - 0.88 * data.getDouble("zoom_time"));
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) {
|
if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0 || stack.getOrCreateTag().getInt("bolt_action_anim") > 0) {
|
||||||
main.setRotX(numR * main.getRotX());
|
main.setRotX(numR * main.getRotX());
|
||||||
main.setRotY(numR * main.getRotY());
|
main.setRotY(numR * main.getRotY());
|
||||||
main.setRotZ(numR * main.getRotZ());
|
main.setRotZ(numR * main.getRotZ());
|
||||||
|
|
|
@ -279,7 +279,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
|
||||||
this.setPosRaw(this.getX() + vec.x, this.getY() + vec.y, this.getZ() + vec.z);
|
this.setPosRaw(this.getX() + vec.x, this.getY() + vec.y, this.getZ() + vec.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setDeltaMovement(vec.x, vec.y - 0.05000000074505806, vec.z);
|
this.setDeltaMovement(vec.x, vec.y - 0.02, vec.z);
|
||||||
|
|
||||||
this.tickCount++;
|
this.tickCount++;
|
||||||
if (this.tickCount > 40) {
|
if (this.tickCount > 40) {
|
||||||
|
|
|
@ -8,7 +8,6 @@ import net.mcreator.superbwarfare.init.ModItems;
|
||||||
import net.mcreator.superbwarfare.init.ModSounds;
|
import net.mcreator.superbwarfare.init.ModSounds;
|
||||||
import net.mcreator.superbwarfare.init.ModTags;
|
import net.mcreator.superbwarfare.init.ModTags;
|
||||||
import net.mcreator.superbwarfare.item.AnimatedItem;
|
import net.mcreator.superbwarfare.item.AnimatedItem;
|
||||||
import net.mcreator.superbwarfare.network.ModVariables;
|
|
||||||
import net.mcreator.superbwarfare.tools.GunsTool;
|
import net.mcreator.superbwarfare.tools.GunsTool;
|
||||||
import net.mcreator.superbwarfare.tools.RarityTool;
|
import net.mcreator.superbwarfare.tools.RarityTool;
|
||||||
import net.mcreator.superbwarfare.tools.TooltipTool;
|
import net.mcreator.superbwarfare.tools.TooltipTool;
|
||||||
|
@ -94,10 +93,6 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem {
|
||||||
|
|
||||||
if (this.animationProcedure.equals("empty")) {
|
if (this.animationProcedure.equals("empty")) {
|
||||||
|
|
||||||
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming && stack.getOrCreateTag().getInt("bolt_action_anim") > 0) {
|
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ntw_20.shift2"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("bolt_action_anim") > 0) {
|
if (stack.getOrCreateTag().getInt("bolt_action_anim") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ntw_20.shift"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ntw_20.shift"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"identifier": "geometry.unknown",
|
"identifier": "geometry.unknown",
|
||||||
"texture_width": 32,
|
"texture_width": 32,
|
||||||
"texture_height": 32,
|
"texture_height": 32,
|
||||||
"visible_bounds_width": 4,
|
"visible_bounds_width": 6,
|
||||||
"visible_bounds_height": 6,
|
"visible_bounds_height": 6,
|
||||||
"visible_bounds_offset": [0, -1, 0]
|
"visible_bounds_offset": [0, -1, 0]
|
||||||
},
|
},
|
||||||
|
@ -22,16 +22,16 @@
|
||||||
"rotation": [-90, 0, -3.75],
|
"rotation": [-90, 0, -3.75],
|
||||||
"cubes": [
|
"cubes": [
|
||||||
{
|
{
|
||||||
"origin": [-1.34303, -32.03027, 10.5525],
|
"origin": [-2.34303, -33.03027, 10.5525],
|
||||||
"size": [2.352, 2.352, 0],
|
"size": [4.352, 4.352, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"north": {"uv": [8, 0], "uv_size": [24, 24]},
|
"north": {"uv": [8, 0], "uv_size": [24, 24]},
|
||||||
"south": {"uv": [8, 0], "uv_size": [24, 24]}
|
"south": {"uv": [8, 0], "uv_size": [24, 24]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"origin": [-0.16703, -62.33427, -4.3575],
|
"origin": [-0.16703, -62.33427, -5.3575],
|
||||||
"size": [0, 49.96, 1.68],
|
"size": [0, 49.96, 3.68],
|
||||||
"pivot": [-0.16703, -30.85427, -3.5175],
|
"pivot": [-0.16703, -30.85427, -3.5175],
|
||||||
"rotation": [-90, 0, 30],
|
"rotation": [-90, 0, 30],
|
||||||
"uv": {
|
"uv": {
|
||||||
|
@ -40,8 +40,8 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"origin": [-0.16703, -62.33427, -4.3575],
|
"origin": [-0.16703, -62.33427, -5.3575],
|
||||||
"size": [0, 49.96, 1.68],
|
"size": [0, 49.96, 3.68],
|
||||||
"pivot": [-0.16703, -30.85427, -3.5175],
|
"pivot": [-0.16703, -30.85427, -3.5175],
|
||||||
"rotation": [-90, 0, -30],
|
"rotation": [-90, 0, -30],
|
||||||
"uv": {
|
"uv": {
|
||||||
|
@ -50,8 +50,8 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"origin": [-0.16703, -62.33427, -4.3575],
|
"origin": [-0.16703, -62.33427, -5.3575],
|
||||||
"size": [0, 49.96, 1.68],
|
"size": [0, 49.96, 3.68],
|
||||||
"pivot": [-0.16703, -30.85427, -3.5175],
|
"pivot": [-0.16703, -30.85427, -3.5175],
|
||||||
"rotation": [-90, 0, -90],
|
"rotation": [-90, 0, -90],
|
||||||
"uv": {
|
"uv": {
|
||||||
|
|
|
@ -22,16 +22,16 @@
|
||||||
"rotation": [-90, 0, 0],
|
"rotation": [-90, 0, 0],
|
||||||
"cubes": [
|
"cubes": [
|
||||||
{
|
{
|
||||||
"origin": [-3.34303, -32.03027, 8.1525],
|
"origin": [-4.34303, -33.03027, 8.1525],
|
||||||
"size": [2.352, 2.352, 0],
|
"size": [4.352, 4.352, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"north": {"uv": [8, 0], "uv_size": [24, 24]},
|
"north": {"uv": [8, 0], "uv_size": [24, 24]},
|
||||||
"south": {"uv": [8, 0], "uv_size": [24, 24]}
|
"south": {"uv": [8, 0], "uv_size": [24, 24]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"origin": [-2.16703, -62.33427, -6.7575],
|
"origin": [-2.16703, -62.33427, -7.7575],
|
||||||
"size": [0, 49.96, 1.68],
|
"size": [0, 49.96, 3.68],
|
||||||
"pivot": [-2.16703, -30.85427, -5.9175],
|
"pivot": [-2.16703, -30.85427, -5.9175],
|
||||||
"rotation": [-90, 0, 30],
|
"rotation": [-90, 0, 30],
|
||||||
"uv": {
|
"uv": {
|
||||||
|
@ -40,8 +40,8 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"origin": [-2.16703, -62.33427, -6.7575],
|
"origin": [-2.16703, -62.33427, -7.7575],
|
||||||
"size": [0, 49.96, 1.68],
|
"size": [0, 49.96, 3.68],
|
||||||
"pivot": [-2.16703, -30.85427, -5.9175],
|
"pivot": [-2.16703, -30.85427, -5.9175],
|
||||||
"rotation": [-90, 0, -30],
|
"rotation": [-90, 0, -30],
|
||||||
"uv": {
|
"uv": {
|
||||||
|
@ -50,8 +50,8 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"origin": [-2.16703, -62.33427, -6.7575],
|
"origin": [-2.16703, -62.33427, -7.7575],
|
||||||
"size": [0, 49.96, 1.68],
|
"size": [0, 49.96, 3.68],
|
||||||
"pivot": [-2.16703, -30.85427, -5.9175],
|
"pivot": [-2.16703, -30.85427, -5.9175],
|
||||||
"rotation": [-90, 0, -90],
|
"rotation": [-90, 0, -90],
|
||||||
"uv": {
|
"uv": {
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.6 KiB |
|
@ -7,7 +7,7 @@
|
||||||
"recoil_y": 0.018,
|
"recoil_y": 0.018,
|
||||||
"damage": 2.5,
|
"damage": 2.5,
|
||||||
"headshot": 1.5,
|
"headshot": 1.5,
|
||||||
"velocity": 16,
|
"velocity": 13,
|
||||||
"mag": 25,
|
"mag": 25,
|
||||||
"projectile_amount": 12,
|
"projectile_amount": 12,
|
||||||
"fire_interval": 4,
|
"fire_interval": 4,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"recoil_y": 0.012,
|
"recoil_y": 0.012,
|
||||||
"damage": 8.5,
|
"damage": 8.5,
|
||||||
"headshot": 2,
|
"headshot": 2,
|
||||||
"velocity": 35,
|
"velocity": 22,
|
||||||
"mag": 30,
|
"mag": 30,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
"fire_interval": 2,
|
"fire_interval": 2,
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
"recoil_y": 0.01,
|
"recoil_y": 0.01,
|
||||||
"damage": 7,
|
"damage": 7,
|
||||||
"headshot": 2,
|
"headshot": 2,
|
||||||
"velocity": 42.4,
|
"velocity": 25,
|
||||||
"mag": 55,
|
"mag": 55,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
"fire_interval": 5,
|
"fire_interval": 5,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"recoil_y": 0.009,
|
"recoil_y": 0.009,
|
||||||
"damage": 7.5,
|
"damage": 7.5,
|
||||||
"headshot": 2,
|
"headshot": 2,
|
||||||
"velocity": 44,
|
"velocity": 24,
|
||||||
"mag": 30,
|
"mag": 30,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
"fire_interval": 1,
|
"fire_interval": 1,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"recoil_y": 0.011,
|
"recoil_y": 0.011,
|
||||||
"damage": 7,
|
"damage": 7,
|
||||||
"headshot": 2,
|
"headshot": 2,
|
||||||
"velocity": 44,
|
"velocity": 24,
|
||||||
"mag": 30,
|
"mag": 30,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
"fire_interval": 1,
|
"fire_interval": 1,
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
"recoil_y": 0.014,
|
"recoil_y": 0.014,
|
||||||
"damage": 9,
|
"damage": 9,
|
||||||
"headshot": 2,
|
"headshot": 2,
|
||||||
"velocity": 42.5,
|
"velocity": 22,
|
||||||
"mag": 100,
|
"mag": 100,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
"fire_interval": 2,
|
"fire_interval": 2,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"recoil_y": 0.04,
|
"recoil_y": 0.04,
|
||||||
"damage": 3,
|
"damage": 3,
|
||||||
"headshot": 1.5,
|
"headshot": 1.5,
|
||||||
"velocity": 16,
|
"velocity": 13,
|
||||||
"mag": 8,
|
"mag": 8,
|
||||||
"force_stop_reloading": 1,
|
"force_stop_reloading": 1,
|
||||||
"projectile_amount": 12,
|
"projectile_amount": 12,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"recoil_y": 0.031,
|
"recoil_y": 0.031,
|
||||||
"damage": 16,
|
"damage": 16,
|
||||||
"headshot": 2.5,
|
"headshot": 2.5,
|
||||||
"velocity": 38,
|
"velocity": 23,
|
||||||
"mag": 8,
|
"mag": 8,
|
||||||
"force_stop_reloading": 1,
|
"force_stop_reloading": 1,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"recoil_y": 0.011,
|
"recoil_y": 0.011,
|
||||||
"damage": 8,
|
"damage": 8,
|
||||||
"headshot": 2,
|
"headshot": 2,
|
||||||
"velocity": 48,
|
"velocity": 24,
|
||||||
"fire_interval": 1,
|
"fire_interval": 1,
|
||||||
"weight": 2,
|
"weight": 2,
|
||||||
"fire_mode": 2,
|
"fire_mode": 2,
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
"recoil_y": 0.014,
|
"recoil_y": 0.014,
|
||||||
"damage": 12,
|
"damage": 12,
|
||||||
"headshot": 2.5,
|
"headshot": 2.5,
|
||||||
"velocity": 42.5,
|
"velocity": 25,
|
||||||
"mag": 20,
|
"mag": 20,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
"fire_interval": 2,
|
"fire_interval": 2,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"recoil_y": 0.009,
|
"recoil_y": 0.009,
|
||||||
"damage": 7.5,
|
"damage": 7.5,
|
||||||
"headshot": 2,
|
"headshot": 2,
|
||||||
"velocity": 48,
|
"velocity": 27,
|
||||||
"mag": 30,
|
"mag": 30,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
"fire_interval": 1,
|
"fire_interval": 1,
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
"recoil_y": 0.012,
|
"recoil_y": 0.012,
|
||||||
"damage": 8.75,
|
"damage": 8.75,
|
||||||
"headshot": 2,
|
"headshot": 2,
|
||||||
"velocity": 37,
|
"velocity": 24,
|
||||||
"mag": 75,
|
"mag": 75,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
"fire_interval": 2,
|
"fire_interval": 2,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"recoil_y": 0.015,
|
"recoil_y": 0.015,
|
||||||
"damage": 9.5,
|
"damage": 9.5,
|
||||||
"headshot": 2,
|
"headshot": 2,
|
||||||
"velocity": 36.5,
|
"velocity": 23,
|
||||||
"mag": 20,
|
"mag": 20,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
"fire_interval": 3,
|
"fire_interval": 3,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"recoil_y": 0.015,
|
"recoil_y": 0.015,
|
||||||
"damage": 18,
|
"damage": 18,
|
||||||
"headshot": 2,
|
"headshot": 2,
|
||||||
"velocity": 41.5,
|
"velocity": 25,
|
||||||
"mag": 10,
|
"mag": 10,
|
||||||
"projectile_amount": 1,
|
"projectile_amount": 1,
|
||||||
"fire_interval": 5,
|
"fire_interval": 5,
|
||||||
|
|
Loading…
Add table
Reference in a new issue