调整数值
This commit is contained in:
parent
8240ff4e1a
commit
146d11a28d
10 changed files with 6421 additions and 41579 deletions
|
@ -51,7 +51,7 @@ public class MinigunItemModel extends GeoModel<MinigunItem> {
|
||||||
|
|
||||||
int rpm = GunData.from(stack).rpm();
|
int rpm = GunData.from(stack).rpm();
|
||||||
|
|
||||||
gun.setRotZ(gun.getRotZ() + times * -0.07f * ((float) rpm / 1200) * ClientEventHandler.shootDelay);
|
gun.setRotZ(gun.getRotZ() + times * -0.14f * ((float) rpm / 1200) * ClientEventHandler.shootDelay);
|
||||||
|
|
||||||
shen.setPosX((float) (0.75f * ClientEventHandler.recoilHorizon * fpz * fp));
|
shen.setPosX((float) (0.75f * ClientEventHandler.recoilHorizon * fpz * fp));
|
||||||
shen.setPosY((float) (-0.03f * fp - 0.06f * fr));
|
shen.setPosY((float) (-0.03f * fp - 0.06f * fr));
|
||||||
|
|
|
@ -485,7 +485,7 @@ public class A10Entity extends ContainerMobileVehicleEntity implements GeoEntity
|
||||||
}
|
}
|
||||||
|
|
||||||
if (backInputDown) {
|
if (backInputDown) {
|
||||||
this.entityData.set(POWER, Math.max(this.entityData.get(POWER) - 0.004f, -0.6f));
|
this.entityData.set(POWER, Math.max(this.entityData.get(POWER) - 0.002f, -0.2f));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -517,7 +517,7 @@ public class AnnihilatorEntity extends EnergyVehicleEntity implements GeoEntity,
|
||||||
|
|
||||||
private PlayState movementPredicate(AnimationState<AnnihilatorEntity> event) {
|
private PlayState movementPredicate(AnimationState<AnnihilatorEntity> event) {
|
||||||
if (this.entityData.get(COOL_DOWN) > 85) {
|
if (this.entityData.get(COOL_DOWN) > 85) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.annihilator.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlayAndHold("animation.annihilator.fire"));
|
||||||
}
|
}
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.annihilator.idle"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.annihilator.idle"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -220,7 +220,7 @@ public class LaserTowerEntity extends EnergyVehicleEntity implements GeoEntity,
|
||||||
|
|
||||||
Vec3 barrelRootPos = new Vec3(this.getX(), this.getY() + 1.390625f, this.getZ());
|
Vec3 barrelRootPos = new Vec3(this.getX(), this.getY() + 1.390625f, this.getZ());
|
||||||
|
|
||||||
if (entityData.get(TARGET_UUID).equals("none") && tickCount % 5 == 0) {
|
if (entityData.get(TARGET_UUID).equals("none") && tickCount % 10 == 0 && entityData.get(COOL_DOWN) == 0) {
|
||||||
Entity naerestEntity = seekNearLivingEntity(this, barrelRootPos, -40, 90, 1, 72, 0.01);
|
Entity naerestEntity = seekNearLivingEntity(this, barrelRootPos, -40, 90, 1, 72, 0.01);
|
||||||
if (naerestEntity != null) {
|
if (naerestEntity != null) {
|
||||||
entityData.set(TARGET_UUID, naerestEntity.getStringUUID());
|
entityData.set(TARGET_UUID, naerestEntity.getStringUUID());
|
||||||
|
@ -345,7 +345,7 @@ public class LaserTowerEntity extends EnergyVehicleEntity implements GeoEntity,
|
||||||
|
|
||||||
private PlayState movementPredicate(AnimationState<LaserTowerEntity> event) {
|
private PlayState movementPredicate(AnimationState<LaserTowerEntity> event) {
|
||||||
if (this.entityData.get(COOL_DOWN) > 10) {
|
if (this.entityData.get(COOL_DOWN) > 10) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.lt.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlayAndHold("animation.lt.fire"));
|
||||||
}
|
}
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.lt.idle"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.lt.idle"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1002,14 +1002,14 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti
|
||||||
|
|
||||||
private PlayState cannonShootPredicate(AnimationState<Yx100Entity> event) {
|
private PlayState cannonShootPredicate(AnimationState<Yx100Entity> event) {
|
||||||
if (this.entityData.get(CANNON_RECOIL_TIME) > 0) {
|
if (this.entityData.get(CANNON_RECOIL_TIME) > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.yx100.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlayAndHold("animation.yx100.fire"));
|
||||||
}
|
}
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.yx100.idle"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.yx100.idle"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private PlayState coaxShootPredicate(AnimationState<Yx100Entity> event) {
|
private PlayState coaxShootPredicate(AnimationState<Yx100Entity> event) {
|
||||||
if (this.entityData.get(FIRE_ANIM) > 0) {
|
if (this.entityData.get(FIRE_ANIM) > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.yx100.fire_coax"));
|
return event.setAndContinue(RawAnimation.begin().thenPlayAndHold("animation.yx100.fire_coax"));
|
||||||
}
|
}
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.yx100.idle_coax"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.yx100.idle_coax"));
|
||||||
}
|
}
|
||||||
|
@ -1017,7 +1017,7 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti
|
||||||
|
|
||||||
private PlayState gunShootPredicate(AnimationState<Yx100Entity> event) {
|
private PlayState gunShootPredicate(AnimationState<Yx100Entity> event) {
|
||||||
if (this.entityData.get(GUN_FIRE_TIME) > 0) {
|
if (this.entityData.get(GUN_FIRE_TIME) > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.yx100.fire2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlayAndHold("animation.yx100.fire2"));
|
||||||
}
|
}
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.yx100.idle2"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.yx100.idle2"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -460,8 +460,9 @@ public abstract class VehicleEntity extends Entity {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (attacker != null) {
|
if (attacker != null) {
|
||||||
|
Vec3 toVec = new Vec3(getX(), getY() + getBbHeight() / 2, getZ()).vectorTo(attacker.position()).normalize();
|
||||||
float angle = (float) java.lang.Math.abs(VectorTool.calculateAngle(this.position().vectorTo(attacker.position()), this.getViewVector(1)));
|
float angle = (float) java.lang.Math.abs(VectorTool.calculateAngle(this.position().vectorTo(attacker.position()), this.getViewVector(1)));
|
||||||
return java.lang.Math.max(1f + multiply * ((angle - 90) / 90), 0.5f);
|
return (float) java.lang.Math.max(1f - multiply * toVec.dot(getViewVector(1)), 0.5f);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -86,7 +86,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Type": "Multiply",
|
"Type": "Multiply",
|
||||||
"Value": 10,
|
"Value": 13,
|
||||||
"Source": "#superbwarfare:vehicle_strike"
|
"Source": "#superbwarfare:vehicle_strike"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -81,7 +81,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Type": "Multiply",
|
"Type": "Multiply",
|
||||||
"Value": 6,
|
"Value": 4,
|
||||||
"Source": "superbwarfare:vehicle_strike"
|
"Source": "superbwarfare:vehicle_strike"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Type": "Multiply",
|
"Type": "Multiply",
|
||||||
"Value": 5,
|
"Value": 3,
|
||||||
"Source": "superbwarfare:vehicle_strike"
|
"Source": "superbwarfare:vehicle_strike"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue