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

Fix damage typing for melee weapons. Fixed recursion bug. Cleaned up variables.

Browse Source
This commit is contained in:
Big Duckie
2022-07-05 13:01:34 -06:00
parent 776678b4c3
commit b206463290
15 changed files with 191 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Items/Weapons/Melee/Shortswords/CarbonDagger.cs
+17 -16
View File
@@ -18,6 +18,7 @@ public class CarbonDagger : ModItem
public override void SetDefaults()
{
Item.damage = 62;
Item.DamageType = DamageClass.Melee;
Item.width = 30;
Item.height = 30;
Item.useTime = 11;
@@ -36,11 +37,11 @@ public class CarbonDagger : ModItem
{
if (Main.rand.NextBool(3))
{
int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RyuuDust2>());
Main.dust[num1].scale = 1f;
Main.dust[num1].velocity.Y = 0f;
Main.dust[num1].velocity.X = 0.5f;
Main.dust[num1].noGravity = true;
int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RyuuDust2>());
Main.dust[dust].scale = 1f;
Main.dust[dust].velocity.Y = 0f;
Main.dust[dust].velocity.X = 0.5f;
Main.dust[dust].noGravity = true;
}
}
@@ -65,17 +66,17 @@ public class CarbonDagger : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<Wakizashi>());
val.AddRecipeGroup("FabusMod:OrichalcumBar", 6);
val.AddIngredient(ItemID.Sapphire, 2);
val.AddTile(TileID.MythrilAnvil);
val.Register();
Recipe recipe1 = CreateRecipe();
recipe1.AddIngredient(ModContent.ItemType<Wakizashi>());
recipe1.AddRecipeGroup("FabusMod:OrichalcumBar", 6);
recipe1.AddIngredient(ItemID.Sapphire, 2);
recipe1.AddTile(TileID.MythrilAnvil);
recipe1.Register();
Recipe val2 = CreateRecipe();
val2.AddIngredient(ModContent.ItemType<CarbonDaggerNihon>());
val2.AddIngredient(ItemID.BlueDye, 1);
val2.AddTile(TileID.DyeVat);
val2.Register();
Recipe recipe2 = CreateRecipe();
recipe2.AddIngredient(ModContent.ItemType<CarbonDaggerNihon>());
recipe2.AddIngredient(ItemID.BlueDye, 1);
recipe2.AddTile(TileID.DyeVat);
recipe2.Register();
}
}
Items/Weapons/Melee/Shortswords/CarbonDaggerNihon.cs
+7 -7
View File
@@ -1,4 +1,3 @@
using FabusMod.Projectiles.Shortsword;
using Microsoft.Xna.Framework;
using Terraria;
using Terraria.DataStructures;
@@ -18,6 +17,7 @@ public class CarbonDaggerNihon : ModItem
public override void SetDefaults()
{
Item.damage = 62;
Item.DamageType = DamageClass.Melee;
Item.width = 30;
Item.height = 30;
Item.useTime = 11;
@@ -28,7 +28,7 @@ public class CarbonDaggerNihon : ModItem
Item.rare = ItemRarityID.LightRed;
Item.UseSound = SoundID.Item1;
Item.autoReuse = true;
Item.shoot = ModContent.ProjectileType<CarbonKnifeNihon>();
Item.shoot = ModContent.ProjectileType<Projectiles.Shortsword.CarbonKnifeNihon>();
Item.shootSpeed = 10f;
}
@@ -36,11 +36,11 @@ public class CarbonDaggerNihon : ModItem
{
if (Main.rand.NextBool(3))
{
int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.OniDust>());
Main.dust[num1].scale = 1f;
Main.dust[num1].velocity.Y = 0f;
Main.dust[num1].velocity.X = 0.5f;
Main.dust[num1].noGravity = true;
int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.OniDust>());
Main.dust[dust].scale = 1f;
Main.dust[dust].velocity.Y = 0f;
Main.dust[dust].velocity.X = 0.5f;
Main.dust[dust].noGravity = true;
}
}
Items/Weapons/Melee/Shortswords/GoldenDagger.cs
+12 -11
View File
@@ -18,6 +18,7 @@ public class GoldenDagger : ModItem
public override void SetDefaults()
{
Item.damage = 95;
Item.DamageType = DamageClass.Melee;
Item.width = 40;
Item.height = 40;
Item.useTime = 12;
@@ -36,11 +37,11 @@ public class GoldenDagger : ModItem
{
if (Main.rand.NextBool(3))
{
int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>(), 0f, 0f, 0, default, 1f);
Main.dust[num1].scale = 1f;
Main.dust[num1].velocity.Y = 0f;
Main.dust[num1].velocity.X = 0.5f;
Main.dust[num1].noGravity = true;
int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>());
Main.dust[dust].scale = 1f;
Main.dust[dust].velocity.Y = 0f;
Main.dust[dust].velocity.X = 0.5f;
Main.dust[dust].noGravity = true;
}
}
@@ -74,11 +75,11 @@ public class GoldenDagger : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<OniDagger>());
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 6);
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 4);
val.AddTile(TileID.AdamantiteForge);
val.Register();
Recipe recipe = CreateRecipe();
recipe.AddIngredient(ModContent.ItemType<OniDagger>());
recipe.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 6);
recipe.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 4);
recipe.AddTile(TileID.AdamantiteForge);
recipe.Register();
}
}
Items/Weapons/Melee/Shortswords/OniDagger.cs
+13 -12
View File
@@ -17,6 +17,7 @@ public class OniDagger : ModItem
public override void SetDefaults()
{
Item.damage = 92;
Item.DamageType = DamageClass.Melee;
Item.width = 40;
Item.height = 40;
Item.useTime = 11;
@@ -35,11 +36,11 @@ public class OniDagger : ModItem
{
if (Main.rand.NextBool(3))
{
int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RyuuDust3>());
Main.dust[num1].scale = 1f;
Main.dust[num1].velocity.Y = 0f;
Main.dust[num1].velocity.X = 0.5f;
Main.dust[num1].noGravity = true;
int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RyuuDust3>());
Main.dust[dust].scale = 1f;
Main.dust[dust].velocity.Y = 0f;
Main.dust[dust].velocity.X = 0.5f;
Main.dust[dust].noGravity = true;
}
}
@@ -65,12 +66,12 @@ public class OniDagger : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddRecipeGroup("FabusMod:CarbonDagger", 1);
val.AddRecipeGroup("FabusMod:AdamantiteBar", 6);
val.AddIngredient(ItemID.SoulofNight, 4);
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 2);
val.AddTile(TileID.MythrilAnvil);
val.Register();
Recipe recipe = CreateRecipe();
recipe.AddRecipeGroup("FabusMod:CarbonDagger", 1);
recipe.AddRecipeGroup("FabusMod:AdamantiteBar", 6);
recipe.AddIngredient(ItemID.SoulofNight, 4);
recipe.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 2);
recipe.AddTile(TileID.MythrilAnvil);
recipe.Register();
}
}
Items/Weapons/Melee/Shortswords/StonePlatedShortsword.cs
+6 -5
View File
@@ -14,6 +14,7 @@ public class StonePlatedShortsword : ModItem
public override void SetDefaults()
{
Item.damage = 9;
Item.DamageType = DamageClass.Melee;
Item.width = 30;
Item.height = 30;
Item.useTime = 13;
@@ -28,10 +29,10 @@ public class StonePlatedShortsword : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<Items.WeaponParts.UntreatedShortswordPart>());
val.AddIngredient(ItemID.StoneBlock, 6);
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.ReinforcedWorkBench>());
val.Register();
Recipe recipe = CreateRecipe();
recipe.AddIngredient(ModContent.ItemType<Items.WeaponParts.UntreatedShortswordPart>());
recipe.AddIngredient(ItemID.StoneBlock, 6);
recipe.AddTile(ModContent.TileType<global::FabusMod.Tiles.ReinforcedWorkBench>());
recipe.Register();
}
}
Items/Weapons/Melee/Shortswords/TheRainbowsCurse.cs
+23 -20
View File
@@ -17,6 +17,7 @@ public class TheRainbowsCurse : ModItem
public override void SetDefaults()
{
Item.damage = 154;
Item.DamageType = DamageClass.Melee;
Item.width = 48;
Item.height = 48;
Item.useTime = 8;
@@ -35,21 +36,23 @@ public class TheRainbowsCurse : ModItem
{
if (Main.rand.NextBool(3))
{
int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RainbowDust>());
int num2 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RainbowDust2>());
int num3 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RainbowDust3>());
Main.dust[num1].scale = 1f;
Main.dust[num1].velocity.Y = 0f;
Main.dust[num1].velocity.X = 0.5f;
Main.dust[num1].noGravity = true;
Main.dust[num2].scale = 1f;
Main.dust[num2].velocity.Y = 0f;
Main.dust[num2].velocity.X = 0.5f;
Main.dust[num2].noGravity = true;
Main.dust[num3].scale = 1f;
Main.dust[num3].velocity.Y = 0f;
Main.dust[num3].velocity.X = 0.5f;
Main.dust[num3].noGravity = true;
int dust1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RainbowDust>());
Main.dust[dust1].scale = 1f;
Main.dust[dust1].velocity.Y = 0f;
Main.dust[dust1].velocity.X = 0.5f;
Main.dust[dust1].noGravity = true;
int dust2 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RainbowDust2>());
Main.dust[dust2].scale = 1f;
Main.dust[dust2].velocity.Y = 0f;
Main.dust[dust2].velocity.X = 0.5f;
Main.dust[dust2].noGravity = true;
int dust3 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RainbowDust3>());
Main.dust[dust3].scale = 1f;
Main.dust[dust3].velocity.Y = 0f;
Main.dust[dust3].velocity.X = 0.5f;
Main.dust[dust3].noGravity = true;
}
}
@@ -83,10 +86,10 @@ public class TheRainbowsCurse : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<GoldenDagger>());
val.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 6);
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
val.Register();
Recipe recipe = CreateRecipe();
recipe.AddIngredient(ModContent.ItemType<GoldenDagger>());
recipe.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 6);
recipe.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
recipe.Register();
}
}
Items/Weapons/Melee/Shortswords/Wakizashi.cs
+12 -11
View File
@@ -16,6 +16,7 @@ public class Wakizashi : ModItem
public override void SetDefaults()
{
Item.damage = 15;
Item.DamageType = DamageClass.Melee;
Item.width = 30;
Item.height = 30;
Item.useTime = 13;
@@ -32,11 +33,11 @@ public class Wakizashi : ModItem
{
if (Main.rand.NextBool(3))
{
int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RyuuDust>());
Main.dust[num1].scale = 1f;
Main.dust[num1].velocity.Y = 0f;
Main.dust[num1].velocity.X = 0.5f;
Main.dust[num1].noGravity = true;
int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.RyuuDust>());
Main.dust[dust].scale = 1f;
Main.dust[dust].velocity.Y = 0f;
Main.dust[dust].velocity.X = 0.5f;
Main.dust[dust].noGravity = true;
}
}
@@ -47,11 +48,11 @@ public class Wakizashi : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<StonePlatedShortsword>());
val.AddRecipeGroup("IronBar", 6);
val.AddIngredient(ItemID.Emerald, 2);
val.AddTile(TileID.Anvils);
val.Register();
Recipe recipe = CreateRecipe();
recipe.AddIngredient(ModContent.ItemType<StonePlatedShortsword>());
recipe.AddRecipeGroup("IronBar", 6);
recipe.AddIngredient(ItemID.Emerald, 2);
recipe.AddTile(TileID.Anvils);
recipe.Register();
}
}