Merge pull request #28 from Acher0ns/Survivors-Of-The-Void

Fixes for the Survivors of the Void DLC Update
Aquatic-Labs · Mar 5, 2022 · 91cea7e · 91cea7e
2 parents 6a83ae4 + c112f54
commit 91cea7e
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 27 deletions.
diff --git a/Menus/Items.cs b/Menus/Items.cs
@@ -372,6 +372,7 @@ public static WeightedSelection<List<ItemIndex>> BuildRollItemsDropTable()
 
 
 
+
             weightedSelection.AddChoice(tier1, 63.5f);
             weightedSelection.AddChoice(tier2, 27f);
             weightedSelection.AddChoice(tier3, 3.5f);

diff --git a/Menus/Player.cs b/Menus/Player.cs
@@ -66,6 +66,7 @@ public uint CoinsToGive
         public Button toggleAimbot;
         public Button toggleGod;
         public Button toggleSkillCD;
+        public Button respawn;
         public Button unlockAll;
 
         public Player() : base(player)
@@ -87,7 +88,8 @@ public Player() : base(player)
                 toggleAimbot = new Button(new TogglableButton(this, 8, "AIMBOT : OFF", "AIMBOT : ON", ToggleAimbot, ToggleAimbot));
                 toggleGod = new Button(new TogglableButton(this, 9, "GOD MODE : OFF", "GOD MODE : ON", ToggleGodMode, ToggleGodMode));
                 toggleSkillCD = new Button(new TogglableButton(this, 10, "INFINITE SKILLS : OFF", "INFINITE SKILLS : ON", ToggleSkillCD, ToggleSkillCD));
-                unlockAll = new Button(new TogglableButton(this, 11, "UNLOCK ALL", "CONFIRM?", DoNothing, UnlockAll));
+                respawn = new Button(new NormalButton(this, 11, "RESPAWN", respawnPlayer));
+                unlockAll = new Button(new TogglableButton(this, 12, "UNLOCK ALL", "CONFIRM?", DoNothing, UnlockAll));
 
                 AddButtons(new List<Button>()
                 {
@@ -101,6 +103,7 @@ public Player() : base(player)
                     toggleAimbot,
                     toggleGod,
                     toggleSkillCD,
+                    respawn,
                     unlockAll
                 });
                 SetActivatingButton(Utility.FindButtonById(0, 1));
@@ -152,6 +155,11 @@ public static void ToggleSkillCD()
             SkillToggle = !SkillToggle;
         }
 
