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

Fixed #7818

Browse Source
This commit is contained in:
Anuken
2022-11-04 11:23:02 -04:00
parent 07a1c6c2c4
commit 13d726108b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/core/World.java
+5
View File
@@ -300,6 +300,10 @@ public class World{
ObjectSet<UnlockableContent> content = new ObjectSet<>(); ObjectSet<UnlockableContent> content = new ObjectSet<>();
//resources can be outside area
boolean border = state.rules.limitMapArea;
state.rules.limitMapArea = false;
//TODO duplicate code? //TODO duplicate code?
for(Tile tile : tiles){ for(Tile tile : tiles){
if(getDarkness(tile.x, tile.y) >= 3){ if(getDarkness(tile.x, tile.y) >= 3){
@@ -312,6 +316,7 @@ public class World{
if(tile.wallDrop() != null) content.add(tile.wallDrop()); if(tile.wallDrop() != null) content.add(tile.wallDrop());
if(liquid != null) content.add(liquid); if(liquid != null) content.add(liquid);
} }
state.rules.limitMapArea = border;
state.rules.cloudColor = sector.planet.landCloudColor; state.rules.cloudColor = sector.planet.landCloudColor;
state.rules.env = sector.planet.defaultEnv; state.rules.env = sector.planet.defaultEnv;
core/src/mindustry/ui/dialogs/PlanetDialog.java
+1 -1
View File
@@ -1136,7 +1136,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
t.add("@sectors.resources").padRight(4); t.add("@sectors.resources").padRight(4);
for(UnlockableContent c : sector.info.resources){ for(UnlockableContent c : sector.info.resources){
if(c == null) continue; //apparently this is possible. if(c == null) continue; //apparently this is possible.
t.image(c.uiIcon).padRight(3).size(iconSmall); t.image(c.uiIcon).padRight(3).scaling(Scaling.fit).size(iconSmall);
} }
}).padLeft(10f).fillX().row(); }).padLeft(10f).fillX().row();
} }