Skip to content

Commit

Permalink
Meeting Jaime in Hong Kong and Paris bingo goals are now only considered
Browse files Browse the repository at this point in the history
possible if you start before mission 6 and your end mission is after HK
or Paris
  • Loading branch information
theastropath committed Aug 4, 2023
1 parent bb71377 commit 374e92e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DXRModules/DeusEx/Classes/DXREvents.uc
Original file line number Diff line number Diff line change
Expand Up @@ -1597,7 +1597,7 @@ simulated function _CreateBingoBoard(PlayerDataItem data)
if(bingo_options[x].event == "") continue;
masked_missions = bingo_options[x].missions & starting_mission_mask & end_mission_mask;
if(bingo_options[x].missions!=0 && masked_missions == 0) continue;
if(class'DXRStartMap'.static.BingoGoalImpossible(bingo_options[x].event,dxr.flags.settings.starting_map)) continue;
if(class'DXRStartMap'.static.BingoGoalImpossible(bingo_options[x].event,dxr.flags.settings.starting_map,end_mission)) continue;
options[num_options++] = x;
}

Expand Down
8 changes: 7 additions & 1 deletion DXRModules/DeusEx/Classes/DXRStartMap.uc
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ static function StartMapSpecificFlags(FlagBase flagbase, string start_map)
}
}

static function bool BingoGoalImpossible(string bingo_event, int start_map)
static function bool BingoGoalImpossible(string bingo_event, int start_map, int end_mission)
{
switch(bingo_event)
{
Expand All @@ -325,10 +325,16 @@ static function bool BingoGoalImpossible(string bingo_event, int start_map)
case "MetSmuggler":
return start_map>=80; //Mission 8 and later starts you should already know Smuggler (see StartMapSpecificFlags)
case "KnowsGuntherKillphrase":
if (end_mission < 12){
return True;
}
return start_map>=60; //Have to have told Jaime to meet you in Paris in mission 5 to get Gunther's killphrase
case "FordSchick_Dead":
return start_map>=20;
case "M07MeetJaime_Played":
if (end_mission < 80){
return True;
}
return start_map>=60; //Have to have told Jaime to meet you in Hong Kong in mission 50a
case "VialAmbrosia_Activated":
return start_map>=96; //Have to have started before the superfreighter upper decks (Arbitrarily chose 96 as that point)
Expand Down

0 comments on commit 374e92e

Please sign in to comment.