v2.7 Merge pull request #717 from Die4Ever/develop

v2.7

BingoDisplay.py

@@ -314,7 +314,7 @@ def translateMod(modName):
 args = parser.parse_args()
 
 def GetVersion():
-    return 'v1.0'
+    return 'v2.7'
 
 if args.version:
     print('DXRando Bingo Viewer version:', GetVersion(), file=sys.stderr)

DXRCore/DeusEx/Classes/DXRMenuSelectDifficulty.uc

@@ -119,7 +119,9 @@ function BindControls(optional string action)
 
     if(mirrored_maps_files_found) {
         NewMenuItem("Mirrored Maps %", "Enable mirrored maps if you have the files downloaded for them.");
-        if(f.mirroredmaps == -1) {
+        if(f.mirroredmaps == -1 && f.IsZeroRando()) {
+            f.mirroredmaps = 0; // default to 0% because of Zero Rando
+        } else if(f.mirroredmaps == -1) {
             f.mirroredmaps = 50; // default to 50% when the files are installed
         }
         Slider(f.mirroredmaps, 0, 100);

DXRCore/DeusEx/Classes/DXRVersion.uc

@@ -5,20 +5,20 @@ simulated static function CurrentVersion(optional out int major, optional out in
     major=2;
     minor=7;
     patch=0;
-    build=2;//build can't be higher than 99
+    build=3;//build can't be higher than 99
 }
 
 simulated static function bool VersionIsStable()
 {
-    return false;
+    return true;
 }
 
 simulated static function string VersionString(optional bool full)
 {
     local int major,minor,patch,build;
     local string status;
 
-    status = "Beta";
+    status = "";
 
     if(status!="") {
         status = " " $ status;

DXRModules/DeusEx/Classes/DXRFlags.uc

@@ -966,5 +966,5 @@ defaultproperties
     autosave=2
     loadout=0
     crowdcontrol=0
-    mirroredmaps=50
+    mirroredmaps=-1
 }

compiler_settings.example.json

@@ -2,22 +2,27 @@
     "default": {
         "source_path": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex Backup/",
         "out_dir": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex Rando/",
-        "mods_paths": [ "../Lay-D-Denton-Project", "./" ]
+        "mods_paths": [ "../Lay-D-Denton-Project", "./" ],
+        "preproc_definitions": { }
     },
     "hx": {
         "source_path": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex HX Backup/",
-        "out_dir": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex HX/"
+        "out_dir": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex HX/",
+        "preproc_definitions": { }
     },
     "gmdx": {
         "source_path": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex GMDX Backup/",
-        "out_dir": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex GMDX/"
+        "out_dir": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex GMDX/",
+        "preproc_definitions": { }
     },
     "revision": {
         "source_path": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex Revision Backup/",
-        "out_dir": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex Revision Rando/"
+        "out_dir": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex Revision Rando/",
+        "preproc_definitions": { }
     },
     "vmd": {
         "source_path": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex VMD Backup/",
-        "out_dir": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex VMD/"
+        "out_dir": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex VMD/",
+        "preproc_definitions": { }
     }
 }

installer/Install/__init__.py

@@ -89,8 +89,11 @@ def GetVersion():
     CurrentVersion = data[i:]
     i = CurrentVersion.find(b'}')
     CurrentVersion = CurrentVersion[:i].decode('iso_8859_1')
-    m = re.search(r'major=(\d+);\s+minor=(\d+);\s+patch=(\d+);\s+build=(\d+);', CurrentVersion, flags=re.MULTILINE)
-    version = 'v' + m.group(1) + '.' + m.group(2) + '.' + m.group(3) + '.' + m.group(4)
+    v = re.search(r'major=(\d+);\s+minor=(\d+);\s+patch=(\d+);\s+build=(\d+);', CurrentVersion, flags=re.MULTILINE)
+    fullversion = 'v' + v.group(1) + '.' + v.group(2) + '.' + v.group(3) + '.' + v.group(4)
+    version = 'v' + v.group(1) + '.' + v.group(2)
+    if v.group(3) != '0':
+        version += '.' + v.group(3)
 
     i = data.find(b'static function string VersionString(')
     VersionString = data[i:]
@@ -99,7 +102,7 @@ def GetVersion():
 
     m = re.search(r'status = "(.*)";', VersionString, flags=re.MULTILINE)
     if m and m.group(1):
-        version += ' ' + m.group(1)
+        version = fullversion + ' ' + m.group(1)
 
     return version