v2.7.1.2 Beta Merge pull request #727 from Die4Ever/develop

v2.7.1.2 Beta

DXRBalance/DeusEx/Classes/AugMuscle.uc

@@ -9,9 +9,11 @@ function PostPostBeginPlay()
  Description = default.Description;
 }
 
+// LevelValues only affect throwing velocity in vanilla, and in DXRando also DoJump
+// otherwise vanilla uses GetClassLevel() + 2
 defaultproperties
 {
  MaxLevel=1
  LevelValues(0)=1.25
- LevelValues(1)=2.0
+ LevelValues(1)=2
 }

DXRBalance/DeusEx/Classes/AugmentationManager.uc

@@ -164,6 +164,8 @@ simulated function Float CalcEnergyUse(float deltaTime)
  energyUse = 0;
  energyMult = 1.0;
 
+ Player.AmbientSound = None;
+
  anAug = FirstAug;
  while(anAug != None)
  {
@@ -180,6 +182,10 @@ simulated function Float CalcEnergyUse(float deltaTime)
  bBoosting = true;
  }
  energyUse += f;
+
+ if ((anAug.bAutomatic == false && anAug.bAlwaysActive == false) || f > 0.0) {
+ Player.AmbientSound = anAug.LoopSound;
+ }
  }
  anAug = anAug.next;
  }

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=1;//build can't be higher than 99
+ build=2;//build can't be higher than 99
 }
 
 simulated static function bool VersionIsStable()
@@ -18,7 +18,7 @@ simulated static function string VersionString(optional bool full)
  local int major,minor,patch,build;
  local string status;
 
- status = "Alpha";
+ status = "Beta";
 
  if(status!="") {
  status = " " $ status;

DXRMapFixups/DeusEx/Classes/DXRFixupM03.uc

@@ -134,10 +134,12 @@ function PreFirstEntryMapFixes()
  m.Tag = 'Sewerdoor';
  }
  }
