From 3f1d957e288a60c460a7a34f724042bf975e99aa Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 4 Apr 2023 11:02:47 -0400
Subject: [PATCH] New duo animation

---
 .../blocks/turrets/duo/duo-barrel-l.png        | Bin 0 -> 203 bytes
 .../blocks/turrets/duo/duo-barrel-r.png        | Bin 0 -> 209 bytes
 .../turrets/{duo.png => duo/duo-preview.png}   | Bin
 .../sprites/blocks/turrets/duo/duo.png         | Bin 0 -> 357 bytes
 core/src/mindustry/content/Blocks.java         |  17 ++++++++++++++++-
 5 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-l.png
 create mode 100644 core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-r.png
 rename core/assets-raw/sprites/blocks/turrets/{duo.png => duo/duo-preview.png} (100%)
 create mode 100644 core/assets-raw/sprites/blocks/turrets/duo/duo.png

diff --git a/core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-l.png b/core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-l.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e2cd467d2f218ba123b86795b620dc4a118a0a2
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U}*Jp
zaSVxQO-_(tRhBhK5-uqzad}w2<cFb*b;UFLo_LFF&9K@h3~EkX7j&1K9VlSf^gc7!
zGK~Gg<)S%!3#LDfkah4sz0s;+-n8UW21SRnIv$&tSL9lH@-1k6>SEmxHcj{`LsXRC
z1;#DgWY#mkNVE*QFkj5~dQpN%Pg9@)m)k)Ni2??OZ&?Py(t69TGB7YOc)I$ztaD0e
F0sy$pM0EfF

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-r.png b/core/assets-raw/sprites/blocks/turrets/duo/duo-barrel-r.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca9582932c8ae73c7ae296a5ae6599773ae508cf
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VCeRA
zaSVxQO-_(tRhBgfy1Zes_wWD8vttd@g}eUz`}^DQi$UOJ#*7E`?p^YZu3JhN+LUEv
zWnaEy;Bn_^Vg6v%6vubqB}bK2Lt|s(L;GC}p|S~bu^vU+mQ`^~c*QZxg;BF_L8O$z
zH9-^KmLnET&vrIUP<}Cq_vA@g6UL0KPc<Z17bl4HGzA)1Ffhnx$O&)17{8Z+fq}u(
L)z4*}Q$iB}U)V@r

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/turrets/duo.png b/core/assets-raw/sprites/blocks/turrets/duo/duo-preview.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/turrets/duo.png
rename to core/assets-raw/sprites/blocks/turrets/duo/duo-preview.png
diff --git a/core/assets-raw/sprites/blocks/turrets/duo/duo.png b/core/assets-raw/sprites/blocks/turrets/duo/duo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d165d5e6dc11e86479250096a638989226344de
GIT binary patch
literal 357
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V3hZC
zaSVxQeLF>)kI7J=t$xR0DH*0#CC5Y$eTFpIX^#qJ7+GhvA5FZ$onxS)5+TBLT#lKC
zyY-x(e73^N^}FVtt%+am**F0N>Q5IM@8?$BQme@FZ1KUnTjQ^a@-bXa^k4l|%9NpC
z+6J)`56=foxIVAj<tQ^BgT)(vh6cawe?P8G+jB?ax3v0!gIAv@W#y<H<hpU_w1)`S
zjzhJo9*kV`Ty?J`XNqKeQ+<+?sJoCez&<VT_10%9v;LO%PFld{=I0>0mFu}mh=r<S
ztnWexJ;#HZoLuX?L=HwWGVI6;kCFTuv8jN;;{6Y~W90`_0@?hyRHo1VR`t^(;KNC)
zi&c|_HMA4C^+hz4A2Ox0)~LihT;ecmS)7pBhxhjs?I*GeADet*(N|_W1_lNOPgg&e
IbxsLQ0Grc@fB*mh

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index e6ece5c272..6a7cebb2ef 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1494,9 +1494,10 @@ public class Blocks{
             craftEffect = new RadialEffect(Fx.heatReactorSmoke, 4, 90f, 7f);
 
             itemCapacity = 20;
+            outputItem = new ItemStack(Items.fissileMatter, 1);
+
             consumeItem(Items.thorium, 3);
             consumeLiquid(Liquids.nitrogen, 1f / 60f);
-            outputItem = new ItemStack(Items.fissileMatter, 1);
         }};
 
         //endregion
@@ -3046,6 +3047,20 @@ public class Blocks{
 
             shoot = new ShootAlternate(3.5f);
 
+            recoils = 2;
+            drawer = new DrawTurret(){{
+                for(int i = 0; i < 2; i ++){
+                    int f = i;
+                    parts.add(new RegionPart("-barrel-" + (i == 0 ? "l" : "r")){{
+                        progress = PartProgress.recoil;
+                        recoilIndex = f;
+                        under = true;
+                        moves.add(new PartMove(PartProgress.recoil, 0f, -1.5f, 0f));
+                    }});
+                }
+            }};
+
+            recoil = 0.5f;
             shootY = 3f;
             reload = 20f;
             range = 110;