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

Fixed typing for thrown weapons.

Browse Source 
Cleaned up code.
This commit is contained in:
Big Duckie
2022-07-05 20:08:41 -06:00
parent 387174adf0
commit 0ea22f005c
9 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Items/Weapons/Thrown/Daggers/ColorfulSolution.cs
+6 -6
View File
@@ -8,13 +8,13 @@ public class ColorfulSolution : ModItem
{ {
public override void SetStaticDefaults() public override void SetStaticDefaults()
{ {
DisplayName.SetDefault("Colorful Solution");
Tooltip.SetDefault("Doesn't consume on use \n[c/B6FF00:Autothrows] \nInflicts [c/401440:Venom] for 12 seconds on hit"); Tooltip.SetDefault("Doesn't consume on use \n[c/B6FF00:Autothrows] \nInflicts [c/401440:Venom] for 12 seconds on hit");
} }
public override void SetDefaults() public override void SetDefaults()
{ {
Item.maxStack = 1; Item.maxStack = 1;
Item.DamageType = DamageClass.Throwing;
Item.damage = 195; Item.damage = 195;
Item.knockBack = 3f; Item.knockBack = 3f;
Item.useStyle = ItemUseStyleID.Swing; Item.useStyle = ItemUseStyleID.Swing;
@@ -35,10 +35,10 @@ public class ColorfulSolution : ModItem
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddIngredient(ItemID.MagicDagger, 1); .AddIngredient(ItemID.MagicDagger)
val.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 14); .AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 14)
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>()); .AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
val.Register(); .Register();
} }
} }
Items/Weapons/Thrown/Shuriken/CarbonShuriken.cs
+12 -12
View File
@@ -8,13 +8,13 @@ public class CarbonShuriken : ModItem
{ {
public override void SetStaticDefaults() public override void SetStaticDefaults()
{ {
DisplayName.SetDefault("Carbon Shuriken");
Tooltip.SetDefault("[c/B6FF00:Autothrows, dyeable]\nThrows 3 fast-flying Shurikens at once"); Tooltip.SetDefault("[c/B6FF00:Autothrows, dyeable]\nThrows 3 fast-flying Shurikens at once");
} }
public override void SetDefaults() public override void SetDefaults()
{ {
Item.maxStack = 1; Item.maxStack = 1;
Item.DamageType = DamageClass.Throwing;
Item.damage = 19; Item.damage = 19;
Item.knockBack = 0f; Item.knockBack = 0f;
Item.useStyle = ItemUseStyleID.Swing; Item.useStyle = ItemUseStyleID.Swing;
@@ -36,17 +36,17 @@ public class CarbonShuriken : ModItem
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddIngredient(ModContent.ItemType<HerosShuriken>()); .AddIngredient(ModContent.ItemType<HerosShuriken>())
val.AddRecipeGroup("FabusMod:DemoniteBar", 3); .AddRecipeGroup("FabusMod:DemoniteBar", 3)
val.AddIngredient(ItemID.Sapphire, 1); .AddIngredient(ItemID.Sapphire)
val.AddTile(TileID.Anvils); .AddTile(TileID.Anvils)
val.Register(); .Register();
Recipe val2 = CreateRecipe(); CreateRecipe()
val2.AddIngredient(ModContent.ItemType<CarbonShurikenNihon>()); .AddIngredient(ModContent.ItemType<CarbonShurikenNihon>())
val2.AddIngredient(ItemID.BlueDye, 1); .AddIngredient(ItemID.BlueDye)
val2.AddTile(TileID.DyeVat); .AddTile(TileID.DyeVat)
val2.Register(); .Register();
} }
} }
Items/Weapons/Thrown/Shuriken/CarbonShurikenNihon.cs
+7 -6
View File
@@ -14,8 +14,9 @@ public class CarbonShurikenNihon : ModItem
public override void SetDefaults() public override void SetDefaults()
{ {
Item.maxStack = 1;
Item.damage = 19; Item.damage = 19;
Item.DamageType = DamageClass.Throwing;
Item.maxStack = 1;
Item.knockBack = 0f; Item.knockBack = 0f;
Item.useStyle = ItemUseStyleID.Swing; Item.useStyle = ItemUseStyleID.Swing;
Item.UseSound = SoundID.Item1; Item.UseSound = SoundID.Item1;
@@ -36,10 +37,10 @@ public class CarbonShurikenNihon : ModItem
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddIngredient(ModContent.ItemType<CarbonShuriken>()); .AddIngredient(ModContent.ItemType<CarbonShuriken>())
val.AddIngredient(ItemID.SilverDye, 1); .AddIngredient(ItemID.SilverDye, 1)
val.AddTile(TileID.DyeVat); .AddTile(TileID.DyeVat)
val.Register(); .Register();
} }
} }
Items/Weapons/Thrown/Shuriken/OniSlayer.cs → Items/Weapons/Thrown/Shuriken/DemonSlayer.cs
+10 -10
View File
@@ -4,18 +4,18 @@ using Terraria.ModLoader;
namespace FabusMod.Items.Weapons.Thrown.Shuriken; namespace FabusMod.Items.Weapons.Thrown.Shuriken;
public class OniSlayer : ModItem public class DemonSlayer : ModItem
{ {
public override void SetStaticDefaults() public override void SetStaticDefaults()
{ {
DisplayName.SetDefault("Demon Slayer");
Tooltip.SetDefault("[c/B6FF00:Autothrows]\nThrows 4 fast-flying Shurikens at once"); Tooltip.SetDefault("[c/B6FF00:Autothrows]\nThrows 4 fast-flying Shurikens at once");
} }
public override void SetDefaults() public override void SetDefaults()
{ {
Item.maxStack = 1;
Item.damage = 48; Item.damage = 48;
Item.DamageType = DamageClass.Throwing;
Item.maxStack = 1;
Item.knockBack = 0f; Item.knockBack = 0f;
Item.useStyle = ItemUseStyleID.Swing; Item.useStyle = ItemUseStyleID.Swing;
Item.UseSound = SoundID.Item1; Item.UseSound = SoundID.Item1;
@@ -36,12 +36,12 @@ public class OniSlayer : ModItem
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddRecipeGroup("FabusMod:CarbonShuriken", 1); .AddRecipeGroup("FabusMod:CarbonShuriken")
val.AddRecipeGroup("FabusMod:AdamantiteBar", 6); .AddRecipeGroup("FabusMod:AdamantiteBar", 6)
val.AddIngredient(ItemID.Ruby, 3); .AddIngredient(ItemID.Ruby, 3)
val.AddIngredient(ItemID.SoulofNight, 3); .AddIngredient(ItemID.SoulofNight, 3)
val.AddTile(TileID.DemonAltar); .AddTile(TileID.DemonAltar)
val.Register(); .Register();
} }
} }
Items/Weapons/Thrown/Shuriken/OniSlayer.png → Items/Weapons/Thrown/Shuriken/DemonSlayer.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 467 B

