From 60af568958d0bb5cd6bfd0ec66f0ec28e13ca805 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Tue, 30 Jun 2020 15:54:17 -0400 Subject: [PATCH] Updated Titanic Pike's sprite. --- Content/Items/Weapons/TitanicPike.cs | 15 ++++++++------- Content/Items/Weapons/TitanicPike.png | Bin 828 -> 1055 bytes Content/Projectiles/TitanicPikeProjectile.cs | 8 ++------ Content/Projectiles/TitanicPikeProjectile.png | Bin 1236 -> 1200 bytes 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Content/Items/Weapons/TitanicPike.cs b/Content/Items/Weapons/TitanicPike.cs index 5dd1738..b9125b2 100644 --- a/Content/Items/Weapons/TitanicPike.cs +++ b/Content/Items/Weapons/TitanicPike.cs @@ -1,4 +1,5 @@ using Decimation.Content.Items.Ores; +using Decimation.Content.Projectiles; using Decimation.Content.Tiles; using Decimation.Lib.Items; using Decimation.Lib.Util; @@ -12,20 +13,20 @@ namespace Decimation.Content.Items.Weapons { protected override string ItemName => "Titanic Pike"; protected override int Damages => 120; - protected override string ProjectileName => "TitanicPikeProjectile"; + protected override int ProjectileId => ModContent.ProjectileType(); protected override void InitWeapon() { item.crit = 14; item.knockBack = 12; item.useStyle = 5; - this.item.value = Item.buyPrice(gold: 45); + item.value = Item.buyPrice(gold: 45); item.rare = Rarity.LightPurple.GetRarityValue(); - this.item.noUseGraphic = true; - this.item.useTurn = true; + item.noUseGraphic = true; + item.useTurn = true; item.autoReuse = true; - item.width = 94; - item.height = 94; + item.width = 88; + item.height = 88; item.useAnimation = 18; item.useTime = 24; item.shootSpeed = 3.7f; @@ -34,7 +35,7 @@ namespace Decimation.Content.Items.Weapons public override bool CanUseItem(Player player) { // Ensures no more than one spear can be thrown out, use this when using autoReuse - return player.ownedProjectileCounts[this.item.shoot] < 1; + return player.ownedProjectileCounts[item.shoot] < 1; } protected override ModRecipe GetRecipe() diff --git a/Content/Items/Weapons/TitanicPike.png b/Content/Items/Weapons/TitanicPike.png index c4cf41000809376396b96954c66225e34ad24ab3..4bdcb84c870ae6523e336483fbd296acd0ca632a 100644 GIT binary patch delta 1019 zcmVEaiBL{Q4GJ0x0000DNk~Le00013000132nGNE0CANtG?5`Re*?5h zL_t(|UhUjHXj5Sn#__a+yHY5q^#h?gDJaE3gyNu}qLcUmohlu4EecAf;-I+dQ0!Fj z11CjA9i$)*QdD%(f@rM{g`&HI%6rHY>>;Q3y~#Z{_vSu-2*;S@D)Gnbo0~K}HP%+! zherR_f7!I&`eaU3Ua%JUX>K~|e>uV9#%FKIb=~#hvoa~zxylOG0wFF*uzuX5skbuG z(Xrh!DLAJpCs+&oFfl3f`O5{FmS9Wn@vXmPKKQa$CI#nQWduXu$ka8tzBF?~Cb9(U z$IZ=tm6;?L$Dv^7x?XUnXSmiel8f3M7;;Vm*} z#xBUz$3YbAT-OP<SrhczY z?;>W)#cCIu}a5zh*&y+PQti9GAIb_KUYj3z@B^Ob!bD8~1d4*jB zUU98?aZjdRN1=9LL!V6CZfVrVjXgV-HVSsGu!8me7w@GZyc4nfd0r+;l8bQstX{EM zQLuA`7o4>A>S6^_aFTnFUpPd%1h zE}~%PI;N!C|APXl$$OJb}m{S<+c_DJC~>ra`n%h zQEprm?3}5PQF611f}Lwk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f|4b!5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66 zdWM!)u5AJ;Vp`+r;uum9_x6r`mq?(9+ebeWc>}>SvCVGF+}PeZ9C0aE(nxFSHYj9I zYvR}}u-)L&QCrvQneNtQ*S|N}vFCkw6@PgBf>ok#=cewe`uX%(LDuHnxgQ=j)P4N; z+=yRpf9$fd+hLsYTp0%sbIPxCuK)F~TJoT|-;V<2539}Nrwi6CZsBKN@!(;LeXxU} zjZ?(+#Mgxk+;vF}hKJ@$2-G&jE`QKxYZbv=r{eI7V}GISn!`r5*3Wy-rJw!x%VM$M z9mQXDzsk-@&pkiu@7Ka>)-HQ;t)9FNe?RTz@85-`mC~$NGOSj7kY-o-{P6Gd)Oq)J z|G)m_@g7F?vW}hd56$1boSbg{oAKB2?eV7>YX5$?Xtd_{;`ZqV@$RoTmFYZmX0&B` z|Ka$7pHU~j{gQaixj&G>z=lbJf${kczO%e9j(;>_y)!+Vl|i}2LV@AY#RFw*FD`md zdHKB1HZP-g4WmkpMch1xj~)p-6djCZ_${ulJiX35N(~K$f7v$7{cL4X z7-PS_EItn;yuNXbwa9~<_t|+O&#ynd?)LoZyVKknK!;p8nEm~i|LY3LB4(=xvGLR9 zoWJtywC4{`#=G%dJQH{VY=R<+oh{bs#QX;5#?V{gh$B?qu0r>s#%MWoLZdxbpJbdgh=X0Suow1Wl%V zc*rszg<$yB|Kni`zxt0Q*a`Lx^*2Rd5Y8SGT zdGOlbMbzf@YXj@@L;hS3?6%(C_R8$b-z#~ym)w2Ff4#FcB5HfEH862Ac)I$ztaD0e F0st~Ad#(Tg diff --git a/Content/Projectiles/TitanicPikeProjectile.cs b/Content/Projectiles/TitanicPikeProjectile.cs index 69c72ed..1bf4271 100644 --- a/Content/Projectiles/TitanicPikeProjectile.cs +++ b/Content/Projectiles/TitanicPikeProjectile.cs @@ -1,8 +1,5 @@ using Microsoft.Xna.Framework; -using System; using Terraria; -using Terraria.ID; -using Terraria.ModLoader; namespace Decimation.Content.Projectiles { @@ -10,13 +7,12 @@ namespace Decimation.Content.Projectiles { protected override void Init() { - projectile.width = 18; - projectile.height = 18; + projectile.width = 88; + projectile.height = 88; projectile.aiStyle = 19; projectile.penetrate = -1; projectile.scale = 1.3f; projectile.alpha = 0; - projectile.hide = true; projectile.ownerHitCheck = true; projectile.tileCollide = false; diff --git a/Content/Projectiles/TitanicPikeProjectile.png b/Content/Projectiles/TitanicPikeProjectile.png index c31e89816c0461407c1c481e0596ededc79b6b83..a95d7f44da70b9d6d5877d4f49f4230076b3f27a 100644 GIT binary patch literal 1200 zcmV;h1W)^kP)FF^Uka6qR5hLaRbRcj?(aH2QB%o1c&K zGd=Cv+18#w4*{o@$SUAVbJH#NG&y|U{oSf$dBUuIX@^-}?*yEfeG}lvQ*Rq~d3X&$&rFBohiP5WoPj3C~cKz`4dbhPI845mhV8Hq9oEXn^1tcDC;oTE( zV&tniu8f_C#Zt*b!&}@T&5m7enO#T)73^0zPRoFzpvf))!Kb-8yb_p^&fNoAMV_48OsxoyRhyFI5BE(rOc{i z9H&&IR!l;kTz4fCaM=pR{xv0UUVP$Ap1=I+wmZ&UXo#)wm$4j5N4xZ^OBK$mU;@r3 zaWh~ES}G1PRZ}wTk#(RyWG7P5Xzz3-6L3C(dcB*b%9@8%5@NDX$+ADG9m3-yuS=Zl* z1YDGYWtM<@YMPR*$MxX*GiUnf={vVw_u{_W&fI%r?ZRYNc?A=&={#mOG8cQ6W^c8O z$=VDJG56=dZs&L6=&lC;Q=1OE&#*(|@~4Fcg;!OXR?-A)B^7ArooL7!1e7diY{&-W z%xv_`UUz6mCah;J6EOBjCiSGXwT188H>L1+1== z3f9IY>%yor_iya&$o!aqtEynBWPFyf7z#!{ENc+*PKY+%PE~TSf(h6r{oH`Hm@L;5 z%Y0U@!bFy!<-M?%S3=eEV*<7bG1w{^V5wx^GaA}DV&9z;d1s_+6imRaMV?H-$cMF+ z@bZKpwl4lyc1j9@$G6Am;PW7cnz#@5xy$+dx3Aot&SjObME9$9W<^0786$I?L zK=OhnU;-{D2Ftx_Peu8PL{zZx{1LDbR9>^JpsC=D#0fYfuuyaBld4p3AYlRy1eeuK zf|l>3r-HK*RcaU7OaBQt5@7jWWURC&U;@rbpdfec|AkP&kxqaH_&;Bky$PlQhlBtC O002ovPDHLkV1fX{h(bXC literal 1236 zcmV;_1S|WAP)ZmlKR}A+zVl#?4l{G#nfvqW=6dhUoICe(zBBL4xj$M~_e}h)R4SF$ zg}47VmBo)YThu@J3re5`;Dhot8gGE_?%JU$&E2{KBYF2GqXP;p1cgAY32=I1BL24Mm(_DXG=LRT00D6EA z0M*5$ah1xW94Oxfr+XcMcV{J9)0&s@Resy%(<=9~)V@86hUz&WtOs zt#GOS(Bz2vmy}P@5tZ{1QI-`lz>DhG-IzCclk({}DfVz@WcuNp3UVqm_wy0KyIPhk zD8RdmRJ5iycplww1@HPip>=Rw?@3MhWri+1#SCs{+V|l0E=t5?+QCct}ZRi=SAcsi}=N0!P-$z9b*>7;lb?U3@R9nb9)^~pAXml3eH z6>;#CYuUSJze>^^J9=DoYIO3Q+VYj{s;l$rcq3n5zXVzlZ(8$S9VuG01MuEjm1z(g zJdfv1bFoSJv<@Jp^PCT@gtt`N)s^0#xmPIV1H6oYy{$A2p6A(lKAjX#$~EQZ`MQ8c z5Y6#p7p|*|8@PO~5XuL5Z>`ESXc|0q!*=J$_7pPD{S1#yE7QNH`&A!lujKv-Ky?$bR+vUF}q~F35Y71Mt2I5~`mVc#8X}-xRHw6wIR`%3e}* zMEiMN(E_}Xf_=>-4&D^!^Js-%2v<6lL-7`u(^LcS5varzZySm{PJdC0?$Pq65-`Wx zNP3n7yeBZ}>f`{M-MlM5GgA$L26&s~QZDCt{=BVZGpBf0e*(NKsX+De>VVuTp8qD~ zEqRuE@OgCrzz3QFZDtDtK5xngc$+i>l@|^?SAJIS(E@xRMcd347JSx~5AZf=1}ZN+ z_^c`);8S|tvozqdrhI@;=^@zCfzOKa0Y0V2ze@`~ZRG=e{Uy1iQwyaBpH@~A;Opd* zzJ&0fRCwIsb--Z0L5E81n^Q4j%i2Q0Z_c7BLLnJ zRH$lF4uIl4Jp}Ncz@)32-otf$3lWNs=@EdB2~Mh6Tn9k$O?m*}n*`Wwb6*EQ@y!xv z`Fz*cKmlF|Jin909q{SbR#k;QDFE;QFH9h1b2R7II?if6q3>%#@qru!@PWX(nl*iq y7K(Qz7_%P0#{?(UjDM32ikBj5vBSat13?)Sd5}OmZU6uP07*qoM6N<$f&c(W=3Nm0