v2.6.2.5 Beta Merge pull request #674 from Die4Ever/develop

v2.6.2.5 Beta
Die4Ever · Mar 31, 2024 · a7c83a4 · a7c83a4
2 parents 28748dd + a457adf
commit a7c83a4
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 4 deletions.
diff --git a/DXRCore/DeusEx/Classes/DXRVersion.uc b/DXRCore/DeusEx/Classes/DXRVersion.uc
@@ -5,7 +5,7 @@ simulated static function CurrentVersion(optional out int major, optional out in
     major=2;
     minor=6;
     patch=2;
-    build=4;//build can't be higher than 99
+    build=5;//build can't be higher than 99
 }
 
 simulated static function bool VersionIsStable()

diff --git a/DXRCore/DeusEx/Classes/DXRando.uc b/DXRCore/DeusEx/Classes/DXRando.uc
@@ -118,6 +118,11 @@ function DXRInit()
     RandoEnter();
 }
 
+simulated event PreTravel()
+{
+    default.dxr = None;// clear the singleton reference
+}
+
 function CheckConfig()
 {
     local int i;

diff --git a/DeusEx.u b/DeusEx.u
diff --git a/GMDXRandomizer.u b/GMDXRandomizer.u
diff --git a/HXRandomizer.u b/HXRandomizer.u
diff --git a/RevRandomizer.u b/RevRandomizer.u
diff --git a/VMDRandomizer.u b/VMDRandomizer.u
diff --git a/installer/GUI/InstallerWindow.py b/installer/GUI/InstallerWindow.py
@@ -15,7 +15,10 @@ def initWindow(self):
         self.width = 350
         self.height = 500
         self.lastprogress = ''
-        self.root.title("Deus Ex Randomizer " + GetVersion() + " Installer")
+        if IsVanillaFixer():
+            self.root.title("DXR Vanilla Fixer " + GetVersion())
+        else:
+            self.root.title("DXRando " + GetVersion() + " Installer")
 
         self.dxvk_default = CheckVulkan()# this takes a second or so
         self.ogl2_default = self.dxvk_default or not IsWindows()
@@ -114,7 +117,7 @@ def InitFlavorSettings(self, f: str, row, pad) -> int:
             v = BooleanVar(master=self.frame, value=IsVanillaFixer())
             settings['ZeroRando'] = v
             c = Checkbutton(self.frame, text="Default to Zero Rando mode for "+f, variable=v)
-            Hovertip(c, "This retains the vanilla menu experience for your first launch.\nAnd also sets Zero Rando mode as your default game mode for a new game.")
+            Hovertip(c, "This retains the vanilla menu experience for your first launch.\nAnd also sets Zero Rando mode as your default game mode for a new game.\nYou can change this once you get into the game with the Rando menu.")
             c.grid(column=1,row=row, sticky='SW', padx=pad*10, pady=pad)
             self.FixColors(c)
             row+=1
@@ -179,7 +182,7 @@ def LDDPCheckbox(self, row, padx, pady):
     def GlobalFixes(self, row, pad):
         # engine.dll speedup fix, this is global
         self.speedupfixval = BooleanVar(master=self.frame, value=True)
-        self.speedupfix = Checkbutton(self.frame, text="Apply Engine.dll speedup fix to support higher frame rates.", variable=self.speedupfixval)
+        self.speedupfix = Checkbutton(self.frame, text="Apply Engine.dll speedup fix\nto support higher frame rates.", variable=self.speedupfixval)
         self.speedupfix.grid(column=1,row=row, sticky='SW', padx=pad, pady=pad)
         Hovertip(self.speedupfix, "Fixes issues with high frame rates.")
         self.FixColors(self.speedupfix)