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

Fixed #5695 / Fixed #5697

Browse Source
This commit is contained in:
Anuken
2021-08-04 09:26:39 -04:00
parent f820121e08
commit 909c64468f
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -769,10 +769,11 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
t.button(Icon.none, Styles.clearTogglei, () -> { t.button(Icon.none, Styles.clearTogglei, () -> {
sector.info.icon = null; sector.info.icon = null;
sector.info.contentIcon = null;
sector.saveInfo(); sector.saveInfo();
hide(); hide();
updateSelected(); updateSelected();
}).checked(sector.info.icon == null); }).checked(sector.info.icon == null && sector.info.contentIcon == null);
int cols = (int)Math.min(20, Core.graphics.getWidth() / Scl.scl(52f)); int cols = (int)Math.min(20, Core.graphics.getWidth() / Scl.scl(52f));
@@ -780,7 +781,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
for(var key : defaultIcons){ for(var key : defaultIcons){
var value = Icon.icons.get(key); var value = Icon.icons.get(key);
t.button(value, Styles.cleari, () -> { t.button(value, Styles.clearTogglei, () -> {
sector.info.icon = key; sector.info.icon = key;
sector.info.contentIcon = null; sector.info.contentIcon = null;
sector.saveInfo(); sector.saveInfo();
@@ -799,7 +800,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
i = 0; i = 0;
for(UnlockableContent u : content.getBy(ctype).<UnlockableContent>as()){ for(UnlockableContent u : content.getBy(ctype).<UnlockableContent>as()){
if(!u.isHidden() && u.unlocked()){ if(!u.isHidden() && u.unlocked()){
t.button(new TextureRegionDrawable(u.uiIcon), Styles.cleari, iconMed, () -> { t.button(new TextureRegionDrawable(u.uiIcon), Styles.clearTogglei, iconMed, () -> {
sector.info.icon = null; sector.info.icon = null;
sector.info.contentIcon = u; sector.info.contentIcon = u;
sector.saveInfo(); sector.saveInfo();

7
core/src/mindustry/world/blocks/campaign/PayloadLaunchPad.java
View File

@@ -21,7 +21,6 @@ import mindustry.logic.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.payloads.*;
import mindustry.world.consumers.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -61,12 +60,6 @@ public class PayloadLaunchPad extends PayloadBlock{
return !state.isCampaign() || net.client() ? SystemCursor.arrow : super.getCursor(); return !state.isCampaign() || net.client() ? SystemCursor.arrow : super.getCursor();
} }
//cannot be disabled
@Override
public float efficiency(){
return power != null && (block.consumes.has(ConsumeType.power) && !block.consumes.getPower().buffered) ? power.status : 1f;
}
@Override @Override
public boolean shouldConsume(){ public boolean shouldConsume(){
return true; return true;

2
gradle.properties
View File

@@ -8,4 +8,4 @@ kapt.include.compile.classpath=false
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false
#needed for android compilation #needed for android compilation
android.useAndroidX=true android.useAndroidX=true
archash=6c4631e2c715e93e10f96a258c307efbaf2564d3 archash=99749ad616e38f96932f863f284c3966c423855b