From 19d058a644adb4f5a47a016d15e831a9547ae8c9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 23 Apr 2018 19:14:52 -0400 Subject: [PATCH] More base unit types added --- .../mindustry/entities/units/types/Bomber.java | 10 ---------- .../anuke/mindustry/entities/units/types/Brute.java | 9 +++++++++ .../mindustry/entities/units/types/Eradicator.java | 4 ++++ .../mindustry/entities/units/types/Reaper.java | 1 + .../mindustry/entities/units/types/RepairDrone.java | 10 ---------- .../mindustry/entities/units/types/Sheller.java | 4 ++++ .../anuke/mindustry/entities/units/types/Vtol.java | 13 ++++++++++++- 7 files changed, 30 insertions(+), 21 deletions(-) delete mode 100644 core/src/io/anuke/mindustry/entities/units/types/Bomber.java create mode 100644 core/src/io/anuke/mindustry/entities/units/types/Brute.java create mode 100644 core/src/io/anuke/mindustry/entities/units/types/Eradicator.java delete mode 100644 core/src/io/anuke/mindustry/entities/units/types/RepairDrone.java create mode 100644 core/src/io/anuke/mindustry/entities/units/types/Sheller.java diff --git a/core/src/io/anuke/mindustry/entities/units/types/Bomber.java b/core/src/io/anuke/mindustry/entities/units/types/Bomber.java deleted file mode 100644 index d344e003d5..0000000000 --- a/core/src/io/anuke/mindustry/entities/units/types/Bomber.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.anuke.mindustry.entities.units.types; - -import io.anuke.mindustry.entities.units.FlyingUnitType; - -public class Bomber extends FlyingUnitType { - - public Bomber(String name) { - super(name); - } -} diff --git a/core/src/io/anuke/mindustry/entities/units/types/Brute.java b/core/src/io/anuke/mindustry/entities/units/types/Brute.java new file mode 100644 index 0000000000..85faf3f62f --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/units/types/Brute.java @@ -0,0 +1,9 @@ +package io.anuke.mindustry.entities.units.types; + +import io.anuke.mindustry.entities.units.GroundUnitType; + +public class Brute extends GroundUnitType { + public Brute(String name) { + super(name); + } +} diff --git a/core/src/io/anuke/mindustry/entities/units/types/Eradicator.java b/core/src/io/anuke/mindustry/entities/units/types/Eradicator.java new file mode 100644 index 0000000000..3dce0d6ae5 --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/units/types/Eradicator.java @@ -0,0 +1,4 @@ +package io.anuke.mindustry.entities.units.types; + +public class Eradicator { +} diff --git a/core/src/io/anuke/mindustry/entities/units/types/Reaper.java b/core/src/io/anuke/mindustry/entities/units/types/Reaper.java index 94c098c075..c76b31e5c7 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Reaper.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Reaper.java @@ -3,6 +3,7 @@ package io.anuke.mindustry.entities.units.types; import io.anuke.mindustry.entities.units.FlyingUnitType; public class Reaper extends FlyingUnitType { + public Reaper(String name) { super(name); } diff --git a/core/src/io/anuke/mindustry/entities/units/types/RepairDrone.java b/core/src/io/anuke/mindustry/entities/units/types/RepairDrone.java deleted file mode 100644 index f099addb36..0000000000 --- a/core/src/io/anuke/mindustry/entities/units/types/RepairDrone.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.anuke.mindustry.entities.units.types; - -import io.anuke.mindustry.entities.units.FlyingUnitType; - -public class RepairDrone extends FlyingUnitType { - - public RepairDrone(String name) { - super(name); - } -} diff --git a/core/src/io/anuke/mindustry/entities/units/types/Sheller.java b/core/src/io/anuke/mindustry/entities/units/types/Sheller.java new file mode 100644 index 0000000000..747415eda3 --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/units/types/Sheller.java @@ -0,0 +1,4 @@ +package io.anuke.mindustry.entities.units.types; + +public class Sheller { +} diff --git a/core/src/io/anuke/mindustry/entities/units/types/Vtol.java b/core/src/io/anuke/mindustry/entities/units/types/Vtol.java index 169425d090..1cb8140508 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Vtol.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Vtol.java @@ -1,11 +1,22 @@ package io.anuke.mindustry.entities.units.types; +import io.anuke.mindustry.entities.Unit; +import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.FlyingUnitType; +import io.anuke.ucore.graphics.Draw; public class Vtol extends FlyingUnitType { public Vtol(){ - super("flier"); + super("vtol"); } + @Override + public void draw(BaseUnit unit) { + Draw.alpha(unit.hitTime / Unit.hitDuration); + + Draw.rect(name, unit.x, unit.y, unit.rotation - 90); + + Draw.alpha(1f); + } }