舰炮缓动:孩子们我回来了

This commit is contained in:
Atsuihsio 2024-09-09 04:37:17 +08:00
parent d2a54113b2
commit 5c28aa083e
8 changed files with 1278 additions and 1439 deletions

View file

@ -38,11 +38,8 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return;
double p = 0;
p = player.getPersistentData().getDouble("zoom_pos");
double zp = 0;
zp = player.getPersistentData().getDouble("zoom_pos_z");
double p = player.getPersistentData().getDouble("zoom_pos");
double zp = player.getPersistentData().getDouble("zoom_pos_z");
gun.setPosX(1.48f * (float) p);
@ -64,26 +61,13 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
shen.setRotY(0.12f * (float) fr);
shen.setRotZ(-0.1f * (float) (fp + 1.3 * fr));
// CoreGeoBone flare = getAnimationProcessor().getBone("flare");
//
// if (stack.getOrCreateTag().getDouble("flash_time") > 0) {
// flare.setHidden(false);
// flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5)));
// flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5)));
// flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
// } else {
// flare.setHidden(true);
// }
CoreGeoBone root = getAnimationProcessor().getBone("root");
float PosX = (float)player.getPersistentData().getDouble("gun_move_posX");
float PosY = (float)player.getPersistentData().getDouble("gun_move_posY");
double y = 0;
double x = 0;
y = player.getPersistentData().getDouble("y");
x = player.getPersistentData().getDouble("x");
double y = player.getPersistentData().getDouble("y");
double x = player.getPersistentData().getDouble("x");
root.setPosX(PosX);

View file

