diff --git a/README.md b/README.md index 29f0d83..9fcf79a 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,14 @@ # HollowKnight.Uuwuu -Hollow Knight mod that adds an harder version of uumuu to godhome +By RedFrog6002 +Hollow Knight mod that adds an harder version of uumuu to godhome -# Mod Installer Readme -By RedFrog6002 Uumuu but only a little bit harder Uuwuu because I couldn't think of anything else -also if it is too hard, there is a new charm +also if it is too hard, there is a new charm that makes it easier + +your reward is a journal entry + +if you feel it's too easy, beat it 3 times to get the notes of the entry \ No newline at end of file diff --git a/Uuwuu/Resources/Spellmaster.png b/Uuwuu/Resources/Spellmaster.png deleted file mode 100644 index 8f5eb29..0000000 Binary files a/Uuwuu/Resources/Spellmaster.png and /dev/null differ diff --git a/Uuwuu/Resources/Uumuu_picture.png b/Uuwuu/Resources/Uumuu_picture.png new file mode 100644 index 0000000..624d662 Binary files /dev/null and b/Uuwuu/Resources/Uumuu_picture.png differ diff --git a/Uuwuu/Resources/Uumuu_portrait.png b/Uuwuu/Resources/Uumuu_portrait.png new file mode 100644 index 0000000..09c88bb Binary files /dev/null and b/Uuwuu/Resources/Uumuu_portrait.png differ diff --git a/Uuwuu/Resources/Uuwuu2.png b/Uuwuu/Resources/Uuwuu2.png deleted file mode 100644 index 22037b5..0000000 Binary files a/Uuwuu/Resources/Uuwuu2.png and /dev/null differ diff --git a/Uuwuu/Resources/divider.png b/Uuwuu/Resources/divider.png new file mode 100644 index 0000000..6cae417 Binary files /dev/null and b/Uuwuu/Resources/divider.png differ diff --git a/Uuwuu/Resources/glass.png b/Uuwuu/Resources/glass.png deleted file mode 100644 index 60cc144..0000000 Binary files a/Uuwuu/Resources/glass.png and /dev/null differ diff --git a/Uuwuu/Settings.cs b/Uuwuu/Settings.cs index b657a23..14c35a9 100644 --- a/Uuwuu/Settings.cs +++ b/Uuwuu/Settings.cs @@ -19,5 +19,8 @@ public bool EquippedCharm base.SetBool(value); } } + public bool haskilled = false; + public bool newentry = true; + public int killsleft = 3; } } \ No newline at end of file diff --git a/Uuwuu/Uumuu.cs b/Uuwuu/Uumuu.cs index 292cf71..e2d7088 100644 --- a/Uuwuu/Uumuu.cs +++ b/Uuwuu/Uumuu.cs @@ -63,7 +63,6 @@ private static ParticleSystem AddTrail(GameObject go, float offset = 0f, Color? } private Vector2 box; private Vector2 circle; - // Token: 0x06000090 RID: 144 RVA: 0x0000253E File Offset: 0x0000073E private IEnumerator Start() { yield return null; @@ -94,6 +93,8 @@ private IEnumerator Start() base.gameObject.GetComponent().color = new Color(1f, 2f, 1f, 1f); base.gameObject.GetComponent().FlipX = true; base.gameObject.GetComponent().FlipY = true; + string s = "CustomJournal" + Uuwuu.Instance.jh.entrynumber; + Modding.ReflectionHelper.SetAttr(GetComponent(), "playerDataName", s); base.gameObject.transform.SetScaleX(base.gameObject.transform.GetScaleX() + 0.07f); base.gameObject.transform.SetScaleY(base.gameObject.transform.GetScaleY() + 0.07f); box = base.gameObject.GetComponent().offset; diff --git a/Uuwuu/Uuwuu.cs b/Uuwuu/Uuwuu.cs index 9a16e35..e9c07a6 100644 --- a/Uuwuu/Uuwuu.cs +++ b/Uuwuu/Uuwuu.cs @@ -8,6 +8,7 @@ using UnityEngine; using UnityEngine.SceneManagement; using SFCore; +using FrogCore; namespace Uuwuu { @@ -127,20 +128,24 @@ private string OnLangGet(string key, string sheettitle) // Token: 0x0600004C RID: 76 RVA: 0x0000235A File Offset: 0x0000055A private void SaveGame(SaveGameData data) { - Uuwuu.AddComponent(); + AddComponent(); } // Token: 0x0600004E RID: 78 RVA: 0x00002384 File Offset: 0x00000584 - private static void AddComponent() + private void AddComponent() { GameManager.instance.gameObject.AddComponent(); + jh.playerData.haskilled = Settings.haskilled; + jh.playerData.killsremaining = Settings.killsleft; + jh.playerData.newentry = Settings.newentry; } // Token: 0x0600004F RID: 79 RVA: 0x00003350 File Offset: 0x00001550 public void Unload() { + ModHooks.Instance.BeforeSavegameSaveHook -= Instance_BeforeSavegameSaveHook; ModHooks.Instance.AfterSavegameLoadHook -= this.SaveGame; - ModHooks.Instance.NewGameHook -= Uuwuu.AddComponent; + ModHooks.Instance.NewGameHook -= AddComponent; ModHooks.Instance.LanguageGetHook -= this.OnLangGet; UnityEngine.SceneManagement.SceneManager.activeSceneChanged -= this.SceneChanged; ModHooks.Instance.GetPlayerVariableHook -= this.GetVariableHook; @@ -172,7 +177,7 @@ public override void Initialize(Dictionary