v2.6.3.4 Alpha

DXRBalance/DeusEx/Classes/AugAqualung.uc

@@ -3,7 +3,10 @@ class DXRAugAqualung injects AugAqualung;
 function PostPostBeginPlay()
 {
  Super.PostPostBeginPlay();
- // description gets overwritten by language file
+ // description gets overwritten by language file, also DXRAugmentations reads from the default.Description
+ // use the vanilla Level 3 description for our max level even though we're using level 4 strength, because the level 4 description makes no sense
+ default.Description = "Soda lime exostructures imbedded in the alveoli of the lungs convert CO2 to O2, extending the time an agent can remain underwater."
+ $ "|n|nTECH ONE: Lung capacity is extended moderately.|n|nTECH TWO: Lung capacity is extended significantly.";
  Description = default.Description;
 }
 
@@ -24,7 +27,6 @@ defaultproperties
  AutoLength=0
  AutoEnergyMult=1// no penalty, it's a gift
  MaxLevel=1
- Description="Soda lime exostructures imbedded in the alveoli of the lungs convert CO2 to O2, extending the time an agent can remain underwater.|n|nTECH ONE: Lung capacity is extended moderately.|n|nTECH TWO: An agent can stay underwater indefinitely."
  LevelValues(0)=60.000000
  LevelValues(1)=240.000000
 }

DXRBalance/DeusEx/Classes/AugMuscle.uc

@@ -3,14 +3,15 @@ class DXRAugMuscle injects AugMuscle;
 function PostPostBeginPlay()
 {
  Super.PostPostBeginPlay();
- // description gets overwritten by language file
+ // description gets overwritten by language file, also DXRAugmentations reads from the default.Description
+ default.Description = "Muscle strength is amplified with ionic polymeric gel myofibrils that allow the agent to push and lift extraordinarily heavy objects."
+ $ "|n|nTECH ONE: Strength is increased slightly.|n|nTECH TWO: An agent is inhumanly strong.";
  Description = default.Description;
 }
 
 defaultproperties
 {
  MaxLevel=1
- Description="Muscle strength is amplified with ionic polymeric gel myofibrils that allow the agent to push and lift extraordinarily heavy objects.|n|nTECH ONE: Strength is increased slightly.|n|nTECH TWO: An agent is inhumanly strong."
  LevelValues(0)=1.25
  LevelValues(1)=2.0
 }

DXRBalance/DeusEx/Classes/AugTarget.uc

