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!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t)4E9ArY;~
z2@<TzvIa@QB_$;;56hSQFqE;bcxK-dZ;`DTR{MlO&57%R?sBsO1q_?sXXaXlv0u1c
zG>31&^rsQB4*sV%S~bj@mR!o9=x|oYV-xd=TuV>B1+7nAtQ*3n2|s0sit@X_xMiEn
zdgd32mSGp>i}_wJN)YL33N+wyJE$R1z`*b=%RpFKZ`oC#gBUzr{an^LB{Ts5xXna$

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!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}-JULvArY;~
z2@<TzvIaqyH%#{a{a<-@tYNxv*PnlXe;a-=2)xXg@u1$lOWx6SO9?}pvW%?k%XbVs
z?mR8bAFP_<_zt|}sIqEkY;1gJzl$MMHbE}dqiEZ*Dvk-SIA*ypYW6LNlv21RXyV&)
z#G>ih&V~ufFDCJxJSl6!n6dS#h6L;41d*PmKm!W~2Kfv*;q4dW_X3^8;OXk;vd$@?
F2>@T%NM8T|

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
zcmV-r0h<1aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$A4x<(R9J=Wlq(JbF%X7-xWgJ80)-+$VMs3kW*wH|aU1~!nuo<<*b8hhBqUfA
z0>>T$3=4(MP9JL^>94w-&3s>{Nr8}%kdTmn%W*Tm3n8?9Aq3{5!QHiA)fEl^(_v4m
z^%^w*aF(zZ$l=dWkk_7zM8yLR066SV0Dw-n{qe14yxbW38z;cQ)#M^-Y$m}9*uu+5
z6biV)eI-Z%3Z6wR)MIHBX!a%KY+)^-2~a;~QR}tlB%1wqjgp`aMovH-wF>7XR5&F;
zT}`1tE<wR52@0-C6v0^m0Jv^fTp9IPvTy)6@Aw|Zcfcf322Khjmz(x_`AAUk$vV+`
zlM^T_VGA!5C?nwlX9avDT;ZfZnx<Y7Ht_G>AwQ7^6ULL+qV)ql00000NkvXXu0mjf
Do70GZ

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;