🔥 移除showMineBeam和unitBarDrawMinHealth设置

Author: way-zer

assets/bundles/bundle-mdtx.properties

@@ -267,7 +267,6 @@ setting.superUnitEffect.name = [pink]玩家特效射程
 setting.turretAlertRange.name = [acid]炮台[white]：警告范围
 setting.turretForceShowRange.name = [acid]炮台[white]：强制显示射程  [gray]可用于在编辑器下显示射程
 setting.turretShowRange.name = [acid]炮台[white]：射程
-setting.unitBarDrawMinHealth.name = [acid]单位属性[white]：最低血量
 setting.unitDrawMinHealth.name = [cyan]单位显示[white]：最低血量
 setting.unitHealthBar.name = [acid]单位属性
 setting.unitItemCarried.name = [acid]单位携带的物品

assets/bundles/bundle-mdtx_en.properties

@@ -255,7 +255,6 @@ setting.superUnitEffect.name = [pink]Player Effect Range
 setting.turretAlertRange.name = [acid]Turret [white]: Alert Range
 setting.turretForceShowRange.name = [acid]Turret [white]: Force Show Range [gray]Can be used to show range in editor
 setting.turretShowRange.name = [acid]Turret [white]: Range
-setting.unitBarDrawMinHealth.name = [acid]Unit Attributes [white]: Minimum Health
 setting.unitDrawMinHealth.name = [cyan]Unit Display [white]: Minimum Health
 setting.unitHealthBar.name = [acid]Unit Attributes
 setting.unitItemCarried.name = [acid]Unit Carried Items

src/mindustryX/features/ArcOld.java

@@ -70,7 +70,6 @@ public static void init(Seq<LazySettingsCategory> categories){
 
             c.addCategory("arcAddUnitInfo");
             c.checkPref("unitHealthBar", false);
-            c.sliderPref("unitBarDrawMinHealth", settings.getInt("minhealth_unithealthbarshown", 0), 0, 2500, 100, i -> i + "[red]HP");
 
 
             c.sliderPref("unitWeaponRange", settings.getInt("unitAlertRange", 0), 0, 30, 1, s -> switch(s){

src/mindustryX/features/Settings.java

@@ -82,7 +82,6 @@ public static void addSettings(){
 
             c.addCategory("entitySettings");
             c.checkPref("bulletShow", true);
-            c.checkPref("showMineBeam".toLowerCase(), true);
             c.checkPref("noPlayerHitBox", false);
             c.checkPref("payloadpreview", true);
             c.checkPref("unithitbox", false);

src/mindustryX/features/draw/ArcUnits.java

@@ -22,7 +22,6 @@
 public class ArcUnits{
     private static final int maxBuildPlans = 100;
     private static boolean alwaysShowUnitRTSAi, unitHealthBar, unitLogicMoveLine, unitLogicTimerBars, unithitbox, unitBuildPlan;
-    private static float minHealthDrawStat;
     private static float unitWeaponRange, unitWeaponRangeAlpha;
     public static boolean selectedUnitsFlyer, selectedUnitsLand;
 
@@ -40,8 +39,6 @@ public class ArcUnits{
             unithitbox = Core.settings.getBool("unithitbox");
             unitBuildPlan = Core.settings.getBool("unitbuildplan");
 
-            minHealthDrawStat = Core.settings.getInt("unitBarDrawMinHealth");
-
             unitWeaponRange = Core.settings.getInt("unitWeaponRange") * tilesize;
             unitWeaponRangeAlpha = Core.settings.getInt("unitWeaponRangeAlpha") / 100f;
 
@@ -61,20 +58,18 @@ public static void draw(Unit unit){
             if(unitTargetType > 0) drawAimTarget(unit);
             if(arcBuildInfo && unit.isLocal()) drawBuildRange();
         }
-        if((RenderExt.unitHideExcludePlayers && unit.isPlayer()) || (unit.maxHealth + unit.shield) >= minHealthDrawStat){
-            Draw.z(Draw.z() + 0.1f);
-            if(unit.team() == player.team() || RenderExt.showOtherInfo){
-                if(unitWeaponRange > 0) drawWeaponRange(unit);
-                if(alwaysShowUnitRTSAi) drawRTSAI(unit);
-                if(unitHealthBar) drawHealthBar(unit);
-                if(unit.controller() instanceof LogicAI ai){
-                    if(unitLogicMoveLine) drawLogicMove(unit, ai);
-                    if(unitLogicTimerBars) drawLogicTimer(unit, ai);
-                }
-                if(unitBuildPlan) drawBuildPlan(unit);
+        Draw.z(Draw.z() + 0.1f);
+        if(unit.team() == player.team() || RenderExt.showOtherInfo){
+            if(unitWeaponRange > 0) drawWeaponRange(unit);
+            if(alwaysShowUnitRTSAi) drawRTSAI(unit);
+            if(unitHealthBar) drawHealthBar(unit);
+            if(unit.controller() instanceof LogicAI ai){
+                if(unitLogicMoveLine) drawLogicMove(unit, ai);
+                if(unitLogicTimerBars) drawLogicTimer(unit, ai);
             }
-            if(unithitbox) drawHitBox(unit);
+            if(unitBuildPlan) drawBuildPlan(unit);
         }
+        if(unithitbox) drawHitBox(unit);
     }
 
     private static void drawAimRange(Unit unit){

src/mindustryX/features/ui/toolTable/HudSettingsTable.java

@@ -105,7 +105,6 @@ protected void rebuild(){
         });
         checkPref("unitHealthBar");
         sliderPref("unitDrawMinHealth", 0, 2500, 50, i -> i + "[red]HP");
-        sliderPref("unitBarDrawMinHealth", 0, 2500, 100, i -> i + "[red]HP");
         sliderPref("unitWeaponRange", 0, 100, 1, i -> i > 0 ? i + "%" : "关闭");
 
         checkPref("alwaysShowUnitRTSAi");