@ -307,30 +307,25 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity, ICannonEntit
public void travel(Vec3 dir) {
Entity entity = this.getPassengers().isEmpty() ? null : this.getPassengers().get(0);
if (this.isVehicle() && entity != null) {
this.setYRot(entity.getYRot());
this.yRotO = this.getYRot();
this.setXRot(Mth.clamp(entity.getXRot() - 1.35f, -85, 15));
this.setRot(this.getYRot(), this.getXRot());
this.yBodyRot = entity.getYRot();
this.yHeadRot = entity.getYRot();
this.setMaxUpStep(1.0F);
if (entity instanceof LivingEntity passenger) {
this.setSpeed((float) this.getAttributeValue(Attributes.MOVEMENT_SPEED));
float forward = passenger.zza;
float strafe = passenger.xxa;
super.travel(new Vec3(strafe, 0, forward));
float diffY = entity.getYHeadRot() - this.getYRot();
float diffX = entity.getXRot() - this.getXRot();
if (diffY > 180.0f) {
diffY -= 360.0f;
} else if (diffY < -180.0f) {
diffY += 360.0f;
}
diffY = diffY * 0.15f;
diffX = diffX * 0.15f;
if (Math.abs(diffY) < 60f && Math.abs(diffX) < 60f) {
this.setYRot(this.getYRot() + Mth.clamp(diffY,-1.75f,1.75f));
this.yRotO = this.getYRot();
this.setXRot(Mth.clamp(this.getXRot() - 0.11f + Mth.clamp(diffX,-3f,3f), -85, 15));
this.setRot(this.getYRot(), this.getXRot());
this.yBodyRot = this.getYRot() + Mth.clamp(diffY,-1.75f,1.75f);
this.yHeadRot = this.getYRot() + Mth.clamp(diffY,-1.75f,1.75f);
}
double d1 = this.getX() - this.xo;
double d0 = this.getZ() - this.zo;
float f1 = (float) Math.sqrt(d1 * d1 + d0 * d0) * 4;
if (f1 > 1.0F)
f1 = 1.0F;
this.walkAnimation.setSpeed(this.walkAnimation.speed() + (f1 - this.walkAnimation.speed()) * 0.4F);
this.walkAnimation.position(this.walkAnimation.position() + this.walkAnimation.speed());
this.calculateEntityAnimation(true);
return;
}
this.setMaxUpStep(0.5F);
super.travel(dir);
}

View file

@ -337,30 +337,25 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn
public void travel(Vec3 dir) {
Entity entity = this.getPassengers().isEmpty() ? null : this.getPassengers().get(0);
if (this.isVehicle() && entity != null) {
this.setYRot(entity.getYRot());
this.yRotO = this.getYRot();
this.setXRot(Mth.clamp(entity.getXRot() - 1f, -30, 4));
this.setRot(this.getYRot(), this.getXRot());
this.yBodyRot = entity.getYRot();
this.yHeadRot = entity.getYRot();
this.setMaxUpStep(1.0F);
if (entity instanceof LivingEntity passenger) {
this.setSpeed((float) this.getAttributeValue(Attributes.MOVEMENT_SPEED));
float forward = passenger.zza;
float strafe = passenger.xxa;
super.travel(new Vec3(strafe, 0, forward));
float diffY = entity.getYHeadRot() - this.getYRot();
float diffX = entity.getXRot() - this.getXRot();
if (diffY > 180.0f) {
diffY -= 360.0f;
} else if (diffY < -180.0f) {
diffY += 360.0f;
}
diffY = diffY * 0.15f;
diffX = diffX * 0.15f;
if (Math.abs(diffY) < 60f && Math.abs(diffX) < 60f) {
this.setYRot(this.getYRot() + Mth.clamp(diffY,-1.25f,1.25f));
this.yRotO = this.getYRot();
this.setXRot(Mth.clamp(this.getXRot() - 0.1f + Mth.clamp(diffX,-2f,2f), -30, 4));
this.setRot(this.getYRot(), this.getXRot());
this.yBodyRot = this.getYRot() + Mth.clamp(diffY,-1.25f,1.25f);
this.yHeadRot = this.getYRot() + Mth.clamp(diffY,-1.25f,1.25f);
}
double d1 = this.getX() - this.xo;
double d0 = this.getZ() - this.zo;
float f1 = (float) Math.sqrt(d1 * d1 + d0 * d0) * 4;
if (f1 > 1.0F)
f1 = 1.0F;
this.walkAnimation.setSpeed(this.walkAnimation.speed() + (f1 - this.walkAnimation.speed()) * 0.4F);
this.walkAnimation.position(this.walkAnimation.position() + this.walkAnimation.speed());
this.calculateEntityAnimation(true);
return;
}
this.setMaxUpStep(0.5F);
super.travel(dir);
}

View file

@ -48,9 +48,6 @@ public class ClientEventHandler {
data.putDouble("yRot", Mth.clamp(0.05 * yRot, -10, 10) * (1 - 0.75 * data.getDouble("zoom_time")));
data.putDouble("zRot", Mth.clamp(0.1 * yRot, -10, 10) * (1 - data.getDouble("zoom_time")));
data.putDouble("Cannon_xRot", Mth.clamp(0.2 * xRot, -3, 3));
data.putDouble("Cannon_yRot", Mth.clamp(1 * yRot, -15, 15));
data.putDouble("droneCameraRotX", Mth.clamp(0.25f * xRot, -10, 10));
data.putDouble("droneCameraRotY", Mth.clamp(0.25f * yRot, -20, 10));
}
@ -115,8 +112,8 @@ public class ClientEventHandler {
double pitch = event.getPitch();
double roll = event.getRoll();
event.setPitch((float) (pitch + 1 * data.getDouble("Cannon_xRot") + data.getDouble("cannon_camera_rot_x")));
event.setYaw((float) (yaw + 1 * data.getDouble("Cannon_yRot") + data.getDouble("cannon_camera_rot_y")));
event.setPitch((float) (pitch + data.getDouble("cannon_camera_rot_x")));
event.setYaw((float) (yaw + data.getDouble("cannon_camera_rot_y")));
event.setRoll((float) (roll + data.getDouble("cannon_camera_rot_z")));
}

View file

@ -1,7 +1,6 @@
package net.mcreator.superbwarfare.mixins;
import net.mcreator.superbwarfare.entity.Mk42Entity;
import net.mcreator.superbwarfare.entity.Mle1934Entity;
import net.mcreator.superbwarfare.entity.ICannonEntity;
import net.mcreator.superbwarfare.init.ModMobEffects;
import net.mcreator.superbwarfare.init.ModTags;
import net.mcreator.superbwarfare.network.ModVariables;
@ -38,18 +37,11 @@ public class MouseHandlerMixin {
ItemStack stack = mc.player.getMainHandItem();
if (player.getVehicle() != null && player.getVehicle() instanceof Mk42Entity) {
if (player.getVehicle() != null && player.getVehicle() instanceof ICannonEntity) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom) {
return 0.12;
return 0.15;
} else {
return 0.23;
}
}
if (player.getVehicle() != null && player.getVehicle() instanceof Mle1934Entity) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom) {
return 0.09;
} else {
return 0.19;
return 0.3;
}
}

View file

