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/Shotguns/Depriver.cs
+10 -9
View File
@@ -18,6 +18,7 @@ public class Depriver : ModItem
public override void SetDefaults()
{
Item.damage = 120;
Item.DamageType = DamageClass.Ranged;
Item.width = 70;
Item.height = 36;
Item.useTime = 18;
@@ -34,7 +35,7 @@ public class Depriver : ModItem
Item.useAmmo = AmmoID.Bullet;
}
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)
{
if (type == 14)
{
@@ -43,8 +44,8 @@ public class Depriver : ModItem
int numberProjectiles = 8;
for (int i = 0; i < numberProjectiles; i++)
{
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(10f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI);
Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f));
Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
}
return false;
}
@@ -75,7 +76,7 @@ public class Depriver : ModItem
Item.useTime = 20;
Item.useAnimation = 20;
}
return CanUseItem(player);
return base.CanUseItem(player);
}
public override Vector2? HoldoutOffset()
@@ -85,10 +86,10 @@ public class Depriver : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<GoldenShotgun>());
val.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 8);
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
val.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<GoldenShotgun>())
.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 8)
.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
.Register();
}
}
Items/Weapons/Ranged/Shotguns/GoldenShotgun.cs
+11 -10
View File
@@ -17,6 +17,7 @@ public class GoldenShotgun : ModItem
public override void SetDefaults()
{
Item.damage = 52;
Item.DamageType = DamageClass.Ranged;
Item.width = 80;
Item.height = 34;
Item.useTime = 25;
@@ -33,13 +34,13 @@ public class GoldenShotgun : ModItem
Item.useAmmo = AmmoID.Bullet;
}
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)
{
int numberProjectiles = 7;
for (int i = 0; i < numberProjectiles; i++)
{
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(10f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI);
Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f));
Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
}
return true;
}
@@ -70,7 +71,7 @@ public class GoldenShotgun : ModItem
Item.useTime = 25;
Item.useAnimation = 25;
}
return CanUseItem(player);
return base.CanUseItem(player);
}
public override Vector2? HoldoutOffset()
@@ -80,11 +81,11 @@ public class GoldenShotgun : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddRecipeGroup("FabusMod:HellkinShotgun", 1);
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 8);
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 4);
val.AddTile(TileID.AdamantiteForge);
val.Register();
CreateRecipe()
.AddRecipeGroup("FabusMod:HellkinShotgun")
.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 8)
.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 4)
.AddTile(TileID.AdamantiteForge)
.Register();
}
}
Items/Weapons/Ranged/Shotguns/HellfireShotgun.cs
+9 -8
View File
@@ -17,6 +17,7 @@ public class HellfireShotgun : ModItem
public override void SetDefaults()
{
Item.damage = 21;
Item.DamageType = DamageClass.Ranged;
Item.width = 78;
Item.height = 28;
Item.useTime = 45;
@@ -33,13 +34,13 @@ public class HellfireShotgun : ModItem
Item.useAmmo = AmmoID.Bullet;
}
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)
{
int numberProjectiles = 5;
for (int i = 0; i < numberProjectiles; i++)
{
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(12f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI);
Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(12f));
Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
}
return false;
}
@@ -51,10 +52,10 @@ public class HellfireShotgun : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ItemID.Obsidian, 16);
val.AddIngredient(ItemID.HellstoneBar, 4);
val.AddTile(TileID.Anvils);
val.Register();
CreateRecipe()
.AddIngredient(ItemID.Obsidian, 16)
.AddIngredient(ItemID.HellstoneBar, 4)
.AddTile(TileID.Anvils)
.Register();
}
}
Items/Weapons/Ranged/Shotguns/HellkinShotgun.cs
+16 -15
View File
@@ -17,6 +17,7 @@ public class HellkinShotgun : ModItem
public override void SetDefaults()
{
Item.damage = 46;
Item.DamageType = DamageClass.Ranged;
Item.width = 80;
Item.height = 34;
Item.useTime = 28;
@@ -33,13 +34,13 @@ public class HellkinShotgun : ModItem
Item.useAmmo = AmmoID.Bullet;
}
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)
{
int numberProjectiles = 6;
for (int i = 0; i < numberProjectiles; i++)
{
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI);
Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f));
Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
}
return true;
}
@@ -70,7 +71,7 @@ public class HellkinShotgun : ModItem
Item.useTime = 28;
Item.useAnimation = 28;
}
return CanUseItem(player);
return base.CanUseItem(player);
}
public override Vector2? HoldoutOffset()
@@ -80,17 +81,17 @@ public class HellkinShotgun : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddRecipeGroup("FabusMod:HellshiverGun");
val.AddIngredient(ItemID.HallowedBar, 6);
val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 4);
val.AddTile(TileID.MythrilAnvil);
val.Register();
CreateRecipe()
.AddRecipeGroup("FabusMod:HellshiverGun")
.AddIngredient(ItemID.HallowedBar, 6)
.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.SoulofWisdom>(), 4)
.AddTile(TileID.MythrilAnvil)
.Register();
Recipe val2 = CreateRecipe();
val2.AddIngredient(ModContent.ItemType<HellkinShotgunDracula>());
val2.AddIngredient(ItemID.OrangeDye, 1);
val2.AddTile(TileID.DyeVat);
val2.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<HellkinShotgunDracula>())
.AddIngredient(ItemID.OrangeDye)
.AddTile(TileID.DyeVat)
.Register();
}
}
Items/Weapons/Ranged/Shotguns/HellkinShotgunDracula.cs
+10 -9
View File
@@ -17,6 +17,7 @@ public class HellkinShotgunDracula : ModItem
public override void SetDefaults()
{
Item.damage = 46;
Item.DamageType = DamageClass.Ranged;
Item.width = 78;
Item.height = 30;
Item.useTime = 28;
@@ -33,13 +34,13 @@ public class HellkinShotgunDracula : ModItem
Item.useAmmo = AmmoID.Bullet;
}
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)
{
int numberProjectiles = 6;
for (int i = 0; i < numberProjectiles; i++)
{
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI);
Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f));
Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
}
return true;
}
@@ -70,7 +71,7 @@ public class HellkinShotgunDracula : ModItem
Item.useTime = 28;
Item.useAnimation = 28;
}
return this.CanUseItem(player);
return base.CanUseItem(player);
}
public override Vector2? HoldoutOffset()
@@ -80,10 +81,10 @@ public class HellkinShotgunDracula : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<HellkinShotgun>());
val.AddIngredient(ItemID.RedDye, 1);
val.AddTile(TileID.DyeVat);
val.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<HellkinShotgun>())
.AddIngredient(ItemID.RedDye)
.AddTile(TileID.DyeVat)
.Register();
}
}
Items/Weapons/Ranged/Shotguns/HellshiverGun.cs
+16 -15
View File
@@ -17,6 +17,7 @@ public class HellshiverGun : ModItem
public override void SetDefaults()
{
Item.damage = 30;
Item.DamageType = DamageClass.Ranged;
Item.width = 78;
Item.height = 28;
Item.useTime = 35;
@@ -33,13 +34,13 @@ public class HellshiverGun : ModItem
Item.useAmmo = AmmoID.Bullet;
}
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)
{
int numberProjectiles = 6;
for (int i = 0; i < numberProjectiles; i++)
{
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(10f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI, 0f, 0f);
Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f));
Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI, 0f, 0f);
}
return false;
}
@@ -51,17 +52,17 @@ public class HellshiverGun : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<HellfireShotgun>());
val.AddRecipeGroup("FabusMod:OrichalcumBar", 6);
val.AddIngredient(ItemID.IceBlock, 20);
val.AddTile(TileID.MythrilAnvil);
val.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<HellfireShotgun>())
.AddRecipeGroup("FabusMod:OrichalcumBar", 6)
.AddIngredient(ItemID.IceBlock, 20)
.AddTile(TileID.MythrilAnvil)
.Register();
Recipe val2 = CreateRecipe();
val2.AddIngredient(ModContent.ItemType<HellshiverGunHellfire>());
val2.AddIngredient(ItemID.BlueFlameDye, 1);
val2.AddTile(TileID.DyeVat);
val2.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<HellshiverGunHellfire>())
.AddIngredient(ItemID.BlueFlameDye)
.AddTile(TileID.DyeVat)
.Register();
}
}
Items/Weapons/Ranged/Shotguns/HellshiverGunHellfire.cs
+9 -8
View File
@@ -17,6 +17,7 @@ public class HellshiverGunHellfire : ModItem
public override void SetDefaults()
{
Item.damage = 30;
Item.DamageType = DamageClass.Ranged;
Item.width = 78;
Item.height = 28;
Item.useTime = 35;
@@ -33,13 +34,13 @@ public class HellshiverGunHellfire : ModItem
Item.useAmmo = AmmoID.Bullet;
}
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)
{
int numberProjectiles = 6;
for (int i = 0; i < numberProjectiles; i++)
{
Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(10f));
Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI);
Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f));
Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
}
return false;
}
@@ -51,10 +52,10 @@ public class HellshiverGunHellfire : ModItem
public override void AddRecipes()
{
Recipe val = CreateRecipe();
val.AddIngredient(ModContent.ItemType<HellshiverGun>());
val.AddIngredient(ItemID.FlameDye, 1);
val.AddTile(TileID.DyeVat);
val.Register();
CreateRecipe()
.AddIngredient(ModContent.ItemType<HellshiverGun>())
.AddIngredient(ItemID.FlameDye)
.AddTile(TileID.DyeVat)
.Register();
}
}