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

Fixed #8787

Browse Source
This commit is contained in:
Anuken
2023-07-23 15:19:21 -04:00
parent 05874ad3e2
commit 135874b922
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View File

@@ -1315,6 +1315,7 @@ public class Blocks{
researchCostMultiplier = 10f; researchCostMultiplier = 10f;
group = BlockGroup.heat;
size = 3; size = 3;
drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput(), new DrawHeatInput("-heat")); drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput(), new DrawHeatInput("-heat"));
regionRotated1 = 1; regionRotated1 = 1;
@@ -1325,6 +1326,7 @@ public class Blocks{
researchCostMultiplier = 10f; researchCostMultiplier = 10f;
group = BlockGroup.heat;
size = 3; size = 3;
drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput(-1, false), new DrawHeatOutput(), new DrawHeatOutput(1, false), new DrawHeatInput("-heat")); drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput(-1, false), new DrawHeatOutput(), new DrawHeatOutput(1, false), new DrawHeatInput("-heat"));
regionRotated1 = 1; regionRotated1 = 1;

2
core/src/mindustry/input/InputHandler.java
View File

@@ -489,7 +489,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
throw new ValidateException(player, "Player cannot configure a tile."); throw new ValidateException(player, "Player cannot configure a tile.");
} }
build.configured(player == null || player.dead() ? null : player.unit(), value); build.configured(player == null || player.dead() ? null : player.unit(), value);
Core.app.post(() -> Events.fire(new ConfigEvent(build, player, value))); Events.fire(new ConfigEvent(build, player, value));
} }
//only useful for servers or local mods, and is not replicated across clients //only useful for servers or local mods, and is not replicated across clients

11
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@@ -259,14 +259,9 @@ public class CustomRulesDialog extends BaseDialog{
} }
t.button("@rules.anyenv", style, () -> { t.button("@rules.anyenv", style, () -> {
if(!rules.infiniteResources){ rules.env = Vars.defaultEnv;
//unlocalized for now rules.hiddenBuildItems.clear();
ui.showInfo("The 'any' environment can only be used in sandbox mode."); rules.planet = Planets.sun;
}else{
rules.env = Vars.defaultEnv;
rules.hiddenBuildItems.clear();
rules.planet = Planets.sun;
}
}).group(group).checked(b -> rules.planet == Planets.sun); }).group(group).checked(b -> rules.planet == Planets.sun);
}).left().fill(false).expand(false, false).row(); }).left().fill(false).expand(false, false).row();

2
core/src/mindustry/world/draw/DrawTurret.java
View File

@@ -37,7 +37,7 @@ public class DrawTurret extends DrawBlock{
part.getOutlines(out); part.getOutlines(out);
} }
if(block.region.found() && !(block.outlinedIcon > 0 && block.getGeneratedIcons()[block.outlinedIcon].equals(block.region))){ if(block.region.found() && !(block.outlinedIcon > 0 && block.outlinedIcon < block.getGeneratedIcons().length && block.getGeneratedIcons()[block.outlinedIcon].equals(block.region))){
out.add(block.region); out.add(block.region);
} }

2
core/src/mindustry/world/meta/BlockGroup.java
View File

@@ -1,7 +1,7 @@
package mindustry.world.meta; package mindustry.world.meta;
public enum BlockGroup{ public enum BlockGroup{
none, walls(true), projectors(true), turrets(true), transportation(true), power, liquids(true), drills, units, logic(true), payloads(true); none, walls(true), projectors(true), turrets(true), transportation(true), power, liquids(true), drills, units, logic(true), payloads(true), heat(true);
/** if true, any block in this category replaces any other block in this category. */ /** if true, any block in this category replaces any other block in this category. */
public final boolean anyReplace; public final boolean anyReplace;