From 34aef2780368d7bdd0792b7cefa85f0e1878c19f Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Wed, 3 Jul 2024 23:08:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8A=E5=BC=B1=E6=80=AA=E7=8C=8E=E6=95=B0?= =?UTF-8?q?=E5=80=BC=EF=BC=8C=E8=B0=83=E6=95=B4RPG=E5=88=9D=E9=80=9F?= =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=A8=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/mcreator/target/entity/ClaymoreEntity.java | 2 +- .../net/mcreator/target/entity/GunGrenadeEntity.java | 2 +- .../net/mcreator/target/entity/ProjectileEntity.java | 2 +- .../net/mcreator/target/entity/RpgRocketEntity.java | 9 +++++---- .../net/mcreator/target/event/ClientEventHandler.java | 2 +- src/main/resources/assets/target/lang/en_us.json | 11 ++++++++--- src/main/resources/assets/target/lang/zh_cn.json | 5 +++++ src/main/resources/data/target/guns/rpg.json | 2 +- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java b/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java index f72f81f40..b58490ee6 100644 --- a/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java +++ b/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java @@ -254,7 +254,7 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated explosion.explode(); net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion); explosion.finalizeExplosion(false); - for (int index0 = 0; index0 < 100; index0++) { + for (int index0 = 0; index0 < 250; index0++) { fragShoot(); } } diff --git a/src/main/java/net/mcreator/target/entity/GunGrenadeEntity.java b/src/main/java/net/mcreator/target/entity/GunGrenadeEntity.java index 944cfcee7..10a247dd1 100644 --- a/src/main/java/net/mcreator/target/entity/GunGrenadeEntity.java +++ b/src/main/java/net/mcreator/target/entity/GunGrenadeEntity.java @@ -69,7 +69,7 @@ public class GunGrenadeEntity extends ThrowableItemProjectile { @Override protected void onHitEntity(EntityHitResult result) { - float damageMultiplier = 1 + 0.4f * this.monsterMultiplier; + float damageMultiplier = 1 + 0.2f * this.monsterMultiplier; Entity entity = result.getEntity(); if (this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { diff --git a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java index 9c2288cf2..358bd66cd 100644 --- a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java +++ b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java @@ -332,7 +332,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa } protected void onHitEntity(Entity entity, boolean headshot, boolean legshot) { - float m_multiple = (1 + 0.4f * this.monster_multiple); + float m_multiple = 1 + 0.2f * this.monster_multiple; if (entity == null) return; diff --git a/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java b/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java index a0597cf45..ad12a3d56 100644 --- a/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java +++ b/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java @@ -69,7 +69,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile { @Override protected void onHitEntity(EntityHitResult result) { - float damageMultiplier = 1 + 0.4f * this.monsterMultiplier; + float damageMultiplier = 1 + 0.2f * this.monsterMultiplier; Entity entity = result.getEntity(); if (this.getOwner() instanceof LivingEntity living) { if (!living.level().isClientSide() && living instanceof ServerPlayer player) { @@ -148,7 +148,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile { @Override public void onHitBlock(BlockHitResult blockHitResult) { super.onHitBlock(blockHitResult); - if (this.tickCount > 0) { + if (this.tickCount > 1) { if (this.level() instanceof ServerLevel) { causeExplode(); } @@ -161,13 +161,14 @@ public class RpgRocketEntity extends ThrowableItemProjectile { public void tick() { super.tick(); - if (this.tickCount == 1) { + if (this.tickCount == 2) { if (!this.level().isClientSide() && this.level() instanceof ServerLevel serverLevel) { + ParticleTool.sendParticle(serverLevel, ParticleTypes.CLOUD, this.getX(), this.getY(), this.getZ(), 50, 0.8, 0.8, 0.8, 0.01, true); ParticleTool.sendParticle(serverLevel, ParticleTypes.CAMPFIRE_COSY_SMOKE, this.getX(), this.getY(), this.getZ(), 50, 0.8, 0.8, 0.8, 0.01, true); } } if (this.tickCount > 1) { - this.setDeltaMovement(new Vec3((1.04 * this.getDeltaMovement().x()), (1.04 * this.getDeltaMovement().y() - 0.02), (1.04 * this.getDeltaMovement().z()))); + this.setDeltaMovement(new Vec3((1.03 * this.getDeltaMovement().x()), (1.03 * this.getDeltaMovement().y() - 0.05), (1.03 * this.getDeltaMovement().z()))); if (!this.level().isClientSide() && this.level() instanceof ServerLevel serverLevel) { ParticleTool.sendParticle(serverLevel, ParticleTypes.SMOKE, this.getX(), this.getY(), this.getZ(), 2, 0, 0, 0, 0, true); diff --git a/src/main/java/net/mcreator/target/event/ClientEventHandler.java b/src/main/java/net/mcreator/target/event/ClientEventHandler.java index 6b1e30b16..b65f9c261 100644 --- a/src/main/java/net/mcreator/target/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/target/event/ClientEventHandler.java @@ -113,7 +113,7 @@ public class ClientEventHandler { float times = 90f / fps; var data = entity.getPersistentData(); - double move_speed = (float) entity.getDeltaMovement().horizontalDistanceSqr(); + double move_speed = (float) Mth.clamp(entity.getDeltaMovement().horizontalDistanceSqr(),0,0.02); double on_ground; if (entity.onGround()) { if (entity.isSprinting()) { diff --git a/src/main/resources/assets/target/lang/en_us.json b/src/main/resources/assets/target/lang/en_us.json index 379bddbb5..39dd6ca58 100644 --- a/src/main/resources/assets/target/lang/en_us.json +++ b/src/main/resources/assets/target/lang/en_us.json @@ -168,9 +168,9 @@ "death.attack.shock": "%1$s was shocked", "death.attack.shock.entity": "%1$s was shocked by %2$s", "death.attack.shock.item": "%1$s was shocked by %2$s", - "death.attack.projectile_boom": "%1$s被轰上了天", - "death.attack.projectile_boom.entity": "%1$s被%2$s轰上了天", - "death.attack.projectile_boom.item": "%1$s被%2$s用%3$s轰上了天", + "death.attack.projectile_boom": "%1$s blew up", + "death.attack.projectile_boom.entity": "%1$s was blown up by %2$s", + "death.attack.projectile_boom.item": "%1$s was blown up by %2$s using %3$s", "gui.target.gun_recycle_gui.tooltip_if_guns_level_10you_will_get": "If gun\u0027s level \u003e 10,you will get soul nuggets", "gui.target.gun_recycle_gui.button_dismantle": "Dismantle", @@ -179,6 +179,11 @@ "entity.target.projectile": "Bullet", "entity.target.projectile_frag": "Frag", + "entity.target.projectile_mortar_shell": "Mortar Shell", + "entity.target.projectile_gun_grenade": "Gun Grenade", + "entity.target.projectile_rpg_rocket": "RPG Rocket", + "entity.target.projectile_bocekarrow": "Arrow", + "entity.target.projectile_taser_bullet_projectile": "Taser Electrode", "entity.target.mortar": "Mortar", "entity.target.target": "Target", "entity.target.target_1": "Target", diff --git a/src/main/resources/assets/target/lang/zh_cn.json b/src/main/resources/assets/target/lang/zh_cn.json index 4edff7c1d..5000b631d 100644 --- a/src/main/resources/assets/target/lang/zh_cn.json +++ b/src/main/resources/assets/target/lang/zh_cn.json @@ -179,6 +179,11 @@ "entity.target.projectile": "子弹", "entity.target.projectile_frag": "破片", + "entity.target.projectile_mortar_shell": "迫击炮弹", + "entity.target.projectile_gun_grenade": "枪榴弹", + "entity.target.projectile_rpg_rocket": "RPG火箭弹", + "entity.target.projectile_bocekarrow": "箭矢", + "entity.target.projectile_taser_bullet_projectile": "电极", "entity.target.mortar": "迫击炮", "entity.target.target": "标靶", "entity.target.target_1": "标靶", diff --git a/src/main/resources/data/target/guns/rpg.json b/src/main/resources/data/target/guns/rpg.json index 74eb61d0d..22e687d88 100644 --- a/src/main/resources/data/target/guns/rpg.json +++ b/src/main/resources/data/target/guns/rpg.json @@ -5,7 +5,7 @@ "recoil_x": 0.008, "recoil_y": 0.018, "damage": 150, - "velocity": 5.75, + "velocity": 4, "mag": 1, "weight": 1, "fire_mode": 0,