v2.5.6

BingoDisplay.py

@@ -42,7 +42,7 @@ def __init__(self,targetFile):
         self.selectedMod=""
         self.prevLines=None
         self.bingoLineMatch = re.compile(
-            r'bingoexport\[(?P<key>\d+)\]=\(Event="(?P<event>.*)",Desc="(?P<desc>.*)",Progress=(?P<progress>\d+),Max=(?P<max>\d+),Active=(?P<active>\d+)\)',
+            r'bingoexport\[(?P<key>\d+)\]=\(Event="(?P<event>.*)",Desc="(?P<desc>.*)",Progress=(?P<progress>\d+),Max=(?P<max>\d+),Active=(?P<active>-?\d+)\)',
             re.IGNORECASE
         )
         self.initDrawnBoard()
@@ -147,7 +147,7 @@ def parseBingoLine(self,bingoLine):
         bingoMatches=self.bingoLineMatch.match(bingoLine)
         if (bingoMatches==None):
             return
-        
+
         bingoNumber=int(bingoMatches.group('key'))
         bingoCoord = self.bingoNumberToCoord(bingoNumber)
 
@@ -216,6 +216,8 @@ def generateBingoStateJson(self):
                 square = dict()
                 square["x"]=x
                 square["y"]=y
+                if self.board[x][y]==None:
+                    return {}
                 square["name"]=self.board[x][y]["desc"]
                 if self.board[x][y]["max"]>1:
                     square["name"]+="\n"+str(self.board[x][y]["progress"])+"/"+str(self.board[x][y]["max"])
@@ -265,11 +267,17 @@ def getDefaultPath():
         Path.home() /'.local'/'share'/'Steam'/'steamapps'/'compatdata'/'6910'/'pfx'/'drive_c'/'users'/'steamuser'/'Documents'/'Deus Ex'/'System',
         Path.home() /'.local'/'share'/'Steam'/'steamapps'/'common'/'Deus Ex'/'System',
     ]
-    p:Path
+
+    modified_times = {}
     for p in checks:
         f:Path = p / "DXRBingo.ini"
         if f.exists():
-            return p
+            modified_times[p] = os.path.getmtime(f)
+    sorted_paths = sorted(modified_times.keys(), key=lambda f: modified_times[f])
+
+    if len(sorted_paths) > 0:
+        return sorted_paths[-1]
+    p:Path
     for p in checks:
         if p.is_dir():
             return p

DXRBalance/DeusEx/Classes/BalancePlayer.uc

@@ -280,6 +280,8 @@ function CatchFire( Pawn burner )
 simulated function DrugEffects(float deltaTime)
 {
     local float olddrugEffectTimer;
+    local DeusExRootWindow root;
+    local bool wasActive;
 
     // set a cap on the effect strength separately from the duration
     olddrugEffectTimer = drugEffectTimer;
@@ -288,9 +290,25 @@ simulated function DrugEffects(float deltaTime)
 
     // calculate duration myself
     drugEffectTimer = FMin(olddrugEffectTimer, 120.0 );
+    wasActive = (drugEffectTimer>0);
     drugEffectTimer -= deltaTime * 1.5;
-    if (drugEffectTimer < 0)
+    if (drugEffectTimer < 0) {
         drugEffectTimer = 0;
+        if (wasActive){
+            //This theoretically fixes the issue where the game stays zoomed in
+            //after being drunk until you switch what's in your hands
+            root = DeusExRootWindow(rootWindow);
+            if ((root != None) && (root.hud != None))
+            {
+                if (root.hud.background != None)
+                {
+                    root.hud.SetBackground(None);
+                    root.hud.SetBackgroundStyle(DSTY_Normal);
+                    DesiredFOV = Default.DesiredFOV;
+                }
+            }
+        }
+    }
 }
 
 // ----------------------------------------------------------------------

DXRBalance/DeusEx/Classes/Fish.uc

@@ -0,0 +1,6 @@
+class DXRFish injects #var(prefix)Fish;
+
+defaultproperties
+{
+     Health=1
+}

DXRBalance/DeusEx/Classes/Fish2.uc

@@ -0,0 +1,6 @@
+class DXRFish2 injects #var(prefix)Fish2;
+
+defaultproperties
+{
+     Health=1
+}

DXRBalance/DeusEx/Classes/Pigeon.uc

@@ -0,0 +1,6 @@
+class DXRPigeon injects #var(prefix)Pigeon;
+
+defaultproperties
+{
+     Health=1
+}

DXRBalance/DeusEx/Classes/Rat.uc

@@ -0,0 +1,6 @@
+class DXRRat injects #var(prefix)Rat;
+
+defaultproperties
+{
+     Health=1
+}

DXRBalance/DeusEx/Classes/Seagull.uc

