马林杠杆重制,削减子弹伤害衰减速率
|
@ -4,6 +4,7 @@ import net.mcreator.target.item.gun.MarlinItem;
|
|||
import net.mcreator.target.network.TargetModVariables;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import software.bernie.geckolib.core.animatable.model.CoreGeoBone;
|
||||
|
@ -40,9 +41,9 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
|
|||
double zp = 0;
|
||||
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||
|
||||
gun.setPosX(5.235f * (float) p);
|
||||
gun.setPosX(1.712f * (float) p);
|
||||
|
||||
gun.setPosY(2.73f * (float) p - (float) (0.7f * zp));
|
||||
gun.setPosY(1.06f * (float) p - (float) (0.7f * zp));
|
||||
|
||||
gun.setPosZ(1.5f * (float) p + (float) (0.9f * zp));
|
||||
|
||||
|
@ -101,7 +102,7 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
|
|||
|
||||
root.setPosX(PosX);
|
||||
|
||||
root.setPosY((float) y + 2.5f * PosY);
|
||||
root.setPosY((float) y + PosY);
|
||||
|
||||
root.setRotX((float) x);
|
||||
|
||||
|
@ -130,5 +131,13 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
|
|||
move.setRotZ(3.7f * (float) yaw + 2.7f * (float) m);
|
||||
|
||||
move.setRotY(1.9f * (float) yaw - 1.7f * (float) m);
|
||||
|
||||
CoreGeoBone camera = getAnimationProcessor().getBone("camera");
|
||||
|
||||
player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX());
|
||||
|
||||
player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY());
|
||||
|
||||
player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -82,15 +82,15 @@ public class LivingEventHandler {
|
|||
double distance = entity.position().distanceTo(sourceentity.position());
|
||||
|
||||
if (stack.is(TargetModTags.Items.SHOTGUN) || stack.getItem() == TargetModItems.BOCEK.get()) {
|
||||
damage = reduceDamageByDistance(amount, distance, 0.05, 20);
|
||||
damage = reduceDamageByDistance(amount, distance, 0.03, 25);
|
||||
} else if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) {
|
||||
damage = reduceDamageByDistance(amount, distance, 0.001, 200);
|
||||
} else if (stack.is(TargetModTags.Items.HANDGUN)) {
|
||||
damage = reduceDamageByDistance(amount, distance, 0.04, 40);
|
||||
damage = reduceDamageByDistance(amount, distance, 0.03, 50);
|
||||
} else if (stack.is(TargetModTags.Items.SMG)) {
|
||||
damage = reduceDamageByDistance(amount, distance, 0.03, 50);
|
||||
} else if (stack.is(TargetModTags.Items.RIFLE)) {
|
||||
damage = reduceDamageByDistance(amount, distance, 0.005, 100);
|
||||
damage = reduceDamageByDistance(amount, distance, 0.0025, 150);
|
||||
}
|
||||
event.setAmount((float) damage);
|
||||
stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage);
|
||||
|
|
|
@ -277,6 +277,6 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem {
|
|||
|
||||
@Override
|
||||
public String getGunDisplayName() {
|
||||
return " MARLIN-1895";
|
||||
return " MARLIN-1894";
|
||||
}
|
||||
}
|
|
@ -16,7 +16,7 @@
|
|||
"item.target.m_60": "M60",
|
||||
"item.target.mk_14": "MK-14EBR",
|
||||
"item.target.m_79": "M79",
|
||||
"item.target.vector": "vector",
|
||||
"item.target.vector": "VECTOR",
|
||||
"item.target.bocek": "BOCEK",
|
||||
"item.target.ak_47": "AK-47",
|
||||
"item.target.m_4": "M4A1",
|
||||
|
@ -28,7 +28,7 @@
|
|||
"des.target.trachelium_2": "\"May the flowers in my hand convey my feelings to you\"",
|
||||
"des.target.trachelium_3": "From: ",
|
||||
"des.target.trachelium_4": "Madoka",
|
||||
"item.target.marlin": "M1895",
|
||||
"item.target.marlin": "MARLIN-1894",
|
||||
"item.target.devotion": "DEVOTION",
|
||||
"item.target.minigun": "M134 MINIGUN",
|
||||
"item.target.taser": "TASER",
|
||||
|
@ -48,7 +48,7 @@
|
|||
"item.target.m_79_blueprint": "M79 Blueprint",
|
||||
"item.target.m_870_blueprint": "M870 Blueprint",
|
||||
"item.target.aa_12_blueprint": "AA-12 Blueprint",
|
||||
"item.target.marlin_blueprint": "M1895 Blueprint",
|
||||
"item.target.marlin_blueprint": "MARLIN-1894 Blueprint",
|
||||
"item.target.bocek_blueprint": "BOCEK Blueprint",
|
||||
"item.target.trachelium_blueprint": "TRACHELIUM Blueprint",
|
||||
"item.target.m_98b_blueprint": "M98B Blueprint",
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
"des.target.trachelium_2": "“愿手中的这束花,能够传达我的深情”",
|
||||
"des.target.trachelium_3": "所属Liver:",
|
||||
"des.target.trachelium_4": "柊真华",
|
||||
"item.target.marlin": "M1895杠杆步枪",
|
||||
"item.target.marlin": "马林1894杠杆步枪",
|
||||
"item.target.devotion": "专注轻机枪",
|
||||
"item.target.minigun": "M134加特林机枪",
|
||||
"item.target.taser": "泰瑟枪",
|
||||
|
@ -48,7 +48,7 @@
|
|||
"item.target.m_79_blueprint": "M79 榴弹发射器蓝图",
|
||||
"item.target.m_870_blueprint": "M870霰弹枪蓝图",
|
||||
"item.target.aa_12_blueprint": "AA-12霰弹枪蓝图",
|
||||
"item.target.marlin_blueprint": "M1895杠杆步枪蓝图",
|
||||
"item.target.marlin_blueprint": "马林1894杠杆步枪蓝图",
|
||||
"item.target.bocek_blueprint": "BOCEK复合弓蓝图",
|
||||
"item.target.trachelium_blueprint": "“夕雾花”蓝图",
|
||||
"item.target.m_98b_blueprint": "M98B狙击步枪蓝图",
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
"credit": "Made with Blockbench",
|
||||
"parent": "builtin/entity",
|
||||
"texture_size": [
|
||||
256,
|
||||
256
|
||||
],
|
||||
"gui_light": "front",
|
||||
"display": {
|
||||
"firstperson_righthand": {
|
||||
"translation": [
|
||||
-3.75,
|
||||
-22,
|
||||
7.25
|
||||
]
|
||||
},
|
||||
"firstperson_lefthand": {
|
||||
"scale": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
"gui": {
|
||||
"translation": [
|
||||
0,
|
||||
-14.5,
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
|
@ -2,30 +2,32 @@
|
|||
"credit": "Made with Blockbench",
|
||||
"parent": "builtin/entity",
|
||||
"texture_size": [
|
||||
256,
|
||||
256
|
||||
128,
|
||||
128
|
||||
],
|
||||
"gui_light": "front",
|
||||
"display": {
|
||||
"firstperson_righthand": {
|
||||
"translation": [
|
||||
-3.75,
|
||||
-22,
|
||||
7.25
|
||||
]
|
||||
},
|
||||
"firstperson_lefthand": {
|
||||
"scale": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
-7.25,
|
||||
3.75,
|
||||
0.25
|
||||
]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [
|
||||
165.69,
|
||||
-39.63,
|
||||
178.66
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
-14.5,
|
||||
-1,
|
||||
-0.75,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.35,
|
||||
0.35,
|
||||
0.35
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"parent": "target:displaysettings/marlin.item",
|
||||
"parent": "target:displaysettings/m870.item",
|
||||
"textures": {
|
||||
"layer0": "target:item/m870"
|
||||
}
|
||||
|
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 5.6 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 187 KiB After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 5.9 KiB |