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/GoddessRevolver.cs
+10 -9
View File
@@ -17,6 +17,7 @@ public class GoddessRevolver : ModItem
public override void SetDefaults()
{
Item.damage = 86;
Item.DamageType = DamageClass.Ranged;
Item.width = 50;
Item.height = 28;
Item.useTime = 2;
@@ -39,14 +40,14 @@ public class GoddessRevolver : 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,11 +61,11 @@ public class GoddessRevolver : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddRecipeGroup("FabusMod:Peaceforcer", 1);
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 8);
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 6);
val.AddTile(TileID.AdamantiteForge);
val.Register();
CreateRecipe()
.AddRecipeGroup("FabusMod:Peaceforcer")
.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 8)
.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 6)
.AddTile(TileID.AdamantiteForge)
.Register();
}
}
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();
}
}
Items/Weapons/Ranged/Peacekeeper/PeaceforcerVanHelsing.cs
+5 -4
View File
@@ -17,6 +17,7 @@ public class PeaceforcerVanHelsing : ModItem
public override void SetDefaults()
{
Item.damage = 48;
Item.DamageType = DamageClass.Ranged;
Item.width = 50;
Item.height = 28;
Item.useTime = 2;
@@ -39,14 +40,14 @@ public class PeaceforcerVanHelsing : 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;
@@ -62,7 +63,7 @@ public class PeaceforcerVanHelsing : ModItem
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<Peaceforcer>());
val.AddIngredient(ItemID.BrownDye, 1);
val.AddIngredient(ItemID.BrownDye);
val.AddTile(TileID.DyeVat);
val.Register();
}
Items/Weapons/Ranged/Peacekeeper/Peacegunner.cs
+13 -12
View File
@@ -17,6 +17,7 @@ public class Peacegunner : ModItem
public override void SetDefaults()
{
Item.damage = 32;
Item.DamageType = DamageClass.Ranged;
Item.width = 50;
Item.height = 28;
Item.useTime = 12;
@@ -38,9 +39,9 @@ public class Peacegunner : ModItem
return new Vector2(-2f, -2f);
}
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;
@@ -50,16 +51,16 @@ public class Peacegunner : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<Peacekeeper>());
val.AddIngredient(ItemID.HellstoneBar, 10);
val.AddTile(TileID.Anvils);
val.Register();
Recipe recipe1 = CreateRecipe();
recipe1.AddIngredient(ModContent.ItemType<Peacekeeper>());
recipe1.AddIngredient(ItemID.HellstoneBar, 10);
recipe1.AddTile(TileID.Anvils);
recipe1.Register();
Recipe val2 = CreateRecipe();
val2.AddIngredient(ModContent.ItemType<PeacegunnerAmerican>());
val2.AddIngredient(ItemID.SilverDye, 1);
val2.AddTile(TileID.DyeVat);
val2.Register();
Recipe recipe2 = CreateRecipe();
recipe2.AddIngredient(ModContent.ItemType<PeacegunnerAmerican>());
recipe2.AddIngredient(ItemID.SilverDye);
recipe2.AddTile(TileID.DyeVat);
recipe2.Register();
}
}
Items/Weapons/Ranged/Peacekeeper/PeacegunnerAmerican.cs
+9 -8
View File
@@ -17,6 +17,7 @@ public class PeacegunnerAmerican : ModItem
public override void SetDefaults()
{
Item.damage = 32;
Item.DamageType = DamageClass.Ranged;
Item.width = 50;
Item.height = 28;
Item.useTime = 12;
@@ -38,9 +39,9 @@ public class PeacegunnerAmerican : ModItem
return new Vector2(-2f, -2f);
}
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;
@@ -50,11 +51,11 @@ public class PeacegunnerAmerican : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<Peacegunner>());
val.AddIngredient(ItemID.BlueDye, 1);
val.AddIngredient(ItemID.RedDye, 1);
val.AddTile(TileID.DyeVat);
val.Register();
Recipe recipe = CreateRecipe();
recipe.AddIngredient(ModContent.ItemType<Peacegunner>());
recipe.AddIngredient(ItemID.BlueDye);
recipe.AddIngredient(ItemID.RedDye);
recipe.AddTile(TileID.DyeVat);
recipe.Register();
}
}
Items/Weapons/Ranged/Peacekeeper/Peacekeeper.cs
+8 -7
View File
@@ -17,6 +17,7 @@ public class Peacekeeper : ModItem
public override void SetDefaults()
{
Item.damage = 12;
Item.DamageType = DamageClass.Ranged;
Item.width = 50;
Item.height = 26;
Item.useTime = 15;
@@ -38,9 +39,9 @@ public class Peacekeeper : ModItem
return new Vector2(-2f, -2f);
}
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;
@@ -50,10 +51,10 @@ public class Peacekeeper : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddRecipeGroup("IronBar", 10);
val.AddIngredient(ItemID.Sapphire, 2);
val.AddTile(TileID.Anvils);
val.Register();
Recipe recipe = CreateRecipe();
recipe.AddRecipeGroup("IronBar", 10);
recipe.AddIngredient(ItemID.Sapphire, 2);
recipe.AddTile(TileID.Anvils);
recipe.Register();
}
}
Items/Weapons/Ranged/Peacekeeper/Unity.cs
+10 -9
View File
@@ -18,6 +18,7 @@ public class Unity : ModItem
public override void SetDefaults()
{
Item.damage = 150;
Item.DamageType = DamageClass.Ranged;
Item.width = 38;
Item.height = 24;
Item.useTime = 2;
@@ -40,14 +41,14 @@ public class Unity : 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.6f;
}
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;
@@ -61,10 +62,10 @@ public class Unity : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<GoddessRevolver>());
val.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 8);
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
val.Register();
Recipe recipe = CreateRecipe();
recipe.AddIngredient(ModContent.ItemType<GoddessRevolver>());
recipe.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 8);
recipe.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
recipe.Register();
}
}