Skip to content

Commit

Permalink
fix hints for GreeneArticles, need to double check and fix the wiki too
Browse files Browse the repository at this point in the history
also some cleanup in the installer
  • Loading branch information
Die4Ever committed Sep 11, 2023
1 parent 9a050ef commit 9f9fa8c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
8 changes: 4 additions & 4 deletions DXRModules/DeusEx/Classes/DXREvents.uc
Original file line number Diff line number Diff line change
Expand Up @@ -2781,13 +2781,13 @@ static simulated function string GetBingoGoalHelpText(string event,int mission)
case "GreeneArticles":
msg="Read enough news articles written by Joe Greene of the Midnight Sun. ";
if (mission<=1){
msg=msg$"There are two different articles on Liberty Island and in UNATCO HQ.";
msg=msg$"There's one on Liberty Island, and one in UNATCO HQ.";
} else if (mission<=2){
msg=msg$"There is an article somewhere around the NSF warehouse as well as in the Underworld bar.";
msg=msg$"There is an article somewhere around the NSF warehouse.";
} else if (mission<=3){
msg=msg$"There is a single article in Brooklyn Bridge Station, in the helibase, and in the 747.";
msg=msg$"There are 3 copies of the same article: in Brooklyn Bridge Station, in the helibase, and in the 747.";
} else if (mission<=8){
msg=msg$"There is an article in the streets of Hell's Kitchen.";
msg=msg$"There is an article in the streets of Hell's Kitchen and in the bar.";
}
return msg;
case "MoonBaseNews":
Expand Down
6 changes: 3 additions & 3 deletions installer/GUI/InstallerWindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ def initWindow(self):
self.lastprogress = ''
self.root.title("Deus Ex Randomizer Installer")

dxvk_default = IsWindows() and CheckVulkan()
dxvk_default = CheckVulkan()# this takes a second or so
ogl2_default = dxvk_default or not IsWindows()

scroll = ScrollableFrame(self.root, width=self.width, height=self.height, mousescroll=1)
self.frame = scroll.frame
Expand Down Expand Up @@ -75,8 +76,7 @@ def initWindow(self):
else:
self.dxvkval = DummyCheckbox()

useOgl2 = dxvk_default or not IsWindows()
self.ogl2val = BooleanVar(master=self.frame, value=useOgl2)
self.ogl2val = BooleanVar(master=self.frame, value=ogl2_default)
self.ogl2 = Checkbutton(self.frame, text="Updated OpenGL 2.0 Renderer", variable=self.ogl2val)
Hovertip(self.ogl2, "Updated OpenGL Renderer for modern systems. An alternative to using D3D10 or D3D9.")
self.ogl2.grid(column=1,row=row, sticky='SW', padx=pad, pady=pad)
Expand Down
2 changes: 2 additions & 0 deletions installer/Install/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ def IsWindows() -> bool:
return os.name == 'nt'

def CheckVulkan() -> bool:
if not IsWindows():
return False # no easy way to detect Vulkan on Linux, they don't need DXVK anyways
try:
info('CheckVulkan')
ret = subprocess.run(['vulkaninfo', '--summary'], text=True, capture_output=True, timeout=30)
Expand Down

0 comments on commit 9f9fa8c

Please sign in to comment.