Update Linux installer message re Wine/Proton

httpGUI.py

@@ -857,6 +857,7 @@ def startInstallHandler(requestData):
 					retval['partialReinstallDetected'] = partialReinstallDetected
 					retval['scriptNeedsUpdate'] = scriptNeedsUpdate
 					retval['isWine'] = fullInstallConfiguration.isWine
+					retval['isSteam'] = fullInstallConfiguration.isSteam
 				return retval
 
 			# requestData: Not necessary - will be ignored

httpGUI/installer.html

@@ -211,15 +211,51 @@ <h4><strong>The below folders were not uninstalled properly.<br><br>Please manua
 										</section>
 										<br><br>
 										<div v-if="metaInfo !== null">
-										<div class="alert alert-danger" role="alert"
-										v-if="	selectedSubMod !== null &&
-												selectedSubMod.family === 'higurashi' &&
-												metaInfo.operatingSystem === 'linux'"><strong>
-												Warning: GNOME/MATE Desktop (the default on Ubuntu and Fedora Linux) will cause Higurashi Ep.4 and upwards to <strong>crash the entire desktop when you start the game.</strong>
-												This happens even on the base game (without any mods applied).<br><br>
-												A workaround for this is to install XFCE desktop (please look up instructions for your specific operating system).<br><br>
-												Please make sure you can launch the base game before applying any mods (please don't make any saves on the base game as they are not compatible with the mod).
-										</strong></div>
+										<div v-if="selectedSubMod !== null && selectedSubMod.family === 'higurashi' && metaInfo.operatingSystem === 'linux'">
+											<h3>Linux PLEASE READ</h3>
+											There are two ways to run the game on Linux:
+											<ol class="installer-ordered">
+												<li>Running the <strong>Native Linux version of the game</strong></li>
+												<li>Running the <strong>Windows version of the game using Proton (Steam/Mangagamer/GOG) or Wine (Mangagamer/GOG)</strong></li>
+											</ol>
+											<br>
+
+											<span class="border border-primary">Your game is detected as: </span>
+											<strong class="installer-text-border" v-if="installPathValid">
+												{{ isWine ? (isSteam ? "2. Proton" : "2. Wine/Proton") : "1. Native Linux" }}
+											</strong>
+											<strong class="installer-text-border" v-else>
+												Install path not yet selected or auto-detected! Please select it below!
+											</strong>
+											<br><br>
+
+											As some users have issues with the Native Linux version of the game, we recommend the following:
+											<br>
+											<ul class="installer-bullets">
+												<li>
+													<strong>If you bought from Steam</strong>, it is suggested you enable Proton compatibility mode before installing the mod.
+												</li>
+												<li>
+													<strong>If you bought from GOG/Mangagamer:</strong>
+													<ul class="installer-bullets">
+														<li>We suggest trying the Native Linux version of the game first</li>
+														<li>If you have problems with the native version, you can try Wine (plain Wine, using Lutris, or using Minigalaxy for GOG).</li>
+														<li>You might only encounter issues with the Native version when reaching Chapter 5 onwards</li>
+													</ul>
+												</li>
+											</ul>
+											Please visit <a href="https://07th-mod.com/wiki/Higurashi/Higurashi-Part-1---Voice-and-Graphics-Patch/">our wiki's Higurashi install instructions page</a>, then click the <strong>"Linux/Proton/Wine" tab</strong> for instructions on <strong>how to enable/disable Proton</strong> and general <strong>information on Wine/Proton</strong>.
+											<br><br>
+
+											<div class="alert alert-danger" role="alert">
+												<strong>
+													Warning: Some GNOME/MATE Desktop users (the default on Ubuntu and Fedora Linux) report Higurashi Ep.4 and upwards will <strong>crash the entire desktop when you start the game.</strong>
+													This happens even on the base game (without any mods applied).<br><br>
+													A workaround for this is to install XFCE desktop (please look up instructions for your specific operating system).<br><br>
+													Please make sure you can launch the base game before applying any mods (please don't make any saves on the base game as they are not compatible with the mod).
+												</strong>
+											</div>
+										</div>
 										<div class="alert alert-warning" role="alert" v-if="!metaInfo.installAlreadyInProgress && metaInfo.lockFileExists"><strong>
 											Warning: It appears an install is already in progress, or the last install was closed unexpectedly.<br>
 											Please double check that there is only one console window open, and the install is not already running.<br>
@@ -621,7 +657,7 @@ <h4 class="uppercase mt40">Please confirm your install settings:</h4>
 																</div>
 															</strong>
 														</div>
-														<h4 class="uppercase mt40">Start The Install</h4>
+														<h4 class="uppercase mt40">Start The Install {{ isWine ? "(Wine/Proton)" : "" }}</h4>
 														<hr>
 														<ul class="tabs button-tabs" v-show="selectedSubMod!==null">
 															<li><div class="tab-title" v-on:click=doInstall() style="background: red">

httpGUI/python-patcher-lib.js

@@ -194,7 +194,8 @@ window.onload = function onWindowLoaded() {
       installDataLoaded: false,
       TIMEOUT_AUTO_DETECT_PATHS: 15,
       gamePathsXHR: null, //The last gamePaths XMLHttpRequest, or null if none exists
-      isWine: false // Set true if game was detected as using Wine or Proton
+      isWine: false, // Set true if game was detected as using Wine or Proton
+      isSteam: false // True if game was installed by Steam (If the game cannot have Steam, set to false)
     },
     methods: {
       doInstall(deleteVersionInformation) {
@@ -269,6 +270,7 @@ Continue install anyway?`)) {
             app.numUpdatesRequired = responseData.numUpdatesRequired;
             app.fullUpdateRequired = responseData.fullUpdateRequired;
             app.isWine = responseData.isWine;
+            app.isSteam = responseData.isSteam;
             if (responseData.partialReinstallDetected) {
               alert("WARNING: It appears you re-installed the game without fully deleting the game folder. If you wish to update or re-install, you MUST click the\n'RE-INSTALL FROM SCRATCH' button at the bottom of this page, otherwise the mod may not work!\n\nFor more info, see Install Instructions - Uninstalling Games:\nhttps://07th-mod.com/wiki/Higurashi/Higurashi-Part-1---Voice-and-Graphics-Patch/#uninstalling-games\n\nIf this message incorrect (you did not partially re-install the game), ignore this message, and let the mod team know.");
             }

httpGUI/style.css

@@ -80,6 +80,20 @@ they have zero height. This forces the height to some valid value*/
     margin-bottom: 10px;
 }
 
+.installer-ordered {
+    list-style: decimal;
+    margin-left: 40px;
+    margin-top: 5px;
+    margin-bottom: 10px;
+}
+
+.installer-text-border {
+    border-style: solid;
+    border-width: 2px;
+    border-radius: 5px;
+    padding: 4px;
+}
+
 .rendered-markdown h1 {
     text-transform: uppercase;
     letter-spacing: 17px;