From 3f996cf2942eb88c91a398ac708bb888e1464825 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 18 Sep 2021 14:32:57 -0400 Subject: [PATCH] Better bullet range calc --- core/src/mindustry/entities/bullet/BulletType.java | 2 +- core/src/mindustry/entities/bullet/LiquidBulletType.java | 5 ----- gradle.properties | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 5fc19e4f20..a5eeca2d68 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -199,7 +199,7 @@ public class BulletType extends Content implements Cloneable{ /** Returns maximum distance the bullet this bullet type has can travel. */ public float range(){ - return Math.max(speed * lifetime * (1f - drag), maxRange); + return Mathf.zero(drag) ? speed * lifetime : Math.max(speed * (1f - Mathf.pow(1f - drag, lifetime)) / drag, maxRange); } /** @return continuous damage in damage/sec, or -1 if not continuous. */ diff --git a/core/src/mindustry/entities/bullet/LiquidBulletType.java b/core/src/mindustry/entities/bullet/LiquidBulletType.java index 7a788f69c5..65b06f5b9a 100644 --- a/core/src/mindustry/entities/bullet/LiquidBulletType.java +++ b/core/src/mindustry/entities/bullet/LiquidBulletType.java @@ -43,11 +43,6 @@ public class LiquidBulletType extends BulletType{ this(null); } - @Override - public float range(){ - return speed * lifetime / 2f; - } - @Override public void update(Bullet b){ super.update(b); diff --git a/gradle.properties b/gradle.properties index f3fc4af013..f436255355 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=e982971b17f48c13f3a18c344b8080b7498cccf6 +archash=c6da2092c281d948c7864f22385575184f82e4b4