From a5eda4fb2e3571543385c69510382cfdc8e8d2e7 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Wed, 10 May 2023 10:10:48 -0700 Subject: [PATCH] Horizontal shifting of pistons (also adds proper icons for pistons) (#8345) * Horizontal offset for pistons * might as well fix icons in the meantime * Make a positive offset shift to the right --- .../chemical-combustion-chamber-piston-icon.png | Bin 0 -> 784 bytes .../power/pyrolysis-generator-piston-icon.png | Bin 0 -> 1115 bytes .../production/spore-press-piston-icon.png | Bin 0 -> 464 bytes core/src/mindustry/world/draw/DrawPistons.java | 15 +++++++++++---- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston-icon.png create mode 100644 core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston-icon.png create mode 100644 core/assets-raw/sprites/blocks/production/spore-press-piston-icon.png diff --git a/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston-icon.png b/core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..72343d52949581ce94f7de8cae5762a769807772 GIT binary patch literal 784 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 FCIDUp=>Px# literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/spore-press-piston-icon.png b/core/assets-raw/sprites/blocks/production/spore-press-piston-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..921a96ef36371b6ae8857bfab01929af3ac806c7 GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z}V&K z;uumf=j|;+FJ?yx)(6Ww;tn1<cE8H^LVY&k%nhe!um7a4Q`4tx^(B_?N6r5qSI-}N6vvRjp4!6h!OCFI zy!jCGlGO)_wwjqA+I{=w{ry}ne}yC-zMQtY^u%0VB``2r^hh`3cFDt+Zv`ixJo>JB z>-}xZ%BL@Xo?cODr^gqyS$N^Lmu2-CyK7CwSNPi3gv@f8&AQ~_;#=M)TKkJs--sr( z_GjrPYSg4mb&&45mbAX%_3z1V+5%sv&5-lXJd~5$_DnKiYC!gnj1?_+rYigv^6*|^ zTQfzw@$1RW9bgcVRpIjNzP-xQ<4^X8`y4*5s9pTPNxEy9@Ut)3`BRwI99ScChg*X+ zb;^T%>{IM27*8etGz?hBv{Pu$Vdf*>8NnX9wT# list){ - + Draw.rect(iconRegion, plan.drawx(), plan.drawy()); } @Override @@ -32,7 +32,8 @@ public class DrawPistons extends DrawBlock{ Draw.yscl = -1f; } - Draw.rect(reg, build.x + Angles.trnsx(angle, len), build.y + Angles.trnsy(angle, len), angle); + Tmp.v1.trns(angle, len, -horiOffset); + Draw.rect(reg, build.x + Tmp.v1.x, build.y + Tmp.v1.y, angle); Draw.yscl = 1f; } @@ -45,5 +46,11 @@ public class DrawPistons extends DrawBlock{ region1 = Core.atlas.find(block.name + suffix + "0", block.name + suffix); region2 = Core.atlas.find(block.name + suffix + "1", block.name + suffix); regiont = Core.atlas.find(block.name + suffix + "-t"); + iconRegion = Core.atlas.find(block.name + suffix + "-icon"); + } + + @Override + public TextureRegion[] icons(Block block){ + return new TextureRegion[]{iconRegion}; } }