Add framework for bingo goals based on looking at images in your

datavault
Die4Ever · Aug 6, 2023 · 7ce7f69 · 7ce7f69
1 parent 1ceebb2
commit 7ce7f69
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/DXRModules/DeusEx/Classes/DXREvents.uc b/DXRModules/DeusEx/Classes/DXREvents.uc
@@ -2335,6 +2335,7 @@ defaultproperties
     bingo_options(209)=(event="NYEagleStatue_peeped",desc="Look at a bronze eagle statue",max=1,missions=28)
     bingo_options(210)=(event="BrokenPianoPlayed",desc="Play a broken piano",max=1,missions=64)
     bingo_options(211)=(event="Supervisor_Paid",desc="Pay for access to the VersaLife labs",max=1,missions=64)
+    bingo_options(212)=(event="ImageOpened_WaltonSimons",desc="Look at Walton Simons' nudes",max=1,missions=544)
 
     mutually_exclusive(0)=(e1="PaulDenton_Dead",e2="SavedPaul")
     mutually_exclusive(1)=(e1="JockBlewUp",e2="GotHelicopterInfo")

diff --git a/DXRNonVanilla/DeusEx/Classes/DXRandoRootWindow.uc b/DXRNonVanilla/DeusEx/Classes/DXRandoRootWindow.uc
@@ -164,6 +164,9 @@ function DeusExBaseWindow InvokeUIScreen(Class<DeusExBaseWindow> newScreen, opti
         case class'PersonaScreenGoals':
             newScreen = class'DXRPersonaScreenGoals';
             break;
+        case class'PersonaScreenImages':
+            newScreen = class'DXRPersonaScreenImages';
+            break;
         default:
             if(class<NetworkTerminal>(newScreen) != None) {
                 log("WARNING: InvokeUIScreen "$newScreen);

diff --git a/DXRando/DeusEx/Classes/Image06_HK_MJ12Lab.uc b/DXRando/DeusEx/Classes/Image06_HK_MJ12Lab.uc
@@ -0,0 +1,10 @@
+//=============================================================================
+// DXRImage06_HK_MJ12Lab
+//=============================================================================
+
+class DXRImage06_HK_MJ12Lab injects Image06_HK_MJ12Lab;
+
+defaultproperties
+{
+     imageDescription="Hong Kong MJ12 Lab Facility"
+}
diff --git a/GUI/DeusEx/Classes/PersonaScreenImages.uc b/GUI/DeusEx/Classes/PersonaScreenImages.uc
@@ -0,0 +1,24 @@
+class DXRPersonaScreenImages injects PersonaScreenImages;
+
+function SetImage(DataVaultImage newImage)
+{
+	local string bingoName;
+    local DXRando dxr;
+
+    if (newImage!=None && newImage.bPlayerViewedImage==False){
+        bingoName = newImage.imageDescription;
+        bingoName = class'DXRInfo'.static.ReplaceText(bingoName," ","");
+        bingoName = class'DXRInfo'.static.ReplaceText(bingoName,"-","");
+        bingoName = class'DXRInfo'.static.ReplaceText(bingoName,":","");
+        bingoName = class'DXRInfo'.static.ReplaceText(bingoName,",","");
+        bingoName = "ImageOpened_"$bingoName;
+
+        foreach newImage.AllActors(class'DXRando', dxr) {
+            class'DXREvents'.static.MarkBingo(dxr,bingoName);
+        }
+
+        newImage.bPlayerViewedImage = True;
+    }
+
+    Super.SetImage(newImage);
+}