big-duckie/FabusMod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed damage typing for Rainbow Demon.

Browse Source 
Cleaned up code.
This commit is contained in:
Big Duckie
2022-07-05 19:59:05 -06:00
parent 148d1fc728
commit 387174adf0
6 changed files with 53 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Items/Weapons/RainbowDemon/TheRainbowDemon.cs
+12 -12
View File
@@ -10,13 +10,13 @@ public class TheRainbowDemon : ModItem
{ {
public override void SetStaticDefaults() 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]"); 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() public override void SetDefaults()
{ {
Item.damage = 82; Item.damage = 82;
Item.DamageType = DamageClass.Melee;
Item.width = 82; Item.width = 82;
Item.height = 39; Item.height = 39;
Item.useTime = 4; Item.useTime = 4;
@@ -43,23 +43,23 @@ public class TheRainbowDemon : ModItem
int numberProjectiles = 10; int numberProjectiles = 10;
for (int i = 0; i < numberProjectiles; i++) for (int i = 0; i < numberProjectiles; i++)
{ {
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
} }
return false; return false;
} }
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.RainbowHandle> ()); .AddIngredient(ModContent.ItemType<Items.CraftingIngredients.RainbowHandle>())
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.RainbowMuzzle>()); .AddIngredient(ModContent.ItemType<Items.CraftingIngredients.RainbowMuzzle>())
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>()); .AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
val.Register(); .Register();
Recipe val2 = CreateRecipe(); CreateRecipe()
val2.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); .AddRecipeGroup("FabusMod:TheRainbowDemon")
val2.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>()); .AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
val2.Register(); .Register();
} }
} }
Items/Weapons/RainbowDemon/TheRainbowDemonClaymore.cs
+8 -7
View File
@@ -17,6 +17,7 @@ public class TheRainbowDemonClaymore : ModItem
public override void SetDefaults() public override void SetDefaults()
{ {
Item.damage = 82; Item.damage = 82;
Item.DamageType = DamageClass.Melee;
Item.width = 82; Item.width = 82;
Item.height = 39; Item.height = 39;
Item.useTime = 4; Item.useTime = 4;
@@ -43,18 +44,18 @@ public class TheRainbowDemonClaymore : ModItem
int numberProjectiles = 5; int numberProjectiles = 5;
for (int i = 0; i < numberProjectiles; i++) for (int i = 0; i < numberProjectiles; i++)
{ {
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
} }
return false; return false;
} }
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); .AddRecipeGroup("FabusMod:TheRainbowDemon")
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.RainbowDust>(), 2); .AddIngredient(ModContent.ItemType<Items.CraftingIngredients.RainbowDust>(), 2)
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>()); .AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
val.Register(); .Register();
} }
} }
Items/Weapons/RainbowDemon/TheRainbowDemonMagic.cs
+8 -7
View File
@@ -17,6 +17,7 @@ public class TheRainbowDemonMagic : ModItem
public override void SetDefaults() public override void SetDefaults()
{ {
Item.damage = 82; Item.damage = 82;
Item.DamageType = DamageClass.Magic;
Item.noMelee = true; Item.noMelee = true;
Item.width = 82; Item.width = 82;
Item.height = 39; Item.height = 39;
@@ -44,18 +45,18 @@ public class TheRainbowDemonMagic : ModItem
int numberProjectiles = 10; int numberProjectiles = 10;
for (int i = 0; i < numberProjectiles; i++) for (int i = 0; i < numberProjectiles; i++)
{ {
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
} }
return false; return false;
} }
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); .AddRecipeGroup("FabusMod:TheRainbowDemon")
val.AddIngredient(ItemID.FragmentNebula, 2); .AddIngredient(ItemID.FragmentNebula, 2)
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>()); .AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
val.Register(); .Register();
} }
} }
Items/Weapons/RainbowDemon/TheRainbowDemonRanged.cs
+8 -7
View File
@@ -17,6 +17,7 @@ public class TheRainbowDemonRanged : ModItem
public override void SetDefaults() public override void SetDefaults()
{ {
Item.damage = 82; Item.damage = 82;
Item.DamageType = DamageClass.Ranged;
Item.noMelee = true; Item.noMelee = true;
Item.width = 82; Item.width = 82;
Item.height = 39; Item.height = 39;
@@ -44,18 +45,18 @@ public class TheRainbowDemonRanged : ModItem
int numberProjectiles = 10; int numberProjectiles = 10;
for (int i = 0; i < numberProjectiles; i++) for (int i = 0; i < numberProjectiles; i++)
{ {
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
} }
return false; return false;
} }
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); .AddRecipeGroup("FabusMod:TheRainbowDemon")
val.AddIngredient(ItemID.FragmentVortex, 2); .AddIngredient(ItemID.FragmentVortex, 2)
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>()); .AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
val.Register(); .Register();
} }
} }
Items/Weapons/RainbowDemon/TheRainbowDemonShredder.cs
+8 -7
View File
@@ -17,6 +17,7 @@ public class TheRainbowDemonShredder : ModItem
public override void SetDefaults() public override void SetDefaults()
{ {
Item.damage = 82; Item.damage = 82;
Item.DamageType = DamageClass.Melee;
Item.width = 82; Item.width = 82;
Item.height = 39; Item.height = 39;
Item.useTime = 4; Item.useTime = 4;
@@ -43,18 +44,18 @@ public class TheRainbowDemonShredder : ModItem
int numberProjectiles = 10; int numberProjectiles = 10;
for (int i = 0; i < numberProjectiles; i++) for (int i = 0; i < numberProjectiles; i++)
{ {
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
} }
return false; return false;
} }
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); .AddRecipeGroup("FabusMod:TheRainbowDemon")
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.RainbowDust>(), 2); .AddIngredient(ModContent.ItemType<Items.CraftingIngredients.RainbowDust>(), 2)
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>()); .AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
val.Register(); .Register();
} }
} }
Items/Weapons/RainbowDemon/TheRainbowDemonThrowing.cs
+9 -8
View File
@@ -17,6 +17,7 @@ public class TheRainbowDemonThrowing : ModItem
public override void SetDefaults() public override void SetDefaults()
{ {
Item.damage = 82; Item.damage = 82;
Item.DamageType = DamageClass.Throwing;
Item.noMelee = true; Item.noMelee = true;
Item.width = 82; Item.width = 82;
Item.height = 39; Item.height = 39;
@@ -44,19 +45,19 @@ public class TheRainbowDemonThrowing : ModItem
int numberProjectiles = 10; int numberProjectiles = 10;
for (int i = 0; i < numberProjectiles; i++) for (int i = 0; i < numberProjectiles; i++)
{ {
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(30f)); Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(30f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
} }
return false; return false;
} }
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddRecipeGroup("FabusMod:TheRainbowDemon", 1); .AddRecipeGroup("FabusMod:TheRainbowDemon")
val.AddIngredient(ItemID.FragmentSolar, 1); .AddIngredient(ItemID.FragmentSolar)
val.AddIngredient(ItemID.FragmentVortex, 1); .AddIngredient(ItemID.FragmentVortex)
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>()); .AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
val.Register(); .Register();
} }
} }