From 884e67c5e2aa12d12bb7a25cce5e531576d3462f Mon Sep 17 00:00:00 2001 From: FyloZ Date: Thu, 9 Jul 2020 18:03:44 -0400 Subject: [PATCH] Updated some potions's sprite. Changed buy price to sell price. --- Content/Items/Accessories/AlucardPendant.cs | 2 +- .../Accessories/CelestialTransmogrifier.cs | 2 +- Content/Items/Accessories/CrystalSkull.cs | 2 +- Content/Items/Accessories/DeadeyesQuiver.cs | 2 +- Content/Items/Accessories/DraculaPendant.cs | 2 +- Content/Items/Accessories/EnchantedFocuser.cs | 2 +- .../Items/Accessories/EndlessPouchofLife.cs | 2 +- Content/Items/Accessories/EnergyFocuser.cs | 2 +- Content/Items/Accessories/Focuser.cs | 2 +- Content/Items/Accessories/NecrosisStone.cs | 2 +- Content/Items/Accessories/RangersQuiver.cs | 2 +- Content/Items/Accessories/RedHotShackle.cs | 2 +- Content/Items/Accessories/ShinySentinel.cs | 2 +- Content/Items/Accessories/SlimeBracelet.cs | 2 +- Content/Items/Accessories/TideTurner.cs | 2 +- Content/Items/Accessories/VeilOfVengeance.cs | 2 +- Content/Items/Accessories/WaspNecklace.cs | 2 +- Content/Items/Accessories/WaspNest.cs | 2 +- .../Items/Accessories/Wings/ScarabWings.cs | 2 +- Content/Items/Ammo/MoltenStyngerBolt.cs | 2 +- Content/Items/Ammo/SiphonArrow.cs | 2 +- Content/Items/Ammo/TitanicStyngerBolt.cs | 2 +- .../Boss/Arachnus/MoltenArachnidsAmulet.cs | 2 +- Content/Items/Boss/Arachnus/MoltenKey.cs | 2 +- Content/Items/Boss/DuneWyrm/DesertDessert.cs | 2 +- Content/Items/Misc/BloodyLunarTablet.cs | 2 +- .../Misc/CondensedSouls/CondensedSpite.cs | 2 +- Content/Items/Misc/LunarTablet.cs | 2 +- Content/Items/Misc/RedThread.cs | 2 +- Content/Items/Misc/Souls/SoulofLife.cs | 2 +- Content/Items/Misc/Souls/SoulofTime.cs | 2 +- Content/Items/Misc/Thermoplasm.cs | 2 +- .../Placeable/DuneWyrm/DuneWyrmTrophy.cs | 2 +- Content/Items/Placeable/EnchantedAnvil.cs | 2 +- .../ShrineoftheMoltenOne/ShrineDoor.cs | 2 +- Content/Items/Potions/Antidote.cs | 1 + Content/Items/Potions/CommanderPotion.cs | 24 ++++++++++-------- Content/Items/Potions/CommanderPotion.png | Bin 356 -> 525 bytes Content/Items/Potions/EnchantedMushroom.cs | 18 ++++++------- Content/Items/Potions/GreaterAntidote.cs | 5 ++-- Content/Items/Potions/GreaterAntidote.png | Bin 367 -> 415 bytes Content/Items/Potions/WarlockPotion.cs | 20 ++++++++------- Content/Items/Potions/WarlockPotion.png | Bin 345 -> 524 bytes Content/Items/Tools/GildedSickle.cs | 2 +- Content/Items/Tools/GreatwoodHammer.cs | 2 +- Content/Items/Tools/MultigrainHammer.cs | 2 +- .../Items/Weapons/Arachnus/ChainStynger.cs | 2 +- .../Items/Weapons/Arachnus/GlaiveWeaver.cs | 2 +- .../Items/Weapons/Arachnus/Infernolizer.cs | 2 +- .../Items/Weapons/Bloodshot/BloodStream.cs | 2 +- Content/Items/Weapons/Bloodshot/Umbra.cs | 2 +- .../Items/Weapons/Bloodshot/VampiricShiv.cs | 2 +- .../Weapons/DuneWyrm/StaffofShiftingSands.cs | 2 +- Content/Items/Weapons/DuneWyrm/Sundial.cs | 2 +- Content/Items/Weapons/DuneWyrm/Timekeeper.cs | 2 +- Content/Items/Weapons/HourHand.cs | 2 +- Content/Items/Weapons/MultigrainSword.cs | 2 +- Content/Items/Weapons/Slimer.cs | 2 +- Content/Items/Weapons/TheGreatwoodSword.cs | 2 +- Content/Items/Weapons/TitanicGatliStynger.cs | 2 +- Content/Items/Weapons/TitanicLongsword.cs | 2 +- Content/Items/Weapons/TitanicPike.cs | 2 +- Content/Items/Weapons/TitanicRepeater.cs | 2 +- Content/Items/Weapons/VampiricEdge.cs | 2 +- .../AncientTombCrawler/AncientTombCrawler.cs | 2 +- .../AncientTombCrawlerFriendly.cs | 2 +- Content/NPCs/DuneWyrm/DuneWyrm.cs | 2 +- .../DuneWyrm/AncientTombCrawler.cs | 2 +- 68 files changed, 98 insertions(+), 90 deletions(-) diff --git a/Content/Items/Accessories/AlucardPendant.cs b/Content/Items/Accessories/AlucardPendant.cs index 712fc6d..5ee15a8 100644 --- a/Content/Items/Accessories/AlucardPendant.cs +++ b/Content/Items/Accessories/AlucardPendant.cs @@ -23,7 +23,7 @@ namespace Decimation.Content.Items.Accessories item.width = 46; item.height = 62; item.rare = Rarity.LightPurple.GetRarityValue(); - this.item.value = Item.buyPrice(0, 4); + this.item.value = Item.sellPrice(0, 4); } public override void UpdateAccessory(Player player, bool hideVisual) diff --git a/Content/Items/Accessories/CelestialTransmogrifier.cs b/Content/Items/Accessories/CelestialTransmogrifier.cs index d5d0cec..e49e624 100644 --- a/Content/Items/Accessories/CelestialTransmogrifier.cs +++ b/Content/Items/Accessories/CelestialTransmogrifier.cs @@ -26,7 +26,7 @@ namespace Decimation.Content.Items.Accessories item.height = 62; item.rare = Rarity.LightPurple.GetRarityValue(); - this.item.value = Item.buyPrice(0, 4); + this.item.value = Item.sellPrice(0, 4); } public override void UpdateAccessory(Player player, bool hideVisual) diff --git a/Content/Items/Accessories/CrystalSkull.cs b/Content/Items/Accessories/CrystalSkull.cs index c4b9598..f4619f3 100644 --- a/Content/Items/Accessories/CrystalSkull.cs +++ b/Content/Items/Accessories/CrystalSkull.cs @@ -18,7 +18,7 @@ namespace Decimation.Content.Items.Accessories item.width = 35; item.height = 22; item.rare = Rarity.Green.GetRarityValue(); - item.value = Item.buyPrice(0, 0, 0, 10); + item.value = Item.sellPrice(0, 0, 0, 10); item.defense = 2; } diff --git a/Content/Items/Accessories/DeadeyesQuiver.cs b/Content/Items/Accessories/DeadeyesQuiver.cs index 1c9a034..20b2bf7 100644 --- a/Content/Items/Accessories/DeadeyesQuiver.cs +++ b/Content/Items/Accessories/DeadeyesQuiver.cs @@ -22,7 +22,7 @@ namespace Decimation.Content.Items.Accessories item.width = 30; item.height = 30; item.rare = Rarity.Red.GetRarityValue(); - this.item.value = Item.buyPrice(0, 15); + this.item.value = Item.sellPrice(0, 15); } protected override List GetRecipes() diff --git a/Content/Items/Accessories/DraculaPendant.cs b/Content/Items/Accessories/DraculaPendant.cs index 8c3eb0e..ec80e53 100644 --- a/Content/Items/Accessories/DraculaPendant.cs +++ b/Content/Items/Accessories/DraculaPendant.cs @@ -21,7 +21,7 @@ namespace Decimation.Content.Items.Accessories item.width = 46; item.height = 62; item.rare = Rarity.LightPurple.GetRarityValue(); - this.item.value = Item.buyPrice(0, 4); + this.item.value = Item.sellPrice(0, 4); } public override void UpdateAccessory(Player player, bool hideVisual) diff --git a/Content/Items/Accessories/EnchantedFocuser.cs b/Content/Items/Accessories/EnchantedFocuser.cs index 92a60d0..90415b7 100644 --- a/Content/Items/Accessories/EnchantedFocuser.cs +++ b/Content/Items/Accessories/EnchantedFocuser.cs @@ -17,7 +17,7 @@ namespace Decimation.Content.Items.Accessories item.width = 62; item.height = 46; item.rare = Rarity.Green.GetRarityValue(); - this.item.value = Item.buyPrice(0, 0, 0, 10); + this.item.value = Item.sellPrice(0, 0, 0, 10); } protected override List GetRecipes() diff --git a/Content/Items/Accessories/EndlessPouchofLife.cs b/Content/Items/Accessories/EndlessPouchofLife.cs index 65d4dcf..a687ead 100644 --- a/Content/Items/Accessories/EndlessPouchofLife.cs +++ b/Content/Items/Accessories/EndlessPouchofLife.cs @@ -21,7 +21,7 @@ namespace Decimation.Content.Items.Accessories item.width = 24; item.height = 32; item.rare = Rarity.Lime.GetRarityValue(); - this.item.value = Item.buyPrice(0, 50); + this.item.value = Item.sellPrice(0, 50); } public override void UpdateAccessory(Player player, bool hideVisual) diff --git a/Content/Items/Accessories/EnergyFocuser.cs b/Content/Items/Accessories/EnergyFocuser.cs index 956442e..333cf16 100644 --- a/Content/Items/Accessories/EnergyFocuser.cs +++ b/Content/Items/Accessories/EnergyFocuser.cs @@ -17,7 +17,7 @@ namespace Decimation.Content.Items.Accessories item.width = 62; item.height = 46; item.rare = Rarity.Green.GetRarityValue(); - this.item.value = Item.buyPrice(0, 0, 0, 10); + this.item.value = Item.sellPrice(0, 0, 0, 10); } protected override List GetRecipes() diff --git a/Content/Items/Accessories/Focuser.cs b/Content/Items/Accessories/Focuser.cs index 5cb2efe..cade6ab 100644 --- a/Content/Items/Accessories/Focuser.cs +++ b/Content/Items/Accessories/Focuser.cs @@ -17,7 +17,7 @@ namespace Decimation.Content.Items.Accessories item.width = 54; item.height = 46; item.rare = Rarity.Green.GetRarityValue(); - this.item.value = Item.buyPrice(0, 0, 0, 10); + this.item.value = Item.sellPrice(0, 0, 0, 10); } protected override List GetRecipes() diff --git a/Content/Items/Accessories/NecrosisStone.cs b/Content/Items/Accessories/NecrosisStone.cs index 37063ea..9e2f52e 100644 --- a/Content/Items/Accessories/NecrosisStone.cs +++ b/Content/Items/Accessories/NecrosisStone.cs @@ -16,7 +16,7 @@ namespace Decimation.Content.Items.Accessories item.width = 32; item.height = 32; item.rare = Rarity.Rainbow.GetRarityValue(); - item.value = Item.buyPrice(gold: 5); + item.value = Item.sellPrice(gold: 5); item.expert = true; } diff --git a/Content/Items/Accessories/RangersQuiver.cs b/Content/Items/Accessories/RangersQuiver.cs index a634e05..408d6b5 100644 --- a/Content/Items/Accessories/RangersQuiver.cs +++ b/Content/Items/Accessories/RangersQuiver.cs @@ -19,7 +19,7 @@ namespace Decimation.Content.Items.Accessories item.width = 32; item.height = 32; item.rare = Rarity.Green.GetRarityValue(); - this.item.value = Item.buyPrice(0, 0, 0, 10); + this.item.value = Item.sellPrice(0, 0, 0, 10); } protected override List GetRecipes() diff --git a/Content/Items/Accessories/RedHotShackle.cs b/Content/Items/Accessories/RedHotShackle.cs index 1044660..129bbd4 100644 --- a/Content/Items/Accessories/RedHotShackle.cs +++ b/Content/Items/Accessories/RedHotShackle.cs @@ -18,7 +18,7 @@ namespace Decimation.Content.Items.Accessories item.width = 24; item.height = 24; item.rare = Rarity.Green.GetRarityValue(); - item.value = Item.buyPrice(0, 0, 2); + item.value = Item.sellPrice(0, 0, 2); item.defense = 1; } diff --git a/Content/Items/Accessories/ShinySentinel.cs b/Content/Items/Accessories/ShinySentinel.cs index f444c9e..7371ff0 100644 --- a/Content/Items/Accessories/ShinySentinel.cs +++ b/Content/Items/Accessories/ShinySentinel.cs @@ -14,7 +14,7 @@ namespace Decimation.Content.Items.Accessories item.width = 30; item.height = 28; item.rare = Rarity.Rainbow.GetRarityValue(); - this.item.value = Item.buyPrice(0, 45); + this.item.value = Item.sellPrice(0, 45); this.item.expert = true; } diff --git a/Content/Items/Accessories/SlimeBracelet.cs b/Content/Items/Accessories/SlimeBracelet.cs index 0995495..74e419e 100644 --- a/Content/Items/Accessories/SlimeBracelet.cs +++ b/Content/Items/Accessories/SlimeBracelet.cs @@ -18,7 +18,7 @@ namespace Decimation.Content.Items.Accessories item.height = 24; item.rare = Rarity.Green.GetRarityValue(); - this.item.value = Item.buyPrice(0, 0, 0, 10); + this.item.value = Item.sellPrice(0, 0, 0, 10); } protected override List GetRecipes() diff --git a/Content/Items/Accessories/TideTurner.cs b/Content/Items/Accessories/TideTurner.cs index 57676a7..6fd3fbf 100644 --- a/Content/Items/Accessories/TideTurner.cs +++ b/Content/Items/Accessories/TideTurner.cs @@ -23,7 +23,7 @@ namespace Decimation.Content.Items.Accessories item.width = 46; item.height = 36; item.rare = Rarity.Rainbow.GetRarityValue(); - item.value = Item.buyPrice(0, 3); + item.value = Item.sellPrice(0, 3); item.defense = 3; item.shieldSlot = 5; item.expert = true; diff --git a/Content/Items/Accessories/VeilOfVengeance.cs b/Content/Items/Accessories/VeilOfVengeance.cs index a0ea5e4..4489357 100644 --- a/Content/Items/Accessories/VeilOfVengeance.cs +++ b/Content/Items/Accessories/VeilOfVengeance.cs @@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Accessories { item.width = 26; item.height = 32; - item.value = Item.buyPrice(gold: 19, silver: 70); + item.value = Item.sellPrice(gold: 19, silver: 70); item.rare = Rarity.LightPurple.GetRarityValue(); } diff --git a/Content/Items/Accessories/WaspNecklace.cs b/Content/Items/Accessories/WaspNecklace.cs index 0073cab..45f0298 100644 --- a/Content/Items/Accessories/WaspNecklace.cs +++ b/Content/Items/Accessories/WaspNecklace.cs @@ -18,7 +18,7 @@ namespace Decimation.Content.Items.Accessories { item.width = 32; item.height = 32; - item.value = Item.buyPrice(gold: 1, silver: 70); + item.value = Item.sellPrice(gold: 1, silver: 70); item.rare = Rarity.Green.GetRarityValue(); } diff --git a/Content/Items/Accessories/WaspNest.cs b/Content/Items/Accessories/WaspNest.cs index 6e287a6..b09e122 100644 --- a/Content/Items/Accessories/WaspNest.cs +++ b/Content/Items/Accessories/WaspNest.cs @@ -17,7 +17,7 @@ namespace Decimation.Content.Items.Accessories { item.width = 32; item.height = 30; - item.value = Item.buyPrice(silver: 10); + item.value = Item.sellPrice(silver: 10); item.rare = Rarity.Blue.GetRarityValue(); } diff --git a/Content/Items/Accessories/Wings/ScarabWings.cs b/Content/Items/Accessories/Wings/ScarabWings.cs index 997d15c..e146ff8 100644 --- a/Content/Items/Accessories/Wings/ScarabWings.cs +++ b/Content/Items/Accessories/Wings/ScarabWings.cs @@ -24,7 +24,7 @@ namespace Decimation.Content.Items.Accessories.Wings item.height = 26; item.rare = Rarity.Red.GetRarityValue(); - this.item.value = Item.buyPrice(0, 5); + this.item.value = Item.sellPrice(0, 5); } public override void UpdateAccessory(Player player, bool hideVisual) diff --git a/Content/Items/Ammo/MoltenStyngerBolt.cs b/Content/Items/Ammo/MoltenStyngerBolt.cs index b78fd29..f2db6ff 100644 --- a/Content/Items/Ammo/MoltenStyngerBolt.cs +++ b/Content/Items/Ammo/MoltenStyngerBolt.cs @@ -24,7 +24,7 @@ namespace Decimation.Content.Items.Ammo item.height = 8; item.knockBack = 1; item.rare = Rarity.Orange.GetRarityValue(); - item.value = Item.buyPrice(0, 0, 10); + item.value = Item.sellPrice(0, 0, 10); item.consumable = true; this.item.shootSpeed = 2f; diff --git a/Content/Items/Ammo/SiphonArrow.cs b/Content/Items/Ammo/SiphonArrow.cs index bb4d666..1e50dde 100644 --- a/Content/Items/Ammo/SiphonArrow.cs +++ b/Content/Items/Ammo/SiphonArrow.cs @@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Ammo item.knockBack = 2; item.width = 14; item.height = 32; - item.value = Item.buyPrice(0, 0, 0, 55); + item.value = Item.sellPrice(0, 0, 0, 55); this.item.shootSpeed = 2.5f; } diff --git a/Content/Items/Ammo/TitanicStyngerBolt.cs b/Content/Items/Ammo/TitanicStyngerBolt.cs index b53570c..447f82e 100644 --- a/Content/Items/Ammo/TitanicStyngerBolt.cs +++ b/Content/Items/Ammo/TitanicStyngerBolt.cs @@ -25,7 +25,7 @@ namespace Decimation.Content.Items.Ammo item.rare = Rarity.Orange.GetRarityValue(); item.width = 8; item.height = 8; - item.value = Item.buyPrice(0, 0, 10); + item.value = Item.sellPrice(0, 0, 10); item.consumable = true; this.item.shootSpeed = 2f; diff --git a/Content/Items/Boss/Arachnus/MoltenArachnidsAmulet.cs b/Content/Items/Boss/Arachnus/MoltenArachnidsAmulet.cs index e4620ba..050d68a 100644 --- a/Content/Items/Boss/Arachnus/MoltenArachnidsAmulet.cs +++ b/Content/Items/Boss/Arachnus/MoltenArachnidsAmulet.cs @@ -17,7 +17,7 @@ namespace Decimation.Content.Items.Boss.Arachnus { item.width = 32; item.height = 32; - item.value = Item.buyPrice(0, 45); + item.value = Item.sellPrice(0, 45); item.rare = Rarity.Red.GetRarityValue(); item.consumable = true; item.useStyle = 4; diff --git a/Content/Items/Boss/Arachnus/MoltenKey.cs b/Content/Items/Boss/Arachnus/MoltenKey.cs index a3b8ce3..04f9119 100644 --- a/Content/Items/Boss/Arachnus/MoltenKey.cs +++ b/Content/Items/Boss/Arachnus/MoltenKey.cs @@ -16,7 +16,7 @@ namespace Decimation.Content.Items.Boss.Arachnus item.width = 20; item.height = 36; item.consumable = true; - item.value = Item.buyPrice(0, 45); + item.value = Item.sellPrice(0, 45); item.rare = Rarity.Red.GetRarityValue(); item.maxStack = 1; } diff --git a/Content/Items/Boss/DuneWyrm/DesertDessert.cs b/Content/Items/Boss/DuneWyrm/DesertDessert.cs index 7601476..bf82225 100644 --- a/Content/Items/Boss/DuneWyrm/DesertDessert.cs +++ b/Content/Items/Boss/DuneWyrm/DesertDessert.cs @@ -16,7 +16,7 @@ namespace Decimation.Content.Items.Boss.DuneWyrm { item.width = 32; item.height = 32; - item.value = Item.buyPrice(0, 0, 13); + item.value = Item.sellPrice(0, 0, 13); item.useStyle = 4; item.useAnimation = 30; item.useTime = 30; diff --git a/Content/Items/Misc/BloodyLunarTablet.cs b/Content/Items/Misc/BloodyLunarTablet.cs index 3cb123f..97159ff 100644 --- a/Content/Items/Misc/BloodyLunarTablet.cs +++ b/Content/Items/Misc/BloodyLunarTablet.cs @@ -14,7 +14,7 @@ namespace Decimation.Content.Items.Misc item.width = 30; item.height = 40; item.rare = Rarity.Green.GetRarityValue(); - item.value = Item.buyPrice(gold: 5); + item.value = Item.sellPrice(gold: 5); item.useStyle = 1; item.useTime = 20; item.useAnimation = 20; diff --git a/Content/Items/Misc/CondensedSouls/CondensedSpite.cs b/Content/Items/Misc/CondensedSouls/CondensedSpite.cs index 8cccdb2..e18afea 100644 --- a/Content/Items/Misc/CondensedSouls/CondensedSpite.cs +++ b/Content/Items/Misc/CondensedSouls/CondensedSpite.cs @@ -21,7 +21,7 @@ namespace Decimation.Content.Items.Misc.CondensedSouls item.width = 44; item.height = 44; - item.value = Item.buyPrice(0, 50); + item.value = Item.sellPrice(0, 50); item.rare = Rarity.Red.GetRarityValue(); ItemID.Sets.AnimatesAsSoul[this.item.type] = true; diff --git a/Content/Items/Misc/LunarTablet.cs b/Content/Items/Misc/LunarTablet.cs index 2c7ce1b..7544542 100644 --- a/Content/Items/Misc/LunarTablet.cs +++ b/Content/Items/Misc/LunarTablet.cs @@ -14,7 +14,7 @@ namespace Decimation.Content.Items.Misc item.width = 30; item.height = 40; item.consumable = true; - item.value = Item.buyPrice(gold: 2, silver: 50); + item.value = Item.sellPrice(gold: 2, silver: 50); item.rare = Rarity.Green.GetRarityValue(); item.useStyle = 1; item.useTime = 20; diff --git a/Content/Items/Misc/RedThread.cs b/Content/Items/Misc/RedThread.cs index 8b554a5..5250fe6 100644 --- a/Content/Items/Misc/RedThread.cs +++ b/Content/Items/Misc/RedThread.cs @@ -16,7 +16,7 @@ namespace Decimation.Content.Items.Misc item.width = 28; item.height = 20; item.rare = Rarity.Gray.GetRarityValue(); - item.value = Item.buyPrice(0, 2); + item.value = Item.sellPrice(0, 2); this.item.maxStack = 99; } diff --git a/Content/Items/Misc/Souls/SoulofLife.cs b/Content/Items/Misc/Souls/SoulofLife.cs index 6fb6d29..c874573 100644 --- a/Content/Items/Misc/Souls/SoulofLife.cs +++ b/Content/Items/Misc/Souls/SoulofLife.cs @@ -21,7 +21,7 @@ namespace Decimation.Content.Items.Misc.Souls item.height = refItem.height; item.width = 20; item.height = 20; - item.value = Item.buyPrice(silver: 2); + item.value = Item.sellPrice(silver: 2); this.item.maxStack = 999; diff --git a/Content/Items/Misc/Souls/SoulofTime.cs b/Content/Items/Misc/Souls/SoulofTime.cs index 46f4297..5446da4 100644 --- a/Content/Items/Misc/Souls/SoulofTime.cs +++ b/Content/Items/Misc/Souls/SoulofTime.cs @@ -16,7 +16,7 @@ namespace Decimation.Content.Items.Misc.Souls { item.width = 22; item.height = 24; - item.value = Item.buyPrice(0, 0, 1); + item.value = Item.sellPrice(0, 0, 1); item.rare = Rarity.Orange.GetRarityValue(); this.item.maxStack = 999; diff --git a/Content/Items/Misc/Thermoplasm.cs b/Content/Items/Misc/Thermoplasm.cs index ec3ffcb..eee46a7 100644 --- a/Content/Items/Misc/Thermoplasm.cs +++ b/Content/Items/Misc/Thermoplasm.cs @@ -14,7 +14,7 @@ namespace Decimation.Content.Items.Misc { item.width = 26; item.height = 36; - item.value = Item.buyPrice(silver: 50); + item.value = Item.sellPrice(silver: 50); item.rare = Rarity.Yellow.GetRarityValue(); } } diff --git a/Content/Items/Placeable/DuneWyrm/DuneWyrmTrophy.cs b/Content/Items/Placeable/DuneWyrm/DuneWyrmTrophy.cs index 0ba5970..beaf073 100644 --- a/Content/Items/Placeable/DuneWyrm/DuneWyrmTrophy.cs +++ b/Content/Items/Placeable/DuneWyrm/DuneWyrmTrophy.cs @@ -15,7 +15,7 @@ namespace Decimation.Content.Items.Placeable.DuneWyrm item.width = 32; item.height = 32; item.maxStack = 99; - item.value = Item.buyPrice(0, 5); + item.value = Item.sellPrice(0, 5); } } } \ No newline at end of file diff --git a/Content/Items/Placeable/EnchantedAnvil.cs b/Content/Items/Placeable/EnchantedAnvil.cs index 8ae412f..2a31308 100644 --- a/Content/Items/Placeable/EnchantedAnvil.cs +++ b/Content/Items/Placeable/EnchantedAnvil.cs @@ -17,7 +17,7 @@ namespace Decimation.Content.Items.Placeable item.width = 44; item.height = 20; item.maxStack = 1; - item.value = Item.buyPrice(gold: 1); + item.value = Item.sellPrice(gold: 1); } protected override ModRecipe GetRecipe() diff --git a/Content/Items/Placeable/ShrineoftheMoltenOne/ShrineDoor.cs b/Content/Items/Placeable/ShrineoftheMoltenOne/ShrineDoor.cs index 8c05e3a..99af30c 100644 --- a/Content/Items/Placeable/ShrineoftheMoltenOne/ShrineDoor.cs +++ b/Content/Items/Placeable/ShrineoftheMoltenOne/ShrineDoor.cs @@ -15,7 +15,7 @@ namespace Decimation.Content.Items.Placeable.ShrineoftheMoltenOne item.width = 14; item.height = 28; this.item.maxStack = 99; - item.value = Item.buyPrice(0, 0, 1, 50); + item.value = Item.sellPrice(0, 0, 1, 50); } } } \ No newline at end of file diff --git a/Content/Items/Potions/Antidote.cs b/Content/Items/Potions/Antidote.cs index 1866271..4631766 100644 --- a/Content/Items/Potions/Antidote.cs +++ b/Content/Items/Potions/Antidote.cs @@ -24,6 +24,7 @@ namespace Decimation.Content.Items.Potions item.useTurn = true; item.useStyle = 2; item.rare = Rarity.Blue.GetRarityValue(); + item.value = Item.sellPrice(copper: 50); } public override bool UseItem(Player player) diff --git a/Content/Items/Potions/CommanderPotion.cs b/Content/Items/Potions/CommanderPotion.cs index b10e060..765546d 100644 --- a/Content/Items/Potions/CommanderPotion.cs +++ b/Content/Items/Potions/CommanderPotion.cs @@ -1,5 +1,7 @@ using Decimation.Content.Buffs.Buffs; using Decimation.Lib.Items; +using Decimation.Lib.Util; +using Decimation.Lib.Util.Builder; using Terraria; using Terraria.ID; using Terraria.ModLoader; @@ -18,20 +20,22 @@ namespace Decimation.Content.Items.Potions protected override void InitPotion() { - item.value = Item.buyPrice(0, 1); + item.width = 24; + item.height = 32; + item.rare = Rarity.Orange.GetRarityValue(); + item.value = Item.sellPrice(silver: 62); } protected override ModRecipe GetRecipe() { - ModRecipe recipe = GetNewModRecipe(this, 1, TileID.AlchemyTable); - - recipe.AddIngredient(ItemID.SummoningPotion); - recipe.AddIngredient(ItemID.SoulofFlight, 20); - recipe.AddIngredient(ItemID.VariegatedLardfish); - recipe.AddIngredient(ItemID.MagicPowerPotion, 2); - recipe.AddIngredient(ItemID.RottenChunk, 2); - - return recipe; + return new RecipeBuilder(this) + .WithIngredient(ItemID.SummoningPotion) + .WithIngredient(ItemID.SoulofFlight, 20) + .WithIngredient(ItemID.VariegatedLardfish) + .WithIngredient(ItemID.MagicPowerPotion, 2) + .WithIngredient(ItemID.RottenChunk, 2) + .WithIngredient(TileID.AlchemyTable) + .Build(); } } } \ No newline at end of file diff --git a/Content/Items/Potions/CommanderPotion.png b/Content/Items/Potions/CommanderPotion.png index 19929e4b8390d40e52ddee97ff6411124070f033..86359e7040899904625e6fc591e631d15adab7bd 100644 GIT binary patch delta 500 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0isDnK~zXfV`Lx_1O+Glhcdxn-P-v?>1Be_Gy?=(0dsjqRwbB! z|Nbp7y>t6oFiprOH1`2P3+~^$1;!d0s$i_Bs0PL`aYA6=<9`4K3=OSOQqlSIM~7G{ za`y}d^I>4nq#~TQ!@|6?XFiw@Nff<`YFFH839r zV0nO0YNEdnB;1`)(mM<|Pt*m|OZPnn(-Ip$fN6B_V&^^-GwJ68n9E=I3xN4Bp!q}r zOdG}h1=Hw05Pvi_0Mjt={_F)X4f6@@eSq%rXeU`PeQpsmn1;C=24Fsb`3&x2sD5;D z`uPAomB4)BtL_P=H{aY2reQwA1+L3H0MoEIqPY)nS^#o6%=I7u@)^u`_(1)4doYFp z`uV`?Z8#W%!X6g>AOH$`SonhgD2!p@j0|vz)7%FvP;D9xih1)OjAsza>n$IcR{4G! zOv8aNl!gL-|74ZH5J6cG&+F05DH-GVB)t< qKzurrZa#q0IO_p&0i8-y1_l5jqNXLfbO4V40000ln46#&fv%qZK0t8}0|NuPkI?1OU5qYIa~}+S3s}&@3>P03*0@p+E`38k zh-mHuj5xrR?geIeVJ(x;)x+Wn7AG|K0lX}Nx#Y&8I+*1sw10%)H8B6hdo3`1L){NW z9>#%{O)#I(+y_J70!CQa-}co52P3oOD_C%X>0dT!D0~()); - item.width = 24; + item.width = 20; item.height = 26; item.rare = Rarity.Orange.GetRarityValue(); + item.value = Item.sellPrice(silver: 52); } public override bool UseItem(Player player) @@ -35,9 +36,9 @@ namespace Decimation.Content.Items.Potions protected override ModRecipe GetRecipe() { return new RecipeBuilder(this, 5) - .WithIngredient(ModContent.ItemType()) .WithIngredient(ItemID.ManaPotion) .WithIngredient(ItemID.GreaterHealingPotion) + .WithIngredient(ModContent.ItemType()) .WithIngredient(ModContent.ItemType(), 5) .WithStation(TileID.AlchemyTable) .Build(); diff --git a/Content/Items/Potions/GreaterAntidote.png b/Content/Items/Potions/GreaterAntidote.png index 0b756736561e5442b102d2c2f37938496f21cbad..2dab71d9ee8097ce7be061f98c244e7bd44172dc 100644 GIT binary patch literal 415 zcmV;Q0bu@#P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0W?WOK~zXfV`RVq z0u6cpLz!5?`tzT$>Scn`R09~cXqh>pxXfDvqQpx23z)9n%MGSs;M%GEC}z;lh3O^r zV7{!RIGEOu69v;Z9=!(BHN{zAn*J_?0hmiotQ^36V=H?wJ+r3~OryID2I%KPC((Sc z3tKqC!TckSpM&WgqKClrzSk26$c5-GLkEOhN;?C8M0Fim?GN;_JCX>{;( z|1l^FJD`~h;RdSxoD0Svmk@FdG601+EZjkWc46r8+72vGy1*PvcPE?#(=Y&wRdk@v zpbVyAIfwc#gwpVwg6>infaMq%z?G+I=Rz2Oxs+HyX0!R7#Uk}?Th4- z>~yHp<$U(pe$Q?knUUY>alQ4Ge7wIzzVS2P;3>w=U5h}Tqzfszy?c~kGi~Cdhej#)ZR6M8#wO(^6VzF&U|)1vvN}yF?5*(HyF+jV(^}lXPQ>LjAJXu zC@*rWAEWRFkaN~u-wVml@3%!nGQYT%rptsnjDi~s{~}G^{dK^2BPMOrN*#B?r0EPG zVP~Q?(K&Ul`O_Ida%^;&n8sdVI)mZ%6@krTjFVg!9`f)8ycxWTWl`?;9x(w}f7#V% zB}1$m++cW3A>wT!=Zzxgizk2kdZj55ayq9sU}vH>qMxXV=_dv^*a4gKS-uiuYl{E? N002ovPDHLkV1lE6q*MR^ diff --git a/Content/Items/Potions/WarlockPotion.cs b/Content/Items/Potions/WarlockPotion.cs index 96fe811..525724e 100644 --- a/Content/Items/Potions/WarlockPotion.cs +++ b/Content/Items/Potions/WarlockPotion.cs @@ -1,5 +1,6 @@ using Decimation.Content.Buffs.Buffs; using Decimation.Lib.Items; +using Decimation.Lib.Util.Builder; using Terraria; using Terraria.ID; using Terraria.ModLoader; @@ -18,19 +19,20 @@ namespace Decimation.Content.Items.Potions protected override void InitPotion() { - item.value = Item.buyPrice(0, 0, 80); + item.width = 20; + item.height = 34; + item.value = Item.sellPrice(gold: 8); } protected override ModRecipe GetRecipe() { - ModRecipe recipe = GetNewModRecipe(this, 1, TileID.AlchemyTable); - - recipe.AddIngredient(ItemID.ManaRegenerationPotion); - recipe.AddIngredient(ItemID.ManaCrystal); - recipe.AddIngredient(ItemID.SoulofMight, 10); - recipe.AddIngredient(ItemID.BottledHoney); - - return recipe; + return new RecipeBuilder(this) + .WithIngredient(ItemID.ManaRegenerationPotion) + .WithIngredient(ItemID.ManaCrystal) + .WithIngredient(ItemID.SoulofMight, 10) + .WithIngredient(ItemID.BottledHoney) + .WithStation(TileID.AlchemyTable) + .Build(); } } } \ No newline at end of file diff --git a/Content/Items/Potions/WarlockPotion.png b/Content/Items/Potions/WarlockPotion.png index 63455f2245f927c18da9716f95c7082ae234e4a5..79f09d67492354f19c8a88ca9e1e3a8967255e64 100644 GIT binary patch literal 524 zcmV+n0`vWeP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ij7mK~zXf&6K}O zfF)yFeV+} z<+fE=v&>c&V{?a1s?|DNJU@X8d6Cpv)6Uh9Nxh?fj0w-6Y`5J@IO$t%Id5e9X$3C6 zHsPcGW7x@6eIIkFPsn5okMnpC?(x7*m{10jyO)r)BKpRJ)e{)$YuK5T|0vnF3oB39 zYuQG>7!#emkSy8yWf(T5ZeZeG!quf`xQyRVW?zKULWIePo){OMJt5@@+a@$?^0h8z z?Y=vMd~al+j7Ho$hs|UR4~FjE;QL{*R($gTCOfG?nD5PHLU6$^&asOLvm&8Z5h6@N zm^`|s!v`e;_Qb>uuRft=`#!XjI*5iuBH~Qu-hF7;IL)Omj7vKXVU&NH2gpF|9{&5Guhqe z5)u*`8XEqCQ~@Rbr=0b|fr7=JE{-7@6W31a<~pFj;i^0L?f?B1_j+zE{MN&a_i7x+bnhF#(D91E7Y97&UKhLC5)MiHJy74 w( GetRecipes() diff --git a/Content/Items/Weapons/DuneWyrm/Sundial.cs b/Content/Items/Weapons/DuneWyrm/Sundial.cs index 0598e23..cea06e2 100644 --- a/Content/Items/Weapons/DuneWyrm/Sundial.cs +++ b/Content/Items/Weapons/DuneWyrm/Sundial.cs @@ -29,7 +29,7 @@ namespace Decimation.Content.Items.Weapons.DuneWyrm item.useAnimation = 24; item.crit = 15; item.rare = Rarity.LightRed.GetRarityValue(); - item.value = Item.buyPrice(gold: 1, silver: 50); + item.value = Item.sellPrice(gold: 1, silver: 50); item.UseSound = SoundID.Item28; } diff --git a/Content/Items/Weapons/DuneWyrm/Timekeeper.cs b/Content/Items/Weapons/DuneWyrm/Timekeeper.cs index a90ad03..9bddba2 100644 --- a/Content/Items/Weapons/DuneWyrm/Timekeeper.cs +++ b/Content/Items/Weapons/DuneWyrm/Timekeeper.cs @@ -29,7 +29,7 @@ namespace Decimation.Content.Items.Weapons.DuneWyrm item.crit = 6; item.shootSpeed = 10f; item.rare = Rarity.LightRed.GetRarityValue(); - item.value = Item.buyPrice(gold: 2, silver: 10); + item.value = Item.sellPrice(gold: 2, silver: 10); } protected override List GetRecipes() diff --git a/Content/Items/Weapons/HourHand.cs b/Content/Items/Weapons/HourHand.cs index 78bffca..c2e748b 100644 --- a/Content/Items/Weapons/HourHand.cs +++ b/Content/Items/Weapons/HourHand.cs @@ -26,7 +26,7 @@ namespace Decimation.Content.Items.Weapons item.useTime = 28; item.useAnimation = 28; item.knockBack = 5; - item.value = Item.buyPrice(gold: 4, silver: 70); + item.value = Item.sellPrice(gold: 4, silver: 70); item.rare = 2; item.crit = 7; item.shootSpeed = 10f; diff --git a/Content/Items/Weapons/MultigrainSword.cs b/Content/Items/Weapons/MultigrainSword.cs index 45ef1e5..6f9b296 100644 --- a/Content/Items/Weapons/MultigrainSword.cs +++ b/Content/Items/Weapons/MultigrainSword.cs @@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Weapons item.useTime = 26; item.useAnimation = 26; item.knockBack = 5; - item.value = Item.buyPrice(0, 0, 40); + item.value = Item.sellPrice(0, 0, 40); item.rare = Rarity.Green.GetRarityValue(); item.crit = 4; item.autoReuse = true; diff --git a/Content/Items/Weapons/Slimer.cs b/Content/Items/Weapons/Slimer.cs index 0ab3281..8416dee 100644 --- a/Content/Items/Weapons/Slimer.cs +++ b/Content/Items/Weapons/Slimer.cs @@ -22,7 +22,7 @@ namespace Decimation.Content.Items.Weapons item.CloneDefaults(ItemID.SlimeGun); item.width = 46; item.height = 24; - item.value = Item.buyPrice(silver: 40); + item.value = Item.sellPrice(silver: 40); item.rare = Rarity.Green.GetRarityValue(); } diff --git a/Content/Items/Weapons/TheGreatwoodSword.cs b/Content/Items/Weapons/TheGreatwoodSword.cs index 9e4602a..b453f4a 100644 --- a/Content/Items/Weapons/TheGreatwoodSword.cs +++ b/Content/Items/Weapons/TheGreatwoodSword.cs @@ -19,7 +19,7 @@ namespace Decimation.Content.Items.Weapons item.useTime = 25; item.useAnimation = 25; item.knockBack = 5; - this.item.value = Item.buyPrice(silver: 40); + this.item.value = Item.sellPrice(silver: 40); item.rare = Rarity.Green.GetRarityValue(); item.autoReuse = true; this.item.expert = false; diff --git a/Content/Items/Weapons/TitanicGatliStynger.cs b/Content/Items/Weapons/TitanicGatliStynger.cs index da75937..acb9552 100644 --- a/Content/Items/Weapons/TitanicGatliStynger.cs +++ b/Content/Items/Weapons/TitanicGatliStynger.cs @@ -30,7 +30,7 @@ namespace Decimation.Content.Items.Weapons item.useAnimation = 10; item.rare = 10; item.autoReuse = true; - item.value = Item.buyPrice(0, 60); + item.value = Item.sellPrice(0, 60); } protected override ModRecipe GetRecipe() diff --git a/Content/Items/Weapons/TitanicLongsword.cs b/Content/Items/Weapons/TitanicLongsword.cs index 6691d30..ecb4e20 100644 --- a/Content/Items/Weapons/TitanicLongsword.cs +++ b/Content/Items/Weapons/TitanicLongsword.cs @@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Weapons item.useAnimation = 88; item.crit = 14; item.knockBack = 7; - item.value = Item.buyPrice(gold: 45); + item.value = Item.sellPrice(gold: 45); item.rare = Rarity.LightPurple.GetRarityValue(); item.autoReuse = true; } diff --git a/Content/Items/Weapons/TitanicPike.cs b/Content/Items/Weapons/TitanicPike.cs index b9125b2..5f81490 100644 --- a/Content/Items/Weapons/TitanicPike.cs +++ b/Content/Items/Weapons/TitanicPike.cs @@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Weapons item.crit = 14; item.knockBack = 12; item.useStyle = 5; - item.value = Item.buyPrice(gold: 45); + item.value = Item.sellPrice(gold: 45); item.rare = Rarity.LightPurple.GetRarityValue(); item.noUseGraphic = true; item.useTurn = true; diff --git a/Content/Items/Weapons/TitanicRepeater.cs b/Content/Items/Weapons/TitanicRepeater.cs index e585d43..f5a0e4a 100644 --- a/Content/Items/Weapons/TitanicRepeater.cs +++ b/Content/Items/Weapons/TitanicRepeater.cs @@ -28,7 +28,7 @@ namespace Decimation.Content.Items.Weapons item.UseSound = SoundID.Item5; item.shootSpeed = 25; item.autoReuse = true; - item.value = Item.buyPrice(gold: 45); + item.value = Item.sellPrice(gold: 45); item.rare = Rarity.LightPurple.GetRarityValue(); } diff --git a/Content/Items/Weapons/VampiricEdge.cs b/Content/Items/Weapons/VampiricEdge.cs index ff22fd7..cf6b8f2 100644 --- a/Content/Items/Weapons/VampiricEdge.cs +++ b/Content/Items/Weapons/VampiricEdge.cs @@ -27,7 +27,7 @@ namespace Decimation.Content.Items.Weapons item.useTime = 20; item.useAnimation = 20; item.shootSpeed = 5f; - item.value = Item.buyPrice(0, 3); + item.value = Item.sellPrice(0, 3); item.rare = Rarity.Green.GetRarityValue(); item.autoReuse = true; } diff --git a/Content/NPCs/DuneWyrm/AncientTombCrawler/AncientTombCrawler.cs b/Content/NPCs/DuneWyrm/AncientTombCrawler/AncientTombCrawler.cs index ff3ccc1..18d140d 100644 --- a/Content/NPCs/DuneWyrm/AncientTombCrawler/AncientTombCrawler.cs +++ b/Content/NPCs/DuneWyrm/AncientTombCrawler/AncientTombCrawler.cs @@ -18,7 +18,7 @@ namespace Decimation.Content.NPCs.DuneWyrm.AncientTombCrawler npc.defense = 5; npc.width = 38; npc.height = 38; - npc.value = Item.buyPrice(gold: 3); + npc.value = Item.sellPrice(gold: 3); npc.npcSlots = 1f; npc.aiStyle = -1; npc.boss = true; diff --git a/Content/NPCs/DuneWyrm/AncientTombCrawler/AncientTombCrawlerFriendly.cs b/Content/NPCs/DuneWyrm/AncientTombCrawler/AncientTombCrawlerFriendly.cs index 0abd4b3..9182444 100644 --- a/Content/NPCs/DuneWyrm/AncientTombCrawler/AncientTombCrawlerFriendly.cs +++ b/Content/NPCs/DuneWyrm/AncientTombCrawler/AncientTombCrawlerFriendly.cs @@ -19,7 +19,7 @@ namespace Decimation.Content.NPCs.DuneWyrm.AncientTombCrawler npc.defense = 5; npc.width = 38; npc.height = 38; - npc.value = Item.buyPrice(gold: 3); + npc.value = Item.sellPrice(gold: 3); npc.npcSlots = 1f; npc.aiStyle = -1; npc.dontTakeDamage = true; diff --git a/Content/NPCs/DuneWyrm/DuneWyrm.cs b/Content/NPCs/DuneWyrm/DuneWyrm.cs index dd56559..254b599 100644 --- a/Content/NPCs/DuneWyrm/DuneWyrm.cs +++ b/Content/NPCs/DuneWyrm/DuneWyrm.cs @@ -295,7 +295,7 @@ namespace Decimation.Content.NPCs.DuneWyrm headType = ModContent.NPCType(); speed = BaseSpeed; turnSpeed = 0.045f; - npc.value = Item.buyPrice(gold: 16); + npc.value = Item.sellPrice(gold: 16); npc.scale = 1.5f; npc.lavaImmune = true; npc.noGravity = true; diff --git a/Content/Projectiles/DuneWyrm/AncientTombCrawler.cs b/Content/Projectiles/DuneWyrm/AncientTombCrawler.cs index f74f8fb..ad8527e 100644 --- a/Content/Projectiles/DuneWyrm/AncientTombCrawler.cs +++ b/Content/Projectiles/DuneWyrm/AncientTombCrawler.cs @@ -82,7 +82,7 @@ namespace Decimation.Content.Projectiles.DuneWyrm TailType = ModContent.ProjectileType(); BodyType = ModContent.ProjectileType(); HeadType = ModContent.ProjectileType(); - Speed = 8f; + Speed = 5f; TurnSpeed = 0.1f; }