From 0e99e121e8c9972c5f64038860ce0b471532d16c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 13 Dec 2021 10:33:46 -0500
Subject: [PATCH] Improved vanquish weapon style

---
 build.gradle                                  |   4 +--
 .../sprites/units/vanquish-treads.png         | Bin 555 -> 556 bytes
 .../sprites/units/vanquish-weapon-old.png     | Bin 0 -> 2226 bytes
 .../sprites/units/vanquish-weapon.png         | Bin 2226 -> 1881 bytes
 core/src/mindustry/content/UnitTypes.java     |  33 ++++++++++++++----
 5 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 core/assets-raw/sprites/units/vanquish-weapon-old.png

diff --git a/build.gradle b/build.gradle
index 29729eebe0..4964fa3cfd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,8 +23,8 @@ buildscript{
 }
 
 plugins{
-    id 'org.jetbrains.kotlin.jvm' version '1.6.0-RC'
-    id "org.jetbrains.kotlin.kapt" version "1.6.0-RC"
+    id "org.jetbrains.kotlin.jvm" version "1.6.0"
+    id "org.jetbrains.kotlin.kapt" version "1.6.0"
 }
 
 allprojects{
diff --git a/core/assets-raw/sprites/units/vanquish-treads.png b/core/assets-raw/sprites/units/vanquish-treads.png
index a8cbe1e0cd4a5726fef8e21aa358c0b2c637887d..e878c59a7dd0892ba5c7fce93e76eec0f97e19d8 100644
GIT binary patch
delta 195
zcmZ3@vW8`XVf`~t7srr_Id5-m^mGXnaJU%y##!e;#0K`&TiFlZV7lV5`$CM_<a*g-
z#atDq`KEK)6<aYfK*53cu`*vj-2Hp_dSL$i&wsvD+^GNQ9sR7L^2p*3lP`F1^tM2W
z7}>8Me!o5)=>K0k`dP-}i2_ob3!#KKgxPu6?nd1GJ91yYM9!DbfB8OiavkHu$+nC;
eWSBvgNj#F~xEir(gV4*BAg-sYpUXO@geCx7b5@W5

delta 195
zcmZ3(vYKUrVf|B27srr_Id5-m^mGXnaJU$%<CJqCWCKU`HjaZ=&UkF+KAUR%^LnDq
z@`mki3T8eqUM|c41Ap#a4dl1Cv8$E+`b~Ac{`vO5)Aw&l?Yr)7!)4Fe+j7B!140}*
z8^}N3{$5|zulSor?$SsyEf>Tgie$bW{PykLzZJ{%t?KtJ-yeQ+vNz+=$##s*GQ1$$
a5<2oXxkYT!dUSCUi0kR<=d#Wzp$PzUo>lGu

diff --git a/core/assets-raw/sprites/units/vanquish-weapon-old.png b/core/assets-raw/sprites/units/vanquish-weapon-old.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a98d2a6c83f5675c5e72d4645333771d587a6b7
GIT binary patch
literal 2226
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/units/vanquish-weapon.png b/core/assets-raw/sprites/units/vanquish-weapon.png
index 7a98d2a6c83f5675c5e72d4645333771d587a6b7..9f3ed5bfeec141a4fdbe5b74b505cf066c1622e4 100644
GIT binary patch
delta 1852
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

literal 2226
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

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index ff69b5773f..bc2f2a2f53 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -2438,17 +2438,36 @@ public class UnitTypes{
             weapons.add(new Weapon("vanquish-weapon"){{
                 layerOffset = 0.0001f;
                 reload = 120f;
-                shootY = 7f;
-                shake = 2f;
+                shootY = 71f / 4f;
+                shake = 3f;
                 recoil = 4f;
                 rotate = true;
                 rotateSpeed = 1f;
                 mirror = false;
                 x = 0f;
-                y = -4;
+                y = 0;
                 shadow = 30f;
 
+                bullet = new BasicBulletType(7f, 50){{
+                    sprite = "missile-large";
+                    width = 9f;
+                    height = 15f;
+                    lifetime = 33f;
+                    hitSize = 6f;
+                    shootEffect = Fx.shootTitan;
+                    smokeEffect = Fx.shootSmokeTitan;
+                    pierceCap = 2;
+                    pierce = true;
+                    pierceBuilding = true;
+                    hitColor = backColor = trailColor = Color.valueOf("feb380");
+                    frontColor = Color.white;
+                    trailWidth = 3f;
+                    trailLength = 8;
+                    hitEffect = despawnEffect = Fx.blastExplosion;
+                }};
+
                 //TODO better bullet / weapon
+                /*
                 bullet = new ArtilleryBulletType(2f, 20, "shell"){{
                     hitEffect = Fx.massiveExplosion;
                     knockback = 0.8f;
@@ -2476,15 +2495,15 @@ public class UnitTypes{
 
                     fragBullets = 9;
                     fragVelocityMin = 0.7f;
-                    fragLifeMin = 0.1f;
-                    fragBullet = new BasicBulletType(5f, 15){{
+                    fragLifeMin = 0f;
+                    fragBullet = new BasicBulletType(3.5f, 15){{
                         width = 7f;
                         height = 9f;
-                        lifetime = 20f;
+                        lifetime = 25f;
                         backColor = Color.valueOf("feb380");
                         frontColor = Color.white;
                     }};
-                }};
+                }};*/
             }});
 
             int i = 0;