From 3cecdadc3b4c64d73995f28d6e119dbbe1c3117c Mon Sep 17 00:00:00 2001 From: direwolf420 Date: Mon, 25 Apr 2022 17:36:59 +0200 Subject: [PATCH] updated pet plantera sprites --- Buffs/GoblinUnderlingBuff.png | Bin 660 -> 614 bytes Buffs/Pets/PetPlanteraBuff.png | Bin 1324 -> 652 bytes Items/Pets/PetPlanteraItem.png | Bin 315 -> 466 bytes Projectiles/Pets/PetPlanteraProj.cs | 24 +++++++++---------- Projectiles/Pets/PetPlanteraProj.png | Bin 696 -> 2618 bytes Projectiles/Pets/PetPlanteraProjTentacle.png | Bin 225 -> 454 bytes Wiki/Pets/Items/PetPlanteraItem.png | Bin 315 -> 466 bytes Wiki/Pets/PetPlantera.png | Bin 499 -> 1093 bytes 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Buffs/GoblinUnderlingBuff.png b/Buffs/GoblinUnderlingBuff.png index 98b3f6c62a383c6384585935f563f507ec7af17f..368453e865c150eb27edd061130364f312246089 100644 GIT binary patch delta 498 zcmVsu08;^&43lSsrh&m40vM?p>JyxNXx#sK{t!&7MnKZU?HvnI3}z9Rf|MJLk%>j+uA3K(#_>fots|yBSNeHVAVfhvvc;xDU=^cNQuVCeK z#8*N>W??&+W@BbV(f?0G5)!g6pMmLLmroD!+7K4EOmCipX-)xNFzqe)9Zb*jl7(b{ zXb8YdL|9z=K}yuKn@-?$z~Bi1Sc`^*T$5g)h5*dxzy3m-n$Wl(bRmGVJ#eDb5)$WC zsOs z&*59smFU delta 567 zcmV-70?7U51e67kNdY#IN+W+z6tXOeCduGGaZ6G7GyGM+w6QP)l!o|yz(arq#(?=8 zmyb0&mS8pD{`IS<0v8W}sUJ}Nc6}#Mq|xmeJRty!bC}OzK1TN;jIXGv4H0u(43TmG zy_O;wyg&^Bn9qOxg*LRHaX;un0GXj4?ac74Y1VD zq-%jveoR?=5~bGtSE@EhbHS>IkT~mGbpmThzW={FJ|ARai%)0dtMFJN0g)7~_^sS4ZP(lJ-{LVp0K_acs z25I|EgR~ngx*=&HOdhpvNK+eZ{Q_8A!AeB&Czrsq^L8tU&u&BVuZ+TfsQ4E!{p|q6 zhi8sl2Gb5tb-^q2)hCxxTESuRDp=FjphyEFyLSu_U;rE4RsRAAqNAi9{y*zSHXqVyo%-D8Pe1SNeHmO7$D!T-V+FBA9`^VOizw^1%IZI zeUI#O122d;wvYhn>456VT_Ogi?If%r>Rk{aJ$OO@0VgW?L7YKaBN>R}-QPg_fl z!tF8^TrtQ(fEa)t_b`AhEf5O^PY8hG9~So;Dp#J?oF+R8pMil5MIAik)M0fD=O9i4pi*iw z!+N}_Ur6y6){uY!m^`7}04Wg%NjU(o4g0UlGTgcU7%aHGmK`-WNSlIb-@dhAT5-QQ ziXrzMPonTQ7X^dqH&0JPQhx^|^?No$LQF+bmZ4Dd@gU3vAeTYFE0o+|4S!DqsG56n zr-A8`$yq2NVV%1ft#;%@GoN9QmIJW*`cCr-cpCvZb;IHwm(OwK23Xv~%!k#wgDV6e zIp8SPv@kzh4w4&+WWe;VUDyr7mHJ`k!F&$OZG$fjAiE3_cM#gY7UC1*2T#Csb>LML zb?@%8p_CIaJ}mCh%^jS%;7Iv#4h%_2%O5B$p0nG|gXz}wQ=uV|jlw_6a2{)m=~b)+ p3jc4`1t9rj@YDq(yLSu_U;v0L+giJ@A=Ll?002ovPDHLkV1mWm5I_I` literal 1324 zcmaJ=duSVV9KW^>y3!V@6jtZ9F$X%;AJNMXOAOiK6j|j#W{?e?*arC<=3{ziX2^u$VEegsDt|G*I+v z=|eDxAZ^EtY|hUm$0f}+LrQ=NRZIu65oBx~N=o z0*%@(K)FyD*C<9nc`-zBqCm5IQJSQ}1St{}i<6W@iV{hojR%9?Ts<$P<#@vvJVmgA z?>iDfl*{E%nF-nMBteOyNRTu^(>O%nUe)rI3T}D*O$##cG}mx^!?w`CqN3U}eguO` z*F!L!WOBo>yhtol40)d z>?i<2HPS<_0gIwc%eFRS0?SXx5e)tb>4q+8swSv;TEK;TSi{3S%i;Xaexh6MZdA?$4py}Iyz8hTmj$A3~ z0>!u8tZh#>yI`VV`?goG9W)vZs?MVWhYU-%%iivwOzTn0z%>p7J?`2jx|V0j*hB*> z>I}=0JPtTU!+C~z7$`q^WhUr%+tg520U^-g*~`sv)lOl{YR!s2)PsNZfbmXRKj zH+zt8j{Ny$&)biPqyFzNT|9ER^z{6@V(I?wl=Mr--%CqFt)0jZN5!v*f`1i8ha_St K`Q?$vkNyjuTE;#A diff --git a/Items/Pets/PetPlanteraItem.png b/Items/Pets/PetPlanteraItem.png index b23fc5d5e7e868462c8e4a99cabafbab83dac290..65001b8ee0307d2d103ddbc1e90edbc16ab0308c 100644 GIT binary patch delta 439 zcmV;o0Z9J40@4E^iBL{Q4GJ0x0000DNk~Le0000M0000W2nGNE02Y^si;*EGe*tt! zL_t(|+G70w|33ph5Ut<{RxfnexVJ?(%v4SW#dzb-PzH)xif2cl`u%?-d8DZ%d=F%u}J23z5?-yV? zz&`^_b87H|>F+l_qWAskK&TPpS57Rh`kxBJi30Gx){a=TbVga2F#hB_5`a-(D~@*JNrJu!P>&d)ggNuLuFoKa%7;Pp`pCA8+cS?`G#TG1HFQ)bxH)LP+sd?c*L0>o{u}36itRQ&FU`MXSMHhf{-v%iN~>H} zDY;mFb++7E_BYElEqB`@!>avzj9&l!xNgd~yE?~`-}Km>KCjVr(Uf)H?Egpf@3KfR Ym?w#C+;+Izopr093SkEC2ui diff --git a/Projectiles/Pets/PetPlanteraProj.cs b/Projectiles/Pets/PetPlanteraProj.cs index 4ccf2b73..721b8be2 100644 --- a/Projectiles/Pets/PetPlanteraProj.cs +++ b/Projectiles/Pets/PetPlanteraProj.cs @@ -31,15 +31,15 @@ public float AI_STATE public override void SetStaticDefaults() { DisplayName.SetDefault("Plantera Sprout"); - Main.projFrames[Projectile.type] = 2; + Main.projFrames[Projectile.type] = 4; Main.projPet[Projectile.type] = true; } public override void SetDefaults() { Projectile.CloneDefaults(ProjectileID.BabyEater); - Projectile.width = 36; - Projectile.height = 36; + Projectile.width = 46; + Projectile.height = 46; Projectile.friendly = true; Projectile.minion = false; //only determines the damage type //minion = false to prevent it from being "replaced" after casting other summons and then spawning its tentacles again @@ -112,7 +112,7 @@ public override void AI() Projectile.friendly = false; AssAI.BabyEaterAI(Projectile, originOffset: new Vector2(0f, -60f)); - AssAI.BabyEaterDraw(Projectile); + AssAI.BabyEaterDraw(Projectile, 5); Projectile.rotation += 3.14159f; } else //STATE_ATTACK @@ -135,7 +135,7 @@ public override void AI() } } - AssAI.BabyEaterDraw(Projectile, 4); + AssAI.BabyEaterDraw(Projectile, 3); } #endregion } @@ -146,10 +146,10 @@ public override bool PreDraw(ref Color lightColor) for (int i = 0; i < Main.maxProjectiles; i++) { - Projectile projectile = Main.projectile[i]; - if (projectile.active && Projectile.owner == projectile.owner && projectile.type == ModContent.ProjectileType()) + Projectile other = Main.projectile[i]; + if (other.active && Projectile.owner == other.owner && other.type == ModContent.ProjectileType()) { - AssUtils.DrawTether("AssortedCrazyThings/Projectiles/Pets/PetPlanteraProj_Chain", projectile.Center, Projectile.Center); + AssUtils.DrawTether("AssortedCrazyThings/Projectiles/Pets/PetPlanteraProj_Chain", other.Center, Projectile.Center); tentacleCount++; } if (tentacleCount >= 4) break; @@ -186,10 +186,8 @@ public override void SetDefaults() { Projectile.CloneDefaults(ProjectileID.ZephyrFish); Projectile.aiStyle = -1; - Projectile.width = 14; //14 - Projectile.height = 19; //19 - //gets set in the buff - //projectile.damage = 1; //to prevent dyes from working on it + Projectile.width = 20; + Projectile.height = 22; } public override void AI() @@ -260,7 +258,7 @@ public override void AI() AssAI.ZephyrfishAI(Projectile, parent: parent, velocityFactor: 1.5f + (Projectile.whoAmI % 4) * 0.8f, random: true, swapSides: 1, offsetX: offsetX, offsetY: offsetY); Vector2 between = parent.Center - Projectile.Center; Projectile.spriteDirection = 1; - Projectile.rotation = between.ToRotation(); + Projectile.rotation = between.ToRotation() - MathHelper.PiOver2; AssAI.ZephyrfishDraw(Projectile, 3 + Main.rand.Next(3)); } diff --git a/Projectiles/Pets/PetPlanteraProj.png b/Projectiles/Pets/PetPlanteraProj.png index 24d6a08037d02104b56fa2fde5fa02b69236d8b8..f7deb4ce4fc265a1f495132de41e39d1bd2ac676 100644 GIT binary patch delta 2608 zcmV-03eWYp1-cX=iBL{Q4GJ0x0000DNk~Le0000k0002+2nGNE0Dp~EXptc&e+k@4 zL_t(|+U%WwXjWAi$M37+glMbbkA**SB|#*lEVCg-mXt;#)XeZlmiSMO8AwDB5-|#i z=#R$iAMpojNJCdFX2i%SY)zBx4~G%v%vP->It@vUTzc>O-MjPMecp5K-Fuatd!GGq zxc8oW@4N4L?sJ}d@8^BqOn-mBe`jL%J~S@0)wK1kjH?%DA zm%r&b?6-BRd-L|6^>oHa`I)0R1dv!&Pj>z4w+A;DDbZ#8 zEk86@*{^Fso3h-rX_?=ifBo%f5KXr9D84+Se5%s_+mHY9+m7ab&ki5w6?au$4(*sz zqF0G7IUiU1zhAS}Z(pn1peR4Drb*3pveAT<=Fij7Tx3Zc*F_b++E3Q*3ymi5ZAob< zy1=(Nn!v1!Dq}b=MpPN<>xV;qeaDJvL3G(P#c!{E8Ga%un&5a)e;Uy%7gavBE2?Dp zE?=*_YKZFunn#r7|2A~wjo!!d z&{pYUhSF*y~e4*Z}O1^Es;;=c( zNBJFB)lO0JW>$FNqTsH)<%{4c!P2!se7^0Ti@}VzJ)?{i?81>Vk)A=?uXxGB)ADwN zFSC-8VPud6e_|w#He5^jTQ~Uj(zUny%NPH=s`xMrPiH+(Ri2{?)+1*ro)laot7=P> z^XZhg*T;3fos{XKjQvqXHxm7`0w2F~_6((8-;PdYd#2+`thntIhvKZH&hB{m0c9lO zDxV(3p)@PUzRteP*FP_^6r_aZABa(DhnZ8`*R$F>}oSE3T{NZqqlfI~;BQkaCvH$Xgjn2pO`XsZq zQa>HxiTzDk+Vm(Mm$i**I+ixQQANkvN;LCuSz7xQkILFIqs46PyykHFjZI={?adBN zSzDg*fB2ofWO)C{GcX??hVxkSE?>;YCDvBQ*lw%}-ay1=5)DE5XXMa@dZXM9R~3-(tc3_J3y? z2JR2a=Lq~@dzaUyD94QLxok9%*xLO9Q;Xx3r}jw}3{isfYl%kYJRKvpzVAi91!Mcs zfAzn?=Ga>JIFx466TBcB^M|0}99tWg^aL{trq+~ZmPk8q!hLPp3_tzi9?CX z)(+PkTdPyDP)u$5o@B8}WG9aVGq}#je+%W?h4y9V;{!t_@Zr}U&%ViN8AU$@yKUZW2NP|ENyxf*HO(9 z%?ukZ#hjj*Q=*!gu>}oReeiR?tzZ0%-!lCs9mnzGri?9=EG-Xed*b;wYJD>Of5v9Y z)Y|Lgy6C}-ZB(|_^tkquo|5uW8C&>vp_y9yecY6>)9f04ko(9s;k>1|mCYiav>Wjh<{)=u30z2AZ$t=Tgn zZ?!8wsu)xg|eR6T0{{rSx=ps9L%6pj~vkhb!$zTf7{VzR*2?tV+XHwEblUJ)kI&W^1$Rh*S$MKL0dt&K{0 zN{UKsZPW_F#+A>kRh(&NsZwxMb5&G_8%=aiiu~F;R z>h^bvONCN&Cesy{S_t=e{bu&#?TSc{njl1 zYC9{)l_t|$VG=AY%#^8R;uAESj)%)f;0|rtu>xG5mgp03bH&V zJ%>J>%|8<8k89(=u3-CxBi9^TtFX0F^oVPY^wdQWseY|vYm<)SaV!58im^=}1!v0C zvZbD8PK+N!l$;egH@*k0w?*6K(;3jr561n01+&S9gS)6rbU4K7PeynZg$W@5OV+BU`z^b4N~N5`2S^86Ek7_*vH}4PwO9+SkJIrJA2uTr{U=CA+k_bzLB)%nhglUj3%i0;yJjhdkFYNUpo;xlyf7=o7&B}BLkAck%pV^{+sxDn#$0j*@cfgxmeEuIJ z0~SC?9TNkM01LVcN>+%0`8^S@h%x}C9;P4Wa@x5VX49qvVPJtnFAjj|m!@)9T>|67 zy>L3u|;26H-UNFrIsSC77PIP998) zZzlI2pTdu)9x;-lj`l95HlTev#s$#pHbQmbz_}P#9f+%r8#ouEm(S*5N0I|5@)4Si_@% literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^d_b(m!VDzYW^UgJq@)9ULR|m<|8Ek)D03rDZkh*g zs!IQL+3al$hK7b}wv3NC9(MqhF_r}R1v5B2yO9RsBze2LFm$lWdH^|`1s;*b3=G`D zAk4@xYmNj^kiEpy*OmP-3pcl*3B%r7oIoLaPZ!4!iOb0e3{9Vk*w`%YUc9(4C5CUg z^(CjvRxuM^^zj|s!pCO8d#TZ9@#)2{-Oc3>*C{b{zH8mNx|!=8BSX5VYiRtwlZ8N| O7(8A5T-G@yGywpA%|c%Q diff --git a/Wiki/Pets/Items/PetPlanteraItem.png b/Wiki/Pets/Items/PetPlanteraItem.png index b23fc5d5e7e868462c8e4a99cabafbab83dac290..65001b8ee0307d2d103ddbc1e90edbc16ab0308c 100644 GIT binary patch delta 439 zcmV;o0Z9J40@4E^iBL{Q4GJ0x0000DNk~Le0000M0000W2nGNE02Y^si;*EGe*tt! zL_t(|+G70w|33ph5Ut<{RxfnexVJ?(%v4SW#dzb-PzH)xif2cl`u%?-d8DZ%d=F%u}J23z5?-yV? zz&`^_b87H|>F+l_qWAskK&TPpS57Rh`kxBJi30Gx){a=TbVga2F#hB_5`a-(D~@*JNrJu!P>&d)ggNuLuFoKa%7;Pp`pCA8+cS?`G#TG1HFQ)bxH)LP+sd?c*L0>o{u}36itRQ&FU`MXSMHhf{-v%iN~>H} zDY;mFb++7E_BYElEqB`@!>avzj9&l!xNgd~yE?~`-}Km>KCjVr(Uf)H?Egpf@3KfR Ym?w#C+;+Izopr093SkEC2ui diff --git a/Wiki/Pets/PetPlantera.png b/Wiki/Pets/PetPlantera.png index db14db05f049126deef9d566c1fc15d688bbb34c..68694b4cdc2872efa5ac8e6240225dddd4daf444 100644 GIT binary patch delta 1071 zcmV+~1kn5Q1H}j-iBL{Q4GJ0x0000DNk~Le0000k0000w2nGNE0MGtwx{)C#e*@=9 zL_t(|+U%KMNEA^N#_y`QLZlT|8=18wLDYj{W{VUEJyZ~(W=1NOZz&Q;L=ZlN1QOAU z=wljbL{b)lMJx%0iJI&_C`MRoX0>gSe?U^Bwzzjcw{xA@nU;LmyPkbG+?ji4c7Nxa zZ_dnG{C+<(6Fc@MXij|lYR(dBf4evC2mC8tQPeG>ld}&B94#q8If0qIDRR#XEtPQBg|@DPy2f7)O8hE z+m9~Uc=q-bauPO2TUc7hdK~X~iI@GYb@hE5S~^lYA9BH-6Qdysj}43Uf2q5yWXxDR znTJZ*u%S--PKxg%Ydvy_%YH3u8+WvN)*jML*4Y;{$s@4e$X#$goWI<0N@OQJU&Io( zpgWX(_`vD)Wa5bD1J93Zti)ZCH)rvD?8beb?OoYqohP@Kj613ec%Jy!FWjWgOSGJ3 z-$LfUxbu}~cc-7Jp>cV`eeD%_zSh&JYUYM&U4--!^327wo{)T{`^orcg*&8wtJja?S+BKbJmAmiI=x4N zray!1kEvNrjWcE?m5dE+ZD?raxw5jD=icGokk6ixPh9r%%+YL35{TGFS_u}Y1jrV7 z&NDN8I$E6Xucyg&f4Gm{dmMFK1;6ZMvV)WV8V|UO4r#0_7|ayzWEa=v1X})&1$|^ zu^9a$0j-0?BH=*1c`v%c(kr5?n|+ta^MhMSJn!5(PUdHqfBQ*S7`$K5XH`9It4|z} zRT#r37T2bbzF8)G=&*PycRmqs3G&N?Kd;(8BkqVdEu>P2>AtaldIzaK@uYpJAtyr1 zGD*EaWzYqp68&wzqWoVsXgj}bH6PD>Ss)rl;O#79l)UUJ*p8khaih3Kiffa|`HaY` zt8pW3FIO13e~kLBVpIu#y3qLAj5IQDs%ePqx47rS^6eGkATE8x delta 472 zcmX@g@tIk%Gr-TCmrII^fq{Y7)59eQNUH&{0S7aX^vd}mHBnK$p1~%-C&bkxgmI!_ z+S&IJTg>WsQ&ldnmJh1saL?s_ek|m4$PBq@9uFJN$=ry0wc>97b=ia|eA(L=)NC0I z4GsVQ|L?22rXFaZNJ)@iFp!H582tU83oUz33hE&{Ia^+!JlK~Iw0~U>-i%ys8 zzt>+cEEjh%KOc35zvJa`Pn|hlKRIt7+I-zh^U{$s*RJZYq)g|Y=A5v0?!pN|UJe}3 zG%eSpyTqoO`6^CmHSkS~eg1)GvhIlqwWltK1U$Ka^PYi1dd}$s`bGz$+LoPuB;YGp z5$bY!)A_K24FWZ>$CtTuyuZ0hVpiYcSIn#ICcLV*c(*xpV^GNRnFX<-@5@6|99F!) zAFX;i`bY=cD#LT1m5+N_duu-57yfp8hhX@VHQSBaS7kJ%KI^+Bxs4%QCoy~PrE^8c zxX(qh%+_k^75kW_{g{oPS!~|>{b{R{e#}`HzIo2yK6me*kGHHzIeg&pt1@G2xfSU* zK4!2zaeh8i{*&Gx;r!WQ#@m>*^b6ZIzWn@Q{)WfL<|M>3@h}MLr$=t#zTN{2TLw>8 KKbLh*2~7Y!#@jvs