@@ -4,8 +4,8 @@ simulated function TickUse()
 {
  if(DeusExRootWindow(Player.rootWindow).winCount > 0)
  return; // don't tick while reading item descriptions
- if (Player.inHand!=None && DeusExWeapon(Player.inHand)!=None && DeusExWeapon(Player.inHand).bHandToHand && (DeusExWeapon(Player.inHand).ProjectileClass == None)){
- return; // don't tick for melee
+ if (Player.inHand!=None && DeusExWeapon(Player.inHand)!=None){
+ return; // don't tick unless you're holding a weapon
  }
  Super.TickUse();
  SetTargetingAugStatus(CurrentLevel, bIsActive);// we're enabled

DXRBalance/DeusEx/Classes/BalanceAugHealing.uc

@@ -1,6 +1,18 @@
 class BalanceAugHealing injects AugHealing;
 
-//DXR: put a cap on the health that regen gives you
+function PostPostBeginPlay()
+{
+ Super.PostPostBeginPlay();
+ // description gets overwritten by language file, also DXRAugmentations reads from the default.Description
+ default.Description = "Programmable polymerase automatically directs construction of proteins in injured cells, restoring an agent's health over time."
+ $ "|n|nTECH ONE: Healing only fixes serious injuries."
+ $ "|n|nTECH TWO: Healing fixes moderate injuries."
+ $ "|n|nTECH THREE: Healing fixes most injuries."
+ $ "|n|nTECH FOUR: Healing restores the agent to nearly full health.";
+ Description = default.Description;
+}
+
+//DXRando: put a cap on the health that regen gives you
 state Active
 {
 Begin:

DXRBalance/DeusEx/Classes/BalanceAugSpeed.uc

@@ -24,7 +24,6 @@ Begin:
 defaultproperties
 {
  EnergyRate=40
- Description="Ionic polymeric gel myofibrils are woven into the leg muscles, increasing the speed at which an agent can run and climb, the height they can jump, and reducing the damage they receive from falls.|n|nTECH ONE: Speed and jumping are increased slightly, while falling damage is reduced.|n|nTECH TWO: Speed and jumping are increased moderately, while falling damage is further reduced.|n|nTECH THREE: Speed and jumping are increased significantly, while falling damage is substantially reduced.|n|nTECH FOUR: An agent can run like the wind and leap from the tallest building."
  LevelValues(0)=1.2
  LevelValues(1)=1.35
  LevelValues(2)=1.5

DXRBalance/DeusEx/Classes/SkillComputer.uc

@@ -1,5 +1,6 @@
 class SkillComputer injects SkillComputer;
 
+// vanilla is 1, 1, 2, 4
 defaultproperties
 {
  LevelValues(0)=0.8

DXRCore/DeusEx/Classes/DXRActorsBase.uc

@@ -356,6 +356,7 @@ static function ThrowItem(Inventory item, float VelocityMult)
  // kinda copied from DeusExPlayer DropItem function
  item.Velocity = rot * 300 + vect(0,0,220) + VRand()*32;
  item.Velocity *= VelocityMult;
+ item.SetCollision(true, false, false); // prevent this from blocking NPCs
 }
 
 function Inventory MoveNextItemTo(Inventory item, vector Location, name Tag)

DXRCore/DeusEx/Classes/DXRVersion.uc

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

DXRFixes/DeusEx/Classes/HUDHitDisplay.uc

@@ -3,5 +3,10 @@ class DXRHUDHitDisplay merges HUDHitDisplay;
 function SetHitColor(out BodyPart part, float deltaSeconds, bool bHide, int hitValue)
 {
  deltaSeconds = FClamp(deltaSeconds, 0, 0.05); // limit delta, so numbers don't go crazy
+
+ // if going from dead to alive, immediately put the body part at 1 health so it draws red right away, great for drinking alcohol when it would take multiple seconds to fade from 0 health to 1 health
+ if(hitValue > 0 && part.displayedHealth <= 0) {
+ part.displayedHealth = 1;
+ }
  _SetHitColor(part, deltaSeconds, bHide, hitValue);
 }

DXRMapFixups/DeusEx/Classes/DXRFixupM00.uc

@@ -108,6 +108,8 @@ function PostFirstEntryMapFixes()
 {
  local Actor a;
 
+ if(dxr.flags.IsZeroRando()) return;
+
  switch(dxr.localURL) {
  case "00_TrainingFinal":
  Spawn(class'#var(prefix)BallisticArmor',,, GetRandomPositionFine());

DXRMapFixups/DeusEx/Classes/DXRFixupM02.uc

@@ -63,11 +63,13 @@ function PreFirstEntryMapFixes()
  foreach AllActors(class'Terrorist',nsf,'ShantyTerrorist'){
  nsf.Tag = 'ShantyTerrorists'; //Restores voice lines when NSF still alive (still hard to have happen though)
  }
- k = Spawn(class'#var(prefix)NanoKey',,, vectm(1574.209839, -238.380142, 339.215179));
- k.KeyID = 'ControlRoomDoor';
- k.Description = "Control Room Door Key";
- if(dxr.flags.settings.keysrando > 0)
- GlowUp(k);
+ if(!dxr.flags.IsZeroRando()) {
+ k = Spawn(class'#var(prefix)NanoKey',,, vectm(1574.209839, -238.380142, 339.215179));
+ k.KeyID = 'ControlRoomDoor';
+ k.Description = "Control Room Door Key";
+ if(dxr.flags.settings.keysrando > 0)
+ GlowUp(k);
+ }
 
  fg=Spawn(class'#var(prefix)FishGenerator',,, vectm(-1274,-3892,177));//Near Boat dock
  fg.ActiveArea=2000;
@@ -289,13 +291,15 @@ function PostFirstEntryMapFixes()
  AddBox(class'#var(prefix)CrateUnbreakableSmall', vectm(-328.287048, 767.875000, 1072.113770));
  }
 
- // this map is too hard
- Spawn(class'#var(prefix)AdaptiveArmor',,, GetRandomPositionFine());
- Spawn(class'#var(prefix)AdaptiveArmor',,, GetRandomPositionFine());
- Spawn(class'#var(prefix)BallisticArmor',,, GetRandomPositionFine());
- Spawn(class'#var(prefix)BallisticArmor',,, GetRandomPositionFine());
- Spawn(class'#var(prefix)FireExtinguisher',,, GetRandomPositionFine());
- Spawn(class'#var(prefix)FireExtinguisher',,, GetRandomPositionFine());
+ if(!dxr.flags.IsZeroRando()) {
+ // this map is too hard
+ Spawn(class'#var(prefix)AdaptiveArmor',,, GetRandomPositionFine());
+ Spawn(class'#var(prefix)AdaptiveArmor',,, GetRandomPositionFine());
+ Spawn(class'#var(prefix)BallisticArmor',,, GetRandomPositionFine());
+ Spawn(class'#var(prefix)BallisticArmor',,, GetRandomPositionFine());
+ Spawn(class'#var(prefix)FireExtinguisher',,, GetRandomPositionFine());
+ Spawn(class'#var(prefix)FireExtinguisher',,, GetRandomPositionFine());
+ }
 
  break;
  }

DXRMapFixups/DeusEx/Classes/DXRFixupM03.uc

@@ -159,8 +159,10 @@ function PreFirstEntryMapFixes()
  a = AddActor(class'DynamicBlockPlayer', vect(-3065,-405,-130));
  SetActorScale(a, 1.3);
 
- //rebreather because of #TOOCEAN connection
- Spawn(class'Rebreather',,, vectm(1411.798950, 546.628845, 247.708572));
+ if(!dxr.flags.IsZeroRando()) {
+ //rebreather because of #TOOCEAN connection
+ Spawn(class'Rebreather',,, vectm(1411.798950, 546.628845, 247.708572));
+ }
 
  //Button to extend sewer platform from the other side
  AddSwitch( vect(-5233.946289,3601.383545,161.851822), rot(0, 16384, 0), 'MoveableBridge');
@@ -180,8 +182,11 @@ function PreFirstEntryMapFixes()
  break;
 
  case "03_NYC_AIRFIELD":
- //rebreather because of #TOOCEAN connection
- Spawn(class'Rebreather',,, vectm(-2031.959473, 995.781067, 75.709816));
+ if(!dxr.flags.IsZeroRando()) {
+ //rebreather because of #TOOCEAN connection
+ Spawn(class'Rebreather',,, vectm(-2031.959473, 995.781067, 75.709816));
+ }
+
  // extra spots for datacube
  Spawn(class'PlaceholderItem',,, vectm(5113,3615,1.3)); //In front of guard tower
  Spawn(class'PlaceholderItem',,, vectm(3111,3218,275)); //Bathroom counter
@@ -299,11 +304,13 @@ function PreFirstEntryMapFixes()
  }
  }
 
- k = Spawn(class'#var(prefix)NanoKey',,, vectm(965,900,-28));
- k.KeyID = 'JaimeClosetKey';
- k.Description = "MedLab Closet Key Code";
- if(dxr.flags.settings.keysrando > 0)
- GlowUp(k);
+ if(!dxr.flags.IsZeroRando()) {
+ k = Spawn(class'#var(prefix)NanoKey',,, vectm(965,900,-28));
+ k.KeyID = 'JaimeClosetKey';
+ k.Description = "MedLab Closet Key Code";
+ if(dxr.flags.settings.keysrando > 0)
+ GlowUp(k);
+ }
 
  //Spawn some placeholders for new item locations
  Spawn(class'PlaceholderItem',,, vectm(363.284149, 344.847, 50.32)); //Womens bathroom counter
@@ -381,6 +388,8 @@ function FixAnnaAmbush()
  local #var(prefix)AnnaNavarre anna;
  local #var(prefix)ThrownProjectile p;
 
+ if(dxr.flags.IsZeroRando()) return;
+
  foreach AllActors(class'#var(prefix)AnnaNavarre', anna) {break;}
 
  // if she's angry then let her blow up

DXRMapFixups/DeusEx/Classes/DXRFixupM04.uc

@@ -82,19 +82,22 @@ function PreFirstEntryMapFixes()
  if (VanillaMaps){
  Spawn(class'#var(prefix)Binoculars',,, vectm(-610.374573,-3221.998779,94.160065)); //Paul's bedside table
 
- key = Spawn(class'#var(prefix)NanoKey',,, vectm(-967,-1240,-74));
- key.KeyID = 'CrackRoom';
- key.Description = "'Ton Hotel, North Room Key";
- if(dxr.flags.settings.keysrando > 0)
- GlowUp(key);
-
- key = Spawn(class'#var(prefix)NanoKey',,, vectm(-845,-2920,180));
- key.KeyID = 'Apartment';
- key.Description = "Apartment key";
- if(dxr.flags.settings.keysrando > 0)
- GlowUp(key);
+ if(!dxr.flags.IsZeroRando()) {
+ key = Spawn(class'#var(prefix)NanoKey',,, vectm(-967,-1240,-74));
+ key.KeyID = 'CrackRoom';
+ key.Description = "'Ton Hotel, North Room Key";
+ if(dxr.flags.settings.keysrando > 0)
+ GlowUp(key);
+
+ key = Spawn(class'#var(prefix)NanoKey',,, vectm(-845,-2920,180));
+ key.KeyID = 'Apartment';
+ key.Description = "Apartment key";
+ if(dxr.flags.settings.keysrando > 0)
+ GlowUp(key);
+
+ SpawnDatacubeTextTag(vectm(-840,-2920,85), rotm(0,0,0), '02_Datacube07',False); //Paul's stash code, in closet
+ }
 
- SpawnDatacubeTextTag(vectm(-840,-2920,85), rotm(0,0,0), '02_Datacube07',False); //Paul's stash code, in closet
  Spawn(class'PlaceholderItem',,, vectm(-732,-2628,75)); //Actual closet
  Spawn(class'PlaceholderItem',,, vectm(-732,-2712,75)); //Actual closet
  Spawn(class'PlaceholderItem',,, vectm(-129,-3038,127)); //Bathroom counter
@@ -222,11 +225,13 @@ function PreFirstEntryMapFixes()
  FixUNATCOCarterCloset();
  FixAlexsEmail();
 
- key = Spawn(class'#var(prefix)NanoKey',,, vectm(965,900,-28));
- key.KeyID = 'JaimeClosetKey';
- key.Description = "MedLab Closet Key Code";
- if(dxr.flags.settings.keysrando > 0)
- GlowUp(key);
+ if(!dxr.flags.IsZeroRando()) {
+ key = Spawn(class'#var(prefix)NanoKey',,, vectm(965,900,-28));
+ key.KeyID = 'JaimeClosetKey';
+ key.Description = "MedLab Closet Key Code";
+ if(dxr.flags.settings.keysrando > 0)
+ GlowUp(key);
+ }
 
  //Spawn some placeholders for new item locations
  Spawn(class'PlaceholderItem',,, vectm(363.284149, 344.847, 50.32)); //Womens bathroom counter

DXRMapFixups/DeusEx/Classes/DXRFixupM05.uc

@@ -17,8 +17,7 @@ function CheckConfig()
 
 function PartialHeal(out int health, int d)
 {
- health = Max(d/2, health);// half default health, or keep current health
- health = Min(health, d);// cap at the default
+ health = Clamp(health, d/2, d);
 }
 
 function PreFirstEntryMapFixes()
@@ -128,17 +127,19 @@ function PreFirstEntryMapFixes()
  RemoveFears(j);
  }
 
- k = Spawn(class'#var(prefix)NanoKey',,, vectm(420,195,333));
- k.KeyID = 'UNOfficeDoorKey';
- k.Description = "UNATCO Office Door Key";
- if(dxr.flags.settings.keysrando > 0)
- GlowUp(k);
-
- k = Spawn(class'#var(prefix)NanoKey',,, vectm(965,900,-28));
- k.KeyID = 'JaimeClosetKey';
- k.Description = "MedLab Closet Key Code";
- if(dxr.flags.settings.keysrando > 0)
- GlowUp(k);
+ if(!dxr.flags.IsZeroRando()) {
+ k = Spawn(class'#var(prefix)NanoKey',,, vectm(420,195,333));
+ k.KeyID = 'UNOfficeDoorKey';
+ k.Description = "UNATCO Office Door Key";
+ if(dxr.flags.settings.keysrando > 0)
+ GlowUp(k);
+
+ k = Spawn(class'#var(prefix)NanoKey',,, vectm(965,900,-28));
+ k.KeyID = 'JaimeClosetKey';
+ k.Description = "MedLab Closet Key Code";
+ if(dxr.flags.settings.keysrando > 0)
+ GlowUp(k);
+ }
 
  //Spawn some placeholders for new item locations
  Spawn(class'PlaceholderItem',,, vectm(363.284149, 344.847, 50.32)); //Womens bathroom counter

DXRMapFixups/DeusEx/Classes/DXRFixupM06.uc

@@ -296,8 +296,10 @@ function PreFirstEntryMapFixes()
  //The other ones are tagged as Dogs
  if (Tag=='Greasel'){
  g.BindName="JerryTheVentGreasel";
- g.FamiliarName = "Jerry the Vent Greasel";
- g.UnfamiliarName = "Jerry the Vent Greasel";
+ if(!dxr.flags.IsReducedRando()) {
+ g.FamiliarName = "Jerry the Vent Greasel";
+ g.UnfamiliarName = "Jerry the Vent Greasel";
+ }
  }
  }
 

DXRMapFixups/DeusEx/Classes/DXRFixupM08.uc

@@ -196,20 +196,22 @@ function PreFirstEntryMapFixes()
  case "08_NYC_HOTEL":
  if (VanillaMaps){
  Spawn(class'#var(prefix)Binoculars',,, vectm(-610.374573,-3221.998779,94.160065)); //Paul's bedside table
- SpawnDatacubeTextTag(vectm(-840,-2920,85), rotm(0,0,0), '02_Datacube07',False); //Paul's stash code, in closet
 
- k = Spawn(class'#var(prefix)NanoKey',,, vectm(-967,-1240,-74));
- k.KeyID = 'CrackRoom';
- k.Description = "'Ton Hotel, North Room Key";
- if(dxr.flags.settings.keysrando > 0)
- GlowUp(k);
+ if(!dxr.flags.IsZeroRando()) {
+ SpawnDatacubeTextTag(vectm(-840,-2920,85), rotm(0,0,0), '02_Datacube07',False); //Paul's stash code, in closet
 
- k = Spawn(class'#var(prefix)NanoKey',,, vectm(-845,-2920,180));
- k.KeyID = 'Apartment';
- k.Description = "Apartment key";
- if(dxr.flags.settings.keysrando > 0)
- GlowUp(k);
+  k = Spawn(class'#var(prefix)NanoKey',,, vectm(-967,-1240,-74));
+  k.KeyID = 'CrackRoom';
+  k.Description = "'Ton Hotel, North Room Key";
+  if(dxr.flags.settings.keysrando > 0)
+  GlowUp(k);
 
+ k = Spawn(class'#var(prefix)NanoKey',,, vectm(-845,-2920,180));
+ k.KeyID = 'Apartment';
+ k.Description = "Apartment key";
+ if(dxr.flags.settings.keysrando > 0)
+ GlowUp(k);
+ }
 
  Spawn(class'PlaceholderItem',,, vectm(-732,-2628,75)); //Actual closet
  Spawn(class'PlaceholderItem',,, vectm(-732,-2712,75)); //Actual closet

DXRMapFixups/DeusEx/Classes/DXRFixupM09.uc

@@ -342,8 +342,10 @@ function PostFirstEntryMapFixes()
 
  case "09_NYC_SHIPBELOW":
  if (!RevisionMaps){
- // add a tnt crate on top of the pipe, visible from the ground floor
- AddActor(class'#var(prefix)CrateExplosiveSmall', vect(141.944641, -877.442627, -175.899567));
+ if(!dxr.flags.IsZeroRando()) {
+ // add a tnt crate on top of the pipe, visible from the ground floor
+ AddActor(class'#var(prefix)CrateExplosiveSmall', vect(141.944641, -877.442627, -175.899567));
+ }
  // add a tnt crate in the locked storage closet overlooking the helipad
  AddActor(class'#var(prefix)CrateExplosiveSmall', vect(-4185.878906, -357.704376, -239.899658));
  // remove big crates blocking the window to the pipe, 16 units == 1 foot