Skip to content

Commit

Permalink
Fix Smuggler-saving related flags and bingo goal possibilities for
Browse files Browse the repository at this point in the history
WaltonWare.  Reorder DXRStartMaps to be loaded before DXREvents so that
flags set there happen before DXREvents runs.
  • Loading branch information
theastropath committed Sep 14, 2023
1 parent f38c4ce commit a68560a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
6 changes: 3 additions & 3 deletions DXRCore/DeusEx/Classes/DXRVersion.uc
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ simulated static function CurrentVersion(optional out int major, optional out in
{
major=2;
minor=5;
patch=3;
build=11;//build can't be higher than 99
patch=4;
build=1;//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 = "Alpha";

if(status!="") {
status = " " $ status;
Expand Down
10 changes: 5 additions & 5 deletions DXRCore/DeusEx/Classes/DXRando.uc
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function CheckConfig()
{
local int i;

if( VersionOlderThan(config_version, 2,5,2,0) ) {
if( VersionOlderThan(config_version, 2,5,4,1) ) {
for(i=0; i < ArrayCount(modules_to_load); i++) {
modules_to_load[i] = "";
}
Expand Down Expand Up @@ -165,13 +165,13 @@ function vanilla_modules()
modules_to_load[i++] = "DXRNPCs";
modules_to_load[i++] = "DXRFashion";
modules_to_load[i++] = "DXRHints";
modules_to_load[i++] = "DXRStartMap";
modules_to_load[i++] = "DXREvents";
//modules_to_load[i++] = "DXRMapInfo";
modules_to_load[i++] = "DXRMusic";
modules_to_load[i++] = "DXRMusicPlayer";
modules_to_load[i++] = "DXRPlayerStats";
modules_to_load[i++] = "DXRMapVariants";
modules_to_load[i++] = "DXRStartMap";
modules_to_load[i++] = "DXRWeaponMods";
}

Expand Down Expand Up @@ -201,10 +201,10 @@ function hx_modules()
modules_to_load[i++] = "DXRStats";
modules_to_load[i++] = "DXRHints";
modules_to_load[i++] = "DXRReplaceActors";
modules_to_load[i++] = "DXRStartMap";
modules_to_load[i++] = "DXREvents";
modules_to_load[i++] = "DXRPlayerStats";
modules_to_load[i++] = "DXRMapVariants";
modules_to_load[i++] = "DXRStartMap";
modules_to_load[i++] = "DXRWeaponMods";
}

Expand Down Expand Up @@ -236,12 +236,12 @@ function gmdx_modules()
modules_to_load[i++] = "DXRReplaceActors";
modules_to_load[i++] = "DXRNPCs";
modules_to_load[i++] = "DXRFashion";
modules_to_load[i++] = "DXRStartMap";
modules_to_load[i++] = "DXREvents";
modules_to_load[i++] = "DXRMusic";
modules_to_load[i++] = "DXRMusicPlayer";
modules_to_load[i++] = "DXRPlayerStats";
modules_to_load[i++] = "DXRMapVariants";
modules_to_load[i++] = "DXRStartMap";
modules_to_load[i++] = "DXRWeaponMods";
}

Expand Down Expand Up @@ -277,12 +277,12 @@ function vmd_modules()
modules_to_load[i++] = "DXRHints";
modules_to_load[i++] = "DXRReplaceActors";
modules_to_load[i++] = "DXRNPCs";
modules_to_load[i++] = "DXRStartMap";
modules_to_load[i++] = "DXREvents";
modules_to_load[i++] = "DXRMusic";
modules_to_load[i++] = "DXRMusicPlayer";
modules_to_load[i++] = "DXRPlayerStats";
modules_to_load[i++] = "DXRMapVariants";
modules_to_load[i++] = "DXRStartMap";
modules_to_load[i++] = "DXRWeaponMods";
}

Expand Down
9 changes: 9 additions & 0 deletions DXRModules/DeusEx/Classes/DXRStartMap.uc
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,10 @@ static function StartMapSpecificFlags(FlagBase flagbase, string start_map)
flagbase.SetBool('KnowsSmugglerPassword',true,,-1);
flagbase.SetBool('MetSmuggler',true,,-1);
break;
case "09_NYC_Dockyard":
flagbase.SetBool('M08WarnedSmuggler',true,,-1);
flagbase.SetBool('DL_BadNews_Played',true,,-1);
break;
case "10_Paris_Chateau":
//Make sure Sandra spawns at the gas station
flagbase.SetBool('SandraWentToCalifornia',true,,-1);
Expand Down Expand Up @@ -391,6 +395,11 @@ static function bool BingoGoalImpossible(string bingo_event, int start_map, int
return True;
}
return start_map>=40;
case "SmugglerDied":
if (end_mission < 9){
return True;
}
return start_map>=90;
default:
return False;
}
Expand Down
Binary file modified DeusEx.u
Binary file not shown.

0 comments on commit a68560a

Please sign in to comment.