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

Fixed archipelago map / filters messing with block data

Browse Source
This commit is contained in:
Anuken
2020-10-22 18:11:12 -04:00
parent a773edd838
commit 4f21ea7799
4 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/archipelago.msav
View File

Binary file not shown.

BIN
core/assets/sprites/fallback/sprites5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 188 KiB

After

Width:  |  Height:  |  Size: 189 KiB

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 190 KiB

After

Width:  |  Height:  |  Size: 190 KiB

6
core/src/mindustry/editor/MapGenerateDialog.java
View File

@@ -135,8 +135,12 @@ public class MapGenerateDialog extends BaseDialog{
Tile tile = editor.tile(x, y); Tile tile = editor.tile(x, y);
GenTile write = writeTiles[x][y]; GenTile write = writeTiles[x][y];
//don't mess up synthetic stuff.
if(!tile.synthetic() && !content.block(write.block).synthetic()){
tile.setBlock(content.block(write.block));
}
tile.setFloor((Floor)content.block(write.floor)); tile.setFloor((Floor)content.block(write.floor));
tile.setBlock(content.block(write.block));
tile.setTeam(Team.get(write.team)); tile.setTeam(Team.get(write.team));
tile.setOverlay(content.block(write.ore)); tile.setOverlay(content.block(write.ore));
} }