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:
17146 2024-08-10 15:32:24 +08:00
parent 69ad5f97cf
commit 8f49e78b4a
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java
View file

@ -106,7 +106,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
Vec3 hitVec = null; Vec3 hitVec = null;
Entity hitEntity = null; Entity hitEntity = null;
boolean headshot = false; boolean headshot = false;
boolean legshot = false; boolean legShot = false;
List<Entity> entities = this.level() List<Entity> entities = this.level()
.getEntities(this, .getEntities(this,
this.getBoundingBox() this.getBoundingBox()
@ -132,10 +132,10 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
hitEntity = entity; hitEntity = entity;
closestDistance = distanceToHit; closestDistance = distanceToHit;
headshot = result.isHeadshot(); headshot = result.isHeadshot();
legshot = result.isLegShot(); legShot = result.isLegShot();
} }
} }
return hitEntity != null ? new EntityResult(hitEntity, hitVec, headshot, legshot) : null; return hitEntity != null ? new EntityResult(hitEntity, hitVec, headshot, legShot) : null;
} }
@Nullable @Nullable
@ -276,10 +276,6 @@ 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);
} }
double x = vec.x;
double y = vec.y;
double z = vec.z;
this.setDeltaMovement(vec.x, vec.y - 0.05000000074505806, vec.z); this.setDeltaMovement(vec.x, vec.y - 0.05000000074505806, vec.z);
this.tickCount++; this.tickCount++;
@ -350,6 +346,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
} }
} }
// TODO 实现穿甲比例大于1时的穿透生物效果
protected void onHitEntity(Entity entity, boolean headshot, boolean legShot) { protected void onHitEntity(Entity entity, boolean headshot, boolean legShot) {
float mMultiple = 1 + 0.2f * this.monsterMultiple; float mMultiple = 1 + 0.2f * this.monsterMultiple;
@ -561,8 +558,10 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
} }
private void performDamage(Entity entity, float damage, boolean headshot) { private void performDamage(Entity entity, float damage, boolean headshot) {
float normalDamage = damage * Mth.clamp(1 - bypassArmorRate, 0, 1); float rate = Mth.clamp(this.bypassArmorRate, 0, 1);
float absoluteDamage = damage * Mth.clamp(bypassArmorRate, 0, 1);
float normalDamage = damage * Mth.clamp(1 - rate, 0, 1);
float absoluteDamage = damage * Mth.clamp(rate, 0, 1);
entity.invulnerableTime = 0; entity.invulnerableTime = 0;
if (headshot) { if (headshot) {

3
src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java
View file

@ -19,7 +19,6 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundSource; import net.minecraft.sounds.SoundSource;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
@ -387,8 +386,8 @@ public class GunEventHandler {
projectile.effect(() -> new MobEffectInstance(ammoPerk.mobEffect.get(), 70 + 30 * level, amplifier)); projectile.effect(() -> new MobEffectInstance(ammoPerk.mobEffect.get(), 70 + 30 * level, amplifier));
} }
} }
bypassArmorRate = Mth.clamp(bypassArmorRate, 0, 1);
bypassArmorRate = Math.max(bypassArmorRate, 0);
projectile.bypassArmorRate(bypassArmorRate); projectile.bypassArmorRate(bypassArmorRate);
if (perk == ModPerks.SILVER_BULLET.get()) { if (perk == ModPerks.SILVER_BULLET.get()) {

5
src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java
View file

@ -16,7 +16,6 @@ import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundSource; import net.minecraft.sounds.SoundSource;
import net.minecraft.util.Mth;
import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.projectile.AbstractArrow;
@ -191,7 +190,7 @@ public class FireMessage {
projectile.damage(0); projectile.damage(0);
player.level().addFreshEntity(projectile); player.level().addFreshEntity(projectile);
bypassArmorRate = Mth.clamp(bypassArmorRate, 0, 1); bypassArmorRate = Math.max(bypassArmorRate, 0);
BocekArrowEntity arrow = new BocekArrowEntity(player, level, monsterMultiple).bypassArmorRate(bypassArmorRate).undeadMultiple(undeadMultiple); BocekArrowEntity arrow = new BocekArrowEntity(player, level, monsterMultiple).bypassArmorRate(bypassArmorRate).undeadMultiple(undeadMultiple);
arrow.setBaseDamage(damage); arrow.setBaseDamage(damage);
@ -270,7 +269,7 @@ public class FireMessage {
} }
} }
bypassArmorRate = Mth.clamp(bypassArmorRate, 0, 1); bypassArmorRate = Math.max(bypassArmorRate, 0);
projectile.bypassArmorRate(bypassArmorRate); projectile.bypassArmorRate(bypassArmorRate);
if (perk == ModPerks.SILVER_BULLET.get()) { if (perk == ModPerks.SILVER_BULLET.get()) {