From 5693605f31810dbfa2c71863e3aa3539339b7d5e Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 6 Jul 2021 11:10:11 -0400 Subject: [PATCH] Correct Bullet#scaleVelocity documentation --- core/src/mindustry/content/UnitTypes.java | 1 + core/src/mindustry/entities/bullet/BulletType.java | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index f5bf7274c1..42a0389f8d 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2155,6 +2155,7 @@ public class UnitTypes implements ContentList{ bullet = new EmpBulletType(){{ float rad = 100f; + scaleVelocity = true; lightOpacity = 0.7f; unitDamageScl = 0.8f; healPercent = 20f; diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 7ed52813a7..ebe84d0f24 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -93,7 +93,7 @@ public class BulletType extends Content implements Cloneable{ public boolean collides = true; /** Whether velocity is inherited from the shooter. */ public boolean keepVelocity = true; - /** Whether to scale velocity to disappear at the target position. Used for artillery. */ + /** Whether to scale lifetime (not actually velocity!) to disappear at the target position. Used for artillery. */ public boolean scaleVelocity; /** Whether this bullet can be hit by point defense. */ public boolean hittable = true; diff --git a/gradle.properties b/gradle.properties index 5aa6936a7b..95715623ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ kapt.include.compile.classpath=false kotlin.stdlib.default.dependency=false #needed for android compilation android.useAndroidX=true -archash=ca296ad37aeca186fcef3290bb8a6e9143bdd245 +archash=33c4976f8084fbb6fc26cfdcca2dda3442711d17