v3.3 Alpha

DXRBalance/DeusEx/Classes/AugmentationManager.uc

@@ -69,21 +69,6 @@ function Augmentation GetAugByKey(int keyNum)
     return None;
 }
 
-simulated function Augmentation GetAug(class<Augmentation> AugClass)
-{
-    local Augmentation anAug;
-
-    anAug = FirstAug;
-    while(anAug != None)
-    {
-        if (anAug.Class == augClass)
-            return anAug;
-        anAug = anAug.next;
-    }
-
-    return None;
-}
-
 // ----------------------------------------------------------------------
 // GetAugLevelValue()
 //

DXRBalance/DeusEx/Classes/BalanceHacking.uc

@@ -6,6 +6,11 @@ var TextWindow   energyMeter;
 var Color colWhite;
 var int energyMeterTimer;
 
+var PersonaActionButtonWindow btnBiocell;
+var String BiocellButtonLabel;
+var int biocellCount;
+
+
 function Tick(float deltaTime)
 {
     local Human p;
@@ -63,9 +68,116 @@ function CreateHackMessageWindow()
         energyMeterTimer = AddTimer(0.1, true, 0, 'UpdateEnergyMeterTimer');
 }
 
+function CreateHackButton()
+{
+    local #var(PlayerPawn) p;
+
+    //Make the hacking button
+    Super.CreateHackButton();
+
+    p = #var(PlayerPawn)(player);
+    if (p==None || p.bZeroRando) return;
+
+    //Make the Biocell button as well
+    btnBiocell = PersonaActionButtonWindow(NewChild(Class'DXRPersonaActionButtonWindow'));
+    btnBioCell.minimumButtonWidth=111;
+    btnBioCell.SetPos(83,86);
+    btnBioCell.CenterText(true);
+    UpdateBiocellButtonCount();
+}
+
+function UpdateBiocellButtonCount()
+{
+    local #var(prefix)BioElectricCell bc;
+    local #var(PlayerPawn) p;
+
+    p = #var(PlayerPawn)(player);
+
+    if (p==None || btnBiocell==None || p.bZeroRando) return;
+
+    biocellCount = 0;
+    if (p!=None){
+        bc = #var(prefix)BioElectricCell(p.FindInventoryType(class'#var(prefix)BioElectricCell'));
+        if (bc!=None){
+            biocellCount = bc.NumCopies;
+        }
+    }
+
+    btnBiocell.SetButtonText(BiocellButtonLabel$" ("$biocellCount$")");
+
+    UpdateBiocellButtonClickability();
+
+}
+
+function UpdateBiocellButtonClickability()
+{
+    local bool enable;
+    local #var(PlayerPawn) p;
+
+    p = #var(PlayerPawn)(player);
+    enable=False;
+
+    if (p==None || btnBiocell==None || p.bZeroRando) return;
+
+    if (p!=None && biocellCount!=0){
+        if (p.Energy<p.EnergyMax){
+            enable=True;
+        }
+    }
+
+    if (!bHacked){
+        btnBiocell.EnableWindow(enable);
+    } else {
+        btnBiocell.Hide(); //Hide biocell button once the computer is hacked
+    }
+}
+
+function HandleBiocellButton()
+{
+    local #var(prefix)BioElectricCell bc;
+    local #var(PlayerPawn) p;
+
+    p = #var(PlayerPawn)(player);
+
+    if (p!=None){
+        bc = #var(prefix)BioElectricCell(p.FindInventoryType(class'#var(prefix)BioElectricCell'));
+        if (bc!=None){
+            bc.Activate();
+            UpdateBiocellButtonCount();
+        }
+    }
+}
+
+function bool ButtonActivated( Window buttonPressed )
+{
+    local bool bHandled;
+    local #var(PlayerPawn) p;
+
+    p = #var(PlayerPawn)(player);
+
+    bHandled = False;
+
+    if (p==None || btnBiocell==None || p.bZeroRando) return Super.ButtonActivated(buttonPressed);
+
+    switch( buttonPressed )
+    {
+        case btnBiocell:
+            bHandled=True;
+            HandleBiocellButton();
+            break;
+    }
+
+    if (bHandled){
+        return True;
+    } else {
+        return Super.ButtonActivated(buttonPressed);
+    }
+}
+
 function UpdateEnergyMeterTimer(int timerID, int invocations, int clientData)
 {
     UpdateEnergyMeter();
+    UpdateBiocellButtonClickability(); //Button can change clickability based on remaining energy
 }
 
 event DestroyWindow()
