Merge pull request #1 from Nick-NCSU/development

Development
Nick-NCSU · Oct 30, 2021 · 304c81d · 304c81d
2 parents b891eea + 1601016
commit 304c81d
Show file tree

Hide file tree

Showing 29 changed files with 1,071 additions and 3 deletions.
diff --git a/.vs/DubNation/DesignTimeBuild/.dtbcache.v2 b/.vs/DubNation/DesignTimeBuild/.dtbcache.v2
diff --git a/.vs/DubNation/v16/.suo b/.vs/DubNation/v16/.suo
diff --git a/Buffs/GoldBuff.cs b/Buffs/GoldBuff.cs
@@ -0,0 +1,32 @@
+using Microsoft.Xna.Framework;
+using System;
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace DubNation.Buffs
+{
+	public class GoldBuff : ModBuff
+	{
+		public override void SetDefaults()
+		{
+			DisplayName.SetDefault("Gold Minion");
+			Description.SetDefault("The gold 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.GoldMinion>()] > 0)
+			{
+				player.buffTime[buffIndex] = 18000;
+			}
+			else
+			{
+				player.DelBuff(buffIndex);
+				buffIndex--;
+			}
+		}
+	}
+}
diff --git a/Buffs/GoldBuff.png b/Buffs/GoldBuff.png
diff --git a/Buffs/MeteoriteBuff.cs b/Buffs/MeteoriteBuff.cs
@@ -0,0 +1,32 @@
+using Microsoft.Xna.Framework;
+using System;
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace DubNation.Buffs
+{
+	public class MeteoriteBuff : ModBuff
+	{
+		public override void SetDefaults()
+		{
+			DisplayName.SetDefault("Meteorite Minion");
+			Description.SetDefault("The meteorite 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.MeteoriteMinion>()] > 0)
+			{
+				player.buffTime[buffIndex] = 18000;
+			}
+			else
+			{
+				player.DelBuff(buffIndex);
+				buffIndex--;
+			}
+		}
+	}
+}
diff --git a/Buffs/MeteoriteBuff.png b/Buffs/MeteoriteBuff.png
diff --git a/Buffs/PlatinumBuff.cs b/Buffs/PlatinumBuff.cs
@@ -0,0 +1,32 @@
+using Microsoft.Xna.Framework;
+using System;
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace DubNation.Buffs
+{
+	public class PlatinumBuff : ModBuff
+	{
+		public override void SetDefaults()
+		{
+			DisplayName.SetDefault("Platinum Minion");
+			Description.SetDefault("The platinum 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.PlatinumMinion>()] > 0)
+			{
+				player.buffTime[buffIndex] = 18000;
+			}
+			else
+			{
+				player.DelBuff(buffIndex);
+				buffIndex--;
+			}
+		}
+	}
+}
diff --git a/Buffs/PlatinumBuff.png b/Buffs/PlatinumBuff.png
diff --git a/Items/GoldStaff.cs b/Items/GoldStaff.cs
@@ -0,0 +1,54 @@
+using Microsoft.Xna.Framework;
+using System;
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace DubNation.Items
+{
+	class GoldStaff : ModItem
+	{
+		public override void SetStaticDefaults()
+		{
+			DisplayName.SetDefault("Gold Staff");
+			Tooltip.SetDefault("Summons a gold minion to fight for you.");
+			ItemID.Sets.GamepadWholeScreenUseRange[item.type] = true;
+			ItemID.Sets.LockOnIgnoresCollision[item.type] = true;
+		}
+
+		public override void SetDefaults()
+		{
+			item.damage = 8;
+			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.GoldBuff>();
+			item.shoot = ModContent.ProjectileType<Projectiles.GoldMinion>();
+		}
+
+		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.GoldBar, 8);
+			recipe.AddIngredient(ItemID.PiggyBank, 1);
+			recipe.AddTile(TileID.Anvils);
+			recipe.SetResult(this);
+			recipe.AddRecipe();
+		}
+	}
+}
diff --git a/Items/MeteoriteStaff.cs b/Items/MeteoriteStaff.cs
@@ -0,0 +1,53 @@
+using Microsoft.Xna.Framework;
+using System;
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace DubNation.Items
+{
+	class MeteoriteStaff : ModItem
+	{
+		public override void SetStaticDefaults()
+		{
+			DisplayName.SetDefault("Meteorite Staff");
+			Tooltip.SetDefault("Summons a meteorite minion to fight for you.\nThe minion will follow your cursor and inflict On Fire! on enemies they touch.");
+			ItemID.Sets.GamepadWholeScreenUseRange[item.type] = true;
+			ItemID.Sets.LockOnIgnoresCollision[item.type] = true;
+		}
+
+		public override void SetDefaults()
+		{
+			item.damage = 34;
+			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.MeteoriteBuff>();
+			item.shoot = ModContent.ProjectileType<Projectiles.MeteoriteMinion>();
+		}
+
+		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.MeteoriteBar, 18);
+			recipe.AddTile(TileID.Anvils);
+			recipe.SetResult(this);
+			recipe.AddRecipe();
+		}
+	}
+}
diff --git a/Items/PlatinumStaff.cs b/Items/PlatinumStaff.cs
@@ -0,0 +1,54 @@
+using Microsoft.Xna.Framework;
+using System;
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace DubNation.Items
+{
+	class PlatinumStaff : ModItem
+	{
+		public override void SetStaticDefaults()
+		{
+			DisplayName.SetDefault("Platinum Staff");
+			Tooltip.SetDefault("Summons a platinum minion to fight for you.");
+			ItemID.Sets.GamepadWholeScreenUseRange[item.type] = true;
+			ItemID.Sets.LockOnIgnoresCollision[item.type] = true;
+		}
+
+		public override void SetDefaults()
+		{
+			item.damage = 8;
+			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.PlatinumBuff>();
+			item.shoot = ModContent.ProjectileType<Projectiles.PlatinumMinion>();
+		}
+
+		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.PlatinumBar, 8);
+			recipe.AddIngredient(ItemID.PiggyBank, 1);
+			recipe.AddTile(TileID.Anvils);
+			recipe.SetResult(this);
+			recipe.AddRecipe();
+		}
+	}
+}