diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index aa80b61182..09784f50a4 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -74,7 +74,7 @@ public class UnitTypes implements ContentList{ hitsize = 9f; range = 10f; health = 500; - armor = 2f; + armor = 3f; immunities.add(StatusEffects.burning); @@ -107,7 +107,7 @@ public class UnitTypes implements ContentList{ rotateSpeed = 3f; targetAir = false; health = 790; - armor = 5f; + armor = 8f; weapons.add(new Weapon("artillery"){{ y = 1f; @@ -167,7 +167,7 @@ public class UnitTypes implements ContentList{ hitsize = 10f; health = 300f; buildSpeed = 0.9f; - armor = 3f; + armor = 4f; mineTier = 2; mineSpeed = 5f; @@ -209,7 +209,7 @@ public class UnitTypes implements ContentList{ health = 640f; buildSpeed = 1.7f; canBoost = true; - armor = 6f; + armor = 9f; landShake = 2f; speed = 0.4f; @@ -321,7 +321,7 @@ public class UnitTypes implements ContentList{ legMoveSpace = 1.4f; legBaseOffset = 2f; hovering = true; - armor = 3f; + armor = 5f; buildSpeed = 0.75f; diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 501ad22c6d..6d211e7860 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -144,7 +144,6 @@ public class UnitType extends UnlockableContent{ if(unit.deactivated){ table.table(d -> { d.left(); - d.label(() -> Core.bundle.format("bar.limitreached", unit.count(), unit.cap(), Fonts.getUnicodeStr(name))); }).left().visible(() -> unit.deactivated); } diff --git a/core/src/mindustry/world/blocks/distribution/Router.java b/core/src/mindustry/world/blocks/distribution/Router.java index d7b9281831..2f88c5c9a7 100644 --- a/core/src/mindustry/world/blocks/distribution/Router.java +++ b/core/src/mindustry/world/blocks/distribution/Router.java @@ -43,6 +43,11 @@ public class Router extends Block{ } } + @Override + public int acceptStack(Item item, int amount, Teamc source){ + return 0; + } + @Override public boolean acceptItem(Building source, Item item){ return team == source.team() && lastItem == null && items.total() == 0;