diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index fee355d..bdbd03a 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -18,7 +18,6 @@ setting.rangemax.name = Block Scan Range setting.panfix.name = Hold camera position for core camera ui. [lightgray](It shakes a lot when the player moves.)[] setting.scan.name = Display block scanner setting.range.name = Display turret range by block scanner -setting.select.name = Display select Arrow setting.infoui.name = Display info UI setting.weaponui.name = Display weapon info UI setting.commandedunitui.name = Display command info UI diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties index 4adeb03..e3d84d8 100644 --- a/assets/bundles/bundle_ko.properties +++ b/assets/bundles/bundle_ko.properties @@ -18,7 +18,6 @@ setting.rangemax.name = 블록 스캔 사거리 setting.panfix.name = 코어 UI용 카메라 고정 [lightgray](플레이어가 움직일 때 흔들림이 심합니다.)[] setting.scan.name = 블록 스캐너 표시 setting.range.name = 블록 스캐너로 포탑 사거리 표시 -setting.select.name = 선택 화살표 표시 setting.infoui.name = 정보 UI 표시 setting.weaponui.name = 무기 정보 UI 표시 setting.commandedunitui.name = 지휘 정보 UI 표시 diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java index cfe4148..5450e6c 100644 --- a/src/UnitInfo/core/HudUi.java +++ b/src/UnitInfo/core/HudUi.java @@ -81,30 +81,6 @@ public class HudUi { else return unit; } - public void setDraw(){ - Events.run(EventType.Trigger.draw, () -> { - if(!Core.settings.getBool("select")) return; - Unit unit = getUnit(); - unitFade = Mathf.lerpDelta(unitFade, Mathf.num(unit != null), 0.1f); - if(unit == null) return; - if(unit2 == null || (unit2.x == 0f && unit2.y == 0f)) unit2 = unit; - - Tmp.v1.set(unit2).lerp(unit, Mathf.clamp(Time.delta%60)); - if(Tmp.v1.x == unit.x && Tmp.v1.y == unit.y){ - hh += Time.delta; - unit2 = unit; - } - - for(int i = 0; i < 4; i++){ - float rot = i * 90f + 45f + (-Time.time) % 360f; - float length = unit.hitSize * 1.5f + (unitFade * 2.5f); - Draw.color(Tmp.c1.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time, 2f, 1f)).a(settings.getInt("uiopacity") / 100f)); - Draw.rect("select-arrow", Tmp.v1.x + Angles.trnsx(rot, length), Tmp.v1.y + Angles.trnsy(rot, length), length / 1.9f, length / 1.9f, rot - 135f); - Draw.reset(); - } - }); - } - public void addTable(){ mainTable = new Table(table -> { table.left(); diff --git a/src/UnitInfo/core/Main.java b/src/UnitInfo/core/Main.java index 0be17af..57f84e5 100644 --- a/src/UnitInfo/core/Main.java +++ b/src/UnitInfo/core/Main.java @@ -36,7 +36,6 @@ public class Main extends Mod { hud.addWaveTable(); hud.addUnitTable(); hud.addTable(); - hud.setDraw(); }); Events.on(WorldLoadEvent.class, e -> { diff --git a/src/UnitInfo/core/Setting.java b/src/UnitInfo/core/Setting.java index 62cfa40..fb5e025 100644 --- a/src/UnitInfo/core/Setting.java +++ b/src/UnitInfo/core/Setting.java @@ -160,7 +160,6 @@ public class Setting { addGraphicSetting("panfix"); addGraphicSetting("scan"); addGraphicSetting("range"); - addGraphicSetting("select"); addGraphicSetting("infoui"); addGraphicSetting("weaponui"); addGraphicSetting("commandedunitui"); @@ -168,7 +167,6 @@ public class Setting { addGraphicTypeSetting("wavemax", 100, "@editmaxwave","@invalid", 200); addGraphicTypeSetting("rangemax", 10, "@editrange","@invalid", 100); - ui.settings.graphics.sliderPref("selectopacity", 50, 0, 100, 5, s -> s + "%"); ui.settings.graphics.sliderPref("baropacity", 100, 0, 100, 5, s -> s + "%"); ui.settings.graphics.sliderPref("uiopacity", 50, 0, 100, 5, s -> s + "%"); ui.settings.graphics.sliderPref("uiscaling", 100, 0, 100, 5, s -> s + "%"); @@ -177,7 +175,6 @@ public class Setting { Core.settings.defaults("panfix", false); Core.settings.defaults("scan", true); Core.settings.defaults("range", false); - Core.settings.defaults("select", true); Core.settings.defaults("infoui", true); Core.settings.defaults("weaponui", true); Core.settings.defaults("commandedunitui", true);