From a80c5a1efaf2827041fd90736dc491363dee5bed Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 16 Sep 2018 22:30:06 -0400
Subject: [PATCH] Fixed artillery bullet not respecting range properly

---
 build.gradle                                     |  2 +-
 .../anuke/mindustry/entities/bullet/Bullet.java  | 16 ++++++++--------
 .../blocks/defense/turrets/ArtilleryTurret.java  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6fc22e7088..c715673843 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '39d511523f61b8464d7187a3bcd93ea17550712d'
+        uCoreVersion = '99b7a3af00a1fa7e48a494515bf6b137774e114b'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
index 3a04fc6d16..09a37e1960 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
@@ -16,6 +16,7 @@ import io.anuke.ucore.entities.impl.BulletEntity;
 import io.anuke.ucore.entities.trait.Entity;
 import io.anuke.ucore.entities.trait.SolidTrait;
 import io.anuke.ucore.entities.trait.VelocityTrait;
+import io.anuke.ucore.util.Mathf;
 import io.anuke.ucore.util.Pooling;
 import io.anuke.ucore.util.Timer;
 
@@ -23,13 +24,12 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import static io.anuke.mindustry.Vars.bulletGroup;
-import static io.anuke.mindustry.Vars.content;
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;
 
 public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncTrait, AbsorbTrait{
     private static Vector2 vector = new Vector2();
     public Timer timer = new Timer(3);
+    private float lifeScl;
     private Team team;
     private Object data;
     private boolean supressCollision, supressOnce, initialized;
@@ -68,7 +68,7 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
 
         bullet.team = team;
         bullet.type = type;
-        bullet.time(type.lifetime() * (1f - lifetimeScl));
+        bullet.lifeScl = lifetimeScl;
 
         //translate bullets backwards, purely for visual reasons
         float backDelta = Timers.delta();
@@ -95,10 +95,6 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
         create(type, null, Team.none, x, y, angle);
     }
 
-    public BulletType getBulletType(){
-        return type;
-    }
-
     public boolean collidesTiles(){
         return type.collidesTiles;
     }
@@ -231,6 +227,9 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
 
     @Override
     protected void updateLife(){
+        time += Timers.delta() * 1f/(lifeScl);
+        time = Mathf.clamp(time, 0, type.lifetime());
+
         if(time >= type.lifetime){
             if(!supressCollision) type.despawned(this);
             remove();
@@ -241,6 +240,7 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
     public void reset(){
         super.reset();
         timer.clear();
+        lifeScl = 1f;
         team = null;
         data = null;
         supressCollision = false;
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java
index ec2b56e27d..0dd8aa1e2e 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java
@@ -38,7 +38,7 @@ public class ArtilleryTurret extends ItemTurret{
 
         for(int i = 0; i < shots; i++){
             Bullet.create(ammo.bullet, tile.entity, tile.getTeam(), tile.drawx() + tr.x, tile.drawy() + tr.y,
-                    entity.rotation + Mathf.range(inaccuracy + type.inaccuracy), 1f + Mathf.range(velocityInaccuracy), Mathf.clamp(dst / maxTraveled));
+            entity.rotation + Mathf.range(inaccuracy + type.inaccuracy), 1f + Mathf.range(velocityInaccuracy), (dst / maxTraveled));
         }
 
         effects(tile);