From c7d735bf56c1717aa2aa58efe1bcd28ba44ccc86 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 17 Aug 2019 11:23:49 -0400 Subject: [PATCH] Fixed moving unit target prediction --- core/assets/sounds/explosion.ogg | Bin 16027 -> 10787 bytes .../io/anuke/mindustry/entities/Predict.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/sounds/explosion.ogg b/core/assets/sounds/explosion.ogg index 7c7f2c43dac0156c00c4240db39b80d3236129ca..5f4a69281d6e8fadda178f86f603b7bcdc4bfd7f 100644 GIT binary patch literal 10787 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 literal 16027 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 diff --git a/core/src/io/anuke/mindustry/entities/Predict.java b/core/src/io/anuke/mindustry/entities/Predict.java index c4143a80b8..ef385cbd26 100644 --- a/core/src/io/anuke/mindustry/entities/Predict.java +++ b/core/src/io/anuke/mindustry/entities/Predict.java @@ -55,7 +55,7 @@ public class Predict{ * See {@link #intercept(float, float, float, float, float, float, float)}. */ public static Vector2 intercept(TargetTrait src, TargetTrait dst, float v){ - return intercept(src.getX(), src.getY(), dst.getX(), dst.getY(), dst.getTargetVelocityX() - src.getTargetVelocityX(), dst.getTargetVelocityY() - src.getTargetVelocityY(), v); + return intercept(src.getX(), src.getY(), dst.getX(), dst.getY(), dst.getTargetVelocityX() - src.getTargetVelocityX()/2f, dst.getTargetVelocityY() - src.getTargetVelocityY()/2f, v); } private static Vector2 quad(float a, float b, float c){