From 0e99e121e8c9972c5f64038860ce0b471532d16c Mon Sep 17 00:00:00 2001 From: Anuken 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_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$%@zRsFu@`@?Te_GUaf*^aSUh8JX8 aLP!24w}?$zk1lQkaXnrAT-G@yGywo}o>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 zcmeAS@N?(olHy`uVBq!ia0y~yU`SzLVA#UJ#=yXkbf>eLfq{XsILO_JVcj{ImkbOX zIi4<#Ar*7p&fT9UV=mDCQo&d5pu?$PWrs>mM!h!_jXd$MR@qPcPFzWtHDOlI zo&D|;r&$M|5>X72TzWk!Q@4DYNV(!#qcxGUr>s0aVTPp9wSe+dS}j+EifZ;qu3H>- zENY35_#;K}?xPvpa^{9n(6wDlcW|#f zIpd_%5+B>PHJ)sS*2_X=uUtRyW=2fwlXErc>I!P&-QRESnk}#{aZ>D&vtO?k{GDX9 zBf@6s4vv|+ips*LR1%d2&+c>It{>v{>XNbxS>yt{w3`@$B&LSLrsXTdrt! z#&U}*URkie{;&G)e@BlOC7HRaKQ;xMEDRg{F|?($H6vMBl{7#`u7ob45z&ZtYPIp?k%Vj=Ey}n#-J2 zcr)JK+orNBv`a-STQki`&b~5GcG^2co#q8-9qnB+L5mo%Hw0L`tzvf}5Jt<%2te>)P zcbMj3r+>dbe^1)J>B@xDm;e8tA~8`>*ICHh*GpGiD5NYhM!{5a>3?AtyyMfw)U#Kaa?QM*&Lhe#Edw!cAIr*PF$p^ z%+f4;SWxo)zpc|917t(g-A_+jbTI2$>Q$j+&$aKWx9epu>xts|o)>#fDn%eu2gI0_ zA|P^kZ}jw|CpG3eexJiRec$1$rk~r5Tu*#@QTeU(WPw|^$jS7bRy!ru7K$4wHBV64 z<$7n14sC&yIUb-X@%{ z6)*0bE_1-UbZcDqinH6-ZFPMjR9CZy^Y+_IC0|4G->(i4-)r8idG}t>A=~$rJEmDA z-Dy3u?_>(MaZ;)1CVwN2_cQKR@vk-i*ERiq#@PqGQ(k`6P?@g#Z)>YNnPW2g?o3_q|P$FtgG@j^y;ojd!rAXU_O#ny6kCGzGj-! zjsrW7TowBK`1YTM`A;0<@04ek7C(*jGQ9cc1%sX}U*<%?`5Z-@-LE^^!~a!8+Pyya zcAr=728#=;#b7K4E~}WU;3s){)yWC>lJalfy(hVHs^8vg zuRiRH*MF$zqUCJ#=C1Xhb9Y-!QrkrC|D3@8{$}V?#gu9P#g|MGim%ew-7MDs{HT?p z&#oq|=`2-m-vq~YrD&h1RnzT$rFB&J5M#WfsIa+(uZO4C>6VZ`k$!C|^924ZnNeQt zE;VW0%C~P{-ibW(xAVU5)e~zw?$6F!|IFlt$M)dOr?YIguGUidx3p)SO#k$ptot52 z%PlkVSpTm&f2H%zgXq(FN`5nr?YcLk!s6-l_fL{rcFIpX8nEZ2p0@akFIh|EB+ajf z$F7!K8ttW5wz^XA@=38!0o3`g!Womoy^lU)!eyjN%V@VChK+y zaFsk^>6&~gSgm^J=L5nISNL#iu5yYBpE<=txU9JLYU#|In|7a_cD4JfmdMt3(V7Np zPhaMEsmiqXI_I~TH;b=|hG{M-o$AT)n17rn$>JL_2ryj3r{KpY0lc*me#$tI`xS7 z%V^u@o{RY=Z4wXOvA6fkT|>v{t~6P(@(P35KeKXERu)DDnY`Yx>u%dik#$=pPCC}> zb#cw%PxsV=-%l5HihgWUraSB7H-oozk&0hT&m~`9B$=-r{BFAFp$Lf7wgnH3~mTgM8j)ycpOJO8l%va({Cyd!QtNV})2pUXO@geCw7Efe$r 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 literal 1881 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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;