diff --git a/Content/Debug/DebugSword.cs b/Content/Debug/DebugSword.cs index 654ca0d..893da65 100644 --- a/Content/Debug/DebugSword.cs +++ b/Content/Debug/DebugSword.cs @@ -5,13 +5,13 @@ namespace Decimation.Content.Debug { public class DebugSword : DecimationWeapon { - public override string Texture => "Terraria/Item_" + ItemID.CopperShortsword; + public override string Texture => "Terraria/Item_" + ItemID.TrueExcalibur; protected override string ItemName => "Debug Sword"; protected override int Damages => 9999999; protected override void InitWeapon() { - item.CloneDefaults(ItemID.CopperShortsword); + item.CloneDefaults(ItemID.TrueExcalibur); } } } \ No newline at end of file diff --git a/Content/Items/Boss/DuneWyrm/DuneWyrmTreasureBag.cs b/Content/Items/Boss/DuneWyrm/DuneWyrmTreasureBag.cs index e790c07..729db71 100644 --- a/Content/Items/Boss/DuneWyrm/DuneWyrmTreasureBag.cs +++ b/Content/Items/Boss/DuneWyrm/DuneWyrmTreasureBag.cs @@ -20,8 +20,8 @@ namespace Decimation.Content.Items.Boss.DuneWyrm protected override void Init() { item.consumable = true; - item.width = 24; - item.height = 24; + item.width = 32; + item.height = 32; item.rare = Rarity.Rainbow.GetRarityValue(); item.expert = true; } diff --git a/Content/Items/Boss/DuneWyrm/DuneWyrmTreasureBag.png b/Content/Items/Boss/DuneWyrm/DuneWyrmTreasureBag.png index eb2b76f..af493cd 100644 Binary files a/Content/Items/Boss/DuneWyrm/DuneWyrmTreasureBag.png and b/Content/Items/Boss/DuneWyrm/DuneWyrmTreasureBag.png differ diff --git a/Content/NPCs/DuneWyrm/DuneWyrm.cs b/Content/NPCs/DuneWyrm/DuneWyrm.cs index 5250c1d..736ac4b 100644 --- a/Content/NPCs/DuneWyrm/DuneWyrm.cs +++ b/Content/NPCs/DuneWyrm/DuneWyrm.cs @@ -1,6 +1,7 @@ using System.IO; using System.Linq; using Decimation.Content.Buffs.Debuffs; +using Decimation.Content.Items.Boss.DuneWyrm; using Decimation.Content.NPCs.DuneWyrm.AncientTombCrawler; using Decimation.Content.Projectiles; using Decimation.Lib.NPCs; @@ -25,7 +26,6 @@ namespace Decimation.Content.NPCs.DuneWyrm npc.defense = 15; npc.width = 116; npc.height = 116; - npc.boss = true; Main.npcFrameCount[npc.type] = 1; npc.value = Item.buyPrice(gold: 12); npc.npcSlots = 1f; @@ -288,6 +288,8 @@ namespace Decimation.Content.NPCs.DuneWyrm npc.netAlways = true; npc.DeathSound = SoundID.NPCDeath18; npc.HitSound = SoundID.NPCHit1; + npc.boss = true; + bossBag = ModContent.ItemType(); undergroundSound = mod.GetLegacySoundSlot(SoundType.Custom, "Sounds/Custom/Earthquake"); } diff --git a/Content/NPCs/DuneWyrm/DuneWyrmHead_Head_Boss.png b/Content/NPCs/DuneWyrm/DuneWyrmHead_Head_Boss.png index 68d3e1a..2e751bd 100644 Binary files a/Content/NPCs/DuneWyrm/DuneWyrmHead_Head_Boss.png and b/Content/NPCs/DuneWyrm/DuneWyrmHead_Head_Boss.png differ