Made the cathedral secret door openable from inside

* And some other stuff
silent-destroyer · Apr 1, 2024 · 57bdc3a · 57bdc3a
1 parent 327b653
commit 57bdc3a
Show file tree

Hide file tree

Showing 9 changed files with 343 additions and 8 deletions.
diff --git a/TunicRandomizer.csproj b/TunicRandomizer.csproj
@@ -201,6 +201,7 @@
     <Compile Include="src\Patches\PlayerCharacterPatches.cs" />
     <Compile Include="src\Patches\OptionsGUIPatches.cs" />
     <Compile Include="src\Patches\SceneLoaderPatches.cs" />
+    <Compile Include="src\Patches\SecretMayor.cs" />
     <Compile Include="src\Patches\TextBuilderPatches.cs" />
     <Compile Include="src\Patches\TunicPortals.cs" />
     <Compile Include="src\Patches\SpeedrunFinishlineDisplayPatches.cs" />

diff --git a/src/Data/ImageData.cs b/src/Data/ImageData.cs
diff --git a/src/Patches/ModelSwaps.cs b/src/Patches/ModelSwaps.cs
@@ -110,7 +110,7 @@ public static void InitializeItems() {
             Items["GoldenTrophy_10"] = ItemRoot.transform.GetChild(42).gameObject;
             Items["GoldenTrophy_11"] = ItemRoot.transform.GetChild(43).gameObject;
             Items["GoldenTrophy_12"] = ItemRoot.transform.GetChild(44).gameObject;
-
+            SecretMayor.MrMayor = Items["GoldenTrophy_1"];
             Items["Key"] = ItemRoot.transform.GetChild(4).gameObject;
             Items["Vault Key (Red)"] = ItemRoot.transform.GetChild(23).gameObject;
 
@@ -1260,6 +1260,7 @@ public static void LoadTextures() {
             CustomItemImages.Add("AbilityShuffle", CreateSprite(ImageData.Abilities, ImageMaterial, 200, 100, SpriteName: "Randomizer heading_Abilities"));
             CustomItemImages.Add("Dath Stone Texture", CreateSprite(ImageData.DathSteneTexture, ImageMaterial, 200, 100, SpriteName: "Randomizer dath stone texture"));
             CustomItemImages.Add("Ladder", CreateSprite(ImageData.Ladder, ImageMaterial, 160, 160, SpriteName: "Randomizer items_ladder"));
+            CustomItemImages.Add("Secret Mayor", CreateSprite(ImageData.SecretMayor, ImageMaterial, 1400, 675, SpriteName: "Randomizer secret_mayor"));
 
             Inventory.GetItemByName("Librarian Sword").icon = CustomItemImages["Librarian Sword"].GetComponent<Image>().sprite;
             Inventory.GetItemByName("Heir Sword").icon = CustomItemImages["Heir Sword"].GetComponent<Image>().sprite;

diff --git a/src/Patches/OptionsGUIPatches.cs b/src/Patches/OptionsGUIPatches.cs
@@ -164,7 +164,9 @@ public static void OtherSettingsPage() {
             OptionsGUI.addToggle("???", "Off", "On", TunicRandomizer.Settings.CameraFlip ? 1 : 0, (OptionsGUIMultiSelect.MultiSelectAction)ToggleWeirdMode);
             OptionsGUI.addToggle("More Skulls", "Off", "On", TunicRandomizer.Settings.MoreSkulls ? 1 : 0, (OptionsGUIMultiSelect.MultiSelectAction)ToggleMoreSkulls);
             OptionsGUI.addToggle("Arachnophobia Mode", "Off", "On", TunicRandomizer.Settings.ArachnophobiaMode ? 1 : 0, (OptionsGUIMultiSelect.MultiSelectAction)ToggleArachnophobiaMode);
-
+            if (SecretMayor.shouldBeActive || SecretMayor.isCorrectDate()) {
+                OptionsGUI.addToggle("Mr Mayor", "Off", "On", SecretMayor.shouldBeActive ? 1 : 0, (OptionsGUIMultiSelect.MultiSelectAction)SecretMayor.ToggleMayorSecret);
+            }
         }
 
         public static void addPageButton(string pageName, Action pageMethod) {

diff --git a/src/Patches/SceneLoaderPatches.cs b/src/Patches/SceneLoaderPatches.cs
@@ -299,7 +299,7 @@ public static void SceneLoader_OnSceneLoaded_PostfixPatch(Scene loadingScene, Lo
                 }
             } else if (SceneName == "Temple") {
                 if (SaveFile.GetInt(HexagonQuestEnabled) == 1) {
-                    foreach (GameObject Questagon in Resources.FindObjectsOfTypeAll<GameObject>().Where(Obj => Obj.name == "questagon")) {
+                    foreach (GameObject Questagon in Resources.FindObjectsOfTypeAll<GameObject>().Where(Obj => Obj.name == "questagon" && Obj.scene.name == loadingScene.name)) {
                         Questagon.GetComponent<MeshRenderer>().materials = ModelSwaps.Items["GoldenTrophy_2"].GetComponent<MeshRenderer>().materials;
                         Questagon.GetComponent<MeshRenderer>().receiveShadows = false;
                     }
@@ -383,6 +383,9 @@ public static void SceneLoader_OnSceneLoaded_PostfixPatch(Scene loadingScene, Lo
                 if (SaveFile.GetInt("randomizer entrance rando enabled") == 1) {
                     StateVariable.GetStateVariableByName("SV_cathedral elevator").BoolValue = true;
                 }
+                if (GameObject.FindObjectOfType<ToggleObjectBySpell>() != null) {
+                    GameObject.FindObjectOfType<ToggleObjectBySpell>().minDistance = 36;
+                }
             } else if (SceneName == "Maze Room") {
                 foreach (Chest chest in Resources.FindObjectsOfTypeAll<Chest>().Where(chest => chest.name == "Chest: Fairy")) {
                     chest.transform.GetChild(4).gameObject.SetActive(false);

diff --git a/src/Patches/SecretMayor.cs b/src/Patches/SecretMayor.cs
diff --git a/src/Patches/TitleVersion.cs b/src/Patches/TitleVersion.cs
@@ -19,6 +19,7 @@ public class TitleVersion {
         public static bool DevBuild = true;
         public static bool UpdateAvailable = false;
         public static string UpdateVersion = "";
+        public static GameObject Logo;
         public static void Initialize() {
             UpdateVersion = PluginInfo.VERSION;
             try {
@@ -55,10 +56,13 @@ public static void Initialize() {
             VersionString.transform.localScale = Vector3.one;
             GameObject.DontDestroyOnLoad(VersionString);
             System.Random Random = new System.Random();
-
+            Logo = GameObject.Find("_GameGUI(Clone)/Title Canvas/Title Screen Root/Image");
             if (Random.Next(100) < 10) {
-                GameObject Title = GameObject.Find("_GameGUI(Clone)/Title Canvas/Title Screen Root/Image");
-                Title.GetComponent<Image>().sprite = ModelSwaps.TuncTitleImage.GetComponent<Image>().sprite;
+                Logo.GetComponent<Image>().sprite = ModelSwaps.TuncTitleImage.GetComponent<Image>().sprite;
+            }
+
+            if (SecretMayor.shouldBeActive) {
+                Logo.GetComponent<Image>().sprite = ModelSwaps.FindSprite("Randomizer secret_mayor");
             }
         }
 

diff --git a/src/TunicRandomizer.cs b/src/TunicRandomizer.cs
@@ -32,8 +32,8 @@ public class TunicRandomizer : BasePlugin {
         public override void Load() {
             TunicLogger.SetLogger(Log);
             Logger = Log;
-            Logger.LogInfo(PluginInfo.NAME+ " v" + PluginInfo.VERSION + " loaded!");
-            
+            TunicLogger.LogInfo(PluginInfo.NAME + " v" + PluginInfo.VERSION + " loaded!");
+
             Application.runInBackground = true;
 
             Tracker = new ItemTracker();
@@ -215,6 +215,8 @@ public override void Load() {
 
             Harmony.Patch(AccessTools.Method(typeof(ConduitNode), "CheckConnectedToPower"), new HarmonyMethod(AccessTools.Method(typeof(InteractionPatches), "ConduitNode_CheckConnectedToPower_PrefixPatch")));
 
+            Harmony.Patch(AccessTools.Method(typeof(SceneLoader), "OnSceneLoaded"), null, new HarmonyMethod(AccessTools.Method(typeof(SecretMayor), "SceneLoader_OnSceneLoaded_SecretMayorPatch")));
+
         }
     }
 }
diff --git a/tunic.apworld b/tunic.apworld