@@ -82,7 +194,7 @@ event DestroyWindow()
 function UpdateEnergyMeter()
 {
     local Human p;
-    local int energy,energydec,req,reqdec;
+    local int energy,energydec,req,reqdec,maxenergy,maxenergydec;
     local float reqEnergy;
     local string msg;
 
@@ -94,12 +206,15 @@ function UpdateEnergyMeter()
     energy = int(p.Energy);
     energydec = int((p.Energy * 10) - (energy*10));
 
+    maxenergy = int(p.EnergyMax);
+    maxenergydec = int((p.EnergyMax * 10) - (maxenergy*10));
+
     reqEnergy = hackTime * 5.0;
     req = int(reqEnergy);
     reqdec = int((reqEnergy*10) - (req*10));
 
 
-    msg = "Energy: "$energy$"."$energydec;
+    msg = "Energy: "$energy$"."$energydec$" / "$maxenergy$"."$maxenergydec;
 
     if (!bHacking) {
         msg = msg$"|n";
@@ -139,4 +254,5 @@ defaultproperties
 {
     colWhite=(R=255,G=255,B=255)
     energyMeterTimer=-1
+    BiocellButtonLabel="Use |&Biocell"
 }

DXRBalance/DeusEx/Classes/BuffTechGoggles.uc

@@ -35,7 +35,7 @@ function UpdateHUDDisplay(DeusExPlayer Player)
     local AugmentationDisplayWindow augDisplay;
     local float dist;
 
-    aug = AugVision(Player.AugmentationSystem.GetAug(class'AugVision'));
+    aug = AugVision(Player.AugmentationSystem.FindAugmentation(class'AugVision'));
     dist = CalcDistance(aug);
 
     augDisplay = DeusExRootWindow(Player.rootWindow).hud.augDisplay;
@@ -69,7 +69,7 @@ function ChargedPickupEnd(DeusExPlayer Player)
         augDisplay.visionBlinder = None;
     } else {
         augDisplay.visionLevel -= 1;
-        aug = AugVision(Player.AugmentationSystem.GetAug(class'AugVision'));
+        aug = AugVision(Player.AugmentationSystem.FindAugmentation(class'AugVision'));
         augDisplay.visionLevelValue -= CalcDistance(aug);
     }
 

DXRCore/DeusEx/Classes/DXRActorsBase.uc

@@ -14,6 +14,7 @@ struct FMinMax {
 
 struct safe_rule {
     var name item_name;
+    var string package_name;
     var vector min_pos;
     var vector max_pos;
     var bool allow;
@@ -1137,14 +1138,15 @@ function #var(injectsprefix)InformationDevices SpawnDatacube(vector loc, rotator
 }
 
 
-function #var(injectsprefix)InformationDevices SpawnDatacubePlaintext(vector loc, rotator rot, string text, optional bool dont_move)
+function #var(injectsprefix)InformationDevices SpawnDatacubePlaintext(vector loc, rotator rot, string text, string plaintextTag, optional bool dont_move)
 {
     local #var(injectsprefix)InformationDevices dc;
 
     dc = SpawnDatacube(loc,rot,dont_move);
 
     if(dc != None) {
         dc.plaintext = text;
+        dc.plaintextTag=plaintextTag;
     }
     return dc;
 }
@@ -1204,7 +1206,7 @@ function Actor SpawnReplacement(Actor a, class<Actor> newclass, optional bool do
 
     l("SpawnReplacement("$a$", "$newclass$") " $ newactor);
 
-    newactor.SetCollision(bCollideActors, bBlockActors, bBlockPlayers);
+    newactor.RotationRate=a.RotationRate;
     newactor.SetPhysics(a.Physics);
     newactor.SetBase(a.Base);
     newactor.Event = event;
@@ -1231,6 +1233,10 @@ function Actor SpawnReplacement(Actor a, class<Actor> newclass, optional bool do
         newactor.SetPropertyText("PrecessorName", a.GetPropertyText("PrecessorName"));
     }
 
+    //SetBase resets the collision to... defaults?
+    //Do this last for safety
+    newactor.SetCollision(bCollideActors, bBlockActors, bBlockPlayers);
+
     return newactor;
 }
 
@@ -1691,12 +1697,13 @@ function safe_rule FixSafeRule(safe_rule r)
     return r;
 }
 
-function int GetSafeRule(safe_rule rules[16], name item_name, vector newpos)
+function int GetSafeRule(safe_rule rules[16], coerce string item_name, string package_name, vector newpos)
 {
     local int i;
 
     for(i=0; i<ArrayCount(rules); i++) {
-        if( item_name != rules[i].item_name ) continue;
+        if( !(item_name ~= string(rules[i].item_name) )) continue;
+        if( !(package_name ~= rules[i].package_name )) continue;
         if( AnyGreater( rules[i].min_pos, newpos ) ) continue;
         if( AnyGreater( newpos, rules[i].max_pos ) ) continue;
         return i;
@@ -1754,7 +1761,8 @@ function RemoveMoverPrePivot(Mover m)
 static function Actor GlowUp(Actor a, optional byte hue, optional byte saturation)
 {
     // if `a` is a datacube, spawn a new light instead
-    if (#var(prefix)DataCube(a) != None) {
+    // Weirdly generalized check here, since non-vanilla replaces with InformationDevices
+    if (#var(prefix)InformationDevices(a) != None && a.Mesh == class'#var(prefix)DataCube'.default.Mesh) {
         a = a.Spawn(class'DynamicLight', a,, a.Location + vect(0, 0, 6.0));
         a.SetBase(a.Owner);
         a.LightSaturation = 0;

DXRCore/DeusEx/Classes/DXRMenuSetupRando.uc

@@ -245,26 +245,29 @@ function BindControls(optional string action)
     NewMenuItem("Enemy Weapons Variety %", "Should enemies be using weapons that normally exist in the map?");
     Slider(f.moresettings.enemies_weapons, 0, 100);
 
+    NewMenuItem("Robot Weapons Rando %", "Allow robots to get randomized weapons.");
+    Slider(f.settings.bot_weapons, 0, 100);
+
     NewMenuItem("Non-Human Chance %", "Reduce the chance of new enemies being non-humans.");
     Slider(f.settings.enemies_nonhumans, 0, 100);
 
     NewMenuItem("Enemy Respawn Seconds", "How many seconds for enemies to respawn. Leave blank or 0 to disable.");
-    Slider(f.settings.enemyrespawn, 0, 10000);
+    Slider(f.settings.enemyrespawn, 0, 3600);
+
+    NewMenuItem("Reanimation Seconds", "Approximately how many seconds for corpses to come back as zombies. Leave blank or 0 to disable.");
+    Slider(f.moresettings.reanimation, 0, 3600);
 
     NewMenuItem("Move Turrets", "Randomizes locations of turrets, cameras, and security computers for them.");
     Slider(f.settings.turrets_move, 0, 100);
 
     NewMenuItem("Add Turrets", "Randomly adds turrets, cameras, and security computers for them.");
     Slider(f.settings.turrets_add, 0, 10000);
 
-    NewMenuItem("Robot Weapons Rando %", "Allow robots to get randomized weapons.");
-    Slider(f.settings.bot_weapons, 0, 100);
-
     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);
 
-    NewMenuItem("Paris Chill %", "Removes MJ12 from the Champs-Elysees.");
+    NewMenuItem("Paris Chill %", "Chance to remove all MJ12 from the Champs-Elysees.");
     Slider(f.remove_paris_mj12, 0, 100);
 
 
@@ -362,6 +365,9 @@ 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%
 
+    NewMenuItem("Aug Slot Rando %", "The chance for each aug to randomize the body part it can be installed into");
+    Slider(f.moresettings.aug_loc_rando, 0, 100);
+
     NewGroup("New Game+");
 
     NewMenuItem("Scaling %", "Scales the curve of New Game+ changes over successive loops. Set to -1 to disable. 100% is default.");

DXRCore/DeusEx/Classes/DXRVersion.uc

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

DXRCore/DeusEx/Classes/DXRando.uc

@@ -168,7 +168,7 @@ function CheckConfig()
         player.bAskedToTrain = false;
         player.SaveConfig();
     }
-    if( VersionOlderThan(config_version, 3,2,3,3) ) {
+    if( VersionOlderThan(config_version, 3,2,5,1) ) {
         for(i=0; i < ArrayCount(modules_to_load); i++) {
             modules_to_load[i] = "";
         }
@@ -215,6 +215,7 @@ function vanilla_modules()
     modules_to_load[i++] = "DXRHordeMode";
     //modules_to_load[i++] = "DXRKillBobPage";
     modules_to_load[i++] = "DXREnemyRespawn";
+    modules_to_load[i++] = "DXRZombies";
     modules_to_load[i++] = "DXRLoadouts";
     modules_to_load[i++] = "DXRWeapons";
     modules_to_load[i++] = "DXRCrowdControl";
@@ -255,6 +256,7 @@ function hx_modules()
     modules_to_load[i++] = "DXREnemies";
     modules_to_load[i++] = "DXRHordeMode";
     modules_to_load[i++] = "DXREnemyRespawn";
+    modules_to_load[i++] = "DXRZombies";
     modules_to_load[i++] = "DXRLoadouts";
     modules_to_load[i++] = "DXRWeapons";
     modules_to_load[i++] = "DXRCrowdControl";
@@ -290,6 +292,7 @@ function gmdx_modules()
     modules_to_load[i++] = "DXREnemies";
     modules_to_load[i++] = "DXRHordeMode";
     modules_to_load[i++] = "DXREnemyRespawn";
+    modules_to_load[i++] = "DXRZombies";
     modules_to_load[i++] = "DXRLoadouts";
     modules_to_load[i++] = "DXRWeapons";
     modules_to_load[i++] = "DXRCrowdControl";
@@ -335,6 +338,7 @@ function vmd_modules()
     modules_to_load[i++] = "DXREnemies";
     modules_to_load[i++] = "DXRHordeMode";
     modules_to_load[i++] = "DXREnemyRespawn";
+    modules_to_load[i++] = "DXRZombies";
     modules_to_load[i++] = "DXRLoadouts";
     modules_to_load[i++] = "DXRWeapons";
     modules_to_load[i++] = "DXRCrowdControl";