@@ -0,0 +1,6 @@
+class DXRSeagull injects #var(prefix)Seagull;
+
+defaultproperties
+{
+     Health=1
+}

DXRCore/DeusEx/Classes/DXRActorsBase.uc

@@ -245,7 +245,14 @@ static function Inventory GiveExistingItem(Pawn p, Inventory item, optional int
             if( pickup.bCanHaveMultipleCopies && pickup.NumCopies < pickup.MaxCopies ) {
                 pickup.NumCopies++;
                 item.Destroy();
+                if( player != None )
+                    player.UpdateBeltText(pickup);
                 return pickup;
+            } else if (pickup.bCanHaveMultipleCopies && pickup.NumCopies >= pickup.MaxCopies) {
+                //Player has some, but can't get more.  Don't try to pick it up or set them as the base.
+                //Disown the player entirely, otherwise if they try to pick it up again, it will follow them
+                item.SetOwner(None);
+                return item;
             }
         }
     }
@@ -262,6 +269,7 @@ static function Inventory GiveExistingItem(Pawn p, Inventory item, optional int
 
     if( player != None ) {
         player.FrobTarget = item;
+        item.SetOwner(None);// just in case the right click fails
         player.ParseRightClick();
     } else {
         item.GiveTo(p);
@@ -926,9 +934,10 @@ static function SetActorScale(Actor a, float scale)
 {
     local Vector newloc;
 
+    scale *= a.DrawScale;
     newloc = a.Location + ( (a.CollisionHeight*scale - a.CollisionHeight*a.DrawScale) * vect(0,0,1) );
+    a.SetCollisionSize(a.CollisionRadius / a.DrawScale * scale, a.CollisionHeight / a.DrawScale * scale);
     a.SetLocation(newloc);
-    a.SetCollisionSize(a.CollisionRadius, a.CollisionHeight / a.DrawScale * scale);
     a.DrawScale = scale;
 }
 

DXRCore/DeusEx/Classes/DXRMenuSetupRando.uc

@@ -25,7 +25,7 @@ function BindControls(optional string action)
     }
 
     //Make sure the starting map values match those in DXRStartMap
-    NewMenuItem("Starting Map", "What level you will start in");
+    NewMenuItem("Starting Map", "What level you will start in.");
     EnumOption("Liberty Island", 0, f.settings.starting_map);
     EnumOption("NSF Generator", 20, f.settings.starting_map);
     EnumOption("Hunting Lebedev", 30, f.settings.starting_map);
@@ -54,12 +54,12 @@ function BindControls(optional string action)
     BreakLine();
 
 #ifndef hx
-    NewMenuItem("", "Randomize starting locations on certain maps");
+    NewMenuItem("", "Randomize starting locations on certain maps.");
     EnumOption("Randomize Starting Locations", 100, f.settings.startinglocations);
     EnumOption("Unchanged Starting Locations", 0, f.settings.startinglocations);
 #endif
 
-    NewMenuItem("", "Randomize goal locations on certain maps");
+    NewMenuItem("", "Randomize goal locations on certain maps.");
     EnumOption("Randomize Goal Locations", 100, f.settings.goals);
     EnumOption("Unchanged Goal Locations", 0, f.settings.goals);
 
@@ -72,7 +72,7 @@ function BindControls(optional string action)
     NewMenuItem("Dancing %", "How many characters should be dancing.");
     Slider(f.settings.dancingpercent, 0, 100);
 
-    NewMenuItem("Spoiler Buttons", "Allow the use of spoiler buttons (Spoilers remain hidden until you choose to view them)");
+    NewMenuItem("Spoiler Buttons", "Allow the use of spoiler buttons (Spoilers remain hidden until you choose to view them).");
     EnumOption("Available", 1, f.settings.spoilers);
     EnumOption("Disallowed", 0, f.settings.spoilers);
 
@@ -82,13 +82,13 @@ function BindControls(optional string action)
 
     NewGroup("Bingo");
 
-    NewMenuItem("Bingo Win", "How many completed lines to instantly win");
+    NewMenuItem("Bingo Win", "How many completed lines to instantly win.");
     Slider(f.settings.bingo_win, 0, 12);
 
     NewMenuItem("Bingo Scale %", "How difficult should bingo goals be?");
     Slider(f.bingo_scale, 0, 100);
 
-    NewMenuItem("Bingo Freespace", "Should the center be a Free Space, or even more Free Spaces");
+    NewMenuItem("Bingo Freespace", "Should the center be a Free Space, or even more Free Spaces?");
     EnumOption("Enabled", 1, f.settings.bingo_freespaces);
     EnumOption("Disabled", 0, f.settings.bingo_freespaces);
     EnumOption("2 Free Spaces", 2, f.settings.bingo_freespaces);
@@ -106,36 +106,39 @@ function BindControls(optional string action)
 
     NewGroup("Medical Bots and Repair Bots");
 
-    NewMenuItem("Medbots", "Percentage chance for a medbot to spawn in a map (vanilla is about 14%)");
+    NewMenuItem("Medbots", "Percentage chance for a medbot to spawn in a map (vanilla is about 14%).");
     Slider(f.settings.medbots, -1, 100);
 
-    NewMenuItem("Repair Bots", "Percentage chance for a repair bot to spawn in a map (vanilla is about 14%)");
+    NewMenuItem("Augbots", "Percentage chance for a zero-heals medbot to spawn in a map if a regular one doesn't.");
+    Slider(f.moresettings.empty_medbots, 0, 100);
+
+    NewMenuItem("Repair Bots", "Percentage chance for a repair bot to spawn in a map (vanilla is about 14%).");
     Slider(f.settings.repairbots, -1, 100);
 
     if(!#defined(vmd)) {
-        NewMenuItem("Medbot Uses", "Number of times you can use an individual medbot to heal");
+        NewMenuItem("Medbot Uses", "Number of times you can use an individual medbot to heal.");
         Slider(f.settings.medbotuses, 0, 10);
 
-        NewMenuItem("Repair Bot Uses", "Number of times you can use an individual repair bot to restore energy");
+        NewMenuItem("Repair Bot Uses", "Number of times you can use an individual repair bot to restore energy.");
         Slider(f.settings.repairbotuses, 0, 10);
     }
 
-    NewMenuItem("Medbot Cooldowns", "Individual: Each Medbot has its own healing cooldown."$BR$"Global: All Medbots have the same cooldown");
+    NewMenuItem("Medbot Cooldowns", "Individual: Each Medbot has its own healing cooldown."$BR$"Global: All Medbots have the same cooldown.");
     EnumOption("Unchanged", 0, f.settings.medbotcooldowns);
     EnumOption("Individual", 1, f.settings.medbotcooldowns);
     EnumOption("Global", 2, f.settings.medbotcooldowns);
 
-    NewMenuItem("Repair Bot Cooldowns", "Individual: Each Repair Bot has its own charge cooldown."$BR$"Global: All Repair Bots have the same cooldown");
+    NewMenuItem("Repair Bot Cooldowns", "Individual: Each Repair Bot has its own charge cooldown."$BR$"Global: All Repair Bots have the same cooldown.");
     EnumOption("Unchanged", 0, f.settings.repairbotcooldowns);
     EnumOption("Individual", 1, f.settings.repairbotcooldowns);
     EnumOption("Global", 2, f.settings.repairbotcooldowns);
 
-    NewMenuItem("Medbot Heal Amount", "Individual: Each Medbot has its own healing amount."$BR$"Global: All Medbots have the same amount");
+    NewMenuItem("Medbot Heal Amount", "Individual: Each Medbot has its own healing amount."$BR$"Global: All Medbots have the same amount.");
     EnumOption("Unchanged", 0, f.settings.medbotamount);
     EnumOption("Individual", 1, f.settings.medbotamount);
     EnumOption("Global", 2, f.settings.medbotamount);
 
-    NewMenuItem("Repair Bot Charge Amount", "Individual: Each Repair Bot has its own charge amount."$BR$"Global: All Repair Bots have the same amount");
+    NewMenuItem("Repair Bot Charge Amount", "Individual: Each Repair Bot has its own charge amount."$BR$"Global: All Repair Bots have the same amount.");
     EnumOption("Unchanged", 0, f.settings.repairbotamount);
     EnumOption("Individual", 1, f.settings.repairbotamount);
     EnumOption("Global", 2, f.settings.repairbotamount);
@@ -228,7 +231,7 @@ function BindControls(optional string action)
     NewMenuItem("Non-Human Chance %", "Reduce the chance of new enemies being non-humans.");
     Slider(f.settings.enemies_nonhumans, 0, 100);
 
-    NewMenuItem("Enemy Respawn Seconds", "(Beta) How many seconds for enemies to respawn. Leave blank or 0 to disable");
+    NewMenuItem("Enemy Respawn Seconds", "(Beta) How many seconds for enemies to respawn. Leave blank or 0 to disable.");
     Slider(f.settings.enemyrespawn, 0, 10000);
 
     NewMenuItem("Move Turrets", "Randomizes locations of turrets, cameras, and security computers for them.");
@@ -237,11 +240,11 @@ function BindControls(optional string action)
     NewMenuItem("Add Turrets", "Randomly adds turrets, cameras, and security computers for them.");
     Slider(f.settings.turrets_add, 0, 10000);
 
-    NewMenuItem("", "Allow robots to get randomized weapons");
+    NewMenuItem("", "Allow robots to get randomized weapons.");
     EnumOption("Unchanged Robot Weapons", 0, f.settings.bot_weapons);
     EnumOption("Random Robot Weapons", 4, f.settings.bot_weapons);
 
-    NewMenuItem("", "Allow non-humans to get randomized stats");
+    NewMenuItem("", "Allow non-humans to get randomized stats.");
     EnumOption("Unchanged Non-human Stats", 0, f.settings.bot_stats);
     EnumOption("Random Non-human Stats", 100, f.settings.bot_stats);
 
@@ -300,7 +303,7 @@ function BindControls(optional string action)
     NewMenuItem("Medkit Drops %", "Make medkits more scarce.");
     Slider(f.settings.medkits, 0, 100);
 
-    NewMenuItem("Starting Equipment", "How many random items you start with");
+    NewMenuItem("Starting Equipment", "How many random items you start with.");
     Slider(f.settings.equipment, 0, 10);
 
     NewMenuItem("Swap Items %", "The chance for item positions to be swapped.");
@@ -342,6 +345,19 @@ function BindControls(optional string action)
     NewMenuItem("Aug Strength Rando %", "How much to randomize the strength of augmentations.");
     Slider(f.settings.aug_value_rando, 0, 100);// this is a wet/dry scale, 0 to 100%
 
+    NewGroup("New Game+");
+
+    NewMenuItem("Scaling %", "Scales the curve of New Game+ changes over successive loops.");
+    Slider(f.moresettings.newgameplus_curve_scalar, 0, 200);
+    NewMenuItem("Max Item Carryover", "Maximum number of the same item that can carry over between loops, not including stackable items.");
+    Slider(f.newgameplus_max_item_carryover, 0, 30);
+    NewMenuItem("Skill Downgrades", "Number of skill level downgrades per loop.");
+    Slider(f.newgameplus_num_skill_downgrades, 0, 33);
+    NewMenuItem("Augmentations Removed", "Number of augmentations removed per loop.");
+    Slider(f.newgameplus_num_removed_augs, 0, 8);
+    NewMenuItem("Weapons Removed", "Number of weapons removed per loop.");
+    Slider(f.newgameplus_num_removed_weapons, 0, 18);
+
     if( action == "NEXT" ) _InvokeNewGameScreen(combatDifficulty, InitDxr());
     if( action == "RANDOMIZE" ) RandomizeOptions(f);
 }