- foreach AllActors(class'Trigger', t) {
- //disable the platforms that fall when you step on them
- if( t.Name == 'Trigger0' || t.Name == 'Trigger1' ) {
- t.Event = '';
+ if(!dxr.flags.IsZeroRando()) {
+ foreach AllActors(class'Trigger', t) {
+ //disable the platforms that fall when you step on them
+ if( t.Name == 'Trigger0' || t.Name == 'Trigger1' ) {
+ t.Event = '';
+ }
  }
  }
  foreach AllActors(class'#var(prefix)UNATCOTroop', unatco) {

DXRMapFixups/DeusEx/Classes/DXRFixupM15.uc

@@ -369,8 +369,10 @@ function PreFirstEntryMapFixes_Page()
  }
  }
 
- //Add a switch to manually trigger the infolink that gives you the Helios computer password
- AddSwitch( vect(5635.609375,-5352.036133,-5240.890625), rot(0, 0, 0), 'PasswordCallReset', "Forgot your Password?");
+ if(!dxr.flags.IsZeroRando()) {
+ //Add a switch to manually trigger the infolink that gives you the Helios computer password
+ AddSwitch( vect(5635.609375,-5352.036133,-5240.890625), rot(0, 0, 0), 'PasswordCallReset', "Forgot your Password?");
+ }
 
  ft=Spawn(class'#var(prefix)FlagTrigger');
  ft.bSetFlag=True; //Setting both of these means it will set the flag

DXRMissions/DeusEx/Classes/DXRMissionsM02.uc

@@ -3,7 +3,7 @@ class DXRMissionsM02 extends DXRMissions;
 
 function int InitGoals(int mission, string map)
 {
- local int goal, loc, loc2;
+ local int goal, loc, loc2, vents_start, jock_sewer, generator_sewer, generator_alley;
 
  switch(map) {
  case "02_NYC_BATTERYPARK":
@@ -14,7 +14,7 @@ function int InitGoals(int mission, string map)
  AddGoalActor(goal, 4, 'DataLinkTrigger1', PHYS_None);
 
  AddGoalLocation("02_NYC_BATTERYPARK", "Dock", START_LOCATION | VANILLA_START, vect(-619.571289, -3679.116455, 255.099762), rot(0, 29856, 0));
- AddGoalLocation("02_NYC_BATTERYPARK", "Ventilation system", NORMAL_GOAL | START_LOCATION, vect(-4310.507813, 2237.952637, 189.843536), rot(0, 0, 0));
+ vents_start = AddGoalLocation("02_NYC_BATTERYPARK", "Ventilation system", NORMAL_GOAL | START_LOCATION, vect(-4310.507813, 2237.952637, 189.843536), rot(0, 0, 0));
 
  loc = AddGoalLocation("02_NYC_BATTERYPARK", "Ambrosia Vanilla", NORMAL_GOAL | VANILLA_GOAL | START_LOCATION, vect(507.282898, -1066.344604, -403.132751), rot(0, 16536, 0));
  AddActorLocation(loc, PLAYER_LOCATION, vect(81.434570, -1123.060547, -384.397644), rot(0, 8000, 0));
@@ -23,8 +23,10 @@ function int InitGoals(int mission, string map)
  AddGoalLocation("02_NYC_BATTERYPARK", "Behind the cargo", NORMAL_GOAL, vect(58.725319, -446.887207, -405.899323), rot(0, 0, 0));
  AddGoalLocation("02_NYC_BATTERYPARK", "By the desk", NORMAL_GOAL, vect(-615.152161, -665.281738, -397.581146), rot(0, 0, 0));
  AddGoalLocation("02_NYC_BATTERYPARK", "Walkway by the water", NORMAL_GOAL, vect(-420.000000, -2222.000000, -400), rot(0, 0, 0));
- AddGoalLocation("02_NYC_BATTERYPARK", "Subway stairs", NORMAL_GOAL, vect(-5106.205078, 1813.453003, -82.239639), rot(0, 0, 0));
- AddGoalLocation("02_NYC_BATTERYPARK", "Subway", NORMAL_GOAL, vect(-4727.703613, 3116.336670, -321.900604), rot(0, 0, 0));
+ loc = AddGoalLocation("02_NYC_BATTERYPARK", "Subway stairs", NORMAL_GOAL, vect(-5106.205078, 1813.453003, -82.239639), rot(0, 0, 0));
+ AddMutualExclusion(loc, vents_start);// don't put ambrosia in the subway if you start right there in the vents, too easy
+ loc = AddGoalLocation("02_NYC_BATTERYPARK", "Subway", NORMAL_GOAL, vect(-4727.703613, 3116.336670, -321.900604), rot(0, 0, 0));
+ AddMutualExclusion(loc, vents_start);// don't put ambrosia in the subway if you start right there in the vents, too easy
 
  if (dxr.flags.settings.starting_map > 20)
  {
@@ -40,19 +42,20 @@ function int InitGoals(int mission, string map)
  AddGoalLocation("02_NYC_WAREHOUSE", "Holy Smokes", NORMAL_GOAL, vect(-566.249695, 305.599731, 1207.798462), rot(0, -32800, 0));
  AddGoalLocation("02_NYC_WAREHOUSE", "Back Door", NORMAL_GOAL, vect(1656.467041, -1658.624268, 357.798462), rot(0, -32800, 0));
  AddGoalLocation("02_NYC_WAREHOUSE", "Dumpster", NORMAL_GOAL, vect(1665.240112, 91.544250, 126.798462), rot(0, 0, 0));
- loc2 = AddGoalLocation("02_NYC_WAREHOUSE", "Sewer", NORMAL_GOAL, vect(-1508.833008, 360, -216.201538), rot(0, 16400, 0));
+ jock_sewer = AddGoalLocation("02_NYC_WAREHOUSE", "Sewer", NORMAL_GOAL, vect(-1508.833008, 360, -216.201538), rot(0, 16400, 0));
 
  goal = AddGoal("02_NYC_WAREHOUSE", "Generator", GOAL_TYPE1, 'BreakableWall2', PHYS_MovingBrush);
  AddGoalActor(goal, 1, 'CrateExplosiveSmall0', PHYS_None);
  AddGoalActor(goal, 2, 'CrateExplosiveSmall6', PHYS_None);
  AddGoalActor(goal, 3, 'AmbientSoundTriggered0', PHYS_None);
  AddGoalActor(goal, 4, 'AmbientSoundTriggered1', PHYS_None);
  AddGoalLocation("02_NYC_WAREHOUSE", "Warehouse", GOAL_TYPE1 | VANILLA_GOAL, vect(576.000000, -512.000000, 71.999939), rot(32768, -16384, 0));
- AddGoalLocation("02_NYC_WAREHOUSE", "Alley", GOAL_TYPE1, vect(-640.000000, 1760.000000, 128.000000), rot(0,32768,-16384));
+ generator_alley = AddGoalLocation("02_NYC_WAREHOUSE", "Alley", GOAL_TYPE1, vect(-640.000000, 1760.000000, 128.000000), rot(0,32768,-16384));
+ AddMutualExclusion(generator_alley, jock_sewer);// too easy
  AddGoalLocation("02_NYC_WAREHOUSE", "Apartment", GOAL_TYPE1, vect(368.000000, 1248.000000, 992.000000), rot(0,32768,-16384));
  AddGoalLocation("02_NYC_WAREHOUSE", "Basement", GOAL_TYPE1, vect(224, -512, -192), rot(0,-16384,-16384));
- loc = AddGoalLocation("02_NYC_WAREHOUSE", "Sewer", GOAL_TYPE1, vect(-1600.000000, 784.000000, -256.000000), rot(32768,-32768,0));
- AddMutualExclusion(loc, loc2);// can't put Jock and the generator both in the sewers
+ generator_sewer = AddGoalLocation("02_NYC_WAREHOUSE", "Sewer", GOAL_TYPE1, vect(-1600.000000, 784.000000, -256.000000), rot(32768,-32768,0));
+ AddMutualExclusion(generator_sewer, jock_sewer);// can't put Jock and the generator both in the sewers
  // pawns run into these and break them
  //AddGoalLocation("02_NYC_WAREHOUSE", "3rd Floor", GOAL_TYPE1, vect(1360.000000, -512.000000, 528.000000), rot(32768, -16384, 0));
  //AddGoalLocation("02_NYC_WAREHOUSE", "3rd Floor Corner", GOAL_TYPE1, vect(1600, -1136.000000, 540), rot(32768, 16384, 0));
@@ -72,7 +75,7 @@ function int InitGoals(int mission, string map)
 
 function int InitGoalsRev(int mission, string map)
 {
- local int goal, loc, loc2;
+ local int goal, loc, loc2, vents_start, jock_sewer, generator_sewer, generator_alley;;
 
  switch(map) {
  case "02_NYC_BATTERYPARK":
@@ -83,7 +86,7 @@ function int InitGoalsRev(int mission, string map)
  AddGoalActor(goal, 4, 'DataLinkTrigger15', PHYS_None);
 
  AddGoalLocation("02_NYC_BATTERYPARK", "Dock", START_LOCATION | VANILLA_START, vect(-619.571289, -3679.116455, 255.099762), rot(0, 29856, 0));
- AddGoalLocation("02_NYC_BATTERYPARK", "Ventilation system", NORMAL_GOAL | START_LOCATION, vect(-4310.507813, 2237.952637, 189.843536), rot(0, 0, 0));
+ vents_start = AddGoalLocation("02_NYC_BATTERYPARK", "Ventilation system", NORMAL_GOAL | START_LOCATION, vect(-4310.507813, 2237.952637, 189.843536), rot(0, 0, 0));
 
  loc = AddGoalLocation("02_NYC_BATTERYPARK", "Ambrosia Vanilla", NORMAL_GOAL | VANILLA_GOAL | START_LOCATION, vect(507.282898, -1066.344604, -403.132751), rot(0, 16536, 0));
  AddActorLocation(loc, PLAYER_LOCATION, vect(81.434570, -1123.060547, -384.397644), rot(0, 8000, 0));
@@ -92,8 +95,10 @@ function int InitGoalsRev(int mission, string map)
  AddGoalLocation("02_NYC_BATTERYPARK", "Behind the cargo", NORMAL_GOAL, vect(185,-30,-405), rot(0, 32768, 0));
  AddGoalLocation("02_NYC_BATTERYPARK", "By the desk", NORMAL_GOAL, vect(-615.152161, -665.281738, -397.581146), rot(0, 0, 0));
  AddGoalLocation("02_NYC_BATTERYPARK", "Walkway by the water", NORMAL_GOAL, vect(-420.000000, -2222.000000, -400), rot(0, 0, 0));
- AddGoalLocation("02_NYC_BATTERYPARK", "Subway stairs", NORMAL_GOAL, vect(-5106.205078, 1813.453003, -82.239639), rot(0, 0, 0));
- AddGoalLocation("02_NYC_BATTERYPARK", "Subway", NORMAL_GOAL, vect(-4727.703613, 3116.336670, -321.900604), rot(0, 0, 0));
+ loc = AddGoalLocation("02_NYC_BATTERYPARK", "Subway stairs", NORMAL_GOAL, vect(-5106.205078, 1813.453003, -82.239639), rot(0, 0, 0));
+ AddMutualExclusion(loc, vents_start);// don't put ambrosia in the subway if you start right there in the vents, too easy
+ loc = AddGoalLocation("02_NYC_BATTERYPARK", "Subway", NORMAL_GOAL, vect(-4727.703613, 3116.336670, -321.900604), rot(0, 0, 0));
+ AddMutualExclusion(loc, vents_start);// don't put ambrosia in the subway if you start right there in the vents, too easy
 
  if (dxr.flags.settings.starting_map > 20)
  {
@@ -109,17 +114,18 @@ function int InitGoalsRev(int mission, string map)
  AddGoalLocation("02_NYC_WAREHOUSE", "Holy Smokes", NORMAL_GOAL, vect(-566.249695, 305.599731, 1207.798462), rot(0, -32800, 0));
  AddGoalLocation("02_NYC_WAREHOUSE", "Back Door", NORMAL_GOAL, vect(1656.467041, -1658.624268, 357.798462), rot(0, -32800, 0));
  AddGoalLocation("02_NYC_WAREHOUSE", "Dumpster", NORMAL_GOAL, vect(1665.240112, 91.544250, 126.798462), rot(0, 0, 0));
- loc2 = AddGoalLocation("02_NYC_WAREHOUSE", "Sewer", NORMAL_GOAL, vect(-1508.833008, 360, -216.201538), rot(0, 16400, 0));
+ jock_sewer = AddGoalLocation("02_NYC_WAREHOUSE", "Sewer", NORMAL_GOAL, vect(-1508.833008, 360, -216.201538), rot(0, 16400, 0));
 
  goal = AddGoal("02_NYC_WAREHOUSE", "Generator", GOAL_TYPE1, 'BreakableWall2', PHYS_MovingBrush);
  AddGoalActor(goal, 1, 'CrateExplosiveSmall0', PHYS_None);
  AddGoalActor(goal, 2, 'CrateExplosiveSmall6', PHYS_None);
  AddGoalLocation("02_NYC_WAREHOUSE", "Warehouse", GOAL_TYPE1 | VANILLA_GOAL, vect(448,-560,224), rot(32768, -16384, 0));
- AddGoalLocation("02_NYC_WAREHOUSE", "Alley", GOAL_TYPE1, vect(-544,1664,16), rot(0,32768,-16384));
+ generator_alley = AddGoalLocation("02_NYC_WAREHOUSE", "Alley", GOAL_TYPE1, vect(-544,1664,16), rot(0,32768,-16384));
+ AddMutualExclusion(generator_alley, jock_sewer);// too easy
  AddGoalLocation("02_NYC_WAREHOUSE", "Apartment", GOAL_TYPE1, vect(304,1184,880), rot(0,32768,-16384));
  AddGoalLocation("02_NYC_WAREHOUSE", "Basement", GOAL_TYPE1, vect(414.272583,-519.35,-272), rot(0,-16384,-16384));
- loc = AddGoalLocation("02_NYC_WAREHOUSE", "Sewer", GOAL_TYPE1, vect(-1712,912,-112), rot(32768,-32768,0));
- AddMutualExclusion(loc, loc2);// can't put Jock and the generator both in the sewers
+ generator_sewer = AddGoalLocation("02_NYC_WAREHOUSE", "Sewer", GOAL_TYPE1, vect(-1712,912,-112), rot(32768,-32768,0));
+ AddMutualExclusion(generator_sewer, jock_sewer);// can't put Jock and the generator both in the sewers
  // pawns run into these and break them
  //AddGoalLocation("02_NYC_WAREHOUSE", "3rd Floor", GOAL_TYPE1, vect(1360.000000, -512.000000, 528.000000), rot(32768, -16384, 0));
  //AddGoalLocation("02_NYC_WAREHOUSE", "3rd Floor Corner", GOAL_TYPE1, vect(1600, -1136.000000, 540), rot(32768, 16384, 0));

DXRMissions/DeusEx/Classes/DXRMissionsM08.uc

@@ -6,7 +6,7 @@ class DXRMissionsM08 extends DXRMissions;
 
 function int InitGoals(int mission, string map)
 {
- local int goal, loc, loc2;
+ local int goal, loc, loc2, bar1, bar2;
 
  AddGoal("08_NYC_Bar", "Harley Filben", GOAL_TYPE1, 'HarleyFilben0', PHYS_Falling);
  goal = AddGoal("08_NYC_Bar", "Vinny", GOAL_TYPE1, 'NathanMadison0', PHYS_Falling);
@@ -15,8 +15,9 @@ function int InitGoals(int mission, string map)
  AddGoal("08_NYC_FreeClinic", "Joe Greene", GOAL_TYPE1, 'JoeGreene0', PHYS_Falling);
 
  AddGoalLocation("08_NYC_Street", "Hotel Roof", START_LOCATION | VANILLA_START | GOAL_TYPE1, vect(-354.250427, 795.071594, 594.411743), rot(0, -18600, 0));
- AddGoalLocation("08_NYC_Bar", "Bar Table", GOAL_TYPE1 | VANILLA_GOAL | SITTING_GOAL, vect(-1689.125122, 337.159912, 63.599533), rot(0,-10144,0));
- AddGoalLocation("08_NYC_Bar", "Bar", GOAL_TYPE1 | VANILLA_GOAL, vect(-931.038086, -488.537109, 47.600464), rot(0,9536,0));
+ bar1 = AddGoalLocation("08_NYC_Bar", "Bar Table", GOAL_TYPE1 | VANILLA_GOAL | SITTING_GOAL, vect(-1689.125122, 337.159912, 63.599533), rot(0,-10144,0));
+ bar2 = AddGoalLocation("08_NYC_Bar", "Bar", GOAL_TYPE1 | VANILLA_GOAL, vect(-931.038086, -488.537109, 47.600464), rot(0,9536,0));
+ AddMutualExclusion(bar1, bar2);
  AddGoalLocation("08_NYC_FreeClinic", "Clinic", GOAL_TYPE1 | VANILLA_GOAL, vect(904.356262, -1229.045166, -272.399506), rot(0,31640,0));
  AddGoalLocation("08_NYC_Underground", "Sewers", GOAL_TYPE1, vect(591.048462, -152.517639, -560.397888), rot(0,32768,0));
  AddGoalLocation("08_NYC_Hotel", "Hotel", GOAL_TYPE1 | SITTING_GOAL, vect(-108.541245, -2709.490479, 111.600838), rot(0,20000,0));
@@ -47,7 +48,7 @@ function int InitGoals(int mission, string map)
 
 function int InitGoalsRev(int mission, string map)
 {
- local int goal, loc, loc2;
+ local int goal, loc, loc2, bar1, bar2;
 
  AddGoal("08_NYC_Bar", "Harley Filben", NORMAL_GOAL, 'HarleyFilben0', PHYS_Falling);
  goal = AddGoal("08_NYC_Bar", "Vinny", NORMAL_GOAL, 'NathanMadison0', PHYS_Falling);
@@ -56,8 +57,9 @@ function int InitGoalsRev(int mission, string map)
  AddGoal("08_NYC_FreeClinic", "Joe Greene", NORMAL_GOAL, 'JoeGreene0', PHYS_Falling);
 
  AddGoalLocation("08_NYC_Street", "Hotel Roof", START_LOCATION | VANILLA_START | NORMAL_GOAL, vect(-462.25,856,634.4), rot(0, -18600, 0));
- AddGoalLocation("08_NYC_Bar", "Bar Table", NORMAL_GOAL | VANILLA_GOAL | SITTING_GOAL, vect(-1394.78,727.7,95.6), rot(0,-10144,0));
- AddGoalLocation("08_NYC_Bar", "Bar", NORMAL_GOAL | VANILLA_GOAL, vect(-556.6,-403.86,49.6), rot(0,41832,0));
+ bar1 = AddGoalLocation("08_NYC_Bar", "Bar Table", NORMAL_GOAL | VANILLA_GOAL | SITTING_GOAL, vect(-1394.78,727.7,95.6), rot(0,-10144,0));
+ bar2 = AddGoalLocation("08_NYC_Bar", "Bar", NORMAL_GOAL | VANILLA_GOAL, vect(-556.6,-403.86,49.6), rot(0,41832,0));
+ AddMutualExclusion(bar1, bar2);
  AddGoalLocation("08_NYC_FreeClinic", "Clinic", NORMAL_GOAL | VANILLA_GOAL, vect(1293.991211,-1226.047852,-239.399506), rot(0,31640,0));
  AddGoalLocation("08_NYC_Underground", "Sewers", NORMAL_GOAL, vect(591.048462, -152.517639, -560.397888), rot(0,32768,0));
  AddGoalLocation("08_NYC_Hotel", "Hotel", NORMAL_GOAL | SITTING_GOAL, vect(316,-3439,111), rot(0,0,0));
@@ -161,6 +163,7 @@ function AfterMoveGoalToLocation(Goal g, GoalLocation Loc)
  g.actors[0].a.DrawScale = 1;
  g.actors[0].a.SetCollisionSize(320, 87);
  }
+ g.actors[0].a.SoundRadius = 255;// this is a byte, FLOAT WorldSoundRadius() const {return 25.0 * ((int)SoundRadius+1);}
  }
 }