@ -200,59 +200,55 @@
"0.0": {
"vector": [0, 0, 0]
},
"0.0833": {
"vector": [6.22824, 1.18826, 5.97426]
"0.1": {
"vector": [2.64495, 4.4993, 8.64601]
},
"0.2": {
"vector": [-14.01, 2.98, -9.37]
},
"0.3167": {
"vector": [-12.25012, 1.71575, -15.23679]
},
"0.4667": {
"vector": [14.54523, -3.65089, 10.23644],
"0.3667": {
"vector": [-33.70972, -24.17219, 20.41347],
"easing": "easeInElastic"
},
"0.6": {
"vector": [0.37441, 0.89667, -10.2701],
"easing": "easeOutSine"
},
"0.7833": {
"vector": [3.26106, 0.70038, -4.05452]
},
"1.0333": {
"vector": [8.50158, 0.81329, -1.09833],
"easing": "easeInSine"
},
"1.2333": {
"vector": [4.40486, 3.1276, -2.71974]
},
"2.05": {
"vector": [-17.74265, 13.09708, 36.45564],
"0.45": {
"vector": [7.74809, -24.29902, 7.14616],
"easing": "easeInElastic"
},
"2.2": {
"vector": [20.69851, 7.36031, 48.82404],
"easing": "easeOutSine"
"0.5333": {
"vector": [-8.83084, -24.67077, 11.42483]
},
"2.3333": {
"vector": [-31.40415, -6.82322, 64.93734],
"easing": "easeOutSine"
"0.6833": {
"vector": [2.56949, -21.38854, 18.06267]
},
"2.4167": {
"vector": [-23.32139, -10.23894, 70.46558]
},
"2.5": {
"vector": [-35.87276, -16.36308, 51.91179],
"1.0833": {
"vector": [-1.24319, -21.1341, 13.91293],
"easing": "easeInElastic"
},
"2.6167": {
"vector": [-19.99348, -11.12689, 35.30002]
"1.6667": {
"vector": [6.3044, -19.42656, 12.78882],
"easing": "easeInOutSine"
},
"2.8": {
"vector": [-0.80443, -0.8837, -5.3357]
"1.95": {
"vector": [-7.55554, -11.47376, 25.02359]
},
"2.95": {
"2.1": {
"vector": [13.29131, -11.23491, 11.21523]
},
"2.2167": {
"vector": [17.66129, 6.45403, 65.11217]
},
"2.3167": {
"vector": [-2.20462, 3.23978, 75.37563]
},
"2.45": {
"vector": [-28.50953, 0.15452, 59.49255]
},
"2.5667": {
"vector": [-20.68198, -0.81121, 18.24901],
"easing": "easeInElastic"
},
"2.7333": {
"vector": [-1.9968, -4.60753, 3.70559],
"easing": "easeOutSine"
},
"2.85": {
"vector": [0, 0, 0]
}
},
@ -260,56 +256,66 @@
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [0.39, -0.22, 0.27]
},
"0.1667": {
"vector": [-1.1, 0.3, -0.1],
"easing": "easeInQuad"
"vector": [1.3, 0.2, 2]
},
"0.3167": {
"vector": [-1.1, 0, -0.8],
"easing": "easeOutSine"
},
"0.4167": {
"vector": [-0.7, -1.4, -1.7],
"0.2333": {
"vector": [1.3, 0, 2],
"easing": "easeInElastic"
},
"0.5167": {
"vector": [-0.88, -0.16, -1.29]
"0.3167": {
"vector": [1.26, 0.2, 3.94]
},
"0.7667": {
"vector": [-0.87, -0.75, -0.67],
"easing": "easeOutSine"
"0.4": {
"vector": [1.22, -0.41, 3.88]
},
"1.1": {
"vector": [-0.57, -0.79, 0.08]
"0.5": {
"vector": [0.77338, -0.59211, 4.59221]
},
"1.4": {
"vector": [1.1, -1.54, 1.83]
"0.6333": {
"vector": [1.11439, -1.80641, 4.08348]
},
"2.05": {
"vector": [1.04, -0.92, 2.22]
"1.1333": {
"vector": [0.93, -1.64, 4.74],
"easing": "easeInElastic"
},
"2.1333": {
"vector": [-0.18598, -2.56715, 2.01348]
"1.7333": {
"vector": [0.69, -2.21, 4.29],
"easing": "easeInElastic"
},
"2.2667": {
"vector": [1.99803, -1.96558, 0.1038]
"1.95": {
"vector": [0.54, -3.44, 3.34],
"easing": "easeInElastic"
},
"2.3833": {
"vector": [0.90879, 0.61708, 2.541]
"2.1": {
"vector": [-0.18, -3.16, 2.89]
},
"2.4667": {
"vector": [-4.26, 0.57, 1.35]
"2.2167": {
"vector": [-2.91, -3.68, 2.49]
},
"2.5667": {
"vector": [-0.79, 0.47, 1.12]
"2.3": {
"vector": [2.95, -2.99, 0.99],
"easing": "easeInOutSine"
},
"2.65": {
"vector": [0, 0, -0.75]
"2.45": {
"vector": [-0.65, -2.44, 0.35],
"easing": "easeInOutSine"
},
"2.75": {
"vector": [0, 0, 0.93]
"2.5333": {
"vector": [-0.17388, -0.45765, 4.31917],
"easing": "easeInOutSine"
},
"2.95": {
"2.6667": {
"vector": [-0.1, 0, 3.83],
"easing": "easeInOutSine"
},
"2.7667": {
"vector": [0, 0, -0.6]
},
"2.85": {
"vector": [0, 0, 0]
}
}
@ -319,14 +325,17 @@
"0.0": {
"vector": [0, 0, 0]
},
"0.1667": {
"vector": [-7.8786, 24.3186, -19.90709]
"0.0833": {
"vector": [5.24182, 26.25749, -41.13684]
},
"0.2": {
"vector": [28.02939, 40.92624, -40.18345]
},
"0.2333": {
"vector": [9.8375, 16.7282, -17.49751]
"vector": [28.02939, 40.92624, -40.18345]
},
"0.3333": {
"vector": [9.8375, 16.7282, -17.49751]
"vector": [28.02939, 40.92624, -40.18345]
},
"0.4833": {
"vector": [5.713, -40.7297, -4.70082],
@ -335,29 +344,33 @@
"0.6333": {
"vector": [-73.9758, 0.7509, 15.72011]
},
"0.95": {
"vector": [-5.13953, 1.24896, -18.89712]
},
"1.45": {
"vector": [-38.2951, 2.0353, -73.55015]
"vector": [-5.13953, 1.24896, -18.89712]
},
"1.5167": {
"vector": [2.1677, 33.7523, -72.39051]
},
"1.8833": {
"vector": [8.55603, 31.72118, -75.59208],
"easing": "easeInOutSine"
},
"1.9167": {
"vector": [8.0672, 30.1573, -76.93122],
"vector": [6.85568, 25.40898, -80.79497],
"easing": "easeInOutSine"
},
"1.95": {
"vector": [7.2186, 27.0002, -79.53013],
"easing": "easeInOutSine"
},
"2.0833": {
"vector": [5.274, 12.4865, -90.38062],
"2.0": {
"vector": [8.55597, 31.72118, -75.59209],
"easing": "easeInSine"
},
"2.1": {
"vector": [5.274, 12.4865, -90.38062]
"2.0167": {
"vector": [8.55597, 31.72118, -75.59209],
"easing": "easeInSine"
},
"2.3667": {
"vector": [-17.6471, 13.8217, -25.46728]
"vector": [10.8529, 13.8217, -25.46728]
},
"2.5": {
"vector": [-12.2568, 6.1776, -20.01117],
@ -371,42 +384,49 @@
"0.0": {
"vector": [0, 0, 0]
},
"0.2667": {
"vector": [0.7, 2.7, -7.9]
"0.1167": {
"vector": [5.8, 1.9, -5.7]
},
"0.2333": {
"vector": [3.57, 2.69, -9.3]
},
"0.3333": {
"vector": [0.7, 2.7, -7.9]
"vector": [3.57, 2.69, -9.3]
},
"0.5": {
"vector": [4.8, 0.1, -13.2],
"vector": [4.8, -1.6, -13.2],
"easing": "easeInElastic"
},
"0.6333": {
"vector": [3.51, -6.73, -5.65]
},
"0.95": {
"vector": [15.05, -3.24, -7.28]
},
"1.45": {
"vector": [-1.02464, 14.3926, 14.13302]
"vector": [15.05, -3.24, -7.28]
},
"1.5167": {
"vector": [10.84145, 22.86044, 13.64551]
"vector": [10.25196, -0.0237, 9.09593]
},
"1.9167": {
"1.8833": {
"vector": [3.92576, 11.04238, -5.00967],
"easing": "easeInOutSine"
},
"1.95": {
"1.9167": {
"vector": [3.56467, 11.49281, -5.45322],
"easing": "easeInOutSine"
},
"2.0833": {
"vector": [3.64099, 12.76781, -5.69136],
"2.0": {
"vector": [4.04099, 8.06781, -5.89136],
"easing": "easeInSine"
},
"2.1": {
"vector": [3.72413, 12.68137, -5.5869]
"2.0167": {
"vector": [4.04099, 8.06781, -5.89136],
"easing": "easeInSine"
},
"2.3667": {
"vector": [5.77, 6.2, -0.4]
"vector": [4.41916, 2.17208, -2.82265]
},
"2.5": {
"vector": [4.94, 3.74, -0.28],
@ -458,15 +478,15 @@
"1.5167": {
"vector": [-20.18076, 7.51466, -2.75196]
},
"1.9167": {
"1.8833": {
"vector": [-13, 0, 0],
"easing": "easeInOutSine"
},
"1.95": {
"1.9167": {
"vector": [0, 0, 0],
"easing": "easeInOutSine"
},
"2.0833": {
"2.0": {
"vector": [0, 0, 0],
"easing": "easeInSine"
}
@ -485,148 +505,22 @@
"vector": [3.2, -17.3, 5.2]
},
"1.5167": {
"vector": [8.48251, -15.17326, 19.36493]
"vector": [8.48251, -15.17326, -4.63507]
},
"1.9167": {
"1.8833": {
"vector": [0, -0.48719, 2.78752],
"easing": "easeInOutSine"
},
"1.95": {
"vector": [0, 0, 2.9],
"1.9167": {
"vector": [0, 0, 1.6],
"easing": "easeInOutSine"
},
"2.0833": {
"2.0": {
"vector": [0, 0, 0],
"easing": "easeInSine"
}
}
},
"ammo8": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.4167": {
"vector": [0, 0, 0]
},
"0.45": {
"vector": [28.62702, -15.46973, -8.28342]
},
"0.5": {
"vector": [63.90695, -17.25861, -14.6615]
},
"1.3333": {
"vector": [859.02393, -48.20277, -48],
"easing": "linear"
},
"1.3833": {
"vector": [859.02393, -48.20277, -48],
"easing": "linear"
},
"1.4167": {
"vector": [0, 0, 0]
},
"2.8": {
"vector": [0, 0, 0]
},
"2.9833": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.3333": {
"vector": [0, 0, 0]
},
"0.3833": {
"vector": [0, -0.01, 0.38]
},
"0.4167": {
"vector": [0, -0.02688, 1.16]
},
"0.45": {
"vector": [-0.4, 0.5, 2.6],
"easing": "easeInQuad"
},
"0.5": {
"vector": [-0.5, 1.45, 3.63]
},
"0.55": {
"vector": [-1, 3.37, 3.97]
},
"0.5833": {
"vector": [-1.4, 4.69, 4.01]
},
"0.6333": {
"vector": [-1.7, 5.86, 3.85]
},
"0.6667": {
"vector": [-2.1, 6.75, 3.64]
},
"0.7": {
"vector": [-2.5, 7.64, 3.34]
},
"0.75": {
"vector": [-2.8, 8.52, 2.83]
},
"0.8": {
"vector": [-3.2, 9.33, 1.99]
},
"0.8333": {
"vector": [-3.6, 10.01, 0.96]
},
"0.8833": {
"vector": [-4, 10.72, -0.48]
},
"0.9167": {
"vector": [-4.4, 11.34, -2.22]
},
"0.95": {
"vector": [-4.8, 11.85, -4.25]
},
"1.0": {
"vector": [-5.2, 12.21, -6.31]
},
"1.05": {
"vector": [-5.5, 12.36, -8.64]
},
"1.0833": {
"vector": [-5.7, 12.3, -12.36]
},
"1.1333": {
"vector": [-6, 12.03, -16.38]
},
"1.1667": {
"vector": [-6.2, 11.44, -20.59]
},
"1.2": {
"vector": [-6.3, 10.63, -26.44]
},
"1.25": {
"vector": [-6.4, 8.72, -34.59]
},
"1.3": {
"vector": [-6.33, 8.72, -34.59]
},
"1.3333": {
"vector": [-6.43, 8.72, -34.59]
},
"1.3833": {
"vector": [-6.43, 8.72, -34.59]
},
"1.4167": {
"vector": [0, 0, 0]
},
"2.8": {
"vector": [0, 0, 0]
},
"2.9833": {
"vector": [0, 0, 0]
}
}
},
"ammo1": {
"rotation": {
"0.0": {
@ -1350,139 +1244,31 @@
}
}
},
"ammo7": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.4167": {
"vector": [0, 0, 0]
},
"0.45": {
"vector": [28.62702, -15.46973, -8.28342]
},
"0.5": {
"vector": [63.90695, -17.25861, -14.6615]
},
"1.25": {
"vector": [659.0239, -48.20277, -48],
"easing": "linear"
},
"1.3833": {
"vector": [859.02393, -48.20277, -48],
"easing": "linear"
},
"1.4167": {
"vector": [0, 0, 0]
},
"2.8": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.3333": {
"vector": [0, 0, 0]
},
"0.3833": {
"vector": [0, -0.01, 0.38]
},
"0.4167": {
"vector": [0, -0.02688, 1.16]
},
"0.45": {
"vector": [-0.4, 0.5, 2.6],
"easing": "easeInQuad"
},
"0.5": {
"vector": [-0.9, 1.45, 3.63]
},
"0.55": {
"vector": [-1.7, 3.17, 4.07]
},
"0.5833": {
"vector": [-2.9, 4.69, 4.31]
},
"0.6333": {
"vector": [-3.7, 5.86, 4.15]
},
"0.6667": {
"vector": [-4.7, 6.75, 3.84]
},
"0.7": {
"vector": [-5.5, 7.64, 3.34]
},
"0.75": {
"vector": [-6.4, 8.52, 2.73]
},
"0.8": {
"vector": [-7.4, 9.33, 1.89]
},
"0.8333": {
"vector": [-8.4, 10.01, 0.96]
},
"0.8833": {
"vector": [-9.4, 10.72, -0.48]
},
"0.9167": {
"vector": [-10.6, 11.34, -2.22]
},
"0.95": {
"vector": [-11.8, 11.85, -4.25]
},
"1.0": {
"vector": [-12.9, 12.21, -6.31]
},
"1.05": {
"vector": [-14, 12.36, -8.64]
},
"1.0833": {
"vector": [-15.3, 12.3, -12.36]
},
"1.1333": {
"vector": [-16.6, 12.03, -16.38]
},
"1.1667": {
"vector": [-17.8, 11.44, -22.19]
},
"1.2": {
"vector": [-18.3, 10.63, -28.14]
},
"1.25": {
"vector": [-17.7, 8.72, -34.59]
},
"1.3": {
"vector": [-16.5, 6.42, -41.19]
},
"1.3333": {
"vector": [-15.3, 3.27, -47.59]
},
"1.3833": {
"vector": [-13.5, -0.38, -54.39]
},
"1.4167": {
"vector": [0, 0, 0]
},
"2.8": {
"vector": [0, 0, 0]
}
}
},
"gun": {
"rotation": {
"0.3667": {
"vector": [0, 0, 0]
},
"0.45": {
"vector": [11, 0, 0]
},
"0.5333": {
"vector": [0, 0, 0]
},
"2.1667": {
"vector": [0, 0, 0]
},
"2.3167": {
"vector": [13.09, 0, 0],
"vector": [58.09, 0, 0],
"easing": "easeInElastic"
},
"2.45": {
"vector": [-35, 0, 0]
"vector": [-15, 0, 0]
},
"2.5833": {
"2.5167": {
"vector": [-35.5, 0, 0]
},
"2.6167": {
"vector": [0, 0, 0]
}
},
@ -1497,7 +1283,7 @@
"2.45": {
"vector": [0, 1.11401, 1.0242]
},
"2.5833": {
"2.5167": {
"vector": [0, 0, 0]
}
}
@ -1564,11 +1350,6 @@
}
}
}
},
"sound_effects": {
"0.0": {
"effect": "reload"
}
}
},
"animation.trachelium.draw": {

File diff suppressed because it is too large Load diff

View file

@ -5,10 +5,10 @@
"zoomSpread": 0.1,
"recoil_x": 0.005,
"recoil_y": 0.032,
"damage": 18,
"headshot": 1.5,
"velocity": 18,
"mag": 8,
"damage": 19,
"headshot": 2.2,
"velocity": 24,
"mag": 6,
"projectile_amount": 1,
"fire_interval": 5,
"weight": 0,
@ -18,6 +18,6 @@
"auto": 0,
"burst_size": 1,
"empty_reload_time": 65,
"BypassesArmor": 0.2,
"BypassesArmor": 0.3,
"SoundRadius": 10
}