From 8f9406c9b541e0b4169b353405bbb1210854cac7 Mon Sep 17 00:00:00 2001 From: Big Duckie Date: Tue, 5 Jul 2022 23:18:12 -0600 Subject: [PATCH] Change items to use rainbow text without being labeled as expert only. --- Items/Accessories/HarmonyScarf.cs | 2 +- Items/Accessories/HarmonyScarfUpgraded.cs | 2 +- Items/Bars/RainbowChunk.cs | 2 +- Items/Items/CraftingIngredients/NatureToken.cs | 2 +- Items/Items/CraftingIngredients/OminousBook.cs | 2 +- Items/Items/CraftingIngredients/RainbowDust.cs | 2 +- Items/Items/CraftingIngredients/RainbowHandle.cs | 2 +- Items/Items/CraftingIngredients/RainbowMuzzle.cs | 2 +- Items/Items/CraftingIngredients/RainbowToken.cs | 2 +- Items/Items/DamageDebugItem.cs | 2 +- Items/Tiles/RainbowStation.cs | 2 +- Items/Weapons/Magic/Coalescence/Coalescence.cs | 2 +- Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs | 2 +- Items/Weapons/Magic/Coalescence/GoldenVengeance.cs | 2 +- Items/Weapons/Magic/Coalescence/HeavensVengeance.cs | 2 +- Items/Weapons/Magic/Coalescence/HellfireBeam.cs | 2 +- Items/Weapons/Magic/FusionNeedlers/FusedWish.cs | 2 +- Items/Weapons/Magic/IllusoryMirror.cs | 2 +- Items/Weapons/Magic/SpectralIllusion.cs | 2 +- Items/Weapons/Magic/Staffs/GoldenStaff.cs | 2 +- Items/Weapons/Magic/Staffs/NatureStaff.cs | 2 +- Items/Weapons/Magic/Staffs/Tranquility.cs | 2 +- Items/Weapons/Melee/Shortswords/TheRainbowsCurse.cs | 2 +- Items/Weapons/Melee/Swords/RainbowClaymore.cs | 2 +- Items/Weapons/Melee/Swords/ShimadaSwords/DreamCatcher.cs | 2 +- Items/Weapons/Melee/Waraxes/SpectralShredder.cs | 2 +- Items/Weapons/RainbowDemon/TheRainbowDemon.cs | 2 +- Items/Weapons/RainbowDemon/TheRainbowDemonClaymore.cs | 2 +- Items/Weapons/RainbowDemon/TheRainbowDemonMagic.cs | 2 +- Items/Weapons/RainbowDemon/TheRainbowDemonRanged.cs | 2 +- Items/Weapons/RainbowDemon/TheRainbowDemonShredder.cs | 2 +- Items/Weapons/RainbowDemon/TheRainbowDemonThrowing.cs | 2 +- Items/Weapons/Ranged/Bows/LunarBow.cs | 2 +- Items/Weapons/Ranged/Bows/LunarRainBow.cs | 2 +- Items/Weapons/Ranged/Bows/StormBows/DemonsBow.cs | 2 +- Items/Weapons/Ranged/Bows/StormBows/GoldenKabuki.cs | 2 +- Items/Weapons/Ranged/Bows/StormBows/Kabuki.cs | 2 +- Items/Weapons/Ranged/Bows/StormBows/RainBow.cs | 2 +- Items/Weapons/Ranged/Bows/StormBows/StormBow.cs | 2 +- Items/Weapons/Ranged/FoxPistols/FoxPistol.cs | 2 +- Items/Weapons/Ranged/FoxPistols/FoxPistolBlue.cs | 2 +- Items/Weapons/Ranged/FoxPistols/SpectralHowler.cs | 2 +- Items/Weapons/Ranged/FusionDrivers/FusedRainbow.cs | 2 +- Items/Weapons/Ranged/LightGuns/GoldenStinger.cs | 2 +- Items/Weapons/Ranged/LightGuns/SpectralBlaster.cs | 2 +- Items/Weapons/Ranged/MachinePistols/CosmicHacker.cs | 2 +- Items/Weapons/Ranged/MachinePistols/MachinePistolGolden.cs | 2 +- Items/Weapons/Ranged/MachinePistols/Verano.cs | 2 +- Items/Weapons/Ranged/MachinePistols/VeranoRime.cs | 2 +- Items/Weapons/Ranged/Peacekeeper/Unity.cs | 2 +- Items/Weapons/Ranged/PulsePistols/GoldenPulse.cs | 3 +-- Items/Weapons/Ranged/PulsePistols/Graffiti.cs | 2 +- Items/Weapons/Ranged/PulsePistols/PulseSprayer.cs | 2 +- Items/Weapons/Ranged/Shotguns/Depriver.cs | 2 +- Items/Weapons/Thrown/Daggers/ColorfulSolution.cs | 2 +- Items/Weapons/Thrown/Shuriken/TheSpinningRainbow.cs | 2 +- 56 files changed, 56 insertions(+), 57 deletions(-) diff --git a/Items/Accessories/HarmonyScarf.cs b/Items/Accessories/HarmonyScarf.cs index 4550be3..f27b8f2 100644 --- a/Items/Accessories/HarmonyScarf.cs +++ b/Items/Accessories/HarmonyScarf.cs @@ -17,7 +17,7 @@ public class HarmonyScarf : ModItem Item.width = 42; Item.height = 38; Item.value = Item.sellPrice(5, 0, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.accessory = true; Item.defense = 16; } diff --git a/Items/Accessories/HarmonyScarfUpgraded.cs b/Items/Accessories/HarmonyScarfUpgraded.cs index 9ef7e5a..07a5955 100644 --- a/Items/Accessories/HarmonyScarfUpgraded.cs +++ b/Items/Accessories/HarmonyScarfUpgraded.cs @@ -18,7 +18,7 @@ public class HarmonyScarfUpgraded : ModItem Item.width = 42; Item.height = 36; Item.value = Item.sellPrice(20, 0, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.accessory = true; Item.defense = 26; } diff --git a/Items/Bars/RainbowChunk.cs b/Items/Bars/RainbowChunk.cs index 6307e24..55d0d82 100644 --- a/Items/Bars/RainbowChunk.cs +++ b/Items/Bars/RainbowChunk.cs @@ -17,7 +17,7 @@ public class RainbowChunk : ModItem Item.height = 24; Item.maxStack = 99; Item.value = Item.sellPrice(0, 21, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override void AddRecipes() diff --git a/Items/Items/CraftingIngredients/NatureToken.cs b/Items/Items/CraftingIngredients/NatureToken.cs index c7dbb0c..b406c63 100644 --- a/Items/Items/CraftingIngredients/NatureToken.cs +++ b/Items/Items/CraftingIngredients/NatureToken.cs @@ -16,6 +16,6 @@ public class NatureToken : ModItem Item.height = 30; Item.maxStack = 99; Item.value = Item.sellPrice(0, 2, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } } diff --git a/Items/Items/CraftingIngredients/OminousBook.cs b/Items/Items/CraftingIngredients/OminousBook.cs index 8b3a4c0..85ca07a 100644 --- a/Items/Items/CraftingIngredients/OminousBook.cs +++ b/Items/Items/CraftingIngredients/OminousBook.cs @@ -16,6 +16,6 @@ public class OminousBook : ModItem Item.height = 30; Item.maxStack = 99; Item.value = Item.sellPrice(0, 2, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } } diff --git a/Items/Items/CraftingIngredients/RainbowDust.cs b/Items/Items/CraftingIngredients/RainbowDust.cs index 21eb69d..fab8ff8 100644 --- a/Items/Items/CraftingIngredients/RainbowDust.cs +++ b/Items/Items/CraftingIngredients/RainbowDust.cs @@ -15,7 +15,7 @@ public class RainbowDust : ModItem Item.width = 24; Item.height = 24; Item.maxStack = 999; - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.value = Item.sellPrice(0, 0, 4, 50); } } diff --git a/Items/Items/CraftingIngredients/RainbowHandle.cs b/Items/Items/CraftingIngredients/RainbowHandle.cs index 9d80c50..3a5dafc 100644 --- a/Items/Items/CraftingIngredients/RainbowHandle.cs +++ b/Items/Items/CraftingIngredients/RainbowHandle.cs @@ -16,6 +16,6 @@ public class RainbowHandle : ModItem Item.height = 37; Item.maxStack = 99; Item.value = Item.sellPrice(18, 0, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } } diff --git a/Items/Items/CraftingIngredients/RainbowMuzzle.cs b/Items/Items/CraftingIngredients/RainbowMuzzle.cs index 3a53918..92ba7a8 100644 --- a/Items/Items/CraftingIngredients/RainbowMuzzle.cs +++ b/Items/Items/CraftingIngredients/RainbowMuzzle.cs @@ -16,6 +16,6 @@ public class RainbowMuzzle : ModItem Item.height = 33; Item.maxStack = 99; Item.value = Item.sellPrice(21, 0, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } } diff --git a/Items/Items/CraftingIngredients/RainbowToken.cs b/Items/Items/CraftingIngredients/RainbowToken.cs index 0e36dfd..19038db 100644 --- a/Items/Items/CraftingIngredients/RainbowToken.cs +++ b/Items/Items/CraftingIngredients/RainbowToken.cs @@ -16,7 +16,7 @@ public class RainbowToken : ModItem Item.height = 30; Item.maxStack = 99; Item.value = Item.sellPrice(0, 9, 80, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override void AddRecipes() diff --git a/Items/Items/DamageDebugItem.cs b/Items/Items/DamageDebugItem.cs index 7aedd79..9988e87 100644 --- a/Items/Items/DamageDebugItem.cs +++ b/Items/Items/DamageDebugItem.cs @@ -22,7 +22,7 @@ public class DamageDebugItem : ModItem Item.maxStack = 1; Item.useStyle = ItemUseStyleID.Shoot; Item.value = Item.sellPrice(0, 0, 0, 0); - Item.expert = false; + Item.rare = ItemRarityID.Expert; } public override bool AltFunctionUse(Player player) diff --git a/Items/Tiles/RainbowStation.cs b/Items/Tiles/RainbowStation.cs index 800155c..bd06901 100644 --- a/Items/Tiles/RainbowStation.cs +++ b/Items/Tiles/RainbowStation.cs @@ -22,7 +22,7 @@ public class RainbowStation : ModItem Item.useTime = 10; Item.useStyle = ItemUseStyleID.Swing; Item.consumable = true; - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.createTile = ModContent.TileType(); } diff --git a/Items/Weapons/Magic/Coalescence/Coalescence.cs b/Items/Weapons/Magic/Coalescence/Coalescence.cs index 99ac6cc..d6c3898 100644 --- a/Items/Weapons/Magic/Coalescence/Coalescence.cs +++ b/Items/Weapons/Magic/Coalescence/Coalescence.cs @@ -18,7 +18,6 @@ public class Coalescence : ModItem Item.noMelee = true; Item.channel = true; Item.mana = 5; - Item.expert = true; Item.width = 28; Item.height = 30; Item.useTime = 20; @@ -28,6 +27,7 @@ public class Coalescence : ModItem Item.useAnimation = 20; Item.shoot = ModContent.ProjectileType(); Item.value = Item.sellPrice(0, 8, 50, 0); + Item.rare = ItemRarityID.Expert; } public override void AddRecipes() diff --git a/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs b/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs index bbc51e1..8f8c60d 100644 --- a/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs +++ b/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs @@ -18,7 +18,6 @@ public class DelightfulDevastation : ModItem Item.noMelee = true; Item.channel = true; Item.mana = 15; - Item.expert = true; Item.width = 30; Item.height = 32; Item.useTime = 20; @@ -28,6 +27,7 @@ public class DelightfulDevastation : ModItem Item.useAnimation = 10; Item.shoot = ModContent.ProjectileType(); Item.value = Item.sellPrice(2, 40, 0, 0); + Item.rare = ItemRarityID.Expert; } public override void AddRecipes() diff --git a/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs b/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs index 458891b..e2637fc 100644 --- a/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs +++ b/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs @@ -18,7 +18,6 @@ public class GoldenVengeance : ModItem Item.noMelee = true; Item.channel = true; Item.mana = 10; - Item.expert = true; Item.width = 28; Item.height = 30; Item.useTime = 20; @@ -28,6 +27,7 @@ public class GoldenVengeance : ModItem Item.useAnimation = 20; Item.shoot = ModContent.ProjectileType(); Item.value = Item.sellPrice(0, 27, 50, 0); + Item.rare = ItemRarityID.Expert; } public override void AddRecipes() diff --git a/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs b/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs index f2adf2f..5e80450 100644 --- a/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs +++ b/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs @@ -19,7 +19,7 @@ public class HeavensVengeance : ModItem Item.noMelee = true; Item.channel = true; Item.mana = 8; - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.width = 28; Item.height = 30; Item.useTime = 20; diff --git a/Items/Weapons/Magic/Coalescence/HellfireBeam.cs b/Items/Weapons/Magic/Coalescence/HellfireBeam.cs index ec56619..15a7126 100644 --- a/Items/Weapons/Magic/Coalescence/HellfireBeam.cs +++ b/Items/Weapons/Magic/Coalescence/HellfireBeam.cs @@ -18,7 +18,7 @@ public class HellfireBeam : ModItem Item.noMelee = true; Item.channel = true; Item.mana = 7; - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.width = 28; Item.height = 30; Item.useTime = 20; diff --git a/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs b/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs index cb593db..d982a52 100644 --- a/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs +++ b/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs @@ -29,7 +29,7 @@ public class FusedWish : ModItem Item.autoReuse = true; Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 16f; - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Magic/IllusoryMirror.cs b/Items/Weapons/Magic/IllusoryMirror.cs index 3b0c9ff..78e1a7c 100644 --- a/Items/Weapons/Magic/IllusoryMirror.cs +++ b/Items/Weapons/Magic/IllusoryMirror.cs @@ -28,7 +28,7 @@ public class IllusoryMirror : ModItem Item.value = Item.sellPrice(0, 11, 60, 0); Item.autoReuse = true; Item.shootSpeed = 7f; - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.reuseDelay = 20; Item.UseSound = SoundID.Item72; Item.shoot = ModContent.ProjectileType(); diff --git a/Items/Weapons/Magic/SpectralIllusion.cs b/Items/Weapons/Magic/SpectralIllusion.cs index d7f0151..b8ed35d 100644 --- a/Items/Weapons/Magic/SpectralIllusion.cs +++ b/Items/Weapons/Magic/SpectralIllusion.cs @@ -28,7 +28,7 @@ public class SpectralIllusion : ModItem Item.value = Item.sellPrice(2, 50, 0, 0); Item.autoReuse = true; Item.shootSpeed = 7f; - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.reuseDelay = 20; Item.UseSound = SoundID.Item72; Item.shoot = ModContent.ProjectileType(); diff --git a/Items/Weapons/Magic/Staffs/GoldenStaff.cs b/Items/Weapons/Magic/Staffs/GoldenStaff.cs index 644dffa..7b8a2e3 100644 --- a/Items/Weapons/Magic/Staffs/GoldenStaff.cs +++ b/Items/Weapons/Magic/Staffs/GoldenStaff.cs @@ -30,11 +30,11 @@ public class GoldenStaff : ModItem Item.noMelee = true; Item.knockBack = 5f; Item.value = Item.sellPrice(0, 25, 30, 0); - Item.expert = true; Item.UseSound = SoundID.Item20; Item.autoReuse = true; Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 40f; + Item.rare = ItemRarityID.Expert; } public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) diff --git a/Items/Weapons/Magic/Staffs/NatureStaff.cs b/Items/Weapons/Magic/Staffs/NatureStaff.cs index 34a6937..68ef5fb 100644 --- a/Items/Weapons/Magic/Staffs/NatureStaff.cs +++ b/Items/Weapons/Magic/Staffs/NatureStaff.cs @@ -30,7 +30,7 @@ public class NatureStaff : ModItem Item.noMelee = true; Item.knockBack = 5f; Item.value = Item.sellPrice(0, 8, 80, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.UseSound = SoundID.Item20; Item.autoReuse = true; Item.shoot = ModContent.ProjectileType(); diff --git a/Items/Weapons/Magic/Staffs/Tranquility.cs b/Items/Weapons/Magic/Staffs/Tranquility.cs index 9fec075..7004581 100644 --- a/Items/Weapons/Magic/Staffs/Tranquility.cs +++ b/Items/Weapons/Magic/Staffs/Tranquility.cs @@ -30,7 +30,7 @@ public class Tranquility : ModItem Item.noMelee = true; Item.knockBack = 5f; Item.value = Item.sellPrice(1, 50, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.UseSound = SoundID.Item20; Item.autoReuse = true; Item.shoot = ModContent.ProjectileType(); diff --git a/Items/Weapons/Melee/Shortswords/TheRainbowsCurse.cs b/Items/Weapons/Melee/Shortswords/TheRainbowsCurse.cs index b131d00..4591a13 100644 --- a/Items/Weapons/Melee/Shortswords/TheRainbowsCurse.cs +++ b/Items/Weapons/Melee/Shortswords/TheRainbowsCurse.cs @@ -25,7 +25,7 @@ public class TheRainbowsCurse : ModItem Item.useStyle = ItemUseStyleID.Thrust; Item.knockBack = 6f; Item.value = Item.sellPrice(2, 20, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 65f; Item.UseSound = SoundID.Item1; diff --git a/Items/Weapons/Melee/Swords/RainbowClaymore.cs b/Items/Weapons/Melee/Swords/RainbowClaymore.cs index 629a199..79d3d63 100644 --- a/Items/Weapons/Melee/Swords/RainbowClaymore.cs +++ b/Items/Weapons/Melee/Swords/RainbowClaymore.cs @@ -24,7 +24,7 @@ public class RainbowClaymore : ModItem Item.useStyle = ItemUseStyleID.Swing; Item.knockBack = 3f; Item.value = Item.sellPrice(3, 20, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.UseSound = SoundID.Item1; Item.autoReuse = true; Item.shoot = ModContent.ProjectileType(); diff --git a/Items/Weapons/Melee/Swords/ShimadaSwords/DreamCatcher.cs b/Items/Weapons/Melee/Swords/ShimadaSwords/DreamCatcher.cs index c05808c..b4ac44a 100644 --- a/Items/Weapons/Melee/Swords/ShimadaSwords/DreamCatcher.cs +++ b/Items/Weapons/Melee/Swords/ShimadaSwords/DreamCatcher.cs @@ -25,11 +25,11 @@ public class DreamCatcher : ModItem Item.useStyle = ItemUseStyleID.Swing; Item.knockBack = 2f; Item.value = Item.sellPrice(2, 75, 0, 0); - Item.expert = true; Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 60f; Item.UseSound = SoundID.Item1; Item.autoReuse = true; + Item.rare = ItemRarityID.Expert; } public override void OnHitNPC(Player player, NPC target, int damage, float knockback, bool crit) diff --git a/Items/Weapons/Melee/Waraxes/SpectralShredder.cs b/Items/Weapons/Melee/Waraxes/SpectralShredder.cs index e0ba9cd..e59aa39 100644 --- a/Items/Weapons/Melee/Waraxes/SpectralShredder.cs +++ b/Items/Weapons/Melee/Waraxes/SpectralShredder.cs @@ -26,7 +26,7 @@ public class SpectralShredder : ModItem Item.tileBoost = 6; Item.knockBack = 8f; Item.value = Item.sellPrice(3, 20, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.UseSound = SoundID.Item1; Item.autoReuse = true; Item.shootSpeed = 80f; diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemon.cs b/Items/Weapons/RainbowDemon/TheRainbowDemon.cs index da585cc..440bd51 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemon.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemon.cs @@ -30,7 +30,7 @@ public class TheRainbowDemon : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 25f; Item.shoot = ModContent.ProjectileType(); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemonClaymore.cs b/Items/Weapons/RainbowDemon/TheRainbowDemonClaymore.cs index e15e27f..b77b833 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemonClaymore.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemonClaymore.cs @@ -31,7 +31,7 @@ public class TheRainbowDemonClaymore : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 25f; Item.shoot = ModContent.ProjectileType(); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemonMagic.cs b/Items/Weapons/RainbowDemon/TheRainbowDemonMagic.cs index 37d116a..0eb8122 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemonMagic.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemonMagic.cs @@ -32,7 +32,7 @@ public class TheRainbowDemonMagic : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 25f; Item.shoot = ModContent.ProjectileType(); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemonRanged.cs b/Items/Weapons/RainbowDemon/TheRainbowDemonRanged.cs index 091dd09..6380ab4 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemonRanged.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemonRanged.cs @@ -32,7 +32,7 @@ public class TheRainbowDemonRanged : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 25f; Item.shoot = ModContent.ProjectileType(); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemonShredder.cs b/Items/Weapons/RainbowDemon/TheRainbowDemonShredder.cs index c17ecdf..c85b2b9 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemonShredder.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemonShredder.cs @@ -31,7 +31,7 @@ public class TheRainbowDemonShredder : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 25f; Item.shoot = ModContent.ProjectileType(); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/RainbowDemon/TheRainbowDemonThrowing.cs b/Items/Weapons/RainbowDemon/TheRainbowDemonThrowing.cs index 6875ea8..fe8fcd7 100644 --- a/Items/Weapons/RainbowDemon/TheRainbowDemonThrowing.cs +++ b/Items/Weapons/RainbowDemon/TheRainbowDemonThrowing.cs @@ -32,7 +32,7 @@ public class TheRainbowDemonThrowing : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 25f; Item.shoot = ModContent.ProjectileType(); - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Ranged/Bows/LunarBow.cs b/Items/Weapons/Ranged/Bows/LunarBow.cs index 346128c..8d84f2a 100644 --- a/Items/Weapons/Ranged/Bows/LunarBow.cs +++ b/Items/Weapons/Ranged/Bows/LunarBow.cs @@ -27,7 +27,7 @@ public class LunarBow : ModItem Item.noMelee = true; Item.knockBack = 0f; Item.value = Item.sellPrice(0, 15, 60, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.UseSound = SoundID.Item5; Item.autoReuse = true; Item.shootSpeed = 50f; diff --git a/Items/Weapons/Ranged/Bows/LunarRainBow.cs b/Items/Weapons/Ranged/Bows/LunarRainBow.cs index fcb26aa..ef9feb2 100644 --- a/Items/Weapons/Ranged/Bows/LunarRainBow.cs +++ b/Items/Weapons/Ranged/Bows/LunarRainBow.cs @@ -27,11 +27,11 @@ public class LunarRainBow : ModItem Item.noMelee = true; Item.knockBack = 0f; Item.value = Item.sellPrice(2, 70, 0, 0); - Item.expert = true; Item.UseSound = SoundID.Item5; Item.autoReuse = true; Item.shootSpeed = 50f; Item.shoot = ModContent.ProjectileType(); + Item.rare = ItemRarityID.Expert; } public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) diff --git a/Items/Weapons/Ranged/Bows/StormBows/DemonsBow.cs b/Items/Weapons/Ranged/Bows/StormBows/DemonsBow.cs index f715e72..bcc8acf 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/DemonsBow.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/DemonsBow.cs @@ -25,10 +25,10 @@ public class DemonsBow : ModItem Item.noMelee = true; Item.knockBack = 3f; Item.value = Item.sellPrice(0, 3, 0, 0); - Item.expert = true; Item.UseSound = SoundID.Item5; Item.autoReuse = true; Item.shootSpeed = 16f; + Item.rare = ItemRarityID.Expert; } public override bool AltFunctionUse(Player player) diff --git a/Items/Weapons/Ranged/Bows/StormBows/GoldenKabuki.cs b/Items/Weapons/Ranged/Bows/StormBows/GoldenKabuki.cs index 049377a..e11ffa7 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/GoldenKabuki.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/GoldenKabuki.cs @@ -25,10 +25,10 @@ public class GoldenKabuki : ModItem Item.noMelee = true; Item.knockBack = 3f; Item.value = Item.sellPrice(0, 22, 0, 0); - Item.expert = true; Item.UseSound = SoundID.Item5; Item.autoReuse = true; Item.shootSpeed = 18f; + Item.rare = ItemRarityID.Expert; } public override bool AltFunctionUse(Player player) diff --git a/Items/Weapons/Ranged/Bows/StormBows/Kabuki.cs b/Items/Weapons/Ranged/Bows/StormBows/Kabuki.cs index 651084f..d36372f 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/Kabuki.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/Kabuki.cs @@ -25,7 +25,7 @@ public class Kabuki : ModItem Item.noMelee = true; Item.knockBack = 3f; Item.value = Item.sellPrice(0, 5, 40, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.UseSound = SoundID.Item5; Item.autoReuse = true; Item.shootSpeed = 18f; diff --git a/Items/Weapons/Ranged/Bows/StormBows/RainBow.cs b/Items/Weapons/Ranged/Bows/StormBows/RainBow.cs index 71c2534..0df3f86 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/RainBow.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/RainBow.cs @@ -25,7 +25,7 @@ public class RainBow : ModItem Item.noMelee = true; Item.knockBack = 3f; Item.value = Item.sellPrice(1, 50, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.UseSound = SoundID.Item5; Item.autoReuse = true; Item.shootSpeed = 20f; diff --git a/Items/Weapons/Ranged/Bows/StormBows/StormBow.cs b/Items/Weapons/Ranged/Bows/StormBows/StormBow.cs index 8cdacb7..598d9af 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/StormBow.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/StormBow.cs @@ -25,7 +25,7 @@ public class StormBow : ModItem Item.noMelee = true; Item.knockBack = 2f; Item.value = Item.sellPrice(0, 0, 60, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.UseSound = SoundID.Item5; Item.autoReuse = true; Item.shootSpeed = 16f; diff --git a/Items/Weapons/Ranged/FoxPistols/FoxPistol.cs b/Items/Weapons/Ranged/FoxPistols/FoxPistol.cs index 5b89649..bd64953 100644 --- a/Items/Weapons/Ranged/FoxPistols/FoxPistol.cs +++ b/Items/Weapons/Ranged/FoxPistols/FoxPistol.cs @@ -30,8 +30,8 @@ public class FoxPistol : ModItem Item.UseSound = SoundID.Item11; Item.autoReuse = true; Item.shootSpeed = 7f; - Item.expert = true; Item.shoot = ModContent.ProjectileType(); + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Ranged/FoxPistols/FoxPistolBlue.cs b/Items/Weapons/Ranged/FoxPistols/FoxPistolBlue.cs index 48190df..47643be 100644 --- a/Items/Weapons/Ranged/FoxPistols/FoxPistolBlue.cs +++ b/Items/Weapons/Ranged/FoxPistols/FoxPistolBlue.cs @@ -30,8 +30,8 @@ public class FoxPistolBlue : ModItem Item.UseSound = SoundID.Item11; Item.autoReuse = true; Item.shootSpeed = 7f; - Item.expert = true; Item.shoot = ModContent.ProjectileType(); + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Ranged/FoxPistols/SpectralHowler.cs b/Items/Weapons/Ranged/FoxPistols/SpectralHowler.cs index de07f63..5b6645f 100644 --- a/Items/Weapons/Ranged/FoxPistols/SpectralHowler.cs +++ b/Items/Weapons/Ranged/FoxPistols/SpectralHowler.cs @@ -30,8 +30,8 @@ public class SpectralHowler : ModItem Item.UseSound = SoundID.Item11; Item.autoReuse = true; Item.shootSpeed = 8f; - Item.expert = true; Item.shoot = ModContent.ProjectileType(); + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Ranged/FusionDrivers/FusedRainbow.cs b/Items/Weapons/Ranged/FusionDrivers/FusedRainbow.cs index bf012cc..fc3ddc2 100644 --- a/Items/Weapons/Ranged/FusionDrivers/FusedRainbow.cs +++ b/Items/Weapons/Ranged/FusionDrivers/FusedRainbow.cs @@ -32,7 +32,7 @@ public class FusedRainbow : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 18f; Item.useAmmo = AmmoID.Bullet; - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Ranged/LightGuns/GoldenStinger.cs b/Items/Weapons/Ranged/LightGuns/GoldenStinger.cs index b551fe4..6b52552 100644 --- a/Items/Weapons/Ranged/LightGuns/GoldenStinger.cs +++ b/Items/Weapons/Ranged/LightGuns/GoldenStinger.cs @@ -30,7 +30,7 @@ public class GoldenStinger : ModItem Item.autoReuse = true; Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 10f; - Item.rare = 12; + Item.rare = ItemRarityID.Cyan; } public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) diff --git a/Items/Weapons/Ranged/LightGuns/SpectralBlaster.cs b/Items/Weapons/Ranged/LightGuns/SpectralBlaster.cs index 9efc860..698635c 100644 --- a/Items/Weapons/Ranged/LightGuns/SpectralBlaster.cs +++ b/Items/Weapons/Ranged/LightGuns/SpectralBlaster.cs @@ -30,7 +30,7 @@ public class SpectralBlaster : ModItem Item.autoReuse = true; Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 10f; - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) diff --git a/Items/Weapons/Ranged/MachinePistols/CosmicHacker.cs b/Items/Weapons/Ranged/MachinePistols/CosmicHacker.cs index 6c9d0d9..6a71dfa 100644 --- a/Items/Weapons/Ranged/MachinePistols/CosmicHacker.cs +++ b/Items/Weapons/Ranged/MachinePistols/CosmicHacker.cs @@ -31,7 +31,7 @@ public class CosmicHacker : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 18f; Item.useAmmo = AmmoID.Bullet; - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Ranged/MachinePistols/MachinePistolGolden.cs b/Items/Weapons/Ranged/MachinePistols/MachinePistolGolden.cs index 3759577..67fe499 100644 --- a/Items/Weapons/Ranged/MachinePistols/MachinePistolGolden.cs +++ b/Items/Weapons/Ranged/MachinePistols/MachinePistolGolden.cs @@ -31,7 +31,7 @@ public class MachinePistolGolden : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 18f; Item.useAmmo = AmmoID.Bullet; - Item.rare = 12; + Item.rare = ItemRarityID.Red; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Ranged/MachinePistols/Verano.cs b/Items/Weapons/Ranged/MachinePistols/Verano.cs index 4574f3d..6451bf0 100644 --- a/Items/Weapons/Ranged/MachinePistols/Verano.cs +++ b/Items/Weapons/Ranged/MachinePistols/Verano.cs @@ -31,7 +31,7 @@ public class Verano : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 18f; Item.useAmmo = AmmoID.Bullet; - Item.rare = ItemRarityID.Red; + Item.rare = ItemRarityID.Cyan; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Ranged/MachinePistols/VeranoRime.cs b/Items/Weapons/Ranged/MachinePistols/VeranoRime.cs index 2396a82..98fba96 100644 --- a/Items/Weapons/Ranged/MachinePistols/VeranoRime.cs +++ b/Items/Weapons/Ranged/MachinePistols/VeranoRime.cs @@ -31,7 +31,7 @@ public class VeranoRime : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 18f; Item.useAmmo = AmmoID.Bullet; - Item.rare = ItemRarityID.Red; + Item.rare = ItemRarityID.Cyan; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Ranged/Peacekeeper/Unity.cs b/Items/Weapons/Ranged/Peacekeeper/Unity.cs index ad57466..eee3ac6 100644 --- a/Items/Weapons/Ranged/Peacekeeper/Unity.cs +++ b/Items/Weapons/Ranged/Peacekeeper/Unity.cs @@ -27,13 +27,13 @@ public class Unity : ModItem Item.noMelee = true; Item.knockBack = 4f; Item.value = Item.sellPrice(2, 26, 0, 0); - Item.expert = true; Item.UseSound = SoundID.Item11; Item.autoReuse = true; Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 100f; Item.reuseDelay = 12; Item.useAmmo = AmmoID.Bullet; + Item.rare = ItemRarityID.Expert; } public override Vector2? HoldoutOffset() diff --git a/Items/Weapons/Ranged/PulsePistols/GoldenPulse.cs b/Items/Weapons/Ranged/PulsePistols/GoldenPulse.cs index a8ed829..2536a9f 100644 --- a/Items/Weapons/Ranged/PulsePistols/GoldenPulse.cs +++ b/Items/Weapons/Ranged/PulsePistols/GoldenPulse.cs @@ -11,7 +11,6 @@ public class GoldenPulse : ModItem { public override void SetStaticDefaults() { - DisplayName.SetDefault("Golden Pulse"); Tooltip.SetDefault("[c/B6FF00:Autoshoots] \n90% chance to not consume ammo \nShoots incredibly fast \nConverts Musket Balls into golden Pulse Bullets"); } @@ -32,7 +31,7 @@ public class GoldenPulse : ModItem Item.shoot = ProjectileID.VilethornTip; Item.shootSpeed = 25f; Item.useAmmo = AmmoID.Bullet; - Item.rare = 12; + Item.rare = ItemRarityID.Red; } public override bool CanConsumeAmmo(Item ammo, Player player) diff --git a/Items/Weapons/Ranged/PulsePistols/Graffiti.cs b/Items/Weapons/Ranged/PulsePistols/Graffiti.cs index b28ddc1..ecec495 100644 --- a/Items/Weapons/Ranged/PulsePistols/Graffiti.cs +++ b/Items/Weapons/Ranged/PulsePistols/Graffiti.cs @@ -32,7 +32,7 @@ public class Graffiti : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 40f; Item.useAmmo = AmmoID.Bullet; - Item.expert = true; + Item.rare = ItemRarityID.Expert; } public override bool CanConsumeAmmo(Item ammo, Player player) diff --git a/Items/Weapons/Ranged/PulsePistols/PulseSprayer.cs b/Items/Weapons/Ranged/PulsePistols/PulseSprayer.cs index 8e90d4e..c37e41b 100644 --- a/Items/Weapons/Ranged/PulsePistols/PulseSprayer.cs +++ b/Items/Weapons/Ranged/PulsePistols/PulseSprayer.cs @@ -32,7 +32,7 @@ public class PulseSprayer : ModItem Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 25f; Item.useAmmo = AmmoID.Bullet; - Item.rare = ItemRarityID.Red; + Item.rare = ItemRarityID.Cyan; } public override bool CanConsumeAmmo(Item ammo, Player player) diff --git a/Items/Weapons/Ranged/Shotguns/Depriver.cs b/Items/Weapons/Ranged/Shotguns/Depriver.cs index 0127912..151d686 100644 --- a/Items/Weapons/Ranged/Shotguns/Depriver.cs +++ b/Items/Weapons/Ranged/Shotguns/Depriver.cs @@ -27,12 +27,12 @@ public class Depriver : ModItem Item.noMelee = true; Item.knockBack = 4f; Item.value = Item.sellPrice(2, 14, 0, 0); - Item.expert = true; Item.UseSound = SoundID.Item38; Item.autoReuse = true; Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 35f; Item.useAmmo = AmmoID.Bullet; + Item.rare = ItemRarityID.Expert; } public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) diff --git a/Items/Weapons/Thrown/Daggers/ColorfulSolution.cs b/Items/Weapons/Thrown/Daggers/ColorfulSolution.cs index ac1b136..b961688 100644 --- a/Items/Weapons/Thrown/Daggers/ColorfulSolution.cs +++ b/Items/Weapons/Thrown/Daggers/ColorfulSolution.cs @@ -28,9 +28,9 @@ public class ColorfulSolution : ModItem Item.noMelee = true; Item.autoReuse = true; Item.value = Item.sellPrice(3, 0, 0, 0); - Item.expert = true; Item.shootSpeed = 28f; Item.shoot = ModContent.ProjectileType(); + Item.rare = ItemRarityID.Expert; } public override void AddRecipes() diff --git a/Items/Weapons/Thrown/Shuriken/TheSpinningRainbow.cs b/Items/Weapons/Thrown/Shuriken/TheSpinningRainbow.cs index 0c75d73..fff2ec6 100644 --- a/Items/Weapons/Thrown/Shuriken/TheSpinningRainbow.cs +++ b/Items/Weapons/Thrown/Shuriken/TheSpinningRainbow.cs @@ -28,7 +28,7 @@ public class TheSpinningRainbow : ModItem Item.noMelee = true; Item.autoReuse = true; Item.value = Item.sellPrice(2, 70, 0, 0); - Item.expert = true; + Item.rare = ItemRarityID.Expert; Item.shootSpeed = 25f; Item.reuseDelay = 8; Item.shoot = ModContent.ProjectileType();