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 c4cf410..4bdcb84 100644 Binary files a/Content/Items/Weapons/TitanicPike.png and b/Content/Items/Weapons/TitanicPike.png differ 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 c31e898..a95d7f4 100644 Binary files a/Content/Projectiles/TitanicPikeProjectile.png and b/Content/Projectiles/TitanicPikeProjectile.png differ