From 4ab4d829af3d6f44175e637a4d4f6731fe746a90 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 9 Mar 2022 22:55:19 -0500 Subject: [PATCH] Single-weapon avert --- .../sprites/units/weapons/avert-weapon.png | Bin 6929 -> 1067 bytes core/src/mindustry/content/UnitTypes.java | 11 ++++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/assets-raw/sprites/units/weapons/avert-weapon.png b/core/assets-raw/sprites/units/weapons/avert-weapon.png index 08083aef14fa64f8276273c6756463cd4a2ada21..75d41b24eecaac6ad03a9398930427eec8ea3319 100644 GIT binary patch delta 693 zcmbPewwgn+Gr-TCmrII^fq{Y7)59f*fq_AXfq}u8gN=cK;SI|x|H&7*M42=uZhpa4 z##pbvx0sKCfhp0`#W5tK@$K~0{>p(O?e)9Uu1{K{lIhfyxv9*yt7Wa?3RTk?Y*!Nm zcKqXHaW#axxro|_)IlRp@x?zO$*nXefl zqRQ~#NyV9K(y~3;3@^U!S~X#tz+G+Y_LR<;St*^%ET|I-{09>WaVf%cSh3dtl}AUH?N(a%f+zk_5JjD`|Zl@?CSs4f8$^%UNq(KQK2ct z)x}GHtx)#awDZijTNi!qye@8+y;@{7bK=?J%X7AbN6Zjj(6+zs&AFQGyDrV|K0iP3 z+_zhTznM+%9BQAvKax>NbV|z7D6yDBLCk(pldooZ&1iki6@Txw@9QL+OKOSh-&{Uz zIxlXW@5X6zn#*$EzI)OeyLVDfJ=b=Dr7t%c{#x{FhX0J1TT0#$OLR9ie9lnI?AHlY z&z;K3G=2WV2Q_(B8Jk$tYs)rn-*cLOqE~ckXUHvWZj&F~CNguv<06wvm KmEvID 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 diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index dff8f75764..02db950828 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -3158,17 +3158,18 @@ public class UnitTypes{ weapons.add(new Weapon("avert-weapon"){{ reload = 35f; - x = 4f; - y = 6.25f; - shootY = 5.75f; - recoil = 1.5f; + x = 0f; + y = 6.5f; + shootY = 5f; + recoil = 1f; top = false; layerOffset = -0.01f; rotate = false; + mirror = false; shoot = new ShootHelix(); //TODO cooler + balancing - bullet = new BasicBulletType(5f, 15){{ + bullet = new BasicBulletType(5f, 20){{ width = 7f; height = 12f; lifetime = 25f;