From d50ae80b2c73ea2ae1bb594aa038d2a6b03b6627 Mon Sep 17 00:00:00 2001 From: Sharlotte Date: Sat, 24 Jul 2021 23:00:29 +0900 Subject: [PATCH] more setting --- README.md | 12 ------------ assets/bundles/bundle.properties | 2 ++ assets/bundles/bundle_ko.properties | 2 ++ src/UnitInfo/core/Main.java | 2 +- src/UnitInfo/core/Setting.java | 1 + 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 96677fb..87c2751 100644 --- a/README.md +++ b/README.md @@ -6,22 +6,15 @@ The display is located at the left side, although it is entirely possible to cha ### Unit Info Shows unit's name, the amount of armor, health, shields, ammo; transported items, controlled units, it's weapons and payload if possible. -- [x] shrink size - - [x] remove command part ### Wave Status Shows the amount of units relative for each wave. There is a setting to modify it. -- [x] fix padding bug -- [x] shows not only current, but next and previous waves as well ### Core Status Shows core's health and coordinates. You can move the screen to your core or just click the core icon. -- [x] remove "?" button -- [x] fix health bar position ### Tile Status Shows blocks, tiles, or overlay tiles and their respective location. -- [ ] add more info... ### hidden shows nothing @@ -32,17 +25,12 @@ r a i n b o w (toggleable throuh settings) ### block scanner Scans turret stats and outputs the info in a circle or linear view. (can toggle in settings) -- [ ] add filter setting to make scanner can scan not only turrret, wall but also another blocks. ### rendered block info Shows the information about any block (even if it's not in the same team), some info bars. (suggestion by @nichrosia) -- [ ] make it ### rendered unit info Shows health, ammo and shields under any unit. ## Setting can toggle display on/off ingame, set some ui opacity etc. -- [x] improve setting ui - - [x] separate setting because it's too many - - [x] add its description diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 3185694..26b1878 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -43,6 +43,8 @@ setting.rangemax.name = Block Scanner Range setting.rangemax.description = set scan radius of scanner.\nSelect the pencil and enter a number. setting.rangeNearby.name = Display Near Range setting.rangeNearby.description = toggle to display range circle when you approached enemy ranges. +setting.unitRange.name = Display Unit Range +setting.unitRange.description = toggle to display unit range too. setting.rangeRadius.name = Near Range Margin setting.rangeRadius.description = set additional distances to show range. setting.allTeamRange.name = Display Team Range diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties index ba5becc..5966247 100644 --- a/assets/bundles/bundle_ko.properties +++ b/assets/bundles/bundle_ko.properties @@ -37,6 +37,8 @@ setting.rangemax.name = 블록 스캐너 사거리 setting.rangemax.description = 연필 아이콘을 눌러서 스캐너 사거리를 설정합니다. setting.rangeNearby.name = 주변 사거리 표시 setting.rangeNearby.description = 적 사거리에 접근했을 경우 사거리를 표시합니다. +setting.unitRange.name = 유닛 사거리 표시 +setting.unitRange.description = 유닛 사거리도 표시합니다. setting.rangeRadius.name = 사거리 접근 거리 setting.rangeRadius.description = 사거리를 표시할 추가 거리를 설정합니다. setting.allTeamRange.name = 팀 사거리 표시 diff --git a/src/UnitInfo/core/Main.java b/src/UnitInfo/core/Main.java index 5e61c5c..3a749b0 100644 --- a/src/UnitInfo/core/Main.java +++ b/src/UnitInfo/core/Main.java @@ -112,7 +112,7 @@ public class Main extends Mod { if(settings.getBool("rangeNearby")) { Groups.all.each(entityc -> - (entityc instanceof BaseTurret.BaseTurretBuild || entityc instanceof Unit) && player != null + (entityc instanceof BaseTurret.BaseTurretBuild || (settings.getBool("unitRange") && entityc instanceof Unit)) && player != null && (settings.getBool("allTeamRange") || (player.team() != ((Ranged) entityc).team() && ((Ranged) entityc).team() != Team.derelict)), entityc -> { if(entityc instanceof Turret.TurretBuild && (settings.getBool("allTargetRange") || !(player.unit().isFlying() && ((Turret)((Turret.TurretBuild) entityc).block).targetAir || !(player.unit().isFlying()) && ((Turret)((Turret.TurretBuild) entityc).block).targetGround))) return; diff --git a/src/UnitInfo/core/Setting.java b/src/UnitInfo/core/Setting.java index cccc7ec..0fe733a 100644 --- a/src/UnitInfo/core/Setting.java +++ b/src/UnitInfo/core/Setting.java @@ -277,6 +277,7 @@ public class Setting { addGraphicCheckSetting("rangeNearby", true, scanSeq); addGraphicCheckSetting("allTeamRange", false, scanSeq); addGraphicCheckSetting("allTargetRange", false, scanSeq); + addGraphicCheckSetting("unitRange", false, scanSeq); addGraphicSlideSetting("rangeRadius", 5, 0, 20, 1, s -> s + "tiles", scanSeq); addGraphicDialogSetting("wavesetting", scanSeq, scanTable);