From acc592b2515fc70213d1f14a70e374e85fd7d887 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Wed, 15 Jul 2020 12:01:13 -0400 Subject: [PATCH] Updated souls. Added all Concentrated Souls. --- .../Items/Accessories/Wings/ScarabWings.cs | 14 +++--- .../ConcentratedSouls/ConcentratedFlight.cs | 10 +++++ .../ConcentratedSouls/ConcentratedFlight.png | Bin 0 -> 663 bytes .../ConcentratedSouls/ConcentratedFright.cs | 10 +++++ .../ConcentratedSouls/ConcentratedFright.png | Bin 0 -> 653 bytes .../ConcentratedSouls/ConcentratedLife.cs | 11 +++++ .../ConcentratedSouls/ConcentratedLife.png | Bin 0 -> 664 bytes .../ConcentratedSouls/ConcentratedLight.cs | 10 +++++ .../ConcentratedSouls/ConcentratedLight.png | Bin 0 -> 658 bytes .../ConcentratedSouls/ConcentratedMight.cs | 10 +++++ .../ConcentratedSouls/ConcentratedMight.png | Bin 0 -> 652 bytes .../ConcentratedSouls/ConcentratedNight.cs | 10 +++++ .../ConcentratedSouls/ConcentratedNight.png | Bin 0 -> 683 bytes .../ConcentratedSouls/ConcentratedSight.cs | 10 +++++ .../ConcentratedSouls/ConcentratedSight.png | Bin 0 -> 659 bytes .../ConcentratedSouls/ConcentratedSoul.cs | 31 +++++++++++++ .../ConcentratedSouls/ConcentratedSpite.cs | 12 +++++ .../ConcentratedSouls/ConcentratedSpite.png | Bin 0 -> 725 bytes .../ConcentratedSouls/ConcentratedTime.cs | 11 +++++ .../ConcentratedSouls/ConcentratedTime.png | Bin 0 -> 709 bytes .../Misc/CondensedSouls/CondensedSpite.cs | 41 ------------------ .../Misc/CondensedSouls/CondensedSpite.gif | Bin 8118 -> 0 bytes .../Misc/CondensedSouls/CondensedSpite.png | Bin 2607 -> 0 bytes .../CondensedSouls/CondensedSpiteWiki.png | Bin 789 -> 0 bytes Content/Items/Misc/Souls/SoulofLife.cs | 22 ++++------ Content/Items/Misc/Souls/SoulofSpite.cs | 15 +++---- Content/Items/Misc/Souls/SoulofTime.cs | 9 ++-- Lib/Items/DecimationItem.cs | 2 +- 28 files changed, 155 insertions(+), 73 deletions(-) create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.cs create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.png create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedFright.cs create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedFright.png create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedLife.cs create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedLife.png create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedLight.cs create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedLight.png create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedMight.cs create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedMight.png create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedNight.cs create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedNight.png create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedSight.cs create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedSight.png create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedSoul.cs create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.cs create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.png create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedTime.cs create mode 100644 Content/Items/Misc/ConcentratedSouls/ConcentratedTime.png delete mode 100644 Content/Items/Misc/CondensedSouls/CondensedSpite.cs delete mode 100644 Content/Items/Misc/CondensedSouls/CondensedSpite.gif delete mode 100644 Content/Items/Misc/CondensedSouls/CondensedSpite.png delete mode 100644 Content/Items/Misc/CondensedSouls/CondensedSpiteWiki.png diff --git a/Content/Items/Accessories/Wings/ScarabWings.cs b/Content/Items/Accessories/Wings/ScarabWings.cs index 27df6cf..24f8ae4 100644 --- a/Content/Items/Accessories/Wings/ScarabWings.cs +++ b/Content/Items/Accessories/Wings/ScarabWings.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Decimation.Content.Items.Misc.CondensedSouls; +using Decimation.Content.Items.Misc.ConcentratedSouls; using Decimation.Content.Items.Ores; using Decimation.Content.Projectiles.Item.Accessory; using Decimation.Content.Tiles; @@ -30,10 +30,10 @@ namespace Decimation.Content.Items.Accessories.Wings public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 240; - Lighting.AddLight((int)(player.position.X + player.width / 2f) / 16, - (int)(player.position.Y + player.height / 2f) / 16, 1.05f, 0.95f, 0.55f); + Lighting.AddLight((int) (player.position.X + player.width / 2f) / 16, + (int) (player.position.Y + player.height / 2f) / 16, 1.05f, 0.95f, 0.55f); - if ((int)player.wingTime % 2 == 1) + if ((int) player.wingTime % 2 == 1) Projectile.NewProjectile(player.Center, new Vector2(0, 0), ModContent.ProjectileType(), 25, 5, player.whoAmI); } @@ -56,14 +56,14 @@ namespace Decimation.Content.Items.Accessories.Wings protected override List GetRecipes() { - ModRecipe recipe = GetNewModRecipe(this, 1, new List { ModContent.TileType() }); + ModRecipe recipe = GetNewModRecipe(this, 1, new List {ModContent.TileType()}); recipe.AddIngredient(ItemID.BeetleWings); recipe.AddIngredient(ItemID.WingsSolar); - recipe.AddIngredient(ModContent.ItemType(), 2); + recipe.AddIngredient(ModContent.ItemType(), 2); recipe.AddIngredient(ModContent.ItemType(), 5); - return new List { recipe }; + return new List {recipe}; } } } \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.cs new file mode 100644 index 0000000..efc7b0e --- /dev/null +++ b/Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.cs @@ -0,0 +1,10 @@ +using Terraria.ID; + +namespace Decimation.Content.Items.Misc.ConcentratedSouls +{ + public class ConcentratedFlight : ConcentratedSoul + { + protected override string ItemName => "Concentrated Flight"; + public override int Soul => ItemID.SoulofFlight; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.png new file mode 100644 index 0000000000000000000000000000000000000000..35e6469cc5318564b08ced3cc287c0dfb7230c18 GIT binary patch literal 663 zcmV;I0%-k-P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TRwye{2(wUrR_vr~6t)PZP-KUtk{wz2DGNhGiIqYY%Flu#3maLB zeD}O^U(Vb!nmA{ky1nP#>7JSM%=g{fy(u9gXMFEX4ShTu+^LbrTcq>bxrroIrFDF+ z8m3x0OJsjz=|YnED|7Z53o>;-S{u_yO5>88&*pTs8Z;kp&zR}T7&e7@fo^`BhvV*c zWxVEewFOLT*?wanUUNka;h2WN)y{TY=9AADOohiLWgj$E7OIh-{>FAmQ*-WhWmi_F zWb5>SB#g1C?Xh9W?9wtx=HcvAayGIeX==_|V`(t8K2R+Oz~bYR8pVdqG5CDz=vvYg zduvQ*jBAVG>lb$?V3Wz$l|W~T;Vzx8s*v+~50B+Ij3v#L|MQ1^82Y-Y!~cf;H5MlFwx#jrVsO}b}{YlvBkzNpd9ER2+^kw^E$iDX+{x+KFj=#DX+sUSl- zbmjmXggI-C1^%$S;sV*Cg;TO63e1Q38Fy=pSJS-Pp+>REsjXBaKlgh_lAHC*lHm68 zM$-Bk3pCbu=dFNOXi80nzw7p&{oRd!U@q7DKKHv4e5}m0zD($Oos~_8J2eJSYj}dr zU-q7$P0@8FKzDL&xp%JwFot&$gEK>te6I@v_e$M8@_cPo67M+NH3kx84g{G3?ivFy x2hgp+^lc8h53niVzA=UknxZqrSZXX3dI!ZPEYlU)u_*um002ovPDHLkV1m "Concentrated Fright"; + public override int Soul => ItemID.SoulofFright; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedFright.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedFright.png new file mode 100644 index 0000000000000000000000000000000000000000..973b552aea5f4902c6aa787477a5dd1f3b2fe7b1 GIT binary patch literal 653 zcmV;80&@L{P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0wPI7K~z{r<(M%n z15p^q?+k2WG9U)QU}304Yifc@q?5s>CXi6BrY4C*Er`J&h9c>t9W+5~m?R7) zkr-Gi_ucz9xv%$nPjixc?Jv3f-=$CW{rY|HrDqz9@?yAbrMX+Idd(u+YS8PP#E;=R zzg}8I29C-qRZYz=gz27huwSI~%Up1c!ITl7pfKZU$BL^=iFp;yuEfB`FLN3gTi>HF zdxjh<*hzcU^(txMcikjSIi1%FB=pnK{4> z!koSvY$lteYb+b1%P;VLcz=$*HO5!-7;P7$+H^-FV&vpCU!WY!e^P>EB10MY8uK)k ze6d%+SE!7~^E7+|nO^(<>ED&WTA6BnsqnQiO_vOPY7C&(@C&-{$o>VbimWREx|7$I zerF|sF+7u4*;=LKXPp-~D`jWo!|4eno^j}F4ESXZc$otF8Uru~(5>LS@GM5PLH7Y} n3g~Z)!wsq;GsFp~F~j%;{M`qOw87hG00000NkvXXu0mjfa#k*5 literal 0 HcmV?d00001 diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedLife.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedLife.cs new file mode 100644 index 0000000..1ffc57f --- /dev/null +++ b/Content/Items/Misc/ConcentratedSouls/ConcentratedLife.cs @@ -0,0 +1,11 @@ +using Decimation.Content.Items.Misc.Souls; +using Terraria.ModLoader; + +namespace Decimation.Content.Items.Misc.ConcentratedSouls +{ + public class ConcentratedLife : ConcentratedSoul + { + protected override string ItemName => "Concentrated Life"; + public override int Soul => ModContent.ItemType(); + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedLife.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedLife.png new file mode 100644 index 0000000000000000000000000000000000000000..349f8931106d241ea1b2d20b819a1121b62a1d17 GIT binary patch literal 664 zcmV;J0%!e+P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0xd~IK~z{r<(N+^ zL{S*VFIn&vOi`lj{K>|!u|Sei7Bd<<+cCBz5-DY6_y}YqSx6cdHjIs8vJx9=luy8p z=Dp{+nTO+^;g);&)$KVm)4kLA&HJ7+_f|MQL^k5D#VqWf%WG%*-uIj!s8ks`KFl75 zz-?kua?4qk9FJc~Y6-|__>IBTLgHCok2+J549v}K)<^=c2Eh-_{rwt?40TEd)xGu@ zV?L~7KxZUY?;8KN#ykUnOf>cOmwv9{_BdOXL5qx$Azin@RR8=^F+2vNjcQa%sxKyK zYRa|}K|$lXbr65bj^ zZDCJr+FX?cg|W=1wZQ8acPC(z_ID-!o6s53!CkuE)gk96&o1PB82d9Te`V3o`$N6| z>x6&hFBe^HG2g8r`*_8H?EV%F0mYV(lQhIHu60X7J8;a&MvYH5ou%5gK?EJsk_dbmDgZ;kP6x-&0o^fi&5s2Y`0ILS$# z#;Ya4Wo}k7^fl&dY~sP40ngABe$K}C68Hty>fGq>y` "Concentrated Light"; + public override int Soul => ItemID.SoulofLight; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedLight.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedLight.png new file mode 100644 index 0000000000000000000000000000000000000000..76998e0e246613c430fbb8d14f4a8547e4dc3161 GIT binary patch literal 658 zcmV;D0&V??P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0w+mCK~z{r<(M%` zLQxoowWX~epw>{<7CAJC(a=yL4Q)E~7cxQ{iU@>gN+q%%kp@LW$gQCv5{ZVwt#qmM z2LugGhTlD}g?a=953~rxTS> zky6zh;AQ|fIXJ7b*FBEc-0|EjUB7nsK<8C!iep=2%^Pc&>ekj@V*eWJ7Flg^daX5m zjq&FdurkHr<~ZD>e#T^bBA5?fh*o<>-s7TW^5IEQ-sV;)IlKn-F(xx*Wk`n19N-3F z&bG!ZZ!A+Bro)%Kr=wrs^YHl`eQS)*=GnC=TAgt(1VpQq>P>-is+Ob#QU4dE?Q6`^ zSoGDL0iU5V{9TB62LkX5WX8`afONGzXGdg7GQ)2+NhJVoGC+0tBRb;CY zV0H4^(r>Q>Fot&$TL;^ee6O "Concentrated Might"; + public override int Soul => ItemID.SoulofMight; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedMight.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedMight.png new file mode 100644 index 0000000000000000000000000000000000000000..cb8f629c682de0a145214c504f992a126940f190 GIT binary patch literal 652 zcmV;70(1R|P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0wGC6K~z{r?U+p~ zgi#d7XM6=aWFfLdBa5-37&R*yDc^vGogyzyq}1$~_y%4Yn$?sUMJb91$->J@%+Ai9 zoO}N2Il1ngX%_d&ub%#AUV3KEZ_a)0%!K|alQ5?}b-N#21t}%UKi4nRa5{&5muxCN zHbgf;eq)a-rb_1AH5Om`AQRu6%Z`PqNIymBvZxYN+nl?`7S5D07|73u1D(RCG-WdU zca3ps(Hdj3EqyU%$iU-4p)7;$8-p1g(%8fC0A(z-ObO!AX0C!v_K#57nsfg;1|!2= zN?i6_H3ma?d}}Ufs*swctZQqhl$36+DOZa-l(y#FH?}hO^N2}vy4iv`iSBv+8#B!q z&|SZz86ZvizbZM6*D<+=0+@rbOm`Cx@^8!*oheDB=KM9L`@Ur| zC6VSN(xiXJu=#Md-DU%@`I&(l8ggIx88Q)mu zDniHp$Q>Qk0_Vf|CH~Hs?B>2!eSh{RnT$U35arkQtRLdMNnF9VA126}$T0#EwiL2ki>I2dg m@ZXq38ni`cNaComQ0Nnh@gq)|o*5bd0000 "Concentrated Night"; + public override int Soul => ItemID.SoulofNight; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedNight.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedNight.png new file mode 100644 index 0000000000000000000000000000000000000000..fc808decf12f7d0f8f8db7e4c7cc072c92354aa2 GIT binary patch literal 683 zcmV;c0#yBpP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zgSbK~z{r-I&WO zL{S{aFZma2ypqS7g(yl{Fv`xt6e%k!EJ(;k%0eCsl(LW#nX#}^hJ{iTS$Hf_^4j<# z$nT!7+%IR&8IL;0r*6MKyO0 z!i?8bZPI7jV@auO0_RQkhvyZ>q-e+6;;gY8o-t+$bLiv!U^bBPY~tYJS!#WdEA^+i zn=v*9kd^yXSi#V2`mBNfyDE96oGtEypBgdY{&fu8&b)|0WC__T9?1IAPV+=XMiP zZOyrFOqV4_mo1oMbmROr22;3R>Gnc~uU~8iu*v_kDs3~yaOM{3s^t8h!&7I}o2g7~{Uz>aEK_vZV!oR-e~t0=3YbhWY>r`*{u$HliQu{IMzy}C>p|USDOL)? z+pXMWsZ@qD=#Md-DU%@`I&**x!kn|lj6bY;sYs6T>18>73w$0vpYb=Xm4jukv3?OT`gD%+!@1SkbtxAB^$=UL6uLLlLXA;9xBT{*H};F_-~A1gSO}lF^(Dwf>(osB8?iG RGKv5I002ovPDHLkV1iM5K$-vm literal 0 HcmV?d00001 diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedSight.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedSight.cs new file mode 100644 index 0000000..384b047 --- /dev/null +++ b/Content/Items/Misc/ConcentratedSouls/ConcentratedSight.cs @@ -0,0 +1,10 @@ +using Terraria.ID; + +namespace Decimation.Content.Items.Misc.ConcentratedSouls +{ + public class ConcentratedSight : ConcentratedSoul + { + protected override string ItemName => "Concentrated Sight"; + public override int Soul => ItemID.SoulofSight; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedSight.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedSight.png new file mode 100644 index 0000000000000000000000000000000000000000..a8f4475bc8a04a45ab291145b9410ffc26c04e93 GIT binary patch literal 659 zcmV;E0&M+>P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0w_sDK~z{r-IzNp z1W^=*muyKbA=$zs3I&A*QHZed2!%o+bVRYyA{vc^=++iOM?*wdA+kgiVz*HcQ3x6d zqNbA|d*=RQ=d5e4&4fAoB{%=w*~w()%Q<%*1p&^|(1)5?jI3nu^9K~F^c`O|Oic~8 zI`;#sN1mGXu`y*TH9STe8kVD!S;kg)!*D)7UiRmfI(%L#o&f~>7W%OX3($t)9jRjTO*tKQ24smlF{J)pH zr8GrOSK7Edx$^akcPHQ`^Pnp^Ihup9SW`XiA2~gv?J$-%D}VNhr440{e?m}=8KSE# zPOh~k*BD=~fSV}}H^<>7O+#2Iob6xzbW^QQ0lE`!(B*5^8?-69 zt_0}Lg^<<#a_^M@#_&yIVt$g6-|O7Ky;66NyxiKL#5WGP#(-DmfSV~G*BF2~fNlk* tUvu~~KQ{&B8{=?;rsxcDd}=HZ_ym)rDlZl9BkuqJ002ovPDHLkV1iC;BryO0 literal 0 HcmV?d00001 diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedSoul.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedSoul.cs new file mode 100644 index 0000000..19cccd3 --- /dev/null +++ b/Content/Items/Misc/ConcentratedSouls/ConcentratedSoul.cs @@ -0,0 +1,31 @@ +using Decimation.Lib.Items; +using Decimation.Lib.Util; +using Decimation.Lib.Util.Builder; +using Terraria; +using Terraria.ID; +using Terraria.ModLoader; + +namespace Decimation.Content.Items.Misc.ConcentratedSouls +{ + public abstract class ConcentratedSoul : DecimationItem + { + public abstract int Soul { get; } + + protected override void Init() + { + item.width = 38; + item.height = 50; + item.value = Item.sellPrice(gold: 1, silver: 50); + item.rare = Rarity.Pink.GetRarityValue(); + item.maxStack = 99; + } + + protected override ModRecipe GetRecipe() + { + return new RecipeBuilder(this) + .WithIngredient(Soul, 50) + .WithStation(TileID.AlchemyTable) + .Build(); + } + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.cs new file mode 100644 index 0000000..e3082d0 --- /dev/null +++ b/Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.cs @@ -0,0 +1,12 @@ +using Decimation.Content.Items.Misc.Souls; +using Terraria.ModLoader; + +namespace Decimation.Content.Items.Misc.ConcentratedSouls +{ + internal class ConcentratedSpite : ConcentratedSoul + { + protected override string ItemName => "Condensed Spite"; + protected override string ItemTooltip => "His soul emanates a primal sense of hatred"; + public override int Soul => ModContent.ItemType(); + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.png new file mode 100644 index 0000000000000000000000000000000000000000..118dc753cbac1d0ccae38293176006a7d80cdc78 GIT binary patch literal 725 zcmV;`0xJE9P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0%}P_K~z{r)tEa^ z8$lF>*A{;wi9`WL>5?c=ku)g?Nhpwr2=tU-XcLiw0z{Dpu-mi|4*_z)yPyFo66H}L zOoK#zLCVNRb9at~55CM`C}uusbY{)^F&}qkb~lp{DswhDJ1>! zKHxgvMb>6;)J6qU`JpFr407%5lEs-7Nj3pfZ-$@Caqh!A$>PAYWV7bNHKv-fBd_uO zM1sv-Gv+YtOSr}`;<3p=d7*rECW(P&oF*XNau(0%7l1+8=^w!mu#_8V9tqg~64DjsIY6_-$r)K0B^mXTK zub%POLz2Gc;xXoeP3=rgN!;+x?vkXhxp-@gS8%PiV2;twi{BVuWw@>q zc>Q8CfK5g}E7c!nt}<|?(Fim0Mx!sj=*pO84{K=WYlLsitn8+lJ@INYwRP8Pt7Zs) zR^Ap~&l=U0VeIf&&huTrK)l9yy#g*%44Y%vWPHZ7JrQJI&e~pM-d4WaUdmQ>M6z=5 zNs{3jjK`Q}%4JAHGY8lp%mr)A`NJj(8`4I<{gZZI;PdeLOuRM5qp9>C+1|}Odev=v z^<3rKiv{?x-JGr*v+baQ#;hDt8FX^7fdz}mHmD(QpXFa`d#WRk0je+|z z2VAB=yv6{`0nApgaa6Xwo5Ab@YzoA0jA4VmXoi?TjU~w?l`k|u-9ooV00000NkvXX Hu0mjfI?q^P literal 0 HcmV?d00001 diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedTime.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedTime.cs new file mode 100644 index 0000000..0c6b483 --- /dev/null +++ b/Content/Items/Misc/ConcentratedSouls/ConcentratedTime.cs @@ -0,0 +1,11 @@ +using Decimation.Content.Items.Misc.Souls; +using Terraria.ModLoader; + +namespace Decimation.Content.Items.Misc.ConcentratedSouls +{ + public class ConcentratedTime : ConcentratedSoul + { + protected override string ItemName => "Concentrated Time"; + public override int Soul => ModContent.ItemType(); + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedTime.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedTime.png new file mode 100644 index 0000000000000000000000000000000000000000..f00b87c44198c2684587d62f60849adde9c70c99 GIT binary patch literal 709 zcmV;$0y_PPP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0$NE#K~z{r<(R)~ zlR+5A-{c=qL^4>&P+L0cki|-eKx2luDeY8>;2>gJ+*%a+3hJPP*obuyq;zR*i%T40 zS~7(G5HnQ7DY_Kep%iB)f86ulx0)w;au=xK4nJ^w@4`#+-Y3u9C2uScNQ8x-x=S2{ zdGXqRL0qSEG+BVDt2g>-eC^aQW$xh|Ww*>ZZ0z#=sFsR%$wYE}o5rg{DHXw$YK;=( zZkcn|*wKwCQ?TU%?$_AOmr)HBKcA%hUj0A`uu4~6)G7bl8v8SAW{xA7>d$1Y>at!g zb!6BBV*vY_CXqTpDVfTK4`>W>gMGT!$i$^lN?UUt88g65mBKreXU?6cBys;(5bHfnU8?fwP)HOBWV zU^2zw<~ZD>f5xOU5xg#M>0WE*XU23dV*K6$P~A+_p2k=k*A_rv>h{H-xQo5{)(-D^)zdQkTo*{f_)K26`I1o5w@DV?t|qp|#M zGy^_ETku2@y!y7LdlC2s3d!j6{9lzo&CIsGYg2WM-&qM@49_H{9#2#9v(5z0O6iRJ^k$h7&p7-w29C=dFqs1W8Uru~uv)>}%`dvw r9;`mVO#%OnakxQSBtslWjRnCkaM~Owe#rwa00000NkvXXu0mjfim6VB literal 0 HcmV?d00001 diff --git a/Content/Items/Misc/CondensedSouls/CondensedSpite.cs b/Content/Items/Misc/CondensedSouls/CondensedSpite.cs deleted file mode 100644 index e18afea..0000000 --- a/Content/Items/Misc/CondensedSouls/CondensedSpite.cs +++ /dev/null @@ -1,41 +0,0 @@ -using Decimation.Content.Items.Misc.Souls; -using Decimation.Content.Tiles; -using Decimation.Lib.Items; -using Decimation.Lib.Util; -using Terraria; -using Terraria.DataStructures; -using Terraria.ID; -using Terraria.ModLoader; - -namespace Decimation.Content.Items.Misc.CondensedSouls -{ - internal class CondensedSpite : DecimationItem - { - protected override string ItemName => "Condensed Spite"; - protected override string ItemTooltip => "his soul emanates a primal sense of hatred"; - protected override DrawAnimation Animation => new DrawAnimationVertical(5, 4); - - protected override void Init() - { - this.item.CloneDefaults(ItemID.SoulofSight); - - item.width = 44; - item.height = 44; - item.value = Item.sellPrice(0, 50); - item.rare = Rarity.Red.GetRarityValue(); - - ItemID.Sets.AnimatesAsSoul[this.item.type] = true; - ItemID.Sets.ItemIconPulse[this.item.type] = true; - ItemID.Sets.ItemNoGravity[this.item.type] = true; - } - - protected override ModRecipe GetRecipe() - { - ModRecipe recipe = GetNewModRecipe(this, 1, ModContent.TileType()); - - recipe.AddIngredient(ModContent.ItemType(), 50); - - return recipe; - } - } -} \ No newline at end of file diff --git a/Content/Items/Misc/CondensedSouls/CondensedSpite.gif b/Content/Items/Misc/CondensedSouls/CondensedSpite.gif deleted file mode 100644 index 5e1f1b1464053a9be9c9cbb94ece010a174ad235..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8118 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 Rk^lez07*qoM6N<$f&fO=6_@}3 diff --git a/Content/Items/Misc/CondensedSouls/CondensedSpiteWiki.png b/Content/Items/Misc/CondensedSouls/CondensedSpiteWiki.png deleted file mode 100644 index 25031df6f50ba68909a7709150c6985c93b331db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 789 zcmV+w1M2*VP)90F%0L)9hbEh)o)ZGO`R+m!1?M2$L#!sBjEB+IT4+o_BohtY;C%JZ)aUQ zbx?TEccKcrcE_Xv$p9vx+Y5Fry@aPKH~L`>qVx$UsFUwe^Bbj zL8IDtx!aISXak1^FvWaiSD(K-4YE9z0Cy+t`yg@&_6H(pCr*EqYP`Ybm0T)I4lte8 z$O=KSJ?;jWm$EX1`id?hYdAH)Sc&GFJl8;ufpKg1Z)}%OBUiR1ANRRQY)*nm$omJm zL^6OS7YM3hWN}QB@LjGsK3)y|UYb-BGR+gi$pO{^2iI<|KI0$A9yy zG3k4OOC$?80M052?w7=vKcrHnLiw?ebTqD_1S{YC3@us3@Ryx_{sw zP;6Axum%+GlLIWBcF8}31q#e)ZWDD)AH%v-(uh0q+<;>iHHba~V|Wl?V&-@NC@}m> T59V6@00000NkvXXu0mjfb)Io- diff --git a/Content/Items/Misc/Souls/SoulofLife.cs b/Content/Items/Misc/Souls/SoulofLife.cs index c874573..c169db2 100644 --- a/Content/Items/Misc/Souls/SoulofLife.cs +++ b/Content/Items/Misc/Souls/SoulofLife.cs @@ -1,4 +1,5 @@ using Decimation.Lib.Items; +using Decimation.Lib.Util; using Terraria; using Terraria.DataStructures; using Terraria.ID; @@ -14,20 +15,15 @@ namespace Decimation.Content.Items.Misc.Souls protected override void Init() { - Item refItem = new Item(); - refItem.SetDefaults(ItemID.SoulofSight); + item.width = 22; + item.height = 22; + item.maxStack = 999; + item.value = Item.sellPrice(silver: 3); + item.rare = Rarity.Pink.GetRarityValue(); - item.width = refItem.width; - item.height = refItem.height; - item.width = 20; - item.height = 20; - item.value = Item.sellPrice(silver: 2); - - this.item.maxStack = 999; - - ItemID.Sets.AnimatesAsSoul[this.item.type] = true; - ItemID.Sets.ItemIconPulse[this.item.type] = true; - ItemID.Sets.ItemNoGravity[this.item.type] = true; + ItemID.Sets.AnimatesAsSoul[item.type] = true; + ItemID.Sets.ItemIconPulse[item.type] = true; + ItemID.Sets.ItemNoGravity[item.type] = true; } public class SoulGlobalNPC : GlobalNPC diff --git a/Content/Items/Misc/Souls/SoulofSpite.cs b/Content/Items/Misc/Souls/SoulofSpite.cs index ae366d5..34d0d6d 100644 --- a/Content/Items/Misc/Souls/SoulofSpite.cs +++ b/Content/Items/Misc/Souls/SoulofSpite.cs @@ -1,4 +1,5 @@ using Decimation.Lib.Items; +using Decimation.Lib.Util; using Terraria; using Terraria.DataStructures; using Terraria.ID; @@ -13,17 +14,15 @@ namespace Decimation.Content.Items.Misc.Souls protected override void Init() { - Item refItem = new Item(); - refItem.SetDefaults(ItemID.SoulofSight); - - item.width = refItem.width; - item.height = refItem.height; + item.width = 22; + item.height = 22; item.maxStack = 999; item.value = Item.sellPrice(silver: 3); + item.rare = Rarity.Pink.GetRarityValue(); - ItemID.Sets.AnimatesAsSoul[this.item.type] = true; - ItemID.Sets.ItemIconPulse[this.item.type] = true; - ItemID.Sets.ItemNoGravity[this.item.type] = true; + ItemID.Sets.AnimatesAsSoul[item.type] = true; + ItemID.Sets.ItemIconPulse[item.type] = true; + ItemID.Sets.ItemNoGravity[item.type] = true; } // Uncomment when Slime Prince will be done diff --git a/Content/Items/Misc/Souls/SoulofTime.cs b/Content/Items/Misc/Souls/SoulofTime.cs index cfe9f2f..a3f5ec4 100644 --- a/Content/Items/Misc/Souls/SoulofTime.cs +++ b/Content/Items/Misc/Souls/SoulofTime.cs @@ -15,10 +15,13 @@ namespace Decimation.Content.Items.Misc.Souls protected override void Init() { item.width = 22; - item.height = 24; - item.value = Item.sellPrice(0, 0, 3); - item.rare = Rarity.Orange.GetRarityValue(); + item.height = 22; + item.maxStack = 999; + item.value = Item.sellPrice(silver: 3); + item.rare = Rarity.Pink.GetRarityValue(); + ItemID.Sets.AnimatesAsSoul[item.type] = true; + ItemID.Sets.ItemIconPulse[item.type] = true; ItemID.Sets.ItemNoGravity[item.type] = true; } } diff --git a/Lib/Items/DecimationItem.cs b/Lib/Items/DecimationItem.cs index 8ddfa3c..061d435 100644 --- a/Lib/Items/DecimationItem.cs +++ b/Lib/Items/DecimationItem.cs @@ -28,7 +28,7 @@ namespace Decimation.Lib.Items this.item.width = 16; this.item.useAnimation = 20; this.item.useTime = 20; - this.item.useStyle = 1; + this.item.useStyle = 0; this.item.maxStack = 999; this.item.noMelee = true; this.item.UseSound = SoundID.Item1;