DXRCore/DeusEx/Classes/DXRVersion.uc

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

DXRCore/DeusEx/Classes/DXRando.uc

@@ -22,6 +22,10 @@ var transient bool runPostFirstEntry;
 var transient bool bTickEnabled;// bTickEnabled is just for DXRandoTests to inspect
 var transient bool bLoginReady;
 
+#ifdef revision
+var transient bool RevisionMaps;
+#endif
+
 replication
 {
     reliable if( Role==ROLE_Authority )
@@ -90,6 +94,10 @@ function DXRInit()
     if(Player == None)
         return;
 
+#ifdef revision
+    RevisionMaps = class'DXRMapVariants'.static.IsRevisionMaps(Player,true);
+#endif
+
     flagbase = Player.FlagBase;
 #ifdef hx
     flagbase = HXGameInfo(Level.Game).Steve.FlagBase;

DXRFixes/DeusEx/Classes/Containers.uc

@@ -0,0 +1,14 @@
+class DXRContainers injects #var(prefix)Containers;
+
+//Only drop the contents when the health is 0 to prevent crate content duping 
+//by carrying through level transitions.
+function Destroyed()
+{
+    if (HitPoints<=0){
+        //Normal "Containers" Destroyed behaviour, including dropping items
+        Super.Destroyed();
+    } else {
+        //DeusExDecoration won't drop items for Containers
+        Super(#var(DeusExPrefix)Decoration).Destroyed();
+    }
+}

DXRFixes/DeusEx/Classes/TrashPaper.uc

@@ -0,0 +1,6 @@
+class DXRTrashPaper injects #var(prefix)TrashPaper;
+
+defaultproperties
+{
+     FragType=Class'DeusEx.PaperFragment'
+}

DXRMapFixups/DeusEx/Classes/DXRFixupM01.uc

@@ -122,9 +122,12 @@ function AnyEntryMapFixes()
     local name conName;
     local string afterTextLine;
 
+    // if you can talk to gunther then obviously he's been rescued
     DeleteConversationFlag(GetConversation('GuntherRescued'), 'GuntherFreed', true);
 
     //Cut out the dialog for Paul giving you equipment
+    if(dxr.flags.IsReducedRando()) return; // but not in reduced rando
+
     c = GetConversation('MeetPaul');
     ce = c.eventList;