diff --git a/Content/Items/Ammo/TitanicStyngerBolt.cs b/Content/Items/Ammo/ScytheStyngerBolt.cs similarity index 93% rename from Content/Items/Ammo/TitanicStyngerBolt.cs rename to Content/Items/Ammo/ScytheStyngerBolt.cs index 447f82e..b7165d9 100644 --- a/Content/Items/Ammo/TitanicStyngerBolt.cs +++ b/Content/Items/Ammo/ScytheStyngerBolt.cs @@ -11,9 +11,9 @@ using Terraria.ModLoader; namespace Decimation.Content.Items.Ammo { - internal class TitanicStyngerBolt : DecimationAmmo + internal class ScytheStyngerBolt : DecimationAmmo { - protected override string ItemName => "Titanic Stynger Bolt"; + protected override string ItemName => "The Scythe Stynger Bolt"; protected override string ItemTooltip => "Explodes into deadly shrapnel."; protected override string Projectile => "TitanicStyngerBolt"; protected override int Ammo => AmmoID.StyngerBolt; diff --git a/Content/Items/Ammo/TitanicStyngerBolt.png b/Content/Items/Ammo/ScytheStyngerBolt.png similarity index 100% rename from Content/Items/Ammo/TitanicStyngerBolt.png rename to Content/Items/Ammo/ScytheStyngerBolt.png diff --git a/Content/Items/Weapons/TitanicGatliStynger.cs b/Content/Items/Weapons/Scythe.cs similarity index 61% rename from Content/Items/Weapons/TitanicGatliStynger.cs rename to Content/Items/Weapons/Scythe.cs index 22fa78a..b88dd11 100644 --- a/Content/Items/Weapons/TitanicGatliStynger.cs +++ b/Content/Items/Weapons/Scythe.cs @@ -1,8 +1,10 @@ -using Decimation.Content.Items.Ores; +using Decimation.Content.Items.Misc.ConcentratedSouls; +using Decimation.Content.Items.Ores; using Decimation.Content.Items.Weapons.Arachnus; using Decimation.Content.Projectiles.Item.Weapon; using Decimation.Content.Tiles; using Decimation.Lib.Items; +using Decimation.Lib.Util.Builder; using Microsoft.Xna.Framework; using Terraria; using Terraria.ID; @@ -10,13 +12,13 @@ using Terraria.ModLoader; namespace Decimation.Content.Items.Weapons { - internal class TitanicGatliStynger : DecimationWeapon + internal class Scythe : DecimationWeapon { - protected override string ItemName => "Titanic Gatli Stynger"; + protected override string ItemName => "The Scythe"; protected override string ItemTooltip => "Feel the rage of Kronos by your side."; protected override DamageType DamagesType => DamageType.Ranged; protected override int Damages => 950; - protected override int ProjectileId => ModContent.ProjectileType(); + protected override int ProjectileId => ModContent.ProjectileType(); protected override void InitWeapon() { @@ -30,25 +32,24 @@ namespace Decimation.Content.Items.Weapons item.useAnimation = 10; item.rare = 10; item.autoReuse = true; - item.value = Item.sellPrice(0, 60); + item.value = Item.sellPrice(gold: 60); } protected override ModRecipe GetRecipe() { - ModRecipe recipe = GetNewModRecipe(this, 1, ModContent.TileType()); - - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ModContent.ItemType(), 15); - // TODO recipe.AddIngredient(null, "CondensedMight", 5); - recipe.AddIngredient(ModContent.ItemType()); - - return recipe; + return new RecipeBuilder(this) + .WithIngredient(ModContent.ItemType()) + .WithIngredient(ModContent.ItemType(), 15) + .WithIngredient(ModContent.ItemType()) + .WithIngredient(ModContent.ItemType(), 5) + .WithStation(ModContent.TileType()) + .Build(); } public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { - type = ModContent.ProjectileType(); + type = ModContent.ProjectileType(); return true; } } diff --git a/Content/Items/Weapons/TitanicGatliStynger.png b/Content/Items/Weapons/Scythe.png similarity index 100% rename from Content/Items/Weapons/TitanicGatliStynger.png rename to Content/Items/Weapons/Scythe.png diff --git a/Content/Projectiles/Item/Weapon/TitanicStyngerBolt.cs b/Content/Projectiles/Item/Weapon/ScytheStyngerBolt.cs similarity index 95% rename from Content/Projectiles/Item/Weapon/TitanicStyngerBolt.cs rename to Content/Projectiles/Item/Weapon/ScytheStyngerBolt.cs index 97c7fb0..afa5889 100644 --- a/Content/Projectiles/Item/Weapon/TitanicStyngerBolt.cs +++ b/Content/Projectiles/Item/Weapon/ScytheStyngerBolt.cs @@ -9,11 +9,11 @@ using Terraria.ModLoader; namespace Decimation.Content.Projectiles.Item.Weapon { - internal class TitanicStyngerBolt : DecimationProjectile + internal class ScytheStyngerBolt : DecimationProjectile { public override void SetStaticDefaults() { - DisplayName.SetDefault("Titanic Stynger Bolt"); + DisplayName.SetDefault("The Scythe Stynger Bolt"); ProjectileID.Sets.TrailCacheLength[projectile.type] = 5; ProjectileID.Sets.TrailingMode[projectile.type] = 0; } diff --git a/Content/Projectiles/Item/Weapon/TitanicStyngerBolt.png b/Content/Projectiles/Item/Weapon/ScytheStyngerBolt.png similarity index 100% rename from Content/Projectiles/Item/Weapon/TitanicStyngerBolt.png rename to Content/Projectiles/Item/Weapon/ScytheStyngerBolt.png