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!ia0vp^4Is?H1|$#LC7xzrV9d{Sb`Ho)PG(@xm{>Z|+MC%? zq}6`0&_xdcU6qI&!J~&90tCE!U1uo>DgVeSyKd8>qPLqsgl!7cOP_@D7|Tin#B)T$uO3hU-~t}phso_iVDF{Zz54 z%pb8+)igGq*xzile#j~bYR9D9C-g0)zOoqEVJue*Y@7S?(ckEt0obConls%JOaX6uT T-_aMpLCQQ`{an^LB{Ts5c=a@d 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!ia0vp^3LwnE1|*BCs=ffJ>7Fi*Ar-gYUf;;uV8FxTaGqT? z*?=X9+vP07m5?_KzguQ$lqDT^5s9zy{KvJVCd2-mLTcppRZq^TGt}{NTz?`Yd|%J8%B1xS5W@I1R@J;SQNSG)#ii}V@d+!#D689txld)t!qQwgNS)78&qol`;+ E05GCT3IG5A 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 zcmV+(0pb3MP)Px#*hxe|R9J;$+_3Awe+E3@#e*mKqzM8E1sS~ZOca?;1u*IW7JQQalKUALBq_Dx zHp9l}jyPp;hJe51eoAd7$}Fr7pr+-7%*1d2EiA`pHVZ~R#}Vg@x{ZvaSoZ&NJ=XFC z-9Dmn0jZXgqKBXZ$g!Lhy@RhDxVr8QT^%ssAu#HIQ3s4VVAKHw9dM;F8*i%_AHY>3 zlH>q#9YKuc3=9kmEEw(f=ae}@J4ghtJi2`tA#leslo)%+0@xa-SfhXzj=miV;fQwt0JM)l-SeTtH~;_u07*qoM6N<$g7NEfn*aa+ 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!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}#-1*YArY-_ z&lxf@7;qdpu>8|4!T(WRJkz=xWA0wJ@1A?s5~vCZI85T%%gv;&vry*)NYvBS&t;uc GLK6TX86a)| 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