From 340d245cbdb9b1d7ee3d0691903554080b7b85ab Mon Sep 17 00:00:00 2001 From: FyloZ Date: Tue, 23 Jun 2020 14:28:18 -0400 Subject: [PATCH] Updated the Hour Hand --- Content/Items/Weapons/HourHand.cs | 15 ++++++++++++--- Content/Projectiles/HourHandProjectile.cs | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Content/Items/Weapons/HourHand.cs b/Content/Items/Weapons/HourHand.cs index 3dda6e2..097eb98 100644 --- a/Content/Items/Weapons/HourHand.cs +++ b/Content/Items/Weapons/HourHand.cs @@ -1,7 +1,9 @@ +using Decimation.Content.Projectiles; using Decimation.Lib.Items; using Microsoft.Xna.Framework; using Terraria; using Terraria.ID; +using Terraria.ModLoader; namespace Decimation.Content.Items.Weapons { @@ -10,8 +12,8 @@ namespace Decimation.Content.Items.Weapons protected override string ItemName => "Hour Hand"; protected override string ItemTooltip => "The sands of time flow in your favor!"; protected override int Damages => 45; - protected override string ProjectileName => "HourHandProjectile"; - + protected override int ProjectileId => ModContent.ProjectileType(); + protected override void InitWeapon() { item.width = 32; @@ -23,19 +25,26 @@ namespace Decimation.Content.Items.Weapons item.rare = 2; item.crit = 7; item.shootSpeed = 10f; + item.autoReuse = true; } public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { - if (Main.rand.NextBool()) player.AddBuff(BuffID.Swiftness, 1500); + if (Main.rand.NextBool()) player.AddBuff(BuffID.Swiftness, 300); return true; } + public override void OnHitNPC(Player player, NPC target, int damage, float knockBack, bool crit) + { + if (Main.rand.NextBool()) target.AddBuff(BuffID.Slow, 300); + } + public override void MeleeEffects(Player player, Rectangle hitbox) { Lighting.AddLight(item.Center, 0f, 0f, 1f); } } + } \ No newline at end of file diff --git a/Content/Projectiles/HourHandProjectile.cs b/Content/Projectiles/HourHandProjectile.cs index 6d38551..0138b8b 100644 --- a/Content/Projectiles/HourHandProjectile.cs +++ b/Content/Projectiles/HourHandProjectile.cs @@ -14,7 +14,7 @@ namespace Decimation.Content.Projectiles projectile.width = 10; projectile.height = 10; projectile.timeLeft = 600; - projectile.penetrate = 1; + projectile.penetrate = -1; projectile.aiStyle = 8; aiType = 253; }