diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 1c73826a7b..c971d153a9 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -4296,7 +4296,7 @@ public class Blocks{ pierceCap = 2; fragOnHit = false; speed = 5f; - damage = 170f; + damage = 180f; lifetime = 80f; width = height = 16f; backColor = Pal.surge; @@ -4398,10 +4398,10 @@ public class Blocks{ lustre = new ContinuousTurret("lustre"){{ requirements(Category.turret, with(Items.silicon, 250, Items.graphite, 200, Items.oxide, 50, Items.carbide, 90)); - range = 130f; + range = 140f; shootType = new PointLaserBulletType(){{ - damage = 180f; + damage = 190f; buildingDamageMultiplier = 0.3f; hitColor = Color.valueOf("fda981"); }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 5e8a449242..be031eff2a 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2509,7 +2509,7 @@ public class UnitTypes{ weapons.add(new Weapon("locus-weapon"){{ shootSound = Sounds.bolt; layerOffset = 0.0001f; - reload = 12f; + reload = 14f; shootY = 10f; recoil = 1f; rotate = true; @@ -2587,7 +2587,7 @@ public class UnitTypes{ weapons.add(new Weapon("precept-weapon"){{ shootSound = Sounds.dullExplosion; layerOffset = 0.0001f; - reload = 85f; + reload = 80f; shootY = 16f; recoil = 3f; rotate = true; @@ -2598,7 +2598,7 @@ public class UnitTypes{ y = -1f; heatColor = Color.valueOf("f9350f"); cooldownTime = 30f; - bullet = new BasicBulletType(7f, 110){{ + bullet = new BasicBulletType(7f, 120){{ sprite = "missile-large"; width = 7.5f; height = 13f; @@ -3527,7 +3527,7 @@ public class UnitTypes{ shadowElevation = 0.1f; drag = 0.07f; - speed = 2f; + speed = 1.8f; rotateSpeed = 5f; accel = 0.09f; diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index eef20f54e3..1c15e83f71 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -38,6 +38,7 @@ public class EventType{ socketConfigChanged, update, unitCommandChange, + unitCommandAttack, importMod, draw, drawOver, diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 8c55cbf32e..e26751bf81 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -827,6 +827,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ ids[i] = selectedUnits.get(i).id; } + if(attack != null){ + Events.fire(Trigger.unitCommandAttack); + } + Call.commandUnits(player, ids, attack instanceof Building b ? b : null, attack instanceof Unit u ? u : null, target); } diff --git a/core/src/mindustry/service/Achievement.java b/core/src/mindustry/service/Achievement.java index 7faeb19726..8c993ab409 100644 --- a/core/src/mindustry/service/Achievement.java +++ b/core/src/mindustry/service/Achievement.java @@ -36,7 +36,7 @@ public enum Achievement{ obtainTitanium, suicideBomb, buildGroundFactory, - issueAttackCommand, + issueAttackCommand, //TODO change desc active100Units(SStat.maxUnitActive, 100), build1000Units(SStat.unitsBuilt, 1000), buildAllUnits(SStat.unitTypesBuilt, 30), diff --git a/core/src/mindustry/service/GameService.java b/core/src/mindustry/service/GameService.java index 10bb516951..6624f26d55 100644 --- a/core/src/mindustry/service/GameService.java +++ b/core/src/mindustry/service/GameService.java @@ -113,6 +113,12 @@ public class GameService{ captureAllSectors.complete(); } + Events.run(Trigger.unitCommandAttack, () -> { + if(campaign()){ + issueAttackCommand.complete(); + } + }); + Events.on(UnitDestroyEvent.class, e -> { if(campaign()){ if(e.unit.team != Vars.player.team()){ diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index d266e5cb9a..8919018d38 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -176,7 +176,7 @@ public class Conveyor extends Block implements Autotiler{ @Override public void payloadDraw(){ - Draw.rect(block.fullIcon,x, y); + Draw.rect(block.fullIcon, x, y); } @Override