From 62332fbebb558a224631088e1d1bbbbeb73e9de6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 13 Jul 2022 22:57:13 -0400 Subject: [PATCH] WIP chnages to collaris weapon --- .../units/weapons/collaris-weapon-heat.png | Bin 1491 -> 2033 bytes .../sprites/units/weapons/collaris-weapon.png | Bin 1035 -> 1305 bytes core/src/mindustry/content/Blocks.java | 2 +- core/src/mindustry/content/Fx.java | 10 +-- core/src/mindustry/content/UnitTypes.java | 77 ++++++++++++++---- 5 files changed, 66 insertions(+), 23 deletions(-) diff --git a/core/assets-raw/sprites/units/weapons/collaris-weapon-heat.png b/core/assets-raw/sprites/units/weapons/collaris-weapon-heat.png index d1e9610ddfcd686255327e8447ed353d53af425c..20e4e5165a8d12e5f82cf00958d33099620a02c2 100644 GIT binary patch literal 2033 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 diff --git a/core/assets-raw/sprites/units/weapons/collaris-weapon.png b/core/assets-raw/sprites/units/weapons/collaris-weapon.png index 5280af86072a8448061d4a4d9ec92f56670a1066..56d66f2431aa85b31480739235126122a5babaf5 100644 GIT binary patch literal 1305 zcmai!YfzF26ovr-6%`w$GAy+u%W@QDwA4+(TS=%N2yLR2mqrQGR#8jK1l?WNOP1!9 zEI*mVdtIUwb`AVr}8wJXx9SnlB%C}BIAn<45Atd_QM(yif4u*;uTxgo~ zzu8U}5FMPPmocbPwghfZf=S!%7ez49xvF$urx%E?6oSyalqeYZg>EDbCkP}p#6L88C- zDG!zg`XB_c5sEGdVp=G-VoNQn_nYjD^!~WGcw=b??hY2iwq_jIJ+|pT7tHZzDWfgl z$m4hukKr0fhl>knmX)1En8^`31D&4GP>|>+@u3j6?A~xmz&+IwHcjLw(53Y}8qjx1 zvc(p#M5#iT6WraUildEUdQpx&lh6tJK(XBosYHgg;7gl9 zbA1x946c}Ht_N^)@~Y04N5eX&vCK?&o68Sw(*iC~o)epqqHUch_7kUotp&Z@hGhDJ zVXU4Rlm^4-M6v?k3{V2i?_JK+`Q?jS$GvO!c!PcW0R|tY6-i7GlYrx+FSCYgI0+d5 zEweLD_M`EuHAPCp-%07#_&N=6D-bjZgP}h5!NcGJ`(?R7RRrr0BfkXhp?ib3M)^$v za~liJ*din-;K4ZplAba4GQWR<8cOQYoTGsn7bMpI&8NwKq9zQ7g~lJsS5KLD`myKq zGjR$f1F@ViaN&X)#_=B8PH|UIC32i2fx* zj|*o?If4|FO?4kLTV7=E%IgY>$3$7Vfx>yyh?tLd3e3ou7jR&-Dk`P?b4Aya6M_TJ zze~%1yAtYZ+TLxswX#)+CL~WRobc+O9!Q?pY<*Yifl0^=L;7_mqlG={*N+Uo-zy)> z&+oGV-XzZjYZGN;>aE@pWq*&OUzxIaswyP=j^B@wx#i76{yU4YkKw$Q)5nW?SA{v3 znr;UyLprz%EsyF7evxg98%D3LijL)`%!}sZJAyCfR^AL~6QbB>WE98gw`*(KQCG3h zS?`&;XE0{RESPUAlZjcBZ!J0UK^%+T8l8TW6daBAkbhlDl+kh?M$3P`s*Y>F-iupl z7=Qn#+$qGk*<9B6>0k^ge?D1O_kjnfYAtHuOD{$p)z-fyQ}vgF@xAxZc^)3WW@Ug? zQlY0Ip#^~gW?Oj$OgK_Bg<6GAi75x$J8lp2EWuXS!_ zT)S55rBkf4E2C*{GeM_X=e80G*~;o+7OyduMB%KxNR=d#eDVBBJ~;{I413NqFNf1D zT<|a;qMrB;RO0yqBz}TIP~T@pga&fbDDgP3k3~1946oPx&#Ysd#RCt{2+%an#F%$=Iwe&l5>*Oqfd;qV7c4(oYG?`+$6iOfvvSx}sWetUb z31kWG)Rd4wJ0y@bAE4l+p1S2zxRVZ9y{Gq{-h0xu+<)?2Y@L3V&XVqqIM=67pFW0p zWL5C~!Faj8K4`XgKaR|fmC9p_LiZ2G%Xr`PboST25>W@X;e2W!Re>p-4~Cqc&X$^A zgc^{7^ML^2el4WQIY3#G0LjBmqx@awA(Q`0HLKsbCwI3OefM!5i$ST0N@|MWrK&aAI$j*#|;o>-s z1lb9o$EA?DsSb=$+DH>1wUW^LG?D5+DUMqX7FD1Yj{Ck;)PPo%mLgSvoCWFi)g`-p z2~rHqS#9Sab0Y#uE+v#gRviaRAd3T!XBR8m*2pR?SQ2S=O$N*H?7|(6wwmo2`DXL2 z%5ltEFswY3xFy4AwW?_s?E=#L9ITBjat!Bha&bNovQxlZTq15mt>NyK+^%jgTvrAeg#5tGuyqhWzx`&X1jB&Y917bHw zJo5JDLFZgri=lErHAiLU&}j_xiX znp7Q7;H%f~&OF%N5G66kT1?lYe++;Dq`{Loz(Eo56jVBB&TGJHNXh3v#!6zY}` zGQ|0G1<4)a)2m*$Vve{Tq16E=IPYbCA*t z#8AK%q#&Udb&iKjl_L#$ah0-~NCg|$G+VB%QP6WR)smE?09M^H4CzP40$Bp*9P=Lq zNV{w5i;|WNmCqU`BrS=3R@zITum}2_icmjefy|o8a4N#Bv^G*y7002ovPDHLk FV1iHm { + shootSmokeSquareBig = new Effect(32f, e -> { color(Color.white, e.color, e.fin()); rand.setSeed(e.id); - for(int i = 0; i < 8; i++){ - float rot = e.rotation + rand.range(22f); - v.trns(rot, rand.random(e.finpow() * 24f)); - Fill.poly(e.x + v.x, e.y + v.y, 4, e.fout() * 3.8f + 0.2f, rand.random(360f)); + for(int i = 0; i < 13; i++){ + float rot = e.rotation + rand.range(26f); + v.trns(rot, rand.random(e.finpow() * 30f)); + Fill.poly(e.x + v.x, e.y + v.y, 4, e.fout() * 4f + 0.2f, rand.random(360f)); } }), diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index d75ffd0821..2871b1a0fe 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -3383,20 +3383,16 @@ public class UnitTypes{ rotateSpeed = 0.4f; rotate = true; - x = 43 / 4f; - y = -20f / 4f; - shootY = 37 / 4f; - shootX = -5f / 4f; + x = 48 / 4f; + y = -28f / 4f; + shootY = 64f / 4f; recoil = 3f; - reload = 30f; - shake = 2f; - cooldownTime = 20f; + reload = 90f; + shake = 5f; layerOffset = 0.02f; + shadow = 10f; - shoot.shots = 3; - shoot.shotDelay = 3f; - inaccuracy = 2f; - velocityRnd = 0.1f; + shoot.shots = 1; heatColor = Color.red; for(int i = 0; i < 5; i++){ @@ -3417,24 +3413,24 @@ public class UnitTypes{ }}); } - bullet = new BasicBulletType(9f, 85){{ + bullet = new ArtilleryBulletType(5.5f, 290){{ pierceCap = 2; pierceBuilding = true; - lifetime = 30f; + lifetime = 75f; shootEffect = Fx.shootBigColor; smokeEffect = Fx.shootSmokeSquareBig; frontColor = Color.white; hitSound = Sounds.none; - width = 12f; - height = 20f; + width = 18f; + height = 24f; lightColor = trailColor = hitColor = backColor = Pal.techBlue; lightRadius = 40f; lightOpacity = 0.7f; - trailWidth = 2.2f; - trailLength = 8; + trailWidth = 4.5f; + trailLength = 19; trailChance = -1f; despawnEffect = Fx.none; @@ -3451,6 +3447,53 @@ public class UnitTypes{ sparkLen = 6f; sparkStroke = 2f; }}; + + fragBullets = 15; + fragVelocityMin = 0.5f; + fragRandomSpread = 130f; + fragLifeMin = 0.3f; + despawnShake = 5f; + + fragBullet = new BasicBulletType(5.5f, 85){{ + pierceCap = 2; + pierceBuilding = true; + + homingPower = 0.09f; + homingRange = 150f; + + lifetime = 50f; + shootEffect = Fx.shootBigColor; + smokeEffect = Fx.shootSmokeSquareBig; + frontColor = Color.white; + hitSound = Sounds.none; + width = 12f; + height = 20f; + + lightColor = trailColor = hitColor = backColor = Pal.techBlue; + lightRadius = 40f; + lightOpacity = 0.7f; + + trailWidth = 2.2f; + trailLength = 8; + trailChance = -1f; + + despawnEffect = Fx.none; + splashDamage = 50f; + splashDamageRadius = 30f; + + hitEffect = despawnEffect = new MultiEffect(new ExplosionEffect(){{ + lifetime = 30f; + waveStroke = 2f; + waveColor = sparkColor = trailColor; + waveRad = 5f; + smokeSize = 0f; + smokeSizeBase = 0f; + sparks = 5; + sparkRad = 20f; + sparkLen = 6f; + sparkStroke = 2f; + }}, Fx.blastExplosion); + }}; }}; }}); }};