diff --git a/Items/BubbleShield.cs b/Items/BubbleShield.cs index 68bbd5e1..d4576d25 100644 --- a/Items/BubbleShield.cs +++ b/Items/BubbleShield.cs @@ -10,7 +10,8 @@ public class BubbleShield : ModItem public override void SetStaticDefaults() { DisplayName.SetDefault("Bubble Shield"); - Tooltip.SetDefault("Creates a bubble that knocks back enemies"); + Tooltip.SetDefault("Creates a bubble that knocks back enemies\n" + + "Fished in the ocean"); } public override void SetDefaults() { diff --git a/Items/GilgBag.cs b/Items/GilgBag.cs index b503fcce..4ae36da6 100644 --- a/Items/GilgBag.cs +++ b/Items/GilgBag.cs @@ -46,34 +46,34 @@ public override void OpenBossBag(Player player) if (Main.rand.NextBool(100)) + { + player.QuickSpawnItem(mod.ItemType("EvilStone")); + } + else if (Main.rand.NextBool(99)) { player.QuickSpawnItem(mod.ItemType("SkullStone")); } - else if (Main.rand.NextBool(100)) + else if (Main.rand.NextBool(98)) { player.QuickSpawnItem(mod.ItemType("JungleStone")); } - else if (Main.rand.NextBool(100)) + else if (Main.rand.NextBool(97)) { player.QuickSpawnItem(mod.ItemType("InfernoStone")); } - else if (Main.rand.NextBool(100)) - { - player.QuickSpawnItem(mod.ItemType("EvilStone")); - } - else if (Main.rand.NextBool(100)) + else if (Main.rand.NextBool(96)) { player.QuickSpawnItem(mod.ItemType("SeaStoneDeep")); } - else if (Main.rand.NextBool(100)) + else if (Main.rand.NextBool(95)) { player.QuickSpawnItem(mod.ItemType("SeaStoneEast")); } - else if (Main.rand.NextBool(100)) + else if (Main.rand.NextBool(94)) { player.QuickSpawnItem(mod.ItemType("SeaStoneHigh")); } - else if (Main.rand.NextBool(100)) + else if (Main.rand.NextBool(93)) { player.QuickSpawnItem(mod.ItemType("SeaStoneWest")); } diff --git a/NPCs/TreasureGoblin.cs b/NPCs/TreasureGoblin.cs index 5e5e5e2b..3ff3192d 100644 --- a/NPCs/TreasureGoblin.cs +++ b/NPCs/TreasureGoblin.cs @@ -99,39 +99,35 @@ public override void NPCLoot() { if (Main.rand.NextBool(100)) { - switch (Main.rand.Next(4)) - { - case 1: - Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("SkullStone"), 1); - break; - case 2: - Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("JungleStone"), 1); - break; - case 3: - Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("InfernoStone"), 1); - break; - default: - Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("EvilStone"), 1); - break; - } + Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("EvilStone"), 1); } - else if (Main.rand.NextBool(100)) + else if (Main.rand.NextBool(99)) { - switch (Main.rand.Next(4)) - { - case 1: - Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("SeaStoneDeep"), 1); - break; - case 2: - Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("SeaStoneEast"), 1); - break; - case 3: - Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("SeaStoneHigh"), 1); - break; - default: - Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("SeaStoneWest"), 1); - break; - } + Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("SkullStone"), 1); + } + else if (Main.rand.NextBool(98)) + { + Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("JungleStone"), 1); + } + else if (Main.rand.NextBool(97)) + { + Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("InfernoStone"), 1); + } + else if (Main.rand.NextBool(96)) + { + Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("SeaStoneDeep"), 1); + } + else if (Main.rand.NextBool(95)) + { + Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("SeaStoneEast"), 1); + } + else if (Main.rand.NextBool(94)) + { + Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("SeaStoneHigh"), 1); + } + else if (Main.rand.NextBool(93)) + { + Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("SeaStoneWest"), 1); } if (Main.rand.Next(5) < 2) { diff --git a/description.txt b/description.txt index e21bd853..8e7d7755 100644 --- a/description.txt +++ b/description.txt @@ -24,4 +24,5 @@ Version 0.8.1.1 - Chained Chainsaws now stick into the enemy and damage them repeatedly, and they have a limited max distance - Hatchets now have a limited max distance - Soil weapons now consume dirt when you use them, equal to 1/20th of the damage granted by your dirt -- Soil armor now consumes dirt when you get hit, equal to the attack's damage, up to a maximum of half of the defense provided by the set bonus \ No newline at end of file +- Soil armor now consumes dirt when you get hit, equal to the attack's damage, up to a maximum of half of the defense provided by the set bonus +- Treasure goblin now drops the legendary stones at 1% chance each, rather than a 1% chance to drop any \ No newline at end of file