diff --git a/Buffs/AncientPredatorBuff.cs b/Buffs/AncientPredatorBuff.cs index 11f7f8c8..7837164b 100644 --- a/Buffs/AncientPredatorBuff.cs +++ b/Buffs/AncientPredatorBuff.cs @@ -16,7 +16,6 @@ public override void SetDefaults() Main.buffNoTimeDisplay[Type] = true; } - public override void Update(Player player, ref int buffIndex) { if (MinionType == -1) diff --git a/Helper.cs b/Helper.cs index eb33eda3..9bd69279 100644 --- a/Helper.cs +++ b/Helper.cs @@ -149,7 +149,6 @@ public static int GetNearestPlayer(this NPC npc) return NearestPlayer; } - /// /// *Используется для вычислиения инерции от точки до точки с заданой скоростью* /// diff --git a/Ice/Dungeon/DungeonBlockItem.cs b/Ice/Dungeon/DungeonBlockItem.cs index a998635f..b6009c3d 100644 --- a/Ice/Dungeon/DungeonBlockItem.cs +++ b/Ice/Dungeon/DungeonBlockItem.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Ice/Dungeon/DungeonWallItem.cs b/Ice/Dungeon/DungeonWallItem.cs index b4594a36..0098beb2 100644 --- a/Ice/Dungeon/DungeonWallItem.cs +++ b/Ice/Dungeon/DungeonWallItem.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Ice/Items/FrostByteEye.cs b/Ice/Items/FrostByteEye.cs index 9f4ce670..1afda580 100644 --- a/Ice/Items/FrostByteEye.cs +++ b/Ice/Items/FrostByteEye.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased move speed and increased jump height"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Ice/Items/FrostGuardian.cs b/Ice/Items/FrostGuardian.cs index 4fc4b172..1bd2a173 100644 --- a/Ice/Items/FrostGuardian.cs +++ b/Ice/Items/FrostGuardian.cs @@ -28,8 +28,6 @@ public override void UpdateEquip(Player player) player.moveSpeed += 0.20f; } - - public override void UpdateAccessory(Player player, bool hideVisual) { player.meleeDamage += 0.05f; diff --git a/Ice/Items/FrostLance.cs b/Ice/Items/FrostLance.cs index 870422b1..117f8c42 100644 --- a/Ice/Items/FrostLance.cs +++ b/Ice/Items/FrostLance.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(44, 60); diff --git a/Ice/Items/FrostLancePro.cs b/Ice/Items/FrostLancePro.cs index d855002b..7ab623dd 100644 --- a/Ice/Items/FrostLancePro.cs +++ b/Ice/Items/FrostLancePro.cs @@ -15,6 +15,5 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Frost Lance"); } - } } diff --git a/Ice/Items/FrostLiquidFlaskPro.cs b/Ice/Items/FrostLiquidFlaskPro.cs index a1b13329..dda57414 100644 --- a/Ice/Items/FrostLiquidFlaskPro.cs +++ b/Ice/Items/FrostLiquidFlaskPro.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Frost Liquid Flask Pro"); } - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 107); @@ -44,6 +43,5 @@ public override void Kill(int timeLeft) } } - } } diff --git a/Ice/Items/Frostex.cs b/Ice/Items/Frostex.cs index ff0c89c5..6b9c7f75 100644 --- a/Ice/Items/Frostex.cs +++ b/Ice/Items/Frostex.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased melee and ranged damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.1f; diff --git a/Ice/Items/FrozenPaxe.cs b/Ice/Items/FrozenPaxe.cs index 58bf7fef..5e44dcfb 100644 --- a/Ice/Items/FrozenPaxe.cs +++ b/Ice/Items/FrozenPaxe.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(3) == 0) diff --git a/Ice/Items/Furniture/IceBathtubTile.cs b/Ice/Items/Furniture/IceBathtubTile.cs index 8f224691..c3c3bba7 100644 --- a/Ice/Items/Furniture/IceBathtubTile.cs +++ b/Ice/Items/Furniture/IceBathtubTile.cs @@ -20,7 +20,6 @@ public override void SetDefaults() bed = true; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { Item.NewItem(i * 16, j * 16, 64, 32, mod.ItemType("IceBathtub")); diff --git a/Ice/Items/Furniture/IceChandelierTile.cs b/Ice/Items/Furniture/IceChandelierTile.cs index 0a2f2041..ea5b9214 100644 --- a/Ice/Items/Furniture/IceChandelierTile.cs +++ b/Ice/Items/Furniture/IceChandelierTile.cs @@ -33,7 +33,6 @@ public override void ModifyLight(int i, int j, ref float r, ref float g, ref flo b = 0.9f; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { if (frameX == 0) diff --git a/Ice/Items/GlacierArmchair.cs b/Ice/Items/GlacierArmchair.cs index 4e5fad95..9f41bb9a 100644 --- a/Ice/Items/GlacierArmchair.cs +++ b/Ice/Items/GlacierArmchair.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Ice/Items/GlacierFence.cs b/Ice/Items/GlacierFence.cs index f3f9c55a..27bc62d4 100644 --- a/Ice/Items/GlacierFence.cs +++ b/Ice/Items/GlacierFence.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Ice/Items/GlacierKnives.cs b/Ice/Items/GlacierKnives.cs index 268d2c0b..4189ffc5 100644 --- a/Ice/Items/GlacierKnives.cs +++ b/Ice/Items/GlacierKnives.cs @@ -60,7 +60,6 @@ public override bool Shoot(Player player, ref Vector2 position, ref float speedX Projectile.NewProjectile(vector2.X, vector2.Y, vX, vY, mod.ProjectileType("GlacierKnivesProj"), damage, knockBack, Main.myPlayer); - } return false; } diff --git a/Ice/Items/GlacierKnivesProj.cs b/Ice/Items/GlacierKnivesProj.cs index c2ea6e9a..770f019f 100644 --- a/Ice/Items/GlacierKnivesProj.cs +++ b/Ice/Items/GlacierKnivesProj.cs @@ -63,6 +63,5 @@ public override void AI() } } - } } diff --git a/Ice/Items/GlacierWood.cs b/Ice/Items/GlacierWood.cs index 0e97eba6..796b1ef6 100644 --- a/Ice/Items/GlacierWood.cs +++ b/Ice/Items/GlacierWood.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Ice/Items/GlacierWoodBow.cs b/Ice/Items/GlacierWoodBow.cs index 25271e1a..7fc2eac1 100644 --- a/Ice/Items/GlacierWoodBow.cs +++ b/Ice/Items/GlacierWoodBow.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-1, 0); diff --git a/Ice/Items/GlacierWoodChestplate.cs b/Ice/Items/GlacierWoodChestplate.cs index 824359f9..0916f06d 100644 --- a/Ice/Items/GlacierWoodChestplate.cs +++ b/Ice/Items/GlacierWoodChestplate.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Ice/Items/GlacierWoodHammer.cs b/Ice/Items/GlacierWoodHammer.cs index 257c817c..44a064a8 100644 --- a/Ice/Items/GlacierWoodHammer.cs +++ b/Ice/Items/GlacierWoodHammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Ice/Items/GlacierWoodHelmet.cs b/Ice/Items/GlacierWoodHelmet.cs index 56761553..bc39efaf 100644 --- a/Ice/Items/GlacierWoodHelmet.cs +++ b/Ice/Items/GlacierWoodHelmet.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("GlacierWoodChestplate") && legs.type == mod.ItemType("GlacierWoodLeggings"); diff --git a/Ice/Items/GlacierWoodLeggings.cs b/Ice/Items/GlacierWoodLeggings.cs index de54b934..ed2a3afa 100644 --- a/Ice/Items/GlacierWoodLeggings.cs +++ b/Ice/Items/GlacierWoodLeggings.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Ice/Items/GlacierWoodSword.cs b/Ice/Items/GlacierWoodSword.cs index 9fb16b91..6456a1a3 100644 --- a/Ice/Items/GlacierWoodSword.cs +++ b/Ice/Items/GlacierWoodSword.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Ice/Mobs/ColdtrapChain.cs b/Ice/Mobs/ColdtrapChain.cs index 3508a018..7ee14074 100644 --- a/Ice/Mobs/ColdtrapChain.cs +++ b/Ice/Mobs/ColdtrapChain.cs @@ -63,13 +63,11 @@ public float maxAngle private const float maxLength = 400f; private const float maxLengthSpeed = 2.5f; - public override void SetStaticDefaults() { DisplayName.SetDefault("Coldtrap"); } - public override void SetDefaults() { projectile.width = 1; diff --git a/Ice/Mobs/Dot.cs b/Ice/Mobs/Dot.cs index b7d7ee18..00d9b92e 100644 --- a/Ice/Mobs/Dot.cs +++ b/Ice/Mobs/Dot.cs @@ -13,7 +13,6 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Coldtrap"); } - public override void SetDefaults() { npc.lifeMax = 20; diff --git a/Ice/Mobs/Frostbyte.cs b/Ice/Mobs/Frostbyte.cs index e809dd4f..f6126784 100644 --- a/Ice/Mobs/Frostbyte.cs +++ b/Ice/Mobs/Frostbyte.cs @@ -14,7 +14,6 @@ public override void SetStaticDefaults() Main.npcFrameCount[npc.type] = 3; } - public override void SetDefaults() { npc.lifeMax = 50; diff --git a/Ice/Mobs/IceWolf.cs b/Ice/Mobs/IceWolf.cs index 75b62396..d27f3222 100644 --- a/Ice/Mobs/IceWolf.cs +++ b/Ice/Mobs/IceWolf.cs @@ -36,7 +36,6 @@ public override void ScaleExpertStats(int numPlayers, float bossLifeScale) npc.damage = npc.damage * 1; } - public override void ModifyHitPlayer(Player target, ref int damage, ref bool crit) { target.AddBuff(44, 60); diff --git a/Invasion/AncientWatch.cs b/Invasion/AncientWatch.cs index a485acf0..f88ed7d1 100644 --- a/Invasion/AncientWatch.cs +++ b/Invasion/AncientWatch.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons Paradox Cohort"); } - public override bool CanUseItem(Player player) { CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer(mod); diff --git a/Invasion/ClockofTime.cs b/Invasion/ClockofTime.cs index 64879345..eddc6bad 100644 --- a/Invasion/ClockofTime.cs +++ b/Invasion/ClockofTime.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows you to control the time"); } - public override bool UseItem(Player player) { if (player.altFunctionUse == 2) diff --git a/Invasion/Crystyle.cs b/Invasion/Crystyle.cs index f657fc77..61ebb083 100644 --- a/Invasion/Crystyle.cs +++ b/Invasion/Crystyle.cs @@ -32,8 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 59); diff --git a/Invasion/CyberWrathInvasion.cs b/Invasion/CyberWrathInvasion.cs index 2c44ef04..dca1987a 100644 --- a/Invasion/CyberWrathInvasion.cs +++ b/Invasion/CyberWrathInvasion.cs @@ -98,7 +98,6 @@ public override void PostUpdate() InvasionWorld.CyberWrathPoints = InvasionWorld.CyberWrathPoints1; - if (InvasionWorld.CyberWrathPoints1 == 15) { NPC.NewNPC((int)player.Center.X, (int)player.Center.Y - YOffset, mod.NPCType("Violeum")); @@ -182,7 +181,6 @@ public override void PostUpdate() InvasionWorld.CyberWrathPoints1 = 98; } - if (InvasionWorld.CyberWrathPoints1 == 100 && !NPC.AnyNPCs(mod.NPCType("Titan_")) && !NPC.AnyNPCs(mod.NPCType("Titan"))) { Main.NewText("Paradox Cohort has been defeated!", 39, 86, 134); diff --git a/Invasion/EndlessPainPro.cs b/Invasion/EndlessPainPro.cs index e09e7b96..950970a0 100644 --- a/Invasion/EndlessPainPro.cs +++ b/Invasion/EndlessPainPro.cs @@ -99,6 +99,5 @@ public override void AI() return Color.White; } - } } diff --git a/Invasion/InvasionWorld.cs b/Invasion/InvasionWorld.cs index e649e012..1f29bca9 100644 --- a/Invasion/InvasionWorld.cs +++ b/Invasion/InvasionWorld.cs @@ -42,7 +42,6 @@ public override void Load(TagCompound tag) CyberWrathPoints1 = tag.GetAsInt("CyberWrathPoints1"); } - public override void NetSend(BinaryWriter writer) { writer.Write(CyberWrath); @@ -55,7 +54,6 @@ public override void NetReceive(BinaryReader reader) CyberWrathPoints1 = reader.ReadInt32(); } - public override void LoadLegacy(BinaryReader reader) { int loadVersion = reader.ReadInt32(); diff --git a/Invasion/MiniSoul.cs b/Invasion/MiniSoul.cs index 589e12ae..d34c8372 100644 --- a/Invasion/MiniSoul.cs +++ b/Invasion/MiniSoul.cs @@ -33,7 +33,6 @@ public override void SetDefaults() animationType = 3; } - public override void NPCLoot() { diff --git a/Invasion/Mini_Cyber.cs b/Invasion/Mini_Cyber.cs index ace4e29a..89bfed67 100644 --- a/Invasion/Mini_Cyber.cs +++ b/Invasion/Mini_Cyber.cs @@ -64,7 +64,6 @@ public override void CheckActive() } } - void Shoot() { float NearestNPCDist = ShootDistance; diff --git a/Invasion/ParadoxDrill.cs b/Invasion/ParadoxDrill.cs index 82690710..851143b8 100644 --- a/Invasion/ParadoxDrill.cs +++ b/Invasion/ParadoxDrill.cs @@ -18,7 +18,6 @@ public override void SetDefaults() item.useAnimation = 12; item.channel = true; - item.noUseGraphic = true; item.noMelee = true; item.useStyle = 5; @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Press LMB to use drill\nPress RMB to use axe and hammer"); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Invasion/ParadoxPotion.cs b/Invasion/ParadoxPotion.cs index 61c689b2..006e4026 100644 --- a/Invasion/ParadoxPotion.cs +++ b/Invasion/ParadoxPotion.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Restores 300 health"); } - public override bool CanUseItem(Player player) { if (player.FindBuffIndex(BuffID.PotionSickness) == -1) diff --git a/Invasion/Relayx.cs b/Invasion/Relayx.cs index 4befa04d..5105d206 100644 --- a/Invasion/Relayx.cs +++ b/Invasion/Relayx.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Feel the power of the Titan"); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(3) == 0) diff --git a/Invasion/RocketWand.cs b/Invasion/RocketWand.cs index 961a0cb3..02bbe035 100644 --- a/Invasion/RocketWand.cs +++ b/Invasion/RocketWand.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Causes missiles to fall from the sky"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = 134; diff --git a/Invasion/SecondHand.cs b/Invasion/SecondHand.cs index b1c526cd..362c6322 100644 --- a/Invasion/SecondHand.cs +++ b/Invasion/SecondHand.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases tile and wall placement range"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Invasion/SoulFlames.cs b/Invasion/SoulFlames.cs index c456b5f3..5e305efd 100644 --- a/Invasion/SoulFlames.cs +++ b/Invasion/SoulFlames.cs @@ -44,6 +44,5 @@ public override bool Shoot(Player player, ref Vector2 position, ref float speedX return false; } - } } diff --git a/Invasion/StrayStaff.cs b/Invasion/StrayStaff.cs index 8da87f34..0a438366 100644 --- a/Invasion/StrayStaff.cs +++ b/Invasion/StrayStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a cyber stray to fight for you"); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Invasion/SunBoots.cs b/Invasion/SunBoots.cs index 2dbf00d1..bbba3249 100644 --- a/Invasion/SunBoots.cs +++ b/Invasion/SunBoots.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.value = 00150000; item.rare = 11; - item.accessory = true; } diff --git a/Invasion/TheEtherealm.cs b/Invasion/TheEtherealm.cs index 8c38cf08..56670db6 100644 --- a/Invasion/TheEtherealm.cs +++ b/Invasion/TheEtherealm.cs @@ -34,8 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Invasion/Titan.cs b/Invasion/Titan.cs index ba25e266..9062ebed 100644 --- a/Invasion/Titan.cs +++ b/Invasion/Titan.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Main.npcFrameCount[npc.type] = 4; } - Vector2 Hands = new Vector2(-1, -1); public static readonly int arenaWidth = (int)(1.3f * NPC.sWidth); public override void SetDefaults() @@ -143,7 +142,6 @@ public override void AI() npc.netUpdate = true; } - npc.netUpdate = false; npc.ai[0]++; npc.ai[1]++; //старт таймера diff --git a/Invasion/Titan_.cs b/Invasion/Titan_.cs index 69ac9c08..ce99a167 100644 --- a/Invasion/Titan_.cs +++ b/Invasion/Titan_.cs @@ -52,12 +52,6 @@ Rectangle GetFrame(int Number) return new Rectangle(0, npc.frame.Height * (Number - 1), npc.frame.Width, npc.frame.Height); } - - - - - - public override void HitEffect(int hitDirection, double damage) { @@ -94,7 +88,6 @@ public override void AI() FirstAttack = false; } - if (player.dead) { npc.active = true; diff --git a/Invasion/VioleumMask.cs b/Invasion/VioleumMask.cs index e24c1e1b..b60e144b 100644 --- a/Invasion/VioleumMask.cs +++ b/Invasion/VioleumMask.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool DrawHead() { return false; diff --git a/Invasion/VioleumWings.cs b/Invasion/VioleumWings.cs index 300542fd..7472c34f 100644 --- a/Invasion/VioleumWings.cs +++ b/Invasion/VioleumWings.cs @@ -22,8 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows flight and slow fall"); } - - public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 180; diff --git a/Items/AbyssBreastplate.cs b/Items/AbyssBreastplate.cs index ac4625ad..07cc107b 100644 --- a/Items/AbyssBreastplate.cs +++ b/Items/AbyssBreastplate.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 18000; item.rare = 7; item.defense = 22; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("14% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 2; diff --git a/Items/AbyssGreaves.cs b/Items/AbyssGreaves.cs index 64f556fe..21c3428c 100644 --- a/Items/AbyssGreaves.cs +++ b/Items/AbyssGreaves.cs @@ -8,14 +8,12 @@ namespace Tremor.Items public class AbyssGreaves : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 18000; item.rare = 7; item.defense = 15; @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("14% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 2; diff --git a/Items/AbyssHeadgear.cs b/Items/AbyssHeadgear.cs index 5b4d164b..4f443119 100644 --- a/Items/AbyssHeadgear.cs +++ b/Items/AbyssHeadgear.cs @@ -10,7 +10,6 @@ namespace Tremor.Items public class AbyssHeadgear : ModItem { - const int ShootType = 496; // ��� ����५� const float ShootRange = 100.0f; // ���쭮��� ����५� const float ShootKN = 1.0f; // ����뢠��� @@ -28,7 +27,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 18000; item.rare = 7; item.defense = 11; @@ -40,7 +38,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("14% increased minion damage\nIncreases maximum health by 40"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.14f; diff --git a/Items/AdamantiteDisc.cs b/Items/AdamantiteDisc.cs index 6805e435..2f82eaca 100644 --- a/Items/AdamantiteDisc.cs +++ b/Items/AdamantiteDisc.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool CanUseItem(Player player) { for (int i = 0; i < 1000; ++i) diff --git a/Items/AdamantiteHat.cs b/Items/AdamantiteHat.cs index a08fbfb9..bbc324b3 100644 --- a/Items/AdamantiteHat.cs +++ b/Items/AdamantiteHat.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 24%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.24f; diff --git a/Items/AdamantiteHeader.cs b/Items/AdamantiteHeader.cs index 1fc48b0e..5d6525c8 100644 --- a/Items/AdamantiteHeader.cs +++ b/Items/AdamantiteHeader.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases thrown damage by 24%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.24f; diff --git a/Items/AdamantiteRifle.cs b/Items/AdamantiteRifle.cs index 81ebec78..9f03b6c7 100644 --- a/Items/AdamantiteRifle.cs +++ b/Items/AdamantiteRifle.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-15, 0); diff --git a/Items/AdamantiteStaff.cs b/Items/AdamantiteStaff.cs index 828af19a..c9ff17cd 100644 --- a/Items/AdamantiteStaff.cs +++ b/Items/AdamantiteStaff.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AdamantiteVisage.cs b/Items/AdamantiteVisage.cs index 78daea74..501e011e 100644 --- a/Items/AdamantiteVisage.cs +++ b/Items/AdamantiteVisage.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 24%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.24f; diff --git a/Items/AdamantiteWarhammer.cs b/Items/AdamantiteWarhammer.cs index 7b963df0..00376aae 100644 --- a/Items/AdamantiteWarhammer.cs +++ b/Items/AdamantiteWarhammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AdvancedCircuit.cs b/Items/AdvancedCircuit.cs index 50be06f3..a71849c9 100644 --- a/Items/AdvancedCircuit.cs +++ b/Items/AdvancedCircuit.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Mothership"); } - public override bool CanUseItem(Player player) { return !NPC.AnyNPCs(mod.NPCType("Mothership")) && NPC.downedPlantBoss && !Main.dayTime && Main.netMode != 1; diff --git a/Items/AfterlifeBreastplate.cs b/Items/AfterlifeBreastplate.cs index 5872e605..5a1bd114 100644 --- a/Items/AfterlifeBreastplate.cs +++ b/Items/AfterlifeBreastplate.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.height = 18; item.value = 10000; - item.rare = 6; item.defense = 11; } @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("9% increased all damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 2; diff --git a/Items/AfterlifeHood.cs b/Items/AfterlifeHood.cs index d4505f67..7c9d54be 100644 --- a/Items/AfterlifeHood.cs +++ b/Items/AfterlifeHood.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration"); } - public override void UpdateEquip(Player player) { player.crimsonRegen = true; diff --git a/Items/AfterlifeLeggings.cs b/Items/AfterlifeLeggings.cs index 7e1461b2..5b0b5b10 100644 --- a/Items/AfterlifeLeggings.cs +++ b/Items/AfterlifeLeggings.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 10000; item.rare = 6; item.defense = 9; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Higher jump height\nIncreases movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.25f; diff --git a/Items/AlchemasterMask.cs b/Items/AlchemasterMask.cs index 3e87cf59..61d799ee 100644 --- a/Items/AlchemasterMask.cs +++ b/Items/AlchemasterMask.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/Alchemator.cs b/Items/Alchemator.cs index e36ebfc9..cc05e6d3 100644 --- a/Items/Alchemator.cs +++ b/Items/Alchemator.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows you to create and use Jellyxir"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AlchemistEmblem.cs b/Items/AlchemistEmblem.cs index 49fdbb1c..8d804e19 100644 --- a/Items/AlchemistEmblem.cs +++ b/Items/AlchemistEmblem.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased alchemical damage"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.GetModPlayer(mod).alchemicalDamage += 0.15f; diff --git a/Items/AlchemistFocus.cs b/Items/AlchemistFocus.cs index 8b3c71c9..93dc809b 100644 --- a/Items/AlchemistFocus.cs +++ b/Items/AlchemistFocus.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 2; item.accessory = true; item.value = 50000; diff --git a/Items/AlchemistGlove.cs b/Items/AlchemistGlove.cs index 1c21f6ad..3c11c02d 100644 --- a/Items/AlchemistGlove.cs +++ b/Items/AlchemistGlove.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemic weapons throw two flasks instead of one"); } - public override void UpdateAccessory(Player player, bool hideVisual) { MPlayer modPlayer = (MPlayer)player.GetModPlayer(mod, "MPlayer"); diff --git a/Items/AlchemistSoul.cs b/Items/AlchemistSoul.cs index 54b20d67..b8a30a47 100644 --- a/Items/AlchemistSoul.cs +++ b/Items/AlchemistSoul.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 3; item.accessory = true; item.value = 100000; diff --git a/Items/AlchemistSpark.cs b/Items/AlchemistSpark.cs index bbea283a..6081383d 100644 --- a/Items/AlchemistSpark.cs +++ b/Items/AlchemistSpark.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 1; item.accessory = true; item.value = 20000; diff --git a/Items/AlchemyStation.cs b/Items/AlchemyStation.cs index bf758044..cdc131f1 100644 --- a/Items/AlchemyStation.cs +++ b/Items/AlchemyStation.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows you to create unusual potions and transformation of different materials"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AlienBlaster.cs b/Items/AlienBlaster.cs index 59eac23f..489784b6 100644 --- a/Items/AlienBlaster.cs +++ b/Items/AlienBlaster.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); @@ -73,8 +72,6 @@ public override bool Shoot(Player player, ref Vector2 position, ref float speedX Projectile.NewProjectile(vector2.X, vector2.Y, vX, vY, 440, damage, knockBack, Main.myPlayer); - - } return false; } diff --git a/Items/AlienFish.cs b/Items/AlienFish.cs index 2f18683e..c02937f8 100644 --- a/Items/AlienFish.cs +++ b/Items/AlienFish.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/AlphaKnife.cs b/Items/AlphaKnife.cs index db4907c6..55dba2f7 100644 --- a/Items/AlphaKnife.cs +++ b/Items/AlphaKnife.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AltarofEnchantments.cs b/Items/AltarofEnchantments.cs index 65f38141..f9e9ae26 100644 --- a/Items/AltarofEnchantments.cs +++ b/Items/AltarofEnchantments.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows you to improve some items"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AmethystBlade.cs b/Items/AmethystBlade.cs index d10e8bbd..1d14c81a 100644 --- a/Items/AmethystBlade.cs +++ b/Items/AmethystBlade.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 62); diff --git a/Items/AmplifiedEnchantmentSolution.cs b/Items/AmplifiedEnchantmentSolution.cs index 106f33b8..02d468ed 100644 --- a/Items/AmplifiedEnchantmentSolution.cs +++ b/Items/AmplifiedEnchantmentSolution.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("45% chance not to consume flask"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AncientArmorPlate.cs b/Items/AncientArmorPlate.cs index 5d34067c..43f513ea 100644 --- a/Items/AncientArmorPlate.cs +++ b/Items/AncientArmorPlate.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/AncientBanner.cs b/Items/AncientBanner.cs index ed418ee2..2eda8070 100644 --- a/Items/AncientBanner.cs +++ b/Items/AncientBanner.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AncientClaymore.cs b/Items/AncientClaymore.cs index 66a600fe..c5fceec7 100644 --- a/Items/AncientClaymore.cs +++ b/Items/AncientClaymore.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots out a ghostly sword that inflicts Ichor on enemies"); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(3) == 0) diff --git a/Items/AncientDagger.cs b/Items/AncientDagger.cs index d2b36b34..b7972218 100644 --- a/Items/AncientDagger.cs +++ b/Items/AncientDagger.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws an exploding dagger"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AncientDragonMask.cs b/Items/AncientDragonMask.cs index 0ba95961..ee388aa9 100644 --- a/Items/AncientDragonMask.cs +++ b/Items/AncientDragonMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class AncientDragonMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/AncientFlail.cs b/Items/AncientFlail.cs index 4e01e989..b9dc6814 100644 --- a/Items/AncientFlail.cs +++ b/Items/AncientFlail.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AncientMeteorHelmet.cs b/Items/AncientMeteorHelmet.cs index d55b0641..2d678f32 100644 --- a/Items/AncientMeteorHelmet.cs +++ b/Items/AncientMeteorHelmet.cs @@ -7,8 +7,6 @@ namespace Tremor.Items public class AncientMeteorHelmet : ModItem { - - public override void SetDefaults() { @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("7% increased magic damage"); } - public override void UpdateEquip(Player player) { player.magicDamage += 0.07f; diff --git a/Items/AncientMosaic.cs b/Items/AncientMosaic.cs index eb9c6577..2063e52e 100644 --- a/Items/AncientMosaic.cs +++ b/Items/AncientMosaic.cs @@ -28,13 +28,11 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Alchemaster"); } - public override bool CanUseItem(Player player) { return !Main.dayTime && Main.hardMode && !NPC.AnyNPCs(mod.NPCType("Alchemaster")); } - public override bool UseItem(Player player) { NPC.SpawnOnPlayer(player.whoAmI, mod.NPCType("Alchemaster")); diff --git a/Items/AncientSmasher.cs b/Items/AncientSmasher.cs index b7c9befe..2e2c2cc7 100644 --- a/Items/AncientSmasher.cs +++ b/Items/AncientSmasher.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(3) == 0) diff --git a/Items/AncientSolarWind.cs b/Items/AncientSolarWind.cs index f41caaba..43b0ff4b 100644 --- a/Items/AncientSolarWind.cs +++ b/Items/AncientSolarWind.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(3) == 0) diff --git a/Items/AncientSoul.cs b/Items/AncientSoul.cs index ae8045bd..852d53c1 100644 --- a/Items/AncientSoul.cs +++ b/Items/AncientSoul.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 28; item.height = 36; - item.rare = 9; item.accessory = true; item.value = 30000; diff --git a/Items/AncientSunStaff.cs b/Items/AncientSunStaff.cs index 15be7271..3f71cc3e 100644 --- a/Items/AncientSunStaff.cs +++ b/Items/AncientSunStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons an fiery exploding bolt"); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(3) == 0) diff --git a/Items/AncientTechnology.cs b/Items/AncientTechnology.cs index 983ec53c..567596ad 100644 --- a/Items/AncientTechnology.cs +++ b/Items/AncientTechnology.cs @@ -19,6 +19,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/AncientVisionStaff.cs b/Items/AncientVisionStaff.cs index 293b8a5a..34112633 100644 --- a/Items/AncientVisionStaff.cs +++ b/Items/AncientVisionStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons an ancient vision to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/AndasCore.cs b/Items/AndasCore.cs index 05c339e3..36daadab 100644 --- a/Items/AndasCore.cs +++ b/Items/AndasCore.cs @@ -24,8 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows flight\nHas infinite flight time\nHas big flight speed"); } - - public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 9999999; diff --git a/Items/AndasMask.cs b/Items/AndasMask.cs index e3cf3c40..f1145042 100644 --- a/Items/AndasMask.cs +++ b/Items/AndasMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class AndasMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/AngelFlameSword.cs b/Items/AngelFlameSword.cs index 413ebdc5..f7059581 100644 --- a/Items/AngelFlameSword.cs +++ b/Items/AngelFlameSword.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Ignites your enemies"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/AngelicTears.cs b/Items/AngelicTears.cs index c3b82ca4..a92a8879 100644 --- a/Items/AngelicTears.cs +++ b/Items/AngelicTears.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/AngeliteBar.cs b/Items/AngeliteBar.cs index 816161b3..ccf9acf1 100644 --- a/Items/AngeliteBar.cs +++ b/Items/AngeliteBar.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/AngeliteOre.cs b/Items/AngeliteOre.cs index 1f824da9..b20203aa 100644 --- a/Items/AngeliteOre.cs +++ b/Items/AngeliteOre.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/AngryTotemMask.cs b/Items/AngryTotemMask.cs index f391af88..668c07c1 100644 --- a/Items/AngryTotemMask.cs +++ b/Items/AngryTotemMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class AngryTotemMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/AntiqueStave.cs b/Items/AntiqueStave.cs index 4ab18d63..f14df656 100644 --- a/Items/AntiqueStave.cs +++ b/Items/AntiqueStave.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a antique spirit to shoot bolts at your enemies"); } - public override bool AltFunctionUse(Player player) { return true; @@ -50,7 +49,6 @@ public override bool UseItem(Player player) return base.UseItem(player); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { Vector2 SPos = Main.screenPosition + new Vector2(Main.mouseX, Main.mouseY); diff --git a/Items/AntlionFury.cs b/Items/AntlionFury.cs index 30fb703e..360a2275 100644 --- a/Items/AntlionFury.cs +++ b/Items/AntlionFury.cs @@ -24,7 +24,6 @@ public override void SetDefaults() item.UseSound = SoundID.Item11; item.autoReuse = true; - item.useAmmo = AmmoID.Sand; } @@ -34,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Quickly shoots sand blocks\nUses sand blocks as ammo"); } - public override Vector2? HoldoutOffset() { return new Vector2(-4, 0); diff --git a/Items/ArcherGlove.cs b/Items/ArcherGlove.cs index f6a0a414..86bb298d 100644 --- a/Items/ArcherGlove.cs +++ b/Items/ArcherGlove.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased ranged damage"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/ArcherGreaves.cs b/Items/ArcherGreaves.cs index 1fb9c0bc..8d3bc80a 100644 --- a/Items/ArcherGreaves.cs +++ b/Items/ArcherGreaves.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class ArcherGreaves : ModItem { - public override void SetDefaults() { diff --git a/Items/ArcherHelmet.cs b/Items/ArcherHelmet.cs index a8d197a5..e84bf560 100644 --- a/Items/ArcherHelmet.cs +++ b/Items/ArcherHelmet.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class ArcherHelmet : ModItem { - public override void SetDefaults() { @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("ArcherChainmail") && legs.type == mod.ItemType("ArcherGreaves"); diff --git a/Items/ArgiteBreastplate.cs b/Items/ArgiteBreastplate.cs index d2bcf448..0f6fbfc1 100644 --- a/Items/ArgiteBreastplate.cs +++ b/Items/ArgiteBreastplate.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("12% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.12f; diff --git a/Items/ArgiteBroadsword.cs b/Items/ArgiteBroadsword.cs index 8517ecf8..9cb30545 100644 --- a/Items/ArgiteBroadsword.cs +++ b/Items/ArgiteBroadsword.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ArgiteGreaves.cs b/Items/ArgiteGreaves.cs index 23aed410..4e5bc8c8 100644 --- a/Items/ArgiteGreaves.cs +++ b/Items/ArgiteGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class ArgiteGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.1f; diff --git a/Items/ArgiteHamaxe.cs b/Items/ArgiteHamaxe.cs index 02fe2e4d..3164afdc 100644 --- a/Items/ArgiteHamaxe.cs +++ b/Items/ArgiteHamaxe.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ArgiteHelmet.cs b/Items/ArgiteHelmet.cs index 30139831..89c8bcd0 100644 --- a/Items/ArgiteHelmet.cs +++ b/Items/ArgiteHelmet.cs @@ -9,7 +9,6 @@ namespace Tremor.Items public class ArgiteHelmet : ModItem { - public override void SetDefaults() { @@ -27,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased melee speed"); } - public override void UpdateEquip(Player player) { player.meleeSpeed += 0.1f; @@ -44,7 +42,6 @@ public override void UpdateArmorSet(Player player) player.setBonus = "Your body become spiky"; player.thorns = 1; - if (Math.Abs(player.velocity.X) + Math.Abs(player.velocity.Y) > 1f && !player.rocketFrame) // Makes sure the player is actually moving { for (int k = 0; k < 2; k++) diff --git a/Items/ArgitePickaxe.cs b/Items/ArgitePickaxe.cs index 47b22808..e8e49954 100644 --- a/Items/ArgitePickaxe.cs +++ b/Items/ArgitePickaxe.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ArgiteTome.cs b/Items/ArgiteTome.cs index d2273899..94207f7a 100644 --- a/Items/ArgiteTome.cs +++ b/Items/ArgiteTome.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Armchair.cs b/Items/Armchair.cs index 226d048d..078a68cf 100644 --- a/Items/Armchair.cs +++ b/Items/Armchair.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ArtifactEngine.cs b/Items/ArtifactEngine.cs index c21d1d1d..de8096ac 100644 --- a/Items/ArtifactEngine.cs +++ b/Items/ArtifactEngine.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons Cog Lord"); } - public override bool CanUseItem(Player player) { return !Main.dayTime && Main.hardMode && NPC.downedMechBossAny && !NPC.AnyNPCs(mod.NPCType("CogLord")); diff --git a/Items/AtisBlood.cs b/Items/AtisBlood.cs index 2f0125b7..5c8c6899 100644 --- a/Items/AtisBlood.cs +++ b/Items/AtisBlood.cs @@ -19,6 +19,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/Awakening.cs b/Items/Awakening.cs index b6020ced..47270b73 100644 --- a/Items/Awakening.cs +++ b/Items/Awakening.cs @@ -32,8 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Hitting enemies temporarily increases maximum health"); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(3) == 0) diff --git a/Items/AxeofExecutioner.cs b/Items/AxeofExecutioner.cs index df584924..3eb76266 100644 --- a/Items/AxeofExecutioner.cs +++ b/Items/AxeofExecutioner.cs @@ -32,6 +32,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/BadApple.cs b/Items/BadApple.cs index b718bf32..d9c78b63 100644 --- a/Items/BadApple.cs +++ b/Items/BadApple.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a gurd pet"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/BallnChain.cs b/Items/BallnChain.cs index 0245473b..52b8e463 100644 --- a/Items/BallnChain.cs +++ b/Items/BallnChain.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Grants a spinning ball around the player"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.AddBuff(mod.BuffType("BallnChainBuff"), 2); diff --git a/Items/Banhammer.cs b/Items/Banhammer.cs index 6684fc5a..198431f9 100644 --- a/Items/Banhammer.cs +++ b/Items/Banhammer.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/BasicFlask.cs b/Items/BasicFlask.cs index f32feec1..9daf84a5 100644 --- a/Items/BasicFlask.cs +++ b/Items/BasicFlask.cs @@ -37,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("CloudPro"); diff --git a/Items/BasicSprayer.cs b/Items/BasicSprayer.cs index 1abc287e..cd2f1503 100644 --- a/Items/BasicSprayer.cs +++ b/Items/BasicSprayer.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.crit = 4; item.useAmmo = mod.ItemType("BoomFlask"); - } public override void SetStaticDefaults() @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Uses flasks as ammo\nSprays alchemical clouds"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Basilisk.cs b/Items/Basilisk.cs index 0ac72941..ef7509ff 100644 --- a/Items/Basilisk.cs +++ b/Items/Basilisk.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BeetleShield.cs b/Items/BeetleShield.cs index 7ae10486..70f9d8ee 100644 --- a/Items/BeetleShield.cs +++ b/Items/BeetleShield.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.value = 123110; item.rare = 8; - item.accessory = true; } @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less health, the more defense\nMaximum life increased by 50"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/BenderHead.cs b/Items/BenderHead.cs index 5ed82dbc..a139025f 100644 --- a/Items/BenderHead.cs +++ b/Items/BenderHead.cs @@ -7,8 +7,6 @@ namespace Tremor.Items public class BenderHead : ModItem { - - public override void SetDefaults() { @@ -25,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("BenderBody") && legs.type == mod.ItemType("BenderLegs"); diff --git a/Items/BenderLegs.cs b/Items/BenderLegs.cs index 1c9f6585..21bd8525 100644 --- a/Items/BenderLegs.cs +++ b/Items/BenderLegs.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class BenderLegs : ModItem { - public override void SetDefaults() { diff --git a/Items/BerserkerChestplate.cs b/Items/BerserkerChestplate.cs index dd615134..4f3b507d 100644 --- a/Items/BerserkerChestplate.cs +++ b/Items/BerserkerChestplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("7% increased melee critical strike chance"); } - public override void UpdateEquip(Player player) { player.meleeCrit += 7; diff --git a/Items/BerserkerGreaves.cs b/Items/BerserkerGreaves.cs index 9e2cdfef..805bfadc 100644 --- a/Items/BerserkerGreaves.cs +++ b/Items/BerserkerGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class BerserkerGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("4% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.04f; @@ -42,5 +40,4 @@ public override void AddRecipes() } } - } diff --git a/Items/BerserkerHelmet.cs b/Items/BerserkerHelmet.cs index 7405337d..d5de4c56 100644 --- a/Items/BerserkerHelmet.cs +++ b/Items/BerserkerHelmet.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased melee speed"); } - public override void UpdateEquip(Player player) { player.meleeSpeed += 0.15f; diff --git a/Items/BestNightmare.cs b/Items/BestNightmare.cs index f976e780..78e2f1ca 100644 --- a/Items/BestNightmare.cs +++ b/Items/BestNightmare.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/BigBottledSpirit.cs b/Items/BigBottledSpirit.cs index 44cc3c6f..4e5b633b 100644 --- a/Items/BigBottledSpirit.cs +++ b/Items/BigBottledSpirit.cs @@ -25,7 +25,6 @@ public override void SetDefaults() item.width = 22; item.height = 44; - item.value = 80000; item.rare = 7; item.accessory = true; @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Using flask also spawns four homing souls\nDamage of the souls scales on flask damage"); } - public override void UpdateAccessory(Player player, bool hideVisual) { MPlayer modPlayer = (MPlayer)player.GetModPlayer(mod, "MPlayer"); diff --git a/Items/BigHealingFlack.cs b/Items/BigHealingFlack.cs index f94461b5..6695173a 100644 --- a/Items/BigHealingFlack.cs +++ b/Items/BigHealingFlack.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.rare = 4; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and heal player if hit enemy"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("HealingCloudPro"); diff --git a/Items/BigManaFlask.cs b/Items/BigManaFlask.cs index fb944b03..f7ef3fd1 100644 --- a/Items/BigManaFlask.cs +++ b/Items/BigManaFlask.cs @@ -27,7 +27,6 @@ public override void SetDefaults() item.rare = 4; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and restore mana"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("ManaCloudPro"); diff --git a/Items/BigPoisonFlask.cs b/Items/BigPoisonFlask.cs index 6c6f1025..9f7a661e 100644 --- a/Items/BigPoisonFlask.cs +++ b/Items/BigPoisonFlask.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.rare = 4; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into poison clouds\nClouds deal damage to enemies and poisons them"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("PoisonCloudPro"); diff --git a/Items/BigVenomFlask.cs b/Items/BigVenomFlask.cs index a2b680ae..a83e0ffa 100644 --- a/Items/BigVenomFlask.cs +++ b/Items/BigVenomFlask.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.rare = 4; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into venom clouds\nClouds deal damage to enemies and poison them"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("PurpleCloudPro"); diff --git a/Items/BirbStaff.cs b/Items/BirbStaff.cs index d56824d3..4074c8f5 100644 --- a/Items/BirbStaff.cs +++ b/Items/BirbStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a birb to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/BlackCauldron.cs b/Items/BlackCauldron.cs index ecf26825..f462e601 100644 --- a/Items/BlackCauldron.cs +++ b/Items/BlackCauldron.cs @@ -12,7 +12,6 @@ public override void SetDefaults() item.width = 22; item.height = 44; - item.value = 100000; item.rare = 4; item.accessory = true; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(8, 4)); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.GetModPlayer(mod).alchemicalDamage += 0.12f; diff --git a/Items/BlacksmithHammer.cs b/Items/BlacksmithHammer.cs index beb995cc..466e8223 100644 --- a/Items/BlacksmithHammer.cs +++ b/Items/BlacksmithHammer.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/BladeofDarkness.cs b/Items/BladeofDarkness.cs index b63bd92f..e3936476 100644 --- a/Items/BladeofDarkness.cs +++ b/Items/BladeofDarkness.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); @@ -44,7 +43,6 @@ public override void AddRecipes() recipe.AddRecipe(); } - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 27); diff --git a/Items/BlastFurnace.cs b/Items/BlastFurnace.cs index 97d687b6..e7d390b9 100644 --- a/Items/BlastFurnace.cs +++ b/Items/BlastFurnace.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Used to craft alloys"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Bloodbath.cs b/Items/Bloodbath.cs index c130fae4..85475751 100644 --- a/Items/Bloodbath.cs +++ b/Items/Bloodbath.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BloodmoonPotion.cs b/Items/BloodmoonPotion.cs index 827d7e99..4bccc3a4 100644 --- a/Items/BloodmoonPotion.cs +++ b/Items/BloodmoonPotion.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons Blood Moon"); } - public override bool CanUseItem(Player player) { if (!Main.dayTime && !Main.bloodMoon) diff --git a/Items/Bloodshed.cs b/Items/Bloodshed.cs index a82aea74..206a778b 100644 --- a/Items/Bloodshed.cs +++ b/Items/Bloodshed.cs @@ -11,8 +11,6 @@ public override void SetDefaults() item.width = 22; item.height = 44; - - item.value = 10000; item.rare = 3; item.defense = 6; @@ -25,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("8% increased melee, magic and minion damage\nIncreases maximum mana and health by 60\nIncreases melee and magic critical strike chance by 10%"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.magicDamage += 0.08f; diff --git a/Items/Bloomstone.cs b/Items/Bloomstone.cs index d5950f5a..54c4b3b9 100644 --- a/Items/Bloomstone.cs +++ b/Items/Bloomstone.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("You are glowing during night"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/BlueCrossguardPhasesaber.cs b/Items/BlueCrossguardPhasesaber.cs index 010a9fdb..2e4c62ab 100644 --- a/Items/BlueCrossguardPhasesaber.cs +++ b/Items/BlueCrossguardPhasesaber.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 59); diff --git a/Items/BlueKnightBreastplate.cs b/Items/BlueKnightBreastplate.cs index 92e7094e..bf6e434f 100644 --- a/Items/BlueKnightBreastplate.cs +++ b/Items/BlueKnightBreastplate.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BlueKnightHelmet.cs b/Items/BlueKnightHelmet.cs index 83eff8a2..6603423d 100644 --- a/Items/BlueKnightHelmet.cs +++ b/Items/BlueKnightHelmet.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BlueSakura.cs b/Items/BlueSakura.cs index 5bc146f8..0698028b 100644 --- a/Items/BlueSakura.cs +++ b/Items/BlueSakura.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a blue wind to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/Bolter.cs b/Items/Bolter.cs index 21ba0ba9..6772ea5d 100644 --- a/Items/Bolter.cs +++ b/Items/Bolter.cs @@ -15,7 +15,6 @@ public override void SetDefaults() item.width = 46; item.height = 32; - item.useTime = 9; item.useAnimation = 9; item.shoot = 1; @@ -35,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Quickly launches arrows\nHas 50% chance to shoot a Hellfire arrow"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { if (Main.rand.Next(2) == 0) diff --git a/Items/BoneGreaves.cs b/Items/BoneGreaves.cs index d99252a5..9ba45cf4 100644 --- a/Items/BoneGreaves.cs +++ b/Items/BoneGreaves.cs @@ -8,12 +8,9 @@ namespace Tremor.Items public class BoneGreaves : ModItem { - public override void SetDefaults() { - - item.defense = 8; item.width = 22; item.height = 18; @@ -27,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased throwing critical strike chance\n6% increased ranged damage"); } - public override void UpdateEquip(Player p) { p.thrownCrit += 20; diff --git a/Items/BoneHelmet.cs b/Items/BoneHelmet.cs index cb367c03..9b8155a4 100644 --- a/Items/BoneHelmet.cs +++ b/Items/BoneHelmet.cs @@ -13,7 +13,6 @@ public class BoneHelmet : ModItem public override void SetDefaults() { - item.defense = 5; item.width = 26; item.height = 22; @@ -27,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("25% increased throwing velocity"); } - public override void UpdateEquip(Player p) { p.thrownVelocity += 0.25f; @@ -44,7 +42,6 @@ public override void UpdateArmorSet(Player player) player.boneArmor = true; player.statDefense += 6; - if (Math.Abs(player.velocity.X) + Math.Abs(player.velocity.Y) > 1f && !player.rocketFrame) // Makes sure the player is actually moving { for (int k = 0; k < 2; k++) diff --git a/Items/BoneMask.cs b/Items/BoneMask.cs index 20f8d448..52b50d24 100644 --- a/Items/BoneMask.cs +++ b/Items/BoneMask.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class BoneMask : ModItem { - public override void SetDefaults() { diff --git a/Items/BoneRepeater.cs b/Items/BoneRepeater.cs index 6ee06dde..23004855 100644 --- a/Items/BoneRepeater.cs +++ b/Items/BoneRepeater.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Uses bones as ammo"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("BoneBoltPro"); diff --git a/Items/BoneShell.cs b/Items/BoneShell.cs index e27de19b..7943b143 100644 --- a/Items/BoneShell.cs +++ b/Items/BoneShell.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 22; item.height = 18; - item.value = 25000; item.rare = 4; item.defense = 9; @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("25% increased thrown damage\n6% increased ranged damage"); } - public override void UpdateEquip(Player p) { p.thrownDamage += 0.25f; diff --git a/Items/BoneThrone.cs b/Items/BoneThrone.cs index 84f011be..9236bd97 100644 --- a/Items/BoneThrone.cs +++ b/Items/BoneThrone.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Bonecrusher.cs b/Items/Bonecrusher.cs index 77f80182..2e441e9c 100644 --- a/Items/Bonecrusher.cs +++ b/Items/Bonecrusher.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool CanUseItem(Player player) { for (int i = 0; i < 1000; ++i) diff --git a/Items/BoomFlask.cs b/Items/BoomFlask.cs index 0a41be0f..f7150a41 100644 --- a/Items/BoomFlask.cs +++ b/Items/BoomFlask.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("A vial of exploding chemicals"); } - public override void UpdateInventory(Player player) { if (player.FindBuffIndex(mod.BuffType("LongFuseBuff")) != -1) diff --git a/Items/Boonerang.cs b/Items/Boonerang.cs index 9b43493e..9d95b9d4 100644 --- a/Items/Boonerang.cs +++ b/Items/Boonerang.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool CanUseItem(Player player) { for (int i = 0; i < 1000; ++i) diff --git a/Items/BorealWoodArmchair.cs b/Items/BorealWoodArmchair.cs index afe0479f..7859dcdd 100644 --- a/Items/BorealWoodArmchair.cs +++ b/Items/BorealWoodArmchair.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BottledGlue.cs b/Items/BottledGlue.cs index f8914b82..24cb4e8a 100644 --- a/Items/BottledGlue.cs +++ b/Items/BottledGlue.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BottledSoulOfFlight.cs b/Items/BottledSoulOfFlight.cs index 3a1b9007..f50e5f02 100644 --- a/Items/BottledSoulOfFlight.cs +++ b/Items/BottledSoulOfFlight.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.autoReuse = true; item.useAnimation = 15; - item.useTime = 10; item.useStyle = 1; item.consumable = true; @@ -32,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Grants Shiny Red Baloon effect if worn\n20% increased jump height if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BottledSoulOfFright.cs b/Items/BottledSoulOfFright.cs index 6d2ab3d6..02a1a0ff 100644 --- a/Items/BottledSoulOfFright.cs +++ b/Items/BottledSoulOfFright.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.autoReuse = true; item.useAnimation = 15; - item.useTime = 10; item.useStyle = 1; item.consumable = true; @@ -32,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases critical strike chance by 6 if worn\nIncreased critical strike chance by 2 if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BottledSoulOfLight.cs b/Items/BottledSoulOfLight.cs index 04c7f0cd..1e37c7db 100644 --- a/Items/BottledSoulOfLight.cs +++ b/Items/BottledSoulOfLight.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.autoReuse = true; item.useAnimation = 15; - item.useTime = 10; item.useStyle = 1; item.consumable = true; @@ -32,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("50% increased movement speed if worn\n20% increased movement speed if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BottledSoulOfMight.cs b/Items/BottledSoulOfMight.cs index b66b8559..1160710f 100644 --- a/Items/BottledSoulOfMight.cs +++ b/Items/BottledSoulOfMight.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.autoReuse = true; item.useAnimation = 15; - item.useTime = 10; item.useStyle = 1; item.consumable = true; @@ -32,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("12% increased damage if worn\n5% increased damage if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BottledSoulOfMind.cs b/Items/BottledSoulOfMind.cs index cbb5c004..885c1417 100644 --- a/Items/BottledSoulOfMind.cs +++ b/Items/BottledSoulOfMind.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.autoReuse = true; item.useAnimation = 15; - item.useTime = 10; item.useStyle = 1; item.consumable = true; @@ -32,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shows the location of enemies if worn\nShows the location of treasure and ore if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BottledSoulOfNight.cs b/Items/BottledSoulOfNight.cs index 1c606703..24175841 100644 --- a/Items/BottledSoulOfNight.cs +++ b/Items/BottledSoulOfNight.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.autoReuse = true; item.useAnimation = 15; - item.useTime = 10; item.useStyle = 1; item.consumable = true; @@ -32,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased melee speed if worn\n8% increased melee speed if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BottledSoulOfSight.cs b/Items/BottledSoulOfSight.cs index 2cf10ffb..f492629b 100644 --- a/Items/BottledSoulOfSight.cs +++ b/Items/BottledSoulOfSight.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.autoReuse = true; item.useAnimation = 15; - item.useTime = 10; item.useStyle = 1; item.consumable = true; @@ -32,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Makes you shine if worn\nShows the location of enemies if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BottledSpirit.cs b/Items/BottledSpirit.cs index 56b23f3a..356491a7 100644 --- a/Items/BottledSpirit.cs +++ b/Items/BottledSpirit.cs @@ -25,7 +25,6 @@ public override void SetDefaults() item.width = 22; item.height = 44; - item.value = 60000; item.rare = 7; item.accessory = true; @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Using flask also spawns two homing souls\nDamage of the souls scales on flask damage"); } - public override void UpdateAccessory(Player player, bool hideVisual) { MPlayer modPlayer = (MPlayer)player.GetModPlayer(mod, "MPlayer"); diff --git a/Items/BouncingCasing.cs b/Items/BouncingCasing.cs index c5c07a62..27d74fdc 100644 --- a/Items/BouncingCasing.cs +++ b/Items/BouncingCasing.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemical flasks bounce off blocks"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.AddBuff(mod.BuffType("BouncingCasingBuff"), 2); diff --git a/Items/BrainSmasher.cs b/Items/BrainSmasher.cs index 44e800db..b3935aa5 100644 --- a/Items/BrainSmasher.cs +++ b/Items/BrainSmasher.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Grants a spinning ball around the player"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.AddBuff(mod.BuffType("BrainSmasherBuff"), 2); diff --git a/Items/Brainiac.cs b/Items/Brainiac.cs index ac5e113f..630c3f4c 100644 --- a/Items/Brainiac.cs +++ b/Items/Brainiac.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Shoots mind waves'"); } - public override Vector2? HoldoutOffset() { return new Vector2(-10, 0); diff --git a/Items/BrambleStaff.cs b/Items/BrambleStaff.cs index 5ea5ceac..e36f86b5 100644 --- a/Items/BrambleStaff.cs +++ b/Items/BrambleStaff.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a bramble bush to spit spikes at your enemies"); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/BrassBar.cs b/Items/BrassBar.cs index 05e4f25e..6dcf484c 100644 --- a/Items/BrassBar.cs +++ b/Items/BrassBar.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BrassChainRepeater.cs b/Items/BrassChainRepeater.cs index e3e76cd2..3df0ac17 100644 --- a/Items/BrassChainRepeater.cs +++ b/Items/BrassChainRepeater.cs @@ -15,7 +15,6 @@ public override void SetDefaults() item.width = 36; item.height = 24; - item.useTime = 11; item.useAnimation = 11; item.shoot = 1; @@ -36,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Quickly launches arrows\n25% to shoot a heat ray"); } - public override void UpdateInventory(Player player) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SteamRangerBuff"))) diff --git a/Items/BrassChestplate.cs b/Items/BrassChestplate.cs index 0b1b47b6..51f6bd06 100644 --- a/Items/BrassChestplate.cs +++ b/Items/BrassChestplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum life by 50"); } - public override void UpdateEquip(Player player) { player.statLifeMax2 += 50; diff --git a/Items/BrassGreaves.cs b/Items/BrassGreaves.cs index 8e403e27..a562fcfc 100644 --- a/Items/BrassGreaves.cs +++ b/Items/BrassGreaves.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class BrassGreaves : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.15f; diff --git a/Items/BrassHammer.cs b/Items/BrassHammer.cs index c01f228c..df5d53da 100644 --- a/Items/BrassHammer.cs +++ b/Items/BrassHammer.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BrassHeadgear.cs b/Items/BrassHeadgear.cs index 323e048e..bbd45d22 100644 --- a/Items/BrassHeadgear.cs +++ b/Items/BrassHeadgear.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 20; item.height = 20; - item.value = 400; item.rare = 5; item.defense = 8; @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased magical damage\nIncreases magical critical strike chance by 8"); } - public override void UpdateEquip(Player player) { player.magicCrit += 8; diff --git a/Items/BrassHelmet.cs b/Items/BrassHelmet.cs index 0b6f5b10..35949719 100644 --- a/Items/BrassHelmet.cs +++ b/Items/BrassHelmet.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 20; item.height = 20; - item.value = 400; item.rare = 5; item.defense = 8; @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased melee damage\nIncreases melee critical strike chance by 8"); } - public override void UpdateEquip(Player player) { player.meleeCrit += 8; diff --git a/Items/BrassMask.cs b/Items/BrassMask.cs index e787f7da..51ad61db 100644 --- a/Items/BrassMask.cs +++ b/Items/BrassMask.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 20; item.height = 20; - item.value = 400; item.rare = 5; item.defense = 8; @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased ranged damage\nIncreases ranged critical strike chance by 8"); } - public override void UpdateEquip(Player player) { player.rangedCrit += 8; diff --git a/Items/BrassPickaxeAxe.cs b/Items/BrassPickaxeAxe.cs index e5bb5707..618ad928 100644 --- a/Items/BrassPickaxeAxe.cs +++ b/Items/BrassPickaxeAxe.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BrassRapier.cs b/Items/BrassRapier.cs index 9a8f12a0..12b04f7e 100644 --- a/Items/BrassRapier.cs +++ b/Items/BrassRapier.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots spiky brass cogs on use"); } - public override void UpdateInventory(Player player) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SteamSwordBuff"))) diff --git a/Items/BrassStave.cs b/Items/BrassStave.cs index bb0c1836..659b3e6b 100644 --- a/Items/BrassStave.cs +++ b/Items/BrassStave.cs @@ -26,7 +26,6 @@ public override void SetDefaults() item.shoot = 443; item.shootSpeed = 12f; - Item.staff[item.type] = true; //this makes the useStyle animate as a staff instead of as a gun } @@ -36,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots fast thin bolts\nPress RMB for powerful attack"); } - public override bool AltFunctionUse(Player player) { return true; @@ -89,7 +87,6 @@ public override bool CanUseItem(Player player) return base.CanUseItem(player); } - public override void UpdateInventory(Player player) { if (player.altFunctionUse == 2) diff --git a/Items/BrilliantBehemoth.cs b/Items/BrilliantBehemoth.cs index 75f5da4b..1e56a605 100644 --- a/Items/BrilliantBehemoth.cs +++ b/Items/BrilliantBehemoth.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BrokenHeroAmulet.cs b/Items/BrokenHeroAmulet.cs index fb795ce9..6296b821 100644 --- a/Items/BrokenHeroAmulet.cs +++ b/Items/BrokenHeroAmulet.cs @@ -21,6 +21,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/BrokenHeroArmorplate.cs b/Items/BrokenHeroArmorplate.cs index 29bd0f7a..b0989e19 100644 --- a/Items/BrokenHeroArmorplate.cs +++ b/Items/BrokenHeroArmorplate.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/BrokenInvarShield.cs b/Items/BrokenInvarShield.cs index 82f5c586..039746ba 100644 --- a/Items/BrokenInvarShield.cs +++ b/Items/BrokenInvarShield.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/BronzeBow.cs b/Items/BronzeBow.cs index 19682739..50213182 100644 --- a/Items/BronzeBow.cs +++ b/Items/BronzeBow.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BronzeChestplate.cs b/Items/BronzeChestplate.cs index 6eb9fa2e..513ecdde 100644 --- a/Items/BronzeChestplate.cs +++ b/Items/BronzeChestplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased ranged critical strike chance"); } - public override void UpdateEquip(Player player) { player.rangedCrit += 6; diff --git a/Items/BronzeGreatsword.cs b/Items/BronzeGreatsword.cs index 7572e46a..d9503f35 100644 --- a/Items/BronzeGreatsword.cs +++ b/Items/BronzeGreatsword.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BronzeGreaves.cs b/Items/BronzeGreaves.cs index 489d1832..24a373f0 100644 --- a/Items/BronzeGreaves.cs +++ b/Items/BronzeGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class BronzeGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased magic critical strike chance"); } - public override void UpdateEquip(Player player) { player.magicCrit += 6; diff --git a/Items/BronzeHamaxe.cs b/Items/BronzeHamaxe.cs index c7c707bb..12c00ddb 100644 --- a/Items/BronzeHamaxe.cs +++ b/Items/BronzeHamaxe.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BronzeHelmet.cs b/Items/BronzeHelmet.cs index 3e82ca57..5a216e05 100644 --- a/Items/BronzeHelmet.cs +++ b/Items/BronzeHelmet.cs @@ -7,8 +7,6 @@ namespace Tremor.Items public class BronzeHelmet : ModItem { - - public override void SetDefaults() { @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased melee critical strike chance"); } - public override void UpdateEquip(Player player) { player.meleeCrit += 6; diff --git a/Items/BronzePickaxe.cs b/Items/BronzePickaxe.cs index a60c14f9..da95a7de 100644 --- a/Items/BronzePickaxe.cs +++ b/Items/BronzePickaxe.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BrutalliskChestplate.cs b/Items/BrutalliskChestplate.cs index b5229fa7..24fddad9 100644 --- a/Items/BrutalliskChestplate.cs +++ b/Items/BrutalliskChestplate.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum life by 40\n15% increased melee speed\n25% increased all damage"); } - public override void UpdateEquip(Player player) { player.statLifeMax2 += 40; diff --git a/Items/BrutalliskGreaves.cs b/Items/BrutalliskGreaves.cs index 99538f5f..4f2d749b 100644 --- a/Items/BrutalliskGreaves.cs +++ b/Items/BrutalliskGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class BrutalliskGreaves : ModItem { - public override void SetDefaults() { @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum life by 40\n15% increased melee speed\n90% increased movement speed\nGreatly increases jump height"); } - public override void UpdateEquip(Player player) { player.statLifeMax2 += 40; diff --git a/Items/BrutalliskHelmet.cs b/Items/BrutalliskHelmet.cs index 2769c848..9735efc8 100644 --- a/Items/BrutalliskHelmet.cs +++ b/Items/BrutalliskHelmet.cs @@ -9,7 +9,6 @@ namespace Tremor.Items public class BrutalliskHelmet : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum life by 40\n15% increased melee speed"); } - public override void UpdateEquip(Player player) { player.statLifeMax2 += 40; diff --git a/Items/BrutalliskMask.cs b/Items/BrutalliskMask.cs index b061b814..f63f391f 100644 --- a/Items/BrutalliskMask.cs +++ b/Items/BrutalliskMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class BrutalliskMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/BrutalliskWings.cs b/Items/BrutalliskWings.cs index cd8de229..71c5c48d 100644 --- a/Items/BrutalliskWings.cs +++ b/Items/BrutalliskWings.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows flight and slow fall"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 290; diff --git a/Items/BulbTorch.cs b/Items/BulbTorch.cs index cfe5f627..193d38bb 100644 --- a/Items/BulbTorch.cs +++ b/Items/BulbTorch.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void HoldItem(Player player) { if (Main.rand.Next(player.itemAnimation > 0 ? 40 : 80) == 0) diff --git a/Items/BurningFist.cs b/Items/BurningFist.cs index 4a08e290..7a348908 100644 --- a/Items/BurningFist.cs +++ b/Items/BurningFist.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots a burning fist that explodes on contact and erupts burning bolts"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/BurningFlask.cs b/Items/BurningFlask.cs index ce944cb2..5a2e02d2 100644 --- a/Items/BurningFlask.cs +++ b/Items/BurningFlask.cs @@ -27,7 +27,6 @@ public override void SetDefaults() item.rare = 1; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and burn them"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("FieryCloudPro"); diff --git a/Items/ButcherAxe.cs b/Items/ButcherAxe.cs index 3b587e68..675e67a8 100644 --- a/Items/ButcherAxe.cs +++ b/Items/ButcherAxe.cs @@ -29,6 +29,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/ButcherMask.cs b/Items/ButcherMask.cs index 5b551d05..f0222450 100644 --- a/Items/ButcherMask.cs +++ b/Items/ButcherMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class ButcherMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/CactusHammer.cs b/Items/CactusHammer.cs index 77f8c72f..f6a8afb3 100644 --- a/Items/CactusHammer.cs +++ b/Items/CactusHammer.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Candent.cs b/Items/Candent.cs index 6b588850..6f577363 100644 --- a/Items/Candent.cs +++ b/Items/Candent.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases melee damage and critical strike chance by 7%"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.meleeDamage += 0.07f; diff --git a/Items/CandyBlaster.cs b/Items/CandyBlaster.cs index 411613cb..13509862 100644 --- a/Items/CandyBlaster.cs +++ b/Items/CandyBlaster.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Spends bullets and fires candies"); } - public override bool ConsumeAmmo(Player p) { return Main.rand.Next(3) == 0; @@ -52,7 +51,6 @@ public override bool Shoot(Player player, ref Vector2 position, ref float speedX return Vector2.Zero; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CandyCane.cs b/Items/CandyCane.cs index 92dd28b0..8801baff 100644 --- a/Items/CandyCane.cs +++ b/Items/CandyCane.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/CarbonSteel.cs b/Items/CarbonSteel.cs index b8903700..2c25034c 100644 --- a/Items/CarbonSteel.cs +++ b/Items/CarbonSteel.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/Carrow.cs b/Items/Carrow.cs index a938792f..297d3c76 100644 --- a/Items/Carrow.cs +++ b/Items/Carrow.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Uses carrots as ammo"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/ChainCoif.cs b/Items/ChainCoif.cs index 6ba0a0d7..27f1ad93 100644 --- a/Items/ChainCoif.cs +++ b/Items/ChainCoif.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class ChainCoif : ModItem { - public override void SetDefaults() { diff --git a/Items/ChainGreaves.cs b/Items/ChainGreaves.cs index 6fef305b..95f5d0a9 100644 --- a/Items/ChainGreaves.cs +++ b/Items/ChainGreaves.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class ChainGreaves : ModItem { - public override void SetDefaults() { diff --git a/Items/Chainsword.cs b/Items/Chainsword.cs index 39d1ef85..320bb0ef 100644 --- a/Items/Chainsword.cs +++ b/Items/Chainsword.cs @@ -30,6 +30,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'It looks like a sword, but its actually a saw! Buy yours today!'"); } - } } diff --git a/Items/ChaosBreastplate.cs b/Items/ChaosBreastplate.cs index c1280bd0..464651be 100644 --- a/Items/ChaosBreastplate.cs +++ b/Items/ChaosBreastplate.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.20f; diff --git a/Items/ChaosGreaves.cs b/Items/ChaosGreaves.cs index 3f84118b..9d13c36c 100644 --- a/Items/ChaosGreaves.cs +++ b/Items/ChaosGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class ChaosGreaves : ModItem { - public override void SetDefaults() { @@ -15,7 +14,6 @@ public override void SetDefaults() item.height = 18; item.value = 6000; - item.rare = 5; item.defense = 11; } @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increased life max by 25\nIncreased wing time"); } - public override void UpdateEquip(Player p) { p.wingTime += 0.15f; diff --git a/Items/ChaosHelmet.cs b/Items/ChaosHelmet.cs index 39e802d1..11902193 100644 --- a/Items/ChaosHelmet.cs +++ b/Items/ChaosHelmet.cs @@ -7,15 +7,12 @@ namespace Tremor.Items public class ChaosHelmet : ModItem { - - public override void SetDefaults() { item.width = 32; item.height = 26; - item.value = 6000; item.rare = 5; item.defense = 8; @@ -27,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum life by 25\nImmune to most debuffs!"); } - public override void UpdateEquip(Player p) { p.statLifeMax2 += 25; diff --git a/Items/ChaosWings.cs b/Items/ChaosWings.cs index 180f6ef7..df27a0c7 100644 --- a/Items/ChaosWings.cs +++ b/Items/ChaosWings.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows flight and slow fall"); } - //these wings use the same values as the solar wings public override void UpdateAccessory(Player player, bool hideVisual) diff --git a/Items/ChaoticAmplifier.cs b/Items/ChaoticAmplifier.cs index dfa3fdea..5fd63808 100644 --- a/Items/ChaoticAmplifier.cs +++ b/Items/ChaoticAmplifier.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less health, the more crit chance..."); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/ChaoticCross.cs b/Items/ChaoticCross.cs index d6c21718..d47ba9f6 100644 --- a/Items/ChaoticCross.cs +++ b/Items/ChaoticCross.cs @@ -12,7 +12,6 @@ public override void SetDefaults() item.width = 24; item.height = 28; - item.value = 150000; item.rare = 6; item.accessory = true; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less health, the more critical strike chance...\nThe less health, the more damage..."); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/Charcoal.cs b/Items/Charcoal.cs index 4c86cded..21c09f21 100644 --- a/Items/Charcoal.cs +++ b/Items/Charcoal.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ChefHat.cs b/Items/ChefHat.cs index 3d7d09cf..841b143d 100644 --- a/Items/ChefHat.cs +++ b/Items/ChefHat.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class ChefHat : ModItem { - public override void SetDefaults() { @@ -21,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/Chemikaze.cs b/Items/Chemikaze.cs index 60fd8b0d..8f95a618 100644 --- a/Items/Chemikaze.cs +++ b/Items/Chemikaze.cs @@ -37,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemical flasks leave five explosions"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ChemistHelmet.cs b/Items/ChemistHelmet.cs index e34bff04..4af2e1b9 100644 --- a/Items/ChemistHelmet.cs +++ b/Items/ChemistHelmet.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class ChemistHelmet : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 6%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.06f; diff --git a/Items/ChemistJacket.cs b/Items/ChemistJacket.cs index 26dda619..be336334 100644 --- a/Items/ChemistJacket.cs +++ b/Items/ChemistJacket.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 6%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.06f; diff --git a/Items/ChemistPants.cs b/Items/ChemistPants.cs index 717b9b3b..51927c4f 100644 --- a/Items/ChemistPants.cs +++ b/Items/ChemistPants.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class ChemistPants : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 6%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.06f; diff --git a/Items/ChippyRedSteelSword.cs b/Items/ChippyRedSteelSword.cs index 7d09629b..72502306 100644 --- a/Items/ChippyRedSteelSword.cs +++ b/Items/ChippyRedSteelSword.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/ChlorophyteDeadshooter.cs b/Items/ChlorophyteDeadshooter.cs index 30c6022b..45e44ecf 100644 --- a/Items/ChlorophyteDeadshooter.cs +++ b/Items/ChlorophyteDeadshooter.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/ChlorophyteHat.cs b/Items/ChlorophyteHat.cs index 27509382..7b3026b3 100644 --- a/Items/ChlorophyteHat.cs +++ b/Items/ChlorophyteHat.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class ChlorophyteHat : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 25%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.25f; diff --git a/Items/ChlorophyteHeader.cs b/Items/ChlorophyteHeader.cs index 4b96c80d..0010c28f 100644 --- a/Items/ChlorophyteHeader.cs +++ b/Items/ChlorophyteHeader.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class ChlorophyteHeader : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases thrown damage by 28%"); } - public override void UpdateEquip(Player player) { player.thrownDamage += 0.28f; diff --git a/Items/ChlorophyteVisage.cs b/Items/ChlorophyteVisage.cs index 2f3df4d6..2df79891 100644 --- a/Items/ChlorophyteVisage.cs +++ b/Items/ChlorophyteVisage.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("29% increased alchemical damage"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.29f; diff --git a/Items/ChristmasFireplace.cs b/Items/ChristmasFireplace.cs index 012181c2..627c5ce9 100644 --- a/Items/ChristmasFireplace.cs +++ b/Items/ChristmasFireplace.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CinderBlade.cs b/Items/CinderBlade.cs index 744e0228..79e767e6 100644 --- a/Items/CinderBlade.cs +++ b/Items/CinderBlade.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ClusterFlask.cs b/Items/ClusterFlask.cs index b30114c0..78f07a50 100644 --- a/Items/ClusterFlask.cs +++ b/Items/ClusterFlask.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into cluster clouds"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("ClusterCloudPro"); diff --git a/Items/ClusterShard.cs b/Items/ClusterShard.cs index d48832ae..681d7dac 100644 --- a/Items/ClusterShard.cs +++ b/Items/ClusterShard.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/CoalFish.cs b/Items/CoalFish.cs index fc3cadb6..7837b5fa 100644 --- a/Items/CoalFish.cs +++ b/Items/CoalFish.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/CobaltDisc.cs b/Items/CobaltDisc.cs index 8af44e70..a001871c 100644 --- a/Items/CobaltDisc.cs +++ b/Items/CobaltDisc.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool CanUseItem(Player player) { for (int i = 0; i < 1000; ++i) diff --git a/Items/CobaltHeader.cs b/Items/CobaltHeader.cs index 5b178e22..32d3f311 100644 --- a/Items/CobaltHeader.cs +++ b/Items/CobaltHeader.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class CobaltHeader : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases thrown damage by 18%"); } - public override void UpdateEquip(Player player) { player.thrownDamage += 0.18f; diff --git a/Items/CobaltHeadgear.cs b/Items/CobaltHeadgear.cs index de9ed1fa..ea416368 100644 --- a/Items/CobaltHeadgear.cs +++ b/Items/CobaltHeadgear.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class CobaltHeadgear : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 18%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.18f; diff --git a/Items/CobaltRifle.cs b/Items/CobaltRifle.cs index 980b7099..45b1d595 100644 --- a/Items/CobaltRifle.cs +++ b/Items/CobaltRifle.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-15, 0); diff --git a/Items/CobaltStaff.cs b/Items/CobaltStaff.cs index b30219a8..65b1e719 100644 --- a/Items/CobaltStaff.cs +++ b/Items/CobaltStaff.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CobaltVisage.cs b/Items/CobaltVisage.cs index b6bfe0af..c753047b 100644 --- a/Items/CobaltVisage.cs +++ b/Items/CobaltVisage.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("18% increased alchemical damage"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.18f; diff --git a/Items/CobaltWarhammer.cs b/Items/CobaltWarhammer.cs index d5bfceea..e7efb46e 100644 --- a/Items/CobaltWarhammer.cs +++ b/Items/CobaltWarhammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CogLordBag.cs b/Items/CogLordBag.cs index c97779aa..1a8277b0 100644 --- a/Items/CogLordBag.cs +++ b/Items/CogLordBag.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("{$CommonItemTooltip.RightClickToOpen}"); } - public override bool CanRightClick() { return true; diff --git a/Items/CogLordMask.cs b/Items/CogLordMask.cs index 0f0cb693..dc1122c6 100644 --- a/Items/CogLordMask.cs +++ b/Items/CogLordMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class CogLordMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/ColdMetalWings.cs b/Items/ColdMetalWings.cs index 6ba10a99..e4a7afa5 100644 --- a/Items/ColdMetalWings.cs +++ b/Items/ColdMetalWings.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows flight and slow fall"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 200; @@ -49,7 +48,6 @@ public override void HorizontalWingSpeeds(Player player, ref float speed, ref fl acceleration *= 2.5f; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ColdTooth.cs b/Items/ColdTooth.cs index 79d44314..fd75db8c 100644 --- a/Items/ColdTooth.cs +++ b/Items/ColdTooth.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CollapsiumBar.cs b/Items/CollapsiumBar.cs index e3a09563..03d04a57 100644 --- a/Items/CollapsiumBar.cs +++ b/Items/CollapsiumBar.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/CollapsiumOre.cs b/Items/CollapsiumOre.cs index 064cd5c4..6bf1b604 100644 --- a/Items/CollapsiumOre.cs +++ b/Items/CollapsiumOre.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/ConcentratedEther.cs b/Items/ConcentratedEther.cs index 9ba0d78b..f361cdef 100644 --- a/Items/ConcentratedEther.cs +++ b/Items/ConcentratedEther.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/ConcentratedTincture.cs b/Items/ConcentratedTincture.cs index dbf49cdc..33e9c282 100644 --- a/Items/ConcentratedTincture.cs +++ b/Items/ConcentratedTincture.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration from healing flasks"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.AddBuff(mod.BuffType("ConcentratedTinctureBuff"), 2); diff --git a/Items/Conglomeration.cs b/Items/Conglomeration.cs index 9c2d5f33..59984d11 100644 --- a/Items/Conglomeration.cs +++ b/Items/Conglomeration.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Prolonged after hit invincibility\nGreatly increased life regeneration\nIncreases maximum life by 140"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.moveSpeed -= 0.2f; diff --git a/Items/CopperSpear.cs b/Items/CopperSpear.cs index bedc6b25..0b47ccd4 100644 --- a/Items/CopperSpear.cs +++ b/Items/CopperSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CoralChestplate.cs b/Items/CoralChestplate.cs index d6dfb6eb..afc786f4 100644 --- a/Items/CoralChestplate.cs +++ b/Items/CoralChestplate.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CoralGreaves.cs b/Items/CoralGreaves.cs index 20737f00..f8c7a4c0 100644 --- a/Items/CoralGreaves.cs +++ b/Items/CoralGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class CoralGreaves : ModItem { - public override void SetDefaults() { @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CoralHamaxe.cs b/Items/CoralHamaxe.cs index 3aa759a5..fe28759a 100644 --- a/Items/CoralHamaxe.cs +++ b/Items/CoralHamaxe.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CoralHelmet.cs b/Items/CoralHelmet.cs index 676f730e..678a2d9d 100644 --- a/Items/CoralHelmet.cs +++ b/Items/CoralHelmet.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class CoralHelmet : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows you to swim"); } - public override void UpdateEquip(Player player) { player.accFlipper = true; diff --git a/Items/CoralPickaxe.cs b/Items/CoralPickaxe.cs index dcdff4e6..31a934ae 100644 --- a/Items/CoralPickaxe.cs +++ b/Items/CoralPickaxe.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CoralSlasher.cs b/Items/CoralSlasher.cs index e3643ba8..e8bac502 100644 --- a/Items/CoralSlasher.cs +++ b/Items/CoralSlasher.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Corfire.cs b/Items/Corfire.cs index f0952a76..0b45db65 100644 --- a/Items/Corfire.cs +++ b/Items/Corfire.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CornFish.cs b/Items/CornFish.cs index fc532133..b400b0c4 100644 --- a/Items/CornFish.cs +++ b/Items/CornFish.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/CornJavelin.cs b/Items/CornJavelin.cs index 347cf86e..42b87803 100644 --- a/Items/CornJavelin.cs +++ b/Items/CornJavelin.cs @@ -33,6 +33,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/CornSeed.cs b/Items/CornSeed.cs index dd0b2f61..2235f9e0 100644 --- a/Items/CornSeed.cs +++ b/Items/CornSeed.cs @@ -30,6 +30,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/CorruptorGun.cs b/Items/CorruptorGun.cs index 61e05556..5959bd94 100644 --- a/Items/CorruptorGun.cs +++ b/Items/CorruptorGun.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Spends bullets and fires small corruptors"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = 307; diff --git a/Items/CorruptorStaff.cs b/Items/CorruptorStaff.cs index 54f2be11..9cb97a5b 100644 --- a/Items/CorruptorStaff.cs +++ b/Items/CorruptorStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a corruptor to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/CosmicAssaultRifle.cs b/Items/CosmicAssaultRifle.cs index 640e7aab..f03d0080 100644 --- a/Items/CosmicAssaultRifle.cs +++ b/Items/CosmicAssaultRifle.cs @@ -17,7 +17,6 @@ public override void SetDefaults() item.useTime = 15; item.shoot = 207; - item.shootSpeed = 20f; item.useAnimation = 15; item.useStyle = 5; diff --git a/Items/CosmicFuel.cs b/Items/CosmicFuel.cs index 24686088..9b2cd9b3 100644 --- a/Items/CosmicFuel.cs +++ b/Items/CosmicFuel.cs @@ -22,6 +22,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Infinity energy!'"); } - } } diff --git a/Items/CosmicKrill.cs b/Items/CosmicKrill.cs index ed9c6f63..a7acd5ea 100644 --- a/Items/CosmicKrill.cs +++ b/Items/CosmicKrill.cs @@ -41,7 +41,6 @@ public override bool UseItem(Player player) return true; } - public override bool CanUseItem(Player player) { return NPC.downedMoonlord && !NPC.AnyNPCs(mod.NPCType("SpaceWhale")); diff --git a/Items/CrabClaw.cs b/Items/CrabClaw.cs index a3caa09e..4b538a25 100644 --- a/Items/CrabClaw.cs +++ b/Items/CrabClaw.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/CrabStaff.cs b/Items/CrabStaff.cs index c5b36db5..cfc31c1d 100644 --- a/Items/CrabStaff.cs +++ b/Items/CrabStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a little crab to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/CrateFish.cs b/Items/CrateFish.cs index b43610de..52d94f82 100644 --- a/Items/CrateFish.cs +++ b/Items/CrateFish.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/CrawlerHook.cs b/Items/CrawlerHook.cs index 0e519f05..73844fd3 100644 --- a/Items/CrawlerHook.cs +++ b/Items/CrawlerHook.cs @@ -36,7 +36,6 @@ public override void SetDefaults() projectile.CloneDefaults(ProjectileID.GemHookAmethyst); } - // Use this hook for hooks that can have multiple hooks midflight: Dual Hook, Web Slinger, Fish Hook, Static Hook, Lunar Hook /* public override bool? CanUseGrapple(Player player) diff --git a/Items/CreeperStaff.cs b/Items/CreeperStaff.cs index 2826a0f7..e3f7f88d 100644 --- a/Items/CreeperStaff.cs +++ b/Items/CreeperStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a creeper to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/CreepyDoor.cs b/Items/CreepyDoor.cs index cd7a8f18..2f14b23f 100644 --- a/Items/CreepyDoor.cs +++ b/Items/CreepyDoor.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CreepyThrone.cs b/Items/CreepyThrone.cs index aa82ee06..13c51350 100644 --- a/Items/CreepyThrone.cs +++ b/Items/CreepyThrone.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneBathtub.cs b/Items/CrimstoneBathtub.cs index e9e30836..ef4bbf72 100644 --- a/Items/CrimstoneBathtub.cs +++ b/Items/CrimstoneBathtub.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneBed.cs b/Items/CrimstoneBed.cs index 697e850f..2b729f92 100644 --- a/Items/CrimstoneBed.cs +++ b/Items/CrimstoneBed.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneBench.cs b/Items/CrimstoneBench.cs index bb24da23..d7b24121 100644 --- a/Items/CrimstoneBench.cs +++ b/Items/CrimstoneBench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneBookcase.cs b/Items/CrimstoneBookcase.cs index 2d121157..f6022813 100644 --- a/Items/CrimstoneBookcase.cs +++ b/Items/CrimstoneBookcase.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneChair.cs b/Items/CrimstoneChair.cs index 058ac703..f26a7db9 100644 --- a/Items/CrimstoneChair.cs +++ b/Items/CrimstoneChair.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneChest.cs b/Items/CrimstoneChest.cs index 7f60156b..2b16c8a8 100644 --- a/Items/CrimstoneChest.cs +++ b/Items/CrimstoneChest.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneDoor.cs b/Items/CrimstoneDoor.cs index aff4be79..5d03a388 100644 --- a/Items/CrimstoneDoor.cs +++ b/Items/CrimstoneDoor.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneDresser.cs b/Items/CrimstoneDresser.cs index 861eb017..c1a0eb1a 100644 --- a/Items/CrimstoneDresser.cs +++ b/Items/CrimstoneDresser.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneGrandfatherClock.cs b/Items/CrimstoneGrandfatherClock.cs index 8f0e0825..92dea619 100644 --- a/Items/CrimstoneGrandfatherClock.cs +++ b/Items/CrimstoneGrandfatherClock.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstonePiano.cs b/Items/CrimstonePiano.cs index e5ae37b3..80a7685e 100644 --- a/Items/CrimstonePiano.cs +++ b/Items/CrimstonePiano.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstonePlatform.cs b/Items/CrimstonePlatform.cs index 86ca23c2..51791c6f 100644 --- a/Items/CrimstonePlatform.cs +++ b/Items/CrimstonePlatform.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneSink.cs b/Items/CrimstoneSink.cs index a134de33..184e0e76 100644 --- a/Items/CrimstoneSink.cs +++ b/Items/CrimstoneSink.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneTable.cs b/Items/CrimstoneTable.cs index 81d9a4cf..f4690211 100644 --- a/Items/CrimstoneTable.cs +++ b/Items/CrimstoneTable.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimstoneWorkbench.cs b/Items/CrimstoneWorkbench.cs index 9955ffb2..577a9d34 100644 --- a/Items/CrimstoneWorkbench.cs +++ b/Items/CrimstoneWorkbench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrimtaneProtector.cs b/Items/CrimtaneProtector.cs index 815ec8e7..864c46d5 100644 --- a/Items/CrimtaneProtector.cs +++ b/Items/CrimtaneProtector.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases max health by 50"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.statLifeMax2 += 50; diff --git a/Items/CrimtaneScythe.cs b/Items/CrimtaneScythe.cs index 267844fa..0e64b9b2 100644 --- a/Items/CrimtaneScythe.cs +++ b/Items/CrimtaneScythe.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrossBlast.cs b/Items/CrossBlast.cs index 1a56dfd2..e28a35fe 100644 --- a/Items/CrossBlast.cs +++ b/Items/CrossBlast.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemical projectiles leave explosions in the shape of cross"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Crossbow.cs b/Items/Crossbow.cs index 5b367578..bd8e36e3 100644 --- a/Items/Crossbow.cs +++ b/Items/Crossbow.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-12, -2); diff --git a/Items/Crowbar.cs b/Items/Crowbar.cs index 5de3c420..1b099d57 100644 --- a/Items/Crowbar.cs +++ b/Items/Crowbar.cs @@ -29,6 +29,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Actually it snaps in two'"); } - } } diff --git a/Items/Crusher.cs b/Items/Crusher.cs index 246f7365..ebb0acbe 100644 --- a/Items/Crusher.cs +++ b/Items/Crusher.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrystalChestplate.cs b/Items/CrystalChestplate.cs index 22086da9..995600dd 100644 --- a/Items/CrystalChestplate.cs +++ b/Items/CrystalChestplate.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("30% increased throwing velocity"); } - public override void UpdateEquip(Player p) { p.thrownVelocity += 0.3f; diff --git a/Items/CrystalDagger.cs b/Items/CrystalDagger.cs index 4902214e..f84e799e 100644 --- a/Items/CrystalDagger.cs +++ b/Items/CrystalDagger.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrystalFlask.cs b/Items/CrystalFlask.cs index ad416370..8bd43252 100644 --- a/Items/CrystalFlask.cs +++ b/Items/CrystalFlask.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into crystal clouds"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("CrystalCloudPro"); diff --git a/Items/CrystalGreaves.cs b/Items/CrystalGreaves.cs index b5626878..3b348606 100644 --- a/Items/CrystalGreaves.cs +++ b/Items/CrystalGreaves.cs @@ -8,11 +8,9 @@ namespace Tremor.Items public class CrystalGreaves : ModItem { - public override void SetDefaults() { - item.defense = 5; item.width = 22; item.height = 18; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased throwing critical strike chance"); } - public override void UpdateEquip(Player p) { p.thrownCrit += 20; diff --git a/Items/CrystalHelmet.cs b/Items/CrystalHelmet.cs index fbf925b6..b7b457d6 100644 --- a/Items/CrystalHelmet.cs +++ b/Items/CrystalHelmet.cs @@ -11,7 +11,6 @@ public class CrystalHelmet : ModItem public override void SetDefaults() { - item.defense = 5; item.width = 26; item.height = 22; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased throwing damage"); } - public override void UpdateEquip(Player p) { p.thrownDamage += 0.2f; diff --git a/Items/CrystalPickaxe.cs b/Items/CrystalPickaxe.cs index 434f5860..098c64f5 100644 --- a/Items/CrystalPickaxe.cs +++ b/Items/CrystalPickaxe.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrystalWarhamaxe.cs b/Items/CrystalWarhamaxe.cs index 9b95dac0..c786cdf1 100644 --- a/Items/CrystalWarhamaxe.cs +++ b/Items/CrystalWarhamaxe.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CrystalWhirlwind.cs b/Items/CrystalWhirlwind.cs index 2dcc7376..c1b3b11f 100644 --- a/Items/CrystalWhirlwind.cs +++ b/Items/CrystalWhirlwind.cs @@ -19,7 +19,6 @@ public override void SetDefaults() item.useTime = 7; item.mana = 20; - item.useAnimation = 30; item.useStyle = 5; item.shootSpeed = 30f; @@ -36,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Causes crystals to fall from the sky\n'Made of pure friendship''"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = 521; diff --git a/Items/CthulhuBlood.cs b/Items/CthulhuBlood.cs index daca1fab..0022faea 100644 --- a/Items/CthulhuBlood.cs +++ b/Items/CthulhuBlood.cs @@ -12,7 +12,6 @@ public override void SetDefaults() item.height = 30; item.maxStack = 1; - item.value = 255000; item.rare = 8; item.accessory = true; @@ -24,8 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increased life regeneration\nIncreased alchemical damage and critical strike chance by 25%"); } - - public override void UpdateAccessory(Player player, bool hideVisual) { player.lifeRegen += 3; diff --git a/Items/CursedBanner.cs b/Items/CursedBanner.cs index 40dc06ab..feba6404 100644 --- a/Items/CursedBanner.cs +++ b/Items/CursedBanner.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases all critical strike chance by 25 if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CursedBreath.cs b/Items/CursedBreath.cs index ce0d96e6..f1bdf660 100644 --- a/Items/CursedBreath.cs +++ b/Items/CursedBreath.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CursedCauldron.cs b/Items/CursedCauldron.cs index ce867e05..53b16ca5 100644 --- a/Items/CursedCauldron.cs +++ b/Items/CursedCauldron.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(8, 4)); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.GetModPlayer(mod).alchemicalDamage += 0.15f; diff --git a/Items/CursedKnife.cs b/Items/CursedKnife.cs index fc8ed24e..3bf5bebe 100644 --- a/Items/CursedKnife.cs +++ b/Items/CursedKnife.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(39, 60); diff --git a/Items/CursedPopcorn.cs b/Items/CursedPopcorn.cs index b088a4d1..829b2a76 100644 --- a/Items/CursedPopcorn.cs +++ b/Items/CursedPopcorn.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Evil Corn"); } - public override bool CanUseItem(Player player) { return !Main.dayTime && !NPC.AnyNPCs(mod.NPCType("EvilCorn")); diff --git a/Items/CursedTwister.cs b/Items/CursedTwister.cs index 9d4dc68d..beea699c 100644 --- a/Items/CursedTwister.cs +++ b/Items/CursedTwister.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/CyberCutter.cs b/Items/CyberCutter.cs index e1761bb4..a3d86b9e 100644 --- a/Items/CyberCutter.cs +++ b/Items/CyberCutter.cs @@ -39,7 +39,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Casts a controllable saw"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { player.channel = true; diff --git a/Items/CyberKingBag.cs b/Items/CyberKingBag.cs index 595fa75e..fbddd338 100644 --- a/Items/CyberKingBag.cs +++ b/Items/CyberKingBag.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("{$CommonItemTooltip.RightClickToOpen}"); } - public override bool CanRightClick() { return true; diff --git a/Items/CyberKingMask.cs b/Items/CyberKingMask.cs index e02e523e..5dac5cfa 100644 --- a/Items/CyberKingMask.cs +++ b/Items/CyberKingMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class CyberKingMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/CyberStaff.cs b/Items/CyberStaff.cs index 6748e996..5aff2372 100644 --- a/Items/CyberStaff.cs +++ b/Items/CyberStaff.cs @@ -37,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a cyber saw to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/Cyclone.cs b/Items/Cyclone.cs index 3c1d800c..33c78aa0 100644 --- a/Items/Cyclone.cs +++ b/Items/Cyclone.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DakkharnsMask.cs b/Items/DakkharnsMask.cs index 1cd2c01d..a59f5db4 100644 --- a/Items/DakkharnsMask.cs +++ b/Items/DakkharnsMask.cs @@ -7,15 +7,12 @@ namespace Tremor.Items public class DakkharnsMask : ModItem { - - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 1000000; item.rare = 11; item.defense = 50; @@ -27,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons and ancient predator to defend you from foes\nPredator attacks enemies and inflicts curses"); } - public override void UpdateEquip(Player player) { player.AddBuff(mod.BuffType("AncientPredatorBuff"), 2); diff --git a/Items/DangerBlade.cs b/Items/DangerBlade.cs index c695edce..916eaa2b 100644 --- a/Items/DangerBlade.cs +++ b/Items/DangerBlade.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Danger Blade"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/DarkAbsorber.cs b/Items/DarkAbsorber.cs index 663f0c3a..965af62a 100644 --- a/Items/DarkAbsorber.cs +++ b/Items/DarkAbsorber.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Gives health when in Corruption"); } - public override void UpdateAccessory(Player player, bool hideVisual) { if (player.ZoneCorrupt) diff --git a/Items/DarkBulb.cs b/Items/DarkBulb.cs index 48fa17be..d3480b1e 100644 --- a/Items/DarkBulb.cs +++ b/Items/DarkBulb.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DarkDruidMask.cs b/Items/DarkDruidMask.cs index 5e2a4112..59c559e2 100644 --- a/Items/DarkDruidMask.cs +++ b/Items/DarkDruidMask.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class DarkDruidMask : ModItem { - public override void SetDefaults() { diff --git a/Items/DarkEmperorBag.cs b/Items/DarkEmperorBag.cs index 6252707a..7aa7db4b 100644 --- a/Items/DarkEmperorBag.cs +++ b/Items/DarkEmperorBag.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("{$CommonItemTooltip.RightClickToOpen}"); } - public override bool CanRightClick() { return true; diff --git a/Items/DarkEmperorMask.cs b/Items/DarkEmperorMask.cs index 3cbef153..12901ca0 100644 --- a/Items/DarkEmperorMask.cs +++ b/Items/DarkEmperorMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class DarkEmperorMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/DarkMass.cs b/Items/DarkMass.cs index e82094af..c63066dd 100644 --- a/Items/DarkMass.cs +++ b/Items/DarkMass.cs @@ -22,6 +22,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/Darkhalis.cs b/Items/Darkhalis.cs index 960e81f3..1a813fdf 100644 --- a/Items/Darkhalis.cs +++ b/Items/Darkhalis.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'It came from the deep abyss...'"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("DarkhalisPro"); diff --git a/Items/DarknessBreastplate.cs b/Items/DarknessBreastplate.cs index 1ac652b8..a00a0fd9 100644 --- a/Items/DarknessBreastplate.cs +++ b/Items/DarknessBreastplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration"); } - public override void UpdateEquip(Player player) { player.lifeRegen += 5; diff --git a/Items/DarknessDust.cs b/Items/DarknessDust.cs index 19a2711a..8c3f39ba 100644 --- a/Items/DarknessDust.cs +++ b/Items/DarknessDust.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void UpdateAccessory(Player player, bool hideVisual) { if (Math.Abs(player.velocity.X) + Math.Abs(player.velocity.Y) > 1f && !player.rocketFrame) // Makes sure the player is actually moving diff --git a/Items/DarknessHat.cs b/Items/DarknessHat.cs index eb36f6f3..467b87ff 100644 --- a/Items/DarknessHat.cs +++ b/Items/DarknessHat.cs @@ -15,7 +15,6 @@ public override void SetDefaults() item.defense = 22; item.width = 26; - item.height = 32; item.value = 600000; item.rare = 11; @@ -27,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration\nIncreases maximum mana by 80"); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("DarknessBreastplate") && legs.type == mod.ItemType("DarknessGreaves"); diff --git a/Items/DarknessHeadgear.cs b/Items/DarknessHeadgear.cs index 26cc0f74..cfa01051 100644 --- a/Items/DarknessHeadgear.cs +++ b/Items/DarknessHeadgear.cs @@ -15,7 +15,6 @@ public override void SetDefaults() item.defense = 22; item.width = 26; - item.height = 32; item.value = 600000; item.rare = 11; @@ -27,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration\n20% chance not consume ammo"); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("DarknessBreastplate") && legs.type == mod.ItemType("DarknessGreaves"); diff --git a/Items/DarknessHelmet.cs b/Items/DarknessHelmet.cs index 96cce705..eb78f29d 100644 --- a/Items/DarknessHelmet.cs +++ b/Items/DarknessHelmet.cs @@ -15,7 +15,6 @@ public override void SetDefaults() item.defense = 22; item.width = 26; - item.height = 32; item.value = 600000; item.rare = 11; @@ -27,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration\nIncreases melee speed by 25%"); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("DarknessBreastplate") && legs.type == mod.ItemType("DarknessGreaves"); @@ -39,7 +37,6 @@ public virtual void ArmorSetShadows(Player player, ref bool longTrail, ref bool Main.NewText("1", 175, 75, 255); } - public override void UpdateEquip(Player player) { player.lifeRegen += 5; diff --git a/Items/DarknessLeggings.cs b/Items/DarknessLeggings.cs index 8d4d2e8f..c9168886 100644 --- a/Items/DarknessLeggings.cs +++ b/Items/DarknessLeggings.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class DarknessLeggings : ModItem { - public override void SetDefaults() { diff --git a/Items/DarknessMask.cs b/Items/DarknessMask.cs index 81a712f9..c5f05b6a 100644 --- a/Items/DarknessMask.cs +++ b/Items/DarknessMask.cs @@ -39,7 +39,6 @@ public override void UpdateEquip(Player player) public override void UpdateArmorSet(Player player) { - if (Math.Abs(player.velocity.X) + Math.Abs(player.velocity.Y) > 1f && !player.rocketFrame) // Makes sure the player is actually moving { for (int k = 0; k < 2; k++) diff --git a/Items/DeadFlower.cs b/Items/DeadFlower.cs index 2fb9eeb9..f34b4446 100644 --- a/Items/DeadFlower.cs +++ b/Items/DeadFlower.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DeadHead.cs b/Items/DeadHead.cs index 2f3dc0f8..cbd39cc5 100644 --- a/Items/DeadHead.cs +++ b/Items/DeadHead.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("4% increased damage and critical strike chance\n15% increased movement speed"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.meleeDamage += 0.04f; diff --git a/Items/DeadTissue.cs b/Items/DeadTissue.cs index c982a4b9..cc7f65f9 100644 --- a/Items/DeadTissue.cs +++ b/Items/DeadTissue.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/DeadlyTreats.cs b/Items/DeadlyTreats.cs index 2661af66..202532a3 100644 --- a/Items/DeadlyTreats.cs +++ b/Items/DeadlyTreats.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration\nLowers visibilty"); } - public override bool UseItem(Player player) { player.AddBuff(22, 10000, true); diff --git a/Items/DeathBlaze.cs b/Items/DeathBlaze.cs index e5f93ac4..57475df7 100644 --- a/Items/DeathBlaze.cs +++ b/Items/DeathBlaze.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DeathFormula.cs b/Items/DeathFormula.cs index d750146a..9b43259b 100644 --- a/Items/DeathFormula.cs +++ b/Items/DeathFormula.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased alchemical critical strike chance"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.GetModPlayer(mod).alchemicalCrit += 20; diff --git a/Items/Decayed.cs b/Items/Decayed.cs index 1a03b3c5..d863a678 100644 --- a/Items/Decayed.cs +++ b/Items/Decayed.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-16, 0); diff --git a/Items/DelightfulClump.cs b/Items/DelightfulClump.cs index 1d54a47c..b66b69c5 100644 --- a/Items/DelightfulClump.cs +++ b/Items/DelightfulClump.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum life by 100\n15% increased critical strike chance"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.statLifeMax2 += 100; @@ -31,6 +30,5 @@ public override void UpdateAccessory(Player player, bool hideVisual) player.thrownCrit += 5; } - } } diff --git a/Items/DemonBlood.cs b/Items/DemonBlood.cs index b194b74c..e7f4e31c 100644 --- a/Items/DemonBlood.cs +++ b/Items/DemonBlood.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/DemoniteProtector.cs b/Items/DemoniteProtector.cs index 68dc5198..5b76a6d2 100644 --- a/Items/DemoniteProtector.cs +++ b/Items/DemoniteProtector.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases max health by 50"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.statLifeMax2 += 50; diff --git a/Items/DemoniteScythe.cs b/Items/DemoniteScythe.cs index 4e59c47e..e1de0d59 100644 --- a/Items/DemoniteScythe.cs +++ b/Items/DemoniteScythe.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DesertClaymore.cs b/Items/DesertClaymore.cs index da6e937f..bacd0ce3 100644 --- a/Items/DesertClaymore.cs +++ b/Items/DesertClaymore.cs @@ -37,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { Projectile.NewProjectile(position.X, position.Y, 0, 0, type, damage, knockBack, player.whoAmI, player.direction); diff --git a/Items/DesertCrown.cs b/Items/DesertCrown.cs index 3ba256a2..658da0b3 100644 --- a/Items/DesertCrown.cs +++ b/Items/DesertCrown.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Rukh"); } - public override bool CanUseItem(Player player) { return !NPC.AnyNPCs(mod.NPCType("npcVultureKing")) && player.ZoneDesert; diff --git a/Items/DesertExplorerBreastplate.cs b/Items/DesertExplorerBreastplate.cs index 632ac7e9..2427b49a 100644 --- a/Items/DesertExplorerBreastplate.cs +++ b/Items/DesertExplorerBreastplate.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 16500; item.rare = 8; item.defense = 17; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 19%\nIncreases throwing damage by 35%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.5f; diff --git a/Items/DesertExplorerGreaves.cs b/Items/DesertExplorerGreaves.cs index 457606ad..295d6529 100644 --- a/Items/DesertExplorerGreaves.cs +++ b/Items/DesertExplorerGreaves.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 18; item.height = 22; - item.value = 13500; item.rare = 8; item.defense = 13; @@ -27,7 +26,6 @@ public override void SetStaticDefaults() TremorGlowMask.AddGlowMask(item.type, "Tremor/Items/DesertExplorerGreaves_LegsGlow"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.16f; diff --git a/Items/DesertExplorerVisage.cs b/Items/DesertExplorerVisage.cs index 235a7f61..eb19f63c 100644 --- a/Items/DesertExplorerVisage.cs +++ b/Items/DesertExplorerVisage.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() TremorGlowMask.AddGlowMask(item.type, "Tremor/Items/DesertExplorerVisage_HeadGlow"); } - public override void ArmorSetShadows(Player player) { player.armorEffectDrawShadowSubtle = true; diff --git a/Items/Destructor.cs b/Items/Destructor.cs index 38f7bca6..97b3b184 100644 --- a/Items/Destructor.cs +++ b/Items/Destructor.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Exterminate!'"); } - public override bool ConsumeAmmo(Player p) { return Main.rand.Next(2) == 0; diff --git a/Items/Devastator.cs b/Items/Devastator.cs index 34b02b65..3f9228de 100644 --- a/Items/Devastator.cs +++ b/Items/Devastator.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/DevilForge.cs b/Items/DevilForge.cs index de8c09eb..2317c3e6 100644 --- a/Items/DevilForge.cs +++ b/Items/DevilForge.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DiamondBlade.cs b/Items/DiamondBlade.cs index 0fb5be51..cc1b77e7 100644 --- a/Items/DiamondBlade.cs +++ b/Items/DiamondBlade.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 63); diff --git a/Items/DimensionalTopHat.cs b/Items/DimensionalTopHat.cs index 5319ddca..5f92a624 100644 --- a/Items/DimensionalTopHat.cs +++ b/Items/DimensionalTopHat.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class DimensionalTopHat : ModItem { - public override void SetDefaults() { @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Grants clairvoyance\n25% increased magic and minion damage\nGreatly increases mana regeneration"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.25f; @@ -33,6 +31,5 @@ public override void UpdateEquip(Player player) player.manaRegen += 25; } - } } diff --git a/Items/Dissolver.cs b/Items/Dissolver.cs index fed42fcc..31d7342c 100644 --- a/Items/Dissolver.cs +++ b/Items/Dissolver.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DivineClaymore.cs b/Items/DivineClaymore.cs index e8973f02..4f3eb23e 100644 --- a/Items/DivineClaymore.cs +++ b/Items/DivineClaymore.cs @@ -33,13 +33,11 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DivineForge.cs b/Items/DivineForge.cs index c88cdee4..e7a3cfbd 100644 --- a/Items/DivineForge.cs +++ b/Items/DivineForge.cs @@ -18,7 +18,6 @@ public override void SetDefaults() item.autoReuse = true; item.useAnimation = 15; - item.useTime = 10; item.useStyle = 1; item.consumable = true; @@ -32,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Combines the function of the anvil, furnace and the ancient manipulator\nAllows you to work with heavenly materials"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/DivineGift.cs b/Items/DivineGift.cs index e3d425f8..1e20f399 100644 --- a/Items/DivineGift.cs +++ b/Items/DivineGift.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 64); diff --git a/Items/DogeMask.cs b/Items/DogeMask.cs index 2350caf2..f2700c40 100644 --- a/Items/DogeMask.cs +++ b/Items/DogeMask.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class DogeMask : ModItem { - public override void SetDefaults() { @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Let it wow'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DoomKey.cs b/Items/DoomKey.cs index 36ab813e..53e2a650 100644 --- a/Items/DoomKey.cs +++ b/Items/DoomKey.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Skeletron"); } - public override bool CanUseItem(Player player) { return !Main.dayTime && !NPC.AnyNPCs(35); diff --git a/Items/Doombrick.cs b/Items/Doombrick.cs index a3650c14..c979d3b6 100644 --- a/Items/Doombrick.cs +++ b/Items/Doombrick.cs @@ -28,8 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DoombrickWall.cs b/Items/DoombrickWall.cs index aa679105..c8917521 100644 --- a/Items/DoombrickWall.cs +++ b/Items/DoombrickWall.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Doomhammer.cs b/Items/Doomhammer.cs index 73dfd4fa..58f907e5 100644 --- a/Items/Doomhammer.cs +++ b/Items/Doomhammer.cs @@ -18,7 +18,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(3) == 0) diff --git a/Items/Doomstick.cs b/Items/Doomstick.cs index 4ad61395..1c8ffd5e 100644 --- a/Items/Doomstick.cs +++ b/Items/Doomstick.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/DopelgangerCandle.cs b/Items/DopelgangerCandle.cs index 7b30dbbe..1e9a09a4 100644 --- a/Items/DopelgangerCandle.cs +++ b/Items/DopelgangerCandle.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(10, 4)); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.statLifeMax2 -= 25; diff --git a/Items/DragonBreastplate.cs b/Items/DragonBreastplate.cs index 87d7fae3..ffe20c48 100644 --- a/Items/DragonBreastplate.cs +++ b/Items/DragonBreastplate.cs @@ -12,7 +12,6 @@ public override void SetDefaults() item.width = 30; item.height = 26; - item.value = 35000; item.rare = 11; item.defense = 29; @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("50% increased ranged damage\nIncreased ranged critical strike chance by 34"); } - public override void UpdateEquip(Player player) { player.rangedDamage += 0.5f; diff --git a/Items/DragonBreath.cs b/Items/DragonBreath.cs index c0a49165..8b72d14e 100644 --- a/Items/DragonBreath.cs +++ b/Items/DragonBreath.cs @@ -32,6 +32,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/DragonGem.cs b/Items/DragonGem.cs index 959b54bd..52115047 100644 --- a/Items/DragonGem.cs +++ b/Items/DragonGem.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases regeneration during night"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/DragonGreaves.cs b/Items/DragonGreaves.cs index 769be94e..ae8cbb8c 100644 --- a/Items/DragonGreaves.cs +++ b/Items/DragonGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class DragonGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("95% increased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.95f; diff --git a/Items/DragonHelmet.cs b/Items/DragonHelmet.cs index 0bfd24f7..af10f869 100644 --- a/Items/DragonHelmet.cs +++ b/Items/DragonHelmet.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class DragonHelmet : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases arrow speed and damage"); } - public override void UpdateEquip(Player player) { player.archery = true; diff --git a/Items/DragonRafale.cs b/Items/DragonRafale.cs index 0988ec44..c1d70c81 100644 --- a/Items/DragonRafale.cs +++ b/Items/DragonRafale.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Two round burst"); } - public override Vector2? HoldoutOffset() { return new Vector2(-10, -4); diff --git a/Items/DragonShield.cs b/Items/DragonShield.cs index 36e5fee1..e6b33396 100644 --- a/Items/DragonShield.cs +++ b/Items/DragonShield.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows to dash\nDouble tap a direction\n60% increased movement speed"); } - public override void UpdateEquip(Player player) { player.dash = 1; diff --git a/Items/DrippingKnife.cs b/Items/DrippingKnife.cs index ccb3a328..0f1e8caf 100644 --- a/Items/DrippingKnife.cs +++ b/Items/DrippingKnife.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/DrippingScythe.cs b/Items/DrippingScythe.cs index 96af83d8..c84afb7c 100644 --- a/Items/DrippingScythe.cs +++ b/Items/DrippingScythe.cs @@ -29,7 +29,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - } } diff --git a/Items/DukeFlask.cs b/Items/DukeFlask.cs index 53796768..6e2d3880 100644 --- a/Items/DukeFlask.cs +++ b/Items/DukeFlask.cs @@ -26,7 +26,6 @@ public override void SetDefaults() item.consumable = true; item.autoReuse = false; - } public override void SetStaticDefaults() @@ -35,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into water tornados\nTornados deal damage to enemies"); } - public override void UpdateInventory(Player player) { if (player.FindBuffIndex(mod.BuffType("LongFuseBuff")) != -1) diff --git a/Items/Durian.cs b/Items/Durian.cs index efe8b2ca..e26b2193 100644 --- a/Items/Durian.cs +++ b/Items/Durian.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/EarthBender.cs b/Items/EarthBender.cs index bd37fde7..0c095bd8 100644 --- a/Items/EarthBender.cs +++ b/Items/EarthBender.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EaterofDreams.cs b/Items/EaterofDreams.cs index a63fab57..82f20b0d 100644 --- a/Items/EaterofDreams.cs +++ b/Items/EaterofDreams.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Consumes gel as ammo"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EaterofWorld.cs b/Items/EaterofWorld.cs index f0408f7c..30ca55e9 100644 --- a/Items/EaterofWorld.cs +++ b/Items/EaterofWorld.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/EbonstoneBathtub.cs b/Items/EbonstoneBathtub.cs index 29c1e8f7..8d4db832 100644 --- a/Items/EbonstoneBathtub.cs +++ b/Items/EbonstoneBathtub.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneBed.cs b/Items/EbonstoneBed.cs index 46fa0baa..eb962166 100644 --- a/Items/EbonstoneBed.cs +++ b/Items/EbonstoneBed.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneBench.cs b/Items/EbonstoneBench.cs index e3fffa11..bac4136b 100644 --- a/Items/EbonstoneBench.cs +++ b/Items/EbonstoneBench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneBookcase.cs b/Items/EbonstoneBookcase.cs index 8e622f3d..8aa36a91 100644 --- a/Items/EbonstoneBookcase.cs +++ b/Items/EbonstoneBookcase.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneChair.cs b/Items/EbonstoneChair.cs index e6d06e86..319c87f4 100644 --- a/Items/EbonstoneChair.cs +++ b/Items/EbonstoneChair.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneChest.cs b/Items/EbonstoneChest.cs index b03ffb31..6aa5ebf1 100644 --- a/Items/EbonstoneChest.cs +++ b/Items/EbonstoneChest.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneDoor.cs b/Items/EbonstoneDoor.cs index b2d7ec0a..65730449 100644 --- a/Items/EbonstoneDoor.cs +++ b/Items/EbonstoneDoor.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneDresser.cs b/Items/EbonstoneDresser.cs index 8a09b94b..0d7f8b51 100644 --- a/Items/EbonstoneDresser.cs +++ b/Items/EbonstoneDresser.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneGrandfatherClock.cs b/Items/EbonstoneGrandfatherClock.cs index 07ea596e..61956172 100644 --- a/Items/EbonstoneGrandfatherClock.cs +++ b/Items/EbonstoneGrandfatherClock.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstonePiano.cs b/Items/EbonstonePiano.cs index ed1fb74d..addcd87c 100644 --- a/Items/EbonstonePiano.cs +++ b/Items/EbonstonePiano.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstonePlatform.cs b/Items/EbonstonePlatform.cs index 195d7d4e..bb86ff6c 100644 --- a/Items/EbonstonePlatform.cs +++ b/Items/EbonstonePlatform.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneSink.cs b/Items/EbonstoneSink.cs index f193abb2..672af7f7 100644 --- a/Items/EbonstoneSink.cs +++ b/Items/EbonstoneSink.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneTable.cs b/Items/EbonstoneTable.cs index 93b0806a..9b9f1f3b 100644 --- a/Items/EbonstoneTable.cs +++ b/Items/EbonstoneTable.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonstoneWorkbench.cs b/Items/EbonstoneWorkbench.cs index ef8cb053..c036a75e 100644 --- a/Items/EbonstoneWorkbench.cs +++ b/Items/EbonstoneWorkbench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EbonwoodArmchair.cs b/Items/EbonwoodArmchair.cs index 78e5119e..1af91a46 100644 --- a/Items/EbonwoodArmchair.cs +++ b/Items/EbonwoodArmchair.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EdgeofFrostKing.cs b/Items/EdgeofFrostKing.cs index c9b80607..424d5cd6 100644 --- a/Items/EdgeofFrostKing.cs +++ b/Items/EdgeofFrostKing.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(44, 60); diff --git a/Items/Eggplant.cs b/Items/Eggplant.cs index 66d9e467..b62ec0d5 100644 --- a/Items/Eggplant.cs +++ b/Items/Eggplant.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/ElectricSpear.cs b/Items/ElectricSpear.cs index f5d959da..a41e2f91 100644 --- a/Items/ElectricSpear.cs +++ b/Items/ElectricSpear.cs @@ -32,6 +32,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Traitor!'"); } - } } diff --git a/Items/EmeraldBlade.cs b/Items/EmeraldBlade.cs index f5280230..6f5fac80 100644 --- a/Items/EmeraldBlade.cs +++ b/Items/EmeraldBlade.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 61); diff --git a/Items/EmperorCrown.cs b/Items/EmperorCrown.cs index a9a122df..8f38572f 100644 --- a/Items/EmperorCrown.cs +++ b/Items/EmperorCrown.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Dark Emperor"); } - public override bool CanUseItem(Player player) { return NPC.downedMoonlord && !NPC.AnyNPCs(mod.NPCType("TheDarkEmperor")); diff --git a/Items/EnchantedBreastplate.cs b/Items/EnchantedBreastplate.cs index e4e67a0f..2ded3acc 100644 --- a/Items/EnchantedBreastplate.cs +++ b/Items/EnchantedBreastplate.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.height = 20; item.value = 10000; - item.rare = 2; item.defense = 7; } @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum mana by 20\nIncreases maximum health by 20"); } - public override void UpdateEquip(Player player) { player.statManaMax2 += 20; diff --git a/Items/EnchantedGreaves.cs b/Items/EnchantedGreaves.cs index 7908f31c..6df06327 100644 --- a/Items/EnchantedGreaves.cs +++ b/Items/EnchantedGreaves.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class EnchantedGreaves : ModItem { - public override void SetDefaults() { item.width = 22; item.height = 18; - item.value = 10000; item.rare = 2; item.defense = 5; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum mana by 20\nIncreases maximum health by 15"); } - public override void UpdateEquip(Player player) { player.statManaMax2 += 20; diff --git a/Items/EnchantedHealthBooster.cs b/Items/EnchantedHealthBooster.cs index cdf4552d..7fdbca41 100644 --- a/Items/EnchantedHealthBooster.cs +++ b/Items/EnchantedHealthBooster.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Regenerates heatlh every 45 seconds"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/EnchantedHelmet.cs b/Items/EnchantedHelmet.cs index a7001c3d..39ad59ba 100644 --- a/Items/EnchantedHelmet.cs +++ b/Items/EnchantedHelmet.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class EnchantedHelmet : ModItem { - public override void SetDefaults() { item.width = 24; item.height = 24; - item.value = 10000; item.rare = 2; item.defense = 5; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum mana by 20\nIncreases maximum health by 15"); } - public override void UpdateEquip(Player player) { player.statManaMax2 += 20; @@ -38,7 +35,6 @@ public override bool IsArmorSet(Item head, Item body, Item legs) return body.type == mod.ItemType("EnchantedBreastplate") && legs.type == mod.ItemType("EnchantedGreaves"); } - public override void UpdateArmorSet(Player player) { player.setBonus = "8% increased magic damage, increases power of enchanted weapons"; diff --git a/Items/EnchantedHourglass.cs b/Items/EnchantedHourglass.cs index 8a3844ac..383edc2a 100644 --- a/Items/EnchantedHourglass.cs +++ b/Items/EnchantedHourglass.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool UseItem(Player player) { if (Main.player[Main.myPlayer].active && Main.player[Main.myPlayer].FindBuffIndex(mod.BuffType("HealthRecharging")) != -1) diff --git a/Items/EnchantedManaBooster.cs b/Items/EnchantedManaBooster.cs index 16b4bc98..2d263dd3 100644 --- a/Items/EnchantedManaBooster.cs +++ b/Items/EnchantedManaBooster.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Regenerates mana every 45 seconds"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/EnchantedShield.cs b/Items/EnchantedShield.cs index 233d103c..8c2b6d42 100644 --- a/Items/EnchantedShield.cs +++ b/Items/EnchantedShield.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.height = 30; item.value = 15000; - item.rare = 2; item.accessory = true; item.defense = 2; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum mana by 40\n10% decreased magic damage"); } - public override void UpdateEquip(Player player) { player.statManaMax2 += 40; diff --git a/Items/EnchantmentSolution.cs b/Items/EnchantmentSolution.cs index eab30ce9..17edb44a 100644 --- a/Items/EnchantmentSolution.cs +++ b/Items/EnchantmentSolution.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("25% chance not to consume flask"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EndlessPileofsnowballs.cs b/Items/EndlessPileofsnowballs.cs index 3803e7ed..4c80934d 100644 --- a/Items/EndlessPileofsnowballs.cs +++ b/Items/EndlessPileofsnowballs.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EnforcerShield.cs b/Items/EnforcerShield.cs index 9544be15..5872a6cb 100644 --- a/Items/EnforcerShield.cs +++ b/Items/EnforcerShield.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases melee damage and speed as health lowers\nIncreased invincibility after taking damage"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/EternalAgony.cs b/Items/EternalAgony.cs index 9f50ae84..f545149f 100644 --- a/Items/EternalAgony.cs +++ b/Items/EternalAgony.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Inflicts Shadow Flames on foes"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EtherealFeather.cs b/Items/EtherealFeather.cs index a5f383be..7f0b17ec 100644 --- a/Items/EtherealFeather.cs +++ b/Items/EtherealFeather.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows you to fall slowly"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.slowFall = true; diff --git a/Items/EverscreamMask.cs b/Items/EverscreamMask.cs index 72d5bef2..145792e6 100644 --- a/Items/EverscreamMask.cs +++ b/Items/EverscreamMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class EverscreamMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/EvershinyBar.cs b/Items/EvershinyBar.cs index 25d3d259..612ac612 100644 --- a/Items/EvershinyBar.cs +++ b/Items/EvershinyBar.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/EvilCornBag.cs b/Items/EvilCornBag.cs index b70db81d..adc588ba 100644 --- a/Items/EvilCornBag.cs +++ b/Items/EvilCornBag.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("{$CommonItemTooltip.RightClickToOpen}"); } - public override bool CanRightClick() { return true; diff --git a/Items/EvilCornMask.cs b/Items/EvilCornMask.cs index 8abd8204..1b1ee0b1 100644 --- a/Items/EvilCornMask.cs +++ b/Items/EvilCornMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class EvilCornMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/EvilCup.cs b/Items/EvilCup.cs index 17ad4fae..31374309 100644 --- a/Items/EvilCup.cs +++ b/Items/EvilCup.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases monsters spawn rate"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.enemySpawns = true; diff --git a/Items/ExecutionerAxe.cs b/Items/ExecutionerAxe.cs index 70be13a1..9724ceb9 100644 --- a/Items/ExecutionerAxe.cs +++ b/Items/ExecutionerAxe.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(39, 120); diff --git a/Items/ExtendedBoomFlask.cs b/Items/ExtendedBoomFlask.cs index 320dbcfd..50656375 100644 --- a/Items/ExtendedBoomFlask.cs +++ b/Items/ExtendedBoomFlask.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("A vial of exploding chemicals"); } - public override void UpdateInventory(Player player) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("LongFuseBuff"))) diff --git a/Items/ExtendedBurningFlask.cs b/Items/ExtendedBurningFlask.cs index 66f88787..cac18827 100644 --- a/Items/ExtendedBurningFlask.cs +++ b/Items/ExtendedBurningFlask.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.rare = 1; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and burn them"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("FieryCloudPro"); diff --git a/Items/ExtendedFreezeFlask.cs b/Items/ExtendedFreezeFlask.cs index e75fa31e..cda454e3 100644 --- a/Items/ExtendedFreezeFlask.cs +++ b/Items/ExtendedFreezeFlask.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.rare = 1; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -38,13 +37,11 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and freeze them"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("FrostCloudPro"); } - public override void UpdateInventory(Player player) { MPlayer modPlayer = player.GetModPlayer(mod); diff --git a/Items/ExtraterrestrialRubies.cs b/Items/ExtraterrestrialRubies.cs index 6a9e1dc6..62fc5a63 100644 --- a/Items/ExtraterrestrialRubies.cs +++ b/Items/ExtraterrestrialRubies.cs @@ -21,13 +21,11 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum life by 100\nGreatly increases life regeneration"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.statLifeMax2 += 100; player.lifeRegen = +20; } - } } diff --git a/Items/EyeMonolith.cs b/Items/EyeMonolith.cs index 9b8046ae..35c9c925 100644 --- a/Items/EyeMonolith.cs +++ b/Items/EyeMonolith.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased minion damage if placed"); } - } } diff --git a/Items/EyeofOblivion.cs b/Items/EyeofOblivion.cs index 63ea5219..217f6dd2 100644 --- a/Items/EyeofOblivion.cs +++ b/Items/EyeofOblivion.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/FashionableHat.cs b/Items/FashionableHat.cs index 649a34d5..e7a501d7 100644 --- a/Items/FashionableHat.cs +++ b/Items/FashionableHat.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class FashionableHat : ModItem { - public override void SetDefaults() { @@ -23,6 +22,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/FaultyRedSteelShield.cs b/Items/FaultyRedSteelShield.cs index a0636a88..79f5c9fc 100644 --- a/Items/FaultyRedSteelShield.cs +++ b/Items/FaultyRedSteelShield.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/FeatherStorm.cs b/Items/FeatherStorm.cs index da5b6cf7..546cefe5 100644 --- a/Items/FeatherStorm.cs +++ b/Items/FeatherStorm.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) diff --git a/Items/FiercePaw.cs b/Items/FiercePaw.cs index 22835fac..4378dc36 100644 --- a/Items/FiercePaw.cs +++ b/Items/FiercePaw.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(120, 60); diff --git a/Items/FieryKunai.cs b/Items/FieryKunai.cs index 3bac4786..163dffdd 100644 --- a/Items/FieryKunai.cs +++ b/Items/FieryKunai.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("50% chance to set enemy on fire"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FlamesofDespair.cs b/Items/FlamesofDespair.cs index bd671cd2..2b9459bb 100644 --- a/Items/FlamesofDespair.cs +++ b/Items/FlamesofDespair.cs @@ -39,13 +39,11 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(5, 4)); } - public override Color? GetAlpha(Color lightColor) { return Color.Yellow; } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/FlamingTooth.cs b/Items/FlamingTooth.cs index 9383a5d7..7f0f1056 100644 --- a/Items/FlamingTooth.cs +++ b/Items/FlamingTooth.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(24, 60); diff --git a/Items/FlaskCore.cs b/Items/FlaskCore.cs index 19d42419..4b1cd6d0 100644 --- a/Items/FlaskCore.cs +++ b/Items/FlaskCore.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Flasks now have autoreuse"); } - public override void UpdateAccessory(Player player, bool hideVisual) { MPlayer modPlayer = (MPlayer)player.GetModPlayer(mod, "MPlayer"); diff --git a/Items/FleshBreastplate.cs b/Items/FleshBreastplate.cs index 8269c874..ed42d1d6 100644 --- a/Items/FleshBreastplate.cs +++ b/Items/FleshBreastplate.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 18000; item.rare = 1; item.defense = 7; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/FleshGreaves.cs b/Items/FleshGreaves.cs index 0aaf03ef..4652b191 100644 --- a/Items/FleshGreaves.cs +++ b/Items/FleshGreaves.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class FleshGreaves : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 18000; item.rare = 1; item.defense = 7; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/FleshHeadgear.cs b/Items/FleshHeadgear.cs index 3326c8e9..f90b7c8c 100644 --- a/Items/FleshHeadgear.cs +++ b/Items/FleshHeadgear.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class FleshHeadgear : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 18000; item.rare = 1; item.defense = 7; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("9% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.09f; diff --git a/Items/FleshHelmet.cs b/Items/FleshHelmet.cs index 876a685d..2c0a37cd 100644 --- a/Items/FleshHelmet.cs +++ b/Items/FleshHelmet.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class FleshHelmet : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 18000; item.rare = 1; item.defense = 7; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/FleshWings.cs b/Items/FleshWings.cs index bc26cf68..972ebdc7 100644 --- a/Items/FleshWings.cs +++ b/Items/FleshWings.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The wings of skin and teeth."); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 120; diff --git a/Items/FleshWorkstation.cs b/Items/FleshWorkstation.cs index ccc28e19..83edfc60 100644 --- a/Items/FleshWorkstation.cs +++ b/Items/FleshWorkstation.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FlowerofAntimony.cs b/Items/FlowerofAntimony.cs index 87b9a0b6..e74e5fcf 100644 --- a/Items/FlowerofAntimony.cs +++ b/Items/FlowerofAntimony.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ForkFish.cs b/Items/ForkFish.cs index a074a49a..150fe2ee 100644 --- a/Items/ForkFish.cs +++ b/Items/ForkFish.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/FreezeFlask.cs b/Items/FreezeFlask.cs index b90a840a..1d4a616f 100644 --- a/Items/FreezeFlask.cs +++ b/Items/FreezeFlask.cs @@ -27,7 +27,6 @@ public override void SetDefaults() item.rare = 1; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and freeze them"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("FrostCloudPro"); diff --git a/Items/FrostCore.cs b/Items/FrostCore.cs index 791693f5..868a23b0 100644 --- a/Items/FrostCore.cs +++ b/Items/FrostCore.cs @@ -20,7 +20,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FrostCrown.cs b/Items/FrostCrown.cs index 89bfea27..7ee33732 100644 --- a/Items/FrostCrown.cs +++ b/Items/FrostCrown.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Frost King"); } - public override bool CanUseItem(Player player) { return NPC.downedMechBossAny && !NPC.AnyNPCs(mod.NPCType("FrostKing")) && player.ZoneSnow; diff --git a/Items/FrostKingBag.cs b/Items/FrostKingBag.cs index 541ef22d..5106d374 100644 --- a/Items/FrostKingBag.cs +++ b/Items/FrostKingBag.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("{$CommonItemTooltip.RightClickToOpen}"); } - public override bool CanRightClick() { return true; diff --git a/Items/FrostKingMask.cs b/Items/FrostKingMask.cs index fe5897f2..07bb9508 100644 --- a/Items/FrostKingMask.cs +++ b/Items/FrostKingMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class FrostKingMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/Frostammer.cs b/Items/Frostammer.cs index f778fa3c..32810929 100644 --- a/Items/Frostammer.cs +++ b/Items/Frostammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); @@ -39,9 +38,6 @@ public override void AddRecipes() recipe.AddRecipe(); } - } } - - diff --git a/Items/FrostbiteChestplate.cs b/Items/FrostbiteChestplate.cs index 395a0b9f..eb6cf25e 100644 --- a/Items/FrostbiteChestplate.cs +++ b/Items/FrostbiteChestplate.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FrostbiteGreaves.cs b/Items/FrostbiteGreaves.cs index 133f35f2..f4139a0e 100644 --- a/Items/FrostbiteGreaves.cs +++ b/Items/FrostbiteGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class FrostbiteGreaves : ModItem { - public override void SetDefaults() { @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FrostbiteHelmet.cs b/Items/FrostbiteHelmet.cs index 7bd3471a..8c959876 100644 --- a/Items/FrostbiteHelmet.cs +++ b/Items/FrostbiteHelmet.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class FrostbiteHelmet : ModItem { - - public override void SetDefaults() { @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("FrostbiteChestplate") && legs.type == mod.ItemType("FrostbiteGreaves"); diff --git a/Items/Frostbiter.cs b/Items/Frostbiter.cs index 87e3060e..e6e6f3a5 100644 --- a/Items/Frostbiter.cs +++ b/Items/Frostbiter.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); @@ -48,8 +47,6 @@ public override void AddRecipes() recipe.AddRecipe(); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { int ShotAmt = 2; @@ -73,8 +70,6 @@ public override bool Shoot(Player player, ref Vector2 position, ref float speedX Projectile.NewProjectile(vector2.X, vector2.Y, vX, vY, 118, damage, knockBack, Main.myPlayer); - - } return false; } diff --git a/Items/FrostbittenBall.cs b/Items/FrostbittenBall.cs index ae46fe1b..a7d3db87 100644 --- a/Items/FrostbittenBall.cs +++ b/Items/FrostbittenBall.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FrostoneBar.cs b/Items/FrostoneBar.cs index bee3a4d5..0202ffeb 100644 --- a/Items/FrostoneBar.cs +++ b/Items/FrostoneBar.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FrostoneOre.cs b/Items/FrostoneOre.cs index 9478afa1..18a4358c 100644 --- a/Items/FrostoneOre.cs +++ b/Items/FrostoneOre.cs @@ -26,6 +26,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/FrostsparkStompers.cs b/Items/FrostsparkStompers.cs index 0fc3f0d3..33dd1ab7 100644 --- a/Items/FrostsparkStompers.cs +++ b/Items/FrostsparkStompers.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.value = 110000; item.rare = 3; - item.accessory = true; } @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases movement speed by 10% and increases knockback effect\nAllows flight, super fast running, and extra mobility on ice"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/FrozenTurtleShield.cs b/Items/FrozenTurtleShield.cs index 5d233cf7..7f62caec 100644 --- a/Items/FrozenTurtleShield.cs +++ b/Items/FrozenTurtleShield.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.value = 123110; item.rare = 8; - item.accessory = true; } @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less health, the more defense\nGrants 25% damage reduction"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/FungalTome.cs b/Items/FungalTome.cs index a1e7f746..755dd5e0 100644 --- a/Items/FungalTome.cs +++ b/Items/FungalTome.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FungusBeetleMask.cs b/Items/FungusBeetleMask.cs index ed55c93b..0f7d2624 100644 --- a/Items/FungusBeetleMask.cs +++ b/Items/FungusBeetleMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class FungusBeetleMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/FungusBreastplate.cs b/Items/FungusBreastplate.cs index 49d5e70d..f020b5dc 100644 --- a/Items/FungusBreastplate.cs +++ b/Items/FungusBreastplate.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("13% increased all damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.13f; diff --git a/Items/FungusBroadsword.cs b/Items/FungusBroadsword.cs index 382ef454..64e29c9d 100644 --- a/Items/FungusBroadsword.cs +++ b/Items/FungusBroadsword.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Fungus Broadsword"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FungusGreaves.cs b/Items/FungusGreaves.cs index 2172fdd1..035fe163 100644 --- a/Items/FungusGreaves.cs +++ b/Items/FungusGreaves.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void UpdateEquip(Player player) { } diff --git a/Items/FungusHamaxe.cs b/Items/FungusHamaxe.cs index 4429d2a7..fada088a 100644 --- a/Items/FungusHamaxe.cs +++ b/Items/FungusHamaxe.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FungusHelmet.cs b/Items/FungusHelmet.cs index 30b4638c..60d162d9 100644 --- a/Items/FungusHelmet.cs +++ b/Items/FungusHelmet.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void UpdateEquip(Player player) { } diff --git a/Items/FungusPickaxe.cs b/Items/FungusPickaxe.cs index dad964a9..2ce1df48 100644 --- a/Items/FungusPickaxe.cs +++ b/Items/FungusPickaxe.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FungusSpear.cs b/Items/FungusSpear.cs index 4b52795d..ca5d3161 100644 --- a/Items/FungusSpear.cs +++ b/Items/FungusSpear.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Has a chance to inflict confusion on enemies"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/FurHat.cs b/Items/FurHat.cs index 31a51a11..4dab5aef 100644 --- a/Items/FurHat.cs +++ b/Items/FurHat.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class FurHat : ModItem { - - public override void SetDefaults() { diff --git a/Items/Galaxon.cs b/Items/Galaxon.cs index 2059ed0d..9aef4974 100644 --- a/Items/Galaxon.cs +++ b/Items/Galaxon.cs @@ -37,13 +37,11 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots a cosmic beam"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { int i = Main.myPlayer; @@ -115,7 +113,6 @@ public override bool Shoot(Player player, ref Vector2 position, ref float speedX return Vector2.Zero; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GarnetGlove.cs b/Items/GarnetGlove.cs index b7037b4f..3d7c0397 100644 --- a/Items/GarnetGlove.cs +++ b/Items/GarnetGlove.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Made of love'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GehennaStaff.cs b/Items/GehennaStaff.cs index 77c046a0..9285bb9b 100644 --- a/Items/GehennaStaff.cs +++ b/Items/GehennaStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a controllable inferno rift that rapidly shoots molten bolts at nearby enemies"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { player.channel = true; diff --git a/Items/GelCube.cs b/Items/GelCube.cs index f80873dc..4254025d 100644 --- a/Items/GelCube.cs +++ b/Items/GelCube.cs @@ -22,8 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemically important ingredient"); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GenieLamp.cs b/Items/GenieLamp.cs index 5c9475f2..7ccff019 100644 --- a/Items/GenieLamp.cs +++ b/Items/GenieLamp.cs @@ -9,7 +9,6 @@ public class GenieLamp : ModItem public override void SetDefaults() { - item.width = 38; item.height = 20; item.useTime = 20; @@ -27,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a Genie"); } - public override bool UseItem(Player player) { player.AddBuff(mod.BuffType("petGenie"), 2); diff --git a/Items/GhostlyHowl.cs b/Items/GhostlyHowl.cs index a09881d6..bd9d7613 100644 --- a/Items/GhostlyHowl.cs +++ b/Items/GhostlyHowl.cs @@ -35,8 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots the ghostly arrows"); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { int i = Main.myPlayer; diff --git a/Items/GiantShell.cs b/Items/GiantShell.cs index 7ab6db4d..0691078e 100644 --- a/Items/GiantShell.cs +++ b/Items/GiantShell.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/GlassDoor.cs b/Items/GlassDoor.cs index 92bd2a96..ea7e8f0b 100644 --- a/Items/GlassDoor.cs +++ b/Items/GlassDoor.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Glass Door"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GlassFish.cs b/Items/GlassFish.cs index 844dd78f..fca480c0 100644 --- a/Items/GlassFish.cs +++ b/Items/GlassFish.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/GlobalItems.cs b/Items/GlobalItems.cs index 227ebeaf..e857e94d 100644 --- a/Items/GlobalItems.cs +++ b/Items/GlobalItems.cs @@ -68,7 +68,6 @@ public override void OpenVanillaBag(string context, Player player, int arg) player.QuickSpawnItem(mod.ItemType("MechaSprayer")); } - // Dev. Items if (Main.hardMode && context == "bossBag" && Main.rand.Next(30) == 0) diff --git a/Items/Gloomstone.cs b/Items/Gloomstone.cs index b57208b3..73511ba5 100644 --- a/Items/Gloomstone.cs +++ b/Items/Gloomstone.cs @@ -27,8 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneBathtub.cs b/Items/GloomstoneBathtub.cs index 521071a0..e2e56bf0 100644 --- a/Items/GloomstoneBathtub.cs +++ b/Items/GloomstoneBathtub.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneBed.cs b/Items/GloomstoneBed.cs index 7a4276df..d9042a0c 100644 --- a/Items/GloomstoneBed.cs +++ b/Items/GloomstoneBed.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneBench.cs b/Items/GloomstoneBench.cs index ad15ece9..6bf2ae69 100644 --- a/Items/GloomstoneBench.cs +++ b/Items/GloomstoneBench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneBrick.cs b/Items/GloomstoneBrick.cs index 48c52457..211d9fd1 100644 --- a/Items/GloomstoneBrick.cs +++ b/Items/GloomstoneBrick.cs @@ -27,8 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneBrickWall.cs b/Items/GloomstoneBrickWall.cs index 6bb26a02..d22f77ec 100644 --- a/Items/GloomstoneBrickWall.cs +++ b/Items/GloomstoneBrickWall.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneCandelabra.cs b/Items/GloomstoneCandelabra.cs index f7f895cf..43632dfa 100644 --- a/Items/GloomstoneCandelabra.cs +++ b/Items/GloomstoneCandelabra.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneCandle.cs b/Items/GloomstoneCandle.cs index 48290dbf..f2962c72 100644 --- a/Items/GloomstoneCandle.cs +++ b/Items/GloomstoneCandle.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneChair.cs b/Items/GloomstoneChair.cs index 04270cf0..bfde1467 100644 --- a/Items/GloomstoneChair.cs +++ b/Items/GloomstoneChair.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneChandelier.cs b/Items/GloomstoneChandelier.cs index 381bcb80..732f2539 100644 --- a/Items/GloomstoneChandelier.cs +++ b/Items/GloomstoneChandelier.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneChest.cs b/Items/GloomstoneChest.cs index 8e619897..413acbca 100644 --- a/Items/GloomstoneChest.cs +++ b/Items/GloomstoneChest.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneDoor.cs b/Items/GloomstoneDoor.cs index d9f43513..73dd6fd4 100644 --- a/Items/GloomstoneDoor.cs +++ b/Items/GloomstoneDoor.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneDresser.cs b/Items/GloomstoneDresser.cs index 22c3cbea..ef87e63a 100644 --- a/Items/GloomstoneDresser.cs +++ b/Items/GloomstoneDresser.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneGrandfatherClock.cs b/Items/GloomstoneGrandfatherClock.cs index adbd745a..25728f95 100644 --- a/Items/GloomstoneGrandfatherClock.cs +++ b/Items/GloomstoneGrandfatherClock.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneLamp.cs b/Items/GloomstoneLamp.cs index 94b9748a..9c6edda6 100644 --- a/Items/GloomstoneLamp.cs +++ b/Items/GloomstoneLamp.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneLantern.cs b/Items/GloomstoneLantern.cs index d0f4b4cf..e4cffc04 100644 --- a/Items/GloomstoneLantern.cs +++ b/Items/GloomstoneLantern.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstonePiano.cs b/Items/GloomstonePiano.cs index 5f876774..6a1d11d4 100644 --- a/Items/GloomstonePiano.cs +++ b/Items/GloomstonePiano.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstonePlatform.cs b/Items/GloomstonePlatform.cs index 7dc47d72..1cf5ca16 100644 --- a/Items/GloomstonePlatform.cs +++ b/Items/GloomstonePlatform.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneSink.cs b/Items/GloomstoneSink.cs index 965197ed..1eec6e3d 100644 --- a/Items/GloomstoneSink.cs +++ b/Items/GloomstoneSink.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneTable.cs b/Items/GloomstoneTable.cs index f87f4fe6..3b1809c8 100644 --- a/Items/GloomstoneTable.cs +++ b/Items/GloomstoneTable.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneWall.cs b/Items/GloomstoneWall.cs index a23cee88..00dd8d97 100644 --- a/Items/GloomstoneWall.cs +++ b/Items/GloomstoneWall.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GloomstoneWorkbench.cs b/Items/GloomstoneWorkbench.cs index d2dbc69a..b66110d5 100644 --- a/Items/GloomstoneWorkbench.cs +++ b/Items/GloomstoneWorkbench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GlowingRod.cs b/Items/GlowingRod.cs index b83cc884..17e3d9b9 100644 --- a/Items/GlowingRod.cs +++ b/Items/GlowingRod.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GoldFlask.cs b/Items/GoldFlask.cs index 0e89fac1..e521df01 100644 --- a/Items/GoldFlask.cs +++ b/Items/GoldFlask.cs @@ -27,7 +27,6 @@ public override void SetDefaults() item.rare = 1; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds increase the amount of coins that drop from monsters"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("GoldenCloudPro"); diff --git a/Items/GoldGlobe.cs b/Items/GoldGlobe.cs index c948e52e..88a66c84 100644 --- a/Items/GoldGlobe.cs +++ b/Items/GoldGlobe.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GoldKunai.cs b/Items/GoldKunai.cs index ae5c613a..3554905a 100644 --- a/Items/GoldKunai.cs +++ b/Items/GoldKunai.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GoldSpear.cs b/Items/GoldSpear.cs index 3296ba74..bdedce3d 100644 --- a/Items/GoldSpear.cs +++ b/Items/GoldSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GoldenCube.cs b/Items/GoldenCube.cs index 88accc57..b27c9017 100644 --- a/Items/GoldenCube.cs +++ b/Items/GoldenCube.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons an golden whale"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/GoldenDust.cs b/Items/GoldenDust.cs index 686eeb69..2d43fe94 100644 --- a/Items/GoldenDust.cs +++ b/Items/GoldenDust.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void UpdateAccessory(Player player, bool hideVisual) { if (Math.Abs(player.velocity.X) + Math.Abs(player.velocity.Y) > 1f && !player.rocketFrame) // Makes sure the player is actually moving diff --git a/Items/GoldenGlowingRing.cs b/Items/GoldenGlowingRing.cs index c8f2e989..bdd806de 100644 --- a/Items/GoldenGlowingRing.cs +++ b/Items/GoldenGlowingRing.cs @@ -11,7 +11,6 @@ public override void SetDefaults() item.width = 22; item.height = 44; - item.value = 10000; item.rare = 11; item.expert = true; @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons two blades to protect you\nBlue has a chance to inflict confusion on enemy, yellow can inflict midas."); } - public override void UpdateEquip(Player player) { player.AddBuff(mod.BuffType("GoldenGlowingRingBuff"), 2); diff --git a/Items/GoldenHat.cs b/Items/GoldenHat.cs index d637952b..483034db 100644 --- a/Items/GoldenHat.cs +++ b/Items/GoldenHat.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 26; item.height = 22; - item.value = 30000; item.rare = 2; item.defense = 3; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% decreased magic damage\nIncreases magic critical strike chance by 6%"); } - public override void UpdateEquip(Player player) { player.magicDamage -= 0.05f; diff --git a/Items/GoldenMace.cs b/Items/GoldenMace.cs index bac7bf08..08eb987b 100644 --- a/Items/GoldenMace.cs +++ b/Items/GoldenMace.cs @@ -32,13 +32,10 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 246); } - } } diff --git a/Items/GoldenRobe.cs b/Items/GoldenRobe.cs index 2e0ae2cc..b3223c7e 100644 --- a/Items/GoldenRobe.cs +++ b/Items/GoldenRobe.cs @@ -12,7 +12,6 @@ public override void SetDefaults() item.width = 250; - item.height = 28; item.value = 35000; item.rare = 2; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% decreased magic damage\nIncreases maximum mana by 40"); } - public override void UpdateEquip(Player player) { player.magicDamage -= 0.05f; diff --git a/Items/GoldenStar.cs b/Items/GoldenStar.cs index 118b26a5..a82f83e6 100644 --- a/Items/GoldenStar.cs +++ b/Items/GoldenStar.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.height = 38; item.value = 12500; - item.rare = 9; item.expert = true; item.accessory = true; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less health, the more alchemical damage\n'Rare alchemical artifact'"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/GoldfishStaff.cs b/Items/GoldfishStaff.cs index 75738d0b..c7e33b37 100644 --- a/Items/GoldfishStaff.cs +++ b/Items/GoldfishStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Causes goldfishes to fall from the sky"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("GoldFishPro"); @@ -53,7 +52,6 @@ public override void AddRecipes() recipe.SetResult(this); recipe.AddRecipe(); - recipe = new ModRecipe(mod); recipe.AddIngredient(ItemID.Wood, 16); recipe.AddIngredient(ItemID.LeadBar, 6); diff --git a/Items/GolemCore.cs b/Items/GolemCore.cs index 38e4fda6..abedad01 100644 --- a/Items/GolemCore.cs +++ b/Items/GolemCore.cs @@ -24,6 +24,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The ancient and mysterious mechanism"); } - } } diff --git a/Items/GraniteChestplate.cs b/Items/GraniteChestplate.cs index 1a657d06..c4b44f20 100644 --- a/Items/GraniteChestplate.cs +++ b/Items/GraniteChestplate.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GraniteGreaves.cs b/Items/GraniteGreaves.cs index 4b071dbc..d13f4378 100644 --- a/Items/GraniteGreaves.cs +++ b/Items/GraniteGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class GraniteGreaves : ModItem { - public override void SetDefaults() { diff --git a/Items/GraniteHelmet.cs b/Items/GraniteHelmet.cs index 36020012..939539dc 100644 --- a/Items/GraniteHelmet.cs +++ b/Items/GraniteHelmet.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class GraniteHelmet : ModItem { - public override void SetDefaults() { diff --git a/Items/GrassGlavie.cs b/Items/GrassGlavie.cs index 3306f268..a9620694 100644 --- a/Items/GrassGlavie.cs +++ b/Items/GrassGlavie.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GreatAnvil.cs b/Items/GreatAnvil.cs index ef3bb12f..1a10e491 100644 --- a/Items/GreatAnvil.cs +++ b/Items/GreatAnvil.cs @@ -27,6 +27,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows to produce heavy weapons"); } - } } diff --git a/Items/GreenCrossguardPhasesaber.cs b/Items/GreenCrossguardPhasesaber.cs index 583e24f7..2350e1d3 100644 --- a/Items/GreenCrossguardPhasesaber.cs +++ b/Items/GreenCrossguardPhasesaber.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 61); diff --git a/Items/GreenKnightBreastplate.cs b/Items/GreenKnightBreastplate.cs index c8dfcb82..9f74bf8e 100644 --- a/Items/GreenKnightBreastplate.cs +++ b/Items/GreenKnightBreastplate.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GreenKnightHelmet.cs b/Items/GreenKnightHelmet.cs index 5411d380..47c30fe2 100644 --- a/Items/GreenKnightHelmet.cs +++ b/Items/GreenKnightHelmet.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GreenPuzzleFragment.cs b/Items/GreenPuzzleFragment.cs index 8c10661a..3652af1a 100644 --- a/Items/GreenPuzzleFragment.cs +++ b/Items/GreenPuzzleFragment.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/GrossBow.cs b/Items/GrossBow.cs index 6f90d534..41007d89 100644 --- a/Items/GrossBow.cs +++ b/Items/GrossBow.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("DemonEyePro"); diff --git a/Items/GuardianBreastplate.cs b/Items/GuardianBreastplate.cs index 5bb99fac..5f68e465 100644 --- a/Items/GuardianBreastplate.cs +++ b/Items/GuardianBreastplate.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GuardianGreaves.cs b/Items/GuardianGreaves.cs index a29e1cc9..0f9748d4 100644 --- a/Items/GuardianGreaves.cs +++ b/Items/GuardianGreaves.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class GuardianGreaves : ModItem { - public override void SetDefaults() { @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GuardianHammer.cs b/Items/GuardianHammer.cs index d9a5c98e..960cfa0a 100644 --- a/Items/GuardianHammer.cs +++ b/Items/GuardianHammer.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/GuardianHelmet.cs b/Items/GuardianHelmet.cs index ed5b7fb0..b50a0e35 100644 --- a/Items/GuardianHelmet.cs +++ b/Items/GuardianHelmet.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("GuardianBreastplate") && legs.type == mod.ItemType("GuardianGreaves"); @@ -40,7 +39,6 @@ public override void ArmorSetShadows(Player player) player.armorEffectDrawShadowLokis = true; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/GunslingerFocus.cs b/Items/GunslingerFocus.cs index e43c96c5..a3c1cdbf 100644 --- a/Items/GunslingerFocus.cs +++ b/Items/GunslingerFocus.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 2; item.accessory = true; item.value = 50000; @@ -27,7 +26,6 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(6, 4)); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.rangedDamage += 0.06f; diff --git a/Items/GunslingerSoul.cs b/Items/GunslingerSoul.cs index 2c68b609..e1e3b599 100644 --- a/Items/GunslingerSoul.cs +++ b/Items/GunslingerSoul.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 3; item.accessory = true; item.value = 100000; diff --git a/Items/GunslingerSpark.cs b/Items/GunslingerSpark.cs index 25a431e0..6fca4b39 100644 --- a/Items/GunslingerSpark.cs +++ b/Items/GunslingerSpark.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 1; item.accessory = true; item.value = 20000; @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(6, 4)); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.rangedDamage += 0.03f; diff --git a/Items/HadesBreastplate.cs b/Items/HadesBreastplate.cs index 92f20361..93269b1b 100644 --- a/Items/HadesBreastplate.cs +++ b/Items/HadesBreastplate.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum life by 50\nIncreases defense when under 100 health\n45% increased all damage"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HadesGreaves.cs b/Items/HadesGreaves.cs index ec6da264..c2fc661a 100644 --- a/Items/HadesGreaves.cs +++ b/Items/HadesGreaves.cs @@ -10,7 +10,6 @@ namespace Tremor.Items public class HadesGreaves : ModItem { - public override void SetDefaults() { @@ -28,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases movement speed\nAllows to dash\nDouble tap a direction\nAllows you to walk on liquids"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HadesHelmet.cs b/Items/HadesHelmet.cs index 0c5a8310..c86f79ab 100644 --- a/Items/HadesHelmet.cs +++ b/Items/HadesHelmet.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Melee attacks inflict fire damage\n30% decreased mana cost\nIncreases maximum life by 150"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HallowedHat.cs b/Items/HallowedHat.cs index 080d0480..8d0db1a7 100644 --- a/Items/HallowedHat.cs +++ b/Items/HallowedHat.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class HallowedHat : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 25%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.25f; diff --git a/Items/HallowedHeader.cs b/Items/HallowedHeader.cs index 3073d456..40aea0b8 100644 --- a/Items/HallowedHeader.cs +++ b/Items/HallowedHeader.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class HallowedHeader : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases thrown damage by 26%"); } - public override void UpdateEquip(Player player) { player.thrownDamage += 0.26f; diff --git a/Items/HallowedSpray.cs b/Items/HallowedSpray.cs index 1d3d3c99..00bf089a 100644 --- a/Items/HallowedSpray.cs +++ b/Items/HallowedSpray.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HallowedVisage.cs b/Items/HallowedVisage.cs index b835b900..c722656f 100644 --- a/Items/HallowedVisage.cs +++ b/Items/HallowedVisage.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 27%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.27f; diff --git a/Items/HappyTotemMask.cs b/Items/HappyTotemMask.cs index 92c954d9..e2e8d424 100644 --- a/Items/HappyTotemMask.cs +++ b/Items/HappyTotemMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class HappyTotemMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/HardBulwark.cs b/Items/HardBulwark.cs index 27719a48..ec6394ec 100644 --- a/Items/HardBulwark.cs +++ b/Items/HardBulwark.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HarpyChestplate.cs b/Items/HarpyChestplate.cs index c1dee5ba..c9b07209 100644 --- a/Items/HarpyChestplate.cs +++ b/Items/HarpyChestplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases jump height"); } - public override void UpdateEquip(Player player) { player.jumpBoost = true; diff --git a/Items/HarpyHelmet.cs b/Items/HarpyHelmet.cs index 6422300f..69b30ca4 100644 --- a/Items/HarpyHelmet.cs +++ b/Items/HarpyHelmet.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class HarpyHelmet : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.1f; diff --git a/Items/HarpyHood.cs b/Items/HarpyHood.cs index d49f6746..8ac58fe1 100644 --- a/Items/HarpyHood.cs +++ b/Items/HarpyHood.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class HarpyHood : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased magic damage"); } - public override void UpdateEquip(Player player) { player.magicDamage += 0.1f; diff --git a/Items/HarpyLeggings.cs b/Items/HarpyLeggings.cs index 171faad9..2607118e 100644 --- a/Items/HarpyLeggings.cs +++ b/Items/HarpyLeggings.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class HarpyLeggings : ModItem { - public override void SetDefaults() { @@ -26,13 +25,11 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.10f; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HarpyMask.cs b/Items/HarpyMask.cs index 2464264d..86ecf681 100644 --- a/Items/HarpyMask.cs +++ b/Items/HarpyMask.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class HarpyMask : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased ranged damage"); } - public override void UpdateEquip(Player player) { player.rangedDamage += 0.1f; diff --git a/Items/HarvesterScythe.cs b/Items/HarvesterScythe.cs index 903326b0..4e5dbce3 100644 --- a/Items/HarvesterScythe.cs +++ b/Items/HarvesterScythe.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { int newLife = Main.rand.Next(damage / 4) + 3; diff --git a/Items/HazardousChemicals.cs b/Items/HazardousChemicals.cs index cee43797..6ef2badb 100644 --- a/Items/HazardousChemicals.cs +++ b/Items/HazardousChemicals.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 5%"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.GetModPlayer(mod).alchemicalDamage += 0.05f; diff --git a/Items/HealthBooster.cs b/Items/HealthBooster.cs index ffdef0e6..3e5a9335 100644 --- a/Items/HealthBooster.cs +++ b/Items/HealthBooster.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Regenerates health every minute"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/HealthSupportFlask.cs b/Items/HealthSupportFlask.cs index 654c8f20..1db1a454 100644 --- a/Items/HealthSupportFlask.cs +++ b/Items/HealthSupportFlask.cs @@ -26,7 +26,6 @@ public override void SetDefaults() item.rare = 2; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -36,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds heal your allies"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("HealthSupportCloudPro"); diff --git a/Items/HeartAmulet.cs b/Items/HeartAmulet.cs index 5f816214..894b74e5 100644 --- a/Items/HeartAmulet.cs +++ b/Items/HeartAmulet.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("You respawn with 80% of maximum health after death"); } - public override void UpdateAccessory(Player player, bool hideVisual) { TremorPlayer modPlayer = (TremorPlayer)player.GetModPlayer(mod, "TremorPlayer"); diff --git a/Items/HeartMagnet.cs b/Items/HeartMagnet.cs index 2e7ba7c0..35e8acea 100644 --- a/Items/HeartMagnet.cs +++ b/Items/HeartMagnet.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increased heart pickup range"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.lifeMagnet = true; diff --git a/Items/HeartofAtis.cs b/Items/HeartofAtis.cs index 8e6a7ad2..262ab4dd 100644 --- a/Items/HeartofAtis.cs +++ b/Items/HeartofAtis.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.lifeRegen += 1; diff --git a/Items/HeatCore.cs b/Items/HeatCore.cs index 823203b5..6a3c851b 100644 --- a/Items/HeatCore.cs +++ b/Items/HeatCore.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots rays at nearby enemies"); } - public override void UpdateAccessory(Player player, bool hideVisual) { if (--TimeToShoot <= 0) diff --git a/Items/HeaterOfWorldsMask.cs b/Items/HeaterOfWorldsMask.cs index 32417560..80014bb0 100644 --- a/Items/HeaterOfWorldsMask.cs +++ b/Items/HeaterOfWorldsMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class HeaterOfWorldsMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/HeavenBreastplate.cs b/Items/HeavenBreastplate.cs index 23c4bb44..a26a92f1 100644 --- a/Items/HeavenBreastplate.cs +++ b/Items/HeavenBreastplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("12% increased ranged damage"); } - public override void UpdateEquip(Player player) { player.rangedDamage += 0.12f; diff --git a/Items/HeavenHelmet.cs b/Items/HeavenHelmet.cs index 1a8fbc25..4ad81edd 100644 --- a/Items/HeavenHelmet.cs +++ b/Items/HeavenHelmet.cs @@ -7,9 +7,6 @@ namespace Tremor.Items public class HeavenHelmet : ModItem { - - - public override void SetDefaults() { @@ -27,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases ranged critical strike chance by 12"); } - public override void UpdateEquip(Player player) { player.rangedCrit += 12; diff --git a/Items/HeavenLeggings.cs b/Items/HeavenLeggings.cs index 9665b482..4e23e04d 100644 --- a/Items/HeavenLeggings.cs +++ b/Items/HeavenLeggings.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class HeavenLeggings : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% decreased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed -= 0.15f; diff --git a/Items/HeavyBeamCannon.cs b/Items/HeavyBeamCannon.cs index 65a691ca..de0cee32 100644 --- a/Items/HeavyBeamCannon.cs +++ b/Items/HeavyBeamCannon.cs @@ -36,8 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Fires a constant powerful beam"); } - - public override Vector2? HoldoutOffset() { return new Vector2(0, -1); diff --git a/Items/HeavyNecklace.cs b/Items/HeavyNecklace.cs index 9d4bafe4..83891e26 100644 --- a/Items/HeavyNecklace.cs +++ b/Items/HeavyNecklace.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased all damage"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/HellStorm.cs b/Items/HellStorm.cs index f99842af..eaf29aca 100644 --- a/Items/HellStorm.cs +++ b/Items/HellStorm.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.shoot = mod.ProjectileType("HellStormProj"); item.shootSpeed = 20f; - item.useAmmo = AmmoID.Arrow; } @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots out homing hell arrows\nThe amount of arrows shot increases when used for longer time"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/HeroPotion.cs b/Items/HeroPotion.cs index 519c06f1..b5fcc5cf 100644 --- a/Items/HeroPotion.cs +++ b/Items/HeroPotion.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Grants 10000 defense\nGrants immunity to all debuffs\nIncreases movement speed\nMakes you priority target for enemies\n'Feel like a real hero! At least for 15 seconds.'"); } - public override bool UseItem(Player player) { player.AddBuff(mod.BuffType("HeroBuff"), 900); diff --git a/Items/HolyDust.cs b/Items/HolyDust.cs index a8534919..4e858d7e 100644 --- a/Items/HolyDust.cs +++ b/Items/HolyDust.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void UpdateAccessory(Player player, bool hideVisual) { if (Math.Abs(player.velocity.X) + Math.Abs(player.velocity.Y) > 1f && !player.rocketFrame) // Makes sure the player is actually moving diff --git a/Items/HolyJavelin.cs b/Items/HolyJavelin.cs index f46a1262..ab40680e 100644 --- a/Items/HolyJavelin.cs +++ b/Items/HolyJavelin.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HonestBlade.cs b/Items/HonestBlade.cs index 96fd190c..9120df0f 100644 --- a/Items/HonestBlade.cs +++ b/Items/HonestBlade.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/HopeMask.cs b/Items/HopeMask.cs index 08efe348..df93ad93 100644 --- a/Items/HopeMask.cs +++ b/Items/HopeMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class HopeMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/HornedWarHammer.cs b/Items/HornedWarHammer.cs index b5d91ec0..95df508a 100644 --- a/Items/HornedWarHammer.cs +++ b/Items/HornedWarHammer.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Forged from lightning"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("HornedWarhammerPro"); diff --git a/Items/HorrificKnife.cs b/Items/HorrificKnife.cs index 1f4b7724..f1672ace 100644 --- a/Items/HorrificKnife.cs +++ b/Items/HorrificKnife.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HorseMask.cs b/Items/HorseMask.cs index 8cf858b1..6f239c75 100644 --- a/Items/HorseMask.cs +++ b/Items/HorseMask.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class HorseMask : ModItem { - public override void SetDefaults() { @@ -22,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HummerBreastplate.cs b/Items/HummerBreastplate.cs index ff897545..8322fcb8 100644 --- a/Items/HummerBreastplate.cs +++ b/Items/HummerBreastplate.cs @@ -9,7 +9,6 @@ public class HummerBreastplate : ModItem public override void SetDefaults() { - item.width = 34; item.height = 18; item.rare = 9; @@ -21,7 +20,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Great for impersonating devs!'"); } - public override void UpdateEquip(Player player) { if (player.name == "Hummer") diff --git a/Items/HummerGreaves.cs b/Items/HummerGreaves.cs index 1a6007c2..de3070ce 100644 --- a/Items/HummerGreaves.cs +++ b/Items/HummerGreaves.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class HummerGreaves : ModItem { - public override void SetDefaults() { diff --git a/Items/HummerHelmet.cs b/Items/HummerHelmet.cs index 0d0f4603..abf96090 100644 --- a/Items/HummerHelmet.cs +++ b/Items/HummerHelmet.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class HummerHelmet : ModItem { - public override void SetDefaults() { diff --git a/Items/HungryStaff.cs b/Items/HungryStaff.cs index e1e36be1..8e8b8908 100644 --- a/Items/HungryStaff.cs +++ b/Items/HungryStaff.cs @@ -37,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a hungry to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/HunterRevolver.cs b/Items/HunterRevolver.cs index f05db5b4..04a03bfa 100644 --- a/Items/HunterRevolver.cs +++ b/Items/HunterRevolver.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HuntingSpear.cs b/Items/HuntingSpear.cs index 2f9fcc00..7da0fe13 100644 --- a/Items/HuntingSpear.cs +++ b/Items/HuntingSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/HuskofDusk.cs b/Items/HuskofDusk.cs index c2259859..dffd8ae2 100644 --- a/Items/HuskofDusk.cs +++ b/Items/HuskofDusk.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Color? GetAlpha(Color lightColor) { return Color.Purple; diff --git a/Items/HuskyStaff.cs b/Items/HuskyStaff.cs index aa6ca350..fda9e594 100644 --- a/Items/HuskyStaff.cs +++ b/Items/HuskyStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a husky to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/IceBullet.cs b/Items/IceBullet.cs index d72cf947..e43db7ff 100644 --- a/Items/IceBullet.cs +++ b/Items/IceBullet.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("25% chance to inflict frostburn"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/IceHammer.cs b/Items/IceHammer.cs index f01df1e6..37429815 100644 --- a/Items/IceHammer.cs +++ b/Items/IceHammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/IcePickaxe.cs b/Items/IcePickaxe.cs index f94755fb..b255a526 100644 --- a/Items/IcePickaxe.cs +++ b/Items/IcePickaxe.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/IceQueenMask.cs b/Items/IceQueenMask.cs index 7769af7c..71456184 100644 --- a/Items/IceQueenMask.cs +++ b/Items/IceQueenMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class IceQueenMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/IchorBreath.cs b/Items/IchorBreath.cs index 6181e2cd..5dd52255 100644 --- a/Items/IchorBreath.cs +++ b/Items/IchorBreath.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/IchorKnife.cs b/Items/IchorKnife.cs index bafae1b3..7d29a54f 100644 --- a/Items/IchorKnife.cs +++ b/Items/IchorKnife.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(69, 60); diff --git a/Items/Igniter.cs b/Items/Igniter.cs index 207428da..e2c2c4c8 100644 --- a/Items/Igniter.cs +++ b/Items/Igniter.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Incinerator.cs b/Items/Incinerator.cs index 0db1a154..59b4b162 100644 --- a/Items/Incinerator.cs +++ b/Items/Incinerator.cs @@ -37,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. @@ -54,7 +53,6 @@ public override bool ConsumeAmmo(Player p) return Main.rand.Next(2) == 0; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/IndifferentTotemMask.cs b/Items/IndifferentTotemMask.cs index 44d44857..ca2ed800 100644 --- a/Items/IndifferentTotemMask.cs +++ b/Items/IndifferentTotemMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class IndifferentTotemMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/InfernalShield.cs b/Items/InfernalShield.cs index dbd4ebe3..fdb257fa 100644 --- a/Items/InfernalShield.cs +++ b/Items/InfernalShield.cs @@ -18,7 +18,6 @@ public class InfernalShield : ModItem int TimeToShoot = ShootRate; - public override void SetDefaults() { @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Casts fireballs at nearby enemies"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/Infernality.cs b/Items/Infernality.cs index c54468e2..ac3c4770 100644 --- a/Items/Infernality.cs +++ b/Items/Infernality.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'For the glory of Satan of course!'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Inferno.cs b/Items/Inferno.cs index 90bfe3c6..af4437d8 100644 --- a/Items/Inferno.cs +++ b/Items/Inferno.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/InfernoSkull.cs b/Items/InfernoSkull.cs index a96b71a4..32a90e43 100644 --- a/Items/InfernoSkull.cs +++ b/Items/InfernoSkull.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Andas"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/InfernoSoul.cs b/Items/InfernoSoul.cs index eda77c15..63698435 100644 --- a/Items/InfernoSoul.cs +++ b/Items/InfernoSoul.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/Infusion.cs b/Items/Infusion.cs index f9554a15..9784349c 100644 --- a/Items/Infusion.cs +++ b/Items/Infusion.cs @@ -27,6 +27,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Eternal potion"); } - } } diff --git a/Items/InspirationPotion.cs b/Items/InspirationPotion.cs index 3125b546..b78e9d0b 100644 --- a/Items/InspirationPotion.cs +++ b/Items/InspirationPotion.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum mana"); } - public override bool UseItem(Player player) { player.AddBuff(mod.BuffType("MaximumCharge"), 14400); diff --git a/Items/InvarAxe.cs b/Items/InvarAxe.cs index 33388966..a61cd1aa 100644 --- a/Items/InvarAxe.cs +++ b/Items/InvarAxe.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/InvarBar.cs b/Items/InvarBar.cs index cffc56cf..d60f6968 100644 --- a/Items/InvarBar.cs +++ b/Items/InvarBar.cs @@ -20,7 +20,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/InvarBow.cs b/Items/InvarBow.cs index 5fd117fd..28a052b6 100644 --- a/Items/InvarBow.cs +++ b/Items/InvarBow.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/InvarBreastplate.cs b/Items/InvarBreastplate.cs index da806e03..efc1ae6d 100644 --- a/Items/InvarBreastplate.cs +++ b/Items/InvarBreastplate.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/InvarBroadsword.cs b/Items/InvarBroadsword.cs index e9198782..7fda1fdc 100644 --- a/Items/InvarBroadsword.cs +++ b/Items/InvarBroadsword.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/InvarGreaves.cs b/Items/InvarGreaves.cs index 9d0236f3..b3857578 100644 --- a/Items/InvarGreaves.cs +++ b/Items/InvarGreaves.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class InvarGreaves : ModItem { - public override void SetDefaults() { @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/InvarHammer.cs b/Items/InvarHammer.cs index 071e66e6..7c121fee 100644 --- a/Items/InvarHammer.cs +++ b/Items/InvarHammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/InvarHat.cs b/Items/InvarHat.cs index 2d1d1ce9..35cafa93 100644 --- a/Items/InvarHat.cs +++ b/Items/InvarHat.cs @@ -7,8 +7,6 @@ namespace Tremor.Items public class InvarHat : ModItem { - - public override void SetDefaults() { @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased melee speed"); } - public override void UpdateEquip(Player player) { player.meleeSpeed += 0.1f; diff --git a/Items/InvarHeadgear.cs b/Items/InvarHeadgear.cs index 35c81f9e..dec0fabb 100644 --- a/Items/InvarHeadgear.cs +++ b/Items/InvarHeadgear.cs @@ -7,8 +7,6 @@ namespace Tremor.Items public class InvarHeadgear : ModItem { - - public override void SetDefaults() { @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.06f; diff --git a/Items/InvarHelmet.cs b/Items/InvarHelmet.cs index 5bd6c4ed..8714ea27 100644 --- a/Items/InvarHelmet.cs +++ b/Items/InvarHelmet.cs @@ -7,8 +7,6 @@ namespace Tremor.Items public class InvarHelmet : ModItem { - - public override void SetDefaults() { @@ -25,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("InvarBreastplate") && legs.type == mod.ItemType("InvarGreaves"); diff --git a/Items/InvarPickaxe.cs b/Items/InvarPickaxe.cs index 5b283635..4945c2e2 100644 --- a/Items/InvarPickaxe.cs +++ b/Items/InvarPickaxe.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/IronSpear.cs b/Items/IronSpear.cs index 8057f5db..4053ffdf 100644 --- a/Items/IronSpear.cs +++ b/Items/IronSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/JawFish.cs b/Items/JawFish.cs index cc1aa5d9..ad25325b 100644 --- a/Items/JawFish.cs +++ b/Items/JawFish.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/JellyfishStaff.cs b/Items/JellyfishStaff.cs index fffc5e81..41fc6bac 100644 --- a/Items/JellyfishStaff.cs +++ b/Items/JellyfishStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a jellyfish to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/Jellyxir.cs b/Items/Jellyxir.cs index 975553cb..b44c97bf 100644 --- a/Items/Jellyxir.cs +++ b/Items/Jellyxir.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/JungleWrath.cs b/Items/JungleWrath.cs index 10933c82..c461304f 100644 --- a/Items/JungleWrath.cs +++ b/Items/JungleWrath.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased magic and minion damage"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.magicDamage += 0.06f; diff --git a/Items/KeyFish.cs b/Items/KeyFish.cs index a537aab1..5aea7067 100644 --- a/Items/KeyFish.cs +++ b/Items/KeyFish.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/KeyKnife.cs b/Items/KeyKnife.cs index 8e0224b3..8b1ecfef 100644 --- a/Items/KeyKnife.cs +++ b/Items/KeyKnife.cs @@ -30,6 +30,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Half key, half knife, completely awe.. oh.'"); } - } } diff --git a/Items/KeyofOcean.cs b/Items/KeyofOcean.cs index 0fcf366f..6fbdfe31 100644 --- a/Items/KeyofOcean.cs +++ b/Items/KeyofOcean.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Charged with the essence of ocean'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/KeyofSands.cs b/Items/KeyofSands.cs index 1952c9b8..82d93c4b 100644 --- a/Items/KeyofSands.cs +++ b/Items/KeyofSands.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Charged with the essence of sands'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/KeyofTwilight.cs b/Items/KeyofTwilight.cs index 3d86df9d..21223b99 100644 --- a/Items/KeyofTwilight.cs +++ b/Items/KeyofTwilight.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Charged with the essence of jungle grass'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/KingPants.cs b/Items/KingPants.cs index d5e7998a..aabe9d6e 100644 --- a/Items/KingPants.cs +++ b/Items/KingPants.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class KingPants : ModItem { - public override void SetDefaults() { diff --git a/Items/Knife.cs b/Items/Knife.cs index 6a95f70d..c0c3a929 100644 --- a/Items/Knife.cs +++ b/Items/Knife.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/KnightGreaves.cs b/Items/KnightGreaves.cs index a1b7c48f..029173fb 100644 --- a/Items/KnightGreaves.cs +++ b/Items/KnightGreaves.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class KnightGreaves : ModItem { - public override void SetDefaults() { diff --git a/Items/KnightHelmet.cs b/Items/KnightHelmet.cs index 6890cf01..d0b02d81 100644 --- a/Items/KnightHelmet.cs +++ b/Items/KnightHelmet.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class KnightHelmet : ModItem { - public override void SetDefaults() { diff --git a/Items/Kunai.cs b/Items/Kunai.cs index 5a0572fc..cab566b0 100644 --- a/Items/Kunai.cs +++ b/Items/Kunai.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Ladder.cs b/Items/Ladder.cs index ae13b977..e2415c97 100644 --- a/Items/Ladder.cs +++ b/Items/Ladder.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/LasCannon.cs b/Items/LasCannon.cs index 731a2955..d2141158 100644 --- a/Items/LasCannon.cs +++ b/Items/LasCannon.cs @@ -37,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Uses bullets as ammo"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = 440; diff --git a/Items/LaurelWreath.cs b/Items/LaurelWreath.cs index bf5fef03..33b31aef 100644 --- a/Items/LaurelWreath.cs +++ b/Items/LaurelWreath.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class LaurelWreath : ModItem { - public override void SetDefaults() { @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'The latest fashion trend'"); } - public override void DrawHair(ref bool drawHair, ref bool drawAltHair) { drawHair = true; diff --git a/Items/LeadSpear.cs b/Items/LeadSpear.cs index 149b3cd8..b9ee1241 100644 --- a/Items/LeadSpear.cs +++ b/Items/LeadSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/LeafBall.cs b/Items/LeafBall.cs index dec534f4..e5d01c45 100644 --- a/Items/LeafBall.cs +++ b/Items/LeafBall.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Flail from grass and leaves'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/LeatherGreaves.cs b/Items/LeatherGreaves.cs index e55f56aa..129e4bb8 100644 --- a/Items/LeatherGreaves.cs +++ b/Items/LeatherGreaves.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class LeatherGreaves : ModItem { - - public override void SetDefaults() { @@ -24,6 +22,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/LeatherHat.cs b/Items/LeatherHat.cs index 9e44a9d8..c795c0a1 100644 --- a/Items/LeatherHat.cs +++ b/Items/LeatherHat.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class LeatherHat : ModItem { - - public override void SetDefaults() { @@ -24,6 +22,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/LeatherShirt.cs b/Items/LeatherShirt.cs index afb4981e..28eac855 100644 --- a/Items/LeatherShirt.cs +++ b/Items/LeatherShirt.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class LeatherShirt : ModItem { - public override void SetDefaults() { diff --git a/Items/LeechingSeed.cs b/Items/LeechingSeed.cs index bd281798..4396d33a 100644 --- a/Items/LeechingSeed.cs +++ b/Items/LeechingSeed.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Maximum life increased by 50"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.statLifeMax2 += 50; diff --git a/Items/LeopardHat.cs b/Items/LeopardHat.cs index 41409d44..9897eb18 100644 --- a/Items/LeopardHat.cs +++ b/Items/LeopardHat.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class LeopardHat : ModItem { - public override void SetDefaults() { @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/LesserHealingFlack.cs b/Items/LesserHealingFlack.cs index 6fa193f0..f7ead88e 100644 --- a/Items/LesserHealingFlack.cs +++ b/Items/LesserHealingFlack.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.rare = 1; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and heal player hit enemy"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("HealingCloudPro"); diff --git a/Items/LesserManaFlask.cs b/Items/LesserManaFlask.cs index 344013a3..a1c6962f 100644 --- a/Items/LesserManaFlask.cs +++ b/Items/LesserManaFlask.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.rare = 1; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and restore mana"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("ManaCloudPro"); diff --git a/Items/LesserPoisonFlask.cs b/Items/LesserPoisonFlask.cs index d8b9c7d6..9cf84004 100644 --- a/Items/LesserPoisonFlask.cs +++ b/Items/LesserPoisonFlask.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.rare = 1; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into poison clouds\nClouds deal damage to enemies and poisons them"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("PoisonCloudPro"); diff --git a/Items/LesserVenomFlask.cs b/Items/LesserVenomFlask.cs index 8a7c24cc..e57afc71 100644 --- a/Items/LesserVenomFlask.cs +++ b/Items/LesserVenomFlask.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.rare = 1; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -38,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into venom clouds\nClouds deal damage to enemies and poison them"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("PurpleCloudPro"); diff --git a/Items/LightningOrb.cs b/Items/LightningOrb.cs index c5e5102e..055566b9 100644 --- a/Items/LightningOrb.cs +++ b/Items/LightningOrb.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Creates a divine lightning"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { Vector2 vector82 = -Main.player[Main.myPlayer].Center + Main.MouseWorld; diff --git a/Items/LightningStaff.cs b/Items/LightningStaff.cs index 19c7c4ef..c4b46d19 100644 --- a/Items/LightningStaff.cs +++ b/Items/LightningStaff.cs @@ -36,8 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Sends out huge lightnings"); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { Vector2 vector82 = -Main.player[Main.myPlayer].Center + Main.MouseWorld; diff --git a/Items/LinearBurst.cs b/Items/LinearBurst.cs index 625bbd04..f726726f 100644 --- a/Items/LinearBurst.cs +++ b/Items/LinearBurst.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Achemical flasks leave five death flames"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/LivingTombstone.cs b/Items/LivingTombstone.cs index d27db4d4..2f4c7da9 100644 --- a/Items/LivingTombstone.cs +++ b/Items/LivingTombstone.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a living tombstone"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/LivingWoodBreastplate.cs b/Items/LivingWoodBreastplate.cs index ee81f6d5..5ee5c3a6 100644 --- a/Items/LivingWoodBreastplate.cs +++ b/Items/LivingWoodBreastplate.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 200; item.rare = 1; item.defense = 2; @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 4%\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/LivingWoodGreaves.cs b/Items/LivingWoodGreaves.cs index 7738be8a..e13d048e 100644 --- a/Items/LivingWoodGreaves.cs +++ b/Items/LivingWoodGreaves.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class LivingWoodGreaves : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 4%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.04f; diff --git a/Items/LivingWoodMask.cs b/Items/LivingWoodMask.cs index d77d5ec1..038f65bd 100644 --- a/Items/LivingWoodMask.cs +++ b/Items/LivingWoodMask.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class LivingWoodMask : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 4%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.04f; diff --git a/Items/LivingWoodThreepeater.cs b/Items/LivingWoodThreepeater.cs index ac9d93b0..849ae538 100644 --- a/Items/LivingWoodThreepeater.cs +++ b/Items/LivingWoodThreepeater.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/LongFuse.cs b/Items/LongFuse.cs index e5f1c1f2..5089479e 100644 --- a/Items/LongFuse.cs +++ b/Items/LongFuse.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemical weapons throws further"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.AddBuff(mod.BuffType("LongFuseBuff"), 2); diff --git a/Items/LostTurtleKnife.cs b/Items/LostTurtleKnife.cs index c8bf0e73..877774bb 100644 --- a/Items/LostTurtleKnife.cs +++ b/Items/LostTurtleKnife.cs @@ -33,6 +33,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/LunarSquid.cs b/Items/LunarSquid.cs index a9237a0f..acf86368 100644 --- a/Items/LunarSquid.cs +++ b/Items/LunarSquid.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/LuxoriousHelmet.cs b/Items/LuxoriousHelmet.cs index 44f2d258..a6965ec4 100644 --- a/Items/LuxoriousHelmet.cs +++ b/Items/LuxoriousHelmet.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases mining speed by 12%"); } - public override void UpdateEquip(Player player) { player.pickSpeed -= 0.12f; @@ -46,7 +45,6 @@ public override void ArmorSetShadows(Player player) player.armorEffectDrawOutlines = true; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/LuxoriousLeggings.cs b/Items/LuxoriousLeggings.cs index 49aaf2f5..becbe4b8 100644 --- a/Items/LuxoriousLeggings.cs +++ b/Items/LuxoriousLeggings.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class LuxoriousLeggings : ModItem { - public override void SetDefaults() { item.defense = 15; @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases mining speed by 12%"); } - public override void UpdateEquip(Player player) { player.pickSpeed -= 0.12f; diff --git a/Items/M29.cs b/Items/M29.cs index 523ddf15..e685afc1 100644 --- a/Items/M29.cs +++ b/Items/M29.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = 242; diff --git a/Items/MagicWorkbench.cs b/Items/MagicWorkbench.cs index 06d584f5..5a4e268b 100644 --- a/Items/MagicWorkbench.cs +++ b/Items/MagicWorkbench.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows you to create scientific-magical things"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MagicalGreaves.cs b/Items/MagicalGreaves.cs index 593bbb1a..3368c857 100644 --- a/Items/MagicalGreaves.cs +++ b/Items/MagicalGreaves.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class MagicalGreaves : ModItem { - public override void SetDefaults() { diff --git a/Items/MagicalHat.cs b/Items/MagicalHat.cs index 825b3dac..43ef74d3 100644 --- a/Items/MagicalHat.cs +++ b/Items/MagicalHat.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("3% increased magic damage"); } - public override void UpdateEquip(Player player) { player.magicDamage += 0.03f; diff --git a/Items/MagicalRobe.cs b/Items/MagicalRobe.cs index 46c6ed0c..e9a83b23 100644 --- a/Items/MagicalRobe.cs +++ b/Items/MagicalRobe.cs @@ -12,7 +12,6 @@ public override void SetDefaults() item.width = 250; - item.height = 28; item.value = 600; item.rare = 1; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("4% increased magic damage\nIncreases maximum mana by 20"); } - public override void UpdateEquip(Player player) { player.magicDamage += 0.04f; diff --git a/Items/MagiumBreastplate.cs b/Items/MagiumBreastplate.cs index 824264d4..30826e08 100644 --- a/Items/MagiumBreastplate.cs +++ b/Items/MagiumBreastplate.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 18000; item.rare = 5; item.defense = 9; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased magic damage\nIncreases maximum mana by 40"); } - public override void UpdateEquip(Player player) { player.statManaMax2 += 40; diff --git a/Items/MagiumGreaves.cs b/Items/MagiumGreaves.cs index 01cbcd66..39eadd13 100644 --- a/Items/MagiumGreaves.cs +++ b/Items/MagiumGreaves.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class MagiumGreaves : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 18000; item.rare = 5; item.defense = 8; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases movement speed by 25%\nIncreases maximum mana by 40"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.2f; diff --git a/Items/MagiumHelmet.cs b/Items/MagiumHelmet.cs index 520ae859..136ae520 100644 --- a/Items/MagiumHelmet.cs +++ b/Items/MagiumHelmet.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class MagiumHelmet : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 18000; item.rare = 5; item.defense = 8; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("9% increased magic critical strike chance\nIncreases maximum mana by 40"); } - public override void UpdateEquip(Player player) { player.magicCrit += 9; diff --git a/Items/MagiumRod.cs b/Items/MagiumRod.cs index 96f191f8..40edff42 100644 --- a/Items/MagiumRod.cs +++ b/Items/MagiumRod.cs @@ -36,8 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { int i = Main.myPlayer; diff --git a/Items/MagmaCrusher.cs b/Items/MagmaCrusher.cs index 6a279ce9..8641baa9 100644 --- a/Items/MagmaCrusher.cs +++ b/Items/MagmaCrusher.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Magmaxe.cs b/Items/Magmaxe.cs index f969c546..4e023e21 100644 --- a/Items/Magmaxe.cs +++ b/Items/Magmaxe.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Magminer.cs b/Items/Magminer.cs index e87d442d..6b689c20 100644 --- a/Items/Magminer.cs +++ b/Items/Magminer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MagmoniumBar.cs b/Items/MagmoniumBar.cs index 953767f6..795cb641 100644 --- a/Items/MagmoniumBar.cs +++ b/Items/MagmoniumBar.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MagmoniumBreastplate.cs b/Items/MagmoniumBreastplate.cs index 12cb81ef..1ff0f408 100644 --- a/Items/MagmoniumBreastplate.cs +++ b/Items/MagmoniumBreastplate.cs @@ -10,7 +10,6 @@ public class MagmoniumBreastplate : ModItem public override void SetDefaults() { - item.defense = 25; item.width = 22; item.height = 30; diff --git a/Items/MagmoniumGreaves.cs b/Items/MagmoniumGreaves.cs index 8ea5a449..5e72aa69 100644 --- a/Items/MagmoniumGreaves.cs +++ b/Items/MagmoniumGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class MagmoniumGreaves : ModItem { - public override void SetDefaults() { item.defense = 15; @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased melee speed\n10% reduced mana usage"); } - public override void UpdateEquip(Player player) { player.manaCost -= 0.1f; diff --git a/Items/MagmoniumHelmet.cs b/Items/MagmoniumHelmet.cs index a27c53c0..18e65099 100644 --- a/Items/MagmoniumHelmet.cs +++ b/Items/MagmoniumHelmet.cs @@ -11,7 +11,6 @@ public class MagmoniumHelmet : ModItem public override void SetDefaults() { - item.defense = 20; item.width = 26; item.height = 32; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Inflicts fire damage on attack"); } - public override void UpdateEquip(Player player) { player.magmaStone = true; @@ -49,7 +47,6 @@ public override void ArmorSetShadows(Player player) player.armorEffectDrawShadowLokis = true; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MagmoniumWings.cs b/Items/MagmoniumWings.cs index bcdab24f..5c1a1d79 100644 --- a/Items/MagmoniumWings.cs +++ b/Items/MagmoniumWings.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows flight and slow fall"); } - //these wings use the same values as the solar wings public override void UpdateAccessory(Player player, bool hideVisual) diff --git a/Items/ManaBooster.cs b/Items/ManaBooster.cs index fe286095..b42aa6b6 100644 --- a/Items/ManaBooster.cs +++ b/Items/ManaBooster.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Regenerates mana every minute"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/ManaDagger.cs b/Items/ManaDagger.cs index c35eb74e..786a9ba0 100644 --- a/Items/ManaDagger.cs +++ b/Items/ManaDagger.cs @@ -15,7 +15,6 @@ public override void SetDefaults() item.magic = true; item.mana = 12; - item.useTime = 8; item.useAnimation = 8; item.useStyle = 5; diff --git a/Items/ManaSupportFlask.cs b/Items/ManaSupportFlask.cs index 8c08b926..629245f3 100644 --- a/Items/ManaSupportFlask.cs +++ b/Items/ManaSupportFlask.cs @@ -26,7 +26,6 @@ public override void SetDefaults() item.rare = 2; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -36,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds restore mana of your allies"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("ManaSupportCloudPro"); diff --git a/Items/ManiacChainsaw.cs b/Items/ManiacChainsaw.cs index 9d71c727..731891b2 100644 --- a/Items/ManiacChainsaw.cs +++ b/Items/ManiacChainsaw.cs @@ -38,6 +38,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'A weapon of a true man killer'"); } - } } diff --git a/Items/MarbleBreastplate.cs b/Items/MarbleBreastplate.cs index d7d20361..c7c9e97f 100644 --- a/Items/MarbleBreastplate.cs +++ b/Items/MarbleBreastplate.cs @@ -10,7 +10,6 @@ public class MarbleBreastplate : ModItem public override void SetDefaults() { - item.defense = 6; item.width = 22; item.height = 30; diff --git a/Items/MarbleHelmet.cs b/Items/MarbleHelmet.cs index 0e212cdf..7edd4eea 100644 --- a/Items/MarbleHelmet.cs +++ b/Items/MarbleHelmet.cs @@ -11,7 +11,6 @@ public class MarbleHelmet : ModItem public override void SetDefaults() { - item.defense = 2; item.width = 26; item.height = 32; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased throwing velocity"); } - public override void UpdateEquip(Player p) { p.thrownVelocity += 0.1f; diff --git a/Items/MarbleLeggings.cs b/Items/MarbleLeggings.cs index 66105f82..eea07387 100644 --- a/Items/MarbleLeggings.cs +++ b/Items/MarbleLeggings.cs @@ -8,11 +8,9 @@ namespace Tremor.Items public class MarbleLeggings : ModItem { - public override void SetDefaults() { - item.defense = 2; item.width = 22; item.height = 18; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased throwing critical strike chance"); } - public override void UpdateEquip(Player p) { p.thrownCrit += 10; diff --git a/Items/MarbleVase.cs b/Items/MarbleVase.cs index 2fb29f6f..ab6c77ab 100644 --- a/Items/MarbleVase.cs +++ b/Items/MarbleVase.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MartianCommunicator.cs b/Items/MartianCommunicator.cs index 5b55f59f..d7ca906b 100644 --- a/Items/MartianCommunicator.cs +++ b/Items/MartianCommunicator.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Starts the Martian Madness"); } - public override bool CanUseItem(Player player) { return Main.hardMode && NPC.downedGolemBoss; diff --git a/Items/MartianSprayer.cs b/Items/MartianSprayer.cs index 74391571..fca15824 100644 --- a/Items/MartianSprayer.cs +++ b/Items/MartianSprayer.cs @@ -27,7 +27,6 @@ public override void SetDefaults() item.crit = 4; item.useAmmo = mod.ItemType("BoomFlask"); - } public override void SetStaticDefaults() @@ -36,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Uses flasks as ammo\nSprays alchemical clouds"); } - public override bool ConsumeAmmo(Player player) { if (player.FindBuffIndex(mod.BuffType("EnchantmentSolution")) != -1) diff --git a/Items/MassiveHammer.cs b/Items/MassiveHammer.cs index cbfda837..86d4d2ec 100644 --- a/Items/MassiveHammer.cs +++ b/Items/MassiveHammer.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/MeatClub.cs b/Items/MeatClub.cs index 52039689..c7ccfb29 100644 --- a/Items/MeatClub.cs +++ b/Items/MeatClub.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MechaSprayer.cs b/Items/MechaSprayer.cs index 4313195c..2a1b873f 100644 --- a/Items/MechaSprayer.cs +++ b/Items/MechaSprayer.cs @@ -27,7 +27,6 @@ public override void SetDefaults() item.crit = 4; item.useAmmo = mod.ItemType("BoomFlask"); - } public override void SetStaticDefaults() @@ -36,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Uses flasks as ammo\nSprays alchemical clouds"); } - public override bool ConsumeAmmo(Player player) { if (player.FindBuffIndex(mod.BuffType("EnchantmentSolution")) != -1) diff --git a/Items/MechanicalBrain.cs b/Items/MechanicalBrain.cs index a715a760..205a0adb 100644 --- a/Items/MechanicalBrain.cs +++ b/Items/MechanicalBrain.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Motherboard"); } - public override bool CanUseItem(Player player) { return Main.hardMode && !Main.dayTime && !NPC.AnyNPCs(mod.NPCType("Motherboard")); @@ -44,7 +43,6 @@ public override bool UseItem(Player player) return true; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Megalodon.cs b/Items/Megalodon.cs index 462f591b..ea18d5c3 100644 --- a/Items/Megalodon.cs +++ b/Items/Megalodon.cs @@ -35,8 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("50% chance not to consume ammo"); } - - public override Vector2? HoldoutOffset() { return new Vector2(-20, 0); @@ -58,7 +56,6 @@ public override bool Shoot(Player player, ref Vector2 position, ref float speedX return false; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Megavolt.cs b/Items/Megavolt.cs index 8f52b08a..6814bdb7 100644 --- a/Items/Megavolt.cs +++ b/Items/Megavolt.cs @@ -35,8 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots the charged arrows"); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { int i = Main.myPlayer; diff --git a/Items/MeltedInvarSword.cs b/Items/MeltedInvarSword.cs index a88b9de9..b67de732 100644 --- a/Items/MeltedInvarSword.cs +++ b/Items/MeltedInvarSword.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/MeteorBlade.cs b/Items/MeteorBlade.cs index 15f9c05e..46f647ca 100644 --- a/Items/MeteorBlade.cs +++ b/Items/MeteorBlade.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(2) == 0) diff --git a/Items/MeteorMask.cs b/Items/MeteorMask.cs index 808919c9..2dacce61 100644 --- a/Items/MeteorMask.cs +++ b/Items/MeteorMask.cs @@ -7,8 +7,6 @@ namespace Tremor.Items public class MeteorMask : ModItem { - - public override void SetDefaults() { @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases magic critical strike chance by 9"); } - public override void UpdateEquip(Player player) { player.magicCrit += 9; diff --git a/Items/MeteorScepter.cs b/Items/MeteorScepter.cs index 6bac0ef6..5845024d 100644 --- a/Items/MeteorScepter.cs +++ b/Items/MeteorScepter.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a meteor head to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/MidnightPotion.cs b/Items/MidnightPotion.cs index f80343ac..dd00ab16 100644 --- a/Items/MidnightPotion.cs +++ b/Items/MidnightPotion.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases all stats during night time"); } - public override bool UseItem(Player player) { player.AddBuff(mod.BuffType("NightHunting"), 14400); diff --git a/Items/MineralTransmutator.cs b/Items/MineralTransmutator.cs index 189f5023..6eaabb84 100644 --- a/Items/MineralTransmutator.cs +++ b/Items/MineralTransmutator.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows to transform pre-hardmode metals to their alternatives"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MinersLamp.cs b/Items/MinersLamp.cs index a3f1b2ec..0f90254f 100644 --- a/Items/MinersLamp.cs +++ b/Items/MinersLamp.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MiniGun.cs b/Items/MiniGun.cs index cc892d26..40bb8dda 100644 --- a/Items/MiniGun.cs +++ b/Items/MiniGun.cs @@ -32,6 +32,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/MoltenHeart.cs b/Items/MoltenHeart.cs index c9974933..c600c3ff 100644 --- a/Items/MoltenHeart.cs +++ b/Items/MoltenHeart.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons Heater of Worlds"); } - public override bool CanUseItem(Player player) { return player.position.Y / 16f > Main.maxTilesY - 200 && NPC.downedBoss2 && !NPC.AnyNPCs(mod.NPCType("HeaterOfWorldsHead")); diff --git a/Items/MoltenLance.cs b/Items/MoltenLance.cs index bbcd8120..3ebdfd44 100644 --- a/Items/MoltenLance.cs +++ b/Items/MoltenLance.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(24, 60); diff --git a/Items/MoltenStaff.cs b/Items/MoltenStaff.cs index aee3ce14..57f9d6cd 100644 --- a/Items/MoltenStaff.cs +++ b/Items/MoltenStaff.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Casts flames to burn your enemies!"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MonsterTooth.cs b/Items/MonsterTooth.cs index 1f69e2b0..d08513b7 100644 --- a/Items/MonsterTooth.cs +++ b/Items/MonsterTooth.cs @@ -33,6 +33,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/MoonDustFlask.cs b/Items/MoonDustFlask.cs index 5a720522..2843f9b2 100644 --- a/Items/MoonDustFlask.cs +++ b/Items/MoonDustFlask.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into moon exlposions"); } - public override void UpdateInventory(Player player) { if (player.FindBuffIndex(mod.BuffType("LongFuseBuff")) != -1) diff --git a/Items/MoonFlash.cs b/Items/MoonFlash.cs index 1837c273..8a3ade3d 100644 --- a/Items/MoonFlash.cs +++ b/Items/MoonFlash.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/MoonLash.cs b/Items/MoonLash.cs index 15ed5dca..7bb9fd4e 100644 --- a/Items/MoonLash.cs +++ b/Items/MoonLash.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Erupts three moon flame bolts"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/MotherboardMask.cs b/Items/MotherboardMask.cs index f6010595..a57d8803 100644 --- a/Items/MotherboardMask.cs +++ b/Items/MotherboardMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class MotherboardMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/MourningWoodMask.cs b/Items/MourningWoodMask.cs index 4c665b18..fc989f4a 100644 --- a/Items/MourningWoodMask.cs +++ b/Items/MourningWoodMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class MourningWoodMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/Murasamu.cs b/Items/Murasamu.cs index f5eacb1d..3b366830 100644 --- a/Items/Murasamu.cs +++ b/Items/Murasamu.cs @@ -30,8 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MushroomCrystal.cs b/Items/MushroomCrystal.cs index 583448cb..144c08ac 100644 --- a/Items/MushroomCrystal.cs +++ b/Items/MushroomCrystal.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons Fungus Beetle"); } - public override bool CanUseItem(Player player) { return NPC.downedBoss3 && !NPC.AnyNPCs(mod.NPCType("FungusBeetle")); diff --git a/Items/MusketeerHat.cs b/Items/MusketeerHat.cs index 26e89545..a1450a06 100644 --- a/Items/MusketeerHat.cs +++ b/Items/MusketeerHat.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class MusketeerHat : ModItem { - public override void SetDefaults() { diff --git a/Items/MysteriousDrum.cs b/Items/MysteriousDrum.cs index 13bbd10c..0018d978 100644 --- a/Items/MysteriousDrum.cs +++ b/Items/MysteriousDrum.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons Tiki Totem"); } - public override bool CanUseItem(Player player) { return !Main.dayTime && player.ZoneJungle && !NPC.AnyNPCs(mod.NPCType("TikiTotem")); diff --git a/Items/MythrilDisc.cs b/Items/MythrilDisc.cs index d49b6ef8..4a09d9ca 100644 --- a/Items/MythrilDisc.cs +++ b/Items/MythrilDisc.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool CanUseItem(Player player) { for (int i = 0; i < 1000; ++i) diff --git a/Items/MythrilHeader.cs b/Items/MythrilHeader.cs index 4a23f19c..f0678251 100644 --- a/Items/MythrilHeader.cs +++ b/Items/MythrilHeader.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class MythrilHeader : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases thrown damage by 20%"); } - public override void UpdateEquip(Player player) { player.thrownDamage += 0.20f; diff --git a/Items/MythrilMask.cs b/Items/MythrilMask.cs index 64b04d2f..3953824b 100644 --- a/Items/MythrilMask.cs +++ b/Items/MythrilMask.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class MythrilMask : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 20%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.20f; diff --git a/Items/MythrilStaff.cs b/Items/MythrilStaff.cs index b2bc8882..22dad0e9 100644 --- a/Items/MythrilStaff.cs +++ b/Items/MythrilStaff.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/MythrilVisage.cs b/Items/MythrilVisage.cs index d46383d9..c18239d2 100644 --- a/Items/MythrilVisage.cs +++ b/Items/MythrilVisage.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 20%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.20f; diff --git a/Items/MythrilWarhammer.cs b/Items/MythrilWarhammer.cs index 46eca2c0..22830ed1 100644 --- a/Items/MythrilWarhammer.cs +++ b/Items/MythrilWarhammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NanoBar.cs b/Items/NanoBar.cs index f7f8a988..14f6afd4 100644 --- a/Items/NanoBar.cs +++ b/Items/NanoBar.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Pulsing with pure energy"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NanoBlade.cs b/Items/NanoBlade.cs index 1c86e158..8642ae27 100644 --- a/Items/NanoBlade.cs +++ b/Items/NanoBlade.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(144, 1200); diff --git a/Items/NanoBreastplate.cs b/Items/NanoBreastplate.cs index 04857a5d..09a9b940 100644 --- a/Items/NanoBreastplate.cs +++ b/Items/NanoBreastplate.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 26; item.height = 18; - item.value = 60000; item.rare = 6; item.defense = 17; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("8% increased all damage\n10% increases melee speed"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.08f; diff --git a/Items/NanoGreaves.cs b/Items/NanoGreaves.cs index 93913bb8..1b47102d 100644 --- a/Items/NanoGreaves.cs +++ b/Items/NanoGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class NanoGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.20f; diff --git a/Items/NanoHelmet.cs b/Items/NanoHelmet.cs index bc8da460..328e35cf 100644 --- a/Items/NanoHelmet.cs +++ b/Items/NanoHelmet.cs @@ -9,16 +9,12 @@ namespace Tremor.Items public class NanoHelmet : ModItem { - - - public override void SetDefaults() { item.width = 32; item.height = 26; - item.value = 60000; item.rare = 6; item.defense = 12; @@ -30,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Maximum mana increased by 60\nIncreases critical strike chance by 8%"); } - public override void UpdateEquip(Player player) { player.statManaMax2 += 60; diff --git a/Items/Narsil.cs b/Items/Narsil.cs index 73ff0554..f4b5ca11 100644 --- a/Items/Narsil.cs +++ b/Items/Narsil.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(2) == 0) diff --git a/Items/NebulaBand.cs b/Items/NebulaBand.cs index 070632d5..b7d3b58b 100644 --- a/Items/NebulaBand.cs +++ b/Items/NebulaBand.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a nebula jellyfish"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/NebulaRing.cs b/Items/NebulaRing.cs index 979430c7..ab47374d 100644 --- a/Items/NebulaRing.cs +++ b/Items/NebulaRing.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased magic damage\nIncreases magic critical strike chance by 15\nIncreases maximum mana by 80"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/NecroBow.cs b/Items/NecroBow.cs index 38da09f5..65f9c439 100644 --- a/Items/NecroBow.cs +++ b/Items/NecroBow.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NecromancerArmor.cs b/Items/NecromancerArmor.cs index 6fc99126..d0aadd14 100644 --- a/Items/NecromancerArmor.cs +++ b/Items/NecromancerArmor.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("18% increased minion damage\n20% increased minion knockback"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.18f; diff --git a/Items/NecromancerBelt.cs b/Items/NecromancerBelt.cs index f0541e08..29a4bdcf 100644 --- a/Items/NecromancerBelt.cs +++ b/Items/NecromancerBelt.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion knockback by 20%\nIncreases your maximum number of minions"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/NecromancerClaymore.cs b/Items/NecromancerClaymore.cs index 2e62940f..5d767bfe 100644 --- a/Items/NecromancerClaymore.cs +++ b/Items/NecromancerClaymore.cs @@ -32,8 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 26); diff --git a/Items/Necronomicon.cs b/Items/Necronomicon.cs index 1b46d369..1784fb4c 100644 --- a/Items/Necronomicon.cs +++ b/Items/Necronomicon.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a skeleton to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/NightCombination.cs b/Items/NightCombination.cs index 3ef59956..d301c4fd 100644 --- a/Items/NightCombination.cs +++ b/Items/NightCombination.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration, melee damage\nMakes you glow during night"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/NightCore.cs b/Items/NightCore.cs index 03b4f59e..d03be687 100644 --- a/Items/NightCore.cs +++ b/Items/NightCore.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Color? GetAlpha(Color lightColor) { return Color.Purple; diff --git a/Items/NightDusk.cs b/Items/NightDusk.cs index 0b015012..0fccdf15 100644 --- a/Items/NightDusk.cs +++ b/Items/NightDusk.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(5) == 0) @@ -41,7 +40,6 @@ public override void MeleeEffects(Player player, Rectangle hitbox) } } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightFury.cs b/Items/NightFury.cs index ed36ec76..cc5a9993 100644 --- a/Items/NightFury.cs +++ b/Items/NightFury.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightingaleChestplate.cs b/Items/NightingaleChestplate.cs index 864d4039..282b38a7 100644 --- a/Items/NightingaleChestplate.cs +++ b/Items/NightingaleChestplate.cs @@ -9,7 +9,6 @@ public class NightingaleChestplate : ModItem public override void SetDefaults() { - item.defense = 7; item.width = 22; item.height = 30; diff --git a/Items/NightingaleGreaves.cs b/Items/NightingaleGreaves.cs index c20ebe53..cdf55892 100644 --- a/Items/NightingaleGreaves.cs +++ b/Items/NightingaleGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class NightingaleGreaves : ModItem { - public override void SetDefaults() { item.defense = 6; @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases movement speed by 10%"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.10f; diff --git a/Items/NightingaleHood.cs b/Items/NightingaleHood.cs index eea4b0d9..89ef4dbf 100644 --- a/Items/NightingaleHood.cs +++ b/Items/NightingaleHood.cs @@ -11,7 +11,6 @@ public class NightingaleHood : ModItem public override void SetDefaults() { - item.defense = 5; item.width = 26; item.height = 32; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration"); } - public override void UpdateEquip(Player player) { player.lifeRegen += 1; @@ -47,7 +45,6 @@ public override void ArmorSetShadows(Player player) player.armorEffectDrawShadowLokis = true; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightmareArrow.cs b/Items/NightmareArrow.cs index 01856446..3f88530d 100644 --- a/Items/NightmareArrow.cs +++ b/Items/NightmareArrow.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Enemies die... from fear.'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightmareBreastplate.cs b/Items/NightmareBreastplate.cs index 39b781d5..9630252c 100644 --- a/Items/NightmareBreastplate.cs +++ b/Items/NightmareBreastplate.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightmareBrick.cs b/Items/NightmareBrick.cs index 2406c34c..f2ab184c 100644 --- a/Items/NightmareBrick.cs +++ b/Items/NightmareBrick.cs @@ -28,8 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightmareBrickWall.cs b/Items/NightmareBrickWall.cs index 8d3f716f..3cd58deb 100644 --- a/Items/NightmareBrickWall.cs +++ b/Items/NightmareBrickWall.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightmareBullet.cs b/Items/NightmareBullet.cs index 726b68bf..ad503347 100644 --- a/Items/NightmareBullet.cs +++ b/Items/NightmareBullet.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Can bounce off blocks.'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightmareGlove.cs b/Items/NightmareGlove.cs index 06a0631f..5dc081bc 100644 --- a/Items/NightmareGlove.cs +++ b/Items/NightmareGlove.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/NightmareHelmet.cs b/Items/NightmareHelmet.cs index fd74f7ce..e267c703 100644 --- a/Items/NightmareHelmet.cs +++ b/Items/NightmareHelmet.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("NightmareBreastplate") && legs.type == mod.ItemType("NightmarePants"); @@ -43,7 +42,6 @@ public override void ArmorSetShadows(Player player) player.armorEffectDrawShadowLokis = true; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightmarePants.cs b/Items/NightmarePants.cs index 1bbcf2df..50aeb4d0 100644 --- a/Items/NightmarePants.cs +++ b/Items/NightmarePants.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class NightmarePants : ModItem { - public override void SetDefaults() { @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightmareSprayer.cs b/Items/NightmareSprayer.cs index 15cd1f7b..cae3accb 100644 --- a/Items/NightmareSprayer.cs +++ b/Items/NightmareSprayer.cs @@ -28,7 +28,6 @@ public override void SetDefaults() item.crit = 4; item.useAmmo = mod.ItemType("BoomFlask"); - } public override void SetStaticDefaults() @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Uses flasks as ammo\nSprays alchemical clouds"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/NightsWatch.cs b/Items/NightsWatch.cs index 777917a4..2bc051c0 100644 --- a/Items/NightsWatch.cs +++ b/Items/NightsWatch.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("8% increased magic, melee and minion damage\nIncreases maximum mana and health by 60\nIncreases melee and magic critical strike chance by 10"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.magicDamage += 0.08f; diff --git a/Items/Nitro.cs b/Items/Nitro.cs index 8cfa9429..17e09df4 100644 --- a/Items/Nitro.cs +++ b/Items/Nitro.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemical flasks leave death flames"); } - public override void UpdateAccessory(Player player, bool hideVisual) { MPlayer modPlayer = (MPlayer)player.GetModPlayer(mod, "MPlayer"); diff --git a/Items/NorthAxe.cs b/Items/NorthAxe.cs index 21e66381..07863363 100644 --- a/Items/NorthAxe.cs +++ b/Items/NorthAxe.cs @@ -29,6 +29,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/NorthCutlass.cs b/Items/NorthCutlass.cs index 43787d6d..54420fc9 100644 --- a/Items/NorthCutlass.cs +++ b/Items/NorthCutlass.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/NorthHammer.cs b/Items/NorthHammer.cs index 7dd6a6de..abe85336 100644 --- a/Items/NorthHammer.cs +++ b/Items/NorthHammer.cs @@ -29,6 +29,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/NorthStaff.cs b/Items/NorthStaff.cs index c7d9d3a8..f343022b 100644 --- a/Items/NorthStaff.cs +++ b/Items/NorthStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a north wind to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/NovaBand.cs b/Items/NovaBand.cs index 7ae854e4..147249a9 100644 --- a/Items/NovaBand.cs +++ b/Items/NovaBand.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a warkee"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/NuclearStar.cs b/Items/NuclearStar.cs index a282fb8e..713b1597 100644 --- a/Items/NuclearStar.cs +++ b/Items/NuclearStar.cs @@ -53,8 +53,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Creates nuclear beams."); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Obscuritron.cs b/Items/Obscuritron.cs index 44a2d2e4..f942b402 100644 --- a/Items/Obscuritron.cs +++ b/Items/Obscuritron.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(3) == 0) diff --git a/Items/ObsidianHeart.cs b/Items/ObsidianHeart.cs index 40ca82ef..4865d380 100644 --- a/Items/ObsidianHeart.cs +++ b/Items/ObsidianHeart.cs @@ -12,7 +12,6 @@ public override void SetDefaults() item.width = 22; item.height = 44; - item.value = 1200; item.rare = 2; item.accessory = true; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases life regeneration\nGrants immunity to fire blocks"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.lifeRegen += 1; diff --git a/Items/ObsidianSaber.cs b/Items/ObsidianSaber.cs index e6f40470..41285eba 100644 --- a/Items/ObsidianSaber.cs +++ b/Items/ObsidianSaber.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("ObsidianSaberPro"); diff --git a/Items/OceanAmulet.cs b/Items/OceanAmulet.cs index 6700960d..5f822173 100644 --- a/Items/OceanAmulet.cs +++ b/Items/OceanAmulet.cs @@ -12,7 +12,6 @@ public override void SetDefaults() item.width = 38; item.height = 34; - item.rare = 5; item.accessory = true; item.value = 50000; diff --git a/Items/OceanBate.cs b/Items/OceanBate.cs index 399ea72f..527be51f 100644 --- a/Items/OceanBate.cs +++ b/Items/OceanBate.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = 408; diff --git a/Items/OldInvarPlate.cs b/Items/OldInvarPlate.cs index 4b49d3e4..d51fd39d 100644 --- a/Items/OldInvarPlate.cs +++ b/Items/OldInvarPlate.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/OmnikronBar.cs b/Items/OmnikronBar.cs index ed7e4dd4..98c76521 100644 --- a/Items/OmnikronBar.cs +++ b/Items/OmnikronBar.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(8, 4)); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/OmnikronBreastplate.cs b/Items/OmnikronBreastplate.cs index c68221e4..0f6cc231 100644 --- a/Items/OmnikronBreastplate.cs +++ b/Items/OmnikronBreastplate.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases all damage by 20%"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/OmnikronGreaves.cs b/Items/OmnikronGreaves.cs index f9c7804b..edb455cd 100644 --- a/Items/OmnikronGreaves.cs +++ b/Items/OmnikronGreaves.cs @@ -9,14 +9,12 @@ namespace Tremor.Items public class OmnikronGreaves : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 0; item.rare = 0; item.defense = 24; @@ -28,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("50% increased movement speed\nIncreases all critical strike chances by 15"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/OmnikronHeadgear.cs b/Items/OmnikronHeadgear.cs index 5c208d9e..9259c59d 100644 --- a/Items/OmnikronHeadgear.cs +++ b/Items/OmnikronHeadgear.cs @@ -10,7 +10,6 @@ namespace Tremor.Items public class OmnikronHeadgear : ModItem { - public override void SetDefaults() { @@ -28,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases max health and mana by 100"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); @@ -67,8 +65,6 @@ public override void UpdateEquip(Player player) player.statManaMax2 += 100; } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/OmnikronHelmet.cs b/Items/OmnikronHelmet.cs index 3585cac9..d2eff39a 100644 --- a/Items/OmnikronHelmet.cs +++ b/Items/OmnikronHelmet.cs @@ -10,7 +10,6 @@ namespace Tremor.Items public class OmnikronHelmet : ModItem { - public override void SetDefaults() { @@ -28,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increased all critical strike chances by 25%"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); @@ -70,8 +68,6 @@ public override void ArmorSetShadows(Player player) player.armorEffectDrawOutlines = true; } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/OmnikronMask.cs b/Items/OmnikronMask.cs index c32c76af..8243090d 100644 --- a/Items/OmnikronMask.cs +++ b/Items/OmnikronMask.cs @@ -10,7 +10,6 @@ namespace Tremor.Items public class OmnikronMask : ModItem { - public override void SetDefaults() { @@ -28,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased all damage"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); @@ -71,8 +69,6 @@ public override void ArmorSetShadows(Player player) player.armorEffectDrawOutlines = true; } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/OrangeKnightBreastplate.cs b/Items/OrangeKnightBreastplate.cs index 7db2221a..d330a0ac 100644 --- a/Items/OrangeKnightBreastplate.cs +++ b/Items/OrangeKnightBreastplate.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/OrangeKnightHelmet.cs b/Items/OrangeKnightHelmet.cs index 4620b513..1aa93271 100644 --- a/Items/OrangeKnightHelmet.cs +++ b/Items/OrangeKnightHelmet.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/OrcishBreastplate.cs b/Items/OrcishBreastplate.cs index 350a8f18..96ca83c3 100644 --- a/Items/OrcishBreastplate.cs +++ b/Items/OrcishBreastplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased melee speed"); } - public override void UpdateEquip(Player player) { player.meleeSpeed += 0.15f; diff --git a/Items/OrcishBroadsword.cs b/Items/OrcishBroadsword.cs index 5d20712f..e5733805 100644 --- a/Items/OrcishBroadsword.cs +++ b/Items/OrcishBroadsword.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/OrcishGreaves.cs b/Items/OrcishGreaves.cs index 036dc8d4..8e0e3dbe 100644 --- a/Items/OrcishGreaves.cs +++ b/Items/OrcishGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class OrcishGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("7% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.07f; diff --git a/Items/OrcishHelmet.cs b/Items/OrcishHelmet.cs index 3ae513ca..2d45f36b 100644 --- a/Items/OrcishHelmet.cs +++ b/Items/OrcishHelmet.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class OrcishHelmet : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("7% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.07f; diff --git a/Items/OrichalcumDisc.cs b/Items/OrichalcumDisc.cs index 04690259..15bf161e 100644 --- a/Items/OrichalcumDisc.cs +++ b/Items/OrichalcumDisc.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool CanUseItem(Player player) { for (int i = 0; i < 1000; ++i) diff --git a/Items/OrichalcumHeader.cs b/Items/OrichalcumHeader.cs index 5a655fdd..4de4199c 100644 --- a/Items/OrichalcumHeader.cs +++ b/Items/OrichalcumHeader.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class OrichalcumHeader : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases thrown damage by 20%"); } - public override void UpdateEquip(Player player) { player.thrownDamage += 0.20f; diff --git a/Items/OrichalcumHeadgear.cs b/Items/OrichalcumHeadgear.cs index 2f8e761f..977a52bb 100644 --- a/Items/OrichalcumHeadgear.cs +++ b/Items/OrichalcumHeadgear.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class OrichalcumHeadgear : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 20%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.20f; diff --git a/Items/OrichalcumStaff.cs b/Items/OrichalcumStaff.cs index fabb81f2..d284d266 100644 --- a/Items/OrichalcumStaff.cs +++ b/Items/OrichalcumStaff.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/OrichalcumVisage.cs b/Items/OrichalcumVisage.cs index 9241add4..6e0ded22 100644 --- a/Items/OrichalcumVisage.cs +++ b/Items/OrichalcumVisage.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased alchemical damage"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.20f; diff --git a/Items/OrichalcumWarhammer.cs b/Items/OrichalcumWarhammer.cs index 52ca446a..f0ada0d5 100644 --- a/Items/OrichalcumWarhammer.cs +++ b/Items/OrichalcumWarhammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PainWheel.cs b/Items/PainWheel.cs index 4b0ec373..c4cc5c2a 100644 --- a/Items/PainWheel.cs +++ b/Items/PainWheel.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PaladinBreastplate.cs b/Items/PaladinBreastplate.cs index 40a528be..e18cca50 100644 --- a/Items/PaladinBreastplate.cs +++ b/Items/PaladinBreastplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("25% increased melee critical strike chance"); } - public override void UpdateEquip(Player player) { player.meleeCrit += 25; diff --git a/Items/PaladinGreaves.cs b/Items/PaladinGreaves.cs index 02dd06d6..67f24330 100644 --- a/Items/PaladinGreaves.cs +++ b/Items/PaladinGreaves.cs @@ -24,12 +24,10 @@ public override void SetStaticDefaults() Tooltip.SetDefault("22% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.22f; } } - } diff --git a/Items/PaladinHelmet.cs b/Items/PaladinHelmet.cs index 6ed5c247..5fd822e3 100644 --- a/Items/PaladinHelmet.cs +++ b/Items/PaladinHelmet.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("30% increased melee speed"); } - public override void UpdateEquip(Player player) { player.meleeSpeed += 0.30f; diff --git a/Items/PalladiumDisc.cs b/Items/PalladiumDisc.cs index 576d4dfb..90df2ac0 100644 --- a/Items/PalladiumDisc.cs +++ b/Items/PalladiumDisc.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool CanUseItem(Player player) { for (int i = 0; i < 1000; ++i) diff --git a/Items/PalladiumHat.cs b/Items/PalladiumHat.cs index fc7dbb47..3b8726d5 100644 --- a/Items/PalladiumHat.cs +++ b/Items/PalladiumHat.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class PalladiumHat : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 18%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.18f; diff --git a/Items/PalladiumHeader.cs b/Items/PalladiumHeader.cs index c15ea428..5d999482 100644 --- a/Items/PalladiumHeader.cs +++ b/Items/PalladiumHeader.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class PalladiumHeader : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases thrown damage by 18%"); } - public override void UpdateEquip(Player player) { player.thrownDamage += 0.18f; diff --git a/Items/PalladiumRifle.cs b/Items/PalladiumRifle.cs index 89a71b8d..105a2e59 100644 --- a/Items/PalladiumRifle.cs +++ b/Items/PalladiumRifle.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-15, 0); diff --git a/Items/PalladiumStaff.cs b/Items/PalladiumStaff.cs index 5769b48d..c54975ce 100644 --- a/Items/PalladiumStaff.cs +++ b/Items/PalladiumStaff.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PalladiumWarhammer.cs b/Items/PalladiumWarhammer.cs index f7a05d7c..37c03737 100644 --- a/Items/PalladiumWarhammer.cs +++ b/Items/PalladiumWarhammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PalmWoodArmchair.cs b/Items/PalmWoodArmchair.cs index d332602a..c8f41511 100644 --- a/Items/PalmWoodArmchair.cs +++ b/Items/PalmWoodArmchair.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Pandemonium.cs b/Items/Pandemonium.cs index b3052264..c572752e 100644 --- a/Items/Pandemonium.cs +++ b/Items/Pandemonium.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots a burst of bullets\nBullets explode into firebals\n75% chance not to consume ammo"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/ParatrooperLens.cs b/Items/ParatrooperLens.cs index 1c75a3b5..12a719bb 100644 --- a/Items/ParatrooperLens.cs +++ b/Items/ParatrooperLens.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases projectile's speed twice"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.AddBuff(mod.BuffType("ShootSpeedBuff2"), 2); diff --git a/Items/ParatrooperShotgun.cs b/Items/ParatrooperShotgun.cs index b91aac0e..abc5c640 100644 --- a/Items/ParatrooperShotgun.cs +++ b/Items/ParatrooperShotgun.cs @@ -37,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Has 33% chance not to consume ammo"); } - public override Vector2? HoldoutOffset() { return new Vector2(-10, 0); diff --git a/Items/ParaxydeAxe.cs b/Items/ParaxydeAxe.cs index b1c30e39..32450460 100644 --- a/Items/ParaxydeAxe.cs +++ b/Items/ParaxydeAxe.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ParaxydeBreastplate.cs b/Items/ParaxydeBreastplate.cs index 490bd554..41b5812b 100644 --- a/Items/ParaxydeBreastplate.cs +++ b/Items/ParaxydeBreastplate.cs @@ -23,14 +23,12 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases melee and magic criticals strike chance by 15"); } - public override void UpdateEquip(Player player) { player.magicCrit += 15; player.meleeCrit += 15; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ParaxydeCleaver.cs b/Items/ParaxydeCleaver.cs index b204a7e0..5e084b73 100644 --- a/Items/ParaxydeCleaver.cs +++ b/Items/ParaxydeCleaver.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ParaxydeGreaves.cs b/Items/ParaxydeGreaves.cs index dfc316fd..51c5fda0 100644 --- a/Items/ParaxydeGreaves.cs +++ b/Items/ParaxydeGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class ParaxydeGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases maximum mana by 40"); } - public override void UpdateEquip(Player player) { player.statManaMax2 += 40; diff --git a/Items/ParaxydeHammer.cs b/Items/ParaxydeHammer.cs index 8f0fead1..372a701a 100644 --- a/Items/ParaxydeHammer.cs +++ b/Items/ParaxydeHammer.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ParaxydeHelmet.cs b/Items/ParaxydeHelmet.cs index 9e38343a..cd79c117 100644 --- a/Items/ParaxydeHelmet.cs +++ b/Items/ParaxydeHelmet.cs @@ -7,15 +7,12 @@ namespace Tremor.Items public class ParaxydeHelmet : ModItem { - - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 10000; item.rare = 5; item.defense = 15; @@ -27,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases magic damage by 12%\nIncreases melee damage by 16%"); } - public override void UpdateEquip(Player player) { player.magicDamage += 0.12f; diff --git a/Items/ParaxydePickaxe.cs b/Items/ParaxydePickaxe.cs index 9eff15c5..5e2638d6 100644 --- a/Items/ParaxydePickaxe.cs +++ b/Items/ParaxydePickaxe.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ParaxydeShard.cs b/Items/ParaxydeShard.cs index 489f4033..8826e42d 100644 --- a/Items/ParaxydeShard.cs +++ b/Items/ParaxydeShard.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ParaxydeStave.cs b/Items/ParaxydeStave.cs index 5f0d8e11..c2828ced 100644 --- a/Items/ParaxydeStave.cs +++ b/Items/ParaxydeStave.cs @@ -19,7 +19,6 @@ public override void SetDefaults() item.useTime = 20; item.mana = 10; - item.useAnimation = 20; item.useStyle = 1; item.shootSpeed = 10f; @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons paraxyde crystals to fall from the sky\n"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ParaxydeStormbow.cs b/Items/ParaxydeStormbow.cs index beda7ca0..ed8a9b36 100644 --- a/Items/ParaxydeStormbow.cs +++ b/Items/ParaxydeStormbow.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Has 33% chance to shoot paraxyde crystal"); } - public override Vector2? HoldoutOffset() { return new Vector2(-8, -2); diff --git a/Items/ParrotFish.cs b/Items/ParrotFish.cs index 17a0e3db..230099ca 100644 --- a/Items/ParrotFish.cs +++ b/Items/ParrotFish.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/PartyOver.cs b/Items/PartyOver.cs index 86bcaa91..e47594ac 100644 --- a/Items/PartyOver.cs +++ b/Items/PartyOver.cs @@ -33,8 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. @@ -53,7 +51,6 @@ public override bool Shoot(Player player, ref Vector2 position, ref float speedX return Vector2.Zero; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PatronoftheMind.cs b/Items/PatronoftheMind.cs index f14a2e2c..2bee2016 100644 --- a/Items/PatronoftheMind.cs +++ b/Items/PatronoftheMind.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Gives health when in Crimson"); } - public override void UpdateAccessory(Player player, bool hideVisual) { if (player.ZoneCrimson) diff --git a/Items/PearlwoodArmchair.cs b/Items/PearlwoodArmchair.cs index 51433e22..b845a89a 100644 --- a/Items/PearlwoodArmchair.cs +++ b/Items/PearlwoodArmchair.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Permafrost.cs b/Items/Permafrost.cs index dc486160..2cd4479d 100644 --- a/Items/Permafrost.cs +++ b/Items/Permafrost.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. @@ -44,7 +43,6 @@ public override bool Shoot(Player player, ref Vector2 position, ref float speedX return false; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PetalBand.cs b/Items/PetalBand.cs index ab5a4fe4..5c03b825 100644 --- a/Items/PetalBand.cs +++ b/Items/PetalBand.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Plantera"); } - public override bool CanUseItem(Player player) { return Main.hardMode && NPC.downedMechBoss1 && NPC.downedMechBoss2 && NPC.downedMechBoss3 && !NPC.AnyNPCs(NPCID.Plantera); diff --git a/Items/PetrifiedSpike.cs b/Items/PetrifiedSpike.cs index da7c7e15..df57303b 100644 --- a/Items/PetrifiedSpike.cs +++ b/Items/PetrifiedSpike.cs @@ -19,6 +19,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/Phantablast.cs b/Items/Phantablast.cs index 321287e5..a662ae48 100644 --- a/Items/Phantablast.cs +++ b/Items/Phantablast.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Fires your ammo in a blast\n50% chance to not consume ammo"); } - public override Vector2? HoldoutOffset() { return new Vector2(-18, -4); diff --git a/Items/Phantaplasm.cs b/Items/Phantaplasm.cs index 6aacec90..6a64e9e6 100644 --- a/Items/Phantaplasm.cs +++ b/Items/Phantaplasm.cs @@ -22,7 +22,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - } } diff --git a/Items/PhantomFlask.cs b/Items/PhantomFlask.cs index 2370c94d..acc62a0d 100644 --- a/Items/PhantomFlask.cs +++ b/Items/PhantomFlask.cs @@ -27,7 +27,6 @@ public override void SetDefaults() item.rare = 1; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and burn them with shadowflames"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("ShadowCloudPro"); diff --git a/Items/PharaohBlade.cs b/Items/PharaohBlade.cs index 4fa74a9e..67d29e78 100644 --- a/Items/PharaohBlade.cs +++ b/Items/PharaohBlade.cs @@ -17,7 +17,6 @@ public override void SetDefaults() item.useAnimation = 25; item.useStyle = 1; - item.knockBack = 4; item.value = 10000; item.rare = 3; @@ -31,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows you to get more coins for killing enemies\n'More gold for God of gold!'"); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(72, 1200); diff --git a/Items/PhilosophersFlower.cs b/Items/PhilosophersFlower.cs index 11ba67f6..c2c17c7f 100644 --- a/Items/PhilosophersFlower.cs +++ b/Items/PhilosophersFlower.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Reduces the cooldown of healing potions\nAutomatically uses mana potions when needed"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.potionDelayTime = 2700; diff --git a/Items/PhoenixShotgun.cs b/Items/PhoenixShotgun.cs index e3d4a857..e2ec3086 100644 --- a/Items/PhoenixShotgun.cs +++ b/Items/PhoenixShotgun.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Uses bullets as ammo\nTransforms bullets into fireballs"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = 666; diff --git a/Items/PiercingQuartz.cs b/Items/PiercingQuartz.cs index a7b8c2c6..3a22a3d5 100644 --- a/Items/PiercingQuartz.cs +++ b/Items/PiercingQuartz.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased critical strike chance"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.rangedCrit += 5; diff --git a/Items/PinkGelCube.cs b/Items/PinkGelCube.cs index 45947a58..0613cf1a 100644 --- a/Items/PinkGelCube.cs +++ b/Items/PinkGelCube.cs @@ -22,8 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemically important ingredient"); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PirahnaStaff.cs b/Items/PirahnaStaff.cs index ae501d5c..f4b3c7b7 100644 --- a/Items/PirahnaStaff.cs +++ b/Items/PirahnaStaff.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Causes pirahnas to fall from the sky"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("PirahnaPro"); diff --git a/Items/PirateChest.cs b/Items/PirateChest.cs index 81c61fa3..782bfabe 100644 --- a/Items/PirateChest.cs +++ b/Items/PirateChest.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.height = 34; item.value = 20000; - item.rare = 5; } @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Right click to open\n'Contains precious things'"); } - public override bool CanRightClick() { return true; diff --git a/Items/PixiePulse.cs b/Items/PixiePulse.cs index c62f4a9e..ab7e60c6 100644 --- a/Items/PixiePulse.cs +++ b/Items/PixiePulse.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-1, 0); diff --git a/Items/PixieQueenMask.cs b/Items/PixieQueenMask.cs index aa93f59b..43315e1d 100644 --- a/Items/PixieQueenMask.cs +++ b/Items/PixieQueenMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class PixieQueenMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/PixieinaJar.cs b/Items/PixieinaJar.cs index 73896ce2..71aa5d9e 100644 --- a/Items/PixieinaJar.cs +++ b/Items/PixieinaJar.cs @@ -15,7 +15,6 @@ public override void SetDefaults() item.height = 30; item.maxStack = 20; - item.rare = 5; item.useAnimation = 45; item.useTime = 45; @@ -29,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Pixie Queen\n'I think something wants to get out of the jar...'"); } - public override bool CanUseItem(Player player) { return NPC.downedMechBossAny && !Main.dayTime && !NPC.AnyNPCs(mod.NPCType("PixieQueen")) && player.ZoneHoly; diff --git a/Items/PlagueBreastplate.cs b/Items/PlagueBreastplate.cs index 09ca2828..0e0eb4f8 100644 --- a/Items/PlagueBreastplate.cs +++ b/Items/PlagueBreastplate.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 10%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.1f; diff --git a/Items/PlagueFlask.cs b/Items/PlagueFlask.cs index 17272515..adfe5537 100644 --- a/Items/PlagueFlask.cs +++ b/Items/PlagueFlask.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into plague souls"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("PlaguePro"); diff --git a/Items/PlagueGreaves.cs b/Items/PlagueGreaves.cs index 1b81463a..f4f7f67b 100644 --- a/Items/PlagueGreaves.cs +++ b/Items/PlagueGreaves.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class PlagueGreaves : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 10%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.1f; diff --git a/Items/PlagueHelmet.cs b/Items/PlagueHelmet.cs index c0851e8c..14186728 100644 --- a/Items/PlagueHelmet.cs +++ b/Items/PlagueHelmet.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class PlagueHelmet : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 10%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.1f; diff --git a/Items/PlagueMask.cs b/Items/PlagueMask.cs index 13ec4b61..63c6b5af 100644 --- a/Items/PlagueMask.cs +++ b/Items/PlagueMask.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class PlagueMask : ModItem { - public override void SetDefaults() { diff --git a/Items/PlaguedBow.cs b/Items/PlaguedBow.cs index 079b242d..7a1bf411 100644 --- a/Items/PlaguedBow.cs +++ b/Items/PlaguedBow.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("GhostlyArrow"); diff --git a/Items/PlatinumGlobe.cs b/Items/PlatinumGlobe.cs index 5e65e112..b9d091a5 100644 --- a/Items/PlatinumGlobe.cs +++ b/Items/PlatinumGlobe.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PlatinumKunai.cs b/Items/PlatinumKunai.cs index bfde85e5..7c0d44f7 100644 --- a/Items/PlatinumKunai.cs +++ b/Items/PlatinumKunai.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PlatinumSpear.cs b/Items/PlatinumSpear.cs index de841f8b..f90afb4d 100644 --- a/Items/PlatinumSpear.cs +++ b/Items/PlatinumSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PlazmaSword.cs b/Items/PlazmaSword.cs index 820df683..c0b2f18a 100644 --- a/Items/PlazmaSword.cs +++ b/Items/PlazmaSword.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(44, 120); diff --git a/Items/PoisonJavelin.cs b/Items/PoisonJavelin.cs index 823a55b0..e0b9bac5 100644 --- a/Items/PoisonJavelin.cs +++ b/Items/PoisonJavelin.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PoisonRod.cs b/Items/PoisonRod.cs index 244bdac0..9dc63ec0 100644 --- a/Items/PoisonRod.cs +++ b/Items/PoisonRod.cs @@ -30,7 +30,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - } } diff --git a/Items/Popcorn.cs b/Items/Popcorn.cs index b92f7d48..7b82934a 100644 --- a/Items/Popcorn.cs +++ b/Items/Popcorn.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void GrabRange(Player player, ref int grabRange) { grabRange = (int)(grabRange * grabRangeMulti); diff --git a/Items/PopcornAmmo.cs b/Items/PopcornAmmo.cs index 97240af7..e18d341d 100644 --- a/Items/PopcornAmmo.cs +++ b/Items/PopcornAmmo.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Poseidon.cs b/Items/Poseidon.cs index 115d2e20..79b30102 100644 --- a/Items/Poseidon.cs +++ b/Items/Poseidon.cs @@ -43,6 +43,5 @@ public override void SetStaticDefaults() // return base.Shoot(player, ref position, ref speedX, ref speedY, ref type, ref damage, ref knockBack); //} - } } diff --git a/Items/PossessedGreaves.cs b/Items/PossessedGreaves.cs index a9bb1816..2c02c499 100644 --- a/Items/PossessedGreaves.cs +++ b/Items/PossessedGreaves.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class PossessedGreaves : ModItem { - public override void SetDefaults() { diff --git a/Items/PossessedHelmet.cs b/Items/PossessedHelmet.cs index 218e8271..e9759094 100644 --- a/Items/PossessedHelmet.cs +++ b/Items/PossessedHelmet.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class PossessedHelmet : ModItem { - public override void SetDefaults() { @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("PossessedChestplate") && legs.type == mod.ItemType("PossessedGreaves"); diff --git a/Items/PrizmaticSword.cs b/Items/PrizmaticSword.cs index b82fa9ae..a61eb889 100644 --- a/Items/PrizmaticSword.cs +++ b/Items/PrizmaticSword.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Grants mana upon hitting an enemy"); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { player.statMana += damage / 6; @@ -48,4 +47,3 @@ public override void MeleeEffects(Player player, Rectangle hitbox) } } - diff --git a/Items/ProfessorGlasses.cs b/Items/ProfessorGlasses.cs index 0055b52d..75da033f 100644 --- a/Items/ProfessorGlasses.cs +++ b/Items/ProfessorGlasses.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class ProfessorGlasses : ModItem { - public override void SetDefaults() { @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void DrawHair(ref bool drawHair, ref bool drawAltHair) { drawHair = true; diff --git a/Items/Pumpfish.cs b/Items/Pumpfish.cs index 25c708f0..198a0883 100644 --- a/Items/Pumpfish.cs +++ b/Items/Pumpfish.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/PumpkingMask.cs b/Items/PumpkingMask.cs index b44bbfff..f12b6c56 100644 --- a/Items/PumpkingMask.cs +++ b/Items/PumpkingMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class PumpkingMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/PurpleCrossguardPhasesaber.cs b/Items/PurpleCrossguardPhasesaber.cs index 1b98a89f..750145b7 100644 --- a/Items/PurpleCrossguardPhasesaber.cs +++ b/Items/PurpleCrossguardPhasesaber.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 62); diff --git a/Items/PurpleKnightBreastplate.cs b/Items/PurpleKnightBreastplate.cs index 6f1b937f..ef8ba569 100644 --- a/Items/PurpleKnightBreastplate.cs +++ b/Items/PurpleKnightBreastplate.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PurpleKnightHelmet.cs b/Items/PurpleKnightHelmet.cs index c8671e5e..8ff40e54 100644 --- a/Items/PurpleKnightHelmet.cs +++ b/Items/PurpleKnightHelmet.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PurplePuzzleFragment.cs b/Items/PurplePuzzleFragment.cs index 51bcf21b..1c5ce8c9 100644 --- a/Items/PurplePuzzleFragment.cs +++ b/Items/PurplePuzzleFragment.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PurpleQuartz.cs b/Items/PurpleQuartz.cs index 3a7d0afa..54b906e2 100644 --- a/Items/PurpleQuartz.cs +++ b/Items/PurpleQuartz.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/PusheenMask.cs b/Items/PusheenMask.cs index 2c5f77c5..11e879b3 100644 --- a/Items/PusheenMask.cs +++ b/Items/PusheenMask.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class PusheenMask : ModItem { - public override void SetDefaults() { @@ -23,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Meow?'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/PyramidHat.cs b/Items/PyramidHat.cs index 8c9d1357..9d3f10e4 100644 --- a/Items/PyramidHat.cs +++ b/Items/PyramidHat.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class PyramidHat : ModItem { - public override void SetDefaults() { @@ -21,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/Pyro.cs b/Items/Pyro.cs index f21272c5..79bceaa8 100644 --- a/Items/Pyro.cs +++ b/Items/Pyro.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemical flasks leaves an explosion"); } - public override void UpdateAccessory(Player player, bool hideVisual) { MPlayer modPlayer = (MPlayer)player.GetModPlayer(mod, "MPlayer"); diff --git a/Items/Quadratron.cs b/Items/Quadratron.cs index d29e9053..ee400c5f 100644 --- a/Items/Quadratron.cs +++ b/Items/Quadratron.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/QuetzalcoatlStave.cs b/Items/QuetzalcoatlStave.cs index 8eeb6903..dede0304 100644 --- a/Items/QuetzalcoatlStave.cs +++ b/Items/QuetzalcoatlStave.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a baby quetzalcoatl to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/Quiver.cs b/Items/Quiver.cs index 4a06b588..d0877fd9 100644 --- a/Items/Quiver.cs +++ b/Items/Quiver.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% chance not to consume ammo"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/RainStaff.cs b/Items/RainStaff.cs index 93c01eb0..b79c6756 100644 --- a/Items/RainStaff.cs +++ b/Items/RainStaff.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows you to call and revoke precipitation"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { if (Main.raining) diff --git a/Items/RavenBreastplate.cs b/Items/RavenBreastplate.cs index f11a7fdd..2f915de5 100644 --- a/Items/RavenBreastplate.cs +++ b/Items/RavenBreastplate.cs @@ -15,7 +15,6 @@ public override void SetDefaults() item.height = 18; item.value = 10000; - item.rare = 4; item.defense = 10; } @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("8% increased melee damage\nIncreases melee critical strike chance by 5"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.08f; diff --git a/Items/RavenClaymore.cs b/Items/RavenClaymore.cs index d756da6a..59f55113 100644 --- a/Items/RavenClaymore.cs +++ b/Items/RavenClaymore.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/RavenClutches.cs b/Items/RavenClutches.cs index 09e25de0..96feca3d 100644 --- a/Items/RavenClutches.cs +++ b/Items/RavenClutches.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RavenGreaves.cs b/Items/RavenGreaves.cs index 6c106e4b..b0147410 100644 --- a/Items/RavenGreaves.cs +++ b/Items/RavenGreaves.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class RavenGreaves : ModItem { - public override void SetDefaults() { @@ -16,7 +15,6 @@ public override void SetDefaults() item.height = 18; item.value = 10000; - item.rare = 4; item.defense = 9; } @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased melee damage\nIncreases melee critical strike chance by 5"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.05f; diff --git a/Items/RavenHeadgear.cs b/Items/RavenHeadgear.cs index 1c25de3f..8668a7ef 100644 --- a/Items/RavenHeadgear.cs +++ b/Items/RavenHeadgear.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class RavenHeadgear : ModItem { - public override void SetDefaults() { @@ -16,7 +15,6 @@ public override void SetDefaults() item.height = 18; item.value = 10000; - item.rare = 4; item.defense = 9; } @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased melee damage\nIncreases melee critical strike chance by 5"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.05f; diff --git a/Items/ReaperBreastplate.cs b/Items/ReaperBreastplate.cs index 1616ba33..4f8d2246 100644 --- a/Items/ReaperBreastplate.cs +++ b/Items/ReaperBreastplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 15%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.15f; diff --git a/Items/ReaperGreaves.cs b/Items/ReaperGreaves.cs index 391be6ee..b1f08c34 100644 --- a/Items/ReaperGreaves.cs +++ b/Items/ReaperGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class ReaperGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 15%"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.15f; diff --git a/Items/RecyclerofMatter.cs b/Items/RecyclerofMatter.cs index 94bc0135..f43e8e67 100644 --- a/Items/RecyclerofMatter.cs +++ b/Items/RecyclerofMatter.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows to convert hardmode metals to their alternatives"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RedBrickChimney.cs b/Items/RedBrickChimney.cs index 7a124470..8994a522 100644 --- a/Items/RedBrickChimney.cs +++ b/Items/RedBrickChimney.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RedCrossguardPhasesaber.cs b/Items/RedCrossguardPhasesaber.cs index 90d329b7..ce7e81af 100644 --- a/Items/RedCrossguardPhasesaber.cs +++ b/Items/RedCrossguardPhasesaber.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 60); diff --git a/Items/RedFeather.cs b/Items/RedFeather.cs index 1864bac5..ce6af42a 100644 --- a/Items/RedFeather.cs +++ b/Items/RedFeather.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/RedFeatherWings.cs b/Items/RedFeatherWings.cs index b2738e4d..3e98cb06 100644 --- a/Items/RedFeatherWings.cs +++ b/Items/RedFeatherWings.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The wings made of red feathers."); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 140; diff --git a/Items/RedKnightBreastplate.cs b/Items/RedKnightBreastplate.cs index ee0d0d32..10197672 100644 --- a/Items/RedKnightBreastplate.cs +++ b/Items/RedKnightBreastplate.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RedKnightHelmet.cs b/Items/RedKnightHelmet.cs index c19fb968..c1aa88a3 100644 --- a/Items/RedKnightHelmet.cs +++ b/Items/RedKnightHelmet.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RedMask.cs b/Items/RedMask.cs index 347da633..d5bc6aa0 100644 --- a/Items/RedMask.cs +++ b/Items/RedMask.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class RedMask : ModItem { - public override void SetDefaults() { diff --git a/Items/RedPuzzleFragment.cs b/Items/RedPuzzleFragment.cs index 47333e8a..4546dd67 100644 --- a/Items/RedPuzzleFragment.cs +++ b/Items/RedPuzzleFragment.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/RedSteelArmorPiece.cs b/Items/RedSteelArmorPiece.cs index 81d5b35d..fc32b42e 100644 --- a/Items/RedSteelArmorPiece.cs +++ b/Items/RedSteelArmorPiece.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/RedSteelBar.cs b/Items/RedSteelBar.cs index 69be910f..484770ed 100644 --- a/Items/RedSteelBar.cs +++ b/Items/RedSteelBar.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RedSteelBroadsword.cs b/Items/RedSteelBroadsword.cs index e2829c29..1d603f0d 100644 --- a/Items/RedSteelBroadsword.cs +++ b/Items/RedSteelBroadsword.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("25% chance to confuse enemy"); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(4) == 0) diff --git a/Items/RedSteelChestplate.cs b/Items/RedSteelChestplate.cs index fe46fc7e..5c556cd5 100644 --- a/Items/RedSteelChestplate.cs +++ b/Items/RedSteelChestplate.cs @@ -23,8 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased melee speed"); } - - public override void UpdateEquip(Player player) { player.meleeSpeed += 0.1f; diff --git a/Items/RedSteelGreaves.cs b/Items/RedSteelGreaves.cs index a4eb054d..37cab328 100644 --- a/Items/RedSteelGreaves.cs +++ b/Items/RedSteelGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class RedSteelGreaves : ModItem { - public override void SetDefaults() { @@ -25,8 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased movement speed"); } - - public override void UpdateEquip(Player player) { player.moveSpeed += 0.2f; diff --git a/Items/RedSteelGuardian.cs b/Items/RedSteelGuardian.cs index dd8ce7cc..d157f982 100644 --- a/Items/RedSteelGuardian.cs +++ b/Items/RedSteelGuardian.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.2f; diff --git a/Items/RedSteelHeadgear.cs b/Items/RedSteelHeadgear.cs index 9539c08b..3403f8f4 100644 --- a/Items/RedSteelHeadgear.cs +++ b/Items/RedSteelHeadgear.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class RedSteelHeadgear : ModItem { - public override void SetDefaults() { @@ -25,13 +24,11 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.1f; } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("RedSteelChestplate") && legs.type == mod.ItemType("RedSteelGreaves"); diff --git a/Items/RedStorm.cs b/Items/RedStorm.cs index b266adbf..1ff433d5 100644 --- a/Items/RedStorm.cs +++ b/Items/RedStorm.cs @@ -18,7 +18,6 @@ public override void SetDefaults() item.width = 22; item.height = 46; - item.useTime = 7; item.useAnimation = 30; item.useStyle = 5; @@ -38,8 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Causes red lasers to fall from sky\n"); } - - public override bool ConsumeAmmo(Player p) { return Main.rand.Next(2) == 0; diff --git a/Items/ReinforcedBurst.cs b/Items/ReinforcedBurst.cs index 5c219ba1..7493e3b9 100644 --- a/Items/ReinforcedBurst.cs +++ b/Items/ReinforcedBurst.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemical flasks leave three death flames"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RetributionofAbraxas.cs b/Items/RetributionofAbraxas.cs index da30710a..06ae45cb 100644 --- a/Items/RetributionofAbraxas.cs +++ b/Items/RetributionofAbraxas.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(2) == 0) @@ -40,7 +39,6 @@ public override void MeleeEffects(Player player, Rectangle hitbox) } } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Revolwar.cs b/Items/Revolwar.cs index 82244bd6..d997dc69 100644 --- a/Items/Revolwar.cs +++ b/Items/Revolwar.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/RichMahoganyArmchair.cs b/Items/RichMahoganyArmchair.cs index 5a511313..23cf9142 100644 --- a/Items/RichMahoganyArmchair.cs +++ b/Items/RichMahoganyArmchair.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RichMahoganySeed.cs b/Items/RichMahoganySeed.cs index eff79aa1..2f3dd214 100644 --- a/Items/RichMahoganySeed.cs +++ b/Items/RichMahoganySeed.cs @@ -37,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a lil' snatcher to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/RichMahoganyShield.cs b/Items/RichMahoganyShield.cs index 3b0679cc..a441618b 100644 --- a/Items/RichMahoganyShield.cs +++ b/Items/RichMahoganyShield.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class RichMahoganyShield : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RoboticDeadHead.cs b/Items/RoboticDeadHead.cs index 0fd8b56a..f14ccaac 100644 --- a/Items/RoboticDeadHead.cs +++ b/Items/RoboticDeadHead.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased damage\n12% increased critical strike chance\n25% increased movement speed"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.meleeDamage += 0.15f; diff --git a/Items/Rock.cs b/Items/Rock.cs index 998850d5..cf1cf137 100644 --- a/Items/Rock.cs +++ b/Items/Rock.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RockClimberPotion.cs b/Items/RockClimberPotion.cs index 275bde4d..1ebe292c 100644 --- a/Items/RockClimberPotion.cs +++ b/Items/RockClimberPotion.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Grants ability to climb walls"); } - public override bool UseItem(Player player) { player.AddBuff(mod.BuffType("RockClimberBuff"), 3600); diff --git a/Items/RockStompers.cs b/Items/RockStompers.cs index fe97c9df..47e24171 100644 --- a/Items/RockStompers.cs +++ b/Items/RockStompers.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases your knockback effect"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/Rockmine.cs b/Items/Rockmine.cs index fa35ab21..9dfcd4a8 100644 --- a/Items/Rockmine.cs +++ b/Items/Rockmine.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Rockspear.cs b/Items/Rockspear.cs index 7b392bc0..1ed2aa53 100644 --- a/Items/Rockspear.cs +++ b/Items/Rockspear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RottenBat.cs b/Items/RottenBat.cs index 0023e937..454b69f9 100644 --- a/Items/RottenBat.cs +++ b/Items/RottenBat.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Sewn from pieces of flesh'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RoundBlast.cs b/Items/RoundBlast.cs index aac711b1..dbaa78e9 100644 --- a/Items/RoundBlast.cs +++ b/Items/RoundBlast.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemical projectiles leave explosions in the shape of round"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RoyalClaymore.cs b/Items/RoyalClaymore.cs index f5dfe4f2..a1bf0901 100644 --- a/Items/RoyalClaymore.cs +++ b/Items/RoyalClaymore.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/RoyalDaggers.cs b/Items/RoyalDaggers.cs index c729ccec..2b6ace2e 100644 --- a/Items/RoyalDaggers.cs +++ b/Items/RoyalDaggers.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { int i = Main.myPlayer; diff --git a/Items/RoyalEgg.cs b/Items/RoyalEgg.cs index 01489927..d17a6cc4 100644 --- a/Items/RoyalEgg.cs +++ b/Items/RoyalEgg.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Brutallisk"); } - public override bool CanUseItem(Player player) { return NPC.downedMoonlord && !NPC.AnyNPCs(mod.NPCType("Brutallisk")) && player.ZoneDesert; diff --git a/Items/RoyalStrike.cs b/Items/RoyalStrike.cs index f33b18dc..5fccb0c5 100644 --- a/Items/RoyalStrike.cs +++ b/Items/RoyalStrike.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/RubyBlade.cs b/Items/RubyBlade.cs index acd8a31d..0fb873c1 100644 --- a/Items/RubyBlade.cs +++ b/Items/RubyBlade.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 60); diff --git a/Items/RustyLantern.cs b/Items/RustyLantern.cs index acab92fc..e72ef4ce 100644 --- a/Items/RustyLantern.cs +++ b/Items/RustyLantern.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.height = 30; item.maxStack = 1; - item.value = 3000; item.rare = 2; item.useTime = 40; @@ -32,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons Ancient Dragon\nCan be only used near Ruin Altar"); } - public override bool CanUseItem(Player player) { TremorPlayer modPlayer = player.GetModPlayer(mod); diff --git a/Items/RustySword.cs b/Items/RustySword.cs index 22cbcc96..b3813031 100644 --- a/Items/RustySword.cs +++ b/Items/RustySword.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(20, 100); diff --git a/Items/SacredCross.cs b/Items/SacredCross.cs index df5a32ec..91532e58 100644 --- a/Items/SacredCross.cs +++ b/Items/SacredCross.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots magical crosses that heal you"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SacrificalPickaxe.cs b/Items/SacrificalPickaxe.cs index 170461de..89f519b5 100644 --- a/Items/SacrificalPickaxe.cs +++ b/Items/SacrificalPickaxe.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if (Main.rand.Next(5) == 0) diff --git a/Items/SalamanderCloth.cs b/Items/SalamanderCloth.cs index 5bf7946e..b22d0aae 100644 --- a/Items/SalamanderCloth.cs +++ b/Items/SalamanderCloth.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.2f; diff --git a/Items/SalamanderLeggings.cs b/Items/SalamanderLeggings.cs index 72d23c93..50eb164f 100644 --- a/Items/SalamanderLeggings.cs +++ b/Items/SalamanderLeggings.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class SalamanderLeggings : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.1f; diff --git a/Items/SalamanderMask.cs b/Items/SalamanderMask.cs index 65ece19b..f07bea83 100644 --- a/Items/SalamanderMask.cs +++ b/Items/SalamanderMask.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class SalamanderMask : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.1f; diff --git a/Items/SamuraiChestplate.cs b/Items/SamuraiChestplate.cs index 086a266a..0568c635 100644 --- a/Items/SamuraiChestplate.cs +++ b/Items/SamuraiChestplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases melee speed by 25%"); } - public override void UpdateEquip(Player player) { player.meleeSpeed += 0.25f; diff --git a/Items/SamuraiGeaves.cs b/Items/SamuraiGeaves.cs index 6f2eef7e..d7819857 100644 --- a/Items/SamuraiGeaves.cs +++ b/Items/SamuraiGeaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class SamuraiGeaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases movement speed by 50%"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.5f; diff --git a/Items/SamuraiHead.cs b/Items/SamuraiHead.cs index a1c28679..fe91a4da 100644 --- a/Items/SamuraiHead.cs +++ b/Items/SamuraiHead.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases all damage by 9%"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.09f; diff --git a/Items/Sanctifier.cs b/Items/Sanctifier.cs index afdabfc2..0897992e 100644 --- a/Items/Sanctifier.cs +++ b/Items/Sanctifier.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical and throwing damage by 15%"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.GetModPlayer(mod).alchemicalDamage += 0.15f; diff --git a/Items/SandShuriken.cs b/Items/SandShuriken.cs index 5739bd37..8277c798 100644 --- a/Items/SandShuriken.cs +++ b/Items/SandShuriken.cs @@ -8,7 +8,6 @@ public class SandShuriken : ModItem public override void SetDefaults() { - item.damage = 27; item.thrown = true; item.width = 26; diff --git a/Items/SandStoneBreastplate.cs b/Items/SandStoneBreastplate.cs index c75436dc..2bb5fbe4 100644 --- a/Items/SandStoneBreastplate.cs +++ b/Items/SandStoneBreastplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.1f; diff --git a/Items/SandStoneGreaves.cs b/Items/SandStoneGreaves.cs index 7493807b..219102bd 100644 --- a/Items/SandStoneGreaves.cs +++ b/Items/SandStoneGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class SandStoneGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.1f; diff --git a/Items/SandStoneHelmet.cs b/Items/SandStoneHelmet.cs index 795319b3..c530dd07 100644 --- a/Items/SandStoneHelmet.cs +++ b/Items/SandStoneHelmet.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.1f; diff --git a/Items/SandstoneAxe.cs b/Items/SandstoneAxe.cs index 103c6fc4..1426e11f 100644 --- a/Items/SandstoneAxe.cs +++ b/Items/SandstoneAxe.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneBathtub.cs b/Items/SandstoneBathtub.cs index 1df04a07..a33d7eff 100644 --- a/Items/SandstoneBathtub.cs +++ b/Items/SandstoneBathtub.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneBed.cs b/Items/SandstoneBed.cs index 59689a4d..e7ec7c23 100644 --- a/Items/SandstoneBed.cs +++ b/Items/SandstoneBed.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneBench.cs b/Items/SandstoneBench.cs index 1ec96c6a..29a68188 100644 --- a/Items/SandstoneBench.cs +++ b/Items/SandstoneBench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneCandelabra.cs b/Items/SandstoneCandelabra.cs index 5e33953d..995ab470 100644 --- a/Items/SandstoneCandelabra.cs +++ b/Items/SandstoneCandelabra.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneCandle.cs b/Items/SandstoneCandle.cs index ea98135c..2053b22a 100644 --- a/Items/SandstoneCandle.cs +++ b/Items/SandstoneCandle.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneChair.cs b/Items/SandstoneChair.cs index c47e7ede..01c17ab0 100644 --- a/Items/SandstoneChair.cs +++ b/Items/SandstoneChair.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneChandelier.cs b/Items/SandstoneChandelier.cs index 14f9d40c..9c6993ab 100644 --- a/Items/SandstoneChandelier.cs +++ b/Items/SandstoneChandelier.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneChest.cs b/Items/SandstoneChest.cs index 2f098565..7202d45c 100644 --- a/Items/SandstoneChest.cs +++ b/Items/SandstoneChest.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneDoor.cs b/Items/SandstoneDoor.cs index 638566fa..f1dab160 100644 --- a/Items/SandstoneDoor.cs +++ b/Items/SandstoneDoor.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneDresser.cs b/Items/SandstoneDresser.cs index db28fef1..ac0f115b 100644 --- a/Items/SandstoneDresser.cs +++ b/Items/SandstoneDresser.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneGrandfatherClock.cs b/Items/SandstoneGrandfatherClock.cs index e31a38bf..2b1225af 100644 --- a/Items/SandstoneGrandfatherClock.cs +++ b/Items/SandstoneGrandfatherClock.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneHammer.cs b/Items/SandstoneHammer.cs index d3e3fb80..41cd19d3 100644 --- a/Items/SandstoneHammer.cs +++ b/Items/SandstoneHammer.cs @@ -8,7 +8,6 @@ public class SandstoneHammer : ModItem public override void SetDefaults() { - item.autoReuse = true; item.useStyle = 1; item.useAnimation = 45; @@ -31,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneLamp.cs b/Items/SandstoneLamp.cs index 64dcfa92..493475b0 100644 --- a/Items/SandstoneLamp.cs +++ b/Items/SandstoneLamp.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneLantern.cs b/Items/SandstoneLantern.cs index 8c72cc5e..c2c81923 100644 --- a/Items/SandstoneLantern.cs +++ b/Items/SandstoneLantern.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstonePiano.cs b/Items/SandstonePiano.cs index a1c7cadc..d09f8c2e 100644 --- a/Items/SandstonePiano.cs +++ b/Items/SandstonePiano.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstonePickaxe.cs b/Items/SandstonePickaxe.cs index 0e20f837..78b91c4e 100644 --- a/Items/SandstonePickaxe.cs +++ b/Items/SandstonePickaxe.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstonePlatform.cs b/Items/SandstonePlatform.cs index 12307366..73bf4733 100644 --- a/Items/SandstonePlatform.cs +++ b/Items/SandstonePlatform.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneRing.cs b/Items/SandstoneRing.cs index 84e0e15a..37ce337a 100644 --- a/Items/SandstoneRing.cs +++ b/Items/SandstoneRing.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.height = 20; item.value = 10000; - item.rare = 1; item.accessory = true; item.defense = 3; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased melee damage\nIncreases melee critical strike chance by 5"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/SandstoneSink.cs b/Items/SandstoneSink.cs index c9092f2b..9b005086 100644 --- a/Items/SandstoneSink.cs +++ b/Items/SandstoneSink.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneTable.cs b/Items/SandstoneTable.cs index 39f7b418..e45b425e 100644 --- a/Items/SandstoneTable.cs +++ b/Items/SandstoneTable.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SandstoneWorkbench.cs b/Items/SandstoneWorkbench.cs index 2df02185..1d37aacd 100644 --- a/Items/SandstoneWorkbench.cs +++ b/Items/SandstoneWorkbench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SantaNK1Mask.cs b/Items/SantaNK1Mask.cs index 0fc0a003..88040c81 100644 --- a/Items/SantaNK1Mask.cs +++ b/Items/SantaNK1Mask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class SantaNK1Mask : ModItem { - - public override void SetDefaults() { diff --git a/Items/SapphireBlade.cs b/Items/SapphireBlade.cs index 8c58f02d..babb9186 100644 --- a/Items/SapphireBlade.cs +++ b/Items/SapphireBlade.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 59); diff --git a/Items/SaturatedDagger.cs b/Items/SaturatedDagger.cs index 633905a8..ce99e60e 100644 --- a/Items/SaturatedDagger.cs +++ b/Items/SaturatedDagger.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SavingPotion.cs b/Items/SavingPotion.cs index 69877c8c..2ce9712f 100644 --- a/Items/SavingPotion.cs +++ b/Items/SavingPotion.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Greatly reduces mana cost"); } - public override bool UseItem(Player player) { player.AddBuff(mod.BuffType("ManaSaving"), 14400); diff --git a/Items/ScamperPotion.cs b/Items/ScamperPotion.cs index 89df98d9..aa7af7ad 100644 --- a/Items/ScamperPotion.cs +++ b/Items/ScamperPotion.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("75% increased movement speed"); } - public override bool UseItem(Player player) { player.AddBuff(mod.BuffType("ScamperBuff"), 14400); diff --git a/Items/ScarredReaper.cs b/Items/ScarredReaper.cs index cc4c8d78..92bfef26 100644 --- a/Items/ScarredReaper.cs +++ b/Items/ScarredReaper.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool CanUseItem(Player player) { for (int i = 0; i < 1000; ++i) diff --git a/Items/Scorcher.cs b/Items/Scorcher.cs index b9ffdf10..de165212 100644 --- a/Items/Scorcher.cs +++ b/Items/Scorcher.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ScorpionStinger.cs b/Items/ScorpionStinger.cs index 7ab712bf..68b4fbae 100644 --- a/Items/ScorpionStinger.cs +++ b/Items/ScorpionStinger.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Poisons enemies"); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(70, 100); diff --git a/Items/ScourgeofFlames.cs b/Items/ScourgeofFlames.cs index 162c0b61..6c74c231 100644 --- a/Items/ScourgeofFlames.cs +++ b/Items/ScourgeofFlames.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Erupts three fire bolts"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/SeaDawn.cs b/Items/SeaDawn.cs index a7a6e8ca..1386b2a8 100644 --- a/Items/SeaDawn.cs +++ b/Items/SeaDawn.cs @@ -30,6 +30,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/ShadewoodArmchair.cs b/Items/ShadewoodArmchair.cs index 5993b7ac..52d23c4d 100644 --- a/Items/ShadewoodArmchair.cs +++ b/Items/ShadewoodArmchair.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ShadowBow.cs b/Items/ShadowBow.cs index e3043faf..8e41a772 100644 --- a/Items/ShadowBow.cs +++ b/Items/ShadowBow.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ShadowCutter.cs b/Items/ShadowCutter.cs index 4991be9c..adedbfaa 100644 --- a/Items/ShadowCutter.cs +++ b/Items/ShadowCutter.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/ShadowMasterPants.cs b/Items/ShadowMasterPants.cs index 61ad224e..9eb95612 100644 --- a/Items/ShadowMasterPants.cs +++ b/Items/ShadowMasterPants.cs @@ -8,14 +8,12 @@ namespace Tremor.Items public class ShadowMasterPants : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 10000; item.rare = 11; item.defense = 20; @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("25% increased alchemical damage\n15% increased throwing damage"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.25f; diff --git a/Items/ShadowRelic.cs b/Items/ShadowRelic.cs index bed4bff0..06880ece 100644 --- a/Items/ShadowRelic.cs +++ b/Items/ShadowRelic.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Can be used in ritual of shadows if thrown into lava in underground and the Dryad is alive...'\nSummons Wall of Shadows"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); @@ -107,6 +106,5 @@ public void SpawnShadowWall(Vector2 pos) NPC.SpawnOnPlayer(Main.myPlayer, mod.NPCType("WallOfShadow")); } - } } diff --git a/Items/ShadowStaff.cs b/Items/ShadowStaff.cs index 97e75709..0fa7374c 100644 --- a/Items/ShadowStaff.cs +++ b/Items/ShadowStaff.cs @@ -37,7 +37,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a shadow arm to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/ShadowTooth.cs b/Items/ShadowTooth.cs index 31f54045..098ea83f 100644 --- a/Items/ShadowTooth.cs +++ b/Items/ShadowTooth.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ShadowWings.cs b/Items/ShadowWings.cs index 7a6c6c72..f3e62897 100644 --- a/Items/ShadowWings.cs +++ b/Items/ShadowWings.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The wings of shadow."); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 180; diff --git a/Items/Sharanga.cs b/Items/Sharanga.cs index e578e003..7df69fff 100644 --- a/Items/Sharanga.cs +++ b/Items/Sharanga.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SharkToothSword.cs b/Items/SharkToothSword.cs index ed169a40..05c2d0c6 100644 --- a/Items/SharkToothSword.cs +++ b/Items/SharkToothSword.cs @@ -28,6 +28,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/Sharkhalis.cs b/Items/Sharkhalis.cs index 19721501..4761b136 100644 --- a/Items/Sharkhalis.cs +++ b/Items/Sharkhalis.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("SharkhalisPro"); diff --git a/Items/ShiningAxe.cs b/Items/ShiningAxe.cs index dd0e97ed..3c08f4f2 100644 --- a/Items/ShiningAxe.cs +++ b/Items/ShiningAxe.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Magical throwing axe!"); } - public override bool CanUseItem(Player player) { for (int i = 0; i < 1000; ++i) @@ -47,7 +46,6 @@ public override bool CanUseItem(Player player) return true; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ShockwaveClaymore.cs b/Items/ShockwaveClaymore.cs index 119ca55e..2b5acaa9 100644 --- a/Items/ShockwaveClaymore.cs +++ b/Items/ShockwaveClaymore.cs @@ -32,8 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 60); diff --git a/Items/ShroomiteMagicalBoots.cs b/Items/ShroomiteMagicalBoots.cs index fe1bfd67..c0d3e0e7 100644 --- a/Items/ShroomiteMagicalBoots.cs +++ b/Items/ShroomiteMagicalBoots.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class ShroomiteMagicalBoots : ModItem { - public override void SetDefaults() { @@ -15,7 +14,6 @@ public override void SetDefaults() item.value = 11000; item.rare = 9; - item.accessory = true; } @@ -25,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less mana, the more defense...\nThe less health, the more speed..."); } - public override void UpdateAccessory(Player player, bool hideVisual) { @@ -63,7 +60,6 @@ public override void UpdateAccessory(Player player, bool hideVisual) } } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ShroomiteMechanicalBoots.cs b/Items/ShroomiteMechanicalBoots.cs index c3cec61b..4ca53477 100644 --- a/Items/ShroomiteMechanicalBoots.cs +++ b/Items/ShroomiteMechanicalBoots.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less health, the more speed..."); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/ShroomiteMinigun.cs b/Items/ShroomiteMinigun.cs index 6144a8fd..48ad7d2a 100644 --- a/Items/ShroomiteMinigun.cs +++ b/Items/ShroomiteMinigun.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-18, -4); diff --git a/Items/ShroomiteRepeater.cs b/Items/ShroomiteRepeater.cs index eae3f533..2a9731e7 100644 --- a/Items/ShroomiteRepeater.cs +++ b/Items/ShroomiteRepeater.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ShroomiteRocketLauncher.cs b/Items/ShroomiteRocketLauncher.cs index 9081a046..c5389f3c 100644 --- a/Items/ShroomiteRocketLauncher.cs +++ b/Items/ShroomiteRocketLauncher.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-18, -4); diff --git a/Items/SilkBanner.cs b/Items/SilkBanner.cs index 1940909b..4d4e7052 100644 --- a/Items/SilkBanner.cs +++ b/Items/SilkBanner.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases defense by 15and grants thorn effect if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SilkTent.cs b/Items/SilkTent.cs index ca28aec5..f527e1b8 100644 --- a/Items/SilkTent.cs +++ b/Items/SilkTent.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SilverSpear.cs b/Items/SilverSpear.cs index 2e4b0352..d07699b8 100644 --- a/Items/SilverSpear.cs +++ b/Items/SilverSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SkullTeeth.cs b/Items/SkullTeeth.cs index 73706798..bd1a5d38 100644 --- a/Items/SkullTeeth.cs +++ b/Items/SkullTeeth.cs @@ -21,6 +21,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Hell yeah!'"); } - } } diff --git a/Items/Skullheart.cs b/Items/Skullheart.cs index 18941420..c2d90af4 100644 --- a/Items/Skullheart.cs +++ b/Items/Skullheart.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(8, 4)); } - public override void UpdateAccessory(Player player, bool hideVisual) { if (--TimeToShoot <= 0) diff --git a/Items/SnakeDevourer.cs b/Items/SnakeDevourer.cs index 5b1b517a..212bf9e5 100644 --- a/Items/SnakeDevourer.cs +++ b/Items/SnakeDevourer.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Uses bullets as ammo"); } - public override Vector2? HoldoutOffset() { return new Vector2(-12, -2); diff --git a/Items/SniperBoots.cs b/Items/SniperBoots.cs index 33bf4de8..bc5f4191 100644 --- a/Items/SniperBoots.cs +++ b/Items/SniperBoots.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class SniperBoots : ModItem { - public override void SetDefaults() { @@ -15,7 +14,6 @@ public override void SetDefaults() item.height = 18; item.value = 1000000; - item.rare = 11; item.defense = 32; } @@ -26,13 +24,11 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased ranged damage\n20% decreased movement speed"); } - public override void UpdateEquip(Player player) { player.rangedDamage *= 1.15f; player.moveSpeed -= 0.20f; } - } } diff --git a/Items/SniperBreastplate.cs b/Items/SniperBreastplate.cs index 6e7d6f40..8f06e0cb 100644 --- a/Items/SniperBreastplate.cs +++ b/Items/SniperBreastplate.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 30; item.height = 22; - item.value = 1000000; item.rare = 11; item.defense = 40; @@ -25,13 +24,11 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased ranged damage\n20% decreased movement speed"); } - public override void UpdateEquip(Player player) { player.rangedDamage *= 1.2f; player.moveSpeed -= 0.20f; } - } } diff --git a/Items/SniperHelmet.cs b/Items/SniperHelmet.cs index 4bbf54a0..51bc4a8b 100644 --- a/Items/SniperHelmet.cs +++ b/Items/SniperHelmet.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class SniperHelmet : ModItem { - public override void SetDefaults() { item.width = 26; item.height = 26; - item.value = 1000000; item.rare = 1; item.defense = 36; @@ -50,6 +48,5 @@ public override void UpdateEquip(Player player) player.moveSpeed -= 0.20f; } - } } diff --git a/Items/SnowShotgun.cs b/Items/SnowShotgun.cs index d737e171..642f8b5b 100644 --- a/Items/SnowShotgun.cs +++ b/Items/SnowShotgun.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-18, -4); diff --git a/Items/SnowballChaingun.cs b/Items/SnowballChaingun.cs index df1ee8a4..55114dbe 100644 --- a/Items/SnowballChaingun.cs +++ b/Items/SnowballChaingun.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-18, -4); diff --git a/Items/SolarBand.cs b/Items/SolarBand.cs index e4c5ed37..8bcc543f 100644 --- a/Items/SolarBand.cs +++ b/Items/SolarBand.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a solar meteor"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/SolarRing.cs b/Items/SolarRing.cs index 1bb10037..abf2608e 100644 --- a/Items/SolarRing.cs +++ b/Items/SolarRing.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased melee damage\nIncreases melee critical strike chance by 15\nCasts a ring of fire"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/SoulEruption.cs b/Items/SoulEruption.cs index 5abfda50..8cedaa8a 100644 --- a/Items/SoulEruption.cs +++ b/Items/SoulEruption.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/SoulofFight.cs b/Items/SoulofFight.cs index 2bcefc47..5a8a6402 100644 --- a/Items/SoulofFight.cs +++ b/Items/SoulofFight.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(5, 4)); } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Items/SoulofMind.cs b/Items/SoulofMind.cs index 01c85eaa..206f8fa1 100644 --- a/Items/SoulofMind.cs +++ b/Items/SoulofMind.cs @@ -29,13 +29,11 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(5, 4)); } - public override Color? GetAlpha(Color lightColor) { return Color.Yellow; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SpaceWhaleMask.cs b/Items/SpaceWhaleMask.cs index 69581814..29e60c8d 100644 --- a/Items/SpaceWhaleMask.cs +++ b/Items/SpaceWhaleMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class SpaceWhaleMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/SparkingFlask.cs b/Items/SparkingFlask.cs index 7c20b7d6..218a0343 100644 --- a/Items/SparkingFlask.cs +++ b/Items/SparkingFlask.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into fiery sparks"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("SparkingBallz"); diff --git a/Items/Spearaxe.cs b/Items/Spearaxe.cs index f05eedbd..653f46b9 100644 --- a/Items/Spearaxe.cs +++ b/Items/Spearaxe.cs @@ -29,6 +29,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/SpectralBlade.cs b/Items/SpectralBlade.cs index b01f18bb..ab8f4fc9 100644 --- a/Items/SpectralBlade.cs +++ b/Items/SpectralBlade.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SpectreFlower.cs b/Items/SpectreFlower.cs index 204e5ba8..01a7ef00 100644 --- a/Items/SpectreFlower.cs +++ b/Items/SpectreFlower.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SpectreNecklace.cs b/Items/SpectreNecklace.cs index ab28b090..298c3dc9 100644 --- a/Items/SpectreNecklace.cs +++ b/Items/SpectreNecklace.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less mana, the more defense..."); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/SpectreTaroCards.cs b/Items/SpectreTaroCards.cs index 3c42d2d3..7ccd5d80 100644 --- a/Items/SpectreTaroCards.cs +++ b/Items/SpectreTaroCards.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/SpiderMeat.cs b/Items/SpiderMeat.cs index 4b09c580..0a5311df 100644 --- a/Items/SpiderMeat.cs +++ b/Items/SpiderMeat.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'I don't see anything wrong with it, eat it!'"); } - public override bool UseItem(Player player) { player.AddBuff(22, 10000, true); diff --git a/Items/SpiderPie.cs b/Items/SpiderPie.cs index c28394ec..050ab783 100644 --- a/Items/SpiderPie.cs +++ b/Items/SpiderPie.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a rideable Fat Spider mount"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SpinalMask.cs b/Items/SpinalMask.cs index 8c8740ca..2691655f 100644 --- a/Items/SpinalMask.cs +++ b/Items/SpinalMask.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class SpinalMask : ModItem { - public override void SetDefaults() { diff --git a/Items/SpineBlade.cs b/Items/SpineBlade.cs index 5fad8c17..fdef1621 100644 --- a/Items/SpineBlade.cs +++ b/Items/SpineBlade.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Sporaxe.cs b/Items/Sporaxe.cs index 97e8d5f0..98b691f2 100644 --- a/Items/Sporaxe.cs +++ b/Items/Sporaxe.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); @@ -46,7 +45,6 @@ public override void AddRecipes() recipe.AddRecipe(); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/SporeDust.cs b/Items/SporeDust.cs index 52b0c199..a27df130 100644 --- a/Items/SporeDust.cs +++ b/Items/SporeDust.cs @@ -24,8 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void UpdateAccessory(Player player, bool hideVisual) { if (Math.Abs(player.velocity.X) + Math.Abs(player.velocity.Y) > 1f && !player.rocketFrame) // Makes sure the player is actually moving diff --git a/Items/SquareBlast.cs b/Items/SquareBlast.cs index a51719e8..222946a6 100644 --- a/Items/SquareBlast.cs +++ b/Items/SquareBlast.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Alchemical projectiles leave explosions in the shape of squares"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Squasher.cs b/Items/Squasher.cs index 6455dd1d..0e2434da 100644 --- a/Items/Squasher.cs +++ b/Items/Squasher.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Strong enough to destroy Demon Altars"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SquidHat.cs b/Items/SquidHat.cs index d6ed04ef..b514dbe8 100644 --- a/Items/SquidHat.cs +++ b/Items/SquidHat.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class SquidHat : ModItem { - public override void SetDefaults() { @@ -21,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/SquidTentacle.cs b/Items/SquidTentacle.cs index 0e2828cf..54f9afae 100644 --- a/Items/SquidTentacle.cs +++ b/Items/SquidTentacle.cs @@ -36,7 +36,6 @@ public override void SetDefaults() projectile.CloneDefaults(ProjectileID.GemHookAmethyst); } - // Use this hook for hooks that can have multiple hooks midflight: Dual Hook, Web Slinger, Fish Hook, Static Hook, Lunar Hook /* public override bool? CanUseGrapple(Player player) diff --git a/Items/StarBlaster.cs b/Items/StarBlaster.cs index fefab4e3..2216e7b1 100644 --- a/Items/StarBlaster.cs +++ b/Items/StarBlaster.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-18, -4); diff --git a/Items/StarBound.cs b/Items/StarBound.cs index 189eaf26..895cdf74 100644 --- a/Items/StarBound.cs +++ b/Items/StarBound.cs @@ -36,8 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { int i = Main.myPlayer; diff --git a/Items/StarDrill.cs b/Items/StarDrill.cs index 662b0398..f8e888e7 100644 --- a/Items/StarDrill.cs +++ b/Items/StarDrill.cs @@ -39,7 +39,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/StarLantern.cs b/Items/StarLantern.cs index 5625ac06..c8cc1e6b 100644 --- a/Items/StarLantern.cs +++ b/Items/StarLantern.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("25% increased magic damage\nEmits aura of light"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.AddBuff(11, 10); diff --git a/Items/StarNest.cs b/Items/StarNest.cs index acd6ff51..c27f6fa1 100644 --- a/Items/StarNest.cs +++ b/Items/StarNest.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StarSmithy.cs b/Items/StarSmithy.cs index 89c4f476..8ab194c5 100644 --- a/Items/StarSmithy.cs +++ b/Items/StarSmithy.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows you to treat space materials"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StardustBand.cs b/Items/StardustBand.cs index 64571f3c..a64eb734 100644 --- a/Items/StardustBand.cs +++ b/Items/StardustBand.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a stardust squid"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/StardustRing.cs b/Items/StardustRing.cs index e7ada942..833a9560 100644 --- a/Items/StardustRing.cs +++ b/Items/StardustRing.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased minion damage\nIncreases your maximum number of minions"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/StarlightGlimmer.cs b/Items/StarlightGlimmer.cs index 1c968c1c..1cae9323 100644 --- a/Items/StarlightGlimmer.cs +++ b/Items/StarlightGlimmer.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots fallen stars"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/Starmine.cs b/Items/Starmine.cs index dc934b7a..fca08c92 100644 --- a/Items/Starmine.cs +++ b/Items/Starmine.cs @@ -33,6 +33,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/SteelAxe.cs b/Items/SteelAxe.cs index 46b51dc3..6d92659b 100644 --- a/Items/SteelAxe.cs +++ b/Items/SteelAxe.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SteelBar.cs b/Items/SteelBar.cs index 63c35348..fa1abb7d 100644 --- a/Items/SteelBar.cs +++ b/Items/SteelBar.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SteelBow.cs b/Items/SteelBow.cs index f8987c94..03adfebe 100644 --- a/Items/SteelBow.cs +++ b/Items/SteelBow.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-1, 0); diff --git a/Items/SteelBroadsword.cs b/Items/SteelBroadsword.cs index 13095e79..5cd6e230 100644 --- a/Items/SteelBroadsword.cs +++ b/Items/SteelBroadsword.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SteelChestplate.cs b/Items/SteelChestplate.cs index 746b92a1..27ae2e76 100644 --- a/Items/SteelChestplate.cs +++ b/Items/SteelChestplate.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("3% increased ranged critical strike chance"); } - public override void UpdateEquip(Player player) { player.rangedCrit += 3; diff --git a/Items/SteelGreaves.cs b/Items/SteelGreaves.cs index 7f6f6675..d1831e4b 100644 --- a/Items/SteelGreaves.cs +++ b/Items/SteelGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class SteelGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("3% increased magic critical strike chance"); } - public override void UpdateEquip(Player player) { player.magicCrit += 3; diff --git a/Items/SteelHammer.cs b/Items/SteelHammer.cs index 9c09d628..eb07eb01 100644 --- a/Items/SteelHammer.cs +++ b/Items/SteelHammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SteelHelmet.cs b/Items/SteelHelmet.cs index b2e9aaf7..695c15e7 100644 --- a/Items/SteelHelmet.cs +++ b/Items/SteelHelmet.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class SteelHelmet : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("3% increased melee critical strike chance"); } - public override void UpdateEquip(Player player) { player.meleeCrit += 3; diff --git a/Items/SteelPickaxe.cs b/Items/SteelPickaxe.cs index 0e6e745e..335a8f48 100644 --- a/Items/SteelPickaxe.cs +++ b/Items/SteelPickaxe.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/SteelSpear.cs b/Items/SteelSpear.cs index 2e608e95..5c3b953d 100644 --- a/Items/SteelSpear.cs +++ b/Items/SteelSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Stigmata.cs b/Items/Stigmata.cs index 1a9359f0..d7860b93 100644 --- a/Items/Stigmata.cs +++ b/Items/Stigmata.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less health, the more damage..."); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/StoneBathtub.cs b/Items/StoneBathtub.cs index b8300081..21b77f10 100644 --- a/Items/StoneBathtub.cs +++ b/Items/StoneBathtub.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneBed.cs b/Items/StoneBed.cs index 30ec28db..378e76fe 100644 --- a/Items/StoneBed.cs +++ b/Items/StoneBed.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneBench.cs b/Items/StoneBench.cs index 7237935b..ca7308bd 100644 --- a/Items/StoneBench.cs +++ b/Items/StoneBench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneBookcase.cs b/Items/StoneBookcase.cs index 8364c98b..491d1f67 100644 --- a/Items/StoneBookcase.cs +++ b/Items/StoneBookcase.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneChair.cs b/Items/StoneChair.cs index 3a47d118..0e7eb596 100644 --- a/Items/StoneChair.cs +++ b/Items/StoneChair.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneChest.cs b/Items/StoneChest.cs index 39458e4a..0d4d74ab 100644 --- a/Items/StoneChest.cs +++ b/Items/StoneChest.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneChestplate.cs b/Items/StoneChestplate.cs index 1fb68989..1caec78d 100644 --- a/Items/StoneChestplate.cs +++ b/Items/StoneChestplate.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("4% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.04f; diff --git a/Items/StoneDoor.cs b/Items/StoneDoor.cs index bac2fd48..3deab256 100644 --- a/Items/StoneDoor.cs +++ b/Items/StoneDoor.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneDresser.cs b/Items/StoneDresser.cs index c1c4f818..f2863162 100644 --- a/Items/StoneDresser.cs +++ b/Items/StoneDresser.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneGrandfatherClock.cs b/Items/StoneGrandfatherClock.cs index f8c40a6c..a29e7df5 100644 --- a/Items/StoneGrandfatherClock.cs +++ b/Items/StoneGrandfatherClock.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneHelmet.cs b/Items/StoneHelmet.cs index 2e0052c3..3dc7d053 100644 --- a/Items/StoneHelmet.cs +++ b/Items/StoneHelmet.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class StoneHelmet : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("4% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.04f; diff --git a/Items/StoneLeggings.cs b/Items/StoneLeggings.cs index 766fb350..e9064957 100644 --- a/Items/StoneLeggings.cs +++ b/Items/StoneLeggings.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class StoneLeggings : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("4% increased melee damage"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.04f; diff --git a/Items/StonePiano.cs b/Items/StonePiano.cs index 41a6f2b2..8611bc73 100644 --- a/Items/StonePiano.cs +++ b/Items/StonePiano.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StonePlatform.cs b/Items/StonePlatform.cs index 68e0a08a..f530ddd9 100644 --- a/Items/StonePlatform.cs +++ b/Items/StonePlatform.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneSink.cs b/Items/StoneSink.cs index f25cfd45..5e21dd0d 100644 --- a/Items/StoneSink.cs +++ b/Items/StoneSink.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneTable.cs b/Items/StoneTable.cs index 73b324b5..8deb1f42 100644 --- a/Items/StoneTable.cs +++ b/Items/StoneTable.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneWorkbench.cs b/Items/StoneWorkbench.cs index ef9f6bfe..02423566 100644 --- a/Items/StoneWorkbench.cs +++ b/Items/StoneWorkbench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/StoneofKnowledge.cs b/Items/StoneofKnowledge.cs index 47127c8d..43c62bd5 100644 --- a/Items/StoneofKnowledge.cs +++ b/Items/StoneofKnowledge.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons the Trinity"); } - public override bool CanUseItem(Player player) { return !Main.dayTime && Main.hardMode && NPC.downedMechBossAny && !NPC.AnyNPCs(mod.NPCType("SoulofHope")) && !NPC.AnyNPCs(mod.NPCType("SoulofTrust")) && !NPC.AnyNPCs(mod.NPCType("SoulofTruth")); diff --git a/Items/StormBlade.cs b/Items/StormBlade.cs index c2606bca..ee1df80c 100644 --- a/Items/StormBlade.cs +++ b/Items/StormBlade.cs @@ -32,8 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 15); diff --git a/Items/StormJelly.cs b/Items/StormJelly.cs index 6f002099..953b4efe 100644 --- a/Items/StormJelly.cs +++ b/Items/StormJelly.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons Storm Jellyfish"); } - public override bool CanUseItem(Player player) { return NPC.downedBoss1 && !NPC.AnyNPCs(mod.NPCType("StormJellyfish")); diff --git a/Items/StormJellyfishMask.cs b/Items/StormJellyfishMask.cs index e0e97eb7..ae3f2e54 100644 --- a/Items/StormJellyfishMask.cs +++ b/Items/StormJellyfishMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class StormJellyfishMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/Stormtron.cs b/Items/Stormtron.cs index 1439ca18..42ee417e 100644 --- a/Items/Stormtron.cs +++ b/Items/Stormtron.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) diff --git a/Items/StrangeEgg.cs b/Items/StrangeEgg.cs index 82f713fa..826dad9d 100644 --- a/Items/StrangeEgg.cs +++ b/Items/StrangeEgg.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons an brutty"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/StrongBelt.cs b/Items/StrongBelt.cs index da6da4a9..2cc5b62e 100644 --- a/Items/StrongBelt.cs +++ b/Items/StrongBelt.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased minion knockback"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/Stynginator.cs b/Items/Stynginator.cs index 16ba7a39..6ddd528f 100644 --- a/Items/Stynginator.cs +++ b/Items/Stynginator.cs @@ -38,7 +38,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Uses Styngers Bolts as ammo"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/SummonerFocus.cs b/Items/SummonerFocus.cs index 79c082ac..fb2cc355 100644 --- a/Items/SummonerFocus.cs +++ b/Items/SummonerFocus.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 2; item.accessory = true; item.value = 50000; diff --git a/Items/SummonerSoul.cs b/Items/SummonerSoul.cs index 99453577..47be61d0 100644 --- a/Items/SummonerSoul.cs +++ b/Items/SummonerSoul.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 2; item.accessory = true; item.value = 100000; diff --git a/Items/SummonerSpark.cs b/Items/SummonerSpark.cs index 20639eca..b9331153 100644 --- a/Items/SummonerSpark.cs +++ b/Items/SummonerSpark.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 1; item.accessory = true; item.value = 20000; diff --git a/Items/SunflowerFish.cs b/Items/SunflowerFish.cs index 285534af..21781b35 100644 --- a/Items/SunflowerFish.cs +++ b/Items/SunflowerFish.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/SunfuryPotion.cs b/Items/SunfuryPotion.cs index 52f760c8..72ab0433 100644 --- a/Items/SunfuryPotion.cs +++ b/Items/SunfuryPotion.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases all stats during daytime"); } - public override bool UseItem(Player player) { player.AddBuff(mod.BuffType("DayHunting"), 14400); diff --git a/Items/SuperBigCannon.cs b/Items/SuperBigCannon.cs index f731c69a..46f6b1fe 100644 --- a/Items/SuperBigCannon.cs +++ b/Items/SuperBigCannon.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Seriously big cannon!'"); } - public override Vector2? HoldoutOffset() { return new Vector2(-18, -4); diff --git a/Items/SuperHealingFlask.cs b/Items/SuperHealingFlask.cs index 84dda0a7..1522e783 100644 --- a/Items/SuperHealingFlask.cs +++ b/Items/SuperHealingFlask.cs @@ -25,7 +25,6 @@ public override void SetDefaults() item.UseSound = SoundID.Item106; item.value = 7; - item.rare = 8; item.autoReuse = false; item.ammo = mod.ItemType("BoomFlask"); @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and restore health"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("HealingCloudPro"); diff --git a/Items/SuperManaFlask.cs b/Items/SuperManaFlask.cs index 6e04f432..f5d6ca97 100644 --- a/Items/SuperManaFlask.cs +++ b/Items/SuperManaFlask.cs @@ -27,7 +27,6 @@ public override void SetDefaults() item.rare = 8; item.autoReuse = false; - item.ammo = mod.ItemType("BoomFlask"); } @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Throws a flask that explodes into clouds\nClouds deal damage to enemies and restore mana"); } - public override void PickAmmo(Player player, ref int type, ref float speed, ref int damage, ref float knockback) { type = mod.ProjectileType("ManaCloudPro"); diff --git a/Items/SuspiciousBag.cs b/Items/SuspiciousBag.cs index cbc8ed63..f7bcb653 100644 --- a/Items/SuspiciousBag.cs +++ b/Items/SuspiciousBag.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.height = 34; item.value = 20000; - item.rare = 11; } @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Right click to open\n'Contains powerful treasures'"); } - public override bool CanRightClick() { return true; diff --git a/Items/SwampClump.cs b/Items/SwampClump.cs index cd846084..5828d100 100644 --- a/Items/SwampClump.cs +++ b/Items/SwampClump.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Greatly reduces movement speed\nProlonged after hit invicibility\nGreatly increases life regeneration"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.moveSpeed -= 0.4f; diff --git a/Items/TatteredBanner.cs b/Items/TatteredBanner.cs index 89ba3a50..556bea1a 100644 --- a/Items/TatteredBanner.cs +++ b/Items/TatteredBanner.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("25% increased all damage if placed"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TechnologyofDionysus.cs b/Items/TechnologyofDionysus.cs index ebb7cea1..d5034e60 100644 --- a/Items/TechnologyofDionysus.cs +++ b/Items/TechnologyofDionysus.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Enemies are less likely to target you"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/TempleCannon.cs b/Items/TempleCannon.cs index 6cf64e32..0fa027a6 100644 --- a/Items/TempleCannon.cs +++ b/Items/TempleCannon.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/Tent.cs b/Items/Tent.cs index b6fb219e..c52dd790 100644 --- a/Items/Tent.cs +++ b/Items/Tent.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TheArtifact.cs b/Items/TheArtifact.cs index ce925fb3..54902ffc 100644 --- a/Items/TheArtifact.cs +++ b/Items/TheArtifact.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons annoying dog"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/TheBooger.cs b/Items/TheBooger.cs index 35503133..acd03ccc 100644 --- a/Items/TheBooger.cs +++ b/Items/TheBooger.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TheCreator.cs b/Items/TheCreator.cs index 96d7f23a..389819a3 100644 --- a/Items/TheCreator.cs +++ b/Items/TheCreator.cs @@ -11,7 +11,6 @@ public override void SetDefaults() item.width = 22; item.height = 44; - item.value = 10000; item.rare = 4; item.defense = 9; @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased all damage and crit\nIncreases maximum mana and health by 100"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.magicDamage += 0.15f; diff --git a/Items/TheCrescent.cs b/Items/TheCrescent.cs index b40fcb4a..2456b2b6 100644 --- a/Items/TheCrescent.cs +++ b/Items/TheCrescent.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool ConsumeAmmo(Player p) { return Main.rand.Next(2) == 0; diff --git a/Items/TheGlorch.cs b/Items/TheGlorch.cs index 7e12a677..e266b1e2 100644 --- a/Items/TheGlorch.cs +++ b/Items/TheGlorch.cs @@ -30,8 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(3) == 0) diff --git a/Items/TheTide.cs b/Items/TheTide.cs index a4c99895..1975bf9b 100644 --- a/Items/TheTide.cs +++ b/Items/TheTide.cs @@ -21,7 +21,6 @@ public override void SetDefaults() item.knockBack = 6; item.value = 50000; - item.rare = 5; item.UseSound = SoundID.Item11; item.autoReuse = true; @@ -36,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots fast moving water bolts\nUses bullets as ammo"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = 27; diff --git a/Items/TheUltimateBoomstick.cs b/Items/TheUltimateBoomstick.cs index 1b1f83b8..66f55210 100644 --- a/Items/TheUltimateBoomstick.cs +++ b/Items/TheUltimateBoomstick.cs @@ -27,7 +27,6 @@ public override void SetDefaults() item.shootSpeed = 5f; item.useAmmo = AmmoID.Bullet; - } public override void SetStaticDefaults() @@ -36,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Has a chance to shoot moon flames\n'What can be better than a giant shotgun!?'"); } - public override Vector2? HoldoutOffset() { return new Vector2(-18, 0); @@ -52,7 +50,6 @@ public override bool Shoot(Player player, ref Vector2 position, ref float speedX type = 645; } - for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. { Projectile.NewProjectile(position.X, position.Y, speedX + 2, speedY + 2, type, damage, knockBack, Main.myPlayer); diff --git a/Items/ThrowerEmblem.cs b/Items/ThrowerEmblem.cs index 13567827..dad00de9 100644 --- a/Items/ThrowerEmblem.cs +++ b/Items/ThrowerEmblem.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased throwing damage"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.thrownDamage += 0.15f; diff --git a/Items/ThrowerFocus.cs b/Items/ThrowerFocus.cs index c82bd208..0960b379 100644 --- a/Items/ThrowerFocus.cs +++ b/Items/ThrowerFocus.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 2; item.accessory = true; item.value = 100000; diff --git a/Items/ThrowerSoul.cs b/Items/ThrowerSoul.cs index 7b1a3383..eae57219 100644 --- a/Items/ThrowerSoul.cs +++ b/Items/ThrowerSoul.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 3; item.accessory = true; item.value = 50000; diff --git a/Items/ThrowerSpark.cs b/Items/ThrowerSpark.cs index cfe82968..d40d7dc5 100644 --- a/Items/ThrowerSpark.cs +++ b/Items/ThrowerSpark.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.rare = 1; item.accessory = true; item.value = 20000; diff --git a/Items/TikiArmor.cs b/Items/TikiArmor.cs index e7c36912..2d4ea94e 100644 --- a/Items/TikiArmor.cs +++ b/Items/TikiArmor.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("15% increased minion damage"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.15f; diff --git a/Items/TikiTotemBag.cs b/Items/TikiTotemBag.cs index 1335d47d..bcd79a84 100644 --- a/Items/TikiTotemBag.cs +++ b/Items/TikiTotemBag.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("{$CommonItemTooltip.RightClickToOpen}"); } - public override bool CanRightClick() { return true; diff --git a/Items/TinSpear.cs b/Items/TinSpear.cs index 0fb8fcaf..47005bc7 100644 --- a/Items/TinSpear.cs +++ b/Items/TinSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TitaniumDisc.cs b/Items/TitaniumDisc.cs index d2ab9890..849b4887 100644 --- a/Items/TitaniumDisc.cs +++ b/Items/TitaniumDisc.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool CanUseItem(Player player) { for (int i = 0; i < 1000; ++i) diff --git a/Items/TitaniumHeader.cs b/Items/TitaniumHeader.cs index 9b806c57..c79b9ab3 100644 --- a/Items/TitaniumHeader.cs +++ b/Items/TitaniumHeader.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class TitaniumHeader : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases thrown damage by 24%"); } - public override void UpdateEquip(Player player) { player.thrownDamage += 0.24f; diff --git a/Items/TitaniumHood.cs b/Items/TitaniumHood.cs index 4c42fe6b..9311021d 100644 --- a/Items/TitaniumHood.cs +++ b/Items/TitaniumHood.cs @@ -8,8 +8,6 @@ namespace Tremor.Items public class TitaniumHood : ModItem { - - public override void SetDefaults() { @@ -27,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage by 24%"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.24f; diff --git a/Items/TitaniumStaff.cs b/Items/TitaniumStaff.cs index 3935c3f3..49127fff 100644 --- a/Items/TitaniumStaff.cs +++ b/Items/TitaniumStaff.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("TitaniumBolt"); diff --git a/Items/TitaniumWarhammer.cs b/Items/TitaniumWarhammer.cs index 3bc3bbd9..71e5bdf8 100644 --- a/Items/TitaniumWarhammer.cs +++ b/Items/TitaniumWarhammer.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TombRaider.cs b/Items/TombRaider.cs index e5f59ce3..c2ce01f0 100644 --- a/Items/TombRaider.cs +++ b/Items/TombRaider.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(31, 30); diff --git a/Items/ToothofAbraxas.cs b/Items/ToothofAbraxas.cs index a74d01fe..b95692b8 100644 --- a/Items/ToothofAbraxas.cs +++ b/Items/ToothofAbraxas.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/TopazBlade.cs b/Items/TopazBlade.cs index ccfb12a2..4541b02a 100644 --- a/Items/TopazBlade.cs +++ b/Items/TopazBlade.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 64); diff --git a/Items/ToxicClaymore.cs b/Items/ToxicClaymore.cs index 08e168fd..17652ab1 100644 --- a/Items/ToxicClaymore.cs +++ b/Items/ToxicClaymore.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TrebleClef.cs b/Items/TrebleClef.cs index 8084be26..6bcd5fe9 100644 --- a/Items/TrebleClef.cs +++ b/Items/TrebleClef.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/TriangleMask.cs b/Items/TriangleMask.cs index d606eb70..5dcb3682 100644 --- a/Items/TriangleMask.cs +++ b/Items/TriangleMask.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class TriangleMask : ModItem { - public override void SetDefaults() { @@ -22,6 +21,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/TrueArachnophobia.cs b/Items/TrueArachnophobia.cs index facf49e9..534c40e6 100644 --- a/Items/TrueArachnophobia.cs +++ b/Items/TrueArachnophobia.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/TrueBeamSword.cs b/Items/TrueBeamSword.cs index 6513b04a..20d095cf 100644 --- a/Items/TrueBeamSword.cs +++ b/Items/TrueBeamSword.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots a beam of light"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TrueBloodCarnage.cs b/Items/TrueBloodCarnage.cs index 478c37d7..18546f30 100644 --- a/Items/TrueBloodCarnage.cs +++ b/Items/TrueBloodCarnage.cs @@ -32,8 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 60); diff --git a/Items/TrueBloodshed.cs b/Items/TrueBloodshed.cs index 5975f0a7..20fbe99a 100644 --- a/Items/TrueBloodshed.cs +++ b/Items/TrueBloodshed.cs @@ -11,7 +11,6 @@ public override void SetDefaults() item.width = 22; item.height = 44; - item.value = 10000; item.rare = 4; item.defense = 6; @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("12% increased melee, magic, minion, ranged damage and crit\nIncreases maximum mana and health by 80"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.magicDamage += 0.12f; diff --git a/Items/TrueDeathSickle.cs b/Items/TrueDeathSickle.cs index b32b1fb7..4315c9bc 100644 --- a/Items/TrueDeathSickle.cs +++ b/Items/TrueDeathSickle.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool UseItemFrame(Player player) { player.bodyFrame.Y = 3 * player.bodyFrame.Height; diff --git a/Items/TrueEssense.cs b/Items/TrueEssense.cs index a86de89d..ac5235fc 100644 --- a/Items/TrueEssense.cs +++ b/Items/TrueEssense.cs @@ -26,12 +26,10 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); } - } } diff --git a/Items/TrueHeroHood.cs b/Items/TrueHeroHood.cs index 6af676c2..cc6b9d0f 100644 --- a/Items/TrueHeroHood.cs +++ b/Items/TrueHeroHood.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Gives one of three true blades"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/TrueHeroPants.cs b/Items/TrueHeroPants.cs index 113b0508..09e5aad0 100644 --- a/Items/TrueHeroPants.cs +++ b/Items/TrueHeroPants.cs @@ -9,7 +9,6 @@ namespace Tremor.Items public class TrueHeroPants : ModItem { - public override void SetDefaults() { @@ -27,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Gives one of three true blades"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); @@ -50,5 +48,4 @@ public override void AddRecipes() } } - } diff --git a/Items/TrueHeroShirt.cs b/Items/TrueHeroShirt.cs index 778116ff..ed1e3404 100644 --- a/Items/TrueHeroShirt.cs +++ b/Items/TrueHeroShirt.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Gives one of three true blades"); } - public override void UpdateEquip(Player player) { player.AddBuff(mod.BuffType("SecondTrueBlade"), 2); diff --git a/Items/TrueNightsWatch.cs b/Items/TrueNightsWatch.cs index 27d44df1..f9b18257 100644 --- a/Items/TrueNightsWatch.cs +++ b/Items/TrueNightsWatch.cs @@ -11,7 +11,6 @@ public override void SetDefaults() item.width = 22; item.height = 44; - item.value = 10000; item.rare = 4; item.defense = 6; @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("12% increased melee, magic, minion, ranged damage and crit\nIncreases maximum mana and health by 80"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.magicDamage += 0.12f; diff --git a/Items/TrueSanctifier.cs b/Items/TrueSanctifier.cs index 821576a0..99a0adb7 100644 --- a/Items/TrueSanctifier.cs +++ b/Items/TrueSanctifier.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical and throwing damage by 30%"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.GetModPlayer(mod).alchemicalDamage += 0.3f; diff --git a/Items/TrueTerraBlade.cs b/Items/TrueTerraBlade.cs index 597df8c6..6f12df1d 100644 --- a/Items/TrueTerraBlade.cs +++ b/Items/TrueTerraBlade.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Shining, shimmering, splendid!'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TrustMask.cs b/Items/TrustMask.cs index 7c3ceae0..e831c15f 100644 --- a/Items/TrustMask.cs +++ b/Items/TrustMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class TrustMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/TruthMask.cs b/Items/TruthMask.cs index 06bcd004..e3cb55af 100644 --- a/Items/TruthMask.cs +++ b/Items/TruthMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class TruthMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/TungstenBullet.cs b/Items/TungstenBullet.cs index bd794a4f..16082bdc 100644 --- a/Items/TungstenBullet.cs +++ b/Items/TungstenBullet.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TungstenSpear.cs b/Items/TungstenSpear.cs index 38893e90..2962d10b 100644 --- a/Items/TungstenSpear.cs +++ b/Items/TungstenSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TurtleGreatsword.cs b/Items/TurtleGreatsword.cs index 35dd86b6..7f43d77a 100644 --- a/Items/TurtleGreatsword.cs +++ b/Items/TurtleGreatsword.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(36, 300); diff --git a/Items/TurtlePitchfork.cs b/Items/TurtlePitchfork.cs index a3daf9ea..57b21e77 100644 --- a/Items/TurtlePitchfork.cs +++ b/Items/TurtlePitchfork.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/TurtleShield.cs b/Items/TurtleShield.cs index 23194f86..face7776 100644 --- a/Items/TurtleShield.cs +++ b/Items/TurtleShield.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less health, the more defense..."); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/TwilightHorns.cs b/Items/TwilightHorns.cs index b0749c9c..1438371c 100644 --- a/Items/TwilightHorns.cs +++ b/Items/TwilightHorns.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("You gain more power during night"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/TwilightKnife.cs b/Items/TwilightKnife.cs index c5acfdfd..bb857508 100644 --- a/Items/TwilightKnife.cs +++ b/Items/TwilightKnife.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { for (int i = 0; i < 1; ++i) // Will shoot 3 bullets. diff --git a/Items/UnchargedBand.cs b/Items/UnchargedBand.cs index f8551d63..0be797bd 100644 --- a/Items/UnchargedBand.cs +++ b/Items/UnchargedBand.cs @@ -10,7 +10,6 @@ public override void SetDefaults() item.rare = 11; item.value = 380000; - } public override void SetStaticDefaults() @@ -19,6 +18,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Can be charged with fragments\nCharged band summons a pet"); } - } } diff --git a/Items/UnderratedTrinkets.cs b/Items/UnderratedTrinkets.cs index b66b7ced..5cb50a21 100644 --- a/Items/UnderratedTrinkets.cs +++ b/Items/UnderratedTrinkets.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class UnderratedTrinkets : ModItem { - public override void SetDefaults() { @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("The less health, the more stats bonuses you gain"); } - public override void UpdateAccessory(Player player, bool hideVisual) { @@ -98,7 +96,6 @@ public override void UpdateAccessory(Player player, bool hideVisual) } } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/UnfathomableFlower.cs b/Items/UnfathomableFlower.cs index 1e44cda0..041e3ac6 100644 --- a/Items/UnfathomableFlower.cs +++ b/Items/UnfathomableFlower.cs @@ -30,6 +30,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git "a/Items/Unpredictable\320\241ompass.cs" "b/Items/Unpredictable\320\241ompass.cs" index fe01d947..3043e099 100644 --- "a/Items/Unpredictable\320\241ompass.cs" +++ "b/Items/Unpredictable\320\241ompass.cs" @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Teleports you to a random location"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { player.TeleportationPotion(); diff --git a/Items/UnstableCrystal.cs b/Items/UnstableCrystal.cs index c0190e4d..6307d86a 100644 --- a/Items/UnstableCrystal.cs +++ b/Items/UnstableCrystal.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 44; item.height = 48; - item.useTime = 30; item.useAnimation = 30; item.useStyle = 4; @@ -32,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Teleports you to a random location\n'Be careful! It can take you to a very dangerous place!'"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { player.TeleportationPotion(); diff --git a/Items/VampireDagger.cs b/Items/VampireDagger.cs index 5ab0c95f..8fab2703 100644 --- a/Items/VampireDagger.cs +++ b/Items/VampireDagger.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/ViciousChestplate.cs b/Items/ViciousChestplate.cs index b5eb67fc..63c474f8 100644 --- a/Items/ViciousChestplate.cs +++ b/Items/ViciousChestplate.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 30000; item.rare = 1; item.defense = 5; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("8% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/ViciousHelmet.cs b/Items/ViciousHelmet.cs index a7646441..b65e45c4 100644 --- a/Items/ViciousHelmet.cs +++ b/Items/ViciousHelmet.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class ViciousHelmet : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 30000; item.rare = 1; item.defense = 1; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/ViciousLeggings.cs b/Items/ViciousLeggings.cs index f05391f3..7c30942e 100644 --- a/Items/ViciousLeggings.cs +++ b/Items/ViciousLeggings.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class ViciousLeggings : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 30000; item.rare = 1; item.defense = 1; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/VileChestplate.cs b/Items/VileChestplate.cs index ccea2e44..fa49c4a1 100644 --- a/Items/VileChestplate.cs +++ b/Items/VileChestplate.cs @@ -12,7 +12,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 30000; item.rare = 1; item.defense = 4; @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("8% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/VileHelmet.cs b/Items/VileHelmet.cs index 821f77cf..8ddd5d23 100644 --- a/Items/VileHelmet.cs +++ b/Items/VileHelmet.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class VileHelmet : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 30000; item.rare = 1; item.defense = 1; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/VileLeggings.cs b/Items/VileLeggings.cs index febd0fd2..ee60e7ae 100644 --- a/Items/VileLeggings.cs +++ b/Items/VileLeggings.cs @@ -7,14 +7,12 @@ namespace Tremor.Items public class VileLeggings : ModItem { - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 30000; item.rare = 1; item.defense = 1; @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/VineCape.cs b/Items/VineCape.cs index a2ef1ba9..0818030a 100644 --- a/Items/VineCape.cs +++ b/Items/VineCape.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased ranged damage"); } - public override void UpdateEquip(Player player) { player.rangedDamage += 0.05f; diff --git a/Items/VineHood.cs b/Items/VineHood.cs index 6637e377..fa35c9a3 100644 --- a/Items/VineHood.cs +++ b/Items/VineHood.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class VineHood : ModItem { - public override void SetDefaults() { diff --git a/Items/VinePants.cs b/Items/VinePants.cs index 40bd9a51..e5d2518c 100644 --- a/Items/VinePants.cs +++ b/Items/VinePants.cs @@ -8,7 +8,6 @@ namespace Tremor.Items public class VinePants : ModItem { - public override void SetDefaults() { @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("5% increased ranged damage"); } - public override void UpdateEquip(Player player) { player.rangedDamage += 0.05f; diff --git a/Items/VoidBar.cs b/Items/VoidBar.cs index 3f88a28e..0b748dee 100644 --- a/Items/VoidBar.cs +++ b/Items/VoidBar.cs @@ -27,6 +27,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/VoidBlade.cs b/Items/VoidBlade.cs index e94bed79..c606f266 100644 --- a/Items/VoidBlade.cs +++ b/Items/VoidBlade.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/Volcannon.cs b/Items/Volcannon.cs index 8502bc18..70e45f5f 100644 --- a/Items/Volcannon.cs +++ b/Items/Volcannon.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/Voltager.cs b/Items/Voltager.cs index 4a87c79c..c3a237af 100644 --- a/Items/Voltager.cs +++ b/Items/Voltager.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/VortexBand.cs b/Items/VortexBand.cs index e56a589d..2afe9320 100644 --- a/Items/VortexBand.cs +++ b/Items/VortexBand.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a vortex bee"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/VortexRing.cs b/Items/VortexRing.cs index f5947673..664911bc 100644 --- a/Items/VortexRing.cs +++ b/Items/VortexRing.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("20% increased ranged damage\nIncreases ranged critical strike chance by 15\n25% chance not to consume ammo"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.rangedDamage += 0.2f; diff --git a/Items/VulcanBlade.cs b/Items/VulcanBlade.cs index e000c45b..c609dad9 100644 --- a/Items/VulcanBlade.cs +++ b/Items/VulcanBlade.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots a molten bolt that leaves molten spheres behind\nSpheres home on enemies, explode on contact and set enemies on fire"); } - public override void ModifyTooltips(List tooltips) { tooltips[0].overrideColor = new Color(238, 194, 73); diff --git a/Items/VultureFeather.cs b/Items/VultureFeather.cs index 7b436b82..bb6d57bd 100644 --- a/Items/VultureFeather.cs +++ b/Items/VultureFeather.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases movement speed by 15%"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.moveSpeed += 0.15f; diff --git a/Items/VultureKingMask.cs b/Items/VultureKingMask.cs index 0be0ec54..fed2835c 100644 --- a/Items/VultureKingMask.cs +++ b/Items/VultureKingMask.cs @@ -6,8 +6,6 @@ namespace Tremor.Items public class VultureKingMask : ModItem { - - public override void SetDefaults() { diff --git a/Items/VultureWings.cs b/Items/VultureWings.cs index a46f5eeb..8f57126c 100644 --- a/Items/VultureWings.cs +++ b/Items/VultureWings.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 100; diff --git a/Items/WarpPad.cs b/Items/WarpPad.cs index 7c0cb49b..f2657d1c 100644 --- a/Items/WarpPad.cs +++ b/Items/WarpPad.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Teleports you to your last death point upon use"); } - public override bool UseItem(Player player) { if (player.lastDeathPostion != player.position && player.showLastDeath) diff --git a/Items/WarriorFocus.cs b/Items/WarriorFocus.cs index 2681d6f8..d59b385c 100644 --- a/Items/WarriorFocus.cs +++ b/Items/WarriorFocus.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.accessory = true; item.defense = 3; item.rare = 2; diff --git a/Items/WarriorGreaves.cs b/Items/WarriorGreaves.cs index 7d42fbd4..fcf795f6 100644 --- a/Items/WarriorGreaves.cs +++ b/Items/WarriorGreaves.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class WarriorGreaves : ModItem { - public override void SetDefaults() { diff --git a/Items/WarriorHelmet.cs b/Items/WarriorHelmet.cs index 6b2b0933..53e260bb 100644 --- a/Items/WarriorHelmet.cs +++ b/Items/WarriorHelmet.cs @@ -6,7 +6,6 @@ namespace Tremor.Items public class WarriorHelmet : ModItem { - public override void SetDefaults() { diff --git a/Items/WarriorSoul.cs b/Items/WarriorSoul.cs index 1105b4c0..0b14b1a1 100644 --- a/Items/WarriorSoul.cs +++ b/Items/WarriorSoul.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.accessory = true; item.defense = 4; item.rare = 3; @@ -28,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("10% increased melee damage\nIncreases melee critical strike chance by 15"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.meleeDamage += 0.1f; diff --git a/Items/WarriorSpark.cs b/Items/WarriorSpark.cs index 51e1c420..3c486a1c 100644 --- a/Items/WarriorSpark.cs +++ b/Items/WarriorSpark.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 22; item.height = 22; - item.accessory = true; item.defense = 2; item.rare = 1; diff --git a/Items/WartimeRocketLauncher.cs b/Items/WartimeRocketLauncher.cs index 984aab95..f7950bea 100644 --- a/Items/WartimeRocketLauncher.cs +++ b/Items/WartimeRocketLauncher.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override Vector2? HoldoutOffset() { return new Vector2(-14, -2); diff --git a/Items/WaterDeadShot.cs b/Items/WaterDeadShot.cs index a0c380a8..7168f28e 100644 --- a/Items/WaterDeadShot.cs +++ b/Items/WaterDeadShot.cs @@ -17,7 +17,6 @@ public override void SetDefaults() item.ranged = true; item.shoot = 27; - item.shootSpeed = 23f; item.useAnimation = 30; item.useStyle = 5; @@ -35,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots water streams\nUses arrows as ammo"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = 27; diff --git a/Items/WaterSpear.cs b/Items/WaterSpear.cs index 2a8054b5..07a8b863 100644 --- a/Items/WaterSpear.cs +++ b/Items/WaterSpear.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/WaterStorm.cs b/Items/WaterStorm.cs index bc0b5e44..7de80b0a 100644 --- a/Items/WaterStorm.cs +++ b/Items/WaterStorm.cs @@ -11,7 +11,6 @@ public override void SetDefaults() item.width = 22; item.height = 44; - item.value = 15000; item.rare = 3; item.defense = 3; @@ -24,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases magic critical strike chance by 10%\nIncreases maximum mana by 40"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.statManaMax2 += 40; diff --git a/Items/WhaleFlippers.cs b/Items/WhaleFlippers.cs index 5f3942e3..2caac52a 100644 --- a/Items/WhaleFlippers.cs +++ b/Items/WhaleFlippers.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows flight and slow fall"); } - //these wings use the same values as the solar wings public override void UpdateAccessory(Player player, bool hideVisual) diff --git a/Items/WhiteCrossguardPhasesaber.cs b/Items/WhiteCrossguardPhasesaber.cs index 84907363..73bceb1f 100644 --- a/Items/WhiteCrossguardPhasesaber.cs +++ b/Items/WhiteCrossguardPhasesaber.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 63); diff --git a/Items/WhiteGoldBreastplate.cs b/Items/WhiteGoldBreastplate.cs index a183d564..55d290d6 100644 --- a/Items/WhiteGoldBreastplate.cs +++ b/Items/WhiteGoldBreastplate.cs @@ -24,14 +24,12 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases melee and ranged critical strike chances by 25%"); } - public override void UpdateEquip(Player player) { player.rangedCrit += 25; player.meleeCrit += 25; } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/WhiteGoldGreaves.cs b/Items/WhiteGoldGreaves.cs index 4d7a8c07..79536c08 100644 --- a/Items/WhiteGoldGreaves.cs +++ b/Items/WhiteGoldGreaves.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class WhiteGoldGreaves : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("50% increased movement speed"); } - public override void UpdateEquip(Player player) { player.moveSpeed += 0.5f; diff --git a/Items/WhiteGoldHelmet.cs b/Items/WhiteGoldHelmet.cs index 00fcba33..9f7fde4a 100644 --- a/Items/WhiteGoldHelmet.cs +++ b/Items/WhiteGoldHelmet.cs @@ -19,15 +19,12 @@ public class WhiteGoldHelmet : ModItem int TimeToShoot = ShootRate; - - public override void SetDefaults() { item.width = 38; item.height = 22; - item.value = 10000; item.rare = 11; item.defense = 30; @@ -39,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases ranged damage by 20%\nIncreases melee damage by 20%"); } - public override void UpdateEquip(Player player) { player.rangedDamage += 0.2f; diff --git a/Items/WhiteSakura.cs b/Items/WhiteSakura.cs index 78465937..8a47a12b 100644 --- a/Items/WhiteSakura.cs +++ b/Items/WhiteSakura.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a white wind to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/WolfClaws.cs b/Items/WolfClaws.cs index 68bcfc20..df6baf92 100644 --- a/Items/WolfClaws.cs +++ b/Items/WolfClaws.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/WolfHood.cs b/Items/WolfHood.cs index a135a57c..0b10f3d8 100644 --- a/Items/WolfHood.cs +++ b/Items/WolfHood.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class WolfHood : ModItem { - public override void SetDefaults() { @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased minion damage"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.06f; diff --git a/Items/WolfJerkin.cs b/Items/WolfJerkin.cs index b7f5d5c9..2511e9df 100644 --- a/Items/WolfJerkin.cs +++ b/Items/WolfJerkin.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.height = 26; item.rare = 1; - item.value = 100; item.defense = 4; } @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased minion damage\nIncreases your max number of minions"); } - public override void UpdateEquip(Player player) { player.maxMinions += 1; diff --git a/Items/WolfLeggings.cs b/Items/WolfLeggings.cs index 1ae09619..73a580e7 100644 --- a/Items/WolfLeggings.cs +++ b/Items/WolfLeggings.cs @@ -7,7 +7,6 @@ namespace Tremor.Items public class WolfLeggings : ModItem { - public override void SetDefaults() { @@ -15,7 +14,6 @@ public override void SetDefaults() item.height = 18; item.rare = 1; - item.value = 100; item.defense = 3; } @@ -26,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("6% increased minion damage\nIncreases movement speed"); } - public override void UpdateEquip(Player player) { player.minionDamage += 0.06f; diff --git a/Items/WoodenCross.cs b/Items/WoodenCross.cs index de93dfe8..74e5895f 100644 --- a/Items/WoodenCross.cs +++ b/Items/WoodenCross.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/Items/WoodenFrame.cs b/Items/WoodenFrame.cs index a2e18196..5f702e8c 100644 --- a/Items/WoodenFrame.cs +++ b/Items/WoodenFrame.cs @@ -22,6 +22,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/WoodenPiranha.cs b/Items/WoodenPiranha.cs index 87a305e8..dae78116 100644 --- a/Items/WoodenPiranha.cs +++ b/Items/WoodenPiranha.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override bool IsQuestFish() { return true; diff --git a/Items/WrathofWraith.cs b/Items/WrathofWraith.cs index 6c47175d..2ebbafd8 100644 --- a/Items/WrathofWraith.cs +++ b/Items/WrathofWraith.cs @@ -34,6 +34,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/YellowCrossguardPhasesaber.cs b/Items/YellowCrossguardPhasesaber.cs index 21334d51..136e312b 100644 --- a/Items/YellowCrossguardPhasesaber.cs +++ b/Items/YellowCrossguardPhasesaber.cs @@ -31,8 +31,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override void MeleeEffects(Player player, Rectangle hitbox) { int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 64); diff --git a/Items/YellowPuzzleFragment.cs b/Items/YellowPuzzleFragment.cs index db078bce..941f122d 100644 --- a/Items/YellowPuzzleFragment.cs +++ b/Items/YellowPuzzleFragment.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - } } diff --git a/Items/YinYangLance.cs b/Items/YinYangLance.cs index 60418bf6..954bd1f5 100644 --- a/Items/YinYangLance.cs +++ b/Items/YinYangLance.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) { target.AddBuff(31, 60); diff --git a/Items/Zephyrhorn.cs b/Items/Zephyrhorn.cs index 83e55708..8755aefe 100644 --- a/Items/Zephyrhorn.cs +++ b/Items/Zephyrhorn.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases minion damage and size"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.AddBuff(mod.BuffType("ZephyrhornBuff"), 2); diff --git a/Items/ZerokkBody.cs b/Items/ZerokkBody.cs index 6b17b043..db59f7ea 100644 --- a/Items/ZerokkBody.cs +++ b/Items/ZerokkBody.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Great for impersonating devs!'"); } - public override void UpdateEquip(Player player) { if (player.name == "Error 404") diff --git a/Items/ZerokkHead.cs b/Items/ZerokkHead.cs index 34a6df75..9156d7c8 100644 --- a/Items/ZerokkHead.cs +++ b/Items/ZerokkHead.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Great for impersonating devs!'"); } - public override bool IsArmorSet(Item head, Item body, Item legs) { return body.type == mod.ItemType("ZerokkBody") && legs.type == mod.ItemType("ZerokkLegs"); diff --git a/Items/ZombatStaff.cs b/Items/ZombatStaff.cs index 72f99bb4..a29f6fc4 100644 --- a/Items/ZombatStaff.cs +++ b/Items/ZombatStaff.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a zombat to fight for you."); } - public override bool AltFunctionUse(Player player) { return true; diff --git a/Items/ZootalooEgg.cs b/Items/ZootalooEgg.cs index 47be1ffb..f9da71f2 100644 --- a/Items/ZootalooEgg.cs +++ b/Items/ZootalooEgg.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons an zootaloo junior"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/Items/itemBoneHook.cs b/Items/itemBoneHook.cs index 15ef9f8c..e4b48718 100644 --- a/Items/itemBoneHook.cs +++ b/Items/itemBoneHook.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'Fresh meat!'"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/NPCs/AndasBoss/Andas.cs b/NPCs/AndasBoss/Andas.cs index 46e485bc..c7c14a59 100644 --- a/NPCs/AndasBoss/Andas.cs +++ b/NPCs/AndasBoss/Andas.cs @@ -132,7 +132,6 @@ public override void AI() npc.position.Y = (Main.player[npc.target].position.Y - 500) + Main.rand.Next(1000); } - if (Timer == 850) { for (int i = 0; i < 50; i++) @@ -148,7 +147,6 @@ public override void AI() npc.position.Y = (Main.player[npc.target].position.Y - 500) + Main.rand.Next(1000); } - if (Timer == 1000) { for (int i = 0; i < 50; i++) diff --git a/NPCs/AndasBoss/TrueAndas.cs b/NPCs/AndasBoss/TrueAndas.cs index 512a9068..41d06115 100644 --- a/NPCs/AndasBoss/TrueAndas.cs +++ b/NPCs/AndasBoss/TrueAndas.cs @@ -114,7 +114,6 @@ public override void AI() npc.position.Y = (Main.player[npc.target].position.Y - 500) + Main.rand.Next(1000); } - if (Timer == 850) { for (int i = 0; i < 50; i++) @@ -127,7 +126,6 @@ public override void AI() npc.position.Y = (Main.player[npc.target].position.Y - 500) + Main.rand.Next(1000); } - if (Timer == 1000) { for (int i = 0; i < 50; i++) diff --git a/NPCs/AndasBoss/UndeadWyrmHead.cs b/NPCs/AndasBoss/UndeadWyrmHead.cs index 7c2acc6e..87d9b96d 100644 --- a/NPCs/AndasBoss/UndeadWyrmHead.cs +++ b/NPCs/AndasBoss/UndeadWyrmHead.cs @@ -52,7 +52,6 @@ public override void SetDefaults() npc.lavaImmune = true; } - public override void AI() { npc.position += npc.velocity * (2 - 1); diff --git a/NPCs/Banshee.cs b/NPCs/Banshee.cs index 3e52313c..2ad45965 100644 --- a/NPCs/Banshee.cs +++ b/NPCs/Banshee.cs @@ -70,7 +70,6 @@ public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) return true; } - public override void NPCLoot() { if (Main.rand.Next(2) == 0) diff --git a/NPCs/Brutallisk.cs b/NPCs/Brutallisk.cs index 1c384703..0a3d705e 100644 --- a/NPCs/Brutallisk.cs +++ b/NPCs/Brutallisk.cs @@ -68,7 +68,6 @@ public override void ScaleExpertStats(int numPlayers, float bossLifeScale) npc.damage = (int)(npc.damage * 0.6f); } - public override void HitEffect(int hitDirection, double damage) { if (npc.life <= 0) @@ -501,7 +500,6 @@ public override void AI() NPC.NewNPC((int)npc.position.Y + 100, (int)npc.position.Y, mod.NPCType("Quetzalcoatl")); } - } Vector2 VelocityFPTP(Vector2 pos1, Vector2 pos2, float speed) diff --git a/NPCs/Brute.cs b/NPCs/Brute.cs index 9de6c830..02a0c90b 100644 --- a/NPCs/Brute.cs +++ b/NPCs/Brute.cs @@ -66,7 +66,6 @@ public override void AI() Main.PlaySound(22, (int)npc.position.X, (int)npc.position.Y, 1); } - public override float SpawnChance(NPCSpawnInfo spawnInfo) { return Helper.NormalSpawn(spawnInfo) && Helper.NoZoneAllowWater(spawnInfo) && NPC.downedMoonlord && Main.hardMode && !Main.dayTime && spawnInfo.spawnTileY < Main.worldSurface ? 0.001f : 0f; diff --git a/NPCs/CyberKing.cs b/NPCs/CyberKing.cs index 20c3dd6c..3f4981c0 100644 --- a/NPCs/CyberKing.cs +++ b/NPCs/CyberKing.cs @@ -15,7 +15,6 @@ public override void SetStaticDefaults() Main.npcFrameCount[npc.type] = 6; } - public override void HitEffect(int hitDirection, double damage) { if (npc.life <= 0) @@ -52,7 +51,6 @@ public override void SetDefaults() bossBag = mod.ItemType("CyberKingBag"); } - public override void ScaleExpertStats(int numPlayers, float bossLifeScale) { npc.lifeMax = (int)(npc.lifeMax * 0.625f * bossLifeScale); @@ -72,7 +70,6 @@ public override void AI() NPC.NewNPC((int)npc.position.X, (int)npc.position.Y - 60, mod.NPCType("Cybermite")); } - bool allDead = false; for (int i = 0; i < Main.player.Length; i++) { diff --git a/NPCs/DesertPrincess.cs b/NPCs/DesertPrincess.cs index 5fcf85de..5663e872 100644 --- a/NPCs/DesertPrincess.cs +++ b/NPCs/DesertPrincess.cs @@ -501,7 +501,6 @@ public override void AI() } } - public override float SpawnChance(NPCSpawnInfo spawnInfo) { return spawnInfo.player.ZoneJungle && NPC.downedPlantBoss ? 0.001f : 0f; diff --git a/NPCs/Dragon_HeadB.cs b/NPCs/Dragon_HeadB.cs index 3915d348..18c2d19d 100644 --- a/NPCs/Dragon_HeadB.cs +++ b/NPCs/Dragon_HeadB.cs @@ -78,7 +78,6 @@ public override void NPCLoot() TremorWorld.Boss.AncientDragon.Downed(); } - public override void AI() { npc.position += npc.velocity * (2 - 1); diff --git a/NPCs/FrostKing.cs b/NPCs/FrostKing.cs index 56211260..0a633720 100644 --- a/NPCs/FrostKing.cs +++ b/NPCs/FrostKing.cs @@ -15,7 +15,6 @@ public override void SetStaticDefaults() Main.npcFrameCount[npc.type] = 8; } - private float timeToNextFrame; private int frame; diff --git a/NPCs/JungleSpirit.cs b/NPCs/JungleSpirit.cs index 565b3bce..b63657a4 100644 --- a/NPCs/JungleSpirit.cs +++ b/NPCs/JungleSpirit.cs @@ -50,5 +50,3 @@ public override float SpawnChance(NPCSpawnInfo spawnInfo) } } - - diff --git a/NPCs/MagiumKeeper.cs b/NPCs/MagiumKeeper.cs index 739f3961..582e4567 100644 --- a/NPCs/MagiumKeeper.cs +++ b/NPCs/MagiumKeeper.cs @@ -263,7 +263,6 @@ public override void AI() } } - public override void NPCLoot() { if (Main.rand.NextBool()) diff --git a/NPCs/Mothership.cs b/NPCs/Mothership.cs index 131a4ab8..0b833464 100644 --- a/NPCs/Mothership.cs +++ b/NPCs/Mothership.cs @@ -15,7 +15,6 @@ public override void SetStaticDefaults() Main.npcFrameCount[npc.type] = 8; } - private float timeToNextFrame; public int frame; @@ -44,8 +43,6 @@ public override void SetDefaults() private float lifeTime; private bool Rage; - - public Vector2 bossCenter { get { return npc.Center; } @@ -69,7 +66,6 @@ public override void HitEffect(int hitDirection, double damage) } } - public override void AI() { bool allDead = false; diff --git a/NPCs/Phabor.cs b/NPCs/Phabor.cs index 4459b2d7..34b70017 100644 --- a/NPCs/Phabor.cs +++ b/NPCs/Phabor.cs @@ -58,7 +58,6 @@ public override void AI() } } - public override void NPCLoot() { if (Main.rand.NextBool()) diff --git a/NPCs/PixieQueen.cs b/NPCs/PixieQueen.cs index 044f40e9..3683aa10 100644 --- a/NPCs/PixieQueen.cs +++ b/NPCs/PixieQueen.cs @@ -55,14 +55,12 @@ public class PixieQueen : ModNPC public static bool phase2; public static bool phase3; - public override void SetStaticDefaults() { DisplayName.SetDefault("Pixie Queen"); Main.npcFrameCount[npc.type] = 8; } - public override void SetDefaults() { npc.aiStyle = 63; diff --git a/NPCs/ShadowHand.cs b/NPCs/ShadowHand.cs index b2ff82c8..f346fa01 100644 --- a/NPCs/ShadowHand.cs +++ b/NPCs/ShadowHand.cs @@ -41,7 +41,6 @@ public override void ScaleExpertStats(int numPlayers, float bossLifeScale) npc.damage = (int)(npc.damage * 0.6f); } - public override bool PreAI() { if (npc.justHit) @@ -205,7 +204,6 @@ public override void HitEffect(int hitDirection, double damage) } } - public override void FindFrame(int frameHeight) { npc.frameCounter++; diff --git a/NPCs/ShadowHandTwo.cs b/NPCs/ShadowHandTwo.cs index b09bd897..b89eed1e 100644 --- a/NPCs/ShadowHandTwo.cs +++ b/NPCs/ShadowHandTwo.cs @@ -13,7 +13,6 @@ public override void SetStaticDefaults() Main.npcFrameCount[npc.type] = 2; } - public override void SetDefaults() { npc.lifeMax = 780; diff --git a/NPCs/ShadowSteed.cs b/NPCs/ShadowSteed.cs index 4f627e55..6117c272 100644 --- a/NPCs/ShadowSteed.cs +++ b/NPCs/ShadowSteed.cs @@ -34,7 +34,6 @@ public override void ModifyHitPlayer(Player target, ref int damage, ref bool cri target.AddBuff(153, 180); } - public override void HitEffect(int hitDirection, double damage) { if (npc.life <= 0) diff --git a/NPCs/SignalDrone.cs b/NPCs/SignalDrone.cs index 8febf272..b5dd1501 100644 --- a/NPCs/SignalDrone.cs +++ b/NPCs/SignalDrone.cs @@ -55,7 +55,6 @@ public override void OnHitPlayer(Player target, int damage, bool crit) public override bool CanHitPlayer(Player target, ref int cooldownSlot) => _immuneTime <= 0; - public override void AI() { CheckParent(); diff --git a/NPCs/SoulofHope.cs b/NPCs/SoulofHope.cs index dcbd77af..3fab9b30 100644 --- a/NPCs/SoulofHope.cs +++ b/NPCs/SoulofHope.cs @@ -303,9 +303,6 @@ public override void NPCLoot() int centerY = (int)(npc.position.Y + npc.height / 2) / 16; int halfLength = npc.width / 2 / 16 + 1; - - - if (!NPC.AnyNPCs(mod.NPCType("SoulofTruth")) && !NPC.AnyNPCs(mod.NPCType("SoulofTrust"))) { @@ -325,7 +322,6 @@ public override void NPCLoot() Main.NewText("This world has been enlightened with Angelite!", 0, 191, 255); Main.NewText("This world has been attacked with Collapsium!", 255, 20, 147); - for (int k = 0; k < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 6E-05); k++) { WorldGen.TileRunner(WorldGen.genRand.Next(0, Main.maxTilesX), WorldGen.genRand.Next((int)(Main.maxTilesY * .3f), (int)(Main.maxTilesY * .65f)), WorldGen.genRand.Next(9, 15), WorldGen.genRand.Next(9, 15), mod.TileType("CollapsiumOreTile"), false, 0f, 0f, false, true); @@ -339,7 +335,6 @@ public override void NPCLoot() } - if (!Main.expertMode && Main.rand.Next(7) == 0) { Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("HopeMask")); diff --git a/NPCs/SoulofTrust.cs b/NPCs/SoulofTrust.cs index 7e56dcc2..32166587 100644 --- a/NPCs/SoulofTrust.cs +++ b/NPCs/SoulofTrust.cs @@ -169,7 +169,6 @@ public override void AI() Main.dust[num706].velocity *= 0.6f; } - if (npc.target != -1 && !RunAway) //если(пнс.цель не варно -1 И не убегать) if (!Main.player[npc.target].active) //если (не мой.игрок[нпс.цель].активный) { @@ -327,9 +326,6 @@ public override void NPCLoot() int centerY = (int)(npc.position.Y + npc.height / 2) / 16; int halfLength = npc.width / 2 / 16 + 1; - - - if (!NPC.AnyNPCs(mod.NPCType("SoulofHope")) && !NPC.AnyNPCs(mod.NPCType("SoulofTruth"))) { @@ -362,7 +358,6 @@ public override void NPCLoot() } - if (!Main.expertMode && Main.rand.Next(7) == 0) { Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("ThrustMask")); diff --git a/NPCs/SoulofTruth.cs b/NPCs/SoulofTruth.cs index b6b83a16..58d3c13d 100644 --- a/NPCs/SoulofTruth.cs +++ b/NPCs/SoulofTruth.cs @@ -301,9 +301,6 @@ public override void NPCLoot() int centerY = (int)(npc.position.Y + npc.height / 2) / 16; int halfLength = npc.width / 2 / 16 + 1; - - - if (!NPC.AnyNPCs(mod.NPCType("SoulofHope")) && !NPC.AnyNPCs(mod.NPCType("SoulofTrust"))) { @@ -323,7 +320,6 @@ public override void NPCLoot() Main.NewText("This world has been enlightened with Angelite!", 0, 191, 255); Main.NewText("This world has been attacked with Collapsium!", 255, 20, 147); - for (int k = 0; k < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 6E-05); k++) { WorldGen.TileRunner(WorldGen.genRand.Next(0, Main.maxTilesX), WorldGen.genRand.Next((int)(Main.maxTilesY * .3f), (int)(Main.maxTilesY * .65f)), WorldGen.genRand.Next(9, 15), WorldGen.genRand.Next(9, 15), mod.TileType("CollapsiumOreTile"), false, 0f, 0f, false, true); @@ -337,7 +333,6 @@ public override void NPCLoot() } - if (!Main.expertMode && Main.rand.Next(7) == 0) { Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("ThruthMask")); diff --git a/NPCs/SpaceWhale.cs b/NPCs/SpaceWhale.cs index 6b0a6bbd..b6f95da6 100644 --- a/NPCs/SpaceWhale.cs +++ b/NPCs/SpaceWhale.cs @@ -15,8 +15,6 @@ public override void SetStaticDefaults() Main.npcFrameCount[npc.type] = 8; } - - public override void SetDefaults() { npc.width = 500; @@ -37,7 +35,6 @@ public override void SetDefaults() bossBag = mod.ItemType("SpaceWhaleTreasureBag"); } - public override void HitEffect(int hitDirection, double damage) { if (npc.life <= 0) @@ -789,7 +786,6 @@ public override void NPCLoot() int CenterY = (int)(npc.Center.Y + npc.height / 2) / 16; int halfLength = npc.width / 2 / 16 + 1; - if (!TremorWorld.Boss.SpaceWhale.IsDowned()) { Main.NewText("A comet has struck the ground!", 117, 187, 253); diff --git a/NPCs/StormJellyfish.cs b/NPCs/StormJellyfish.cs index 85694ce4..9614add1 100644 --- a/NPCs/StormJellyfish.cs +++ b/NPCs/StormJellyfish.cs @@ -123,7 +123,6 @@ Vector2 VelocityFPTP(Vector2 pos1, Vector2 pos2, float speed) return move * (speed / (float)Math.Sqrt(move.X * move.X + move.Y * move.Y)); } - public override void NPCLoot() { if (Main.netMode != 1) diff --git a/NPCs/TheDarkEmperor.cs b/NPCs/TheDarkEmperor.cs index 9ced0acc..38ccdd35 100644 --- a/NPCs/TheDarkEmperor.cs +++ b/NPCs/TheDarkEmperor.cs @@ -15,8 +15,6 @@ public override void SetStaticDefaults() Main.npcFrameCount[npc.type] = 14; } - - public override void SetDefaults() { npc.width = 126; diff --git a/NPCs/TheDarkEmperorTwo.cs b/NPCs/TheDarkEmperorTwo.cs index c56603ed..403edb22 100644 --- a/NPCs/TheDarkEmperorTwo.cs +++ b/NPCs/TheDarkEmperorTwo.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Main.npcFrameCount[npc.type] = 6; } - public override void SetDefaults() { npc.aiStyle = -1; @@ -52,7 +51,6 @@ public override void SetDefaults() npc.npcSlots = 10f; } - public override void ScaleExpertStats(int numPlayers, float bossLifeScale) { npc.lifeMax = (int)(npc.lifeMax * 0.625f * bossLifeScale); @@ -64,7 +62,6 @@ public override void AI() Lighting.AddLight(npc.position, 1f, 0.3f, 0.3f); - bool allDead = false; for (int i = 0; i < Main.player.Length; i++) { @@ -398,7 +395,6 @@ public override void NPCLoot() int centerY = (int)(npc.position.Y + npc.height / 2) / 16; int halfLength = npc.width / 2 / 16 + 1; - if (!Main.expertMode && Main.rand.Next(7) == 0) { Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("DarkEmperorMask")); diff --git a/NPCs/TikiSoul.cs b/NPCs/TikiSoul.cs index 7fbdab7a..3b9916d5 100644 --- a/NPCs/TikiSoul.cs +++ b/NPCs/TikiSoul.cs @@ -62,7 +62,6 @@ public override bool PreAI() return false; } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Texture2D drawTexture = Main.npcTexture[npc.type]; diff --git a/NPCs/TownNPCs/Sorcerer.cs b/NPCs/TownNPCs/Sorcerer.cs index a935ca1d..53e0badb 100644 --- a/NPCs/TownNPCs/Sorcerer.cs +++ b/NPCs/TownNPCs/Sorcerer.cs @@ -53,7 +53,6 @@ public override void SetDefaults() public override bool CanTownNPCSpawn(int numTownNPCs, int money) => true; - private readonly WeightedRandom _names = new[] { "Merdok:2", diff --git a/NPCs/TownNPCs/Warlock.cs b/NPCs/TownNPCs/Warlock.cs index 9c98d59f..cb8c2c5b 100644 --- a/NPCs/TownNPCs/Warlock.cs +++ b/NPCs/TownNPCs/Warlock.cs @@ -138,7 +138,6 @@ public override void TownNPCAttackProjSpeed(ref float multiplier, ref float grav randomOffset = 2f; } - public override void HitEffect(int hitDirection, double damage) { if (npc.life <= 0) diff --git a/NPCs/TremorNPC.cs b/NPCs/TremorNPC.cs index 8c77c3f4..afce1f76 100644 --- a/NPCs/TremorNPC.cs +++ b/NPCs/TremorNPC.cs @@ -79,7 +79,6 @@ public override void NPCLoot(NPC npc) if (Main.rand.Next(7) == 1) Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("IceSoul")); - } } @@ -477,7 +476,6 @@ public override void NPCLoot(NPC npc) mod.ItemType("HeavenLeggings")); } - if (npc.type == 13 && Main.rand.Next(20) == 0) { Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, @@ -635,7 +633,6 @@ public override void NPCLoot(NPC npc) mod.ItemType("ClusterShard"), Main.rand.Next(1, 2)); } - if ((npc.type == 175 || npc.type == 205 || npc.type == 226) && NPC.downedMoonlord && Main.rand.Next(4) == 0) { Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, diff --git a/NPCs/UndeadWarlock.cs b/NPCs/UndeadWarlock.cs index a9498d2e..62922623 100644 --- a/NPCs/UndeadWarlock.cs +++ b/NPCs/UndeadWarlock.cs @@ -75,7 +75,6 @@ public override void HitEffect(int hitDirection, double damage) } } - public override float SpawnChance(NPCSpawnInfo spawnInfo) => Helper.NormalSpawn(spawnInfo) && Helper.NoZoneAllowWater(spawnInfo) && NPC.downedBoss3 && !Main.dayTime && spawnInfo.spawnTileY < Main.worldSurface ? 0.008f : 0f; } diff --git a/NPCs/WallOfShadow.cs b/NPCs/WallOfShadow.cs index febd3f50..6b65d12e 100644 --- a/NPCs/WallOfShadow.cs +++ b/NPCs/WallOfShadow.cs @@ -409,7 +409,6 @@ public override bool PreAI() } } - if (npc.localAI[0] != 1.0 || Main.netMode == 1) return false; npc.localAI[0] = 2f; @@ -694,7 +693,6 @@ public override bool PreAI() } - return false; } diff --git a/NPCs/npcVultureKing.cs b/NPCs/npcVultureKing.cs index 94827d52..ea0e5295 100644 --- a/NPCs/npcVultureKing.cs +++ b/NPCs/npcVultureKing.cs @@ -53,7 +53,6 @@ public class npcVultureKing : ModNPC bool runAway; #endregion - public override void SetStaticDefaults() { DisplayName.SetDefault("Rukh"); diff --git a/NovaPillar/Items/Accessories/NovaWings.cs b/NovaPillar/Items/Accessories/NovaWings.cs index 1705e90c..7c5a2cec 100644 --- a/NovaPillar/Items/Accessories/NovaWings.cs +++ b/NovaPillar/Items/Accessories/NovaWings.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Allows flight and slow fall"); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 334; diff --git a/NovaPillar/Items/Armor/NovaBreastplate.cs b/NovaPillar/Items/Armor/NovaBreastplate.cs index 3a253fd9..020c9c03 100644 --- a/NovaPillar/Items/Armor/NovaBreastplate.cs +++ b/NovaPillar/Items/Armor/NovaBreastplate.cs @@ -20,7 +20,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases alchemical damage by 25% and critical strike chance by 20%\nGrants 40% chance to not consume flasks"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalCrit += 20; diff --git a/NovaPillar/Items/NovaDye.cs b/NovaPillar/Items/NovaDye.cs index ccf199a3..8c42d4ed 100644 --- a/NovaPillar/Items/NovaDye.cs +++ b/NovaPillar/Items/NovaDye.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { var recipe = new ModRecipe(mod); diff --git a/NovaPillar/Items/NovaFragment.cs b/NovaPillar/Items/NovaFragment.cs index 4b0e55ff..228a8dda 100644 --- a/NovaPillar/Items/NovaFragment.cs +++ b/NovaPillar/Items/NovaFragment.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("'The constituents of stars are contained in this fragment'"); } - public override void PostUpdate() { Lighting.AddLight(item.Center, new Vector3(0.8f, 0.7f, 0.3f) * Main.essScale); diff --git a/NovaPillar/Items/Placeable/NovaFragmentBlock.cs b/NovaPillar/Items/Placeable/NovaFragmentBlock.cs index 4139a139..55a4ed82 100644 --- a/NovaPillar/Items/Placeable/NovaFragmentBlock.cs +++ b/NovaPillar/Items/Placeable/NovaFragmentBlock.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Nova Fragment Block"); } - public override void AddRecipes() { var recipe = new ModRecipe(mod); diff --git a/NovaPillar/Items/Weapons/NovaFlask.cs b/NovaPillar/Items/Weapons/NovaFlask.cs index 5b9c3dc4..66e5a2e5 100644 --- a/NovaPillar/Items/Weapons/NovaFlask.cs +++ b/NovaPillar/Items/Weapons/NovaFlask.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots out a nova flask that explodes into two balls\nBalls explode into flames after some time or when they hit enemy\nFlames explode into damagin bursts after some time or when they hit enemy"); } - public override void UpdateInventory(Player player) { MPlayer modPlayer = player.GetModPlayer(mod); diff --git a/NovaPillar/Items/Weapons/NovaHamaxe.cs b/NovaPillar/Items/Weapons/NovaHamaxe.cs index 6894838c..b636b96f 100644 --- a/NovaPillar/Items/Weapons/NovaHamaxe.cs +++ b/NovaPillar/Items/Weapons/NovaHamaxe.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() TremorGlowMask.AddGlowMask(item.type, "Tremor/NovaPillar/Items/Weapons/NovaHamaxe_Glow"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/NovaPillar/Items/Weapons/NovaPickaxe.cs b/NovaPillar/Items/Weapons/NovaPickaxe.cs index 9b5a09b3..fa15d4eb 100644 --- a/NovaPillar/Items/Weapons/NovaPickaxe.cs +++ b/NovaPillar/Items/Weapons/NovaPickaxe.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() TremorGlowMask.AddGlowMask(item.type, "Tremor/NovaPillar/Items/Weapons/NovaPickaxe_Glow"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/NovaPillar/Items/Weapons/NovaSprayer.cs b/NovaPillar/Items/Weapons/NovaSprayer.cs index 9e801bd8..2885ba71 100644 --- a/NovaPillar/Items/Weapons/NovaSprayer.cs +++ b/NovaPillar/Items/Weapons/NovaSprayer.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots a burst of nova balls which explode into flames when hit enemy or after some time,\n flames explode into damaging bursts when hit enemy or after some time."); } - public override Vector2? HoldoutOffset() { return new Vector2(-15, 0); diff --git a/NovaPillar/Projectiles/NovaBlast.cs b/NovaPillar/Projectiles/NovaBlast.cs index 5e62576a..9bc0cd56 100644 --- a/NovaPillar/Projectiles/NovaBlast.cs +++ b/NovaPillar/Projectiles/NovaBlast.cs @@ -17,8 +17,6 @@ public override void SetDefaults() projectile.penetrate = -1; } - - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/NovaPillar/Projectiles/NovaBurst.cs b/NovaPillar/Projectiles/NovaBurst.cs index ab908d91..6fd4a1d9 100644 --- a/NovaPillar/Projectiles/NovaBurst.cs +++ b/NovaPillar/Projectiles/NovaBurst.cs @@ -17,8 +17,6 @@ public override void SetDefaults() projectile.penetrate = -1; } - - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/NovaPillar/Projectiles/NovaFlask_Proj.cs b/NovaPillar/Projectiles/NovaFlask_Proj.cs index dcc414f8..dd58e371 100644 --- a/NovaPillar/Projectiles/NovaFlask_Proj.cs +++ b/NovaPillar/Projectiles/NovaFlask_Proj.cs @@ -66,8 +66,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - - public override void AI() { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("TheCadenceBuff"))) diff --git a/NovaPillar/Projectiles/NovaFlask_ProjBall.cs b/NovaPillar/Projectiles/NovaFlask_ProjBall.cs index 89fb63ce..fee86194 100644 --- a/NovaPillar/Projectiles/NovaFlask_ProjBall.cs +++ b/NovaPillar/Projectiles/NovaFlask_ProjBall.cs @@ -30,8 +30,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; @@ -207,7 +205,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -265,7 +262,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("NovaSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); diff --git a/NovaPillar/Projectiles/NovaFlask_ProjFire.cs b/NovaPillar/Projectiles/NovaFlask_ProjFire.cs index f82c19b9..05bac2ca 100644 --- a/NovaPillar/Projectiles/NovaFlask_ProjFire.cs +++ b/NovaPillar/Projectiles/NovaFlask_ProjFire.cs @@ -23,8 +23,6 @@ public override void SetDefaults() return Color.White; } - - public override bool PreAI() { projectile.frameCounter++; diff --git a/NovaPillar/Projectiles/NovaFlierProj.cs b/NovaPillar/Projectiles/NovaFlierProj.cs index 76695d76..ce879b92 100644 --- a/NovaPillar/Projectiles/NovaFlierProj.cs +++ b/NovaPillar/Projectiles/NovaFlierProj.cs @@ -30,7 +30,6 @@ public override void AI() projectile.rotation = (float)Math.Atan2(projectile.velocity.Y, projectile.velocity.X) + 1.57f; } - public override void Kill(int timeLeft) { for (int i = 0; i < 5; i++) diff --git a/NovaPillar/Projectiles/NovaSkull.cs b/NovaPillar/Projectiles/NovaSkull.cs index 1b7592f1..954fca5d 100644 --- a/NovaPillar/Projectiles/NovaSkull.cs +++ b/NovaPillar/Projectiles/NovaSkull.cs @@ -20,8 +20,6 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 15; } - - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/NovaPillar/Projectiles/NovaSkullburst.cs b/NovaPillar/Projectiles/NovaSkullburst.cs index d4bfe92d..ac9f08b6 100644 --- a/NovaPillar/Projectiles/NovaSkullburst.cs +++ b/NovaPillar/Projectiles/NovaSkullburst.cs @@ -17,8 +17,6 @@ public override void SetDefaults() projectile.penetrate = -1; } - - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/AdamantiteBolt.cs b/Projectiles/AdamantiteBolt.cs index eab80243..47de00c5 100644 --- a/Projectiles/AdamantiteBolt.cs +++ b/Projectiles/AdamantiteBolt.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/AdamantiteCloud.cs b/Projectiles/AdamantiteCloud.cs index bf764946..a06fe934 100644 --- a/Projectiles/AdamantiteCloud.cs +++ b/Projectiles/AdamantiteCloud.cs @@ -22,8 +22,5 @@ public override void SetStaticDefaults() } - - - } } diff --git a/Projectiles/AdamantiteDiscPro.cs b/Projectiles/AdamantiteDiscPro.cs index b4489e63..f5dd698c 100644 --- a/Projectiles/AdamantiteDiscPro.cs +++ b/Projectiles/AdamantiteDiscPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/AlchemasterPoisonCloudPro.cs b/Projectiles/AlchemasterPoisonCloudPro.cs index e259b1e1..4b65bda5 100644 --- a/Projectiles/AlchemasterPoisonCloudPro.cs +++ b/Projectiles/AlchemasterPoisonCloudPro.cs @@ -24,8 +24,6 @@ public override void SetStaticDefaults() } - - public override void OnHitPlayer(Player target, int damage, bool crit) { if (Main.rand.NextBool()) diff --git a/Projectiles/Alchemic/BasicFlaskPro.cs b/Projectiles/Alchemic/BasicFlaskPro.cs index e8858262..efd407b1 100644 --- a/Projectiles/Alchemic/BasicFlaskPro.cs +++ b/Projectiles/Alchemic/BasicFlaskPro.cs @@ -87,10 +87,6 @@ public override void AI() } } - - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -316,7 +312,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -374,7 +369,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("BasicSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); diff --git a/Projectiles/Alchemic/BigHealingFlackPro.cs b/Projectiles/Alchemic/BigHealingFlackPro.cs index 7d25e4d0..c4e0ec50 100644 --- a/Projectiles/Alchemic/BigHealingFlackPro.cs +++ b/Projectiles/Alchemic/BigHealingFlackPro.cs @@ -86,9 +86,6 @@ public override void AI() } } - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -119,7 +116,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void Kill(int timeLeft) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("DesertEmperorSetBuff"))) @@ -316,7 +312,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -374,7 +369,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("HealingSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -497,7 +491,5 @@ public override void Kill(int timeLeft) } } - - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/BigManaFlaskPro.cs b/Projectiles/Alchemic/BigManaFlaskPro.cs index 71694742..5316b961 100644 --- a/Projectiles/Alchemic/BigManaFlaskPro.cs +++ b/Projectiles/Alchemic/BigManaFlaskPro.cs @@ -86,9 +86,6 @@ public override void AI() } } - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -119,7 +116,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void Kill(int timeLeft) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("DesertEmperorSetBuff"))) @@ -316,7 +312,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -374,7 +369,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("ManaSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -497,7 +491,5 @@ public override void Kill(int timeLeft) } } - - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/BigPoisonFlaskPro.cs b/Projectiles/Alchemic/BigPoisonFlaskPro.cs index aeaf003f..bd2b2134 100644 --- a/Projectiles/Alchemic/BigPoisonFlaskPro.cs +++ b/Projectiles/Alchemic/BigPoisonFlaskPro.cs @@ -86,9 +86,6 @@ public override void AI() } } - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -119,7 +116,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void Kill(int timeLeft) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("DesertEmperorSetBuff"))) @@ -316,7 +312,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -374,7 +369,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("PoisonSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -497,6 +491,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/BigVenomFlaskPro.cs b/Projectiles/Alchemic/BigVenomFlaskPro.cs index b49837ca..6c86926d 100644 --- a/Projectiles/Alchemic/BigVenomFlaskPro.cs +++ b/Projectiles/Alchemic/BigVenomFlaskPro.cs @@ -86,11 +86,6 @@ public override void AI() } } - - - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -121,7 +116,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void Kill(int timeLeft) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("DesertEmperorSetBuff"))) @@ -318,7 +312,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -376,7 +369,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("PurpleSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -499,6 +491,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/BoomFlaskPro.cs b/Projectiles/Alchemic/BoomFlaskPro.cs index 06dcf719..16e6c54d 100644 --- a/Projectiles/Alchemic/BoomFlaskPro.cs +++ b/Projectiles/Alchemic/BoomFlaskPro.cs @@ -86,8 +86,6 @@ public override void AI() } } - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -118,7 +116,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void Kill(int timeLeft) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("DesertEmperorSetBuff"))) @@ -379,7 +376,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -437,7 +433,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("BoomSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -560,6 +555,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/BurningFlaskPro.cs b/Projectiles/Alchemic/BurningFlaskPro.cs index b704c9cb..3b4c406e 100644 --- a/Projectiles/Alchemic/BurningFlaskPro.cs +++ b/Projectiles/Alchemic/BurningFlaskPro.cs @@ -86,11 +86,6 @@ public override void AI() } } - - - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -317,7 +312,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -375,7 +369,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("FierySkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -498,6 +491,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/BasicBurst.cs b/Projectiles/Alchemic/Bursts/BasicBurst.cs index 8d85e66c..b6e12546 100644 --- a/Projectiles/Alchemic/Bursts/BasicBurst.cs +++ b/Projectiles/Alchemic/Bursts/BasicBurst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/BasicSkull.cs b/Projectiles/Alchemic/Bursts/BasicSkull.cs index 5bd3eb5f..54c35b7a 100644 --- a/Projectiles/Alchemic/Bursts/BasicSkull.cs +++ b/Projectiles/Alchemic/Bursts/BasicSkull.cs @@ -21,19 +21,14 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 15; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - - public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -70,8 +65,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/BasicSkullburst.cs b/Projectiles/Alchemic/Bursts/BasicSkullburst.cs index 6498fdf2..632b9c88 100644 --- a/Projectiles/Alchemic/Bursts/BasicSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/BasicSkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/BoomBurst.cs b/Projectiles/Alchemic/Bursts/BoomBurst.cs index 6a281a24..d905c3bd 100644 --- a/Projectiles/Alchemic/Bursts/BoomBurst.cs +++ b/Projectiles/Alchemic/Bursts/BoomBurst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/BoomSkull.cs b/Projectiles/Alchemic/Bursts/BoomSkull.cs index ee65dd2f..34535971 100644 --- a/Projectiles/Alchemic/Bursts/BoomSkull.cs +++ b/Projectiles/Alchemic/Bursts/BoomSkull.cs @@ -21,15 +21,11 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 15; } - - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -113,11 +109,9 @@ public override void Kill(int timeLeft) } } - public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -154,8 +148,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/BoomSkullburst.cs b/Projectiles/Alchemic/Bursts/BoomSkullburst.cs index 6c1e0931..429eeb77 100644 --- a/Projectiles/Alchemic/Bursts/BoomSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/BoomSkullburst.cs @@ -17,9 +17,6 @@ public override void SetDefaults() projectile.penetrate = -1; } - - - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); diff --git a/Projectiles/Alchemic/Bursts/ClusterBurst.cs b/Projectiles/Alchemic/Bursts/ClusterBurst.cs index 6667a20f..d02e4407 100644 --- a/Projectiles/Alchemic/Bursts/ClusterBurst.cs +++ b/Projectiles/Alchemic/Bursts/ClusterBurst.cs @@ -21,19 +21,14 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 20; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - - public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -68,8 +63,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/ClusterSkull.cs b/Projectiles/Alchemic/Bursts/ClusterSkull.cs index c4699827..e7768338 100644 --- a/Projectiles/Alchemic/Bursts/ClusterSkull.cs +++ b/Projectiles/Alchemic/Bursts/ClusterSkull.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/ClusterSkullburst.cs b/Projectiles/Alchemic/Bursts/ClusterSkullburst.cs index 7f6d7234..fff506d2 100644 --- a/Projectiles/Alchemic/Bursts/ClusterSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/ClusterSkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/CrystalBurst.cs b/Projectiles/Alchemic/Bursts/CrystalBurst.cs index 8117db49..d5dbb664 100644 --- a/Projectiles/Alchemic/Bursts/CrystalBurst.cs +++ b/Projectiles/Alchemic/Bursts/CrystalBurst.cs @@ -21,19 +21,14 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 20; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - - public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -68,8 +63,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/CrystalSkull.cs b/Projectiles/Alchemic/Bursts/CrystalSkull.cs index 9b0ac747..19f551f0 100644 --- a/Projectiles/Alchemic/Bursts/CrystalSkull.cs +++ b/Projectiles/Alchemic/Bursts/CrystalSkull.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/CrystalSkullburst.cs b/Projectiles/Alchemic/Bursts/CrystalSkullburst.cs index 18ffcdbc..ab0a2caf 100644 --- a/Projectiles/Alchemic/Bursts/CrystalSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/CrystalSkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/FieryBurst.cs b/Projectiles/Alchemic/Bursts/FieryBurst.cs index 1f6c6c12..14a35b2f 100644 --- a/Projectiles/Alchemic/Bursts/FieryBurst.cs +++ b/Projectiles/Alchemic/Bursts/FieryBurst.cs @@ -21,15 +21,11 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 20; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) @@ -40,7 +36,6 @@ public override void OnHitNPC(NPC target, int damage, float knockback, bool crit public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -75,8 +70,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/FierySkull.cs b/Projectiles/Alchemic/Bursts/FierySkull.cs index 9d107d41..2bbaef65 100644 --- a/Projectiles/Alchemic/Bursts/FierySkull.cs +++ b/Projectiles/Alchemic/Bursts/FierySkull.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) diff --git a/Projectiles/Alchemic/Bursts/FierySkullburst.cs b/Projectiles/Alchemic/Bursts/FierySkullburst.cs index b64c042e..4635b6f1 100644 --- a/Projectiles/Alchemic/Bursts/FierySkullburst.cs +++ b/Projectiles/Alchemic/Bursts/FierySkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) diff --git a/Projectiles/Alchemic/Bursts/FrostBurst.cs b/Projectiles/Alchemic/Bursts/FrostBurst.cs index b45ad86e..bdb578be 100644 --- a/Projectiles/Alchemic/Bursts/FrostBurst.cs +++ b/Projectiles/Alchemic/Bursts/FrostBurst.cs @@ -21,15 +21,11 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 20; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) @@ -40,7 +36,6 @@ public override void OnHitNPC(NPC target, int damage, float knockback, bool crit public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -75,8 +70,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/FrostSkull.cs b/Projectiles/Alchemic/Bursts/FrostSkull.cs index b9a4622f..4e55d353 100644 --- a/Projectiles/Alchemic/Bursts/FrostSkull.cs +++ b/Projectiles/Alchemic/Bursts/FrostSkull.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) diff --git a/Projectiles/Alchemic/Bursts/FrostSkullburst.cs b/Projectiles/Alchemic/Bursts/FrostSkullburst.cs index 5065b1ce..aeb0d7e3 100644 --- a/Projectiles/Alchemic/Bursts/FrostSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/FrostSkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) diff --git a/Projectiles/Alchemic/Bursts/GoldenBurst.cs b/Projectiles/Alchemic/Bursts/GoldenBurst.cs index 6a1242e0..99e57551 100644 --- a/Projectiles/Alchemic/Bursts/GoldenBurst.cs +++ b/Projectiles/Alchemic/Bursts/GoldenBurst.cs @@ -21,15 +21,11 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 20; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.NextBool()) @@ -40,7 +36,6 @@ public override void OnHitNPC(NPC target, int damage, float knockback, bool crit public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -75,8 +70,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/GoldenSkull.cs b/Projectiles/Alchemic/Bursts/GoldenSkull.cs index 4e40830d..53877ab8 100644 --- a/Projectiles/Alchemic/Bursts/GoldenSkull.cs +++ b/Projectiles/Alchemic/Bursts/GoldenSkull.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.NextBool()) diff --git a/Projectiles/Alchemic/Bursts/GoldenSkullburst.cs b/Projectiles/Alchemic/Bursts/GoldenSkullburst.cs index 2685fd97..6d3c255c 100644 --- a/Projectiles/Alchemic/Bursts/GoldenSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/GoldenSkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.NextBool()) diff --git a/Projectiles/Alchemic/Bursts/HealingBurst.cs b/Projectiles/Alchemic/Bursts/HealingBurst.cs index 2fb6b83f..6f161377 100644 --- a/Projectiles/Alchemic/Bursts/HealingBurst.cs +++ b/Projectiles/Alchemic/Bursts/HealingBurst.cs @@ -23,8 +23,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/HealingSkull.cs b/Projectiles/Alchemic/Bursts/HealingSkull.cs index ac95da4e..9fda8a5f 100644 --- a/Projectiles/Alchemic/Bursts/HealingSkull.cs +++ b/Projectiles/Alchemic/Bursts/HealingSkull.cs @@ -27,8 +27,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ConcentratedTinctureBuff"))) @@ -48,7 +46,6 @@ public override void OnHitNPC(NPC target, int damage, float knockback, bool crit public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -85,8 +82,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/HealingSkullburst.cs b/Projectiles/Alchemic/Bursts/HealingSkullburst.cs index 2f421cd3..a0182011 100644 --- a/Projectiles/Alchemic/Bursts/HealingSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/HealingSkullburst.cs @@ -23,8 +23,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ConcentratedTinctureBuff"))) diff --git a/Projectiles/Alchemic/Bursts/ManaBurst.cs b/Projectiles/Alchemic/Bursts/ManaBurst.cs index 72fc9ed2..f5b60458 100644 --- a/Projectiles/Alchemic/Bursts/ManaBurst.cs +++ b/Projectiles/Alchemic/Bursts/ManaBurst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/ManaSkull.cs b/Projectiles/Alchemic/Bursts/ManaSkull.cs index 979b795c..3a533bea 100644 --- a/Projectiles/Alchemic/Bursts/ManaSkull.cs +++ b/Projectiles/Alchemic/Bursts/ManaSkull.cs @@ -21,14 +21,11 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 15; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { int newLife = Main.rand.Next(damage / 2) + 3; @@ -39,7 +36,6 @@ public override void OnHitNPC(NPC target, int damage, float knockback, bool crit public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -76,8 +72,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/ManaSkullburst.cs b/Projectiles/Alchemic/Bursts/ManaSkullburst.cs index 9b3fc300..48f344a1 100644 --- a/Projectiles/Alchemic/Bursts/ManaSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/ManaSkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { int newLife = Main.rand.Next(damage / 2) + 3; diff --git a/Projectiles/Alchemic/Bursts/MoonBurst.cs b/Projectiles/Alchemic/Bursts/MoonBurst.cs index c47f6be1..4cba80a5 100644 --- a/Projectiles/Alchemic/Bursts/MoonBurst.cs +++ b/Projectiles/Alchemic/Bursts/MoonBurst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/MoonSkull.cs b/Projectiles/Alchemic/Bursts/MoonSkull.cs index 6f7c8943..4a647c82 100644 --- a/Projectiles/Alchemic/Bursts/MoonSkull.cs +++ b/Projectiles/Alchemic/Bursts/MoonSkull.cs @@ -21,19 +21,14 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 15; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - - public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -70,8 +65,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/MoonSkullburst.cs b/Projectiles/Alchemic/Bursts/MoonSkullburst.cs index e7601231..a3d3b4af 100644 --- a/Projectiles/Alchemic/Bursts/MoonSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/MoonSkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void AI() { projectile.frameCounter++; diff --git a/Projectiles/Alchemic/Bursts/PoisonBurst.cs b/Projectiles/Alchemic/Bursts/PoisonBurst.cs index c17e8992..84df1924 100644 --- a/Projectiles/Alchemic/Bursts/PoisonBurst.cs +++ b/Projectiles/Alchemic/Bursts/PoisonBurst.cs @@ -21,14 +21,11 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 20; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) @@ -37,11 +34,9 @@ public override void OnHitNPC(NPC target, int damage, float knockback, bool crit } } - public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -76,8 +71,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/PoisonSkull.cs b/Projectiles/Alchemic/Bursts/PoisonSkull.cs index 6a582a98..7c62bd05 100644 --- a/Projectiles/Alchemic/Bursts/PoisonSkull.cs +++ b/Projectiles/Alchemic/Bursts/PoisonSkull.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) diff --git a/Projectiles/Alchemic/Bursts/PoisonSkullburst.cs b/Projectiles/Alchemic/Bursts/PoisonSkullburst.cs index e12c4761..06a71b92 100644 --- a/Projectiles/Alchemic/Bursts/PoisonSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/PoisonSkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) diff --git a/Projectiles/Alchemic/Bursts/PurpleBurst.cs b/Projectiles/Alchemic/Bursts/PurpleBurst.cs index 2a89c6c9..3f967dce 100644 --- a/Projectiles/Alchemic/Bursts/PurpleBurst.cs +++ b/Projectiles/Alchemic/Bursts/PurpleBurst.cs @@ -21,14 +21,11 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 20; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(3) == 0) @@ -41,7 +38,6 @@ public override void OnHitNPC(NPC target, int damage, float knockback, bool crit public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -76,8 +72,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/PurpleSkull.cs b/Projectiles/Alchemic/Bursts/PurpleSkull.cs index fab78eae..39e8a628 100644 --- a/Projectiles/Alchemic/Bursts/PurpleSkull.cs +++ b/Projectiles/Alchemic/Bursts/PurpleSkull.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(3) == 0) diff --git a/Projectiles/Alchemic/Bursts/PurpleSkullburst.cs b/Projectiles/Alchemic/Bursts/PurpleSkullburst.cs index 0c2ef43f..30ec6b55 100644 --- a/Projectiles/Alchemic/Bursts/PurpleSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/PurpleSkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(5) == 0) diff --git a/Projectiles/Alchemic/Bursts/ShadowBurst.cs b/Projectiles/Alchemic/Bursts/ShadowBurst.cs index 094d58a9..1d1e6d9b 100644 --- a/Projectiles/Alchemic/Bursts/ShadowBurst.cs +++ b/Projectiles/Alchemic/Bursts/ShadowBurst.cs @@ -21,14 +21,11 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 20; } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(5) == 0) @@ -40,7 +37,6 @@ public override void OnHitNPC(NPC target, int damage, float knockback, bool crit public override void AI() { - int num613 = 10; int num614 = 15; float num615 = 1f; @@ -75,8 +71,6 @@ public override void AI() } } - - } } } \ No newline at end of file diff --git a/Projectiles/Alchemic/Bursts/ShadowSkull.cs b/Projectiles/Alchemic/Bursts/ShadowSkull.cs index 6d30204d..7e764c02 100644 --- a/Projectiles/Alchemic/Bursts/ShadowSkull.cs +++ b/Projectiles/Alchemic/Bursts/ShadowSkull.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(5) == 0) diff --git a/Projectiles/Alchemic/Bursts/ShadowSkullburst.cs b/Projectiles/Alchemic/Bursts/ShadowSkullburst.cs index 49351195..675954c0 100644 --- a/Projectiles/Alchemic/Bursts/ShadowSkullburst.cs +++ b/Projectiles/Alchemic/Bursts/ShadowSkullburst.cs @@ -22,8 +22,6 @@ public override void SetDefaults() return Color.White; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(5) == 0) diff --git a/Projectiles/Alchemic/ClusterFlaskPro.cs b/Projectiles/Alchemic/ClusterFlaskPro.cs index e0edd715..96ab8dfb 100644 --- a/Projectiles/Alchemic/ClusterFlaskPro.cs +++ b/Projectiles/Alchemic/ClusterFlaskPro.cs @@ -86,13 +86,6 @@ public override void AI() } } - - - - - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -319,7 +312,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -377,7 +369,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("ClusterSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -500,7 +491,5 @@ public override void Kill(int timeLeft) } } - - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/CrystalFlaskPro.cs b/Projectiles/Alchemic/CrystalFlaskPro.cs index aa45e630..fb25288c 100644 --- a/Projectiles/Alchemic/CrystalFlaskPro.cs +++ b/Projectiles/Alchemic/CrystalFlaskPro.cs @@ -87,12 +87,6 @@ public override void AI() } } - - - - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -319,7 +313,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -377,7 +370,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("CrystalSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -500,7 +492,5 @@ public override void Kill(int timeLeft) } } - - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/ExtendedBoomFlaskPro.cs b/Projectiles/Alchemic/ExtendedBoomFlaskPro.cs index b3eabc6e..e0667e2d 100644 --- a/Projectiles/Alchemic/ExtendedBoomFlaskPro.cs +++ b/Projectiles/Alchemic/ExtendedBoomFlaskPro.cs @@ -87,8 +87,6 @@ public override void AI() } } - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -119,7 +117,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void Kill(int timeLeft) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("DesertEmperorSetBuff"))) @@ -380,7 +377,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -438,7 +434,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("BoomSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -561,6 +556,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/ExtendedBurningFlaskPro.cs b/Projectiles/Alchemic/ExtendedBurningFlaskPro.cs index aae50b87..87dc9cd4 100644 --- a/Projectiles/Alchemic/ExtendedBurningFlaskPro.cs +++ b/Projectiles/Alchemic/ExtendedBurningFlaskPro.cs @@ -87,10 +87,6 @@ public override void AI() } } - - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -317,7 +313,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -375,7 +370,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("FierySkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -498,6 +492,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/ExtendedFreezeFlaskPro.cs b/Projectiles/Alchemic/ExtendedFreezeFlaskPro.cs index 066d6d67..46f1de4e 100644 --- a/Projectiles/Alchemic/ExtendedFreezeFlaskPro.cs +++ b/Projectiles/Alchemic/ExtendedFreezeFlaskPro.cs @@ -86,11 +86,6 @@ public override void AI() } } - - - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -317,7 +312,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -375,7 +369,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("FrostSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -498,6 +491,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/FreezeFlaskPro.cs b/Projectiles/Alchemic/FreezeFlaskPro.cs index 5ebe2fcd..990fe3df 100644 --- a/Projectiles/Alchemic/FreezeFlaskPro.cs +++ b/Projectiles/Alchemic/FreezeFlaskPro.cs @@ -87,9 +87,6 @@ public override void AI() } } - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -316,7 +313,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -374,7 +370,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("FrostSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -497,6 +492,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/GoldFlaskPro.cs b/Projectiles/Alchemic/GoldFlaskPro.cs index 11c0c190..7becad84 100644 --- a/Projectiles/Alchemic/GoldFlaskPro.cs +++ b/Projectiles/Alchemic/GoldFlaskPro.cs @@ -313,7 +313,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -371,7 +370,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("GoldenSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -494,6 +492,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/HealthSupportFlaskPro.cs b/Projectiles/Alchemic/HealthSupportFlaskPro.cs index b31ef831..84f0e435 100644 --- a/Projectiles/Alchemic/HealthSupportFlaskPro.cs +++ b/Projectiles/Alchemic/HealthSupportFlaskPro.cs @@ -46,6 +46,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/LesserHealingFlackPro.cs b/Projectiles/Alchemic/LesserHealingFlackPro.cs index 34fdce23..c4093527 100644 --- a/Projectiles/Alchemic/LesserHealingFlackPro.cs +++ b/Projectiles/Alchemic/LesserHealingFlackPro.cs @@ -85,8 +85,6 @@ public override void AI() } } - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -117,7 +115,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void Kill(int timeLeft) { Player player = Main.player[projectile.owner]; @@ -314,7 +311,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -372,7 +368,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("HealingSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -495,6 +490,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/LesserManaFlaskPro.cs b/Projectiles/Alchemic/LesserManaFlaskPro.cs index dedfa3e5..56ba4ddd 100644 --- a/Projectiles/Alchemic/LesserManaFlaskPro.cs +++ b/Projectiles/Alchemic/LesserManaFlaskPro.cs @@ -87,9 +87,6 @@ public override void AI() } } - - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -120,7 +117,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void Kill(int timeLeft) { Player player = Main.player[projectile.owner]; @@ -317,7 +313,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -375,7 +370,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("ManaSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -498,6 +492,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/LesserPoisonFlaskPro.cs b/Projectiles/Alchemic/LesserPoisonFlaskPro.cs index f6fc10fe..b1b39783 100644 --- a/Projectiles/Alchemic/LesserPoisonFlaskPro.cs +++ b/Projectiles/Alchemic/LesserPoisonFlaskPro.cs @@ -311,7 +311,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -369,7 +368,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("PoisonSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -492,7 +490,5 @@ public override void Kill(int timeLeft) } } - - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/LesserVenomFlaskPro.cs b/Projectiles/Alchemic/LesserVenomFlaskPro.cs index 21dcada0..cdc0ca4b 100644 --- a/Projectiles/Alchemic/LesserVenomFlaskPro.cs +++ b/Projectiles/Alchemic/LesserVenomFlaskPro.cs @@ -307,7 +307,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -365,7 +364,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("PurpleSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -488,6 +486,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/MoonDustFlaskPro.cs b/Projectiles/Alchemic/MoonDustFlaskPro.cs index ac2f97e8..80f1593b 100644 --- a/Projectiles/Alchemic/MoonDustFlaskPro.cs +++ b/Projectiles/Alchemic/MoonDustFlaskPro.cs @@ -330,7 +330,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -388,7 +387,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("MoonSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -529,6 +527,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/PhantomFlaskPro.cs b/Projectiles/Alchemic/PhantomFlaskPro.cs index 7d7de3fc..1bf8de34 100644 --- a/Projectiles/Alchemic/PhantomFlaskPro.cs +++ b/Projectiles/Alchemic/PhantomFlaskPro.cs @@ -329,7 +329,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -387,7 +386,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("ShadowSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -510,7 +508,5 @@ public override void Kill(int timeLeft) } } - - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/PlagueFlaskPro.cs b/Projectiles/Alchemic/PlagueFlaskPro.cs index 58ac999d..771d4a81 100644 --- a/Projectiles/Alchemic/PlagueFlaskPro.cs +++ b/Projectiles/Alchemic/PlagueFlaskPro.cs @@ -324,7 +324,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -382,7 +381,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("BigPlague"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); diff --git a/Projectiles/Alchemic/SparkingFlaskPro.cs b/Projectiles/Alchemic/SparkingFlaskPro.cs index 8e7a0d40..f64cee57 100644 --- a/Projectiles/Alchemic/SparkingFlaskPro.cs +++ b/Projectiles/Alchemic/SparkingFlaskPro.cs @@ -326,7 +326,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -384,7 +383,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("SparkingBallz"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); diff --git a/Projectiles/Alchemic/SuperHealingFlaskPro.cs b/Projectiles/Alchemic/SuperHealingFlaskPro.cs index 2ca26c65..f875ac42 100644 --- a/Projectiles/Alchemic/SuperHealingFlaskPro.cs +++ b/Projectiles/Alchemic/SuperHealingFlaskPro.cs @@ -312,7 +312,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -370,7 +369,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("HealingSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -493,6 +491,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/Alchemic/SuperManaFlaskPro.cs b/Projectiles/Alchemic/SuperManaFlaskPro.cs index 98072bd1..03dde389 100644 --- a/Projectiles/Alchemic/SuperManaFlaskPro.cs +++ b/Projectiles/Alchemic/SuperManaFlaskPro.cs @@ -85,8 +85,6 @@ public override void AI() } } - - public override bool OnTileCollide(Vector2 oldVelocity) { if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("BouncingCasingBuff"))) @@ -117,7 +115,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void Kill(int timeLeft) { Player player = Main.player[projectile.owner]; @@ -314,7 +311,6 @@ public override void Kill(int timeLeft) Main.projectile[h].scale = 0.8f; } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("RoundBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -372,7 +368,6 @@ public override void Kill(int timeLeft) int h = Projectile.NewProjectile(projectile.position.X - 30, projectile.position.Y - 30, -3, -3, mod.ProjectileType("ManaSkull"), projectile.damage * 2, 1f, projectile.owner); } - if (Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("SquareBlastBuff")) && Main.player[Main.myPlayer].buffType.Contains(mod.BuffType("ReinforcedBurstBuff"))) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); @@ -495,6 +490,5 @@ public override void Kill(int timeLeft) } } - } } \ No newline at end of file diff --git a/Projectiles/AlphaKnifePro.cs b/Projectiles/AlphaKnifePro.cs index 93fb3d8d..697d018d 100644 --- a/Projectiles/AlphaKnifePro.cs +++ b/Projectiles/AlphaKnifePro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/AmethystDrillPro.cs b/Projectiles/AmethystDrillPro.cs index 8b5f15a2..f43d704c 100644 --- a/Projectiles/AmethystDrillPro.cs +++ b/Projectiles/AmethystDrillPro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 62, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/AncientClaymorePro.cs b/Projectiles/AncientClaymorePro.cs index 7b49df10..cbe76dbb 100644 --- a/Projectiles/AncientClaymorePro.cs +++ b/Projectiles/AncientClaymorePro.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.velocity.Y += projectile.ai[0]; diff --git a/Projectiles/AncientDaggerPro.cs b/Projectiles/AncientDaggerPro.cs index 79927f8b..6b6a0532 100644 --- a/Projectiles/AncientDaggerPro.cs +++ b/Projectiles/AncientDaggerPro.cs @@ -111,6 +111,5 @@ public override void Kill(int timeLeft) return Color.White; } - } } diff --git a/Projectiles/AncientDisc.cs b/Projectiles/AncientDisc.cs index 7573520e..3ad7adf2 100644 --- a/Projectiles/AncientDisc.cs +++ b/Projectiles/AncientDisc.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/AncientFlailPro.cs b/Projectiles/AncientFlailPro.cs index 38d06f41..6580dbc1 100644 --- a/Projectiles/AncientFlailPro.cs +++ b/Projectiles/AncientFlailPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Texture2D texture = ModLoader.GetTexture("Tremor/Projectiles/AncientFlail_Chain"); diff --git a/Projectiles/AncientShield.cs b/Projectiles/AncientShield.cs index 7469e3db..eb24cac6 100644 --- a/Projectiles/AncientShield.cs +++ b/Projectiles/AncientShield.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { float Num = 4f; diff --git a/Projectiles/AncientSunExplosionPro.cs b/Projectiles/AncientSunExplosionPro.cs index 24953b1d..86197728 100644 --- a/Projectiles/AncientSunExplosionPro.cs +++ b/Projectiles/AncientSunExplosionPro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, ((255 - projectile.alpha) * 0.75f) / 255f, ((255 - projectile.alpha) * 0.5f) / 255f, ((255 - projectile.alpha) * 0.01f) / 255f); diff --git a/Projectiles/AncientSunPro.cs b/Projectiles/AncientSunPro.cs index 83c4dd60..12cf1ab1 100644 --- a/Projectiles/AncientSunPro.cs +++ b/Projectiles/AncientSunPro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, ((255 - projectile.alpha) * 0.25f) / 255f, ((255 - projectile.alpha) * 0.2f) / 255f, ((255 - projectile.alpha) * 0.01f) / 255f); diff --git a/Projectiles/AngelTearsPro.cs b/Projectiles/AngelTearsPro.cs index d49a2973..791d9050 100644 --- a/Projectiles/AngelTearsPro.cs +++ b/Projectiles/AngelTearsPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, ((255 - projectile.alpha) * 0.45f) / 255f, ((255 - projectile.alpha) * 0.2f) / 255f, ((255 - projectile.alpha) * 0.1f) / 255f); diff --git a/Projectiles/AnnoyingDog.cs b/Projectiles/AnnoyingDog.cs index 709560d1..5ec12cb5 100644 --- a/Projectiles/AnnoyingDog.cs +++ b/Projectiles/AnnoyingDog.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/ArgiteSpherePro.cs b/Projectiles/ArgiteSpherePro.cs index e4319312..95488d16 100644 --- a/Projectiles/ArgiteSpherePro.cs +++ b/Projectiles/ArgiteSpherePro.cs @@ -25,8 +25,6 @@ public override void SetStaticDefaults() } - - public override bool OnTileCollide(Vector2 oldVelocity) { projectile.penetrate--; diff --git a/Projectiles/AvengerPro.cs b/Projectiles/AvengerPro.cs index 3b3e1a2c..c9ff5d30 100644 --- a/Projectiles/AvengerPro.cs +++ b/Projectiles/AvengerPro.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/AxeofExecutionerPro.cs b/Projectiles/AxeofExecutionerPro.cs index e654b1a0..d98f7351 100644 --- a/Projectiles/AxeofExecutionerPro.cs +++ b/Projectiles/AxeofExecutionerPro.cs @@ -19,6 +19,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/BallChainPro.cs b/Projectiles/BallChainPro.cs index 43dde36e..88b14dfa 100644 --- a/Projectiles/BallChainPro.cs +++ b/Projectiles/BallChainPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Ball n Chain"); } - public override void AI() { Rotation += RotationSpeed; diff --git a/Projectiles/BerserkerPro.cs b/Projectiles/BerserkerPro.cs index c64d7ad8..03ff49f9 100644 --- a/Projectiles/BerserkerPro.cs +++ b/Projectiles/BerserkerPro.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Berserker Sword"); } - public override void AI() { Rotation += RotationSpeed; diff --git a/Projectiles/BestNightmarePro.cs b/Projectiles/BestNightmarePro.cs index 2bea3310..1463fc12 100644 --- a/Projectiles/BestNightmarePro.cs +++ b/Projectiles/BestNightmarePro.cs @@ -23,8 +23,6 @@ public override void SetStaticDefaults() } - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/BicholmereSpearPro.cs b/Projectiles/BicholmereSpearPro.cs index 158a2ec6..e41b347d 100644 --- a/Projectiles/BicholmereSpearPro.cs +++ b/Projectiles/BicholmereSpearPro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/BigPlague.cs b/Projectiles/BigPlague.cs index 9ebe26d7..f1d79396 100644 --- a/Projectiles/BigPlague.cs +++ b/Projectiles/BigPlague.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; @@ -45,8 +44,6 @@ public override void AI() if (projectile.frame >= 4) { projectile.frame = 0; } - - } } } diff --git a/Projectiles/BlackRosePro.cs b/Projectiles/BlackRosePro.cs index 8921e15d..388b9975 100644 --- a/Projectiles/BlackRosePro.cs +++ b/Projectiles/BlackRosePro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 54, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/BloodyArrow.cs b/Projectiles/BloodyArrow.cs index a4d3eae0..05518346 100644 --- a/Projectiles/BloodyArrow.cs +++ b/Projectiles/BloodyArrow.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; @@ -68,7 +67,6 @@ public override void Kill(int timeLeft) } } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/BoneBoltPro.cs b/Projectiles/BoneBoltPro.cs index 4f5e0666..4fb73da0 100644 --- a/Projectiles/BoneBoltPro.cs +++ b/Projectiles/BoneBoltPro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/BoneKnifePro.cs b/Projectiles/BoneKnifePro.cs index e26b7bc9..96ea3d6a 100644 --- a/Projectiles/BoneKnifePro.cs +++ b/Projectiles/BoneKnifePro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/BoneSpike.cs b/Projectiles/BoneSpike.cs index e07e3b75..0dcbaefa 100644 --- a/Projectiles/BoneSpike.cs +++ b/Projectiles/BoneSpike.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 40; k++) diff --git a/Projectiles/BonecrusherPro.cs b/Projectiles/BonecrusherPro.cs index 10045bd5..deab45e0 100644 --- a/Projectiles/BonecrusherPro.cs +++ b/Projectiles/BonecrusherPro.cs @@ -19,6 +19,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/BoonerangPro.cs b/Projectiles/BoonerangPro.cs index 0fdfafe8..1b68a7a0 100644 --- a/Projectiles/BoonerangPro.cs +++ b/Projectiles/BoonerangPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/Bounce.cs b/Projectiles/Bounce.cs index 9f33a704..ac0d6ceb 100644 --- a/Projectiles/Bounce.cs +++ b/Projectiles/Bounce.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - float smooth = 2f; public override bool OnTileCollide(Vector2 oldVelocity) diff --git a/Projectiles/BrainiacWavePro.cs b/Projectiles/BrainiacWavePro.cs index 18e51b43..6f169c15 100644 --- a/Projectiles/BrainiacWavePro.cs +++ b/Projectiles/BrainiacWavePro.cs @@ -11,7 +11,6 @@ public override void SetDefaults() { projectile.CloneDefaults(348); - projectile.timeLeft = 120; aiType = 348; } @@ -22,7 +21,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.rotation = (float)Math.Atan2(projectile.velocity.Y, projectile.velocity.X) + 1.57f; @@ -32,7 +30,6 @@ public override void AI() } } - public override bool OnTileCollide(Vector2 oldVelocity) { for (int i = 0; i < 3; i++) diff --git a/Projectiles/BrassCog.cs b/Projectiles/BrassCog.cs index 2bb99ab7..5b9c5b4e 100644 --- a/Projectiles/BrassCog.cs +++ b/Projectiles/BrassCog.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/BrassGlaive.cs b/Projectiles/BrassGlaive.cs index 229096a6..30d0de6d 100644 --- a/Projectiles/BrassGlaive.cs +++ b/Projectiles/BrassGlaive.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/BrilliantBehemothPro.cs b/Projectiles/BrilliantBehemothPro.cs index 24712c75..9d3e1fc2 100644 --- a/Projectiles/BrilliantBehemothPro.cs +++ b/Projectiles/BrilliantBehemothPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { projectile.penetrate--; diff --git a/Projectiles/Brutty.cs b/Projectiles/Brutty.cs index 07976389..6fd1278e 100644 --- a/Projectiles/Brutty.cs +++ b/Projectiles/Brutty.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/BurningFist.cs b/Projectiles/BurningFist.cs index 918ef928..82e009ec 100644 --- a/Projectiles/BurningFist.cs +++ b/Projectiles/BurningFist.cs @@ -109,7 +109,6 @@ public override void Kill(int timeLeft) } - public override bool CanHitPlayer(Player target) { return false; @@ -120,7 +119,5 @@ public override bool CanHitPlayer(Player target) return (target.friendly) ? false : true; } - - } } diff --git a/Projectiles/BurningHammerPro.cs b/Projectiles/BurningHammerPro.cs index e4337942..7be7d604 100644 --- a/Projectiles/BurningHammerPro.cs +++ b/Projectiles/BurningHammerPro.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override bool CanHitPlayer(Player target) { return false; diff --git a/Projectiles/Carrot.cs b/Projectiles/Carrot.cs index b74af3ee..26372d19 100644 --- a/Projectiles/Carrot.cs +++ b/Projectiles/Carrot.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/ChainedRocketPro.cs b/Projectiles/ChainedRocketPro.cs index 7e82f869..5f82badd 100644 --- a/Projectiles/ChainedRocketPro.cs +++ b/Projectiles/ChainedRocketPro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 6, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 136, default(Color), 0.9f); diff --git a/Projectiles/ChaosStarPro.cs b/Projectiles/ChaosStarPro.cs index b13a4d9d..2d1acab6 100644 --- a/Projectiles/ChaosStarPro.cs +++ b/Projectiles/ChaosStarPro.cs @@ -26,9 +26,6 @@ public override void SetStaticDefaults() } - - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/ChargedArrow.cs b/Projectiles/ChargedArrow.cs index bbc8e53b..a7023502 100644 --- a/Projectiles/ChargedArrow.cs +++ b/Projectiles/ChargedArrow.cs @@ -24,8 +24,6 @@ public override void SetStaticDefaults() } - - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 93); diff --git a/Projectiles/ChargedArrowBoom.cs b/Projectiles/ChargedArrowBoom.cs index 5c97aef3..08a288b0 100644 --- a/Projectiles/ChargedArrowBoom.cs +++ b/Projectiles/ChargedArrowBoom.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, ((255 - projectile.alpha) * 0.75f) / 255f, ((255 - projectile.alpha) * 0.5f) / 255f, ((255 - projectile.alpha) * 0.01f) / 255f); diff --git a/Projectiles/ClusterSpearPro.cs b/Projectiles/ClusterSpearPro.cs index 5d76d747..2879c8f0 100644 --- a/Projectiles/ClusterSpearPro.cs +++ b/Projectiles/ClusterSpearPro.cs @@ -19,7 +19,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, mod.DustType(), projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 136, default(Color), 2.9f); diff --git a/Projectiles/CobaltBolt.cs b/Projectiles/CobaltBolt.cs index 80fc4b0c..a662708e 100644 --- a/Projectiles/CobaltBolt.cs +++ b/Projectiles/CobaltBolt.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/CobaltDiscPro.cs b/Projectiles/CobaltDiscPro.cs index db8491bf..596b53ea 100644 --- a/Projectiles/CobaltDiscPro.cs +++ b/Projectiles/CobaltDiscPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/CogLordLaser.cs b/Projectiles/CogLordLaser.cs index e1eb0f22..9efcbc71 100644 --- a/Projectiles/CogLordLaser.cs +++ b/Projectiles/CogLordLaser.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.localAI[0] += 1f; diff --git a/Projectiles/CopperSpearPro.cs b/Projectiles/CopperSpearPro.cs index d417916f..6c232fa8 100644 --- a/Projectiles/CopperSpearPro.cs +++ b/Projectiles/CopperSpearPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/CorfirePro.cs b/Projectiles/CorfirePro.cs index de800798..059ed9da 100644 --- a/Projectiles/CorfirePro.cs +++ b/Projectiles/CorfirePro.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.rotation = (float)Math.Atan2(projectile.velocity.Y, projectile.velocity.X) + 1.57f; diff --git a/Projectiles/CornJavelinPro.cs b/Projectiles/CornJavelinPro.cs index dded2dd0..019cd8b4 100644 --- a/Projectiles/CornJavelinPro.cs +++ b/Projectiles/CornJavelinPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/CrSpear.cs b/Projectiles/CrSpear.cs index 8cbe372c..1a97628e 100644 --- a/Projectiles/CrSpear.cs +++ b/Projectiles/CrSpear.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { CreateDust(); diff --git a/Projectiles/CrystalChainmer.cs b/Projectiles/CrystalChainmer.cs index 2df7e5e6..0a001ba0 100644 --- a/Projectiles/CrystalChainmer.cs +++ b/Projectiles/CrystalChainmer.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 71, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/CrystalDagger.cs b/Projectiles/CrystalDagger.cs index 8775c652..312eea2e 100644 --- a/Projectiles/CrystalDagger.cs +++ b/Projectiles/CrystalDagger.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/CrystalDrill.cs b/Projectiles/CrystalDrill.cs index 5bc3fd2a..920110e1 100644 --- a/Projectiles/CrystalDrill.cs +++ b/Projectiles/CrystalDrill.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 71, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/CthulhunadoPro.cs b/Projectiles/CthulhunadoPro.cs index 44b42a2b..04b8a57f 100644 --- a/Projectiles/CthulhunadoPro.cs +++ b/Projectiles/CthulhunadoPro.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() } - public override void AI() { int num613 = 10; diff --git a/Projectiles/CursedBreathPro.cs b/Projectiles/CursedBreathPro.cs index aa826d58..33e05ecd 100644 --- a/Projectiles/CursedBreathPro.cs +++ b/Projectiles/CursedBreathPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 75, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/CursedTwisterPro.cs b/Projectiles/CursedTwisterPro.cs index 34663d45..5753d686 100644 --- a/Projectiles/CursedTwisterPro.cs +++ b/Projectiles/CursedTwisterPro.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dustType = 74; diff --git a/Projectiles/CyberRingPro.cs b/Projectiles/CyberRingPro.cs index 09eb5655..b8620108 100644 --- a/Projectiles/CyberRingPro.cs +++ b/Projectiles/CyberRingPro.cs @@ -24,8 +24,6 @@ public override void SetStaticDefaults() } - - public override void AI() { if (projectile.ai[1] == 0f) @@ -40,6 +38,5 @@ public override void AI() } } - } } diff --git a/Projectiles/CyclonePro.cs b/Projectiles/CyclonePro.cs index 27dd518f..1efb6840 100644 --- a/Projectiles/CyclonePro.cs +++ b/Projectiles/CyclonePro.cs @@ -20,7 +20,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/DangerBladePro.cs b/Projectiles/DangerBladePro.cs index cbbd4028..93db7e83 100644 --- a/Projectiles/DangerBladePro.cs +++ b/Projectiles/DangerBladePro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/DarkBubblePro.cs b/Projectiles/DarkBubblePro.cs index e67fef5a..f04b2873 100644 --- a/Projectiles/DarkBubblePro.cs +++ b/Projectiles/DarkBubblePro.cs @@ -25,8 +25,6 @@ public override void SetStaticDefaults() } - - public override void AI() { if (projectile.frameCounter < 5) diff --git a/Projectiles/DarkhalisPro.cs b/Projectiles/DarkhalisPro.cs index cbf6e4f3..94affb1a 100644 --- a/Projectiles/DarkhalisPro.cs +++ b/Projectiles/DarkhalisPro.cs @@ -19,6 +19,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/DeadFlowerPro.cs b/Projectiles/DeadFlowerPro.cs index e68600c9..10b283bf 100644 --- a/Projectiles/DeadFlowerPro.cs +++ b/Projectiles/DeadFlowerPro.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/DeathHooksPro.cs b/Projectiles/DeathHooksPro.cs index 99b1314c..20f9f3d0 100644 --- a/Projectiles/DeathHooksPro.cs +++ b/Projectiles/DeathHooksPro.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Texture2D texture = ModLoader.GetTexture("Tremor/Projectiles/DeathHooks_Chain"); diff --git a/Projectiles/DemonEyePro.cs b/Projectiles/DemonEyePro.cs index 271eaafb..31395094 100644 --- a/Projectiles/DemonEyePro.cs +++ b/Projectiles/DemonEyePro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/DesertClaymorePro.cs b/Projectiles/DesertClaymorePro.cs index af84571b..1e412a3c 100644 --- a/Projectiles/DesertClaymorePro.cs +++ b/Projectiles/DesertClaymorePro.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() } - bool FirstAI = true; public override void AI() { diff --git a/Projectiles/DesertSigil.cs b/Projectiles/DesertSigil.cs index f8c18c9f..8a13ba40 100644 --- a/Projectiles/DesertSigil.cs +++ b/Projectiles/DesertSigil.cs @@ -35,7 +35,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { return false; @@ -68,7 +67,6 @@ void Shoot() } } - public override void AI() { Shoot(); diff --git a/Projectiles/DevastatorPro.cs b/Projectiles/DevastatorPro.cs index 5473d8c7..3b568811 100644 --- a/Projectiles/DevastatorPro.cs +++ b/Projectiles/DevastatorPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { projectile.penetrate--; diff --git a/Projectiles/DiamondBeamPro.cs b/Projectiles/DiamondBeamPro.cs index 002f115f..2a0fdb40 100644 --- a/Projectiles/DiamondBeamPro.cs +++ b/Projectiles/DiamondBeamPro.cs @@ -42,7 +42,6 @@ public override void SetStaticDefaults() } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { if (Charge == MAX_CHARGE) @@ -176,7 +175,6 @@ public override void AI() } #endregion - #region Set laser tail position and dusts if (Charge < MAX_CHARGE) return; Vector2 start = player.Center; diff --git a/Projectiles/DiamondDrillPro.cs b/Projectiles/DiamondDrillPro.cs index 5dfc7910..74c4c753 100644 --- a/Projectiles/DiamondDrillPro.cs +++ b/Projectiles/DiamondDrillPro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 63, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/DivineClaymorePro.cs b/Projectiles/DivineClaymorePro.cs index f5ee2535..9b10c772 100644 --- a/Projectiles/DivineClaymorePro.cs +++ b/Projectiles/DivineClaymorePro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; @@ -125,8 +124,6 @@ public override void AI() } } - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/DivineRingPro.cs b/Projectiles/DivineRingPro.cs index 99a50aa0..ab362fe8 100644 --- a/Projectiles/DivineRingPro.cs +++ b/Projectiles/DivineRingPro.cs @@ -28,13 +28,11 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/DragonBreathPro.cs b/Projectiles/DragonBreathPro.cs index 85e9f694..cef8a913 100644 --- a/Projectiles/DragonBreathPro.cs +++ b/Projectiles/DragonBreathPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 6, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/DragonGrenade.cs b/Projectiles/DragonGrenade.cs index e81a9229..9e3bbaa6 100644 --- a/Projectiles/DragonGrenade.cs +++ b/Projectiles/DragonGrenade.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/DragonHead.cs b/Projectiles/DragonHead.cs index d2651934..88c609f5 100644 --- a/Projectiles/DragonHead.cs +++ b/Projectiles/DragonHead.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Texture2D texture = ModLoader.GetTexture("Tremor/Projectiles/DragonHead_Chain"); diff --git a/Projectiles/DragonSpearPro.cs b/Projectiles/DragonSpearPro.cs index b89761ee..eeccdc6e 100644 --- a/Projectiles/DragonSpearPro.cs +++ b/Projectiles/DragonSpearPro.cs @@ -19,7 +19,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 61, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 136, default(Color), 2.9f); diff --git a/Projectiles/DreadGun.cs b/Projectiles/DreadGun.cs index 8abec4a2..a5d4ab45 100644 --- a/Projectiles/DreadGun.cs +++ b/Projectiles/DreadGun.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.velocity.Y += projectile.ai[0]; diff --git a/Projectiles/DrippingKnifePro.cs b/Projectiles/DrippingKnifePro.cs index 6cef2518..4395f962 100644 --- a/Projectiles/DrippingKnifePro.cs +++ b/Projectiles/DrippingKnifePro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/Dukado.cs b/Projectiles/Dukado.cs index 80119900..2b5e40eb 100644 --- a/Projectiles/Dukado.cs +++ b/Projectiles/Dukado.cs @@ -28,9 +28,6 @@ public override void SetStaticDefaults() } - - - public override void AI() { int num613 = 10; diff --git a/Projectiles/DukesCannonBall.cs b/Projectiles/DukesCannonBall.cs index d2b3178e..8d6388dc 100644 --- a/Projectiles/DukesCannonBall.cs +++ b/Projectiles/DukesCannonBall.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - int time = 45; //Сам счетчик, впринципе просто целочисленная переменная, 60 = 1 сек, то есть тут 0.75 сек /*public override void AI() Этот ИИ направляет прожектайл к игроку через 0.75 сек после выстрела diff --git a/Projectiles/DungeonGuardianPro.cs b/Projectiles/DungeonGuardianPro.cs index 046b1865..5590418d 100644 --- a/Projectiles/DungeonGuardianPro.cs +++ b/Projectiles/DungeonGuardianPro.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/EarthquakePro.cs b/Projectiles/EarthquakePro.cs index a671c4e4..2eb2b6d7 100644 --- a/Projectiles/EarthquakePro.cs +++ b/Projectiles/EarthquakePro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/EaterofDreamsPro.cs b/Projectiles/EaterofDreamsPro.cs index 2bbf92db..13b46f90 100644 --- a/Projectiles/EaterofDreamsPro.cs +++ b/Projectiles/EaterofDreamsPro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, ((255 - projectile.alpha) * 0.25f) / 255f, ((255 - projectile.alpha) * 0.05f) / 255f, ((255 - projectile.alpha) * 0.05f) / 255f); diff --git a/Projectiles/ElectricBolt.cs b/Projectiles/ElectricBolt.cs index 5d2e047c..3e78525c 100644 --- a/Projectiles/ElectricBolt.cs +++ b/Projectiles/ElectricBolt.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() ProjectileID.Sets.TrailingMode[projectile.type] = 2; } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 6, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 136, default(Color), 0.9f); @@ -54,6 +53,5 @@ public override void Kill(int timeLeft) return Color.White; } - } } diff --git a/Projectiles/ElectricSpearPro.cs b/Projectiles/ElectricSpearPro.cs index bdc9f57b..cf21ae25 100644 --- a/Projectiles/ElectricSpearPro.cs +++ b/Projectiles/ElectricSpearPro.cs @@ -19,7 +19,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 226, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 136, default(Color), 0.9f); diff --git a/Projectiles/EmeraldDrillPro.cs b/Projectiles/EmeraldDrillPro.cs index f5bb1f8e..5729f72e 100644 --- a/Projectiles/EmeraldDrillPro.cs +++ b/Projectiles/EmeraldDrillPro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 61, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/Emeraldy.cs b/Projectiles/Emeraldy.cs index cff5146f..789b688d 100644 --- a/Projectiles/Emeraldy.cs +++ b/Projectiles/Emeraldy.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/EruptPro.cs b/Projectiles/EruptPro.cs index e63e6202..df1a1de9 100644 --- a/Projectiles/EruptPro.cs +++ b/Projectiles/EruptPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; @@ -52,7 +51,6 @@ public override void Kill(int timeLeft) } } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/EternalAgonyPro.cs b/Projectiles/EternalAgonyPro.cs index 6801ce2c..327f2a94 100644 --- a/Projectiles/EternalAgonyPro.cs +++ b/Projectiles/EternalAgonyPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(3) == 0) diff --git a/Projectiles/ExampleLaser.cs b/Projectiles/ExampleLaser.cs index 5173fdbf..8d9d369e 100644 --- a/Projectiles/ExampleLaser.cs +++ b/Projectiles/ExampleLaser.cs @@ -42,7 +42,6 @@ public override void SetStaticDefaults() } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { if (Charge == MAX_CHARGE) @@ -176,7 +175,6 @@ public override void AI() } #endregion - #region Set laser tail position and dusts if (Charge < MAX_CHARGE) return; Vector2 start = player.Center; diff --git a/Projectiles/FallenSnakePro.cs b/Projectiles/FallenSnakePro.cs index d5b0079b..1efdeab2 100644 --- a/Projectiles/FallenSnakePro.cs +++ b/Projectiles/FallenSnakePro.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { if (Main.rand.Next(3) == 0) diff --git a/Projectiles/FallingDarkServant.cs b/Projectiles/FallingDarkServant.cs index c8759877..2b2347af 100644 --- a/Projectiles/FallingDarkServant.cs +++ b/Projectiles/FallingDarkServant.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { if (projectile.frameCounter < 5) diff --git a/Projectiles/FallingDarkSlime.cs b/Projectiles/FallingDarkSlime.cs index 18ac82eb..c7169336 100644 --- a/Projectiles/FallingDarkSlime.cs +++ b/Projectiles/FallingDarkSlime.cs @@ -25,8 +25,6 @@ public override void SetStaticDefaults() } - - public override void AI() { if (projectile.frameCounter < 5) diff --git a/Projectiles/FieryKunai.cs b/Projectiles/FieryKunai.cs index 1f23179a..8f6fd507 100644 --- a/Projectiles/FieryKunai.cs +++ b/Projectiles/FieryKunai.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/FlamesofDespairPro.cs b/Projectiles/FlamesofDespairPro.cs index d9b2c0e5..d1d54e16 100644 --- a/Projectiles/FlamesofDespairPro.cs +++ b/Projectiles/FlamesofDespairPro.cs @@ -28,8 +28,6 @@ public override void SetStaticDefaults() } - - public override void AI() { if (Main.rand.Next(3) == 0) diff --git a/Projectiles/FlaskWasp.cs b/Projectiles/FlaskWasp.cs index cde42d1b..4e9bd2a6 100644 --- a/Projectiles/FlaskWasp.cs +++ b/Projectiles/FlaskWasp.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/FlowerofAntimony.cs b/Projectiles/FlowerofAntimony.cs index eb7fe2ad..a3e5b342 100644 --- a/Projectiles/FlowerofAntimony.cs +++ b/Projectiles/FlowerofAntimony.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, ((255 - projectile.alpha) * 0.25f) / 255f, ((255 - projectile.alpha) * 0.2f) / 255f, ((255 - projectile.alpha) * 0.01f) / 255f); diff --git a/Projectiles/FrostJavelinPro.cs b/Projectiles/FrostJavelinPro.cs index 81c28ce0..5b61113f 100644 --- a/Projectiles/FrostJavelinPro.cs +++ b/Projectiles/FrostJavelinPro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(3) == 0) @@ -50,6 +49,5 @@ public override void Kill(int timeLeft) Main.PlaySound(0, (int)projectile.position.X, (int)projectile.position.Y, 0); } - } } diff --git a/Projectiles/FrostbittenBallPro.cs b/Projectiles/FrostbittenBallPro.cs index a44a5d49..4153d0ea 100644 --- a/Projectiles/FrostbittenBallPro.cs +++ b/Projectiles/FrostbittenBallPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 15, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/FrostwindPro.cs b/Projectiles/FrostwindPro.cs index 6121586a..c5264803 100644 --- a/Projectiles/FrostwindPro.cs +++ b/Projectiles/FrostwindPro.cs @@ -28,8 +28,6 @@ public override void SetStaticDefaults() } - - public override void AI() { int num613 = 10; @@ -111,6 +109,5 @@ public override void AI() } } - } } diff --git a/Projectiles/FungusSpear.cs b/Projectiles/FungusSpear.cs index bdf934b1..3a7ac2e5 100644 --- a/Projectiles/FungusSpear.cs +++ b/Projectiles/FungusSpear.cs @@ -18,7 +18,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(4) == 0) diff --git a/Projectiles/GalaxonPro.cs b/Projectiles/GalaxonPro.cs index d79c7ea3..26e46ed0 100644 --- a/Projectiles/GalaxonPro.cs +++ b/Projectiles/GalaxonPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { if (projectile.ai[1] != -1f && projectile.position.Y > projectile.ai[1]) diff --git a/Projectiles/GarnetGlovePro.cs b/Projectiles/GarnetGlovePro.cs index 60772a15..231c4d60 100644 --- a/Projectiles/GarnetGlovePro.cs +++ b/Projectiles/GarnetGlovePro.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override bool CanHitPlayer(Player target) { return false; @@ -32,7 +31,5 @@ public override bool CanHitPlayer(Player target) return (target.friendly) ? false : true; } - - } } diff --git a/Projectiles/GhostlyArrow.cs b/Projectiles/GhostlyArrow.cs index e5119891..33efdee6 100644 --- a/Projectiles/GhostlyArrow.cs +++ b/Projectiles/GhostlyArrow.cs @@ -24,8 +24,6 @@ public override void SetStaticDefaults() } - - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 93); diff --git a/Projectiles/GhostlyExplosion.cs b/Projectiles/GhostlyExplosion.cs index 32b8cd8e..bc9dae34 100644 --- a/Projectiles/GhostlyExplosion.cs +++ b/Projectiles/GhostlyExplosion.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, ((255 - projectile.alpha) * 0.75f) / 255f, ((255 - projectile.alpha) * 0.5f) / 255f, ((255 - projectile.alpha) * 0.01f) / 255f); diff --git a/Projectiles/GloomSphere.cs b/Projectiles/GloomSphere.cs index 9b69559a..9daef53b 100644 --- a/Projectiles/GloomSphere.cs +++ b/Projectiles/GloomSphere.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.velocity.Y += projectile.ai[0]; diff --git a/Projectiles/GoldFishPro.cs b/Projectiles/GoldFishPro.cs index bf152a66..bb3e153a 100644 --- a/Projectiles/GoldFishPro.cs +++ b/Projectiles/GoldFishPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { Main.PlaySound(4, (int)projectile.position.X, (int)projectile.position.Y, 1); diff --git a/Projectiles/GoldKunai.cs b/Projectiles/GoldKunai.cs index 695585ea..03299110 100644 --- a/Projectiles/GoldKunai.cs +++ b/Projectiles/GoldKunai.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/GoldSpearPro.cs b/Projectiles/GoldSpearPro.cs index fcad7303..73589f45 100644 --- a/Projectiles/GoldSpearPro.cs +++ b/Projectiles/GoldSpearPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/GoldenMacePro.cs b/Projectiles/GoldenMacePro.cs index b01032d4..adc2c298 100644 --- a/Projectiles/GoldenMacePro.cs +++ b/Projectiles/GoldenMacePro.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dustType = 246; diff --git a/Projectiles/GoldenThrowingAxePro.cs b/Projectiles/GoldenThrowingAxePro.cs index 4aa16263..ba87c9b0 100644 --- a/Projectiles/GoldenThrowingAxePro.cs +++ b/Projectiles/GoldenThrowingAxePro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/GoldenWhalePro.cs b/Projectiles/GoldenWhalePro.cs index 70bd1145..8d4c5db9 100644 --- a/Projectiles/GoldenWhalePro.cs +++ b/Projectiles/GoldenWhalePro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/GrassGlaviePro.cs b/Projectiles/GrassGlaviePro.cs index a2208073..a44c53d2 100644 --- a/Projectiles/GrassGlaviePro.cs +++ b/Projectiles/GrassGlaviePro.cs @@ -19,7 +19,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) diff --git a/Projectiles/GuardianHammerPro.cs b/Projectiles/GuardianHammerPro.cs index 60b2f3dc..8ffe2e62 100644 --- a/Projectiles/GuardianHammerPro.cs +++ b/Projectiles/GuardianHammerPro.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; @@ -38,7 +37,6 @@ public override bool CanHitPlayer(Player target) return (target.friendly) ? false : true; } - public override void AI() { projectile.rotation = (float)Math.Atan2(projectile.velocity.Y, projectile.velocity.X) + 1.57f; @@ -48,6 +46,5 @@ public override void AI() } } - } } diff --git a/Projectiles/GurdPet.cs b/Projectiles/GurdPet.cs index 0a694102..2d5e3981 100644 --- a/Projectiles/GurdPet.cs +++ b/Projectiles/GurdPet.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/Gurumaster.cs b/Projectiles/Gurumaster.cs index 1ab08acd..c7074093 100644 --- a/Projectiles/Gurumaster.cs +++ b/Projectiles/Gurumaster.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 6, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 136, default(Color), 0.9f); @@ -48,7 +47,6 @@ public override void AI() public override void Kill(int timeLeft) { - Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); projectile.position.X = projectile.position.X + projectile.width / 2; projectile.position.Y = projectile.position.Y + projectile.height / 2; @@ -135,6 +133,5 @@ public override void Kill(int timeLeft) return Color.White; } - } } diff --git a/Projectiles/HallowedSprayPro.cs b/Projectiles/HallowedSprayPro.cs index 4a399bb7..59fb98dd 100644 --- a/Projectiles/HallowedSprayPro.cs +++ b/Projectiles/HallowedSprayPro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, ((255 - projectile.alpha) * 0.25f) / 255f, ((255 - projectile.alpha) * 0.05f) / 255f, ((255 - projectile.alpha) * 0.05f) / 255f); diff --git a/Projectiles/HellStormArrow.cs b/Projectiles/HellStormArrow.cs index a0ef1aa5..f2440238 100644 --- a/Projectiles/HellStormArrow.cs +++ b/Projectiles/HellStormArrow.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; @@ -40,7 +39,6 @@ public override void Kill(int timeLeft) Main.PlaySound(0, (int)projectile.position.X, (int)projectile.position.Y, 0); } - public override void AI() { projectile.rotation = (float)Math.Atan2(projectile.velocity.Y, projectile.velocity.X) + 1.57f; diff --git a/Projectiles/HellStormProj.cs b/Projectiles/HellStormProj.cs index b4fd57ac..19f00a36 100644 --- a/Projectiles/HellStormProj.cs +++ b/Projectiles/HellStormProj.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/HolyJavelinPro.cs b/Projectiles/HolyJavelinPro.cs index 87b86835..d1472e3e 100644 --- a/Projectiles/HolyJavelinPro.cs +++ b/Projectiles/HolyJavelinPro.cs @@ -25,8 +25,6 @@ public override void SetStaticDefaults() } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) @@ -78,7 +76,6 @@ public override void Kill(int timeLeft) } } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/HornedWarhammerPro.cs b/Projectiles/HornedWarhammerPro.cs index 17b79230..af91025c 100644 --- a/Projectiles/HornedWarhammerPro.cs +++ b/Projectiles/HornedWarhammerPro.cs @@ -22,6 +22,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/HorrificKnifePro.cs b/Projectiles/HorrificKnifePro.cs index 416cfc7c..454a245a 100644 --- a/Projectiles/HorrificKnifePro.cs +++ b/Projectiles/HorrificKnifePro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.NextBool()) diff --git a/Projectiles/HuntingSpearPro.cs b/Projectiles/HuntingSpearPro.cs index 203df9ba..a73edb08 100644 --- a/Projectiles/HuntingSpearPro.cs +++ b/Projectiles/HuntingSpearPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/IceBullet.cs b/Projectiles/IceBullet.cs index 09fd89ee..c19e196f 100644 --- a/Projectiles/IceBullet.cs +++ b/Projectiles/IceBullet.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(4) == 0) diff --git a/Projectiles/IceDrillPro.cs b/Projectiles/IceDrillPro.cs index ad58c732..37678dbc 100644 --- a/Projectiles/IceDrillPro.cs +++ b/Projectiles/IceDrillPro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 59, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.6f); diff --git a/Projectiles/IchorBreathPro.cs b/Projectiles/IchorBreathPro.cs index 659e3e35..3038be09 100644 --- a/Projectiles/IchorBreathPro.cs +++ b/Projectiles/IchorBreathPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 64, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/Igniter.cs b/Projectiles/Igniter.cs index dbf57dd8..fe72c0bf 100644 --- a/Projectiles/Igniter.cs +++ b/Projectiles/Igniter.cs @@ -20,9 +20,6 @@ public override void SetStaticDefaults() } - - - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/InfernoRift.cs b/Projectiles/InfernoRift.cs index 520e556c..ce784b6e 100644 --- a/Projectiles/InfernoRift.cs +++ b/Projectiles/InfernoRift.cs @@ -42,7 +42,6 @@ public override void SetStaticDefaults() } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/IronSpearPro.cs b/Projectiles/IronSpearPro.cs index d2464a15..61653d6a 100644 --- a/Projectiles/IronSpearPro.cs +++ b/Projectiles/IronSpearPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/Kunai.cs b/Projectiles/Kunai.cs index 0fe007d3..da09562a 100644 --- a/Projectiles/Kunai.cs +++ b/Projectiles/Kunai.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { Main.PlaySound(0, (int)projectile.position.X, (int)projectile.position.Y, 1); diff --git a/Projectiles/LeadSpearPro.cs b/Projectiles/LeadSpearPro.cs index a532dff9..4ebc3519 100644 --- a/Projectiles/LeadSpearPro.cs +++ b/Projectiles/LeadSpearPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/LeafBallPro.cs b/Projectiles/LeafBallPro.cs index 6365314c..4eb5235a 100644 --- a/Projectiles/LeafBallPro.cs +++ b/Projectiles/LeafBallPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - // Now this is where the chain magic happens. You don't have to try to figure this whole thing out. // Just make sure that you edit the first line (which starts with 'Texture2D texture') correctly. public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) diff --git a/Projectiles/LightningBoltPro.cs b/Projectiles/LightningBoltPro.cs index ca206c53..0f2dacbf 100644 --- a/Projectiles/LightningBoltPro.cs +++ b/Projectiles/LightningBoltPro.cs @@ -22,7 +22,5 @@ public override void SetStaticDefaults() } - - } } diff --git a/Projectiles/LightningTome.cs b/Projectiles/LightningTome.cs index f3a7e47f..242c37f1 100644 --- a/Projectiles/LightningTome.cs +++ b/Projectiles/LightningTome.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 40; k++) @@ -40,8 +39,6 @@ public override void Kill(int timeLeft) Main.PlaySound(0, (int)projectile.position.X, (int)projectile.position.Y, 0); } - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/LivingTombstonePro.cs b/Projectiles/LivingTombstonePro.cs index bf24d046..012fef1e 100644 --- a/Projectiles/LivingTombstonePro.cs +++ b/Projectiles/LivingTombstonePro.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/LizardPro.cs b/Projectiles/LizardPro.cs index ba52c276..30ea7137 100644 --- a/Projectiles/LizardPro.cs +++ b/Projectiles/LizardPro.cs @@ -25,8 +25,6 @@ public override void SetStaticDefaults() } - - public override bool OnTileCollide(Vector2 oldVelocity) { projectile.penetrate--; @@ -53,6 +51,5 @@ public override void Kill(int timeLeft) NPC.NewNPC((int)projectile.Center.X, (int)projectile.Center.Y, mod.NPCType("Lizard")); } - } } diff --git a/Projectiles/LostTurtleKnifePro.cs b/Projectiles/LostTurtleKnifePro.cs index 06dbb739..a0c40c2a 100644 --- a/Projectiles/LostTurtleKnifePro.cs +++ b/Projectiles/LostTurtleKnifePro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/MagicGrenade.cs b/Projectiles/MagicGrenade.cs index 09b2e49e..1eb81034 100644 --- a/Projectiles/MagicGrenade.cs +++ b/Projectiles/MagicGrenade.cs @@ -18,6 +18,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/MagicShurikenPro.cs b/Projectiles/MagicShurikenPro.cs index 66a1aedd..810faf1a 100644 --- a/Projectiles/MagicShurikenPro.cs +++ b/Projectiles/MagicShurikenPro.cs @@ -18,6 +18,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/MagiumRodPro.cs b/Projectiles/MagiumRodPro.cs index fef5aa27..4d7b4a2a 100644 --- a/Projectiles/MagiumRodPro.cs +++ b/Projectiles/MagiumRodPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/MagusBall.cs b/Projectiles/MagusBall.cs index 84aae2ad..45e95f35 100644 --- a/Projectiles/MagusBall.cs +++ b/Projectiles/MagusBall.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { for (int i = 0; i < 10; i++) diff --git a/Projectiles/MagusBallF.cs b/Projectiles/MagusBallF.cs index 803f6971..a5cdd150 100644 --- a/Projectiles/MagusBallF.cs +++ b/Projectiles/MagusBallF.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { for (int i = 0; i < 10; i++) diff --git a/Projectiles/ManiacChainsawPro.cs b/Projectiles/ManiacChainsawPro.cs index c36013a1..6968d43c 100644 --- a/Projectiles/ManiacChainsawPro.cs +++ b/Projectiles/ManiacChainsawPro.cs @@ -30,8 +30,6 @@ public override void SetStaticDefaults() } - - public override void AI() { Vector2 vector22; diff --git a/Projectiles/MasterKunai.cs b/Projectiles/MasterKunai.cs index 923e89f6..d45d4f46 100644 --- a/Projectiles/MasterKunai.cs +++ b/Projectiles/MasterKunai.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/Minions/AncientPredator.cs b/Projectiles/Minions/AncientPredator.cs index 98a83d91..ea1a9a88 100644 --- a/Projectiles/Minions/AncientPredator.cs +++ b/Projectiles/Minions/AncientPredator.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { target.AddBuff(20, 80, false); @@ -52,7 +51,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void CheckActive() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/Minions/AncientVisionPro.cs b/Projectiles/Minions/AncientVisionPro.cs index 436ec03b..e2306175 100644 --- a/Projectiles/Minions/AncientVisionPro.cs +++ b/Projectiles/Minions/AncientVisionPro.cs @@ -40,8 +40,6 @@ public override void SetStaticDefaults() } - - void Shoot() { if (--TimeToShoot <= 0) @@ -74,7 +72,6 @@ void Shoot() return Color.White; } - public override void AI() { Shoot(); diff --git a/Projectiles/Minions/AntiqueStavePro.cs b/Projectiles/Minions/AntiqueStavePro.cs index 1a6be1f1..6149a34a 100644 --- a/Projectiles/Minions/AntiqueStavePro.cs +++ b/Projectiles/Minions/AntiqueStavePro.cs @@ -11,7 +11,6 @@ public class AntiqueStavePro : ModProjectile public override void SetDefaults() { - projectile.width = 30; projectile.height = 30; @@ -33,7 +32,6 @@ public override void SetStaticDefaults() } - public override void AI() { for (int i = 0; i < 200; i++) diff --git a/Projectiles/Minions/BirbStaffPro.cs b/Projectiles/Minions/BirbStaffPro.cs index b218d03d..2448ad8e 100644 --- a/Projectiles/Minions/BirbStaffPro.cs +++ b/Projectiles/Minions/BirbStaffPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/BlueSakuraPro.cs b/Projectiles/Minions/BlueSakuraPro.cs index 9c24836b..9dd9f998 100644 --- a/Projectiles/Minions/BlueSakuraPro.cs +++ b/Projectiles/Minions/BlueSakuraPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/Bramble.cs b/Projectiles/Minions/Bramble.cs index ecaec565..5cd16073 100644 --- a/Projectiles/Minions/Bramble.cs +++ b/Projectiles/Minions/Bramble.cs @@ -11,7 +11,6 @@ public class Bramble : ModProjectile public override void SetDefaults() { - projectile.width = 48; projectile.height = 44; @@ -33,7 +32,6 @@ public override void SetStaticDefaults() } - public override void AI() { for (int i = 0; i < 200; i++) diff --git a/Projectiles/Minions/CorruptorStaffPro.cs b/Projectiles/Minions/CorruptorStaffPro.cs index d370d224..41306313 100644 --- a/Projectiles/Minions/CorruptorStaffPro.cs +++ b/Projectiles/Minions/CorruptorStaffPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/CrabStaffPro.cs b/Projectiles/Minions/CrabStaffPro.cs index 6b8e3639..84930af0 100644 --- a/Projectiles/Minions/CrabStaffPro.cs +++ b/Projectiles/Minions/CrabStaffPro.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() DisplayName.SetDefault("Crab Staff"); } - public override bool TileCollideStyle(ref int width, ref int height, ref bool fallThrough) { fallThrough = false; diff --git a/Projectiles/Minions/CreeperStaffPro.cs b/Projectiles/Minions/CreeperStaffPro.cs index 39173189..d9a62549 100644 --- a/Projectiles/Minions/CreeperStaffPro.cs +++ b/Projectiles/Minions/CreeperStaffPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/CyberStaffPro.cs b/Projectiles/Minions/CyberStaffPro.cs index 9b2a39f2..d801db26 100644 --- a/Projectiles/Minions/CyberStaffPro.cs +++ b/Projectiles/Minions/CyberStaffPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/GoblinStaffPro.cs b/Projectiles/Minions/GoblinStaffPro.cs index 21d69a04..99771060 100644 --- a/Projectiles/Minions/GoblinStaffPro.cs +++ b/Projectiles/Minions/GoblinStaffPro.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/HungryStaffPro.cs b/Projectiles/Minions/HungryStaffPro.cs index 5431236b..7ceb90c0 100644 --- a/Projectiles/Minions/HungryStaffPro.cs +++ b/Projectiles/Minions/HungryStaffPro.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/Hunter.cs b/Projectiles/Minions/Hunter.cs index 10b3917f..7f1cb467 100644 --- a/Projectiles/Minions/Hunter.cs +++ b/Projectiles/Minions/Hunter.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/HuskyStaffPro.cs b/Projectiles/Minions/HuskyStaffPro.cs index 80425de6..6d51c82d 100644 --- a/Projectiles/Minions/HuskyStaffPro.cs +++ b/Projectiles/Minions/HuskyStaffPro.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() } - public override bool TileCollideStyle(ref int width, ref int height, ref bool fallThrough) { fallThrough = false; @@ -53,7 +52,6 @@ public override void CheckActive() } } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.penetrate == 0) diff --git a/Projectiles/Minions/JellyfishStaffPro.cs b/Projectiles/Minions/JellyfishStaffPro.cs index 07b3796c..3b1db1f8 100644 --- a/Projectiles/Minions/JellyfishStaffPro.cs +++ b/Projectiles/Minions/JellyfishStaffPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/MeteorScepterPro.cs b/Projectiles/Minions/MeteorScepterPro.cs index 9e75d35c..1022a3dc 100644 --- a/Projectiles/Minions/MeteorScepterPro.cs +++ b/Projectiles/Minions/MeteorScepterPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/NecronomiconPro.cs b/Projectiles/Minions/NecronomiconPro.cs index af44a584..37fbecbc 100644 --- a/Projectiles/Minions/NecronomiconPro.cs +++ b/Projectiles/Minions/NecronomiconPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/NorthWindMinion.cs b/Projectiles/Minions/NorthWindMinion.cs index 042c35f5..e83526aa 100644 --- a/Projectiles/Minions/NorthWindMinion.cs +++ b/Projectiles/Minions/NorthWindMinion.cs @@ -40,8 +40,6 @@ public override void SetStaticDefaults() } - - void Shoot() { if (--TimeToShoot <= 0) @@ -69,7 +67,6 @@ void Shoot() } } - public override void AI() { Shoot(); diff --git a/Projectiles/Minions/QuetzalcoatlPro.cs b/Projectiles/Minions/QuetzalcoatlPro.cs index 40e1b999..59a34d02 100644 --- a/Projectiles/Minions/QuetzalcoatlPro.cs +++ b/Projectiles/Minions/QuetzalcoatlPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/ShadowStaffPro.cs b/Projectiles/Minions/ShadowStaffPro.cs index c5068bfc..f4107691 100644 --- a/Projectiles/Minions/ShadowStaffPro.cs +++ b/Projectiles/Minions/ShadowStaffPro.cs @@ -34,7 +34,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/StarfishPro.cs b/Projectiles/Minions/StarfishPro.cs index 391ecf4c..ad94d2df 100644 --- a/Projectiles/Minions/StarfishPro.cs +++ b/Projectiles/Minions/StarfishPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/WhiteSakuraPro.cs b/Projectiles/Minions/WhiteSakuraPro.cs index 79ee8e62..dab027f0 100644 --- a/Projectiles/Minions/WhiteSakuraPro.cs +++ b/Projectiles/Minions/WhiteSakuraPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { if (projectile.velocity.X != oldVelocity.X) diff --git a/Projectiles/Minions/ZombatStaffPro.cs b/Projectiles/Minions/ZombatStaffPro.cs index 3009f94c..12d7a716 100644 --- a/Projectiles/Minions/ZombatStaffPro.cs +++ b/Projectiles/Minions/ZombatStaffPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if(Main.rand.Next(4) == 0) diff --git a/Projectiles/MoltenWatcher.cs b/Projectiles/MoltenWatcher.cs index b40d4082..7a3d5c08 100644 --- a/Projectiles/MoltenWatcher.cs +++ b/Projectiles/MoltenWatcher.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { return false; @@ -69,7 +68,6 @@ void Shoot() } } - public override void AI() { Shoot(); diff --git a/Projectiles/MonsterToothPro.cs b/Projectiles/MonsterToothPro.cs index 0a0a2799..a1a1c5ca 100644 --- a/Projectiles/MonsterToothPro.cs +++ b/Projectiles/MonsterToothPro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/MudDoll.cs b/Projectiles/MudDoll.cs index 2c737b25..7e160674 100644 --- a/Projectiles/MudDoll.cs +++ b/Projectiles/MudDoll.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/MudShot.cs b/Projectiles/MudShot.cs index 71c5427e..fd64a6bd 100644 --- a/Projectiles/MudShot.cs +++ b/Projectiles/MudShot.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { target.AddBuff(31, 60, false); diff --git a/Projectiles/MythrilBolt.cs b/Projectiles/MythrilBolt.cs index 65737b55..dc318a34 100644 --- a/Projectiles/MythrilBolt.cs +++ b/Projectiles/MythrilBolt.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.rotation = (float)Math.Atan2(projectile.velocity.Y, projectile.velocity.X) + 1.57f; @@ -61,7 +60,6 @@ public override bool OnTileCollide(Vector2 oldVelocity) return false; } - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 64); diff --git a/Projectiles/MythrilDiscPro.cs b/Projectiles/MythrilDiscPro.cs index 48acaa93..7422db84 100644 --- a/Projectiles/MythrilDiscPro.cs +++ b/Projectiles/MythrilDiscPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/NanoDronLaserPro.cs b/Projectiles/NanoDronLaserPro.cs index 9e29e172..32b74085 100644 --- a/Projectiles/NanoDronLaserPro.cs +++ b/Projectiles/NanoDronLaserPro.cs @@ -19,7 +19,6 @@ public override void SetStaticDefaults() } - public override bool CanHitPlayer(Player target) { return false; diff --git a/Projectiles/NanoDronPro.cs b/Projectiles/NanoDronPro.cs index 6cfab44c..23cd4ab4 100644 --- a/Projectiles/NanoDronPro.cs +++ b/Projectiles/NanoDronPro.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { return false; @@ -69,7 +68,6 @@ void Shoot() } } - public override void AI() { Shoot(); diff --git a/Projectiles/NebulaJellyfish.cs b/Projectiles/NebulaJellyfish.cs index cc65695a..2f7f0dd4 100644 --- a/Projectiles/NebulaJellyfish.cs +++ b/Projectiles/NebulaJellyfish.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/NightFuryPro.cs b/Projectiles/NightFuryPro.cs index ca78e81f..5d09db3d 100644 --- a/Projectiles/NightFuryPro.cs +++ b/Projectiles/NightFuryPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 27, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/NightmareArrowPro.cs b/Projectiles/NightmareArrowPro.cs index ddc445e6..38192dfb 100644 --- a/Projectiles/NightmareArrowPro.cs +++ b/Projectiles/NightmareArrowPro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) diff --git a/Projectiles/NightmareBulletPro.cs b/Projectiles/NightmareBulletPro.cs index 243c4307..a3d25725 100644 --- a/Projectiles/NightmareBulletPro.cs +++ b/Projectiles/NightmareBulletPro.cs @@ -32,7 +32,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 27, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 0.9f); diff --git a/Projectiles/NuclearStarPro.cs b/Projectiles/NuclearStarPro.cs index 206a8e15..d33906f6 100644 --- a/Projectiles/NuclearStarPro.cs +++ b/Projectiles/NuclearStarPro.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override bool CanHitPlayer(Player target) { return false; diff --git a/Projectiles/ObsidianSaberPro.cs b/Projectiles/ObsidianSaberPro.cs index 76de3041..b436fc44 100644 --- a/Projectiles/ObsidianSaberPro.cs +++ b/Projectiles/ObsidianSaberPro.cs @@ -21,6 +21,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/OmnikronBeast.cs b/Projectiles/OmnikronBeast.cs index f84424e4..9c028a45 100644 --- a/Projectiles/OmnikronBeast.cs +++ b/Projectiles/OmnikronBeast.cs @@ -36,7 +36,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { return false; @@ -69,7 +68,6 @@ void Shoot() } } - public override void AI() { Shoot(); diff --git a/Projectiles/OrichalcumBolt.cs b/Projectiles/OrichalcumBolt.cs index ff47c968..b1df3874 100644 --- a/Projectiles/OrichalcumBolt.cs +++ b/Projectiles/OrichalcumBolt.cs @@ -27,8 +27,6 @@ public override void SetStaticDefaults() } - - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/OrichalcumDiscPro.cs b/Projectiles/OrichalcumDiscPro.cs index 8923997f..50760ddb 100644 --- a/Projectiles/OrichalcumDiscPro.cs +++ b/Projectiles/OrichalcumDiscPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/PainWheelPro.cs b/Projectiles/PainWheelPro.cs index 8758f028..25c21342 100644 --- a/Projectiles/PainWheelPro.cs +++ b/Projectiles/PainWheelPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 60, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/PalladiumBolt.cs b/Projectiles/PalladiumBolt.cs index 08017b8c..8d533796 100644 --- a/Projectiles/PalladiumBolt.cs +++ b/Projectiles/PalladiumBolt.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/PalladiumDiscPro.cs b/Projectiles/PalladiumDiscPro.cs index 997f60ad..a3a8b5f4 100644 --- a/Projectiles/PalladiumDiscPro.cs +++ b/Projectiles/PalladiumDiscPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/PandemoniumBullet.cs b/Projectiles/PandemoniumBullet.cs index de1ee021..3f7f2b56 100644 --- a/Projectiles/PandemoniumBullet.cs +++ b/Projectiles/PandemoniumBullet.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() } - const int ShootDirection = 7; public override void Kill(int timeLeft) { diff --git a/Projectiles/ParaxydeKnifePro.cs b/Projectiles/ParaxydeKnifePro.cs index d3db4dbd..92534566 100644 --- a/Projectiles/ParaxydeKnifePro.cs +++ b/Projectiles/ParaxydeKnifePro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/PerfectBehemothPro.cs b/Projectiles/PerfectBehemothPro.cs index 3fc8daf8..080c2283 100644 --- a/Projectiles/PerfectBehemothPro.cs +++ b/Projectiles/PerfectBehemothPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { projectile.penetrate--; diff --git a/Projectiles/PhantomSpear.cs b/Projectiles/PhantomSpear.cs index e559c413..8d880b0a 100644 --- a/Projectiles/PhantomSpear.cs +++ b/Projectiles/PhantomSpear.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; @@ -69,7 +68,6 @@ public override void Kill(int timeLeft) } } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/PirahnaPro.cs b/Projectiles/PirahnaPro.cs index c7e49c1f..330de00c 100644 --- a/Projectiles/PirahnaPro.cs +++ b/Projectiles/PirahnaPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { Main.PlaySound(4, (int)projectile.position.X, (int)projectile.position.Y, 1); diff --git a/Projectiles/PitchforkPro.cs b/Projectiles/PitchforkPro.cs index cc837f2e..17e004d2 100644 --- a/Projectiles/PitchforkPro.cs +++ b/Projectiles/PitchforkPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/PlagueFlaskEvil.cs b/Projectiles/PlagueFlaskEvil.cs index 89ac3f9d..4b59ba6a 100644 --- a/Projectiles/PlagueFlaskEvil.cs +++ b/Projectiles/PlagueFlaskEvil.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 107); @@ -44,6 +43,5 @@ public override void Kill(int timeLeft) //} } - } } diff --git a/Projectiles/PlaguePro.cs b/Projectiles/PlaguePro.cs index ba4f9377..c80d3647 100644 --- a/Projectiles/PlaguePro.cs +++ b/Projectiles/PlaguePro.cs @@ -23,13 +23,11 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; } - public override void Kill(int timeLeft) { int ses = Projectile.NewProjectile(projectile.position.X, projectile.position.Y, 0, 0, mod.ProjectileType("PlagueBlast"), projectile.damage * 2, 0.7f, projectile.owner); @@ -47,7 +45,6 @@ public override void AI() if (projectile.frame >= 4) { projectile.frame = 0; } - } } } diff --git a/Projectiles/PlatinumKunai.cs b/Projectiles/PlatinumKunai.cs index d4821f6d..07b322bb 100644 --- a/Projectiles/PlatinumKunai.cs +++ b/Projectiles/PlatinumKunai.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/PlatinumSpearPro.cs b/Projectiles/PlatinumSpearPro.cs index 5bd69fcf..ccad3e71 100644 --- a/Projectiles/PlatinumSpearPro.cs +++ b/Projectiles/PlatinumSpearPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/PoisonJavelinPro.cs b/Projectiles/PoisonJavelinPro.cs index 3af63273..9a395f1f 100644 --- a/Projectiles/PoisonJavelinPro.cs +++ b/Projectiles/PoisonJavelinPro.cs @@ -26,8 +26,6 @@ public override void SetStaticDefaults() } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(2) == 0) @@ -79,7 +77,6 @@ public override void Kill(int timeLeft) } } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/PoisonedKunai.cs b/Projectiles/PoisonedKunai.cs index e8467846..25a38f9a 100644 --- a/Projectiles/PoisonedKunai.cs +++ b/Projectiles/PoisonedKunai.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/PopcornAmmo.cs b/Projectiles/PopcornAmmo.cs index 8b74f1ee..0a8f423a 100644 --- a/Projectiles/PopcornAmmo.cs +++ b/Projectiles/PopcornAmmo.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 10; k++) diff --git a/Projectiles/PumpkinPro.cs b/Projectiles/PumpkinPro.cs index 0f975277..e07930fa 100644 --- a/Projectiles/PumpkinPro.cs +++ b/Projectiles/PumpkinPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.velocity.Y += projectile.ai[0]; @@ -50,8 +49,6 @@ public override void Kill(int timeLeft) Main.PlaySound(0, (int)projectile.position.X, (int)projectile.position.Y, 0); } - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/PurplePulsePro.cs b/Projectiles/PurplePulsePro.cs index c5ad0496..99810959 100644 --- a/Projectiles/PurplePulsePro.cs +++ b/Projectiles/PurplePulsePro.cs @@ -24,8 +24,6 @@ public override void SetStaticDefaults() } - - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); diff --git a/Projectiles/RavenFeather.cs b/Projectiles/RavenFeather.cs index c9fab54a..3183c2f1 100644 --- a/Projectiles/RavenFeather.cs +++ b/Projectiles/RavenFeather.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/RedPulsePro.cs b/Projectiles/RedPulsePro.cs index 272b778b..ef82bebe 100644 --- a/Projectiles/RedPulsePro.cs +++ b/Projectiles/RedPulsePro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); diff --git a/Projectiles/Rock.cs b/Projectiles/Rock.cs index bab0a054..ab2d7062 100644 --- a/Projectiles/Rock.cs +++ b/Projectiles/Rock.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/RockminePro.cs b/Projectiles/RockminePro.cs index d5800205..2b69490e 100644 --- a/Projectiles/RockminePro.cs +++ b/Projectiles/RockminePro.cs @@ -26,8 +26,6 @@ public override void SetStaticDefaults() } - - public override bool OnTileCollide(Vector2 oldVelocity) { projectile.penetrate--; @@ -134,6 +132,5 @@ public override void Kill(int timeLeft) } } - } } diff --git a/Projectiles/RockspearPro.cs b/Projectiles/RockspearPro.cs index 2e95494e..96ba0354 100644 --- a/Projectiles/RockspearPro.cs +++ b/Projectiles/RockspearPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/RubyDrillPro.cs b/Projectiles/RubyDrillPro.cs index 4b34254e..39b6ddaa 100644 --- a/Projectiles/RubyDrillPro.cs +++ b/Projectiles/RubyDrillPro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 60, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/SacredCrossPro.cs b/Projectiles/SacredCrossPro.cs index 55a99a54..ae9e715c 100644 --- a/Projectiles/SacredCrossPro.cs +++ b/Projectiles/SacredCrossPro.cs @@ -24,8 +24,6 @@ public override void SetStaticDefaults() } - - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/Sand.cs b/Projectiles/Sand.cs index 85b544f7..d42f13cd 100644 --- a/Projectiles/Sand.cs +++ b/Projectiles/Sand.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.rotation = (float)Math.Atan2(projectile.velocity.Y, projectile.velocity.X) + 1.57f; diff --git a/Projectiles/SandShuriken.cs b/Projectiles/SandShuriken.cs index c1e33808..2fc17a8a 100644 --- a/Projectiles/SandShuriken.cs +++ b/Projectiles/SandShuriken.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/SandstoneChainsawPro.cs b/Projectiles/SandstoneChainsawPro.cs index 5519781b..274ecfb4 100644 --- a/Projectiles/SandstoneChainsawPro.cs +++ b/Projectiles/SandstoneChainsawPro.cs @@ -25,6 +25,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/SandstoneDrillPro.cs b/Projectiles/SandstoneDrillPro.cs index a022834c..3d4a538c 100644 --- a/Projectiles/SandstoneDrillPro.cs +++ b/Projectiles/SandstoneDrillPro.cs @@ -25,6 +25,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/SandstormMinion.cs b/Projectiles/SandstormMinion.cs index 06d1268f..1b4444c5 100644 --- a/Projectiles/SandstormMinion.cs +++ b/Projectiles/SandstormMinion.cs @@ -49,7 +49,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { return false; diff --git a/Projectiles/SapphireDrillPro.cs b/Projectiles/SapphireDrillPro.cs index 7b48a43f..d935a5b8 100644 --- a/Projectiles/SapphireDrillPro.cs +++ b/Projectiles/SapphireDrillPro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 59, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/SaturatedDaggerPro.cs b/Projectiles/SaturatedDaggerPro.cs index d9e4d4fb..f11c21ce 100644 --- a/Projectiles/SaturatedDaggerPro.cs +++ b/Projectiles/SaturatedDaggerPro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/ScarredReaperPro.cs b/Projectiles/ScarredReaperPro.cs index fd1332f0..09a68192 100644 --- a/Projectiles/ScarredReaperPro.cs +++ b/Projectiles/ScarredReaperPro.cs @@ -19,6 +19,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/ScorcherStar.cs b/Projectiles/ScorcherStar.cs index 924a327f..299ef4ed 100644 --- a/Projectiles/ScorcherStar.cs +++ b/Projectiles/ScorcherStar.cs @@ -26,9 +26,6 @@ public override void SetStaticDefaults() } - - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/ScorcherTwo.cs b/Projectiles/ScorcherTwo.cs index 336c948f..af58b6fa 100644 --- a/Projectiles/ScorcherTwo.cs +++ b/Projectiles/ScorcherTwo.cs @@ -22,7 +22,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int num158 = 0; num158 < 20; num158++) diff --git a/Projectiles/ShadowCutterPro.cs b/Projectiles/ShadowCutterPro.cs index 58068a3e..e72f3983 100644 --- a/Projectiles/ShadowCutterPro.cs +++ b/Projectiles/ShadowCutterPro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.velocity.Y += projectile.ai[0]; @@ -50,8 +49,6 @@ public override void Kill(int timeLeft) Main.PlaySound(0, (int)projectile.position.X, (int)projectile.position.Y, 0); } - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/ShadowForkPro.cs b/Projectiles/ShadowForkPro.cs index 4ddedf11..0bc52ec8 100644 --- a/Projectiles/ShadowForkPro.cs +++ b/Projectiles/ShadowForkPro.cs @@ -19,8 +19,6 @@ public override void SetStaticDefaults() } - - public override void AI() { projectile.velocity.Y += projectile.ai[0]; diff --git a/Projectiles/ShadowR.cs b/Projectiles/ShadowR.cs index eb41ea81..e75168c5 100644 --- a/Projectiles/ShadowR.cs +++ b/Projectiles/ShadowR.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - int time2 = 6; int time = 6; diff --git a/Projectiles/SharkhalisPro.cs b/Projectiles/SharkhalisPro.cs index 04e60019..c692d4fc 100644 --- a/Projectiles/SharkhalisPro.cs +++ b/Projectiles/SharkhalisPro.cs @@ -21,6 +21,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/Shatter1.cs b/Projectiles/Shatter1.cs index 1ef538f6..c3328ec4 100644 --- a/Projectiles/Shatter1.cs +++ b/Projectiles/Shatter1.cs @@ -18,8 +18,6 @@ public override void SetDefaults() projectile.light = 0.5f; } - - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { int newLife = 1; diff --git a/Projectiles/ShiningAxePro.cs b/Projectiles/ShiningAxePro.cs index 42684036..f7656266 100644 --- a/Projectiles/ShiningAxePro.cs +++ b/Projectiles/ShiningAxePro.cs @@ -19,6 +19,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/ShockwavePro.cs b/Projectiles/ShockwavePro.cs index 72374760..110dc191 100644 --- a/Projectiles/ShockwavePro.cs +++ b/Projectiles/ShockwavePro.cs @@ -10,7 +10,6 @@ public override void SetDefaults() { projectile.CloneDefaults(348); - projectile.timeLeft = 120; aiType = 348; } @@ -21,7 +20,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.rotation = (float)Math.Atan2(projectile.velocity.Y, projectile.velocity.X) + 1.57f; diff --git a/Projectiles/SilverSpearPro.cs b/Projectiles/SilverSpearPro.cs index b14f4309..406aa7ac 100644 --- a/Projectiles/SilverSpearPro.cs +++ b/Projectiles/SilverSpearPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/SlimeFlailPro.cs b/Projectiles/SlimeFlailPro.cs index 62918d59..577f3124 100644 --- a/Projectiles/SlimeFlailPro.cs +++ b/Projectiles/SlimeFlailPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Texture2D texture = ModLoader.GetTexture("Tremor/Projectiles/SlimeFlail_Chain"); diff --git a/Projectiles/SolarMeteor.cs b/Projectiles/SolarMeteor.cs index bd1902e1..0c887a58 100644 --- a/Projectiles/SolarMeteor.cs +++ b/Projectiles/SolarMeteor.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/SparkingCloudPro.cs b/Projectiles/SparkingCloudPro.cs index 5e0921b3..a99154fe 100644 --- a/Projectiles/SparkingCloudPro.cs +++ b/Projectiles/SparkingCloudPro.cs @@ -24,8 +24,6 @@ public override void SetStaticDefaults() } - - public override void OnHitPlayer(Player target, int damage, bool crit) { if (Main.rand.Next(2) == 0) diff --git a/Projectiles/SparkingFlaskEvil.cs b/Projectiles/SparkingFlaskEvil.cs index a0a1dfc4..5195aeff 100644 --- a/Projectiles/SparkingFlaskEvil.cs +++ b/Projectiles/SparkingFlaskEvil.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 107); @@ -44,6 +43,5 @@ public override void Kill(int timeLeft) //} } - } } diff --git a/Projectiles/SparkingFlaskEvilTwo.cs b/Projectiles/SparkingFlaskEvilTwo.cs index be393505..49e2723c 100644 --- a/Projectiles/SparkingFlaskEvilTwo.cs +++ b/Projectiles/SparkingFlaskEvilTwo.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 107); @@ -44,6 +43,5 @@ public override void Kill(int timeLeft) //} } - } } diff --git a/Projectiles/SpearofJusticePro.cs b/Projectiles/SpearofJusticePro.cs index 9fe5d0bb..a965dde6 100644 --- a/Projectiles/SpearofJusticePro.cs +++ b/Projectiles/SpearofJusticePro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; @@ -69,7 +68,6 @@ public override void Kill(int timeLeft) } } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/SpectreFlower.cs b/Projectiles/SpectreFlower.cs index ff24f7e9..b1056602 100644 --- a/Projectiles/SpectreFlower.cs +++ b/Projectiles/SpectreFlower.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { projectile.penetrate--; diff --git a/Projectiles/SpectreTaroCard.cs b/Projectiles/SpectreTaroCard.cs index d0ac5506..19384aaa 100644 --- a/Projectiles/SpectreTaroCard.cs +++ b/Projectiles/SpectreTaroCard.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.velocity.Y += projectile.ai[0]; @@ -50,8 +49,6 @@ public override void Kill(int timeLeft) Main.PlaySound(0, (int)projectile.position.X, (int)projectile.position.Y, 0); } - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/SpiK3Ball.cs b/Projectiles/SpiK3Ball.cs index 51d33777..6a1e398d 100644 --- a/Projectiles/SpiK3Ball.cs +++ b/Projectiles/SpiK3Ball.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 40; k++) diff --git a/Projectiles/SporeExplosion.cs b/Projectiles/SporeExplosion.cs index cae45afd..e60b1c86 100644 --- a/Projectiles/SporeExplosion.cs +++ b/Projectiles/SporeExplosion.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, ((255 - projectile.alpha) * 0.75f) / 255f, ((255 - projectile.alpha) * 0.5f) / 255f, ((255 - projectile.alpha) * 0.01f) / 255f); diff --git a/Projectiles/StarDrillPro.cs b/Projectiles/StarDrillPro.cs index 82be04d1..860debc2 100644 --- a/Projectiles/StarDrillPro.cs +++ b/Projectiles/StarDrillPro.cs @@ -28,8 +28,6 @@ public override void SetStaticDefaults() } - - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/StarNestPro.cs b/Projectiles/StarNestPro.cs index 82da2b63..1c2e279e 100644 --- a/Projectiles/StarNestPro.cs +++ b/Projectiles/StarNestPro.cs @@ -20,7 +20,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.rotation = (float)Math.Atan2(projectile.velocity.Y, projectile.velocity.X) + 1.57f; diff --git a/Projectiles/StardustSquid.cs b/Projectiles/StardustSquid.cs index 729cf26f..db7375fb 100644 --- a/Projectiles/StardustSquid.cs +++ b/Projectiles/StardustSquid.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/StarminePro.cs b/Projectiles/StarminePro.cs index de97f85c..bb7b80ab 100644 --- a/Projectiles/StarminePro.cs +++ b/Projectiles/StarminePro.cs @@ -28,8 +28,6 @@ public override void SetStaticDefaults() } - - public override void AI() { if (Main.rand.Next(3) == 0) diff --git a/Projectiles/SteelSpear.cs b/Projectiles/SteelSpear.cs index 3b88c290..7894c965 100644 --- a/Projectiles/SteelSpear.cs +++ b/Projectiles/SteelSpear.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/StickyFlailPro.cs b/Projectiles/StickyFlailPro.cs index 2dc4854e..d45caa9a 100644 --- a/Projectiles/StickyFlailPro.cs +++ b/Projectiles/StickyFlailPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Texture2D texture = ModLoader.GetTexture("Tremor/Projectiles/StickyFlail_Chain"); diff --git a/Projectiles/StormBladePro.cs b/Projectiles/StormBladePro.cs index 08b50b84..d6983004 100644 --- a/Projectiles/StormBladePro.cs +++ b/Projectiles/StormBladePro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.velocity.Y += projectile.ai[0]; @@ -46,6 +45,5 @@ public override void Kill(int timeLeft) Main.PlaySound(0, (int)projectile.position.X, (int)projectile.position.Y, 0); } - } } diff --git a/Projectiles/SuperBigCannonPro.cs b/Projectiles/SuperBigCannonPro.cs index 4b6309f6..e95c04b6 100644 --- a/Projectiles/SuperBigCannonPro.cs +++ b/Projectiles/SuperBigCannonPro.cs @@ -19,7 +19,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { Main.PlaySound(2, (int)projectile.position.X, (int)projectile.position.Y, 62); diff --git a/Projectiles/SweetPro.cs b/Projectiles/SweetPro.cs index 6570b26c..d8eb0278 100644 --- a/Projectiles/SweetPro.cs +++ b/Projectiles/SweetPro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/SwordstormPro.cs b/Projectiles/SwordstormPro.cs index 6f8fb1a5..28657c00 100644 --- a/Projectiles/SwordstormPro.cs +++ b/Projectiles/SwordstormPro.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/TheBoogerBallPro.cs b/Projectiles/TheBoogerBallPro.cs index f3ad4ec2..cf87a134 100644 --- a/Projectiles/TheBoogerBallPro.cs +++ b/Projectiles/TheBoogerBallPro.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/TheBoogerPro.cs b/Projectiles/TheBoogerPro.cs index c4a2d71b..a714f396 100644 --- a/Projectiles/TheBoogerPro.cs +++ b/Projectiles/TheBoogerPro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/TheCadenceProj.cs b/Projectiles/TheCadenceProj.cs index 2dc3a939..d3875780 100644 --- a/Projectiles/TheCadenceProj.cs +++ b/Projectiles/TheCadenceProj.cs @@ -20,8 +20,6 @@ public override void SetDefaults() projectile.timeLeft = 600; } - - public override void AI() { if (projectile.ai[1] == 0f) diff --git a/Projectiles/TheGhostClaymorePro.cs b/Projectiles/TheGhostClaymorePro.cs index ed382f5e..07d1b583 100644 --- a/Projectiles/TheGhostClaymorePro.cs +++ b/Projectiles/TheGhostClaymorePro.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; @@ -69,7 +68,6 @@ public override void Kill(int timeLeft) } } - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/TheSnowBall.cs b/Projectiles/TheSnowBall.cs index 004b36bb..ef152b9a 100644 --- a/Projectiles/TheSnowBall.cs +++ b/Projectiles/TheSnowBall.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { projectile.penetrate--; diff --git a/Projectiles/TheSpikePro.cs b/Projectiles/TheSpikePro.cs index 96a2a7a8..5c391c5b 100644 --- a/Projectiles/TheSpikePro.cs +++ b/Projectiles/TheSpikePro.cs @@ -20,6 +20,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/ThornBall.cs b/Projectiles/ThornBall.cs index 05be776d..f7a46a74 100644 --- a/Projectiles/ThornBall.cs +++ b/Projectiles/ThornBall.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override bool OnTileCollide(Vector2 oldVelocity) { projectile.penetrate--; diff --git a/Projectiles/ThrowingAxe.cs b/Projectiles/ThrowingAxe.cs index d8a9f9bc..7a7da55a 100644 --- a/Projectiles/ThrowingAxe.cs +++ b/Projectiles/ThrowingAxe.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/ThrowingCog.cs b/Projectiles/ThrowingCog.cs index 26824941..1c02b7fc 100644 --- a/Projectiles/ThrowingCog.cs +++ b/Projectiles/ThrowingCog.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/TikiSoulPro.cs b/Projectiles/TikiSoulPro.cs index 09e6b8a0..7d6a7fc6 100644 --- a/Projectiles/TikiSoulPro.cs +++ b/Projectiles/TikiSoulPro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.localAI[0] += 1f; diff --git a/Projectiles/TinSpearPro.cs b/Projectiles/TinSpearPro.cs index 4a192f82..a879fe52 100644 --- a/Projectiles/TinSpearPro.cs +++ b/Projectiles/TinSpearPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/TitaniumBolt.cs b/Projectiles/TitaniumBolt.cs index bc0fd287..f647477e 100644 --- a/Projectiles/TitaniumBolt.cs +++ b/Projectiles/TitaniumBolt.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/TitaniumDiscPro.cs b/Projectiles/TitaniumDiscPro.cs index 2831ee58..21cad4b5 100644 --- a/Projectiles/TitaniumDiscPro.cs +++ b/Projectiles/TitaniumDiscPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/TomatoPro.cs b/Projectiles/TomatoPro.cs index 8cbc8a80..c5745935 100644 --- a/Projectiles/TomatoPro.cs +++ b/Projectiles/TomatoPro.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/TopazDrillPro.cs b/Projectiles/TopazDrillPro.cs index 056e442b..0f39a4fd 100644 --- a/Projectiles/TopazDrillPro.cs +++ b/Projectiles/TopazDrillPro.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() } - public override void AI() { int dust = Dust.NewDust(projectile.position, projectile.width, projectile.height, 64, projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, default(Color), 1.9f); diff --git a/Projectiles/ToxicRazorknifePro.cs b/Projectiles/ToxicRazorknifePro.cs index 69d8aeeb..8247ea8a 100644 --- a/Projectiles/ToxicRazorknifePro.cs +++ b/Projectiles/ToxicRazorknifePro.cs @@ -25,7 +25,6 @@ public override void SetStaticDefaults() } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if (Main.rand.Next(6) == 0) diff --git a/Projectiles/TreasureGlaive.cs b/Projectiles/TreasureGlaive.cs index 7a7710de..57bbec41 100644 --- a/Projectiles/TreasureGlaive.cs +++ b/Projectiles/TreasureGlaive.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/TremorProjectiles.cs b/Projectiles/TremorProjectiles.cs index b088c445..63b52acf 100644 --- a/Projectiles/TremorProjectiles.cs +++ b/Projectiles/TremorProjectiles.cs @@ -67,4 +67,3 @@ public override void OnHitNPC(Projectile projectile, NPC target, int damage, flo } } - diff --git a/Projectiles/TrueBloodCarnage.cs b/Projectiles/TrueBloodCarnage.cs index c425333a..f662d8a6 100644 --- a/Projectiles/TrueBloodCarnage.cs +++ b/Projectiles/TrueBloodCarnage.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.velocity.Y += projectile.ai[0]; @@ -50,8 +49,6 @@ public override void Kill(int timeLeft) Main.PlaySound(0, (int)projectile.position.X, (int)projectile.position.Y, 0); } - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/TrueDeathSickleProj.cs b/Projectiles/TrueDeathSickleProj.cs index 497e31c7..8706218a 100644 --- a/Projectiles/TrueDeathSickleProj.cs +++ b/Projectiles/TrueDeathSickleProj.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.soundDelay--; diff --git a/Projectiles/TrueTridentProjectile.cs b/Projectiles/TrueTridentProjectile.cs index 95f3306b..be408ad4 100644 --- a/Projectiles/TrueTridentProjectile.cs +++ b/Projectiles/TrueTridentProjectile.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/TungstenSpearPro.cs b/Projectiles/TungstenSpearPro.cs index 9b194429..7c04d90b 100644 --- a/Projectiles/TungstenSpearPro.cs +++ b/Projectiles/TungstenSpearPro.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/TurtlePitchfork.cs b/Projectiles/TurtlePitchfork.cs index 07f5a34f..f6b70a21 100644 --- a/Projectiles/TurtlePitchfork.cs +++ b/Projectiles/TurtlePitchfork.cs @@ -17,6 +17,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/TwilightKnifePro.cs b/Projectiles/TwilightKnifePro.cs index d27c27be..aa9fbb8e 100644 --- a/Projectiles/TwilightKnifePro.cs +++ b/Projectiles/TwilightKnifePro.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int k = 0; k < 5; k++) diff --git a/Projectiles/TyphoonPro.cs b/Projectiles/TyphoonPro.cs index 3e886576..a4ebee12 100644 --- a/Projectiles/TyphoonPro.cs +++ b/Projectiles/TyphoonPro.cs @@ -28,8 +28,6 @@ public override void SetStaticDefaults() } - - public override void AI() { int num613 = 10; @@ -115,6 +113,5 @@ public override void AI() } } - } } diff --git a/Projectiles/VindicatorProj.cs b/Projectiles/VindicatorProj.cs index 0814a9db..381b9b28 100644 --- a/Projectiles/VindicatorProj.cs +++ b/Projectiles/VindicatorProj.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() } - public override void AI() { Vector2 vector22; diff --git a/Projectiles/VoidBladePro.cs b/Projectiles/VoidBladePro.cs index 4992ba47..0a32a49b 100644 --- a/Projectiles/VoidBladePro.cs +++ b/Projectiles/VoidBladePro.cs @@ -31,7 +31,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int num158 = 0; num158 < 20; num158++) @@ -120,8 +119,6 @@ public override void AI() } } - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/VoidRingPro.cs b/Projectiles/VoidRingPro.cs index 64f841af..74d35cf5 100644 --- a/Projectiles/VoidRingPro.cs +++ b/Projectiles/VoidRingPro.cs @@ -26,9 +26,6 @@ public override void SetStaticDefaults() } - - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/VortexBee.cs b/Projectiles/VortexBee.cs index a916536b..cd89a83b 100644 --- a/Projectiles/VortexBee.cs +++ b/Projectiles/VortexBee.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/VulcanBladePro.cs b/Projectiles/VulcanBladePro.cs index 97fcc937..1451a99f 100644 --- a/Projectiles/VulcanBladePro.cs +++ b/Projectiles/VulcanBladePro.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() } - public override void Kill(int timeLeft) { for (int num158 = 0; num158 < 20; num158++) diff --git a/Projectiles/VulcanBladeRing.cs b/Projectiles/VulcanBladeRing.cs index 5f90c34b..4ee3a860 100644 --- a/Projectiles/VulcanBladeRing.cs +++ b/Projectiles/VulcanBladeRing.cs @@ -27,9 +27,6 @@ public override void SetStaticDefaults() } - - - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/VultureFeatherPro.cs b/Projectiles/VultureFeatherPro.cs index aa395de9..b9ea02ae 100644 --- a/Projectiles/VultureFeatherPro.cs +++ b/Projectiles/VultureFeatherPro.cs @@ -23,6 +23,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/WallOfShadowsBoom.cs b/Projectiles/WallOfShadowsBoom.cs index 9202f67c..07b81bb6 100644 --- a/Projectiles/WallOfShadowsBoom.cs +++ b/Projectiles/WallOfShadowsBoom.cs @@ -44,8 +44,6 @@ public override bool PreAI() return false; } - - public override void AI() { Dust.NewDust(projectile.position + projectile.velocity, projectile.width, projectile.height, 173, projectile.velocity.X * 0.5f, projectile.velocity.Y * 0.5f); diff --git a/Projectiles/WallOfShadowsFlask_Proj.cs b/Projectiles/WallOfShadowsFlask_Proj.cs index f3fe59bf..327e6012 100644 --- a/Projectiles/WallOfShadowsFlask_Proj.cs +++ b/Projectiles/WallOfShadowsFlask_Proj.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() ProjectileID.Sets.TrailingMode[projectile.type] = 0; } - public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor) { Vector2 drawOrigin = new Vector2(Main.projectileTexture[projectile.type].Width * 0.5f, projectile.height * 0.5f); diff --git a/Projectiles/Warkee.cs b/Projectiles/Warkee.cs index ff8bdcba..d57faa70 100644 --- a/Projectiles/Warkee.cs +++ b/Projectiles/Warkee.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/WhiteGoldDagger.cs b/Projectiles/WhiteGoldDagger.cs index d01dcda5..ccf07550 100644 --- a/Projectiles/WhiteGoldDagger.cs +++ b/Projectiles/WhiteGoldDagger.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/WhiteGoldKnife.cs b/Projectiles/WhiteGoldKnife.cs index 4086a8ba..3c95a624 100644 --- a/Projectiles/WhiteGoldKnife.cs +++ b/Projectiles/WhiteGoldKnife.cs @@ -26,7 +26,6 @@ public override void SetStaticDefaults() } - public override Color? GetAlpha(Color lightColor) { return Color.White; diff --git a/Projectiles/WraithCloud.cs b/Projectiles/WraithCloud.cs index 8959e7c9..eec23792 100644 --- a/Projectiles/WraithCloud.cs +++ b/Projectiles/WraithCloud.cs @@ -22,6 +22,5 @@ public override void SetStaticDefaults() } - } } diff --git a/Projectiles/WraithWrathPro.cs b/Projectiles/WraithWrathPro.cs index 8e4c0e41..11ea5285 100644 --- a/Projectiles/WraithWrathPro.cs +++ b/Projectiles/WraithWrathPro.cs @@ -20,9 +20,6 @@ public override void SetStaticDefaults() } - - - public override void AI() { if (projectile.localAI[0] == 0f) diff --git a/Projectiles/ZootalooPet.cs b/Projectiles/ZootalooPet.cs index a9195009..805dd499 100644 --- a/Projectiles/ZootalooPet.cs +++ b/Projectiles/ZootalooPet.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override bool PreAI() { Player player = Main.player[projectile.owner]; diff --git a/Projectiles/ZootalooRodPro.cs b/Projectiles/ZootalooRodPro.cs index f2ba7679..e5cf1fe8 100644 --- a/Projectiles/ZootalooRodPro.cs +++ b/Projectiles/ZootalooRodPro.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, ((255 - projectile.alpha) * 0.25f) / 255f, ((255 - projectile.alpha) * 0.2f) / 255f, ((255 - projectile.alpha) * 0.01f) / 255f); diff --git a/Projectiles/projClamperLaser.cs b/Projectiles/projClamperLaser.cs index 4ef95347..dea61699 100644 --- a/Projectiles/projClamperLaser.cs +++ b/Projectiles/projClamperLaser.cs @@ -42,7 +42,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.Center = Main.npc[(int)projectile.ai[0]].Center + Offset; diff --git a/Projectiles/projDesertClaymore.cs b/Projectiles/projDesertClaymore.cs index 50e0fa46..44d01f63 100644 --- a/Projectiles/projDesertClaymore.cs +++ b/Projectiles/projDesertClaymore.cs @@ -33,7 +33,6 @@ public override void SetStaticDefaults() } - bool FirstAI = true; public override void AI() { diff --git a/Projectiles/projEyeofInfinity.cs b/Projectiles/projEyeofInfinity.cs index b22146d8..47b72d18 100644 --- a/Projectiles/projEyeofInfinity.cs +++ b/Projectiles/projEyeofInfinity.cs @@ -38,7 +38,6 @@ public override void SetStaticDefaults() } - void TryToReturn() { if (--TimeToReturn <= 0) diff --git a/Projectiles/projGenie.cs b/Projectiles/projGenie.cs index 74bdf425..95bae970 100644 --- a/Projectiles/projGenie.cs +++ b/Projectiles/projGenie.cs @@ -24,7 +24,6 @@ public override void SetStaticDefaults() } - public override void AI() { Lighting.AddLight(projectile.Center, new Vector3(0, 0, 1.5f)); diff --git a/Projectiles/projManaDagger.cs b/Projectiles/projManaDagger.cs index 1b0a1dd2..dea1b46d 100644 --- a/Projectiles/projManaDagger.cs +++ b/Projectiles/projManaDagger.cs @@ -29,7 +29,6 @@ public override void SetStaticDefaults() } - public override void AI() { float Light = 0.635f * (3 - (Hits - 1)); diff --git a/Projectiles/projSteampunkProbe.cs b/Projectiles/projSteampunkProbe.cs index cfe6e84f..f72ec2da 100644 --- a/Projectiles/projSteampunkProbe.cs +++ b/Projectiles/projSteampunkProbe.cs @@ -38,7 +38,6 @@ public override void SetStaticDefaults() } - public override void AI() { projectile.ai[0] = -1; diff --git a/Tiles/AlchemyStationTile.cs b/Tiles/AlchemyStationTile.cs index fcaa249e..7c90b31a 100644 --- a/Tiles/AlchemyStationTile.cs +++ b/Tiles/AlchemyStationTile.cs @@ -30,5 +30,4 @@ public override void KillMultiTile(int i, int j, int frameX, int frameY) } } - }} \ No newline at end of file diff --git a/Tiles/AltarofEnchantmentsTile.cs b/Tiles/AltarofEnchantmentsTile.cs index 8c0d3fcf..c05de085 100644 --- a/Tiles/AltarofEnchantmentsTile.cs +++ b/Tiles/AltarofEnchantmentsTile.cs @@ -29,5 +29,4 @@ public override void KillMultiTile(int i, int j, int frameX, int frameY) } } - }} \ No newline at end of file diff --git a/Tiles/ArgiteBar.cs b/Tiles/ArgiteBar.cs index 0da73b60..9cf30f23 100644 --- a/Tiles/ArgiteBar.cs +++ b/Tiles/ArgiteBar.cs @@ -24,7 +24,6 @@ public override void SetDefaults() Main.tileSolid[Type] = true; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { if(frameX == 0) diff --git a/Tiles/BrassBar.cs b/Tiles/BrassBar.cs index 942abc0c..f2a42903 100644 --- a/Tiles/BrassBar.cs +++ b/Tiles/BrassBar.cs @@ -24,7 +24,6 @@ public override void SetDefaults() Main.tileSolid[Type] = true; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { if(frameX == 0) diff --git a/Tiles/BronzeBar.cs b/Tiles/BronzeBar.cs index 56c30d1a..cb41d4e1 100644 --- a/Tiles/BronzeBar.cs +++ b/Tiles/BronzeBar.cs @@ -24,7 +24,6 @@ public override void SetDefaults() Main.tileSolid[Type] = true; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { if(frameX == 0) diff --git a/Tiles/CandyBarTile.cs b/Tiles/CandyBarTile.cs index fcd87c82..ca7ba778 100644 --- a/Tiles/CandyBarTile.cs +++ b/Tiles/CandyBarTile.cs @@ -24,7 +24,6 @@ public override void SetDefaults() Main.tileSolid[Type] = true; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { if(frameX == 0) diff --git a/Tiles/CometiteBarTile.cs b/Tiles/CometiteBarTile.cs index 8e313636..2ec9be31 100644 --- a/Tiles/CometiteBarTile.cs +++ b/Tiles/CometiteBarTile.cs @@ -24,7 +24,6 @@ public override void SetDefaults() Main.tileSolid[Type] = true; } - public override bool Drop(int i, int j) { Item.NewItem(i * 16, j * 16, 32, 32, mod.ItemType("CometiteBar")); diff --git a/Tiles/CometiteOreTile.cs b/Tiles/CometiteOreTile.cs index 3233dc62..1199d665 100644 --- a/Tiles/CometiteOreTile.cs +++ b/Tiles/CometiteOreTile.cs @@ -30,7 +30,6 @@ public override bool CanExplode(int i, int j) return false; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { if(Main.rand.Next(10) == 0) diff --git a/Tiles/CrimstoneBathtub.cs b/Tiles/CrimstoneBathtub.cs index d076ef67..cf215b7e 100644 --- a/Tiles/CrimstoneBathtub.cs +++ b/Tiles/CrimstoneBathtub.cs @@ -20,7 +20,6 @@ public override void SetDefaults() bed = true; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { Item.NewItem(i * 16, j * 16, 64, 32, mod.ItemType("CrimstoneBathtub")); diff --git a/Tiles/EbonstoneBathtub.cs b/Tiles/EbonstoneBathtub.cs index ca6e7a98..488bc755 100644 --- a/Tiles/EbonstoneBathtub.cs +++ b/Tiles/EbonstoneBathtub.cs @@ -20,7 +20,6 @@ public override void SetDefaults() bed = true; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { Item.NewItem(i * 16, j * 16, 64, 32, mod.ItemType("EbonstoneBathtub")); diff --git a/Tiles/GloomstoneBathtub.cs b/Tiles/GloomstoneBathtub.cs index cdfa656b..0ab41426 100644 --- a/Tiles/GloomstoneBathtub.cs +++ b/Tiles/GloomstoneBathtub.cs @@ -20,7 +20,6 @@ public override void SetDefaults() bed = true; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { Item.NewItem(i * 16, j * 16, 64, 32, mod.ItemType("GloomstoneBathtub")); diff --git a/Tiles/GloomstoneChandelier.cs b/Tiles/GloomstoneChandelier.cs index 43585718..24263222 100644 --- a/Tiles/GloomstoneChandelier.cs +++ b/Tiles/GloomstoneChandelier.cs @@ -33,7 +33,6 @@ public override void ModifyLight(int i, int j, ref float r, ref float g, ref flo b = 0.9f; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { if(frameX == 0) diff --git a/Tiles/GreatAnvilTile.cs b/Tiles/GreatAnvilTile.cs index 43d0cdda..ece9db44 100644 --- a/Tiles/GreatAnvilTile.cs +++ b/Tiles/GreatAnvilTile.cs @@ -29,5 +29,4 @@ public override void KillMultiTile(int i, int j, int frameX, int frameY) } } - }} \ No newline at end of file diff --git a/Tiles/HardCometiteBarTile.cs b/Tiles/HardCometiteBarTile.cs index 24a1196a..a53bdfbf 100644 --- a/Tiles/HardCometiteBarTile.cs +++ b/Tiles/HardCometiteBarTile.cs @@ -24,7 +24,6 @@ public override void SetDefaults() Main.tileSolid[Type] = true; } - public override bool Drop(int i, int j) { Item.NewItem(i * 16, j * 16, 32, 32, mod.ItemType("HardCometiteBar")); diff --git a/Tiles/SandstoneBathtub.cs b/Tiles/SandstoneBathtub.cs index 7050b019..ce1ca6c9 100644 --- a/Tiles/SandstoneBathtub.cs +++ b/Tiles/SandstoneBathtub.cs @@ -20,7 +20,6 @@ public override void SetDefaults() bed = true; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { Item.NewItem(i * 16, j * 16, 64, 32, mod.ItemType("SandstoneBathtub")); diff --git a/Tiles/SandstoneChandelier.cs b/Tiles/SandstoneChandelier.cs index 7781fe0a..e4aba95d 100644 --- a/Tiles/SandstoneChandelier.cs +++ b/Tiles/SandstoneChandelier.cs @@ -33,7 +33,6 @@ public override void ModifyLight(int i, int j, ref float r, ref float g, ref flo b = 0.9f; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { if(frameX == 0) diff --git a/Tiles/StoneBathtub.cs b/Tiles/StoneBathtub.cs index 05367b4f..30164a7c 100644 --- a/Tiles/StoneBathtub.cs +++ b/Tiles/StoneBathtub.cs @@ -20,7 +20,6 @@ public override void SetDefaults() bed = true; } - public override void KillMultiTile(int i, int j, int frameX, int frameY) { Item.NewItem(i * 16, j * 16, 64, 32, mod.ItemType("StoneBathtub")); diff --git a/Tiles/WhiteGoldBarTile.cs b/Tiles/WhiteGoldBarTile.cs index 4e02e8fd..aebf55a6 100644 --- a/Tiles/WhiteGoldBarTile.cs +++ b/Tiles/WhiteGoldBarTile.cs @@ -24,7 +24,6 @@ public override void SetDefaults() Main.tileSolid[Type] = true; } - public override bool Drop(int i, int j) { Item.NewItem(i * 16, j * 16, 32, 32, mod.ItemType("WhiteGoldBar")); diff --git a/Tremor.cs b/Tremor.cs index 8e6e2e1b..4fc9140e 100644 --- a/Tremor.cs +++ b/Tremor.cs @@ -196,7 +196,6 @@ public override void Unload() } } - public override void Load() { instance = this; @@ -315,7 +314,6 @@ public void DrawOrionEvent(SpriteBatch spriteBatch) Rectangle waveProgressAmount = new Rectangle(0, 0, (int)(progressColor.Width * 0.01f * MathHelper.Clamp(InvasionWorld.CyberWrathPoints1, 0f, 100f)), progressColor.Height); Vector2 offset = new Vector2((waveProgressBar.Width - (int)(waveProgressBar.Width * scaleMultiplier)) * 0.5f, (waveProgressBar.Height - (int)(waveProgressBar.Height * scaleMultiplier)) * 0.5f); - spriteBatch.Draw(progressBg, waveProgressBar.Location.ToVector2() + offset, null, Color.White * alpha, 0f, new Vector2(0f), scaleMultiplier, SpriteEffects.None, 0f); spriteBatch.Draw(progressBg, waveProgressBar.Location.ToVector2() + offset, waveProgressAmount, waveColor, 0f, new Vector2(0f), scaleMultiplier, SpriteEffects.None, 0f); diff --git a/ZombieEvent/Items/BookofRevelations.cs b/ZombieEvent/Items/BookofRevelations.cs index 6e88c4e0..2a1c95fa 100644 --- a/ZombieEvent/Items/BookofRevelations.cs +++ b/ZombieEvent/Items/BookofRevelations.cs @@ -21,7 +21,6 @@ public override void SetDefaults() item.autoReuse = false; item.noMelee = true; - } public override void SetStaticDefaults() @@ -39,7 +38,6 @@ public override void AddRecipes() recipe.AddRecipe(); } - public override bool UseItem(Player player) { if (player.FindBuffIndex(mod.BuffType("TomeRechargeBuff1")) < 1) diff --git a/ZombieEvent/Items/BowBlueprint.cs b/ZombieEvent/Items/BowBlueprint.cs index ae92823c..3d96b862 100644 --- a/ZombieEvent/Items/BowBlueprint.cs +++ b/ZombieEvent/Items/BowBlueprint.cs @@ -20,7 +20,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/ZombieEvent/Items/ChargedLamp.cs b/ZombieEvent/Items/ChargedLamp.cs index b2979157..8873a905 100644 --- a/ZombieEvent/Items/ChargedLamp.cs +++ b/ZombieEvent/Items/ChargedLamp.cs @@ -54,5 +54,4 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Releases electric blasts in all directions"); } - }} diff --git a/ZombieEvent/Items/CryptStone.cs b/ZombieEvent/Items/CryptStone.cs index e59b8679..cfb870e3 100644 --- a/ZombieEvent/Items/CryptStone.cs +++ b/ZombieEvent/Items/CryptStone.cs @@ -19,5 +19,4 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - }} diff --git a/ZombieEvent/Items/CryptomageSkull.cs b/ZombieEvent/Items/CryptomageSkull.cs index a4497144..a25f43c3 100644 --- a/ZombieEvent/Items/CryptomageSkull.cs +++ b/ZombieEvent/Items/CryptomageSkull.cs @@ -20,5 +20,4 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - }} diff --git a/ZombieEvent/Items/CursedCleaver.cs b/ZombieEvent/Items/CursedCleaver.cs index e8afe91e..5ae076a3 100644 --- a/ZombieEvent/Items/CursedCleaver.cs +++ b/ZombieEvent/Items/CursedCleaver.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Inflicts Cursed Flames on enemies"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("CursedCleaverPro"); diff --git a/ZombieEvent/Items/CursedCleaverPro.cs b/ZombieEvent/Items/CursedCleaverPro.cs index 63029457..5dbd6dd3 100644 --- a/ZombieEvent/Items/CursedCleaverPro.cs +++ b/ZombieEvent/Items/CursedCleaverPro.cs @@ -15,14 +15,11 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 28; } - - public override Color? GetAlpha(Color lightColor) { return Color.White; } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if(Main.rand.Next(6) == 0) @@ -31,7 +28,6 @@ public override void OnHitNPC(NPC target, int damage, float knockback, bool crit } } - public override void OnHitPvp(Player target, int damage, bool crit) { if(Main.rand.Next(6) == 0) diff --git a/ZombieEvent/Items/CursedCloth.cs b/ZombieEvent/Items/CursedCloth.cs index 8753586a..a929432e 100644 --- a/ZombieEvent/Items/CursedCloth.cs +++ b/ZombieEvent/Items/CursedCloth.cs @@ -19,5 +19,4 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - }} diff --git a/ZombieEvent/Items/DeadBranch.cs b/ZombieEvent/Items/DeadBranch.cs index f7f2d99d..48634a67 100644 --- a/ZombieEvent/Items/DeadBranch.cs +++ b/ZombieEvent/Items/DeadBranch.cs @@ -36,8 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots shadow bolts"); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { int proj = Projectile.NewProjectile(position.X, position.Y, speedX, speedY, 671, damage, knockBack, Main.myPlayer); diff --git a/ZombieEvent/Items/GunBlueprint.cs b/ZombieEvent/Items/GunBlueprint.cs index 5b01b250..f9d26ea5 100644 --- a/ZombieEvent/Items/GunBlueprint.cs +++ b/ZombieEvent/Items/GunBlueprint.cs @@ -20,7 +20,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/ZombieEvent/Items/HauntHat.cs b/ZombieEvent/Items/HauntHat.cs index 6e9255a4..f01bb420 100644 --- a/ZombieEvent/Items/HauntHat.cs +++ b/ZombieEvent/Items/HauntHat.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Summons a friendly ghost"); } - public override void UseStyle(Player player) { if (player.whoAmI == Main.myPlayer && player.itemTime == 0) diff --git a/ZombieEvent/Items/IchorCleaver.cs b/ZombieEvent/Items/IchorCleaver.cs index 69329afb..46723ffe 100644 --- a/ZombieEvent/Items/IchorCleaver.cs +++ b/ZombieEvent/Items/IchorCleaver.cs @@ -21,7 +21,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Inflicts Ichor on enemies"); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { type = mod.ProjectileType("IchorCleaverPro"); diff --git a/ZombieEvent/Items/IchorCleaverPro.cs b/ZombieEvent/Items/IchorCleaverPro.cs index c0bee160..c108384f 100644 --- a/ZombieEvent/Items/IchorCleaverPro.cs +++ b/ZombieEvent/Items/IchorCleaverPro.cs @@ -15,15 +15,11 @@ public override void SetDefaults() Main.projFrames[projectile.type] = 28; } - - - public override Color? GetAlpha(Color lightColor) { return Color.White; } - public override void OnHitNPC(NPC target, int damage, float knockback, bool crit) { if(Main.rand.Next(6) == 0) @@ -32,7 +28,6 @@ public override void OnHitNPC(NPC target, int damage, float knockback, bool crit } } - public override void OnHitPvp(Player target, int damage, bool crit) { if(Main.rand.Next(6) == 0) diff --git a/ZombieEvent/Items/NecromaniacWorkbench.cs b/ZombieEvent/Items/NecromaniacWorkbench.cs index d54b817d..0b7d4c2b 100644 --- a/ZombieEvent/Items/NecromaniacWorkbench.cs +++ b/ZombieEvent/Items/NecromaniacWorkbench.cs @@ -27,7 +27,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/ZombieEvent/Items/PoisonousPhylactery.cs b/ZombieEvent/Items/PoisonousPhylactery.cs index 936b4cac..831c07c8 100644 --- a/ZombieEvent/Items/PoisonousPhylactery.cs +++ b/ZombieEvent/Items/PoisonousPhylactery.cs @@ -26,7 +26,6 @@ public override void SetDefaults() item.value = 2500; item.rare = 5; - item.accessory = true; } @@ -37,8 +36,6 @@ public override void SetStaticDefaults() Main.RegisterItemAnimation(item.type, new DrawAnimationVertical(6, 4)); } - - public override void UpdateAccessory(Player player, bool hideVisual) { player.AddBuff(79, 60, true); diff --git a/ZombieEvent/Items/RupicideCannon.cs b/ZombieEvent/Items/RupicideCannon.cs index 97884f56..00549d7d 100644 --- a/ZombieEvent/Items/RupicideCannon.cs +++ b/ZombieEvent/Items/RupicideCannon.cs @@ -35,8 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Shoots magical blasts"); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { int proj = Projectile.NewProjectile(position.X, position.Y, speedX, speedY, 675, damage, knockBack, Main.myPlayer); @@ -57,7 +55,6 @@ public override void AddRecipes() recipe.AddRecipe(); } - public override Vector2? HoldoutOffset() { return new Vector2(-18, -4); diff --git a/ZombieEvent/Items/RupicideClub.cs b/ZombieEvent/Items/RupicideClub.cs index 2329bbb1..f2774a09 100644 --- a/ZombieEvent/Items/RupicideClub.cs +++ b/ZombieEvent/Items/RupicideClub.cs @@ -30,7 +30,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void MeleeEffects(Player player, Rectangle hitbox) { if(Main.rand.Next(2) == 0) diff --git a/ZombieEvent/Items/RupicideRepeater.cs b/ZombieEvent/Items/RupicideRepeater.cs index 6163ff6d..4bbccba8 100644 --- a/ZombieEvent/Items/RupicideRepeater.cs +++ b/ZombieEvent/Items/RupicideRepeater.cs @@ -14,7 +14,6 @@ public override void SetDefaults() item.width = 36; item.height = 24; - item.useTime = 15; item.useAnimation = 15; item.shoot = 1; @@ -35,7 +34,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Quickly launches arrows\n20% to shoot a fiery burst"); } - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/ZombieEvent/Items/RupicideStaff.cs b/ZombieEvent/Items/RupicideStaff.cs index 7c0ff9fa..253dc97e 100644 --- a/ZombieEvent/Items/RupicideStaff.cs +++ b/ZombieEvent/Items/RupicideStaff.cs @@ -35,8 +35,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack) { int proj = Projectile.NewProjectile(position.X, position.Y, speedX, speedY, type, damage, knockBack, Main.myPlayer); diff --git a/ZombieEvent/Items/ScaryCloak.cs b/ZombieEvent/Items/ScaryCloak.cs index 458b7f0b..38afcce7 100644 --- a/ZombieEvent/Items/ScaryCloak.cs +++ b/ZombieEvent/Items/ScaryCloak.cs @@ -16,7 +16,6 @@ public override void SetDefaults() item.rare = 3; item.defense = 3; - item.accessory = true; } @@ -26,7 +25,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Makes the player invisible\nIncreases magic and summon damage and critical strike chanse by 8"); } - public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/ZombieEvent/Items/ScrollofUndead.cs b/ZombieEvent/Items/ScrollofUndead.cs index 52f11558..f9cb8744 100644 --- a/ZombieEvent/Items/ScrollofUndead.cs +++ b/ZombieEvent/Items/ScrollofUndead.cs @@ -28,7 +28,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Begins the Night of the Undead"); } - public override bool CanUseItem(Player player) { CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer(mod); diff --git a/ZombieEvent/Items/SpecterChestplate.cs b/ZombieEvent/Items/SpecterChestplate.cs index 46de8aca..959d9f9a 100644 --- a/ZombieEvent/Items/SpecterChestplate.cs +++ b/ZombieEvent/Items/SpecterChestplate.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 10000; item.rare = 11; item.defense = 22; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases melee damage by 12%\nIncreases maximum number of minions by 2"); } - public override void UpdateEquip(Player player) { player.GetModPlayer(mod).alchemicalDamage += 0.2f; diff --git a/ZombieEvent/Items/SpecterHood.cs b/ZombieEvent/Items/SpecterHood.cs index 05854df3..ffe9396c 100644 --- a/ZombieEvent/Items/SpecterHood.cs +++ b/ZombieEvent/Items/SpecterHood.cs @@ -25,7 +25,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 10000; item.rare = 11; item.defense = 8; @@ -37,7 +36,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases melee damage by 10%\nIncreases minion damage by 10%"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.1f; diff --git a/ZombieEvent/Items/SpecterPants.cs b/ZombieEvent/Items/SpecterPants.cs index a99bc083..e84b0adf 100644 --- a/ZombieEvent/Items/SpecterPants.cs +++ b/ZombieEvent/Items/SpecterPants.cs @@ -13,7 +13,6 @@ public override void SetDefaults() item.width = 38; item.height = 22; - item.value = 10000; item.rare = 11; item.defense = 15; @@ -25,7 +24,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Increases melee damage by 10%\nIncreases minion damage by 10%"); } - public override void UpdateEquip(Player player) { player.meleeDamage += 0.1f; diff --git a/ZombieEvent/Items/TornPapyrus.cs b/ZombieEvent/Items/TornPapyrus.cs index 011d199c..734ea2ed 100644 --- a/ZombieEvent/Items/TornPapyrus.cs +++ b/ZombieEvent/Items/TornPapyrus.cs @@ -20,5 +20,4 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - }} diff --git a/ZombieEvent/Items/TornWings.cs b/ZombieEvent/Items/TornWings.cs index 1d2c38b5..69e07307 100644 --- a/ZombieEvent/Items/TornWings.cs +++ b/ZombieEvent/Items/TornWings.cs @@ -23,7 +23,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault(""); } - public override void UpdateAccessory(Player player, bool hideVisual) { player.wingTimeMax = 25; diff --git a/ZombieEvent/Items/WickedRing.cs b/ZombieEvent/Items/WickedRing.cs index ba0c35d7..2e451512 100644 --- a/ZombieEvent/Items/WickedRing.cs +++ b/ZombieEvent/Items/WickedRing.cs @@ -54,8 +54,6 @@ public override void SetStaticDefaults() Tooltip.SetDefault("Releases shadow tentacles in all directions"); } - - public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); diff --git a/ZombieEvent/Mobs/Dapperblook.cs b/ZombieEvent/Mobs/Dapperblook.cs index fd2d3f0d..afc8529d 100644 --- a/ZombieEvent/Mobs/Dapperblook.cs +++ b/ZombieEvent/Mobs/Dapperblook.cs @@ -36,7 +36,6 @@ public override void SetDefaults() // Todo: bannerItem = mod.ItemType("Dapperblook"); } - public override void AI() { if (NPC.AnyNPCs(mod.NPCType("Cryptomage"))) diff --git a/ZombieEvent/Mobs/DiceZombie.cs b/ZombieEvent/Mobs/DiceZombie.cs index 8f740bfa..f25cc42f 100644 --- a/ZombieEvent/Mobs/DiceZombie.cs +++ b/ZombieEvent/Mobs/DiceZombie.cs @@ -51,7 +51,6 @@ public override void HitEffect(int hitDirection, double damage) } } - public override void NPCLoot() { if (Main.rand.NextBool()) diff --git a/ZombieEvent/Mobs/PetrifiedZombie1.cs b/ZombieEvent/Mobs/PetrifiedZombie1.cs index 87bc5eb2..3ee45221 100644 --- a/ZombieEvent/Mobs/PetrifiedZombie1.cs +++ b/ZombieEvent/Mobs/PetrifiedZombie1.cs @@ -54,7 +54,6 @@ public override void HitEffect(int hitDirection, double damage) } } - public override void NPCLoot() { if (Main.netMode != 1) diff --git a/ZombieEvent/Mobs/PetrifiedZombie2.cs b/ZombieEvent/Mobs/PetrifiedZombie2.cs index 466546da..2af6ea06 100644 --- a/ZombieEvent/Mobs/PetrifiedZombie2.cs +++ b/ZombieEvent/Mobs/PetrifiedZombie2.cs @@ -54,7 +54,6 @@ public override void HitEffect(int hitDirection, double damage) } } - public override void NPCLoot() { if (Main.netMode != 1) diff --git a/ZombieEvent/Mobs/PetrifiedZombie3.cs b/ZombieEvent/Mobs/PetrifiedZombie3.cs index 93e71fc4..affbc8b5 100644 --- a/ZombieEvent/Mobs/PetrifiedZombie3.cs +++ b/ZombieEvent/Mobs/PetrifiedZombie3.cs @@ -54,7 +54,6 @@ public override void HitEffect(int hitDirection, double damage) } } - public override void NPCLoot() { if (Main.netMode != 1) diff --git a/ZombieEvent/Mobs/TheHaunt.cs b/ZombieEvent/Mobs/TheHaunt.cs index ca253488..0389656f 100644 --- a/ZombieEvent/Mobs/TheHaunt.cs +++ b/ZombieEvent/Mobs/TheHaunt.cs @@ -36,7 +36,6 @@ public override void SetDefaults() // Todo: bannerItem = mod.ItemType("TheHauntBanner"); } - public override void AI() { if (NPC.AnyNPCs(mod.NPCType("Cryptomage"))) diff --git a/ZombieEvent/Mobs/Zombeast.cs b/ZombieEvent/Mobs/Zombeast.cs index f36eab7f..7e6d54cc 100644 --- a/ZombieEvent/Mobs/Zombeast.cs +++ b/ZombieEvent/Mobs/Zombeast.cs @@ -14,7 +14,6 @@ public override void SetStaticDefaults() Main.npcFrameCount[npc.type] = 10; } - public override void SetDefaults() { npc.lifeMax = 500;