From 34777458c1ae3971fe2657671db618adbb55ff85 Mon Sep 17 00:00:00 2001
From: Sharlotte <seeseafood@naver.com>
Date: Tue, 27 Jul 2021 17:52:07 +0900
Subject: [PATCH] h

---
 assets/bundles/bundle.properties    |  4 ++--
 assets/bundles/bundle_ko.properties |  4 ++--
 src/UnitInfo/core/Main.java         | 10 ++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
index 31ba180..365fb20 100644
--- a/assets/bundles/bundle.properties
+++ b/assets/bundles/bundle.properties
@@ -49,8 +49,8 @@ setting.rangeRadius.name = Near Range Margin
 setting.rangeRadius.description = set additional distances to show range.
 setting.allTeamRange.name = Display Team Range
 setting.allTeamRange.description = toggle to display all teams' range.
-setting.allTargetRange.name = Display All Range
-setting.allTargetRange.description = toggle to display all range whatever airTarget or groundTarget or having ammo etc.
+setting.allTargetRange.name = Display All Target Range
+setting.allTargetRange.description = toggle to display all range whatever airTarget or groundTarget etc.
 
 setting.autoShooting.name = Enable Auto Shooting
 setting.infoui.name = Display Info UI
diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties
index 29dfcab..c8bed39 100644
--- a/assets/bundles/bundle_ko.properties
+++ b/assets/bundles/bundle_ko.properties
@@ -43,8 +43,8 @@ setting.rangeRadius.name = 사거리 접근 거리
 setting.rangeRadius.description = 사거리를 표시할 추가 거리를 설정합니다.
 setting.allTeamRange.name = 팀 사거리 표시
 setting.allTeamRange.description = 모든 팀의 사거리를 표시합니다.
-setting.allTargetRange.name = 모든 사거리 표시
-setting.allTargetRange.description = 지상 공중 탄약 등 상관없이 모든 사거리를 표시합니다.
+setting.allTargetRange.name = 모든 목표물 사거리 표시
+setting.allTargetRange.description = 지상 공중 상관없이 모든 사거리를 표시합니다.
 
 
 setting.selectopacity.name = 선택 화살표 투명도
diff --git a/src/UnitInfo/core/Main.java b/src/UnitInfo/core/Main.java
index d2bcd25..5612dde 100644
--- a/src/UnitInfo/core/Main.java
+++ b/src/UnitInfo/core/Main.java
@@ -98,7 +98,7 @@ public class Main extends Mod {
                 Unit unit = player.unit();
                 Groups.build.each(e -> {
                     if (e.team == team) return; // Don't draw own turrets
-                    if (!(e instanceof BaseTurret.BaseTurretBuild )) return; // Not a turret
+                    if (!(e instanceof BaseTurret.BaseTurretBuild)) return; // Not a turret
                     if ((e instanceof Turret.TurretBuild t && !t.hasAmmo()) || !e.cons.valid()) return; // No ammo
 
                     boolean canHit = e.block instanceof Turret t ? unit.isFlying() ? t.targetAir : t.targetGround :
@@ -107,16 +107,14 @@ public class Main extends Mod {
 
 
                     if(Vars.player.dst(e) <= range + settings.getInt("rangeRadius") * tilesize + e.block.offset) {
-                        if (canHit || settings.getBool("allTargetRange"))
+                        if(canHit || settings.getBool("allTargetRange"))
                             Drawf.dashCircle(e.x, e.y, range, canHit ? e.team.color : Team.derelict.color);
                     }
                 });
 
                 // Unit Ranges (Only works when turret ranges are enabled)
-                if (!settings.getBool("unitRange")) {
-                    Groups.unit.each(u -> {
-                        if (u.team == team) return; // Don't draw own units
-
+                if(settings.getBool("unitRange")) {
+                    Groups.unit.each(u -> u.team == team, u -> { // Don't draw own units
                         boolean canHit = unit.isFlying() ? u.type.targetAir : u.type.targetGround;
                         float range = u.range();