From 32cb25af62be7f0f0bb254e0f80b8d6ededc2f8a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 13 Dec 2021 00:08:01 -0500
Subject: [PATCH] Vanquish weapons & sprite tweaks

---
 .../sprites/units/vanquish-point-weapon.png   | Bin 0 -> 437 bytes
 .../sprites/units/vanquish-weapon.png         | Bin 0 -> 2226 bytes
 core/assets-raw/sprites/units/vanquish.png    | Bin 4432 -> 4412 bytes
 core/src/mindustry/content/UnitTypes.java     |  79 ++++++++++++++++++
 .../src/mindustry/entities/comp/TankComp.java |   4 +-
 core/src/mindustry/game/Schematics.java       |   7 +-
 core/src/mindustry/type/UnitType.java         |   5 +-
 tools/src/mindustry/tools/Generators.java     |   2 +-
 8 files changed, 88 insertions(+), 9 deletions(-)
 create mode 100644 core/assets-raw/sprites/units/vanquish-point-weapon.png
 create mode 100644 core/assets-raw/sprites/units/vanquish-weapon.png

diff --git a/core/assets-raw/sprites/units/vanquish-point-weapon.png b/core/assets-raw/sprites/units/vanquish-point-weapon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3b3434c71883acac087aeb19705fbe582dcba52
GIT binary patch
literal 437
zcmV;m0ZRUfP)<h;3K|Lk000e1NJLTq000~S0021%1^@s6C2UI(00001b5ch_0Itp)
z=>Px$Z%IT!R9J=W*S|``P!z}UZ^cn@ZLJ7GiV%zs(vDp_m%fF40x1QdbQ8L|h&uWZ
zR=Tv4klMKjj&YFGHm3K_xlsr2Zwd+besV(Y$qo4U`22NBwgU#k5dfWbi@|V|tk2VF
zx3uGT3cvu8c^p%3G>Zcj7yyUWY656cs|vSa0F%j#pcds`6N4%&jSjT}b(l$<KwHcS
zlwelia{1<riNHK83<JV2C>B&<dB@J+JdTx^DY~nJ($2A1yd*3>&)sz*0EVyH`}`Ku
z3Ue28yYe&3LfJWNQRhx$i;BR<>nAZPu270PJyHoO0&kDbm1v=0P>Y;UD=@{<NKj)i
zi%C%<a2p0Nn~u4B|JrTpP%T(4A8*~e&ZcACaC>lX{{V6}%o5B9?Dx9#d)*CGih;rB
zX&tUNnk6*NT$e(c_pgJhx43XHi<P5_@{ddct|qj_tigx-n-!YHo=;9o0B09hHdFfe
f`1ttv{L6d*WDJI>ncyU-00000NkvXXu0mjfXIQ}y

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/units/vanquish-weapon.png b/core/assets-raw/sprites/units/vanquish-weapon.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.png b/core/assets-raw/sprites/units/vanquish.png
index a1b5c2d58b111067dae55ec5b9645141c281b67a..3f6317a3d4fe71c883a0d834679eab67a044056d 100644
GIT binary patch
delta 4405
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

delta 4425
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
P00000NkvXXu0mjfh=7o_

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 9c961396bc..ff69b5773f 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -2429,10 +2429,89 @@ public class UnitTypes{
 
         vanquish = new TankUnitType("vanquish"){{
             hitSize = 28f;
+            treadPullOffset = 4;
             speed = 0.6f;
             health = 10000;
             armor = 20f;
             treadRect = new Rect(22f, 16f, 28f, 130f);
+
+            weapons.add(new Weapon("vanquish-weapon"){{
+                layerOffset = 0.0001f;
+                reload = 120f;
+                shootY = 7f;
+                shake = 2f;
+                recoil = 4f;
+                rotate = true;
+                rotateSpeed = 1f;
+                mirror = false;
+                x = 0f;
+                y = -4;
+                shadow = 30f;
+
+                //TODO better bullet / weapon
+                bullet = new ArtilleryBulletType(2f, 20, "shell"){{
+                    hitEffect = Fx.massiveExplosion;
+                    knockback = 0.8f;
+                    lifetime = 100f;
+                    width = height = 14f;
+                    collidesTiles = false;
+                    splashDamageRadius = 60f;
+                    splashDamage = 60f;
+                    backColor = Color.valueOf("feb380");
+                    frontColor = Color.white;
+
+                    width = 9f;
+                    height = 15f;
+
+                    status = StatusEffects.blasted;
+                    lightning = 5;
+
+                    trailLength = 28;
+                    trailWidth = 4f;
+                    trailEffect = Fx.none;
+                    trailColor = backColor;
+
+                    shrinkX = 0.1f;
+                    shrinkY = 0.5f;
+
+                    fragBullets = 9;
+                    fragVelocityMin = 0.7f;
+                    fragLifeMin = 0.1f;
+                    fragBullet = new BasicBulletType(5f, 15){{
+                        width = 7f;
+                        height = 9f;
+                        lifetime = 20f;
+                        backColor = Color.valueOf("feb380");
+                        frontColor = Color.white;
+                    }};
+                }};
+            }});
+
+            int i = 0;
+            for(float f : new float[]{34f / 4f, -36f / 4f}){
+                int fi = i ++;
+                weapons.add(new Weapon("vanquish-point-weapon"){{
+                    reload = 35f + fi * 5;
+                    x = 48f / 4f;
+                    y = f;
+                    shootY = 5.5f;
+                    recoil = 2f;
+                    rotate = true;
+                    rotateSpeed = 2f;
+
+                    bullet = new BasicBulletType(4.5f, 14){{
+                        width = 6.5f;
+                        height = 11f;
+                        shootEffect = Fx.sparkShoot;
+                        smokeEffect = Fx.shootBigSmoke;
+                        hitColor = backColor = trailColor = Color.valueOf("feb380");
+                        frontColor = Color.white;
+                        trailWidth = 1.5f;
+                        trailLength = 6;
+                        hitEffect = despawnEffect = Fx.hitBulletColor;
+                    }};
+                }});
+            }
         }};
 
         //endregion
diff --git a/core/src/mindustry/entities/comp/TankComp.java b/core/src/mindustry/entities/comp/TankComp.java
index 320ddcf555..6dfa5d0044 100644
--- a/core/src/mindustry/entities/comp/TankComp.java
+++ b/core/src/mindustry/entities/comp/TankComp.java
@@ -34,7 +34,7 @@ abstract class TankComp implements Posc, Flyingc, Hitboxc, Unitc, ElevationMovec
                 float yOffset = (treadRegion.height/2f - (treadRect.y + treadRect.height/2f)) / 4f;
 
                 for(int i : Mathf.signs){
-                    Tmp.v1.set(xOffset * i, yOffset - treadRect.height / 2f / 4f).rotate(rotation - 90);
+                    Tmp.v1.set(xOffset * i, yOffset - treadRect.height / 2f / 4f - 2f).rotate(rotation - 90);
 
                     Effect.floorDustAngle(type.treadEffect, Tmp.v1.x + x, Tmp.v1.y + y, rotation + 180f);
                 }
@@ -49,8 +49,6 @@ abstract class TankComp implements Posc, Flyingc, Hitboxc, Unitc, ElevationMovec
             treadTime += len;
             walked = false;
         }
-
-        //TODO treads should create dust, see MechComp
     }
 
     @Replace
diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java
index f025eed055..9e6d726180 100644
--- a/core/src/mindustry/game/Schematics.java
+++ b/core/src/mindustry/game/Schematics.java
@@ -437,9 +437,10 @@ public class Schematics implements Loadable{
             if(check && !(st.block instanceof CoreBlock)){
                 seq.clear();
                 tile.getLinkedTilesAs(st.block, seq);
-                if(seq.contains(t -> !t.block().alwaysReplace && !t.synthetic())){
-                    return;
-                }
+                //remove env blocks, or not?
+                //if(seq.contains(t -> !t.block().alwaysReplace && !t.synthetic())){
+                //    return;
+                //}
                 for(var t : seq){
                     if(t.block() != Blocks.air){
                         t.remove();
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 6e2a00ad57..f344fadcec 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -121,6 +121,7 @@ public class UnitType extends UnlockableContent{
 
     public Rect treadRect = new Rect();
     public int treadFrames = 18;
+    public int treadPullOffset = 0;
 
     public int itemCapacity = -1;
     public int ammoCapacity = -1;
@@ -442,12 +443,12 @@ public class UnitType extends UnlockableContent{
         }
 
         if(treadEffect == null){
-            treadEffect = new Effect(45, e -> {
+            treadEffect = new Effect(50, e -> {
                 color(Tmp.c1.set(e.color).mul(1.5f));
                 Fx.rand.setSeed(e.id);
                 for(int i = 0; i < 3; i++){
                     Fx.v.trns(e.rotation + Fx.rand.range(40f), Fx.rand.random(6f * e.finpow()));
-                    Fill.circle(e.x + Fx.v.x + Fx.rand.range(3f), e.y + Fx.v.y + Fx.rand.range(3f), e.fout() * hitSize / 28f * 3f * Fx.rand.random(0.8f, 1.1f) + 0.3f);
+                    Fill.circle(e.x + Fx.v.x + Fx.rand.range(4f), e.y + Fx.v.y + Fx.rand.range(4f), e.fout() * hitSize / 28f * 3f * Fx.rand.random(0.8f, 1.1f) + 0.3f);
                 }
             }).layer(Layer.debris);
         }
diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java
index 6eededbe91..544b747f02 100644
--- a/tools/src/mindustry/tools/Generators.java
+++ b/tools/src/mindustry/tools/Generators.java
@@ -516,7 +516,7 @@ public class Generators{
                     Pixmap slice = pix.crop((int)type.treadRect.x, (int)type.treadRect.y, 1, (int)type.treadRect.height);
                     int frames = type.treadFrames;
                     for(int i = 0; i < frames; i++){
-                        int pullOffset = 4;
+                        int pullOffset = type.treadPullOffset;
                         Pixmap frame = new Pixmap(slice.width, slice.height);
                         for(int y = 0; y < slice.height; y++){
                             int idx = y + i;