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

Fixed crashes for ranged weapons.

Browse Source 
Optimized code.
This commit is contained in:
Big Duckie
2022-07-05 16:08:31 -06:00
parent 8f5ec80722
commit eb2cb27e79
51 changed files with 513 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Items/Weapons/Ranged/FoxPistols/FoxPistol.cs
+15 -16
View File
@@ -18,6 +18,7 @@ public class FoxPistol : ModItem
public override void SetDefaults()
{
Item.damage = 22;
Item.DamageType = DamageClass.Ranged;
Item.width = 36;
Item.height = 21;
Item.useTime = 12;
@@ -38,9 +39,9 @@ public class FoxPistol : ModItem
return new Vector2(0f, -2f);
}
public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
{
Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 32f;
public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
{
Vector2 muzzleOffset = Vector2.Normalize(velocity) * 32f;
if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0))
{
position += muzzleOffset;
@@ -54,9 +55,7 @@ public class FoxPistol : ModItem
{
player.AddBuff(ModContent.BuffType<Buffs.FoxPistol.FoxMending>(), 300, true);
}
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(3f));
velocity.X = perturbedSpeed.X;
velocity.Y = perturbedSpeed.Y;
velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(3f));
return true;
}
@@ -88,16 +87,16 @@ public class FoxPistol : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.NatureToken>());
val.AddRecipeGroup("FabusMod:GoldBar", 10);
val.AddTile(TileID.Anvils);
val.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.NatureToken>())
.AddRecipeGroup("FabusMod:GoldBar", 10)
.AddTile(TileID.Anvils)
.Register();
Recipe val2 = CreateRecipe();
val2.AddIngredient(ModContent.ItemType<FoxPistolBlue>());
val2.AddIngredient(ItemID.OrangeDye, 1);
val2.AddTile(TileID.DyeVat);
val2.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<FoxPistolBlue>())
.AddIngredient(ItemID.OrangeDye)
.AddTile(TileID.DyeVat)
.Register();
}
}