Add bingo goal for playing pinball

Die4Ever · Jun 24, 2023 · dbe333b · dbe333b
1 parent afb6f04
commit dbe333b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/DXRModules/DeusEx/Classes/DXREvents.uc b/DXRModules/DeusEx/Classes/DXREvents.uc
@@ -2216,6 +2216,7 @@ defaultproperties
     bingo_options(196)=(event="PianoSongPlayed",desc="Play %s different songs on the piano",max=5,missions=64)
     bingo_options(197)=(event="PianoSong0Played",desc="Play the theme song on the piano",max=1,missions=64)
     bingo_options(198)=(event="PianoSong7Played",desc="Stauf Says...",max=1,missions=64)
+    bingo_options(199)=(event="PinballWizard",desc="Play %s different pinball machines",max=10,missions=37246)
 
     mutually_exclusive(0)=(e1="PaulDenton_Dead",e2="SavedPaul")
     mutually_exclusive(1)=(e1="JockBlewUp",e2="GotHelicopterInfo")

diff --git a/DXRModules/DeusEx/Classes/DXRReplaceActors.uc b/DXRModules/DeusEx/Classes/DXRReplaceActors.uc
@@ -55,6 +55,9 @@ function ReplaceActors()
         else if( #var(prefix)Poolball(a) != None ) {
             ReplacePoolball(#var(prefix)Poolball(a));
         }
+        else if( #var(prefix)Pinball(a) != None ) {
+            ReplacePinball(#var(prefix)Pinball(a));
+        }
 #ifdef gmdx
         else if( WeaponGEPGun(a) != None ) {
             ReplaceGepGun(WeaponGEPGun(a));
@@ -236,6 +239,21 @@ function ReplacePoolball(#var(prefix)Poolball a)
     a.Destroy();
 }
 
+function ReplacePinball(#var(prefix)Pinball a)
+{
+    local DXRPinball n;
+    n = DXRPinball(SpawnReplacement(a, class'DXRPinball'));
+    if(n == None)
+        return;
+
+    // probably doesn't need this since it's all defaults
+    //ReplaceDecoration(a, n);
+#ifdef hx
+    n.PrecessorName = a.PrecessorName;
+#endif
+    a.Destroy();
+}
+
 function ReplaceToilet(#var(prefix)Toilet a)
 {
     local DXRToilet n;

diff --git a/DXRando/DeusEx/Classes/Pinball.uc b/DXRando/DeusEx/Classes/Pinball.uc
@@ -0,0 +1,17 @@
+class DXRPinball injects #var(prefix)Pinball;
+
+var bool bAlreadyUsed;
+
+function Frob(actor Frobber, Inventory frobWith)
+{
+    local DXRando dxr;
+
+    if (!bUsing && !bAlreadyUsed){
+        bAlreadyUsed=True;
+        foreach AllActors(class'DXRando', dxr) {
+            class'DXREvents'.static.MarkBingo(dxr,"PinballWizard");
+        }
+    }
+
+    Super.Frob(Frobber,frobWith);
+}