v1.6.3 Merge pull request #176 from Die4Ever/develop

v1.6.3 fix DXRMachines failing to spawn bots, fix TongHasRom trigger, WIP Lay D Denton compatibility

DXRFixes/DeusEx/Classes/Carcass.uc

@@ -10,6 +10,17 @@ function InitFor(Actor Other)
     Super.InitFor(Other);
 }
 
+// HACK to fix compatibility with Lay D Denton, see Carcass2.uc
+function SetMesh2(mesh m)
+{
+    Mesh2 = m;
+}
+
+function SetMesh3(mesh m)
+{
+    Mesh3 = m;
+}
+
 function bool _DropItem(Inventory item, Name classname)
 {
     if( Ammo(item) != None )

DXRFixes/DeusEx/Classes/Carcass2.uc

@@ -0,0 +1,12 @@
+class Carcass2 injects DeusExCarcass;
+// HACK to fix compatibility with Lay D Denton
+// Lay D Denton expects the DeusExCarcass class to have Mesh2 and Mesh3 in them, but the engine isn't smart enough to look in the parent class
+
+var(Display) mesh Mesh2; // mesh for secondary carcass
+var(Display) mesh Mesh3; // mesh for floating carcass
+
+simulated function PreBeginPlay()
+{
+    SetMesh2(Mesh2);
+    SetMesh3(Mesh3);
+}

DXRModules/DeusEx/Classes/DXRFixup.uc

@@ -769,6 +769,7 @@ function HongKong_FirstEntry()
     local Button1 b;
     local ElevatorMover e;
     local #var Mover  m;
+    local FlagTrigger ft;
 
     switch(dxr.localURL)
     {
@@ -848,6 +849,9 @@ function HongKong_FirstEntry()
             foreach AllActors(class'#var Mover ', m, 'elevator_door') {
                 m.bIsDoor = true;// DXRKeys will pick this up later since we're in PreFirstEntry
             }
+            foreach AllActors(class'FlagTrigger', ft, 'MJ12Alert') {
+                ft.Tag = 'TongHasRom';
+            }
             break;
 
         default:

DXRModules/DeusEx/Classes/DXRFlags.uc

@@ -181,8 +181,8 @@ simulated static function CurrentVersion(optional out int major, optional out in
 {
     major=1;
     minor=6;
-    patch=2;
-    build=2;//build can't be higher than 99
+    patch=3;
+    build=6;//build can't be higher than 99
 }
 
 simulated static function string VersionString(optional bool full)
@@ -195,7 +195,7 @@ simulated static function string VersionString(optional bool full)
 function CheckConfig()
 {
     local int i;
-    if( ConfigOlderThan(1,6,0,5) ) {
+    if( ConfigOlderThan(1,6,3,2) ) {
         // setup default difficulties
         i=0;
 #ifndef hx

DXRModules/DeusEx/Classes/DXRMachines.uc

@@ -407,14 +407,30 @@ function Actor SpawnBot(class<Actor> c, Name datacubeTag)
     return a;
 }
 
-function Actor SpawnNewActor(class<Actor> c, optional vector target, optional float mindist, optional float maxdist)
+function Actor _SpawnNewActor(class<Actor> c, optional vector target, optional float mindist, optional float maxdist)
 {
     local Actor a;
     local vector loc;
     loc = GetRandomPositionFine(target, mindist, maxdist);
     a = Spawn(c,,, loc );
-    if( a == None ) warning("SpawnNewActor "$c$" failed at "$loc);
-    else if( ScriptedPawn(a) != None ) class'DXRNames'.static.GiveRandomName(dxr, ScriptedPawn(a) );
+
+    if( ScriptedPawn(a) != None ) class'DXRNames'.static.GiveRandomName(dxr, ScriptedPawn(a) );
+    
+    if( a == None ) warning("_SpawnNewActor "$c$" failed at "$loc);
+    else info("_SpawnNewActor "$a$" at ("$loc$")");
+    return a;
+}
+
+function Actor SpawnNewActor(class<Actor> c, optional vector target, optional float mindist, optional float maxdist)
+{
+    local Actor a;
+    local int i;
+
+    for(i=0; i<10; i++) {
+        a = _SpawnNewActor(c, target, mindist, maxdist);
+        if( a != None ) return a;
+    }
+
     return a;
 }
 

DXRVanilla/DeusEx/Classes/MenuSelectDifficulty.uc

@@ -116,10 +116,15 @@ function BindControls(bool writing, optional string action)
 
     if(writing) {
         if( action == "ADVANCED" ) NewGameSetup(difficulty);
-        else InvokeNewGameScreen(difficulty, InitDxr());
+        else _InvokeNewGameScreen(difficulty, InitDxr());
     }
 }
 
+function InvokeNewGameScreen(float difficulty)
+{
+    _InvokeNewGameScreen(difficulty, InitDxr());
+}
+
 function NewGameSetup(float difficulty)
 {
     local DXRMenuSetupRando newGame;

DXRando/DeusEx/Classes/DXRMenuBase.uc

@@ -112,7 +112,7 @@ function DXRando InitDxr()
     return dxr;
 }
 
-function InvokeNewGameScreen(float difficulty, DXRando dxr)
+function _InvokeNewGameScreen(float difficulty, DXRando dxr)
 {
     local DXRMenuScreenNewGame newGame;
 

DXRando/DeusEx/Classes/DXRMenuSetupRando.uc

@@ -274,7 +274,7 @@ function BindControls(bool writing, optional string action)
     Slider(id, f.settings.max_weapon_shottime, 0, 300, writing);
     id++;
 
-    if( action == "NEXT" ) InvokeNewGameScreen(combatDifficulty, InitDxr());
+    if( action == "NEXT" ) _InvokeNewGameScreen(combatDifficulty, InitDxr());
 }
 
 function SetDifficulty(float newDifficulty)

HXRandomizer.int

@@ -1,2 +1,2 @@
 [Public]
-Object=(Name=HXRandomizer.HXRandoGameInfo,Class=Class,MetaClass=HX.HXGameInfo,Description="Deus Ex Randomizer HX")
+Object=(Name=HXRandomizer.HXRandoGameInfo,Class=Class,MetaClass=HX.HXGameInfo,Description="Deus Ex Randomizer HX",GameName="HX Randomized Coop Game")

compiler.py

@@ -30,7 +30,7 @@
 print(repr(args))
 
 if args.profile is None:
-    args.profile = "default"
+    args.profile = "all"
 
 rerun = ""
 while rerun != "exit":

compiler/compiler.py

@@ -17,8 +17,9 @@ def run(args):
     try:
         with open('compiler_settings.json') as f:
             settings = json.load(f)
-    except:
-        pass
+    except FileNotFoundError as e:
+        e.strerror += '\n\nERROR: You need to copy compiler_settings.example.json to compiler_settings.json and adjust the paths.'
+        raise
 
     merged = default_settings
     for p in settings:

compiler_settings.example.json

@@ -0,0 +1,10 @@
+{
+    "default": {
+        "source_path": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex Backup/",
+        "out_dir": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex/"
+    },
+    "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/"
+    }
+}