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-10-21 16:33:46 +08:00
parent 0d93444a98
commit bd159870e1
7 changed files with 237 additions and 388 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
View file

@ -7,6 +7,7 @@ import net.mcreator.superbwarfare.compat.clothconfig.ClothConfigHelper;
import net.mcreator.superbwarfare.config.client.ReloadConfig;
import net.mcreator.superbwarfare.entity.ICannonEntity;
import net.mcreator.superbwarfare.entity.MortarEntity;
import net.mcreator.superbwarfare.event.ClientEventHandler;
import net.mcreator.superbwarfare.init.*;
import net.mcreator.superbwarfare.item.common.ammo.CannonShellItem;
import net.mcreator.superbwarfare.network.ModVariables;
@ -173,17 +174,23 @@ public class ClickHandler {
if (key == ModKeyMappings.EDIT_MODE.getKey().getValue()) {
ModUtils.PACKET_HANDLER.sendToServer(new EditModeMessage(0));
}
if (key == ModKeyMappings.EDIT_SCOPE.getKey().getValue()) {
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(0));
}
if (key == ModKeyMappings.EDIT_BARREL.getKey().getValue()) {
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(1));
}
if (key == ModKeyMappings.EDIT_MAGAZINE.getKey().getValue()) {
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(2));
}
if (key == ModKeyMappings.EDIT_STOCK.getKey().getValue()) {
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(3));
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
if (key == ModKeyMappings.EDIT_SCOPE.getKey().getValue()) {
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(0));
}
if (key == ModKeyMappings.EDIT_BARREL.getKey().getValue()) {
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(1));
}
if (key == ModKeyMappings.EDIT_MAGAZINE.getKey().getValue()) {
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(2));
}
if (key == ModKeyMappings.EDIT_STOCK.getKey().getValue()) {
ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(3));
}
ClientEventHandler.movePosY = -0.8;
ClientEventHandler.fireRotTimer = 0.4;
}
if (key == ModKeyMappings.SENSITIVITY_INCREASE.getKey().getValue()) {
ModUtils.PACKET_HANDLER.sendToServer(new SensitivityMessage(true));

37
src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
View file

@ -408,6 +408,7 @@ public class ClientEventHandler {
float times = 3.7f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8);
double moveSpeed = (float) Mth.clamp(entity.getDeltaMovement().horizontalDistanceSqr(), 0, 0.02);
double onGround;
if (entity.onGround()) {
if (entity.isSprinting()) {
onGround = 1.35;
@ -418,27 +419,31 @@ public class ClientEventHandler {
onGround = 0.001;
}
if (Minecraft.getInstance().options.keyUp.isDown() && firePosTimer == 0) {
moveRotZ = Mth.clamp(moveRotZ + 0.007 * times, 0, 0.14) * (1 - zoomTime);
} else {
moveRotZ = Mth.clamp(moveRotZ - 0.007 * times, 0, 0.14) * (1 - zoomTime);
if (!entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
if (Minecraft.getInstance().options.keyUp.isDown() && firePosTimer == 0) {
moveRotZ = Mth.clamp(moveRotZ + 0.007 * times, 0, 0.14) * (1 - zoomTime);
} else {
moveRotZ = Mth.clamp(moveRotZ - 0.007 * times, 0, 0.14) * (1 - zoomTime);
}
}
if (isMoving() && firePosTimer == 0) {
if (moveYTime < 1.25) {
moveYTime += 1.2 * onGround * times * moveSpeed;
} else {
moveYTime = 0.25;
}
if (!entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
if (moveYTime < 1.25) {
moveYTime += 1.2 * onGround * times * moveSpeed;
} else {
moveYTime = 0.25;
}
if (moveXTime < 2) {
moveXTime += 1.2 * onGround * times * moveSpeed;
} else {
moveXTime = 0;
}
if (moveXTime < 2) {
moveXTime += 1.2 * onGround * times * moveSpeed;
} else {
moveXTime = 0;
}
movePosX = 0.2 * Math.sin(1 * Math.PI * moveXTime) * (1 - 0.95 * zoomTime);
movePosY = -0.135 * Math.sin(2 * Math.PI * (moveYTime - 0.25)) * (1 - 0.95 * zoomTime);
movePosX = 0.2 * Math.sin(1 * Math.PI * moveXTime) * (1 - 0.95 * zoomTime);
movePosY = -0.135 * Math.sin(2 * Math.PI * (moveYTime - 0.25)) * (1 - 0.95 * zoomTime);
}
} else {
if (moveYTime > 0.25) {
moveYTime -= 0.5 * times;

19
src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java
View file

@ -81,10 +81,6 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem {
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.edit"));
}
if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.reload_empty"));
}
@ -108,10 +104,25 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak12.idle"));
}
private PlayState editPredicate(AnimationState<AK12Item> event) {
LocalPlayer player = Minecraft.getInstance().player;
if (player == null) return PlayState.STOP;
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.edit"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak12.idle"));
}
@Override
public void registerControllers(AnimatableManager.ControllerRegistrar data) {
var idleController = new AnimationController<>(this, "idleController", 3, this::idlePredicate);
data.add(idleController);
var editController = new AnimationController<>(this, "editController", 1, this::editPredicate);
data.add(editController);
}
@Override

58
src/main/java/net/mcreator/superbwarfare/network/message/EditMessage.java
View file

@ -1,8 +1,6 @@
package net.mcreator.superbwarfare.network.message;
import net.mcreator.superbwarfare.init.ModSounds;
import net.mcreator.superbwarfare.init.ModTags;
import net.mcreator.superbwarfare.network.ModVariables;
import net.mcreator.superbwarfare.tools.SoundTool;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.FriendlyByteBuf;
@ -40,37 +38,35 @@ public class EditMessage {
ItemStack stack = player.getMainHandItem();
if (stack.is(ModTags.Items.CAN_CUSTOM_GUN) && player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
CompoundTag tag = stack.getOrCreateTag().getCompound("Attachments");
switch (type) {
case 0 -> {
int att = tag.getInt("Scope");
att++;
att %= 4;
tag.putInt("Scope", att);
}
case 1 -> {
int att = tag.getInt("Barrel");
att++;
att %= 3;
tag.putInt("Barrel", att);
}
case 2 -> {
int att = tag.getInt("Magazine");
att++;
att %= 3;
tag.putInt("Magazine", att);
}
case 3 -> {
int att = tag.getInt("Stock");
att++;
att %= 3;
tag.putInt("Stock", att);
}
CompoundTag tag = stack.getOrCreateTag().getCompound("Attachments");
switch (type) {
case 0 -> {
int att = tag.getInt("Scope");
att++;
att %= 4;
tag.putInt("Scope", att);
}
case 1 -> {
int att = tag.getInt("Barrel");
att++;
att %= 3;
tag.putInt("Barrel", att);
}
case 2 -> {
int att = tag.getInt("Magazine");
att++;
att %= 3;
tag.putInt("Magazine", att);
}
case 3 -> {
int att = tag.getInt("Stock");
att++;
att %= 3;
tag.putInt("Stock", att);
}
stack.addTagElement("Attachments", tag);
SoundTool.playLocalSound(player, ModSounds.EDIT.get(), 1f, 1f);
}
stack.addTagElement("Attachments", tag);
SoundTool.playLocalSound(player, ModSounds.EDIT.get(), 1f, 1f);
}
}

482
src/main/resources/assets/superbwarfare/animations/ak12.animation.json
View file

@ -6,30 +6,72 @@
},
"animation.ak12.edit": {
"loop": "hold_on_last_frame",
"animation_length": 0.1,
"animation_length": 0.4083,
"bones": {
"0": {
"rotation": {
"vector": [2.28664, -70.21598, -13.21611]
"0.0": {
"vector": [0, 0, 0]
},
"0.0667": {
"vector": [-13.37397, -18.59699, -1.83212],
"easing": "easeInOutSine"
},
"0.15": {
"vector": [-17.77391, -60.1281, -10.99134]
},
"0.3": {
"vector": [4.29, -70.22, -13.22]
},
"0.3583": {
"vector": [2.28664, -70.21598, -13.21611],
"easing": "easeInElastic",
"easingArgs": [1]
},
"0.4083": {
"vector": [2.18, -70.22, -13.22]
}
},
"position": {
"vector": [2.6, 2.6, -6.45]
"0.0": {
"vector": [0, 0, 0]
},
"0.0583": {
"vector": [1.22297, 0.37811, -1.26375]
},
"0.1167": {
"vector": [0.12132, 1.14111, -1.71705]
},
"0.3": {
"vector": [4.64002, 3.03958, -4.07823]
},
"0.3583": {
"vector": [3.42378, 2.79346, -4.09756],
"easing": "linear"
},
"0.4083": {
"vector": [3.95, 2.9, -4.09]
}
}
},
"Lefthand": {
"rotation": {
"vector": [-20.80188, -23.88158, -14.35972]
"vector": [-20.80188, -23.88158, -14.35972],
"easing": "easeInElastic"
},
"position": {
"vector": [-4, -10, 20]
"vector": [-4, -10, 20],
"easing": "easeInElastic"
}
},
"Righthand": {
"rotation": {
"vector": [1.90371, -57.62597, -9.69366]
"vector": [1.90371, -57.62597, -9.69366],
"easing": "easeInElastic"
},
"position": {
"vector": [9.7, -12.5, 17]
"vector": [9.7, -12.5, 17],
"easing": "easeInElastic"
}
}
}
@ -203,18 +245,21 @@
"bones": {
"0": {
"rotation": {
"0.0": {
"0.15": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [3.4, 1.25, 4.95]
},
"0.35": {
"0.2333": {
"vector": [-13.59467, 1.59889, -0.0597],
"easing": "easeInElastic"
},
"0.3167": {
"vector": [-13.4882, 1.37149, -0.57174]
},
"0.4333": {
"vector": [-13.3918, 0.47094, -5.24635]
},
"0.5167": {
"vector": [-13.59467, 1.59889, -16.0597]
"vector": [-10.88864, -0.3826, -2.87472]
},
"0.6333": {
"vector": [-14.32523, -1.08564, -11.90473]
@ -257,19 +302,19 @@
}
},
"position": {
"0.0": {
"0.0833": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [-0.1, 0.1, -0.1],
"0.1833": {
"vector": [-0.1, 0.1, -0.4],
"easing": "easeInElastic"
},
"0.2": {
"vector": [-0.1, 0.52, 0.9],
"easing": "easeInElastic"
"0.2833": {
"vector": [-0.1, 0.7, 0.65],
"easing": "easeOutQuad"
},
"0.4": {
"vector": [-0.1, 0.7, -0.1],
"0.3667": {
"vector": [-0.1, 0.7, -0.4],
"easing": "easeOutQuad"
},
"0.5333": {
@ -338,20 +383,20 @@
"1.1": {
"vector": [-12.5, -70, -130]
},
"1.1667": {
"1.1333": {
"vector": [-12.5, -70, -130]
},
"1.2333": {
"1.1833": {
"vector": [1.51, -72.16, -135.34]
},
"1.2833": {
"1.2333": {
"vector": [-0.58781, -40.02039, -106.56534]
},
"1.4333": {
"1.35": {
"vector": [-14.72777, -7.86614, -33.43033],
"easing": "easeInOutSine"
},
"1.5333": {
"1.45": {
"vector": [-22.63843, -5.6156, -7.36216],
"easing": "easeInOutSine"
},
@ -383,17 +428,17 @@
"1.1": {
"vector": [3.05, -7.25, 7.56]
},
"1.1667": {
"1.1333": {
"vector": [4.08351, -1.47888, 4.9022],
"easing": "easeInOutSine"
},
"1.25": {
"1.2": {
"vector": [5.1, 0.44, 3.5]
},
"1.4": {
"1.3167": {
"vector": [2.86, -1.65, -0.74]
},
"1.5333": {
"1.45": {
"vector": [0.39786, 0.10076, -1.31536],
"easing": "easeInOutSine"
},
@ -412,88 +457,16 @@
}
}
},
"magazine2": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.5333": {
"vector": [0, 0, 0]
},
"0.9": {
"vector": [15, 0, 4],
"easing": "easeOutSine"
},
"1.1333": {
"vector": [0, 0, -1],
"easing": "easeInOutQuad"
},
"1.3167": {
"vector": [-22.05592, -4.56353, -7.11018]
},
"1.35": {
"vector": [-21.17748, -2.97195, -4.59202]
},
"1.5": {
"vector": [0, 0, 0]
},
"1.5667": {
"vector": [0, 0, 0]
},
"2.2167": {
"vector": [0, 0, 0]
},
"2.2333": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.5333": {
"vector": [-0.86802, -3.30009, -2.89697]
},
"0.9": {
"vector": [-5.12342, 4.47795, -9.02235],
"easing": "easeOutSine"
},
"1.1333": {
"vector": [-5.12342, 0.97795, -10.02235],
"easing": "easeInOutQuad"
},
"1.3167": {
"vector": [-5.74422, 2.89641, -11.82]
},
"1.35": {
"vector": [-5.86422, 2.65484, -11.5]
},
"1.4167": {
"vector": [-5.79109, 2.99891, -10.69375]
},
"1.5": {
"vector": [-5.99844, 3.01172, -10.01172]
},
"1.5667": {
"vector": [-5.99844, 3.01172, -10.01172]
},
"2.2167": {
"vector": [-5.99844, 3.01172, -10.01172]
},
"2.2333": {
"vector": [0, 0, 330]
},
"2.25": {
"vector": [0, 0, 0]
}
}
},
"Lefthand": {
"rotation": {
"0.4167": {
"0.3333": {
"vector": [0, 0, 0]
},
"0.5833": {
"0.4333": {
"vector": [-10.83774, -11.3082, 26.01338],
"easing": "easeInElastic"
},
"0.55": {
"vector": [-10.83774, -11.3082, 26.01338],
"easing": "easeInElastic"
},
@ -515,19 +488,19 @@
"1.1": {
"vector": [-49.77006, 64.26495, -91.19885]
},
"1.1667": {
"1.1333": {
"vector": [-47.55314, 65.39596, -103.44208]
},
"1.25": {
"1.2": {
"vector": [-46.07222, 70.25928, -87.18593]
},
"1.35": {
"1.2667": {
"vector": [-16.54273, 37.67935, -40.57865]
},
"1.4": {
"1.3167": {
"vector": [-13.14801, 19.23814, -10.56439]
},
"1.5333": {
"1.45": {
"vector": [-10.79618, 6.21927, 22.54367],
"easing": "linear"
},
@ -551,10 +524,14 @@
}
},
"position": {
"0.4167": {
"0.3333": {
"vector": [0, 0, 0]
},
"0.5833": {
"0.4333": {
"vector": [-2.59069, -0.63326, 6.31688],
"easing": "easeInElastic"
},
"0.55": {
"vector": [-2.59069, -0.63326, 6.31688],
"easing": "easeInElastic"
},
@ -576,22 +553,22 @@
"1.1": {
"vector": [3.78778, -5.55218, 11.79434]
},
"1.1667": {
"1.1333": {
"vector": [6.50262, 0.9929, 8.56821]
},
"1.25": {
"1.2": {
"vector": [6.51159, 0.43131, 6.5098]
},
"1.35": {
"1.2667": {
"vector": [5.08812, -0.82527, 5.37621]
},
"1.4": {
"1.3167": {
"vector": [1.61237, -3.02671, 4.36969]
},
"1.4667": {
"1.3833": {
"vector": [-0.78777, -2.78872, 4.5296]
},
"1.5333": {
"1.45": {
"vector": [-3.9135, -3.08305, 4.31438],
"easing": "linear"
},
@ -685,18 +662,21 @@
"bones": {
"0": {
"rotation": {
"0.0": {
"0.15": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [3.4, 1.25, 4.95]
},
"0.35": {
"0.2333": {
"vector": [-13.59467, 1.59889, -0.0597],
"easing": "easeInElastic"
},
"0.3167": {
"vector": [-13.4882, 1.37149, -0.57174]
},
"0.4333": {
"vector": [-13.3918, 0.47094, -5.24635]
},
"0.5167": {
"vector": [-13.59467, 1.59889, -16.0597]
"vector": [-10.88864, -0.3826, -2.87472]
},
"0.6333": {
"vector": [-14.32523, -1.08564, -11.90473]
@ -739,19 +719,19 @@
}
},
"position": {
"0.0": {
"0.0833": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [-0.1, 0.1, -0.1],
"0.1833": {
"vector": [-0.1, 0.1, -0.4],
"easing": "easeInElastic"
},
"0.2": {
"vector": [-0.1, 0.52, 0.9],
"easing": "easeInElastic"
"0.2833": {
"vector": [-0.1, 0.7, 0.65],
"easing": "easeOutQuad"
},
"0.4": {
"vector": [-0.1, 0.7, -0.1],
"0.3667": {
"vector": [-0.1, 0.7, -0.4],
"easing": "easeOutQuad"
},
"0.5333": {
@ -820,20 +800,20 @@
"1.1": {
"vector": [-12.5, -70, -130]
},
"1.1667": {
"1.1333": {
"vector": [-12.5, -70, -130]
},
"1.2333": {
"1.1833": {
"vector": [1.51, -72.16, -135.34]
},
"1.2833": {
"1.2333": {
"vector": [-0.58781, -40.02039, -106.56534]
},
"1.4333": {
"1.35": {
"vector": [-14.72777, -7.86614, -33.43033],
"easing": "easeInOutSine"
},
"1.5333": {
"1.45": {
"vector": [-22.63843, -5.6156, -7.36216],
"easing": "easeInOutSine"
},
@ -865,17 +845,17 @@
"1.1": {
"vector": [3.05, -7.25, 7.56]
},
"1.1667": {
"1.1333": {
"vector": [4.08351, -1.47888, 4.9022],
"easing": "easeInOutSine"
},
"1.25": {
"1.2": {
"vector": [5.1, 0.44, 3.5]
},
"1.4": {
"1.3167": {
"vector": [2.86, -1.65, -0.74]
},
"1.5333": {
"1.45": {
"vector": [0.39786, 0.10076, -1.31536],
"easing": "easeInOutSine"
},
@ -894,88 +874,15 @@
}
}
},
"magazine2": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.5333": {
"vector": [0, 0, 0]
},
"0.9": {
"vector": [15, 0, 4],
"easing": "easeOutSine"
},
"1.1333": {
"vector": [0, 0, -1],
"easing": "easeInOutQuad"
},
"1.3167": {
"vector": [-22.05592, -4.56353, -7.11018]
},
"1.35": {
"vector": [-21.17748, -2.97195, -4.59202]
},
"1.5": {
"vector": [0, 0, 0]
},
"1.5667": {
"vector": [0, 0, 0]
},
"2.2167": {
"vector": [0, 0, 0]
},
"2.2333": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.5333": {
"vector": [-0.86802, -3.30009, -2.89697]
},
"0.9": {
"vector": [-5.12342, 4.47795, -9.02235],
"easing": "easeOutSine"
},
"1.1333": {
"vector": [-5.12342, 0.97795, -10.02235],
"easing": "easeInOutQuad"
},
"1.3167": {
"vector": [-5.74422, 2.89641, -11.82]
},
"1.35": {
"vector": [-5.86422, 2.65484, -11.5]
},
"1.4167": {
"vector": [-5.79109, 2.99891, -10.69375]
},
"1.5": {
"vector": [-5.99844, 3.01172, -10.01172]
},
"1.5667": {
"vector": [-5.99844, 3.01172, -10.01172]
},
"2.2167": {
"vector": [-5.99844, 3.01172, -10.01172]
},
"2.2333": {
"vector": [0, 0, 330]
},
"2.25": {
"vector": [0, 0, 0]
}
}
},
"Lefthand": {
"rotation": {
"0.4167": {
"0.3333": {
"vector": [0, 0, 0]
},
"0.5833": {
"0.4333": {
"vector": [-23.04, -6.9, 40.68]
},
"0.55": {
"vector": [-23.04, -6.9, 40.68]
},
"0.6667": {
@ -997,35 +904,33 @@
"1.1": {
"vector": [-49.77006, 64.26495, -91.19885]
},
"1.1667": {
"1.1333": {
"vector": [-47.55314, 65.39596, -103.44208]
},
"1.25": {
"1.2": {
"vector": [-46.07222, 70.25928, -87.18593]
},
"1.35": {
"1.2667": {
"vector": [-16.54273, 37.67935, -40.57865]
},
"1.4": {
"vector": [-13.14801, 19.23814, -10.56439]
"1.3167": {
"vector": [-13.30798, -10.54682, 23.55855]
},
"1.5333": {
"vector": [-10.79618, 6.21927, 22.54367],
"1.45": {
"vector": [-19.26177, -22.55603, 58.49338],
"easing": "linear"
},
"1.6333": {
"vector": [-27.96238, -13.84396, 58.89893]
"vector": [-30.96238, -13.84396, 58.89893]
},
"1.7333": {
"vector": [-23.9632, -12.39386, 52.59974],
"easing": "linear"
"vector": [-27.96238, -13.84396, 58.89893]
},
"1.8333": {
"vector": [-23.9632, -12.39386, 52.59974],
"easing": "linear"
"vector": [-22.71238, -13.84396, 58.89893]
},
"1.9167": {
"vector": [-23.9632, -12.39386, 52.59974],
"vector": [-25.10279, -2.73231, 57.98657],
"easing": "linear"
},
"2.0833": {
@ -1033,10 +938,13 @@
}
},
"position": {
"0.4167": {
"0.3333": {
"vector": [0, 0, 0]
},
"0.5833": {
"0.4333": {
"vector": [-2.59, -0.63, 6.45]
},
"0.55": {
"vector": [-2.59, -0.63, 6.45]
},
"0.6667": {
@ -1058,35 +966,33 @@
"1.1": {
"vector": [3.78778, -5.55218, 11.79434]
},
"1.1667": {
"1.1333": {
"vector": [6.50262, 0.9929, 8.56821]
},
"1.25": {
"1.2": {
"vector": [6.51159, 0.43131, 6.5098]
},
"1.35": {
"1.2667": {
"vector": [5.08812, -0.82527, 5.37621]
},
"1.4": {
"vector": [1.61237, -3.02671, 4.36969]
"1.3167": {
"vector": [2.11901, -1.90094, 5.02998]
},
"1.4667": {
"1.3833": {
"vector": [-0.78777, -2.78872, 4.5296]
},
"1.5333": {
"vector": [-3.9135, -3.08305, 4.31438],
"1.45": {
"vector": [-2.65755, -2.13952, 4.93059],
"easing": "linear"
},
"1.6333": {
"vector": [-5.03219, -1.54203, 6.77]
"vector": [-3.27214, -1.48037, 6.08189]
},
"1.7333": {
"vector": [-4.22575, -1.43666, 6.09951],
"easing": "linear"
"vector": [-3.21729, -1.68999, 6.47986]
},
"1.8333": {
"vector": [-4.22575, -1.43666, 6.09951],
"easing": "linear"
"vector": [-3.87892, -2.04721, 6.87809]
},
"1.9167": {
"vector": [-4.22575, -1.43666, 6.09951],
@ -1395,82 +1301,6 @@
}
}
},
"magazine2": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.5333": {
"vector": [0, 0, 0]
},
"0.9": {
"vector": [15, 0, 4],
"easing": "easeOutSine"
},
"1.1333": {
"vector": [0, 0, -1],
"easing": "easeInOutQuad"
},
"1.3167": {
"vector": [-22.05592, -4.56353, -7.11018]
},
"1.35": {
"vector": [-21.17748, -2.97195, -4.59202]
},
"1.5": {
"vector": [0, 0, 0]
},
"1.5667": {
"vector": [0, 0, 0]
},
"2.2167": {
"vector": [0, 0, 0]
},
"2.2333": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.5333": {
"vector": [-0.86802, -3.30009, -2.89697]
},
"0.9": {
"vector": [-5.12342, 4.47795, -9.02235],
"easing": "easeOutSine"
},
"1.1333": {
"vector": [-5.12342, 0.97795, -10.02235],
"easing": "easeInOutQuad"
},
"1.3167": {
"vector": [-5.74422, 2.89641, -11.82]
},
"1.35": {
"vector": [-5.86422, 2.65484, -11.5]
},
"1.4167": {
"vector": [-5.79109, 2.99891, -10.69375]
},
"1.5": {
"vector": [-5.99844, 3.01172, -10.01172]
},
"1.5667": {
"vector": [-5.99844, 3.01172, -10.01172]
},
"2.2167": {
"vector": [-5.99844, 3.01172, -10.01172]
},
"2.2333": {
"vector": [0, 0, 330]
},
"2.25": {
"vector": [0, 0, 0]
}
}
},
"Lefthand": {
"rotation": {
"0.2167": {

BIN
src/main/resources/assets/superbwarfare/sounds/edit_mode.ogg
View file

Binary file not shown.

BIN
src/main/resources/assets/superbwarfare/sounds/edit_mode.wav Normal file
View file

Binary file not shown.