From 05149c4341bf4b23106356a22577b0b67bc7786c Mon Sep 17 00:00:00 2001
From: FyloZ <fylozdev@gmail.com>
Date: Mon, 30 Mar 2020 12:39:49 -0400
Subject: [PATCH] The bloody lunar tablet could be used at day time Fixed the
 sling and the slingshot Balanced the sling and the slingshot

---
 Content/Items/Ammo/Pebble.cs            |  2 +-
 Content/Items/Misc/BloodyLunarTablet.cs |  3 +--
 Content/Items/Weapons/Sling.cs          | 15 +++++++++------
 Content/Items/Weapons/SlingshotWood.cs  |  9 ++++-----
 Content/Projectiles/Pebble.cs           |  6 +-----
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/Content/Items/Ammo/Pebble.cs b/Content/Items/Ammo/Pebble.cs
index 5c8acae..eb63ffd 100644
--- a/Content/Items/Ammo/Pebble.cs
+++ b/Content/Items/Ammo/Pebble.cs
@@ -10,7 +10,7 @@ namespace Decimation.Content.Items.Ammo
         protected override string ItemName => "Pebble";
         protected override string ItemTooltip => "For use with slings and slingshots";
         protected override string Projectile => "Pebble";
-        protected override int Ammo => ModContent.ItemType<Pebble>();
+        protected override int Ammo => item.type;
         protected override int Damages => 11;
 
         protected override void InitAmmo()
diff --git a/Content/Items/Misc/BloodyLunarTablet.cs b/Content/Items/Misc/BloodyLunarTablet.cs
index b59d35e..10f7c6a 100644
--- a/Content/Items/Misc/BloodyLunarTablet.cs
+++ b/Content/Items/Misc/BloodyLunarTablet.cs
@@ -19,8 +19,7 @@ namespace Decimation.Content.Items.Misc
             item.useTime = 20;
             item.useAnimation = 20;
             item.consumable = true;
-
-            this.item.maxStack = 1;
+            item.maxStack = 1;
         }
 
         public override bool CanUseItem(Player player)
diff --git a/Content/Items/Weapons/Sling.cs b/Content/Items/Weapons/Sling.cs
index caa255c..81b1d3d 100644
--- a/Content/Items/Weapons/Sling.cs
+++ b/Content/Items/Weapons/Sling.cs
@@ -1,6 +1,9 @@
+using Decimation.Content.Items.Ammo;
 using Decimation.Lib.Items;
 using Decimation.Lib.Util;
 using Terraria.ID;
+using Terraria.ModLoader;
+using Terraria.ModLoader.Config;
 
 namespace Decimation.Content.Items.Weapons
 {
@@ -8,7 +11,7 @@ namespace Decimation.Content.Items.Weapons
     {
         protected override string ItemName => "Sling";
         protected override string ItemTooltip => "Uses pebbles and marbles as ammo";
-        protected override DamageType DamagesType => DamageType.Ranged;
+        protected override DamageType DamagesType => DamageType.Throw;
         protected override int Damages => 9;
         protected override string Ammo => "Pebble";
 
@@ -16,13 +19,13 @@ namespace Decimation.Content.Items.Weapons
         {
             item.width = 30;
             item.height = 22;
-            item.useTime = 16;
-            item.useAnimation = 16;
-            item.knockBack = 6;
+            item.useTime = 25;
+            item.useAnimation = 25;
             item.rare = Rarity.Orange.GetRarityValue();
-            item.UseSound = SoundID.Item5;
-            item.shootSpeed = 10f;
+            item.shootSpeed = 7.5f;
             item.crit = 10;
+            item.shoot = 1;
+            item.useTurn = false;
         }
     }
 }
\ No newline at end of file
diff --git a/Content/Items/Weapons/SlingshotWood.cs b/Content/Items/Weapons/SlingshotWood.cs
index d7b6c5e..b03de69 100644
--- a/Content/Items/Weapons/SlingshotWood.cs
+++ b/Content/Items/Weapons/SlingshotWood.cs
@@ -12,22 +12,21 @@ namespace Decimation.Content.Items.Weapons
         protected override string ItemTooltip => "Uses pebbles and marbles as ammo";
         protected override DamageType DamagesType => DamageType.Throw;
         protected override int Damages => 7;
+        protected override string Ammo => "Pebble";
 
         protected override void InitWeapon()
         {
-            this.item.noMelee = true;
             item.width = 32;
             item.height = 32;
             item.useTime = 16;
             item.useAnimation = 16;
             item.useStyle = 5;
-            this.item.shoot = 1;
-            item.useAmmo = ModContent.ItemType<Pebble>();
-            item.knockBack = 6;
+            item.shoot = 1;
             item.rare = Rarity.Orange.GetRarityValue();
             item.UseSound = SoundID.Item5;
-            item.shootSpeed = 10f;
+            item.shootSpeed = 5f;
             item.crit = 10;
+            item.useTurn = false;
         }
 
         protected override ModRecipe GetRecipe()
diff --git a/Content/Projectiles/Pebble.cs b/Content/Projectiles/Pebble.cs
index 0edf70c..4d4d289 100644
--- a/Content/Projectiles/Pebble.cs
+++ b/Content/Projectiles/Pebble.cs
@@ -1,10 +1,5 @@
-using Decimation.Content.Items.Weapons;
 using Decimation.Lib.Items;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Terraria;
 using Terraria.ID;
-using Terraria.ModLoader;
 
 namespace Decimation.Content.Projectiles
 {
@@ -23,6 +18,7 @@ namespace Decimation.Content.Projectiles
             projectile.scale = 0.625f;
             projectile.aiStyle = 1;
             DamageType = DecimationWeapon.DamageType.Ranged;
+            projectile.knockBack = 6;
             projectile.penetrate = 5;
             projectile.timeLeft = 600;
             projectile.alpha = 0;