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/Peacekeeper/Peaceforcer.cs
+16 -15
View File
@@ -17,6 +17,7 @@ public class Peaceforcer : ModItem
public override void SetDefaults()
{
Item.damage = 48;
Item.DamageType = DamageClass.Ranged;
Item.width = 50;
Item.height = 30;
Item.useTime = 2;
@@ -39,14 +40,14 @@ public class Peaceforcer : ModItem
return new Vector2(-2f, -2f);
}
public override bool CanConsumeAmmo(Item ammo, Player player)
public override bool CanConsumeAmmo(Item ammo, Player player)
{
return Utils.NextFloat(Main.rand) >= 0.5f;
}
public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
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)) * 35f;
Vector2 muzzleOffset = Vector2.Normalize(velocity) * 35f;
if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0))
{
position += muzzleOffset;
@@ -60,18 +61,18 @@ public class Peaceforcer : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddRecipeGroup("FabusMod:Peacegunner", 1);
val.AddRecipeGroup("FabusMod:AdamantiteBar", 8);
val.AddIngredient(ItemID.SoulofNight, 6);
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 4);
val.AddTile(TileID.MythrilAnvil);
val.Register();
CreateRecipe()
.AddRecipeGroup("FabusMod:Peacegunner")
.AddRecipeGroup("FabusMod:AdamantiteBar", 8)
.AddIngredient(ItemID.SoulofNight, 6)
.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 4)
.AddTile(TileID.MythrilAnvil)
.Register();
Recipe val2 = CreateRecipe();
val2.AddIngredient(ModContent.ItemType<PeaceforcerVanHelsing>(), 1);
val2.AddIngredient(ItemID.SilverDye, 1);
val2.AddTile(TileID.DyeVat);
val2.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<PeaceforcerVanHelsing>())
.AddIngredient(ItemID.SilverDye)
.AddTile(TileID.DyeVat)
.Register();
}
}