v2.7.1.4 Beta Merge pull request #737 from Die4Ever/develop

v2.7.1.4 Beta

DXRBalance/DeusEx/Classes/AugDisplayWindow.uc

@@ -122,13 +122,29 @@ function bool ShouldDrawActorDist(Actor A, float dist)
 function _DrawActor(GC gc, Actor A, float DrawGlow)
 {
     local Texture oldSkins[9];
+    local #var(prefix)Containers c;
+    local class<Inventory> i;
+    local Mesh oldMesh;
 
     if(A.Mesh == None) {
         DrawBrush(gc, A);
     }
     else {
         SetSkins(A, oldSkins);
         gc.DrawActor(A, False, False, True, 1.0, DrawGlow/4, None);
+
+        c = #var(prefix)Containers(A);
+        if(c != None) {
+            i = c.Contents;
+            if(i == None) i = c.Content2;
+            if(i == None) i = c.Content3;
+            if(i != None) {
+                oldMesh = c.Mesh;
+                c.Mesh = i.default.Mesh;
+                gc.DrawActor(A, False, False, True, 1.0, DrawGlow, None);
+                c.Mesh = oldMesh;
+            }
+        }
         ResetSkins(A, oldSkins);
     }
 }

DXRCore/DeusEx/Classes/DXRVersion.uc

@@ -5,7 +5,7 @@ simulated static function CurrentVersion(optional out int major, optional out in
     major=2;
     minor=7;
     patch=1;
-    build=3;//build can't be higher than 99
+    build=4;//build can't be higher than 99
 }
 
 simulated static function bool VersionIsStable()

DXRMapFixups/DeusEx/Classes/DXRFixupM03.uc

@@ -26,7 +26,6 @@ function PostFirstEntryMapFixes()
             a = AddActor(class'Barrel1', vect(-27.953907, -3493.229980, 45.101418));
             Barrel1(a).SkinColor = SC_Explosive;
             a.BeginPlay();
-            a.PostPostBeginPlay();
         }
         break;
 
@@ -66,6 +65,7 @@ function PreFirstEntryMapFixes()
     local #var(prefix)BlackHelicopter jock;
     local DXRHoverHint hoverHint;
     local #var(prefix)HumanCivilian hc;
+    local #var(prefix)OrdersTrigger ot;
 
     local bool VanillaMaps;
 
@@ -345,6 +345,13 @@ function PreFirstEntryMapFixes()
                 GlowUp(k);
         }
 
+        foreach AllActors(class'#var(prefix)OrdersTrigger',ot){
+            if (ot.ordersTag=='CarterAtWindow'){
+                ot.Orders='RunningTo';
+                break;
+            }
+        }
+
         //Spawn some placeholders for new item locations
         Spawn(class'PlaceholderItem',,, vectm(363.284149, 344.847, 50.32)); //Womens bathroom counter
         Spawn(class'PlaceholderItem',,, vectm(211.227, 348.46, 50.32)); //Mens bathroom counter

DXRMapFixups/DeusEx/Classes/DXRFixupM05.uc

@@ -40,6 +40,7 @@ function PreFirstEntryMapFixes()
     local DXRHoverHint hoverHint;
     local #var(prefix)HumanCivilian hc;
     local #var(prefix)Keypad3 kp;
+    local #var(prefix)Cigarettes cigs;
 
     local DXREnemies dxre;
     local int i;
@@ -103,6 +104,12 @@ function PreFirstEntryMapFixes()
                 }
             }
 
+            foreach AllActors(class'#var(prefix)Cigarettes', cigs) {
+                if(cigs.Name=='Cigarettes0') {
+                    cigs.Destroy();
+                }
+            }
+
             class'PlaceholderEnemy'.static.Create(self,vectm(-5066,1368,208),,'Sitting');
             class'PlaceholderEnemy'.static.Create(self,vectm(-4981,1521,208),,'Sitting');
             class'PlaceholderEnemy'.static.Create(self,vectm(-3417,1369,208),,'Sitting');

DXRMapFixups/DeusEx/Classes/DXRFixupM09.uc

@@ -297,7 +297,6 @@ function PreFirstEntryMapFixes()
         barrel = #var(prefix)Barrel1(AddActor(class'#var(prefix)Barrel1', vect(-1112.480469,1120.735840,29.096186)));
         barrel.SkinColor = SC_Explosive;
         barrel.BeginPlay();
