From 1a125100814b33679863d895cabe24a34b187d7c Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Mon, 16 Aug 2021 08:15:20 -0400 Subject: [PATCH 1/2] Closes #5777 (#5779) I did a dumb --- core/src/mindustry/ai/formations/patterns/CircleFormation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ai/formations/patterns/CircleFormation.java b/core/src/mindustry/ai/formations/patterns/CircleFormation.java index 7cda7a4bb4..d905f40ea3 100644 --- a/core/src/mindustry/ai/formations/patterns/CircleFormation.java +++ b/core/src/mindustry/ai/formations/patterns/CircleFormation.java @@ -9,7 +9,7 @@ public class CircleFormation extends FormationPattern{ @Override public Vec3 calculateSlotLocation(Vec3 outLocation, int slotNumber){ if(slots > 1){ - float angle = (360f * slotNumber) / slots + slots == 8 ? 22.5f : 0; + 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{ From 59456b67a127eb526bf4c91d470e19abc7510656 Mon Sep 17 00:00:00 2001 From: JrTRinny <85090668+JrTRinny@users.noreply.github.com> Date: Mon, 16 Aug 2021 19:22:03 +0700 Subject: [PATCH 2/2] payload source and void descriptions (#5778) --- core/assets/bundles/bundle.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 06c77ad450..5bc7c38ed0 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1438,6 +1438,8 @@ block.item-source.description = Infinitely outputs items. Sandbox only. block.item-void.description = Destroys any items. Sandbox only. block.liquid-source.description = Infinitely outputs liquids. Sandbox only. block.liquid-void.description = Removes any liquids. Sandbox only. +block.payload-source.description = Infinitely outputs payloads. Sandbox only. +block.payload-void.description = Destroys any payloads. Sandbox only. block.copper-wall.description = Protects structures from enemy projectiles. block.copper-wall-large.description = Protects structures from enemy projectiles. block.titanium-wall.description = Protects structures from enemy projectiles.