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/PulsePistols/GoldenPulse.cs
+9 -10
View File
@@ -18,6 +18,7 @@ public class GoldenPulse : ModItem
public override void SetDefaults()
{
Item.damage = 66;
Item.DamageType = DamageClass.Ranged;
Item.width = 40;
Item.height = 28;
Item.useTime = 2;
@@ -34,7 +35,7 @@ public class GoldenPulse : ModItem
Item.rare = 12;
}
public override bool CanConsumeAmmo(Item ammo, Player player)
public override bool CanConsumeAmmo(Item ammo, Player player)
{
return Utils.NextFloat(Main.rand) >= 0.9f;
}
@@ -44,11 +45,9 @@ public class GoldenPulse : ModItem
return new Vector2(1f, -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 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f));
velocity.X = perturbedSpeed.X;
velocity.Y = perturbedSpeed.Y;
velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f));
if (type == 14)
{
type = ModContent.ProjectileType<PulseBulletGolden>();
@@ -58,10 +57,10 @@ public class GoldenPulse : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddRecipeGroup("FabusMod:PulseSprayer", 1);
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 2);
val.AddTile(TileID.LunarCraftingStation);
val.Register();
CreateRecipe()
.AddRecipeGroup("FabusMod:PulseSprayer")
.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 2)
.AddTile(TileID.LunarCraftingStation)
.Register();
}
}
Items/Weapons/Ranged/PulsePistols/Graffiti.cs
+9 -10
View File
@@ -18,6 +18,7 @@ public class Graffiti : ModItem
public override void SetDefaults()
{
Item.damage = 80;
Item.DamageType = DamageClass.Ranged;
Item.width = 40;
Item.height = 28;
Item.useTime = 2;
@@ -34,7 +35,7 @@ public class Graffiti : ModItem
Item.expert = true;
}
public override bool CanConsumeAmmo(Item ammo, Player player)
public override bool CanConsumeAmmo(Item ammo, Player player)
{
return Utils.NextFloat(Main.rand) >= 0.9f;
}
@@ -44,11 +45,9 @@ public class Graffiti : ModItem
return new Vector2(1f, -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 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f));
velocity.X = perturbedSpeed.X;
velocity.Y = perturbedSpeed.Y;
velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f));
if (type == 14)
{
type = ModContent.ProjectileType<RainbowBullet>();
@@ -58,10 +57,10 @@ public class Graffiti : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<GoldenPulse>());
val.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 10);
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
val.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<GoldenPulse>())
.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 10)
.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
.Register();
}
}
Items/Weapons/Ranged/PulsePistols/PulsePistol.cs
+11 -12
View File
@@ -18,6 +18,7 @@ public class PulsePistol : ModItem
public override void SetDefaults()
{
Item.damage = 10;
Item.DamageType = DamageClass.Ranged;
Item.width = 40;
Item.height = 28;
Item.useTime = 2;
@@ -34,16 +35,14 @@ public class PulsePistol : ModItem
Item.rare = ItemRarityID.LightRed;
}
public override bool CanConsumeAmmo(Item ammo, Player player)
public override bool CanConsumeAmmo(Item ammo, Player player)
{
return Utils.NextFloat(Main.rand) >= 0.7f;
}
public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
{
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f));
velocity.X = perturbedSpeed.X;
velocity.Y = perturbedSpeed.Y;
public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
{
velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f));
if (type == 14)
{
type = ModContent.ProjectileType<PulseBullet>();
@@ -58,11 +57,11 @@ public class PulsePistol : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddRecipeGroup("FabusMod:AdamantiteBar", 6);
val.AddIngredient(ItemID.Diamond, 2);
val.AddIngredient(ItemID.Sapphire, 2);
val.AddTile(TileID.MythrilAnvil);
val.Register();
CreateRecipe()
.AddRecipeGroup("FabusMod:AdamantiteBar", 6)
.AddIngredient(ItemID.Diamond, 2)
.AddIngredient(ItemID.Sapphire, 2)
.AddTile(TileID.MythrilAnvil)
.Register();
}
}
Items/Weapons/Ranged/PulsePistols/PulseSprayer.cs
+15 -16
View File
@@ -18,6 +18,7 @@ public class PulseSprayer : ModItem
public override void SetDefaults()
{
Item.damage = 54;
Item.DamageType = DamageClass.Ranged;
Item.width = 40;
Item.height = 28;
Item.useTime = 2;
@@ -34,7 +35,7 @@ public class PulseSprayer : ModItem
Item.rare = ItemRarityID.Red;
}
public override bool CanConsumeAmmo(Item ammo, Player player)
public override bool CanConsumeAmmo(Item ammo, Player player)
{
return Utils.NextFloat(Main.rand) >= 0.8f;
}
@@ -44,11 +45,9 @@ public class PulseSprayer : ModItem
return new Vector2(1f, -2f);
}
public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
{
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f));
velocity.X = perturbedSpeed.X;
velocity.Y = perturbedSpeed.Y;
public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
{
velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f));
if (type == 14)
{
type = ModContent.ProjectileType<PulseBulletBlue>();
@@ -58,16 +57,16 @@ public class PulseSprayer : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddRecipeGroup("FabusMod:PunksPulse", 1);
val.AddIngredient(ItemID.FragmentVortex, 8);
val.AddTile(TileID.LunarCraftingStation);
val.Register();
CreateRecipe()
.AddRecipeGroup("FabusMod:PunksPulse")
.AddIngredient(ItemID.FragmentVortex, 8)
.AddTile(TileID.LunarCraftingStation)
.Register();
Recipe val2 = CreateRecipe();
val2.AddIngredient(ModContent.ItemType<PulseSprayerCadet>());
val2.AddIngredient(ItemID.BlueDye, 1);
val2.AddTile(TileID.DyeVat);
val2.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<PulseSprayerCadet>())
.AddIngredient(ItemID.BlueDye)
.AddTile(TileID.DyeVat)
.Register();
}
}
Items/Weapons/Ranged/PulsePistols/PulseSprayerCadet.cs
+10 -11
View File
@@ -18,6 +18,7 @@ public class PulseSprayerCadet : ModItem
public override void SetDefaults()
{
Item.damage = 54;
Item.DamageType = DamageClass.Ranged;
Item.width = 40;
Item.height = 28;
Item.useTime = 2;
@@ -34,7 +35,7 @@ public class PulseSprayerCadet : ModItem
Item.rare = ItemRarityID.Red;
}
public override bool CanConsumeAmmo(Item ammo, Player player)
public override bool CanConsumeAmmo(Item ammo, Player player)
{
return Utils.NextFloat(Main.rand) >= 0.8f;
}
@@ -44,11 +45,9 @@ public class PulseSprayerCadet : ModItem
return new Vector2(1f, -2f);
}
public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
{
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f));
velocity.X = perturbedSpeed.X;
velocity.Y = perturbedSpeed.Y;
public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
{
velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f));
if (type == 14)
{
type = ModContent.ProjectileType<PulseBullet>();
@@ -58,10 +57,10 @@ public class PulseSprayerCadet : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<PulseSprayer>());
val.AddIngredient(ItemID.SilverDye, 1);
val.AddTile(TileID.DyeVat);
val.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<PulseSprayer>())
.AddIngredient(ItemID.SilverDye)
.AddTile(TileID.DyeVat)
.Register();
}
}
Items/Weapons/Ranged/PulsePistols/PunksPulse.cs
+15 -16
View File
@@ -18,6 +18,7 @@ public class PunksPulse : ModItem
public override void SetDefaults()
{
Item.damage = 25;
Item.DamageType = DamageClass.Ranged;
Item.width = 40;
Item.height = 28;
Item.useTime = 2;
@@ -34,7 +35,7 @@ public class PunksPulse : ModItem
Item.rare = ItemRarityID.Pink;
}
public override bool CanConsumeAmmo(Item ammo, Player player)
public override bool CanConsumeAmmo(Item ammo, Player player)
{
return Utils.NextFloat(Main.rand) >= 0.7f;
}
@@ -44,11 +45,9 @@ public class PunksPulse : ModItem
return new Vector2(1f, -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 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f));
velocity.X = perturbedSpeed.X;
velocity.Y = perturbedSpeed.Y;
velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f));
if (type == 14)
{
type = ModContent.ProjectileType<PulseBullet>();
@@ -58,17 +57,17 @@ public class PunksPulse : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<PulsePistol>());
val.AddIngredient(ItemID.HallowedBar, 8);
val.AddIngredient(ItemID.SoulofNight, 6);
val.AddTile(TileID.AdamantiteForge);
val.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<PulsePistol>())
.AddIngredient(ItemID.HallowedBar, 8)
.AddIngredient(ItemID.SoulofNight, 6)
.AddTile(TileID.AdamantiteForge)
.Register();
Recipe val2 = CreateRecipe();
val2.AddIngredient(ModContent.ItemType<PunksPulseUltraviolet>());
val2.AddIngredient(ItemID.BlueDye, 1);
val2.AddTile(TileID.DyeVat);
val2.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<PunksPulseUltraviolet>())
.AddIngredient(ItemID.BlueDye)
.AddTile(TileID.DyeVat)
.Register();
}
}
Items/Weapons/Ranged/PulsePistols/PunksPulseUltraviolet.cs
+9 -10
View File
@@ -18,6 +18,7 @@ public class PunksPulseUltraviolet : ModItem
public override void SetDefaults()
{
Item.damage = 25;
Item.DamageType = DamageClass.Ranged;
Item.width = 40;
Item.height = 28;
Item.useTime = 2;
@@ -34,7 +35,7 @@ public class PunksPulseUltraviolet : ModItem
Item.rare = ItemRarityID.Pink;
}
public override bool CanConsumeAmmo(Item ammo, Player player)
public override bool CanConsumeAmmo(Item ammo, Player player)
{
return Utils.NextFloat(Main.rand) >= 0.7f;
}
@@ -44,11 +45,9 @@ public class PunksPulseUltraviolet : ModItem
return new Vector2(1f, -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 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f));
velocity.X = perturbedSpeed.X;
velocity.Y = perturbedSpeed.Y;
velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f));
if (type == 14)
{
type = ModContent.ProjectileType<PulseBulletPink>();
@@ -58,10 +57,10 @@ public class PunksPulseUltraviolet : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<PunksPulse>());
val.AddIngredient(ItemID.PinkDye, 1);
val.AddTile(TileID.DyeVat);
val.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<PunksPulse>())
.AddIngredient(ItemID.PinkDye)
.AddTile(TileID.DyeVat)
.Register();
}
}