From bc296728f97432e652509dd817f47cd7bfc2993c Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 27 Nov 2021 13:10:10 -0500 Subject: [PATCH] Erekir thorium + Minor visual tweaks --- .../blocks/drills/impact-drill-item.png | Bin 0 -> 712 bytes .../blocks/production/liquid-source.png | Bin 208 -> 0 bytes .../{production => sandbox}/item-source.png | Bin .../{production => sandbox}/item-void.png | Bin .../sprites/blocks/sandbox/liquid-source.png | Bin 0 -> 286 bytes .../{production => sandbox}/liquid-void.png | Bin .../sprites/blocks/sandbox/source-bottom.png | Bin 0 -> 121 bytes core/src/mindustry/content/Liquids.java | 5 ++--- .../maps/planet/ErekirPlanetGenerator.java | 5 +++++ .../world/blocks/liquid/LiquidBlock.java | 2 +- .../world/blocks/production/BurstDrill.java | 12 +++++------ .../world/blocks/sandbox/LiquidSource.java | 19 ++++++++++++++---- 12 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/drills/impact-drill-item.png delete mode 100644 core/assets-raw/sprites/blocks/production/liquid-source.png rename core/assets-raw/sprites/blocks/{production => sandbox}/item-source.png (100%) rename core/assets-raw/sprites/blocks/{production => sandbox}/item-void.png (100%) create mode 100644 core/assets-raw/sprites/blocks/sandbox/liquid-source.png rename core/assets-raw/sprites/blocks/{production => sandbox}/liquid-void.png (100%) create mode 100644 core/assets-raw/sprites/blocks/sandbox/source-bottom.png diff --git a/core/assets-raw/sprites/blocks/drills/impact-drill-item.png b/core/assets-raw/sprites/blocks/drills/impact-drill-item.png new file mode 100644 index 0000000000000000000000000000000000000000..a9ab1b27408d7f9f9eaad9f4426dc3de63f333d2 GIT binary patch literal 712 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+^D~{D12U7785lGsmQJ+x zW_A>5wO=fB(L+F2B_c=g=plyy0q7y)+NJ*OPwq3Y#d(js zpFMxRge`^dfq=Rf3vaVhc8aFJq*>F?Nc}z(dY|X@Bg3cpfrrH0XZ2LLyXbmdUvg#2 z3(udMri8rv|G6Y6dGXeF`#84P?|%1Np`v_YP}$x0$=BD;ad<5p^X&D%(vz8wg1;2S za?3TvXT01NH#I7?DoC@!y7`^!i@mMqo<@c3e?7;}At`v?3$}0k z2_D~mhu1Nz-q%Z0n0|TRor;B4q#hkY{Hu@fM5MaF^=_1I&!r~Gxv#3RzF|ae) zU9YvFL2nv^Zc{S9EaSE(mHL}f*f;-s9C=%i0T1}oeP>t0RvQ~R`~La!`z}Uh$DdD6 zn->>+@ai?zHBSq6^mi2g5ENXyHB9x(q-B+z9sLXHg+JCty@{QvtDw~8|IZ_B+D`pc zv8v1;u~XGFHlEnuc0V+u$wk8Gy85}Sb4q9e0C@E@ga7~l literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/liquid-source.png b/core/assets-raw/sprites/blocks/production/liquid-source.png deleted file mode 100644 index 0ae3a70f6fcb280c46dd0ae0d1cf6ee8066eeb84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}(>+}rLn>~)y}psR!GMRw z;XJ!)vH?pHx64_ED) z_`qtL_61^3g_@$K7ISpfOT9b1PCn$}xz68R47Z9n7qUg1wmkBm@w?4FCI%32;5}3# zxs*Z7-1vrE=9tO|U^YjCzmpCQhT!K0Gl^C`Z!ElEF>Kw3Oq{an^L HB{Ts5FrrEd diff --git a/core/assets-raw/sprites/blocks/production/item-source.png b/core/assets-raw/sprites/blocks/sandbox/item-source.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/item-source.png rename to core/assets-raw/sprites/blocks/sandbox/item-source.png diff --git a/core/assets-raw/sprites/blocks/production/item-void.png b/core/assets-raw/sprites/blocks/sandbox/item-void.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/item-void.png rename to core/assets-raw/sprites/blocks/sandbox/item-void.png diff --git a/core/assets-raw/sprites/blocks/sandbox/liquid-source.png b/core/assets-raw/sprites/blocks/sandbox/liquid-source.png new file mode 100644 index 0000000000000000000000000000000000000000..92693f920070815566571081736a004a47e7dd4d GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V7TGw z;usRqntW%&>jU*{HV=+AtN&QS$;8Pjx#yFQ$V@+0gI5eXIZ}WPY9lPG~#>yHzP&9be5XjzRm2icTMYdq6p>+OgN%;ez z%9EZj6v;aFJmulx;n9(J`|bG@ODAg&mi0EfY9$m4jvGyps6N4TLuz@%;s&w416PfX q&175glB4Eq(XosB9(I&7Fl^~}xchnGVG9NZ1_n=8KbLh*2~7a;>vNj` literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/liquid-void.png b/core/assets-raw/sprites/blocks/sandbox/liquid-void.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/liquid-void.png rename to core/assets-raw/sprites/blocks/sandbox/liquid-void.png diff --git a/core/assets-raw/sprites/blocks/sandbox/source-bottom.png b/core/assets-raw/sprites/blocks/sandbox/source-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a2dd7b5e0cfcac960eaafb2f8ecec1335a10aa05 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U@-P{ zaSVxQeS6N3k->oD$bsdbZVCR6>f)K!-57KCx_$TDvz81fz+n>4UT!9JorO9dK;oXR KelF{r5}E)Z86a)| literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index fbee647b00..d4411b9d0e 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -72,13 +72,12 @@ public class Liquids implements ContentList{ }}; //TODO combustion - hydrogen = new Liquid("hydrogen", Color.valueOf("b8c2fc")){{ + hydrogen = new Liquid("hydrogen", Color.valueOf("9eabf7")){{ gas = true; - barColor = Color.valueOf("a3b0ff"); flammability = 1f; }}; - nitrogen = new Liquid("nitrogen", Color.valueOf("e2cffa")){{ + nitrogen = new Liquid("nitrogen", Color.valueOf("efe3ff")){{ gas = true; }}; diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 138d078a46..fa1c163d1b 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -189,6 +189,11 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ if(empty && noise(x + 150, y + x*2 + 100, 4, 0.8f, 40f, 1f) > 0.71f/* && floor == Blocks.yellowStone*/){ ore = Blocks.oreTungsten; } + + //TODO design ore generation so it doesn't overlap + if(empty && noise(x + 999, y + 600, 4, 0.63f, 37f, 1f) < 0.25f/* && floor == Blocks.yellowStone*/){ + ore = Blocks.oreThorium; + } } }); diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBlock.java b/core/src/mindustry/world/blocks/liquid/LiquidBlock.java index a73d85d506..977da2f3b2 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidBlock.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidBlock.java @@ -37,7 +37,7 @@ public class LiquidBlock extends Block{ TextureRegion toDraw = Tmp.tr1; float bounds = size/2f * tilesize - padding; - Color color = Tmp.c1.set(liquid.color).mul(liquid.gas ? 1f : 1f).a(1f); + Color color = Tmp.c1.set(liquid.color).a(1f); for(int sx = 0; sx < size; sx++){ for(int sy = 0; sy < size; sy++){ diff --git a/core/src/mindustry/world/blocks/production/BurstDrill.java b/core/src/mindustry/world/blocks/production/BurstDrill.java index c7539ae2b8..b430269501 100644 --- a/core/src/mindustry/world/blocks/production/BurstDrill.java +++ b/core/src/mindustry/world/blocks/production/BurstDrill.java @@ -92,12 +92,6 @@ public class BurstDrill extends Drill{ Draw.rect(region, x, y); drawDefaultCracks(); - if(dominantItem != null && drawMineItem){ - Draw.color(dominantItem.color); - Draw.rect(itemRegion, x, y); - Draw.color(); - } - Draw.rect(topRegion, x, y); if(invertTime > 0){ Draw.alpha(Interp.pow3Out.apply(invertTime)); @@ -105,6 +99,12 @@ public class BurstDrill extends Drill{ Draw.color(); } + if(dominantItem != null && drawMineItem){ + Draw.color(dominantItem.color); + Draw.rect(itemRegion, x, y); + Draw.color(); + } + float fract = smoothProgress; int arrows = 3; Draw.color(arrowColor); diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java index 4a10160a4b..f47dd82c68 100644 --- a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java @@ -4,16 +4,20 @@ import arc.graphics.g2d.*; import arc.scene.ui.layout.*; import arc.util.*; import arc.util.io.*; +import mindustry.annotations.Annotations.*; import mindustry.entities.units.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.*; +import mindustry.world.blocks.liquid.*; import mindustry.world.meta.*; import static mindustry.Vars.*; public class LiquidSource extends Block{ + public @Load("cross") TextureRegion crossRegion; + public @Load("source-bottom") TextureRegion bottomRegion; public LiquidSource(String name){ super(name); @@ -45,6 +49,11 @@ public class LiquidSource extends Block{ drawRequestConfigCenter(plan, plan.config, "center", true); } + @Override + public TextureRegion[] icons(){ + return new TextureRegion[]{bottomRegion, region}; + } + public class LiquidSourceBuild extends Building{ public @Nullable Liquid source = null; @@ -62,13 +71,15 @@ public class LiquidSource extends Block{ public void draw(){ super.draw(); + Draw.rect(bottomRegion, x, y); + if(source == null){ - Draw.rect("cross", x, y); + Draw.rect(crossRegion, x, y); }else{ - Draw.color(source.color); - Draw.rect("center", x, y); - Draw.color(); + LiquidBlock.drawTiledFrames(size, x, y, 0f, source, 1f); } + + Draw.rect(block.region, x, y); } @Override