-        barrel.PostPostBeginPlay();
 
         // just in case the gate keeper gets stuck, or if you wanna go fast!
         foreach AllActors(class'#var(prefix)FlagTrigger', ft, 'CheckGateFlag') {

DXRMapFixups/DeusEx/Classes/DXRFixupParis.uc

@@ -7,7 +7,6 @@ function PreFirstEntryMapFixes()
     local Trigger t;
     local Dispatcher d;
     local ScriptedPawn sp;
-    local Conversation c;
     local #var(prefix)TobyAtanwe toby;
     local #var(prefix)JaimeReyes j;
     local #var(prefix)DamageTrigger dt;
@@ -90,13 +89,6 @@ function PreFirstEntryMapFixes()
                 //Need to pretend he *was* recruited, so that he doesn't spawn
                 dxr.flagbase.SetBool('JaimeRecruited',True);
             }
-            // fix the night manager sometimes trying to talk to you while you're flying away https://www.youtube.com/watch?v=PeLbKPSHSOU&t=6332s
-            c = GetConversation('MeetNightManager');
-            if(c!=None) {
-                c.bInvokeBump = false;
-                c.bInvokeSight = false;
-                c.bInvokeRadius = false;
-            }
             foreach AllActors(class'#var(prefix)JaimeReyes', j) {
                 RemoveFears(j);
             }
@@ -253,6 +245,14 @@ function AnyEntryMapFixes()
             }
             ce=ce.nextEvent;
         }
+
+        // fix the night manager sometimes trying to talk to you while you're flying away https://www.youtube.com/watch?v=PeLbKPSHSOU&t=6332s
+        c = GetConversation('MeetNightManager');
+        if(c!=None) {
+            c.bInvokeBump = false;
+            c.bInvokeSight = false;
+            c.bInvokeRadius = false;
+        }
         break;
     case "11_PARIS_UNDERGROUND":
         //Add a flag change to Toby's conversation so it sets MS_PlayerTeleported to false if you choose the "take me with you" option

DXRMissions/DeusEx/Classes/DXRMissionsM02.uc

@@ -199,7 +199,6 @@ function ReplaceBatteryParkSubwayTNT()
         if (barrel!=None){
             barrel.bIsSecretGoal=True;
             barrel.BeginPlay();
-            barrel.PostPostBeginPlay();
             barrel.Tag='ExplosiveCrate';
         }
 

DXRMissions/DeusEx/Classes/DXRMissionsM08.uc

@@ -167,6 +167,17 @@ function AfterMoveGoalToLocation(Goal g, GoalLocation Loc)
     }
 }
 
+function AfterMovePlayerToStartLocation(GoalLocation Loc)
+{
+    local #var(prefix)InterpolateTrigger it;
+
+    if (Loc.name!="Hotel Roof") {
+        foreach AllActors(class'#var(prefix)InterpolateTrigger', it) {
+            if(it.Event=='EntranceCopter') it.Trigger(self, None);
+        }
+    }
+}
+
 function AfterShuffleGoals(int goalsToLocations[32])
 {
     local int g;

DXRMissions/DeusEx/Classes/DXRMissionsM09.uc

@@ -120,7 +120,7 @@ function int InitGoals(int mission, string map)
         AddMapMarker(class'Image09_NYC_Ship_Bottom',208,54,"C","Bilge Computer", loc,"The bilge pump computer can be located on a desk in the corner of the bilge pump room.  This is the vanilla location.");
         loc = AddGoalLocation("09_NYC_SHIPBELOW", "Helibay Barracks", GOAL_TYPE1, vect(-5505, 175, -432), rot(0, 0, 0));
         AddMapMarker(class'Image09_NYC_Ship_Bottom',51,102,"C","Bilge Computer", loc,"The bilge pump computer can be located on a bed in the barracks underneath the helicopter in the helibay.");
-        loc = AddGoalLocation("09_NYC_SHIPBELOW", "Engine Room Tower", GOAL_TYPE1, vect(-133,-658,15), rot(0, -15815, 0));
+        loc = AddGoalLocation("09_NYC_SHIPBELOW", "Engine Room Tower", GOAL_TYPE1, vect(-131.815552,-492.488342,9), rot(0, -15815, 0));
         AddMapMarker(class'Image09_NYC_Ship_Bottom',328,256,"C","Bilge Computer", loc,"The bilge pump computer can be found in the control tower in the engine room.");
         loc = AddGoalLocation("09_NYC_SHIPBELOW", "Helipad Air Control", GOAL_TYPE1, vect(-4799, 1198, -150), rot(0, 32768, 0));
         AddActorLocation(loc, 1, vect(-4799, 1198, -220), rot(0,0,0));// MAHOGANY desk

DXRMissions/DeusEx/Classes/DXRMissionsParis.uc

@@ -323,7 +323,7 @@ function AfterMoveGoalToLocation(Goal g, GoalLocation Loc)
     }
 
     if (g.name=="Templar Computer" && VanillaMaps) { // TODO: make this work in Revision too
-        g.actors[2].a.SetCollisionSize(160,64);
-        g.actors[4].a.SetCollisionSize(1600,200);
+        g.actors[2].a.SetCollisionSize(160,64);// skillawardtrigger
+        g.actors[4].a.SetCollisionSize(1400,180);// DL_gunthernearcomp
     }
 }

