Clean up tool code.

This commit is contained in:
Big Duckie
2022-07-05 17:03:46 -06:00
parent 5ea7aceefa
commit f3cfce7792
3 changed files with 38 additions and 36 deletions
+11 -10
View File
@@ -15,6 +15,7 @@ public class GoddessPick : ModItem
public override void SetDefaults() public override void SetDefaults()
{ {
Item.damage = 22; Item.damage = 22;
Item.DamageType = DamageClass.Melee;
Item.width = 50; Item.width = 50;
Item.height = 50; Item.height = 50;
Item.useTime = 10; Item.useTime = 10;
@@ -33,20 +34,20 @@ public class GoddessPick : ModItem
{ {
if (Main.rand.NextBool(3)) if (Main.rand.NextBool(3))
{ {
int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>()); int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>());
Main.dust[num1].scale = 1f; Main.dust[dust].scale = 1f;
Main.dust[num1].velocity.Y = 0f; Main.dust[dust].velocity.Y = 0f;
Main.dust[num1].velocity.X = 0.5f; Main.dust[dust].velocity.X = 0.5f;
Main.dust[num1].noGravity = true; Main.dust[dust].noGravity = true;
} }
} }
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddIngredient(ItemID.Picksaw, 1); .AddIngredient(ItemID.Picksaw)
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 12); .AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 12)
val.AddTile(TileID.AdamantiteForge); .AddTile(TileID.AdamantiteForge)
val.Register(); .Register();
} }
} }
+16 -16
View File
@@ -9,13 +9,13 @@ public class GoldenDiggingClaw : ModItem
{ {
public override void SetStaticDefaults() public override void SetStaticDefaults()
{ {
DisplayName.SetDefault("Golden Digging Claw");
Tooltip.SetDefault("[c/FF3C2B:Mining speed too high may result in no funcionality]"); Tooltip.SetDefault("[c/FF3C2B:Mining speed too high may result in no funcionality]");
} }
public override void SetDefaults() public override void SetDefaults()
{ {
Item.damage = 60; Item.damage = 60;
Item.DamageType = DamageClass.Melee;
Item.width = 38; Item.width = 38;
Item.height = 38; Item.height = 38;
Item.useTime = 3; Item.useTime = 3;
@@ -33,27 +33,27 @@ public class GoldenDiggingClaw : ModItem
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddIngredient(ItemID.ShroomiteDiggingClaw); .AddIngredient(ItemID.ShroomiteDiggingClaw)
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 18); .AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 18)
val.AddIngredient(ItemID.LunarBar, 22); .AddIngredient(ItemID.LunarBar, 22)
val.AddIngredient(ItemID.FragmentSolar, 8); .AddIngredient(ItemID.FragmentSolar, 8)
val.AddIngredient(ItemID.FragmentNebula, 8); .AddIngredient(ItemID.FragmentNebula, 8)
val.AddIngredient(ItemID.FragmentStardust, 8); .AddIngredient(ItemID.FragmentStardust, 8)
val.AddIngredient(ItemID.FragmentVortex, 8); .AddIngredient(ItemID.FragmentVortex, 8)
val.AddTile(TileID.LunarCraftingStation); .AddTile(TileID.LunarCraftingStation)
val.Register(); .Register();
} }
public override void MeleeEffects(Player player, Rectangle hitbox) public override void MeleeEffects(Player player, Rectangle hitbox)
{ {
if (Main.rand.NextBool(3)) if (Main.rand.NextBool(3))
{ {
int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>()); int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>());
Main.dust[num1].scale = 1f; Main.dust[dust].scale = 1f;
Main.dust[num1].velocity.Y = 0f; Main.dust[dust].velocity.Y = 0f;
Main.dust[num1].velocity.X = 0.5f; Main.dust[dust].velocity.X = 0.5f;
Main.dust[num1].noGravity = true; Main.dust[dust].noGravity = true;
} }
} }
} }
+11 -10
View File
@@ -15,6 +15,7 @@ public class GoldenHamaxe : ModItem
public override void SetDefaults() public override void SetDefaults()
{ {
Item.damage = 68; Item.damage = 68;
Item.DamageType = DamageClass.Melee;
Item.width = 70; Item.width = 70;
Item.height = 60; Item.height = 60;
Item.useTime = 10; Item.useTime = 10;
@@ -32,22 +33,22 @@ public class GoldenHamaxe : ModItem
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddIngredient(ItemID.Picksaw, 1); .AddIngredient(ItemID.Picksaw, 1)
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 12); .AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 12)
val.AddTile(TileID.AdamantiteForge); .AddTile(TileID.AdamantiteForge)
val.Register(); .Register();
} }
public override void MeleeEffects(Player player, Rectangle hitbox) public override void MeleeEffects(Player player, Rectangle hitbox)
{ {
if (Main.rand.NextBool(3)) if (Main.rand.NextBool(3))
{ {
int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>()); int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>());
Main.dust[num1].scale = 1f; Main.dust[dust].scale = 1f;
Main.dust[num1].velocity.Y = 0f; Main.dust[dust].velocity.Y = 0f;
Main.dust[num1].velocity.X = 0.5f; Main.dust[dust].velocity.X = 0.5f;
Main.dust[num1].noGravity = true; Main.dust[dust].noGravity = true;
} }
} }
} }