From 61fece734598dfd9fee2b87684931abc019933df Mon Sep 17 00:00:00 2001 From: Edgar Orendain Date: Sun, 3 Apr 2022 18:38:01 -0700 Subject: [PATCH 1/5] Extend LevelSequence rule to allow arbitrarily long sequences. --- .../Rules/LevelSequenceOverriddenRule.cs | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/HouseRules_Essentials/Rules/LevelSequenceOverriddenRule.cs b/HouseRules_Essentials/Rules/LevelSequenceOverriddenRule.cs index 25c28974..c64df13e 100644 --- a/HouseRules_Essentials/Rules/LevelSequenceOverriddenRule.cs +++ b/HouseRules_Essentials/Rules/LevelSequenceOverriddenRule.cs @@ -11,12 +11,10 @@ using HouseRules.Types; using UnityEngine; - public sealed class LevelSequenceOverriddenRule : Rule, IConfigWritable>, IMultiplayerSafe + public sealed class LevelSequenceOverriddenRule : Rule, IConfigWritable>, IPatchable, IMultiplayerSafe { public override string Description => "LevelSequence is overridden"; - protected override SyncableTrigger ModifiedSyncables => SyncableTrigger.NewPieceModified | SyncableTrigger.StatusEffectDataModified; - private readonly List _adjustments; private List _originals; @@ -42,10 +40,36 @@ protected override void OnDeactivate(GameContext gameContext) ReplaceExistingProperties(_originals); } + private static void Patch(Harmony harmony) + { + harmony.Patch( + original: AccessTools.Method( + typeof(LevelSequenceConfiguration), "GetSequenceDefinition"), + prefix: new HarmonyMethod(typeof(LevelSequenceOverriddenRule), nameof(LevelSequenceConfiguration_GetSequenceDefinition_Prefix))); + } + + private static bool LevelSequenceConfiguration_GetSequenceDefinition_Prefix(ref SequenceDefinition __result, int index, LevelSequence.GameType gameType) + { + var gameContext = Traverse.Create(typeof(GameHub)).Field("gameContext").Value; + + var gameTypeSequence = gameContext.levelSequenceConfiguration.sequenceDefinitions.GetSequenceFromId(gameType, out _); + if (index >= 0 && index < gameTypeSequence.Length) + { + return true; + } + + var indexToReturn = gameContext.levelManager.GetLevelSequence().CurrentLevelIsLastLevel + ? gameTypeSequence.Length - 1 + : gameTypeSequence.Length - 3; + + __result = gameTypeSequence[indexToReturn]; + return false; + } + /// /// Replaces LevelSequence levels with predefined list. /// - /// List of previous LevelSequnece levels that are now replaced. + /// List of previous LevelSequence levels that are now replaced. private static List ReplaceExistingProperties(List replacements) { var levelManager = Resources.FindObjectsOfTypeAll().First(); From dcd90f73e1bff8c95b49fcb20277123942fd390b Mon Sep 17 00:00:00 2001 From: Edgar Orendain Date: Sun, 3 Apr 2022 19:27:40 -0700 Subject: [PATCH 2/5] Apply cleanup. --- .../HouseRules_Essentials.csproj | 3 ++ .../Rules/LevelSequenceOverriddenRule.cs | 48 +++++++------------ 2 files changed, 19 insertions(+), 32 deletions(-) diff --git a/HouseRules_Essentials/HouseRules_Essentials.csproj b/HouseRules_Essentials/HouseRules_Essentials.csproj index 404e13f2..06c9190a 100644 --- a/HouseRules_Essentials/HouseRules_Essentials.csproj +++ b/HouseRules_Essentials/HouseRules_Essentials.csproj @@ -97,6 +97,9 @@ $(SteamDemeoDir)\MelonLoader\MelonLoader.dll + + $(SteamDemeoDir)\demeo_Data\Managed\PhotonUnityNetworking.dll + $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll diff --git a/HouseRules_Essentials/Rules/LevelSequenceOverriddenRule.cs b/HouseRules_Essentials/Rules/LevelSequenceOverriddenRule.cs index c64df13e..1c091f2d 100644 --- a/HouseRules_Essentials/Rules/LevelSequenceOverriddenRule.cs +++ b/HouseRules_Essentials/Rules/LevelSequenceOverriddenRule.cs @@ -3,20 +3,14 @@ using System.Collections.Generic; using System.Linq; using Boardgame; - using Boardgame.LevelLoading; - using Boardgame.Networking; - using Data.GameData; - using DataKeys; using HarmonyLib; using HouseRules.Types; - using UnityEngine; public sealed class LevelSequenceOverriddenRule : Rule, IConfigWritable>, IPatchable, IMultiplayerSafe { public override string Description => "LevelSequence is overridden"; private readonly List _adjustments; - private List _originals; /// /// Initializes a new instance of the class. @@ -25,19 +19,13 @@ public sealed class LevelSequenceOverriddenRule : Rule, IConfigWritable adjustments) { _adjustments = adjustments; - _originals = new List(); } public List GetConfigObject() => _adjustments; - protected override void OnPostGameCreated(GameContext gameContext) + protected override void OnPreGameCreated(GameContext gameContext) { - _originals = ReplaceExistingProperties(_adjustments); - } - - protected override void OnDeactivate(GameContext gameContext) - { - ReplaceExistingProperties(_originals); + ReplaceExistingProperties(_adjustments, gameContext); } private static void Patch(Harmony harmony) @@ -48,21 +36,22 @@ private static void Patch(Harmony harmony) prefix: new HarmonyMethod(typeof(LevelSequenceOverriddenRule), nameof(LevelSequenceConfiguration_GetSequenceDefinition_Prefix))); } + /// + /// Sets a safe sequence definition even if the active game type does not have one that extends to the current level. + /// private static bool LevelSequenceConfiguration_GetSequenceDefinition_Prefix(ref SequenceDefinition __result, int index, LevelSequence.GameType gameType) { var gameContext = Traverse.Create(typeof(GameHub)).Field("gameContext").Value; - - var gameTypeSequence = gameContext.levelSequenceConfiguration.sequenceDefinitions.GetSequenceFromId(gameType, out _); - if (index >= 0 && index < gameTypeSequence.Length) + var sequenceDefinitions = gameContext.levelSequenceConfiguration.sequenceDefinitions.GetSequenceFromId(gameType, out _); + if (index >= 0 && index < sequenceDefinitions.Length) { return true; } - var indexToReturn = gameContext.levelManager.GetLevelSequence().CurrentLevelIsLastLevel - ? gameTypeSequence.Length - 1 - : gameTypeSequence.Length - 3; + __result = gameContext.levelManager.GetLevelSequence().CurrentLevelIsLastLevel + ? sequenceDefinitions[sequenceDefinitions.Length - 1] + : sequenceDefinitions[sequenceDefinitions.Length - 3]; - __result = gameTypeSequence[indexToReturn]; return false; } @@ -70,18 +59,13 @@ private static bool LevelSequenceConfiguration_GetSequenceDefinition_Prefix(ref /// Replaces LevelSequence levels with predefined list. /// /// List of previous LevelSequence levels that are now replaced. - private static List ReplaceExistingProperties(List replacements) + private static List ReplaceExistingProperties(List replacements, GameContext gameContext) { - var levelManager = Resources.FindObjectsOfTypeAll().First(); - var levelSequence = Traverse.Create(levelManager).Field("levelSequence").Value; - var originals = Traverse.Create(levelSequence).Field("levels").Value; - var newlist = new List - { - originals[0], // We need the Entrance to match the current one or the game will crash when moving to the next level. - }; - newlist.AddRange(replacements); // Append user supplied levels - Traverse.Create(levelSequence).Field("levels").Value = newlist.ToArray(); - return originals.ToList().GetRange(1, 5); + var gsmLevelSequence = Traverse.Create(gameContext.gameStateMachine).Field("levelSequence").Value; + var originalSequence = Traverse.Create(gsmLevelSequence).Field("levels").Value; + Traverse.Create(gsmLevelSequence).Field("levels").Value = + replacements.Prepend(originalSequence[0]).ToArray(); + return originalSequence.ToList(); } } } From 5f4cd4cf74612ee7b2e258594674cfc9bfbdc4cd Mon Sep 17 00:00:00 2001 From: Edgar Orendain Date: Sun, 3 Apr 2022 20:01:58 -0700 Subject: [PATCH 3/5] WIP dump for new levels. --- HouseRules_Essentials/EssentialsMod.cs | 3 ++ .../HouseRules_Essentials.csproj | 3 ++ .../Rulesets/HiddenForestRuleset.cs | 30 +++++++++++++++++++ .../Rulesets/HiddenTemple1Ruleset.cs | 29 ++++++++++++++++++ .../Rulesets/HiddenTemple2Ruleset.cs | 30 +++++++++++++++++++ 5 files changed, 95 insertions(+) create mode 100644 HouseRules_Essentials/Rulesets/HiddenForestRuleset.cs create mode 100644 HouseRules_Essentials/Rulesets/HiddenTemple1Ruleset.cs create mode 100644 HouseRules_Essentials/Rulesets/HiddenTemple2Ruleset.cs diff --git a/HouseRules_Essentials/EssentialsMod.cs b/HouseRules_Essentials/EssentialsMod.cs index 8a53f7d9..835b7645 100644 --- a/HouseRules_Essentials/EssentialsMod.cs +++ b/HouseRules_Essentials/EssentialsMod.cs @@ -58,6 +58,9 @@ private static void RegisterRuleTypes() private static void RegisterRulesets() { HR.Rulebook.Register(Arachnophobia.Create()); + HR.Rulebook.Register(HiddenTemple1Ruleset.Create()); + HR.Rulebook.Register(HiddenTemple2Ruleset.Create()); + HR.Rulebook.Register(HiddenForestRuleset.Create()); HR.Rulebook.Register(LuckyDip.Create()); HR.Rulebook.Register(TheSwirlRuleset.Create()); HR.Rulebook.Register(BeatTheClockRuleset.Create()); diff --git a/HouseRules_Essentials/HouseRules_Essentials.csproj b/HouseRules_Essentials/HouseRules_Essentials.csproj index 06c9190a..811e801b 100644 --- a/HouseRules_Essentials/HouseRules_Essentials.csproj +++ b/HouseRules_Essentials/HouseRules_Essentials.csproj @@ -42,7 +42,10 @@ + + + diff --git a/HouseRules_Essentials/Rulesets/HiddenForestRuleset.cs b/HouseRules_Essentials/Rulesets/HiddenForestRuleset.cs new file mode 100644 index 00000000..f4914633 --- /dev/null +++ b/HouseRules_Essentials/Rulesets/HiddenForestRuleset.cs @@ -0,0 +1,30 @@ +namespace HouseRules.Essentials.Rulesets +{ + using System.Collections.Generic; + using DataKeys; + using HouseRules.Essentials.Rules; + using HouseRules.Types; + + internal static class HiddenForestRuleset + { + internal static Ruleset Create() + { + const string name = "Hidden Forest"; + const string description = "A never-before seen forest full of mysteries."; + + var levelSequenceOverriddenRule = new LevelSequenceOverriddenRule(new List + { + "ForestShopFloor", + "ForestFloor07", //medlarge ... maybe seen before... + "ForestShopFloor", + "ForestFloor08", //med/big + }); + + + return Ruleset.NewInstance( + name, + description, + levelSequenceOverriddenRule); + } + } +} diff --git a/HouseRules_Essentials/Rulesets/HiddenTemple1Ruleset.cs b/HouseRules_Essentials/Rulesets/HiddenTemple1Ruleset.cs new file mode 100644 index 00000000..70a1a0f3 --- /dev/null +++ b/HouseRules_Essentials/Rulesets/HiddenTemple1Ruleset.cs @@ -0,0 +1,29 @@ +namespace HouseRules.Essentials.Rulesets +{ + using System.Collections.Generic; + using HouseRules.Essentials.Rules; + using HouseRules.Types; + + internal static class HiddenTemple1Ruleset + { + internal static Ruleset Create() + { + const string name = "Hidden Temple: I"; + const string description = "Explore the legends of the first hidden temple."; + + var levelSequenceOverriddenRule = new LevelSequenceOverriddenRule(new List + { + "ElvenFloor14",//small + "ShopFloor02", + "ElvenFloor13",//medium + "ShopFloor02", + "ElvenFloor12",// big + }); + + return Ruleset.NewInstance( + name, + description, + levelSequenceOverriddenRule); + } + } +} diff --git a/HouseRules_Essentials/Rulesets/HiddenTemple2Ruleset.cs b/HouseRules_Essentials/Rulesets/HiddenTemple2Ruleset.cs new file mode 100644 index 00000000..4b0ac9d3 --- /dev/null +++ b/HouseRules_Essentials/Rulesets/HiddenTemple2Ruleset.cs @@ -0,0 +1,30 @@ +namespace HouseRules.Essentials.Rulesets +{ + using System.Collections.Generic; + using HouseRules.Essentials.Rules; + using HouseRules.Types; + + internal static class HiddenTemple2Ruleset + { + internal static Ruleset Create() + { + const string name = "Hidden Temple: II"; + const string description = "Explore the legends of the second hidden temple."; + + var levelSequenceOverriddenRule = new LevelSequenceOverriddenRule(new List + { + "ElvenFloor14",//small + "ShopFloor02", + "ElvenFloor16",//med + "ShopFloor02", + "ElvenFloor17",//med-large + }); + + + return Ruleset.NewInstance( + name, + description, + levelSequenceOverriddenRule); + } + } +} From df9e15b16c0d4ae2f136bda42c93d45fb656a9cf Mon Sep 17 00:00:00 2001 From: Edgar Orendain Date: Tue, 5 Apr 2022 14:37:53 -0700 Subject: [PATCH 4/5] Remove non-hidden map and rearrange levels into rulesets. --- HouseRules_Essentials/EssentialsMod.cs | 1 - .../HouseRules_Essentials.csproj | 1 - .../Rulesets/HiddenForestRuleset.cs | 30 ------------------- .../Rulesets/HiddenTemple1Ruleset.cs | 6 ++-- .../Rulesets/HiddenTemple2Ruleset.cs | 8 ++--- 5 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 HouseRules_Essentials/Rulesets/HiddenForestRuleset.cs diff --git a/HouseRules_Essentials/EssentialsMod.cs b/HouseRules_Essentials/EssentialsMod.cs index 835b7645..2c55d973 100644 --- a/HouseRules_Essentials/EssentialsMod.cs +++ b/HouseRules_Essentials/EssentialsMod.cs @@ -60,7 +60,6 @@ private static void RegisterRulesets() HR.Rulebook.Register(Arachnophobia.Create()); HR.Rulebook.Register(HiddenTemple1Ruleset.Create()); HR.Rulebook.Register(HiddenTemple2Ruleset.Create()); - HR.Rulebook.Register(HiddenForestRuleset.Create()); HR.Rulebook.Register(LuckyDip.Create()); HR.Rulebook.Register(TheSwirlRuleset.Create()); HR.Rulebook.Register(BeatTheClockRuleset.Create()); diff --git a/HouseRules_Essentials/HouseRules_Essentials.csproj b/HouseRules_Essentials/HouseRules_Essentials.csproj index 811e801b..560c468c 100644 --- a/HouseRules_Essentials/HouseRules_Essentials.csproj +++ b/HouseRules_Essentials/HouseRules_Essentials.csproj @@ -42,7 +42,6 @@ - diff --git a/HouseRules_Essentials/Rulesets/HiddenForestRuleset.cs b/HouseRules_Essentials/Rulesets/HiddenForestRuleset.cs deleted file mode 100644 index f4914633..00000000 --- a/HouseRules_Essentials/Rulesets/HiddenForestRuleset.cs +++ /dev/null @@ -1,30 +0,0 @@ -namespace HouseRules.Essentials.Rulesets -{ - using System.Collections.Generic; - using DataKeys; - using HouseRules.Essentials.Rules; - using HouseRules.Types; - - internal static class HiddenForestRuleset - { - internal static Ruleset Create() - { - const string name = "Hidden Forest"; - const string description = "A never-before seen forest full of mysteries."; - - var levelSequenceOverriddenRule = new LevelSequenceOverriddenRule(new List - { - "ForestShopFloor", - "ForestFloor07", //medlarge ... maybe seen before... - "ForestShopFloor", - "ForestFloor08", //med/big - }); - - - return Ruleset.NewInstance( - name, - description, - levelSequenceOverriddenRule); - } - } -} diff --git a/HouseRules_Essentials/Rulesets/HiddenTemple1Ruleset.cs b/HouseRules_Essentials/Rulesets/HiddenTemple1Ruleset.cs index 70a1a0f3..087c5ad2 100644 --- a/HouseRules_Essentials/Rulesets/HiddenTemple1Ruleset.cs +++ b/HouseRules_Essentials/Rulesets/HiddenTemple1Ruleset.cs @@ -13,11 +13,11 @@ internal static Ruleset Create() var levelSequenceOverriddenRule = new LevelSequenceOverriddenRule(new List { - "ElvenFloor14",//small + "ElvenFloor16",// relative size: 2 "ShopFloor02", - "ElvenFloor13",//medium + "ElvenFloor12",// relative size: 5 "ShopFloor02", - "ElvenFloor12",// big + "ElvenFloor13",// relative size: 4 }); return Ruleset.NewInstance( diff --git a/HouseRules_Essentials/Rulesets/HiddenTemple2Ruleset.cs b/HouseRules_Essentials/Rulesets/HiddenTemple2Ruleset.cs index 4b0ac9d3..6c6511ba 100644 --- a/HouseRules_Essentials/Rulesets/HiddenTemple2Ruleset.cs +++ b/HouseRules_Essentials/Rulesets/HiddenTemple2Ruleset.cs @@ -13,11 +13,11 @@ internal static Ruleset Create() var levelSequenceOverriddenRule = new LevelSequenceOverriddenRule(new List { - "ElvenFloor14",//small + "ElvenFloor14",// relative size: 1 "ShopFloor02", - "ElvenFloor16",//med - "ShopFloor02", - "ElvenFloor17",//med-large + "ForestFloor08", // relative size: 6 + "ForestShopFloor", + "ElvenFloor17",// relative size: 3 }); From 5debdc6b4d6822cbc1a39bd5fb2a4a102d8d267f Mon Sep 17 00:00:00 2001 From: Edgar Orendain Date: Sun, 10 Apr 2022 14:46:04 -0700 Subject: [PATCH 5/5] Replace names of Demeo paths with agnostic VR and PC names. --- Common/Common.csproj | 14 +++++------ .../HouseRules_Configuration.csproj | 18 +++++++------- HouseRules_Core/HouseRules_Core.csproj | 16 ++++++------- .../HouseRules_Essentials.csproj | 16 ++++++------- RoomCode/RoomCode.csproj | 10 ++++---- RoomFinder/RoomFinder.csproj | 24 +++++++++---------- SkipIntro/SkipIntro.csproj | 12 +++++----- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/Common/Common.csproj b/Common/Common.csproj index 5d00913e..39a271da 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -33,25 +33,25 @@ - $(SteamDemeoDir)\MelonLoader\0Harmony.dll + $(DemeoVrDir)\MelonLoader\0Harmony.dll - $(SteamDemeoDir)\MelonLoader\MelonLoader.dll + $(DemeoVrDir)\MelonLoader\MelonLoader.dll - $(SteamDemeoDir)\demeo_Data\Managed\Assembly-CSharp.dll + $(DemeoVrDir)\demeo_Data\Managed\Assembly-CSharp.dll - $(SteamDemeoDir)\demeo_Data\Managed\Unity.TextMeshPro.dll + $(DemeoVrDir)\demeo_Data\Managed\Unity.TextMeshPro.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.PhysicsModule.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.PhysicsModule.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.UI.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.UI.dll diff --git a/HouseRules_Configuration/HouseRules_Configuration.csproj b/HouseRules_Configuration/HouseRules_Configuration.csproj index c4c669ac..907f4996 100644 --- a/HouseRules_Configuration/HouseRules_Configuration.csproj +++ b/HouseRules_Configuration/HouseRules_Configuration.csproj @@ -33,26 +33,26 @@ - $(SteamDemeoDir)\MelonLoader\0Harmony.dll + $(DemeoVrDir)\MelonLoader\0Harmony.dll - $(SteamDemeoDir)\demeo_Data\Managed\Assembly-CSharp.dll + $(DemeoVrDir)\demeo_Data\Managed\Assembly-CSharp.dll - $(SteamDemeoDir)\MelonLoader\MelonLoader.dll + $(DemeoVrDir)\MelonLoader\MelonLoader.dll - $(SteamDemeoDir)\demeo_Data\Managed\Unity.TextMeshPro.dll + $(DemeoVrDir)\demeo_Data\Managed\Unity.TextMeshPro.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.PhysicsModule.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.PhysicsModule.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.UI.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.UI.dll @@ -78,7 +78,7 @@ - - + + diff --git a/HouseRules_Core/HouseRules_Core.csproj b/HouseRules_Core/HouseRules_Core.csproj index 40aad6cf..c7150c86 100644 --- a/HouseRules_Core/HouseRules_Core.csproj +++ b/HouseRules_Core/HouseRules_Core.csproj @@ -33,23 +33,23 @@ - $(SteamDemeoDir)\MelonLoader\0Harmony.dll + $(DemeoVrDir)\MelonLoader\0Harmony.dll - $(SteamDemeoDir)\demeo_Data\Managed\Assembly-CSharp.dll + $(DemeoVrDir)\demeo_Data\Managed\Assembly-CSharp.dll - $(SteamDemeoDir)\MelonLoader\MelonLoader.dll + $(DemeoVrDir)\MelonLoader\MelonLoader.dll - $(SteamDemeoDir)\demeo_Data\Managed\PhotonRealtime.dll + $(DemeoVrDir)\demeo_Data\Managed\PhotonRealtime.dll - $(SteamDemeoDir)\demeo_Data\Managed\PhotonUnityNetworking.dll + $(DemeoVrDir)\demeo_Data\Managed\PhotonUnityNetworking.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll @@ -72,7 +72,7 @@ - - + + diff --git a/HouseRules_Essentials/HouseRules_Essentials.csproj b/HouseRules_Essentials/HouseRules_Essentials.csproj index 06c9190a..c26437c1 100644 --- a/HouseRules_Essentials/HouseRules_Essentials.csproj +++ b/HouseRules_Essentials/HouseRules_Essentials.csproj @@ -88,20 +88,20 @@ - $(SteamDemeoDir)\MelonLoader\0Harmony.dll + $(DemeoVrDir)\MelonLoader\0Harmony.dll - $(SteamDemeoDir)\demeo_Data\Managed\Assembly-CSharp.dll + $(DemeoVrDir)\demeo_Data\Managed\Assembly-CSharp.dll - $(SteamDemeoDir)\MelonLoader\MelonLoader.dll + $(DemeoVrDir)\MelonLoader\MelonLoader.dll - $(SteamDemeoDir)\demeo_Data\Managed\PhotonUnityNetworking.dll + $(DemeoVrDir)\demeo_Data\Managed\PhotonUnityNetworking.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll @@ -115,7 +115,7 @@ - - + + - \ No newline at end of file + diff --git a/RoomCode/RoomCode.csproj b/RoomCode/RoomCode.csproj index 656f7b98..1f568cac 100644 --- a/RoomCode/RoomCode.csproj +++ b/RoomCode/RoomCode.csproj @@ -33,13 +33,13 @@ - $(SteamDemeoDir)\MelonLoader\0Harmony.dll + $(DemeoVrDir)\MelonLoader\0Harmony.dll - $(SteamDemeoDir)\demeo_Data\Managed\Assembly-CSharp.dll + $(DemeoVrDir)\demeo_Data\Managed\Assembly-CSharp.dll - $(SteamDemeoDir)\MelonLoader\MelonLoader.dll + $(DemeoVrDir)\MelonLoader\MelonLoader.dll @@ -52,7 +52,7 @@ - - + + diff --git a/RoomFinder/RoomFinder.csproj b/RoomFinder/RoomFinder.csproj index 348b1023..717501ad 100644 --- a/RoomFinder/RoomFinder.csproj +++ b/RoomFinder/RoomFinder.csproj @@ -33,34 +33,34 @@ - $(SteamDemeoDir)\MelonLoader\0Harmony.dll + $(DemeoVrDir)\MelonLoader\0Harmony.dll - $(SteamDemeoDir)\demeo_Data\Managed\Assembly-CSharp.dll + $(DemeoVrDir)\demeo_Data\Managed\Assembly-CSharp.dll - $(SteamDemeoDir)\MelonLoader\MelonLoader.dll + $(DemeoVrDir)\MelonLoader\MelonLoader.dll - $(SteamDemeoDir)\demeo_Data\Managed\Photon3Unity3D.dll + $(DemeoVrDir)\demeo_Data\Managed\Photon3Unity3D.dll - $(SteamDemeoDir)\demeo_Data\Managed\PhotonRealtime.dll + $(DemeoVrDir)\demeo_Data\Managed\PhotonRealtime.dll - $(SteamDemeoDir)\demeo_Data\Managed\PhotonUnityNetworking.dll + $(DemeoVrDir)\demeo_Data\Managed\PhotonUnityNetworking.dll - $(SteamDemeoDir)\demeo_Data\Managed\Unity.TextMeshPro.dll + $(DemeoVrDir)\demeo_Data\Managed\Unity.TextMeshPro.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.PhysicsModule.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.PhysicsModule.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.UI.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.UI.dll @@ -77,7 +77,7 @@ - - + + diff --git a/SkipIntro/SkipIntro.csproj b/SkipIntro/SkipIntro.csproj index 8f23074c..705fad7e 100644 --- a/SkipIntro/SkipIntro.csproj +++ b/SkipIntro/SkipIntro.csproj @@ -35,16 +35,16 @@ - $(SteamDemeoDir)\MelonLoader\0Harmony.dll + $(DemeoVrDir)\MelonLoader\0Harmony.dll - $(SteamDemeoDir)\demeo_Data\Managed\Assembly-CSharp.dll + $(DemeoVrDir)\demeo_Data\Managed\Assembly-CSharp.dll - $(SteamDemeoDir)\MelonLoader\MelonLoader.dll + $(DemeoVrDir)\MelonLoader\MelonLoader.dll - $(SteamDemeoDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll + $(DemeoVrDir)\demeo_Data\Managed\UnityEngine.CoreModule.dll @@ -54,7 +54,7 @@ - - + +