From 3f93b5c63b0c6b0f31bf513cca8ad00dbb75a437 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 1 Oct 2018 12:45:24 -0400 Subject: [PATCH] Revenant stat changes --- core/src/io/anuke/mindustry/content/UnitTypes.java | 3 ++- core/src/io/anuke/mindustry/entities/Unit.java | 2 +- core/src/io/anuke/mindustry/entities/units/BaseUnit.java | 2 +- core/src/io/anuke/mindustry/entities/units/types/Revenant.java | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java index 2e0a85cb84..99575981f7 100644 --- a/core/src/io/anuke/mindustry/content/UnitTypes.java +++ b/core/src/io/anuke/mindustry/content/UnitTypes.java @@ -96,7 +96,8 @@ public class UnitTypes implements ContentList{ revenant = new UnitType("revenant", Revenant.class, Revenant::new){{ health = 250; - speed = 0.2f; + mass = 4f; + speed = 0.14f*mass; maxVelocity = 1.4f; drag = 0.01f; isFlying = true; diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java index 35399c7f5a..3120fdfda6 100644 --- a/core/src/io/anuke/mindustry/entities/Unit.java +++ b/core/src/io/anuke/mindustry/entities/Unit.java @@ -200,7 +200,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ return; float dst = distanceTo(t); if(dst > avoidRange) return; - velocity.add(moveVector.set(x, y).sub(t.getX(), t.getY()).setLength(1f * (1f - (dst / avoidRange)))); + velocity.add(moveVector.set(x, y).sub(t.getX(), t.getY()).setLength(1f * (1f - (dst / avoidRange)) / getMass())); }); } diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index 10fd736076..78035af666 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -306,7 +306,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } if(!Net.client()){ - avoidOthers(8f); + avoidOthers(4f + type.hitsize); if(spawner != -1 && (world.tile(spawner) == null || world.tile(spawner).entity == null)){ damage(health); diff --git a/core/src/io/anuke/mindustry/entities/units/types/Revenant.java b/core/src/io/anuke/mindustry/entities/units/types/Revenant.java index 65aa6d2c15..b2de68bdce 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Revenant.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Revenant.java @@ -3,4 +3,5 @@ package io.anuke.mindustry.entities.units.types; import io.anuke.mindustry.entities.units.FlyingUnit; public class Revenant extends FlyingUnit{ + }