v2.6.3.5 Alpha

DXRCore/DeusEx/Classes/DXRMenuSetupRando.uc

@@ -92,9 +92,9 @@ function BindControls(optional string action)
  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?");
- EnumOption("Enabled", 1, f.settings.bingo_freespaces);
- EnumOption("Disabled", 0, f.settings.bingo_freespaces);
+ NewMenuItem("Bingo Freespaces", "Should the center be a Free Space, or even more Free Spaces?");
+ EnumOption("0 Free Spaces", 0, f.settings.bingo_freespaces);
+ EnumOption("1 Free Space", 1, f.settings.bingo_freespaces);
  EnumOption("2 Free Spaces", 2, f.settings.bingo_freespaces);
  EnumOption("3 Free Spaces", 3, f.settings.bingo_freespaces);
  EnumOption("4 Free Spaces", 4, f.settings.bingo_freespaces);

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=4;//build can't be higher than 99
+ build=5;//build can't be higher than 99
 }
 
 simulated static function bool VersionIsStable()

DXRModules/DeusEx/Classes/DXRAugmentations.uc

@@ -417,7 +417,7 @@ simulated function string DescriptionLevel(Actor act, int i, out string word)
  return string(int(a.energyRate * a.LevelValues[i] + 0.5));
  }
  word = "Noise";
- return int(a.LevelValues[i] * 100.0) $ "%";
+ return Max(int(a.LevelValues[i] * 100.0), 0) $ "%";
  }
  else if( a.Class == class'#var(prefix)AugTarget') {
  word = "Damage";

DXRModules/DeusEx/Classes/DXRFlags.uc

@@ -10,6 +10,7 @@ const WaltonWare = 7;
 const WaltonWareEntranceRando = 8;
 const RandoMedium = 9;
 const WaltonWareHardcore = 10;
+const WaltonWarex3 = 11;
 
 #ifdef hx
 var string difficulty_names[4];// Easy, Medium, Hard, DeusEx
@@ -642,6 +643,13 @@ function FlagsSettings SetDifficulty(int new_difficulty)
  settings.health = 200;
  autosave = 5; // Ironman, autosaves and manual saves disabled
  }
+ else if(gamemode == WaltonWarex3) {
+ settings.bingo_win = 3;
+ settings.bingo_freespaces = 1;
+ bingo_duration = 3;
+ bingo_scale = 33;
+ moresettings.newgameplus_curve_scalar = 75;
+ }
 
  l("applying WaltonWare, DXRando: " $ dxr @ dxr.seed);
  settings.starting_map = class'DXRStartMap'.static.ChooseRandomStartMap(self, 10);
@@ -671,6 +679,7 @@ static function int GameModeIdForSlot(int slot)
  if(slot--==0) return WaltonWareEntranceRando;
  if(!VersionIsStable()) {
  if(slot--==0) return WaltonWareHardcore;
+ if(slot--==0) return WaltonWarex3;
  }
  if(slot--==0) return SpeedrunMode;
  if(slot--==0) return ZeroRando;
@@ -710,6 +719,8 @@ static function string GameModeName(int gamemode)
 #endif
  case WaltonWareHardcore:
  return "WaltonWare Harcore";
+ case WaltonWarex3:
+ return "WaltonWare x3";
  }
  //EnumOption("Kill Bob Page (Alpha)", 3, f.gamemode);
  //EnumOption("How About Some Soy Food?", 6, f.gamemode);
@@ -744,7 +755,7 @@ function bool IsSpeedrunMode()
 
 function bool IsWaltonWare()
 {
- return gamemode == WaltonWare || gamemode == WaltonWareEntranceRando || gamemode == WaltonWareHardcore;
+ return gamemode == WaltonWare || gamemode == WaltonWareEntranceRando || gamemode == WaltonWareHardcore || gamemode == WaltonWarex3;
 }
 
 function bool IsWaltonWareHardcore()

DXRModules/DeusEx/Classes/DXRFlagsBase.uc

@@ -309,23 +309,22 @@ simulated function string BindFlags(int mode, optional string str)
  FlagInt('Rando_playthrough_id', playthrough_id, mode, str);
  }
 
- FlagInt('Rando_maxrando', maxrando, mode, str);
+ FlagInt('Rando_gamemode', gamemode, mode, str);
+ if( FlagInt('Rando_difficulty', difficulty, mode, str) ) {
+ SetDifficulty(difficulty);
+ }
 
+ FlagInt('Rando_maxrando', maxrando, mode, str);
  FlagInt('Rando_autosave', autosave, mode, str);
  FlagInt('Rando_crowdcontrol', crowdcontrol, mode, str);
  FlagInt('Rando_loadout', loadout, mode, str);
  FlagInt('Rando_newgameplus_loops', newgameplus_loops, mode, str);
- FlagInt('Rando_gamemode', gamemode, mode, str);
  FlagInt('Rando_setseed', bSetSeed, mode, str);
  FlagInt('Rando_bingoboardroll', bingoBoardRoll, mode, str);
  FlagInt('Rando_mirroredmaps', mirroredmaps, mode, str);
  FlagInt('Rando_bingo_duration', bingo_duration, mode, str);
  FlagInt('Rando_bingo_scale', bingo_scale, mode, str);
 
- if( FlagInt('Rando_difficulty', difficulty, mode, str) ) {
- SetDifficulty(difficulty);
- }
-
  FlagInt('Rando_minskill', settings.minskill, mode, str);
  FlagInt('Rando_maxskill', settings.maxskill, mode, str);
  FlagInt('Rando_ammo', settings.ammo, mode, str);

GUI/DeusEx/Classes/NewGamePlusCreditsWindow.uc

@@ -63,6 +63,7 @@ function AddDXRCreditsGeneral()
  PrintText("WCCC for the OpenAugTree");
  PrintText("Joe Wintergreen for the Lipsync fix");
  PrintText("Kentie for DeusExe Launcher and D3D10");
+ PrintText("Deus_nsf for the tweaked D3D10 Renderer");
  PrintText("Han for Launchbox");
  PrintText("Chris Dohnal for D3D9 and OpenGL2 Renderers");
  PrintText("doitsujin for DXVK");

installer/Configs/DXRandoDefault.ini

@@ -354,7 +354,7 @@ LODBias=0
 BumpMapping=False
 ClassicLighting=True
 AlphaToCoverage=False
-AutoFOV=True
+AutoFOV=False
 FPSLimit=0
 simulateMultipassTexturing=True
 unlimitedViewDistance=False

installer/Configs/DeusExDefault.ini

@@ -352,7 +352,7 @@ LODBias=0
 BumpMapping=False
 ClassicLighting=True
 AlphaToCoverage=False
-AutoFOV=True
+AutoFOV=False
 FPSLimit=0
 simulateMultipassTexturing=True
 unlimitedViewDistance=False