From 74468855c2e4a66898f1463643badf3d02acb410 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Fri, 13 Aug 2021 17:45:12 -0400 Subject: [PATCH] Offset formations by 22.5 degrees when full (#5754) This stops the annoying "unit bumping" problem on servers (at least with full formations), removed the other 2 lines as they didnt actually do anything. Before: https://mee6.is-terrible.com/56YkB59o8.webm After: I really cant be bothered --- .../mindustry/ai/formations/patterns/CircleFormation.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/mindustry/ai/formations/patterns/CircleFormation.java b/core/src/mindustry/ai/formations/patterns/CircleFormation.java index 9636d97036..7cda7a4bb4 100644 --- a/core/src/mindustry/ai/formations/patterns/CircleFormation.java +++ b/core/src/mindustry/ai/formations/patterns/CircleFormation.java @@ -5,21 +5,17 @@ import arc.math.geom.*; import mindustry.ai.formations.*; public class CircleFormation extends FormationPattern{ - /** Angle offset. */ - public float angleOffset = 0; @Override public Vec3 calculateSlotLocation(Vec3 outLocation, int slotNumber){ if(slots > 1){ - float angle = (360f * slotNumber) / slots; + float angle = (360f * slotNumber) / slots + slots == 8 ? 22.5f : 0; float radius = spacing / (float)Math.sin(180f / slots * Mathf.degRad); outLocation.set(Angles.trnsx(angle, radius), Angles.trnsy(angle, radius), angle); }else{ outLocation.set(0, spacing * 1.1f, 360f * slotNumber); } - outLocation.z += angleOffset; - return outLocation; }