v2.5.1 Merge pull request #480 from Die4Ever/develop

v2.5.1
Die4Ever · Jul 28, 2023 · 65a54a6 · 65a54a6
2 parents 6e8bd92 + 30cdf47
commit 65a54a6
Show file tree

Hide file tree

Showing 28 changed files with 481 additions and 215 deletions.
diff --git a/.github/release_template.md b/.github/release_template.md
@@ -14,7 +14,7 @@ If you don't know what Deus Ex Randomizer is, then here's our old trailer which
 <a href="https://www.youtube.com/watch?v=XsoIKbn_suE&list=PLZIQTa_kwZhBksj7UzcahPiRaHk87fWch" target="_blank">
 <img src="https://github.com/Die4Ever/deus-ex-randomizer/assets/30947252/daf30de5-fd3e-4b65-a0cf-abc7f6ac758b" alt="v2.0 Trailer" width="500"/></a>
 
-[See the full README here.](https://github.com/Die4Ever/deus-ex-randomizer#readme) Also check out [our Discord!](https://discord.gg/daQVyAp2ds)
+[See the full README here.](https://github.com/Die4Ever/deus-ex-randomizer#readme) Also check out [our Discord](https://discord.gg/daQVyAp2ds) and [Mods4Ever.com](https://mods4ever.com)
 
 ## Major Changes
 

diff --git a/DXRCore/DeusEx/Classes/DXRVersion.uc b/DXRCore/DeusEx/Classes/DXRVersion.uc
@@ -5,15 +5,15 @@ simulated static function CurrentVersion(optional out int major, optional out in
     major=2;
     minor=5;
     patch=1;
-    build=5;//build can't be higher than 99
+    build=8;//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 = "Beta";
+    status = "";
 
     if(status!="") {
         status = " " $ status;

diff --git a/DXRCore/DeusEx/Classes/DXRando.uc b/DXRCore/DeusEx/Classes/DXRando.uc
@@ -79,7 +79,8 @@ function SetdxInfo(DeusExLevelInfo i)
 
 function DXRInit()
 {
-    l("DXRInit has localURL == " $ localURL $ ", flagbase == "$flagbase);
+    if(!#defined(hx))
+        l("DXRInit has localURL == " $ localURL $ ", flagbase == "$flagbase);
     if( flagbase != None ) return;
 
     Player = #var(PlayerPawn)(GetPlayerPawn());

diff --git a/DXRModules/DeusEx/Classes/DXREvents.uc b/DXRModules/DeusEx/Classes/DXREvents.uc
@@ -2311,6 +2311,7 @@ defaultproperties
     bingo_options(207)=(event="PawnState_Dancing",desc="You can dance if you want to",max=1)
     bingo_options(208)=(event="BirdWatching",desc="Watch birds for %s seconds",max=30,missions=19838)
     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)
 
     mutually_exclusive(0)=(e1="PaulDenton_Dead",e2="SavedPaul")
     mutually_exclusive(1)=(e1="JockBlewUp",e2="GotHelicopterInfo")
@@ -2333,13 +2334,16 @@ defaultproperties
     mutually_exclusive(18)=(e1="AnnaNavarre_DeadM5",e2="AnnaNavarre_DeadM3")
     mutually_exclusive(19)=(e1="AnnaNavarre_DeadM5",e2="AnnaNavarre_DeadM4")
     mutually_exclusive(20)=(e1="VialAmbrosia_Activated",e2="GaveDowdAmbrosia")
-    mutually_exclusive(21)=(e1="AllPianoSongsPlayed",e2="PianoSong0Played")
-    mutually_exclusive(22)=(e1="AllPianoSongsPlayed",e2="PianoSong7Played")
+    mutually_exclusive(21)=(e1="PianoSongPlayed",e2="PianoSong0Played")
+    mutually_exclusive(22)=(e1="PianoSongPlayed",e2="PianoSong7Played")
     mutually_exclusive(23)=(e1="PianoSong0Played",e2="PianoSong7Played")
     mutually_exclusive(24)=(e1="UNATCOTroop_peeptime",e2="Terrorist_peeptime")
     mutually_exclusive(25)=(e1="MJ12Troop_peeptime",e2="UNATCOTroop_peeptime")
     mutually_exclusive(26)=(e1="MJ12Troop_peeptime",e2="Terrorist_peeptime")
     mutually_exclusive(27)=(e1="MJ12Troop_peeptime",e2="MJ12Commando_peeptime")
+    mutually_exclusive(28)=(e1="BrokenPianoPlayed",e2="PianoSongPlayed")
+    mutually_exclusive(29)=(e1="BrokenPianoPlayed",e2="PianoSong0Played")
+    mutually_exclusive(30)=(e1="BrokenPianoPlayed",e2="PianoSong7Played")
 
     bingo_win_countdown=-1
 }
diff --git a/DXRModules/DeusEx/Classes/DXRMemes.uc b/DXRModules/DeusEx/Classes/DXRMemes.uc
@@ -153,6 +153,7 @@ function AnyEntry()
     local #var(prefix)IonStormLogo islogo;
     local #var(prefix)EidosLogo elogo;
     local #var(prefix)ElectricityEmitter elec;
+    local #var(prefix)DXText text;
     local Actor a;
     local Rotator r;
     local Vector v;
@@ -229,6 +230,40 @@ function AnyEntry()
                 v.Z = 70;
                 elec.move(v);
             }
+
+
+//Add me back in once we have "Randomizer" name textures!  Just change the textures below
+            foreach AllActors(class'#var(prefix)DXText',text)
+            {
+                text.bHidden=True; //Hide all the original text
+            }
+            if (dxr.localURL=="DX"){
+                text = Spawn(class'DXRText',,,vectm(-60.979568,57.046417,-137.022430),rotm(0,32768,0));
+                text.Skin = None;
+                text = Spawn(class'DXRText',,,vectm(138.886353,57.125278,-137.022430),rotm(0,32768,0));
+                text.Skin = Texture'DeusExDeco.Skins.DXTextTex2';
+
+                // Randomizer logo
+                v = vect(10, 57.15, -177.66);// midpoint
+                text = Spawn(class'DXRText',,,vectm(v.X - 100, v.Y, v.Z),rotm(0,32768,0));
+                text.Skin = Texture'RandomizerTextTex1';  //Left half of "Randomizer" text texture
+                text = Spawn(class'DXRText',,,vectm(v.X + 100, v.Y, v.Z),rotm(0,32768,0));
+                text.Skin = Texture'RandomizerTextTex2';  //Right half of "Randomizer" text texture
+            } else if (dxr.localURL=="DXONLY"){
+                text = Spawn(class'DXRText',,,vectm(-62.015648,-55.260841,-139.022430),rotm(0,49136,0));
+                text.Skin = None;
+                text = Spawn(class'DXRText',,,vectm(-61.787956,144.605042,-139.022430),rotm(0,49136,0));
+                text.Skin = Texture'DeusExDeco.Skins.DXTextTex2';
+
+                // Randomizer logo
+                v = vect(-62, 10, -178.990417);// midpoint
+                text = Spawn(class'DXRText',,,vectm(v.X, v.Y - 100, v.Z),rotm(0,49136,0));
+                text.Skin = Texture'RandomizerTextTex1';  //Left half of "Randomizer" text texture
+                text = Spawn(class'DXRText',,,vectm(v.X, v.Y + 100, v.Z),rotm(0,49136,0));
+                text.Skin = Texture'RandomizerTextTex2';  //Right half of "Randomizer" text texture
+            }
+
+
             break;
 
         case "INTRO":

diff --git a/DXRModules/DeusEx/Classes/DXRMissions.uc b/DXRModules/DeusEx/Classes/DXRMissions.uc
@@ -424,6 +424,8 @@ function UpdateGoalWithRandoInfo(name goalName, string text)
     local DeusExGoal goal;
     local int randoPos;
 
+    if(player(true)==None) return;// don't spam HX logs
+
     goal = player().FindGoal(goalName);
     if(goal == None) return;
 

diff --git a/DXRando/DeusEx/Classes/DXRText.uc b/DXRando/DeusEx/Classes/DXRText.uc
@@ -0,0 +1,7 @@
+class DXRText extends #var(prefix)DXText;
+
+defaultproperties
+{
+    bStatic=False
+    Style=STY_Translucent
+}
diff --git a/DXRando/DeusEx/Classes/DXRandoImageTextures.uc b/DXRando/DeusEx/Classes/DXRandoImageTextures.uc
@@ -1,6 +1,11 @@
 class DXRandoImageTextures extends Object abstract;
 
-#exec TEXTURE IMPORT FILE="Textures\Image09_NYC_Ship_Bttm_1.pcx"			NAME="Image09_NYC_Ship_Bttm_1"			GROUP="DXRandoImages" MIPS=Off 
-#exec TEXTURE IMPORT FILE="Textures\Image09_NYC_Ship_Bttm_2.pcx"			NAME="Image09_NYC_Ship_Bttm_2"			GROUP="DXRandoImages" MIPS=Off 
-#exec TEXTURE IMPORT FILE="Textures\Image09_NYC_Ship_Bttm_3.pcx"			NAME="Image09_NYC_Ship_Bttm_3"			GROUP="DXRandoImages" MIPS=Off 
-#exec TEXTURE IMPORT FILE="Textures\Image09_NYC_Ship_Bttm_4.pcx"			NAME="Image09_NYC_Ship_Bttm_4"			GROUP="DXRandoImages" MIPS=Off 
+#exec TEXTURE IMPORT FILE="Textures\Image09_NYC_Ship_Bttm_1.pcx"			NAME="Image09_NYC_Ship_Bttm_1"			GROUP="DXRandoImages" MIPS=Off
+#exec TEXTURE IMPORT FILE="Textures\Image09_NYC_Ship_Bttm_2.pcx"			NAME="Image09_NYC_Ship_Bttm_2"			GROUP="DXRandoImages" MIPS=Off
+#exec TEXTURE IMPORT FILE="Textures\Image09_NYC_Ship_Bttm_3.pcx"			NAME="Image09_NYC_Ship_Bttm_3"			GROUP="DXRandoImages" MIPS=Off
+#exec TEXTURE IMPORT FILE="Textures\Image09_NYC_Ship_Bttm_4.pcx"			NAME="Image09_NYC_Ship_Bttm_4"			GROUP="DXRandoImages" MIPS=Off
+
+#exec TEXTURE IMPORT FILE="Textures\RandomizerTextTex1.pcx"			        NAME="RandomizerTextTex1"			    GROUP="DXRandoImages"
+#exec TEXTURE IMPORT FILE="Textures\RandomizerTextTex2.pcx"			        NAME="RandomizerTextTex2"			    GROUP="DXRandoImages"
+#exec TEXTURE IMPORT FILE="Textures\RandomizerTextCredits1.pcx"			    NAME="RandomizerTextCredits1"			GROUP="DXRandoImages"
+#exec TEXTURE IMPORT FILE="Textures\RandomizerTextCredits2.pcx"			    NAME="RandomizerTextCredits2"			GROUP="DXRandoImages"
diff --git a/DXRando/DeusEx/Classes/DXRandoSounds.uc b/DXRando/DeusEx/Classes/DXRandoSounds.uc
@@ -40,4 +40,7 @@ class DXRandoSounds extends Object abstract;
 #exec AUDIO IMPORT FILE="Sounds\GuilesTheme.mp3"                NAME="GuilesTheme"          GROUP="MemePiano"
 #exec AUDIO IMPORT FILE="Sounds\TetrisThemeA.mp3"               NAME="TetrisThemeA"         GROUP="MemePiano"
 
+#exec AUDIO IMPORT FILE="Sounds\MaxPayneBrokenPianoPlay.mp3"    NAME="MaxPayneBrokenPianoPlay" GROUP="MemePiano"
+#exec AUDIO IMPORT FILE="Sounds\MaxPaynePianoJustBroke.mp3"     NAME="MaxPaynePianoJustBroke"  GROUP="MemePiano"
+
 #exec AUDIO IMPORT FILE="Sounds\JockLetsGo.mp3"                 NAME="PocketJockLetsGo"     GROUP="DXRandoItems"