DXRModules/DeusEx/Classes/DXRHordeMode.uc

@@ -679,7 +679,6 @@ function GenerateItem()
     else if( barrel != None ) {
         barrel.SkinColor = SC_Poison;
         barrel.BeginPlay();
-        barrel.PostPostBeginPlay();
     }
 }
 

DXRModules/DeusEx/Classes/DXRMissions.uc

@@ -107,6 +107,7 @@ function int InitGoalsRev(int mission, string map);// return a salt for the seed
 function CreateGoal(out Goal g, GoalLocation Loc);
 function DeleteGoal(Goal g, GoalLocation Loc);
 function AfterMoveGoalToLocation(Goal g, GoalLocation Loc);
+function AfterMovePlayerToStartLocation(GoalLocation Loc);
 function PreFirstEntryMapFixes();
 function MissionTimer();
 function AddMissionGoals();
@@ -374,6 +375,7 @@ function MoveActorsIn(int goalsToLocations[32])
         p.PutCarriedDecorationInHand();
         rando_start_loc = p.Location;
         b_rando_start = true;
+        AfterMovePlayerToStartLocation(locations[g]);
     }
 
     if( dxr.flags.settings.goals > 0 ) {

DXRModules/DeusEx/Classes/DXRReduceItems.uc

@@ -27,7 +27,7 @@ replication
 function CheckConfig()
 {
     local int i;
-    if( ConfigOlderThan(2,6,2,1) ) {
+    if( ConfigOlderThan(2,7,1,4) ) {
         min_rate_adjust = 0.3;
         max_rate_adjust = 1.75;
 
@@ -93,7 +93,15 @@ function PostFirstEntry()
 {
     local int mission, scale;
     Super.PostFirstEntry();
-    if(dxr.flags.IsZeroRando()) return;
+
+    if(dxr.flags.settings.ammo==100
+        && dxr.flags.settings.multitools==100
+        && dxr.flags.settings.lockpicks==100
+        && dxr.flags.settings.biocells==100
+        && dxr.flags.settings.medkits==100
+    ) {
+        return;
+    }
 
     mission = Clamp(dxr.dxInfo.missionNumber, 0, ArrayCount(mission_scaling)-1);
     scale = mission_scaling[mission];

DXRando/DeusEx/Classes/Barrel1.uc

@@ -10,9 +10,21 @@ function BeginPlay()
     Super.BeginPlay();
     bInvincible = false;
     _SkinColor = SkinColor;
+    SetTimer(0.1,False);
 }
 
-function PostPostBeginPlay()
+function Timer()
+{
+    local DXRFlags f;
+    foreach AllActors(class'DXRFlags',f){break;}
+    if (f==None){
+        SetTimer(0.1,False);
+        return;
+    }
+    AdjustBarrels();
+}
+
+function AdjustBarrels()
 {
     UpdateBarrelTexture();
     AdjustBarrelBehaviour();
@@ -92,8 +104,6 @@ event TravelPostAccept()
     Super.TravelPostAccept();
     SkinColor = _SkinColor;
     BeginPlay();
-    UpdateBarrelTexture();
-    AdjustBarrelBehaviour();
 }
 
 function Trigger(Actor Other, Pawn Instigator)

DXRando/DeusEx/Classes/DXRandoImageTextures.uc

@@ -16,3 +16,9 @@ class DXRandoImageTextures extends Object abstract;
 #exec TEXTURE IMPORT FILE="Textures\YellowRadioactiveBarrel.pcx"	        NAME="YellowRadioactiveBarrel"          GROUP="DXRandoImages"
 
 #exec TEXTURE IMPORT FILE="Textures\WinePuddle.pcx"	                        NAME="WinePuddle"                       GROUP="DXRandoImages"
+
+#exec TEXTURE IMPORT FILE="Textures\MenuRandoOptionsFourChoice_1.pcx"	    NAME="MenuRandoOptionsFourChoice_1"     GROUP="DXRandoImages"
+#exec TEXTURE IMPORT FILE="Textures\MenuRandoOptionsFourChoice_2.pcx"	    NAME="MenuRandoOptionsFourChoice_2"     GROUP="DXRandoImages"
+
+#exec TEXTURE IMPORT FILE="Textures\MenuRandoOptionsFiveChoice_1.pcx"	    NAME="MenuRandoOptionsFiveChoice_1"     GROUP="DXRandoImages"
+#exec TEXTURE IMPORT FILE="Textures\MenuRandoOptionsFiveChoice_2.pcx"	    NAME="MenuRandoOptionsFiveChoice_2"     GROUP="DXRandoImages"

GUI/DeusEx/Classes/HUDSpeedrunSplits.uc

@@ -160,7 +160,7 @@ function InitStats(DXRStats newstats)
     }
 
     if(curMission == 99) {
-        CompletedRun();
+        CompletedRun(total);
     }
     SaveConfig();
 
@@ -173,9 +173,9 @@ function InitStats(DXRStats newstats)
     StyleChanged();
 }
 
-function CompletedRun()
+function CompletedRun(int total)
 {
-    local int i, total, time;
+    local int i, time;
     local bool bNewPB;
 
     // write back new PBs and Golds

GUI/DeusEx/Classes/MenuScreenRandoOptChoices.uc

@@ -6,24 +6,25 @@ defaultproperties
      ButtonNames(1)="Visuals"
      ButtonNames(2)="Audio"
      ButtonNames(3)="Gameplay"
-     ButtonNames(4)="?????"
-     ButtonNames(5)="?????"
-     ButtonNames(6)="Previous Menu"
+     ButtonNames(4)="Previous Menu" //Four Choice menu
+     //ButtonNames(4)="?????" //five Choice menu
+     //ButtonNames(5)="Previous Menu" //five Choice menu
      buttonXPos=7
      buttonWidth=282
      buttonDefaults(0)=(Y=13,Action=MA_MenuScreen,Invoke=Class'#var(package).MenuScreenRandoOptionsRandomizer')
      buttonDefaults(1)=(Y=49,Action=MA_MenuScreen,Invoke=Class'#var(package).MenuScreenRandoOptionsVisuals')
      buttonDefaults(2)=(Y=85,Action=MA_MenuScreen,Invoke=Class'#var(package).MenuScreenRandoOptionsAudio')
      buttonDefaults(3)=(Y=121,Action=MA_MenuScreen,Invoke=Class'#var(package).MenuScreenRandoOptionsGameplay')
-     buttonDefaults(4)=(Y=157,Action=MA_MenuScreen,Invoke=Class'#var(package).MenuScreenRandoOptions')
-     buttonDefaults(5)=(Y=193,Action=MA_MenuScreen,Invoke=Class'#var(package).MenuScreenRandoOptions')
-     buttonDefaults(6)=(Y=266,Action=MA_Previous)
+     buttonDefaults(4)=(Y=198,Action=MA_Previous) //Four choice menu coord
+     //buttonDefaults(4)=(Y=157,Action=MA_MenuScreen,Invoke=Class'#var(package).MenuScreenRandoOptionsGameplay') //five choice menu coord
+     //buttonDefaults(5)=(Y=213,Action=MA_Previous) //five choice menu coord
      Title="Rando Settings"
      ClientWidth=294
-     ClientHeight=308
-     clientTextures(0)=Texture'DeusExUI.UserInterface.MenuOptionsBackground_1'
-     clientTextures(1)=Texture'DeusExUI.UserInterface.MenuOptionsBackground_2'
-     clientTextures(2)=Texture'DeusExUI.UserInterface.MenuOptionsBackground_3'
-     clientTextures(3)=Texture'DeusExUI.UserInterface.MenuOptionsBackground_4'
+     ClientHeight=240 //Four choice menu
+     //ClientHeight=255 //Five choice menu
+     clientTextures(0)=Texture'MenuRandoOptionsFourChoice_1'
+     clientTextures(1)=Texture'MenuRandoOptionsFourChoice_2'
+     //clientTextures(0)=Texture'MenuRandoOptionsFiveChoice_1'
+     //clientTextures(1)=Texture'MenuRandoOptionsFiveChoice_2'
      textureCols=2
 }

GUI/DeusEx/Classes/MenuScreenRandoOptionsAudio.uc

@@ -26,4 +26,6 @@ function CreateChoices()
 defaultproperties
 {
      Title="Randomizer Audio"
+     ClientHeight=300
+     helpPosY=264//helpPosY = ClientHeight - 36
 }

GUI/DeusEx/Classes/MenuScreenRandoOptionsRandomizer.uc

@@ -24,4 +24,6 @@ function CreateChoices()
 defaultproperties
 {
      Title="Randomizer Options"
+     ClientHeight=230
+     helpPosY=194//helpPosY = ClientHeight - 36
 }

GUI/DeusEx/Classes/MenuScreenRandoOptionsVisuals.uc

@@ -26,4 +26,6 @@ function CreateChoices()
 defaultproperties
 {
      Title="Randomizer Visuals"
+     ClientHeight=270
+     helpPosY=234//helpPosY = ClientHeight - 36
 }