diff --git a/GameCompletion.cs b/GameCompletion.cs index bdaa197..8d9d0bf 100644 --- a/GameCompletion.cs +++ b/GameCompletion.cs @@ -27,7 +27,7 @@ public static void CalculateCompletion(On.PlayerData.orig_CountGameCompletion or if (!Enabled) return; - int charmCount = self.GetInt("charmsOwned"); //max 17 + int charmCount = self.GetInt("charmsOwned"); //max 19 int nailUpgrades = self.GetInt("nailSmithUpgrades"); // max 3 @@ -38,7 +38,7 @@ public static void CalculateCompletion(On.PlayerData.orig_CountGameCompletion or if (self.GetInt("screamLevel") > 0) spells++; if (self.GetInt("quakeLevel") > 0) spells++; - int mainUpgrades = 0; //max 7 + int mainUpgrades = 0; //max 8 if (self.GetBool("hasDoubleJump")) mainUpgrades++; if (self.GetBool("hasSuperDash")) mainUpgrades++; if (self.GetBool("hasTramPass")) mainUpgrades++; @@ -46,16 +46,17 @@ public static void CalculateCompletion(On.PlayerData.orig_CountGameCompletion or if (self.GetBool("hasLantern")) mainUpgrades++; if (self.GetBool("hasDreamNail")) mainUpgrades++; if (self.GetBool("hasDreamGate")) mainUpgrades++; + if (self.GetBool("dreamNailUpgraded")) mainUpgrades++; int dreamers = 0; //max 3 if (self.GetBool("monomonDefeated")) dreamers++; if (self.GetBool("hegemolDefeated")) dreamers++; if (self.GetBool("lurienDefeated")) dreamers++; - int masks = self.GetInt("maxHealth") - 5; //max 1 + int masks = self.GetInt("maxHealth") - 5; //max 2 int vessels = self.GetInt("MPReserveMax") / 33; //max 1 - float percentage = 3 * charmCount + 2 * nailUpgrades + 3 * charmNotches + 2 * spells + 2 * mainUpgrades + 3 * dreamers + 3 * masks + 2 * vessels; + float percentage = 3 * charmCount + 1 * nailUpgrades + 2 * charmNotches + 2 * spells + 2 * mainUpgrades + 2 * dreamers + 2 * masks + 2 * vessels; if (percentage > 100) percentage = 100; diff --git a/GeneralChanges.cs b/GeneralChanges.cs index b6e8d9b..f8c1743 100644 --- a/GeneralChanges.cs +++ b/GeneralChanges.cs @@ -72,6 +72,7 @@ public static void ChangeText() ReplaceText("CHARM_DESC_3", "A present from an old catapillar. Probably won't change your size though."); ReplaceText("CHARM_DESC_31", "A very pretty medal. Could probably be sold for a good prize to a collector. If you had a mouth to barter with, that is."); ReplaceText("CHARM_DESC_40_N", "A finely crafted medal, eternally giving off a faint lullaby.
Crafted by a mother mourning her family."); + ReplaceText("CHARM_DESC_38", "A little medal with an emblem shaped like a flower. Used by gardeners across the world to repell snail invasions."); //Replace Elegy to Hallownest ReplaceText("PROLOGUE_EXCERPT_01", "A note to all who it may concern:"); diff --git a/Maps/PlacedCharms.txt b/Maps/PlacedCharms.txt index 7cede79..5149654 100644 --- a/Maps/PlacedCharms.txt +++ b/Maps/PlacedCharms.txt @@ -15,6 +15,7 @@ Quick Slash 32 Dream Wielder 30 Grubsong 3 Dashmaster 31 -Dreamshield +Carefree Melody 40N +Dreamshield Don't include Flukenest without adding Flukehermit dialog \ No newline at end of file