From 9ea9906d3286c07a330585a9b64c151e271b59fd Mon Sep 17 00:00:00 2001 From: Witchybun Date: Thu, 11 Jul 2024 13:59:08 -0500 Subject: [PATCH] Fix items, drops --- Data/LunacidEnemies.cs | 5 +++-- Data/LunacidItems.cs | 4 ++-- Data/LunacidLocations.cs | 6 +++--- Data/LunacidTraits.cs | 10 +++++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Data/LunacidEnemies.cs b/Data/LunacidEnemies.cs index fc2babe..c2d18e9 100644 --- a/Data/LunacidEnemies.cs +++ b/Data/LunacidEnemies.cs @@ -18,6 +18,7 @@ public static class LunacidEnemies {"MUMMY KNIGHT", "Mummy Knight"}, {"MUMMY", "Mummy"}, {"MILK_SNAIL_DED(Clone)", "Milk Snail"}, + {"MILK_SNAIL_DED2(Clone)", "Milk Snail"}, {"SNAIL_DED(Clone)", "Snail"}, {"SHULKER_DED(Clone)", "Shulker"}, {"RAT_DED1(Clone)", "Rat"}, // Monitor this; seems to end with a different number sometimes? @@ -82,7 +83,7 @@ public static class LunacidEnemies {"CANDLE_WEP_PICKUP", "Jailor's Candle"}, {"RUSTED_SWORD_PICKUP", "Rusted Sword"}, {"GOLDEN_SICKLE_PICKUP", "Golden Sickle"}, - {"GOLDEN_KOPESH_PICKUP", "Golden Khopesh"}, + {"GOLDEN_KHOPESH_PICKUP", "Golden Khopesh"}, {"BRITTLE_PICKUP", "Brittle Arming Sword"}, {"BOOK_PICKUP", "Black Book"}, {"OBS_SHIELD_PICKUP", "Obsidian Cursebrand"}, @@ -181,7 +182,7 @@ public static class LunacidEnemies {"Cetea", new List(){"VOID"}}, {"Abyssal Demon", new List(){"LAKE", "HAUNT"}}, {"Cerritulus Lunam", new List(){"PRISON"}}, - {"Sanguine Umbra", new List(){"CAS_PITT"}} + {"Sanguis Umbra", new List(){"CAS_PITT"}} }; } } \ No newline at end of file diff --git a/Data/LunacidItems.cs b/Data/LunacidItems.cs index da40769..0126bfa 100644 --- a/Data/LunacidItems.cs +++ b/Data/LunacidItems.cs @@ -105,13 +105,13 @@ public ItemData(long itemID, string itemName, string gameObject, ItemType type, "VHS Tape", "Corrupt Key", "Skull of Josiah", "Vampiric Symbol (W)", "Vampiric Symbol (A)", "Vampiric Symbol (E)", "Crystal Lantern", "Terminus Prison Key", "Survey Banner", "Water Talisman", "Earth Talisman", "Oil Lantern", "Strange Coin", "Health ViaI", "Eggnog", "Dusty Crystal Orb", "Skeleton Egg", "Dried Rat", "Skeletal Rattle", "Coal", "Pink Shrimp", "Angel Feather", "Sheryl's Initial Offerings Voucher", - "Sheryl's Golden Armor Voucher", "Sheryl's Dreamer Voucher", "Patchouli's Drink Voucher" + "Sheryl's Golden Armor Voucher", "Sheryl's Dreamer Voucher", "Patchouli's Drink Voucher", "Fool's Gold" }; public static readonly List Filler = new(){ "Blood Wine", "Light Urn", "Cloth Bandage", "Dark Urn", "Bomb", "Poison Urn", "Limbo", "Wisp Heart", "Staff of Osiris", "Moonlight Vial", "Spectral Candle", "Health Vial", "Mana Vial", "Fairy Moss", "Crystal Shard", "Poison Throwing Knife", - "Throwing Knife", "Holy Water", "Antidote", "Survey Banner", "Pink Shrimp", "Angel Feather" + "Throwing Knife", "Holy Water", "Antidote", "Survey Banner", "Pink Shrimp", "Angel Feather", "Fool's Gold" }; public static readonly List Materials = new(){ diff --git a/Data/LunacidLocations.cs b/Data/LunacidLocations.cs index d9bb5f3..9cd7433 100644 --- a/Data/LunacidLocations.cs +++ b/Data/LunacidLocations.cs @@ -69,8 +69,8 @@ public LocationData() new LocationData( 450, "Mummy: Small Silver Drop" ), new LocationData( 451, "Mummy: Large Silver Drop" ), new LocationData( 452, "Necronomicon: Fire Opal Drop" ), - new LocationData( 453, "Necronomicon: Small Silver Drop" ), - new LocationData( 454, "Necronomicon: Medium Silver Drop" ), + new LocationData( 453, "Necronomicon: Medium Silver Drop" ), + new LocationData( 454, "Necronomicon: Large Silver Drop" ), new LocationData( 455, "Necronomicon: Mana Vial Drop" ), new LocationData( 456, "Chimera: Light Urn Drop" ), new LocationData( 457, "Chimera: Holy Water Drop" ), @@ -146,7 +146,7 @@ public LocationData() new LocationData( 527, "Obsidian Skeleton: Bones Drop" ), new LocationData( 528, "Obsidian Skeleton: Mana Vial Drop" ), new LocationData( 529, "Obsidian Skeleton: Obsidian Drop" ), - new LocationData( 530, "Anpu: Medium Silver Drop" ), + new LocationData( 530, "Anpu: Large Silver Drop" ), new LocationData( 531, "Anpu: Fire Opal Drop" ), new LocationData( 532, "Serpent: Antidote Drop" ), new LocationData( 533, "Serpent: Small Silver Drop" ), diff --git a/Data/LunacidTraits.cs b/Data/LunacidTraits.cs index a671da7..188c7be 100644 --- a/Data/LunacidTraits.cs +++ b/Data/LunacidTraits.cs @@ -115,7 +115,7 @@ public static class LunacidTraits private static readonly GiftTrait[] CoalTraits = new[]{ new GiftTrait(GiftFlag.Energy, 1, 1), - new GiftTrait(GiftFlag.Heat, 1, 1), + new GiftTrait(GiftFlag.Fire, 1, 1), new GiftTrait(GiftFlag.Ore, 1, 1), }; @@ -139,7 +139,7 @@ public static class LunacidTraits private static readonly GiftTrait[] SnowflakeObsidianTraits = new[]{ new GiftTrait(GiftFlag.Material, 1, 1), - new GiftTrait(GiftFlag.Cold, 1, 1), + new GiftTrait(GiftFlag.Ice, 1, 1), new GiftTrait(GiftFlag.Ore, 1, 1), }; @@ -151,14 +151,14 @@ public static class LunacidTraits private static readonly GiftTrait[] FireOpalTraits = new[]{ new GiftTrait(GiftFlag.Material, 1, 1), - new GiftTrait(GiftFlag.Heat, 1, 1), + new GiftTrait(GiftFlag.Fire, 1, 1), new GiftTrait(GiftFlag.Ore, 1, 1), }; private static readonly GiftTrait[] AshesTraits = new[]{ new GiftTrait(GiftFlag.Material, 1, 1), new GiftTrait(GiftFlag.Wood, 1, 1), - new GiftTrait(GiftFlag.Heat, 1, 1), + new GiftTrait(GiftFlag.Fire, 1, 1), new GiftTrait(GiftFlag.Monster, 1, 1), }; @@ -182,7 +182,7 @@ public static class LunacidTraits private static readonly GiftTrait[] ObsidianTraits = new[]{ new GiftTrait(GiftFlag.Material, 1, 1), - new GiftTrait(GiftFlag.Heat, 1, 1), + new GiftTrait(GiftFlag.Fire, 1, 1), new GiftTrait(GiftFlag.Stone, 1, 1), };