diff --git a/.vs/CharmMod/v17/.futdcache.v2 b/.vs/CharmMod/v17/.futdcache.v2 index 7973ff9..76af7aa 100644 Binary files a/.vs/CharmMod/v17/.futdcache.v2 and b/.vs/CharmMod/v17/.futdcache.v2 differ diff --git a/.vs/CharmMod/v17/.suo b/.vs/CharmMod/v17/.suo index 6d69b74..8d0dbf1 100644 Binary files a/.vs/CharmMod/v17/.suo and b/.vs/CharmMod/v17/.suo differ diff --git a/CharmMod.cs b/CharmMod.cs index a476065..b045041 100644 --- a/CharmMod.cs +++ b/CharmMod.cs @@ -209,7 +209,7 @@ public override void Initialize(Dictionary c.Settings(Settings).Got); + // 50% Max + int CharmMultiplier = 50/Charms.Count(); + Completion += CharmMultiplier * Charms.Count(c => c.Settings(Settings).Got); - // 36% Max - if (PlayerData.instance.metIselda) Completion++; - - // 37% Max - if (PlayerData.instance.iseldaConvoGrimm) Completion++; - - // 42% Max + // 55% Max if (PlayerData.instance.elderbugGaveFlower) Completion += 5; - // 43% Max - if (PlayerData.instance.tisoDead) Completion++; - - // 45% Max + // 57% Max if (PlayerData.instance.dreamNailUpgraded) Completion += 2; // 69% Max - Completion += Mathf.Clamp(PlayerData.instance.dreamOrbs, 0, 2400) / 100; - - // 79% Max - Completion += Mathf.Clamp(PlayerData.instance.rancidEggs, 0, 10); - - // 83% Max - Completion += Mathf.Clamp(PlayerData.instance.royalCharmState, 0, 4); - - // 84% Max - if (PlayerData.instance.salubraBlessing) Completion++; + Completion += Mathf.Clamp(PlayerData.instance.dreamOrbs, 0, 2400) / 200; - // 93% Max + // 78% Max if (PlayerData.instance.notchFogCanyon) Completion++; if (PlayerData.instance.notchShroomOgres) Completion++; if (PlayerData.instance.gotGrimmNotch) Completion++; @@ -532,14 +515,26 @@ private void SetGameCompletion(On.PlayerData.orig_CountGameCompletion orig, glob if (PlayerData.instance.slyNotch1) Completion++; if (PlayerData.instance.slyNotch2) Completion++; - // 97% Max + // 82% Max Completion += Mathf.Clamp(PlayerData.instance.maxHealth, 5, 9) - 5; - // 100% Max - if (PlayerData.instance.metBanker) Completion++; - if (PlayerData.instance.metCornifer) Completion++; + // 85% Max + if (PlayerData.instance.metMoth) Completion += 3; + + // 86% Max if (PlayerData.instance.metGiraffe) Completion++; + // 100% Max + if (PlayerData.instance.dreamReward1) Completion++; + if (PlayerData.instance.dreamReward2) Completion++; + if (PlayerData.instance.dreamReward3) Completion++; + if (PlayerData.instance.dreamReward4) Completion++; + if (PlayerData.instance.dreamReward5) Completion += 2; + if (PlayerData.instance.dreamReward6) Completion += 2; + if (PlayerData.instance.dreamReward7) Completion += 2; + if (PlayerData.instance.dreamReward8) Completion += 2; + if (PlayerData.instance.dreamReward9) Completion += 2; + Completion = Mathf.Clamp(Completion, 0, 100); self.completionPercentage = Completion; @@ -711,6 +706,7 @@ private void OnUpdate() if (PlayerData.instance.gaveSlykey && PlayerData.instance.slyConvoNailHoned && PlayerData.instance.completionPercentage > 100) SlyDeal.instance.Settings(Settings).Got = true; LocalSaveData.SlyDealGot = true; if (PlayerData.instance.honedNail) GiantNail.instance.Settings(Settings).Got = true; LocalSaveData.GiantNailGot = true; if (PlayerData.instance.hasAllNailArts && PlayerData.instance.hasKingsBrand) MatosBlessing.instance.Settings(Settings).Got = true; LocalSaveData.MatosBlessingGot = true; + if (!LocalSaveData.SturdyNailGot && SturdyNail.instance.Settings(Settings).Got) LocalSaveData.SturdyNailGot = true; if (!LocalSaveData.BetterCDashGot && BetterCDash.instance.Settings(Settings).Got) LocalSaveData.BetterCDashGot = true; if (!LocalSaveData.GlassCannonGot && GlassCannon.instance.Settings(Settings).Got) LocalSaveData.GlassCannonGot = true; @@ -736,7 +732,7 @@ private void OnUpdate() if (!LocalSaveData.ShellShieldGot && ShellShield.instance.Settings(Settings).Got) LocalSaveData.ShellShieldGot = true; if (!LocalSaveData.GravityCharmGot && GravityCharm.instance.Settings(Settings).Got) LocalSaveData.GravityCharmGot = true; if (!LocalSaveData.BulbousInfectionGot && BulbousInfection.instance.Settings(Settings).Got) LocalSaveData.BulbousInfectionGot = true; - //if (!LocalSaveData.FyreChildGot && Fyrechild.instance.Settings(Settings).Got) LocalSaveData.FyreChildGot = true; + if (!LocalSaveData.FyreChildGot && Fyrechild.instance.Settings(Settings).Got) LocalSaveData.FyreChildGot = true; if (!LocalSaveData.WyrmFormGot && WyrmForm.instance.Settings(Settings).Got) LocalSaveData.WyrmFormGot = true; if (!LocalSaveData.VoidSoulGot && VoidSoul.instance.Settings(Settings).Got) LocalSaveData.WyrmFormGot = true; #endregion @@ -1196,8 +1192,6 @@ private void CheckCharmPopup() if (PlayerData.instance.hasAllNailArts && PlayerData.instance.hasKingsBrand && !LocalSaveData.MatosBlessingDonePopup) MessageController.Enqueue(EmbeddedSprite.Get("MatosBlessing.png"), "Gained Charm"); LocalSaveData.MatosBlessingDonePopup = true; if (PlayerData.instance.honedNail && !LocalSaveData.ShellShieldDonePopup) MessageController.Enqueue(EmbeddedSprite.Get("ShellShield.png"), "Gained Charm"); LocalSaveData.ShellShieldDonePopup = true; if (PlayerData.instance.honedNail && !LocalSaveData.VoidSoulDonePopup) MessageController.Enqueue(EmbeddedSprite.Get("VoidSoulPopup.png"), "Gained Charm"); LocalSaveData.VoidSoulDonePopup = true; - - // make it buy from salubra if (PlayerData.instance.geo > 100 && PlayerData.instance.hasCityKey && !LocalSaveData.QuickjumpDonePopup) MessageController.Enqueue(EmbeddedSprite.Get("Quickjump.png"), "Gained Charm"); LocalSaveData.QuickjumpDonePopup = true; if (PlayerData.instance.killedJellyfish && PlayerData.instance.killsJellyCrawler > 20 && !LocalSaveData.SlowjumpDonePopup) MessageController.Enqueue(EmbeddedSprite.Get("Slowjump.png"), "Gained Charm"); LocalSaveData.SlowjumpDonePopup = true; #endregion @@ -1315,7 +1309,7 @@ public void OnSaveLoad() if (LocalSaveData.WealthyAmuletGot) WealthyAmulet.instance.Settings(Settings).Got = true; if (LocalSaveData.ZoteBornGot) ZoteBorn.instance.Settings(Settings).Got = true; if (LocalSaveData.WyrmFormGot) WyrmForm.instance.Settings(Settings).Got = true; - //if (LocalSaveData.FyreChildGot) Fyrechild.instance.Settings(Settings).Got = true; + if (LocalSaveData.FyreChildGot) Fyrechild.instance.Settings(Settings).Got = true; if (LocalSaveData.GravityCharmGot) GravityCharm.instance.Settings(Settings).Got = true; if (LocalSaveData.BulbousInfectionGot) BulbousInfection.instance.Settings(Settings).Got = true; diff --git a/Charms/FyreChild.cs b/Charms/FyreChild.cs index d8987d8..f7d8af9 100644 --- a/Charms/FyreChild.cs +++ b/Charms/FyreChild.cs @@ -35,16 +35,9 @@ private void UpdateHook() { foreach (GameObject companion in foundCompanions) { - PlayMakerFSM companionFsm = FSMUtility.LocateMyFSM(companion, "Control"); - FsmState fsmState = companionFsm.GetState("Antic"); - bool flag4 = companion.tag.Equals("Grimmchild"); - if (flag4) - { - companionFsm = FSMUtility.LocateMyFSM(companion, "Control"); - fsmState = companionFsm.GetState("Antic"); - companion.gameObject.transform.SetScaleX(2f); - companion.gameObject.transform.SetScaleY(2f); - } + //PlayMakerFSM companionFsm = FSMUtility.LocateMyFSM(companion, "Control"); + companion.gameObject.transform.SetScaleX(2f); + companion.gameObject.transform.SetScaleY(2f); this._companions.Add(companion); } } diff --git a/Charms/GiantsNail.cs b/Charms/GiantsNail.cs index e182085..4473e42 100644 --- a/Charms/GiantsNail.cs +++ b/Charms/GiantsNail.cs @@ -3,14 +3,14 @@ namespace Fyrenest internal class GiantNail : Charm { public static readonly GiantNail instance = new(); - public override bool Placeable => false; + public override bool Placeable => true; public override string Sprite => "GiantNail.png"; public override string Name => "Giant's Nail"; public override string Description => "This charm enlarges your nail dramatically.\n\nYou gain an extraordinary amount of power, having the your nail transformed into a giant's."; public override int DefaultCost => 4; public override string Scene => "Room_Charm_Shop"; public override float X => 23.1f; - public override float Y => 6.4f; + public override float Y => 6.5f; private GiantNail() { } public override CharmSettings Settings(SaveSettings s) => s.GiantNail; diff --git a/bin/Debug/net472/Fyrenest.dll b/bin/Debug/net472/Fyrenest.dll index d0673aa..3e42966 100644 Binary files a/bin/Debug/net472/Fyrenest.dll and b/bin/Debug/net472/Fyrenest.dll differ diff --git a/bin/Debug/net472/Fyrenest.pdb b/bin/Debug/net472/Fyrenest.pdb index abec284..6f28574 100644 Binary files a/bin/Debug/net472/Fyrenest.pdb and b/bin/Debug/net472/Fyrenest.pdb differ diff --git a/obj/Debug/net472/Fyrenest.dll b/obj/Debug/net472/Fyrenest.dll index d0673aa..3e42966 100644 Binary files a/obj/Debug/net472/Fyrenest.dll and b/obj/Debug/net472/Fyrenest.dll differ diff --git a/obj/Debug/net472/Fyrenest.pdb b/obj/Debug/net472/Fyrenest.pdb index abec284..6f28574 100644 Binary files a/obj/Debug/net472/Fyrenest.pdb and b/obj/Debug/net472/Fyrenest.pdb differ