diff --git a/src/main/java/edn/stratodonut/trackwork/TrackworkConfigs.java b/src/main/java/edn/stratodonut/trackwork/TrackworkConfigs.java index 43055a8..9a25a5b 100644 --- a/src/main/java/edn/stratodonut/trackwork/TrackworkConfigs.java +++ b/src/main/java/edn/stratodonut/trackwork/TrackworkConfigs.java @@ -23,6 +23,7 @@ public static class TServer extends ConfigBase { public final ConfigBase.ConfigBool enableTrackThrow = this.b(false, "enableTrackThrow", "Enable entire tracks being thrown off by explosions"); public final ConfigBase.ConfigInt wheelPairDist = this.i(7, 5, 15, "wheelPairDistance", "The max distance between wheels where steering, etc. will be paired"); public final ConfigBase.ConfigBool wheelRPMPassthrough = this.b(true, "wheelRPMPassthrough", "Allow wheels to transmit RPM through them when connected to kinetic network"); + public final ConfigBase.ConfigInt damageSpeed = this.i(256, "damageSpeed", "speed needed to damage"); @Override public String getName() { diff --git a/src/main/java/edn/stratodonut/trackwork/tracks/blocks/OleoWheelBlockEntity.java b/src/main/java/edn/stratodonut/trackwork/tracks/blocks/OleoWheelBlockEntity.java index a315097..8a59c11 100644 --- a/src/main/java/edn/stratodonut/trackwork/tracks/blocks/OleoWheelBlockEntity.java +++ b/src/main/java/edn/stratodonut/trackwork/tracks/blocks/OleoWheelBlockEntity.java @@ -230,7 +230,7 @@ public void tick() { for (LivingEntity e : hits) { SuspensionTrackBlockEntity.push(e, worldPos); float speed = Math.abs(this.getWheelSpeed()); - if (speed > 1) e.hurt(TrackDamageSources.runOver(this.level), (speed / 16f) * AllConfigs.server().kinetics.crushingDamage.get()); + if (speed > TrackworkConfigs.server().damageSpeed.get()) e.hurt(TrackDamageSources.runOver(this.level), (speed / 16f) * AllConfigs.server().kinetics.crushingDamage.get()); if (e instanceof ServerPlayer p) p.connection.send(new ClientboundSetEntityMotionPacket(p)); } diff --git a/src/main/java/edn/stratodonut/trackwork/tracks/blocks/SuspensionTrackBlockEntity.java b/src/main/java/edn/stratodonut/trackwork/tracks/blocks/SuspensionTrackBlockEntity.java index ecc7a76..2bde161 100644 --- a/src/main/java/edn/stratodonut/trackwork/tracks/blocks/SuspensionTrackBlockEntity.java +++ b/src/main/java/edn/stratodonut/trackwork/tracks/blocks/SuspensionTrackBlockEntity.java @@ -264,7 +264,7 @@ public void tick() { push(e, worldPos); float speed = Math.abs(this.getSpeed()); - if (speed > 1) e.hurt(TrackDamageSources.runOver(this.level), (speed / 8f) * AllConfigs.server().kinetics.crushingDamage.get()); + if (speed > TrackworkConfigs.server().damageSpeed.get()) e.hurt(TrackDamageSources.runOver(this.level), (speed / 8f) * AllConfigs.server().kinetics.crushingDamage.get()); if (e instanceof ServerPlayer p) p.connection.send(new ClientboundSetEntityMotionPacket(p)); } diff --git a/src/main/java/edn/stratodonut/trackwork/tracks/blocks/WheelBlockEntity.java b/src/main/java/edn/stratodonut/trackwork/tracks/blocks/WheelBlockEntity.java index 055c950..bdb640e 100644 --- a/src/main/java/edn/stratodonut/trackwork/tracks/blocks/WheelBlockEntity.java +++ b/src/main/java/edn/stratodonut/trackwork/tracks/blocks/WheelBlockEntity.java @@ -285,7 +285,7 @@ public void tick() { SuspensionTrackBlockEntity.push(e, worldPos); float speed = Math.abs(trackRPM); - if (speed > 1) e.hurt(TrackDamageSources.runOver(this.level), (speed / 16f) * AllConfigs.server().kinetics.crushingDamage.get()); + if (speed > TrackworkConfigs.server().damageSpeed.get()) e.hurt(TrackDamageSources.runOver(this.level), (speed / 16f) * AllConfigs.server().kinetics.crushingDamage.get()); if (e instanceof ServerPlayer p) p.connection.send(new ClientboundSetEntityMotionPacket(p)); }