调整obb膨胀大小,调整无人机音量和速度
This commit is contained in:
parent
7a2cc5e79b
commit
1997dbb63e
4 changed files with 10 additions and 3 deletions
|
@ -184,7 +184,6 @@ public class SmallCannonShellEntity extends FastThrowableProjectile implements G
|
||||||
.toList();
|
.toList();
|
||||||
for (var entity : entities) {
|
for (var entity : entities) {
|
||||||
causeExplode(entity.position(), false);
|
causeExplode(entity.position(), false);
|
||||||
|
|
||||||
entity.discard();
|
entity.discard();
|
||||||
this.discard();
|
this.discard();
|
||||||
}
|
}
|
||||||
|
|
|
@ -384,7 +384,7 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity {
|
||||||
holdTickZ = 0;
|
holdTickZ = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setDeltaMovement(this.getDeltaMovement().multiply(0.97, 0.94, 0.97));
|
this.setDeltaMovement(this.getDeltaMovement().multiply(0.965, 0.935, 0.965));
|
||||||
} else {
|
} else {
|
||||||
this.setDeltaMovement(this.getDeltaMovement().multiply(0.8, 1, 0.8));
|
this.setDeltaMovement(this.getDeltaMovement().multiply(0.8, 1, 0.8));
|
||||||
this.setZRot(this.roll * 0.7f);
|
this.setZRot(this.roll * 0.7f);
|
||||||
|
@ -497,6 +497,14 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getEngineSoundVolume() {
|
public float getEngineSoundVolume() {
|
||||||
|
Player player = EntityFindUtil.findPlayer(this.level(), this.entityData.get(CONTROLLER));
|
||||||
|
|
||||||
|
if (player == null) return entityData.get(POWER);
|
||||||
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
|
if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) {
|
||||||
|
return entityData.get(POWER) * 0.25f;
|
||||||
|
}
|
||||||
return entityData.get(POWER) * 2f;
|
return entityData.get(POWER) * 2f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ public class ProjectileUtilMixin {
|
||||||
(projectile.getOwner() == entity || entity.getPassengers().contains(projectile.getOwner()))) {
|
(projectile.getOwner() == entity || entity.getPassengers().contains(projectile.getOwner()))) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
OBB obb = obbEntity.getOBB().inflate(pInflationAmount * 2);
|
OBB obb = obbEntity.getOBB().inflate(6);
|
||||||
|
|
||||||
Optional<Vector3f> optional = obb.clip(pStartVec.toVector3f(), pEndVec.toVector3f());
|
Optional<Vector3f> optional = obb.clip(pStartVec.toVector3f(), pEndVec.toVector3f());
|
||||||
if (optional.isPresent()) {
|
if (optional.isPresent()) {
|
||||||
|
|
Binary file not shown.
Loading…
Add table
Reference in a new issue