+        public static void respawnPlayer()
+        {
+            UmbraMenu.LocalPlayer.GetComponent<CharacterMaster>().RespawnExtraLife();
+        }
+
         public static void RemoveAllBuffs()
         {
             foreach (BuffIndex buffIndex in UmbraMenu.buffs)
@@ -245,7 +253,7 @@ public static void EnableGodMode()
                     {
                         // works
                         // Buff
-                        UmbraMenu.LocalPlayerBody.AddBuff(BuffCatalog.FindBuffIndex("Intangible"));
+                        //UmbraMenu.LocalPlayerBody.AddBuff(BuffDef..FindBuffIndex("Intangible"));
                         break;
                     }
 

diff --git a/Menus/Render.cs b/Menus/Render.cs
@@ -207,7 +207,7 @@ public static void Interactables()
                     var chest = purchaseInteraction?.gameObject.GetComponent<ChestBehavior>();
                     if (chest)
                     {
-                        dropName = Util.GenerateColoredString(Language.GetString(chest.GetField<PickupIndex>("dropPickup").GetPickupNameToken()), chest.GetField<PickupIndex>("dropPickup").GetPickupColor());
+                        dropName = Util.GenerateColoredString(Language.GetString(chest.dropPickup.GetPickupNameToken()), chest.dropPickup.GetPickupColor());
                     }
                     float distanceToObject = Vector3.Distance(Camera.main.transform.position, purchaseInteraction.transform.position);
                     Vector3 Position = Camera.main.WorldToScreenPoint(purchaseInteraction.transform.position);

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.2")]
-[assembly: AssemblyFileVersion("2.0.2")]
+[assembly: AssemblyVersion("2.0.3")]
+[assembly: AssemblyFileVersion("2.0.3")]
diff --git a/README.md b/README.md
@@ -15,7 +15,8 @@ and was merged with [Lodington's](https://github.com/Lodington/) unofficial fork
 This menu is for testing/personal fun. I do not condone the use of this menu in competitive modes such as the Prismatic Trials nor do I condone the use of this menu if it harms the experience of other players in any way. Thank you.
 
 
-# Just released Umbra-Injector to auto inject/update Umbra Menu. Check it out [here](https://github.com/Acher0ns/Umbra-Menu-Injector)
+### Check out Umbra-Injector to auto inject/update Umbra Menu. Check it out [here](https://github.com/Acher0ns/Umbra-Menu-Injector)
+# Updated for Survivors of the Void!
 # Features
 
 - [ ] Unlock All
@@ -149,15 +150,18 @@ pause
 5. Click browse. The required resources are found in > `\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed`
 ```
 1) Assembly-CSharp.dll
-2) HGCSharpUtils
-3) netstandard.dll
-4) Rewired_Core.dll
-5) System.dll
-6) UnityEngine.CoreModule.dll
-7) UnityEngine.dll
-8) UnityEngine.IMGUIModule.dll
-9) UnityEngine.Networking.dll
-10) UnityEngine.TextRenderingModule.dll
+2) com.unity.multiplayer.hlapi.Runtime.dll
+3) HGCSharpUtils
+4) netstandard.dll
+5) Rewired_Core.dll
+6) RoR2.dll
+7) System.dll
+8) UnityEngine.CoreModule.dll
+9) UnityEngine.dll
+10) UnityEngine.IMGUIModule.dll
+11) UnityEngine.InputLegacyModule.dll
+12) UnityEngine.TextCoreModule.dll
+13) UnityEngine.TextRenderingModule.dll
 ```
 6. You will also have to add ```Octokit.dll``` that is in the project's source folder. `Umbra-Mod-Menu-master\Octokit.dll`. This is used to check for updates.
 
@@ -166,6 +170,14 @@ pause
 
 
 # Changelog:
+## 3/4/2022 v2.0.3:
+- [ ] Fixed to the extent where the game won't crash anymore after injecting.
+- [ ] Added all new Void Items to the ItemList Pool.
+- [ ] Fixed the chest ESP not applying properly.
+- [ ] Temporarily Removed Intangible Godmode.
+- [ ] Added player respawn button.
+
+
 ## 6/11/2021 v2.0.2:
 - [ ] Complete update fixing everything Anniversary Update Broke.
 - [ ] Fix Unlock All so that profile becomes 100% complete

diff --git a/UmbraMenu.cs b/UmbraMenu.cs
@@ -12,7 +12,9 @@ public class UmbraMenu : MonoBehaviour
     {
         public const string
             NAME = "U M B R A",
-            VERSION = "2.0.2";
+            VERSION = "2.0.3";
+
+
 
         public static string SETTINGSPATH = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), $"UmbraMenu/settings-{VERSION}.ini");
 
@@ -320,7 +322,7 @@ public static void GetCharacter()
                 {
                     LocalNetworkUser = null;
 
-                    foreach (NetworkUser readOnlyInstance in NetworkUser.readOnlyInstancesList)   
+                    foreach (NetworkUser readOnlyInstance in NetworkUser.readOnlyLocalPlayersList)   
                     {
                         if (readOnlyInstance.isLocalPlayer)
                         {

diff --git a/UmbraMenu.csproj b/UmbraMenu.csproj
@@ -112,10 +112,15 @@
     <EmbeddedResource Include="Octokit.dll" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Assembly-CSharp">
+    <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="HGCSharpUtils">
+    <Reference Include="com.unity.multiplayer-hlapi.Runtime">
+      <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\com.unity.multiplayer-hlapi.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="HGCSharpUtils, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\HGCSharpUtils.dll</HintPath>
     </Reference>
     <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -126,25 +131,37 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>.\Octokit.dll</HintPath>
     </Reference>
-    <Reference Include="Rewired_Core">
+    <Reference Include="Rewired_Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\Rewired_Core.dll</HintPath>
     </Reference>
+    <Reference Include="RoR2">
+      <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\RoR2.dll</HintPath>
+    </Reference>
     <Reference Include="System">
       <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\System.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine">
+    <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.CoreModule">
+    <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.IMGUIModule">
+    <Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.Networking">
-      <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\UnityEngine.Networking.dll</HintPath>
+    <Reference Include="UnityEngine.InputLegacyModule">
+      <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.TextRenderingModule">
+    <Reference Include="UnityEngine.TextCoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\UnityEngine.TextCoreModule.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Programs\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
     </Reference>
   </ItemGroup>

diff --git a/Utility.cs b/Utility.cs
@@ -167,13 +167,15 @@ public static List<ItemIndex> GetItems()
             List<ItemIndex> tier2 = new List<ItemIndex>();
             List<ItemIndex> tier1 = new List<ItemIndex>();
             List<ItemIndex> lunar = new List<ItemIndex>();
+            List<ItemIndex> voidt = new List<ItemIndex>();
             List<ItemIndex> other = new List<ItemIndex>();
 
             Color32 bossColor = ColorCatalog.GetColor(ColorCatalog.ColorIndex.BossItem);
             Color32 tier3Color = ColorCatalog.GetColor(ColorCatalog.ColorIndex.Tier3Item);
             Color32 tier2Color = ColorCatalog.GetColor(ColorCatalog.ColorIndex.Tier2Item);
             Color32 tier1Color = ColorCatalog.GetColor(ColorCatalog.ColorIndex.Tier1Item);
             Color32 lunarColor = ColorCatalog.GetColor(ColorCatalog.ColorIndex.LunarItem);
+            Color32 voidColor = ColorCatalog.GetColor(ColorCatalog.ColorIndex.VoidItem);
 
             foreach (ItemIndex itemIndex in ItemCatalog.allItems)
             {
@@ -197,6 +199,10 @@ public static List<ItemIndex> GetItems()
                 else if (itemColor.Equals(lunarColor)) // lunar
                 {
                     lunar.Add(itemIndex);
+                }                
+                else if (itemColor.Equals(voidColor)) // Void
+                {
+                    voidt.Add(itemIndex);
                 }
                 else // Other
                 {
@@ -206,7 +212,7 @@ public static List<ItemIndex> GetItems()
 
             UmbraMenu.bossItems = boss;
             UmbraMenu.unreleasedItems = other;
-            var result = items.Concat(boss).Concat(tier3).Concat(tier2).Concat(tier1).Concat(lunar).Concat(other).ToList();
+            var result = items.Concat(boss).Concat(tier3).Concat(tier2).Concat(tier1).Concat(lunar).Concat(voidt).Concat(other).ToList();
             return result;
         }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -372,6 +372,7 @@ public static WeightedSelection<List<ItemIndex>> BuildRollItemsDropTable()




		weightedSelection.AddChoice(tier1, 63.5f);
		weightedSelection.AddChoice(tier2, 27f);
		weightedSelection.AddChoice(tier3, 3.5f);
Expand Down