Merge pull request #23 from Nick-NCSU/development

Development

Buffs/ChlorophyteBuff.cs

@@ -6,19 +6,19 @@
 
 namespace DubNation.Buffs
 {
-	public class ChlorophyteBuff : ModBuff
+	public class ShroomiteBuff : ModBuff
 	{
 		public override void SetDefaults()
 		{
-			DisplayName.SetDefault("Chlorophyte Minion");
-			Description.SetDefault("The chlorophyte minion will fight for you");
+			DisplayName.SetDefault("Shroomite Minion");
+			Description.SetDefault("The shroomite minion will fight for you");
 			Main.buffNoSave[Type] = true;
 			Main.buffNoTimeDisplay[Type] = true;
 		}
 
 		public override void Update(Player player, ref int buffIndex)
 		{
-			if (player.ownedProjectileCounts[ModContent.ProjectileType<Projectiles.ChlorophyteMinion>()] > 0)
+			if (player.ownedProjectileCounts[ModContent.ProjectileType<Projectiles.ShroomiteMinion>()] > 0)
 			{
 				player.buffTime[buffIndex] = 18000;
 			}

Buffs/ShroomiteBuff.cs

@@ -0,0 +1,32 @@
+using Microsoft.Xna.Framework;
+using System;
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace DubNation.Buffs
+{
+	public class ChlorophyteBuff : ModBuff
+	{
+		public override void SetDefaults()
+		{
+			DisplayName.SetDefault("Chlorophyte Minion");
+			Description.SetDefault("The chlorophyte minion will fight for you");
+			Main.buffNoSave[Type] = true;
+			Main.buffNoTimeDisplay[Type] = true;
+		}
+
+		public override void Update(Player player, ref int buffIndex)
+		{
+			if (player.ownedProjectileCounts[ModContent.ProjectileType<Projectiles.ChlorophyteMinion>()] > 0)
+			{
+				player.buffTime[buffIndex] = 18000;
+			}
+			else
+			{
+				player.DelBuff(buffIndex);
+				buffIndex--;
+			}
+		}
+	}
+}

Items/ChlorophyteStaff.cs

@@ -18,7 +18,7 @@ public override void SetStaticDefaults()
 
 		public override void SetDefaults()
 		{
-			item.damage = 10;
+			item.damage = 30;
 			item.width = 40;
 			item.height = 40;
 			item.useTime = 36;

Items/ShroomiteStaff.cs

@@ -0,0 +1,54 @@
+using Microsoft.Xna.Framework;
+using System;
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace DubNation.Items
+{
+	class ShroomiteStaff : ModItem
+	{
+		public override void SetStaticDefaults()
+		{
+			DisplayName.SetDefault("Shroomite Staff");
+			Tooltip.SetDefault("Summons a shroomite minion to fight for you.");
+			ItemID.Sets.GamepadWholeScreenUseRange[item.type] = true;
+			ItemID.Sets.LockOnIgnoresCollision[item.type] = true;
+		}
+
+		public override void SetDefaults()
+		{
+			item.damage = 30;
+			item.width = 40;
+			item.height = 40;
+			item.useTime = 36;
+			item.useAnimation = 36;
+			item.useStyle = ItemUseStyleID.SwingThrow;
+			item.value = 10;
+			item.rare = ItemRarityID.Blue;
+			item.UseSound = SoundID.Item1;
+			item.mana = 10;
+			item.noMelee = true;
+			item.summon = true;
+			item.buffType = ModContent.BuffType<Buffs.ShroomiteBuff>();
+			item.shoot = ModContent.ProjectileType<Projectiles.ShroomiteMinion>();
+		}
+
+		public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack)
+		{
+			player.AddBuff(item.buffType, 2);
+			position = Main.MouseWorld;
+			return true;
+		}
+
+		public override void AddRecipes()
+		{
+			ModRecipe recipe = new ModRecipe(mod);
+			recipe.AddIngredient(ItemID.ChlorophyteBar, 9);
+			recipe.AddIngredient(ItemID.TurtleShell, 1);
+			recipe.AddTile(TileID.MythrilAnvil);
+			recipe.SetResult(this);
+			recipe.AddRecipe();
+		}
+	}
+}