Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-11-06 13:34:57 -05:00
parent e7d7be2f57
commit fda2ed8b41
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/editor/MapEditorDialog.java
View File

@@ -681,7 +681,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
search.image(Icon.zoom).padRight(8); search.image(Icon.zoom).padRight(8);
search.field("", this::rebuildBlockSelection) search.field("", this::rebuildBlockSelection)
.name("editor/search").maxTextLength(maxNameLength).get().setMessageText("@players.search"); .name("editor/search").maxTextLength(maxNameLength).get().setMessageText("@players.search");
}).pad(5); }).pad(-2);
cont.row(); cont.row();
cont.table(Tex.underline, extra -> extra.labelWrap(() -> editor.drawBlock.localizedName).width(200f).center()).growX(); cont.table(Tex.underline, extra -> extra.labelWrap(() -> editor.drawBlock.localizedName).width(200f).center()).growX();
cont.row(); cont.row();
@@ -730,7 +730,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
} }
if(i == 0){ if(i == 0){
blockSelection.add("@none").padLeft(80f).padTop(10f); blockSelection.add("@none").color(Color.lightGray).padLeft(80f).padTop(10f);
} }
} }
} }

3
core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java
View File

@@ -6,6 +6,7 @@ import arc.math.*;
import arc.util.*; import arc.util.*;
import arc.util.io.*; import arc.util.io.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.entities.*; import mindustry.entities.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
@@ -102,7 +103,7 @@ public class TractorBeamTurret extends BaseTurret{
} }
if(status != StatusEffects.none){ if(status != StatusEffects.none){
target.apply(status, statusDuration) target.apply(status, statusDuration);
} }
//shoot when possible //shoot when possible