From 387174adf0aeaf859f7b3763c4787df9d04264d9 Mon Sep 17 00:00:00 2001 From: Big Duckie Date: Tue, 5 Jul 2022 19:59:05 -0600 Subject: [PATCH] Fixed damage typing for Rainbow Demon. Cleaned up code. --- Items/Weapons/RainbowDemon/TheRainbowDemon.cs | 24 +++++++++---------- .../RainbowDemon/TheRainbowDemonClaymore.cs | 15 ++++++------ .../RainbowDemon/TheRainbowDemonMagic.cs | 15 ++++++------ .../RainbowDemon/TheRainbowDemonRanged.cs | 15 ++++++------ .../RainbowDemon/TheRainbowDemonShredder.cs | 15 ++++++------ .../RainbowDemon/TheRainbowDemonThrowing.cs | 17 ++++++------- 6 files changed, 53 insertions(+), 48 deletions(-) diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemon.cs b/Items/Weapons/RainbowDemon/TheRainbowDemon.cs index e6e543b..da585cc 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemon.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemon.cs @@ -10,13 +10,13 @@ public class TheRainbowDemon : ModItem { public override void SetStaticDefaults() { - DisplayName.SetDefault("The Rainbow Demon"); Tooltip.SetDefault("[c/B6FF00:Autoshoots] \nUnleashes a barrage of rainbow waves \nDoes not require ammo \nClass and projectiles fired can be changed via crafting \n[c/FF2B6E:Currently Unobtainable]"); } public override void SetDefaults() { Item.damage = 82; + Item.DamageType = DamageClass.Melee; Item.width = 82; Item.height = 39; Item.useTime = 4; @@ -43,23 +43,23 @@ public class TheRainbowDemon : ModItem int numberProjectiles = 10; for (int i = 0; i < numberProjectiles; i++) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType ()); - val.AddIngredient(ModContent.ItemType()); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType()) + .AddTile(ModContent.TileType()) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); - val2.AddTile(ModContent.TileType()); - val2.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:TheRainbowDemon") + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemonClaymore.cs b/Items/Weapons/RainbowDemon/TheRainbowDemonClaymore.cs index 9a60570..e15e27f 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemonClaymore.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemonClaymore.cs @@ -17,6 +17,7 @@ public class TheRainbowDemonClaymore : ModItem public override void SetDefaults() { Item.damage = 82; + Item.DamageType = DamageClass.Melee; Item.width = 82; Item.height = 39; Item.useTime = 4; @@ -43,18 +44,18 @@ public class TheRainbowDemonClaymore : ModItem int numberProjectiles = 5; for (int i = 0; i < numberProjectiles; i++) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); - val.AddIngredient(ModContent.ItemType(), 2); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:TheRainbowDemon") + .AddIngredient(ModContent.ItemType(), 2) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemonMagic.cs b/Items/Weapons/RainbowDemon/TheRainbowDemonMagic.cs index 1fe4501..37d116a 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemonMagic.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemonMagic.cs @@ -17,6 +17,7 @@ public class TheRainbowDemonMagic : ModItem public override void SetDefaults() { Item.damage = 82; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.width = 82; Item.height = 39; @@ -44,18 +45,18 @@ public class TheRainbowDemonMagic : ModItem int numberProjectiles = 10; for (int i = 0; i < numberProjectiles; i++) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); - val.AddIngredient(ItemID.FragmentNebula, 2); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:TheRainbowDemon") + .AddIngredient(ItemID.FragmentNebula, 2) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemonRanged.cs b/Items/Weapons/RainbowDemon/TheRainbowDemonRanged.cs index e7525fb..091dd09 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemonRanged.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemonRanged.cs @@ -17,6 +17,7 @@ public class TheRainbowDemonRanged : ModItem public override void SetDefaults() { Item.damage = 82; + Item.DamageType = DamageClass.Ranged; Item.noMelee = true; Item.width = 82; Item.height = 39; @@ -44,18 +45,18 @@ public class TheRainbowDemonRanged : ModItem int numberProjectiles = 10; for (int i = 0; i < numberProjectiles; i++) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); - val.AddIngredient(ItemID.FragmentVortex, 2); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:TheRainbowDemon") + .AddIngredient(ItemID.FragmentVortex, 2) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemonShredder.cs b/Items/Weapons/RainbowDemon/TheRainbowDemonShredder.cs index 226b719..c17ecdf 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemonShredder.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemonShredder.cs @@ -17,6 +17,7 @@ public class TheRainbowDemonShredder : ModItem public override void SetDefaults() { Item.damage = 82; + Item.DamageType = DamageClass.Melee; Item.width = 82; Item.height = 39; Item.useTime = 4; @@ -43,18 +44,18 @@ public class TheRainbowDemonShredder : ModItem int numberProjectiles = 10; for (int i = 0; i < numberProjectiles; i++) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); - val.AddIngredient(ModContent.ItemType(), 2); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:TheRainbowDemon") + .AddIngredient(ModContent.ItemType(), 2) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemonThrowing.cs b/Items/Weapons/RainbowDemon/TheRainbowDemonThrowing.cs index 9bfde1e..6875ea8 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemonThrowing.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemonThrowing.cs @@ -17,6 +17,7 @@ public class TheRainbowDemonThrowing : ModItem public override void SetDefaults() { Item.damage = 82; + Item.DamageType = DamageClass.Throwing; Item.noMelee = true; Item.width = 82; Item.height = 39; @@ -44,19 +45,19 @@ public class TheRainbowDemonThrowing : ModItem int numberProjectiles = 10; for (int i = 0; i < numberProjectiles; i++) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); - val.AddIngredient(ItemID.FragmentSolar, 1); - val.AddIngredient(ItemID.FragmentVortex, 1); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:TheRainbowDemon") + .AddIngredient(ItemID.FragmentSolar) + .AddIngredient(ItemID.FragmentVortex) + .AddTile(ModContent.TileType()) + .Register(); } }