After

Width:  |  Height:  |  Size: 467 B

Items/Weapons/Thrown/Shuriken/HerosShuriken.cs
+8 -7
View File
@@ -14,8 +14,9 @@ public class HerosShuriken : ModItem
public override void SetDefaults() public override void SetDefaults()
{ {
Item.maxStack = 1;
Item.damage = 10; Item.damage = 10;
Item.DamageType = DamageClass.Throwing;
Item.maxStack = 1;
Item.knockBack = 0f; Item.knockBack = 0f;
Item.useStyle = ItemUseStyleID.Swing; Item.useStyle = ItemUseStyleID.Swing;
Item.UseSound = SoundID.Item1; Item.UseSound = SoundID.Item1;
@@ -36,11 +37,11 @@ public class HerosShuriken : ModItem
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddIngredient(ModContent.ItemType<StonePlatedShuriken>()); .AddIngredient(ModContent.ItemType<StonePlatedShuriken>())
val.AddRecipeGroup("IronBar", 3); .AddRecipeGroup("IronBar", 3)
val.AddIngredient(ItemID.Emerald, 1); .AddIngredient(ItemID.Emerald)
val.AddTile(TileID.Anvils); .AddTile(TileID.Anvils)
val.Register(); .Register();
} }
} }
Items/Weapons/Thrown/Shuriken/SparklingDemon.cs
+1 -1
View File
@@ -37,7 +37,7 @@ public class SparklingDemon : ModItem
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<OniSlayer>()); val.AddIngredient(ModContent.ItemType<DemonSlayer>());
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 6); val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 6);
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 6); val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 6);
val.AddTile(TileID.AdamantiteForge); val.AddTile(TileID.AdamantiteForge);
Items/Weapons/Thrown/Shuriken/StonePlatedShuriken.cs
+8 -7
View File
@@ -15,8 +15,9 @@ public class StonePlatedShuriken : ModItem
public override void SetDefaults() public override void SetDefaults()
{ {
Item.maxStack = 1;
Item.damage = 9; Item.damage = 9;
Item.DamageType = DamageClass.Throwing;
Item.maxStack = 1;
Item.knockBack = 0f; Item.knockBack = 0f;
Item.useStyle = ItemUseStyleID.Swing; Item.useStyle = ItemUseStyleID.Swing;
Item.UseSound = SoundID.Item1; Item.UseSound = SoundID.Item1;
@@ -36,11 +37,11 @@ public class StonePlatedShuriken : ModItem
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddIngredient(ModContent.ItemType<Items.WeaponParts.UntreatedShurikenPart>()); .AddIngredient(ModContent.ItemType<Items.WeaponParts.UntreatedShurikenPart>())
val.AddIngredient(ItemID.StoneBlock, 3); .AddIngredient(ItemID.StoneBlock, 3)
val.AddIngredient(ItemID.FallenStar, 1); .AddIngredient(ItemID.FallenStar)
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.ReinforcedWorkBench>()); .AddTile(ModContent.TileType<global::FabusMod.Tiles.ReinforcedWorkBench>())
val.Register(); .Register();
} }
} }
Items/Weapons/Thrown/Shuriken/TheSpinningRainbow.cs
+7 -7
View File
@@ -8,14 +8,14 @@ public class TheSpinningRainbow : ModItem
{ {
public override void SetStaticDefaults() public override void SetStaticDefaults()
{ {
DisplayName.SetDefault("The Spinning Rainbow");
Tooltip.SetDefault("[c/B6FF00:Autothrows]\nThrows 6 Shurikens at once"); Tooltip.SetDefault("[c/B6FF00:Autothrows]\nThrows 6 Shurikens at once");
} }
public override void SetDefaults() public override void SetDefaults()
{ {
Item.maxStack = 1;
Item.damage = 230; Item.damage = 230;
Item.DamageType = DamageClass.Throwing;
Item.maxStack = 1;
Item.knockBack = 0f; Item.knockBack = 0f;
Item.useStyle = ItemUseStyleID.Swing; Item.useStyle = ItemUseStyleID.Swing;
Item.UseSound = SoundID.Item1; Item.UseSound = SoundID.Item1;
@@ -36,10 +36,10 @@ public class TheSpinningRainbow : ModItem
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); CreateRecipe()
val.AddIngredient(ModContent.ItemType<SparklingDemon>()); .AddIngredient(ModContent.ItemType<SparklingDemon>())
val.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 6); .AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 6)
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>()); .AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
val.Register(); .Register();
} }
} }