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

Fixed shore world borders / Core size tweaks

Browse Source
This commit is contained in:
Anuken
2019-02-08 17:25:17 -05:00
parent ce3b0f2d8f
commit 22dad88ff7
6 changed files with 29 additions and 9734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/ruinousShores.mmap
View File

Binary file not shown.

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 509 B

After

Width:  |  Height:  |  Size: 509 B

9713
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 MiB

5
core/src/io/anuke/mindustry/content/Zones.java
View File

@@ -390,7 +390,7 @@ public class Zones implements ContentList{
}};
desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift")
.core(Blocks.coreFoundation).dist(2f)){{
.core(Blocks.coreNucleus).dist(2f)){{
deployCost = ItemStack.with(Items.copper, 2000);
startingItems = ItemStack.with(Items.copper, 1500);
itemRequirements = ItemStack.with(Items.copper, 8000, Items.metaglass, 2000, Items.graphite, 3000);
@@ -483,7 +483,8 @@ public class Zones implements ContentList{
*/
nuclearComplex = new Zone("nuclearComplex", new MapGenerator("nuclearProductionComplex", 1)
.drops(ItemStack.with(Items.copper, 2000, Items.lead, 1500, Items.silicon, 1000, Items.graphite, 1000, Items.thorium, 200, Items.titanium, 2000, Items.metaglass, 1000))
.decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.01))){{
.decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.01))
.core(Blocks.coreFoundation)){{
deployCost = ItemStack.with(Items.copper, 3000, Items.lead, 2000, Items.silicon, 1000, Items.metaglass, 500);
startingItems = ItemStack.with(Items.copper, 2500, Items.lead, 1500, Items.silicon, 800, Items.metaglass, 400);
itemRequirements = ItemStack.with(Items.copper, 10000, Items.titanium, 8000, Items.metaglass, 6000, Items.plastanium, 2000);

45
tools/src/io/anuke/mindustry/Generators.java
View File

@@ -26,7 +26,7 @@ public class Generators {
ImagePacker.generate("block-icons", () -> {
Image colors = new Image(256, 1);
Color outlineColor = new Color(0, 0, 0, 0.3f);
Color outlineColor = new Color(0, 0, 0, 0.2f);
for(Block block : content.blocks()){
TextureRegion[] regions = block.getGeneratedIcons();
@@ -36,28 +36,12 @@ public class Generators {
}
try{
Image image = ImagePacker.get(regions[0]);
for(TextureRegion region : regions){
image.draw(region);
}
if(regions.length > 1){
image.save(block.name + "-icon-full");
}
for(Icon icon : Icon.values()){
if(icon.size == 0 || (icon.size == image.width() && icon.size == image.height())) continue;
Image scaled = new Image(icon.size, icon.size);
scaled.drawScaled(image);
scaled.save(block.name + "-icon-" + icon.name());
}
Image last = null;
if(block.outlineIcon){
int radius = 3;
GenRegion region = (GenRegion)regions[regions.length-1];
Image base = ImagePacker.get(region);
Image out = new Image(region.getWidth(), region.getHeight());
Image out = last = new Image(region.getWidth(), region.getHeight());
for(int x = 0; x < out.width(); x++){
for(int y = 0; y < out.height(); y++){
@@ -92,6 +76,29 @@ public class Generators {
out.save(block.name);
}
Image image = ImagePacker.get(regions[0]);
int i = 0;
for(TextureRegion region : regions){
i ++;
if(i != regions.length || last == null){
image.draw(region);
}else{
image.draw(last);
}
}
if(regions.length > 1){
image.save(block.name + "-icon-full");
}
for(Icon icon : Icon.values()){
if(icon.size == 0 || (icon.size == image.width() && icon.size == image.height())) continue;
Image scaled = new Image(icon.size, icon.size);
scaled.drawScaled(image);
scaled.save(block.name + "-icon-" + icon.name());
}
Color average = new Color();
for(int x = 0; x < image.width(); x++){
for(int y = 0; y < image.height(); y++){