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

Added cliff support to editor

Browse Source
This commit is contained in:
Anuken
2021-09-05 20:08:02 -04:00
parent 508abba2ec
commit 4da21ba363
6 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@@ -363,6 +363,7 @@ publish.confirm = Are you sure you want to publish this?\n\n[lightgray]Make sure
publish.error = Error publishing item: {0} publish.error = Error publishing item: {0}
steam.error = Failed to initialize Steam services.\nError: {0} steam.error = Failed to initialize Steam services.\nError: {0}
editor.cliffs = Walls To Cliffs
editor.brush = Brush editor.brush = Brush
editor.openin = Open In Editor editor.openin = Open In Editor
editor.oregen = Ore Generation editor.oregen = Ore Generation

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

@@ -576,13 +576,11 @@ public class MapEditorDialog extends Dialog implements Disposable{
}).growX().top(); }).growX().top();
} }
if(experimental){ mid.row();
mid.row();
mid.table(t -> { mid.table(t -> {
t.button("Cliffs", Icon.terrain, Styles.cleart, editor::addCliffs).growX().margin(9f); t.button("@editor.cliffs", Icon.terrain, Styles.cleart, editor::addCliffs).growX().margin(9f);
}).growX().top(); }).growX().top();
}
}).margin(0).left().growY(); }).margin(0).left().growY();

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

@@ -10,6 +10,7 @@ import mindustry.content.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.environment.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -132,6 +133,11 @@ public class MapRenderer implements Disposable{
wall.editorVariantRegions()[Mathf.randomSeed(idxWall, 0, wall.editorVariantRegions().length - 1)] : wall.editorVariantRegions()[Mathf.randomSeed(idxWall, 0, wall.editorVariantRegions().length - 1)] :
wall.editorIcon(); wall.editorIcon();
if(wall == Blocks.cliff){
mesh.setColor(Tmp.c1.set(floor.mapColor).mul(1.6f));
region = ((Cliff)Blocks.cliff).editorCliffs[tile.data & 0xff];
}
offsetX = tilesize / 2f - region.width / 2f * Draw.scl; offsetX = tilesize / 2f - region.width / 2f * Draw.scl;
offsetY = tilesize / 2f - region.height / 2f * Draw.scl; offsetY = tilesize / 2f - region.height / 2f * Draw.scl;
}else if(wall == Blocks.air && !tile.overlay().isAir()){ }else if(wall == Blocks.air && !tile.overlay().isAir()){

2
core/src/mindustry/graphics/BlockRenderer.java
View File

@@ -150,7 +150,7 @@ public class BlockRenderer{
public void checkChanges(){ public void checkChanges(){
darkEvents.each(pos -> { darkEvents.each(pos -> {
var tile = world.tile(pos); var tile = world.tile(pos);
if(tile != null){ if(tile != null && tile.block().fillsTile){
tile.data = world.getWallDarkness(tile); tile.data = world.getWallDarkness(tile);
} }
}); });

1
core/src/mindustry/world/blocks/environment/Cliff.java
View File

@@ -9,6 +9,7 @@ import mindustry.world.*;
public class Cliff extends Block{ public class Cliff extends Block{
public float size = 11f; public float size = 11f;
public @Load(value = "cliffmask#", length = 256) TextureRegion[] cliffs; public @Load(value = "cliffmask#", length = 256) TextureRegion[] cliffs;
public @Load(value = "editor-cliffmask#", length = 256) TextureRegion[] editorCliffs;
public Cliff(String name){ public Cliff(String name){
super(name); super(name);

4
tools/src/mindustry/tools/Generators.java
View File

@@ -158,7 +158,9 @@ public class Generators{
} }
}); });
Fi.get("../blocks/environment/cliffmask" + (val & 0xff) + ".png").writePng(result); Fi fi = Fi.get("../blocks/environment/cliffmask" + (val & 0xff) + ".png");
fi.writePng(result);
fi.copyTo(Fi.get("../editor").child("editor-" + fi.name()));
}); });
} }