v3.3.1.2 Merge pull request #1086 from Die4Ever/develop

v3.3.1.2
Die4Ever · Jan 6, 2025 · 689b9c3 · 689b9c3
2 parents e7b6363 + 10aba2c
commit 689b9c3
Show file tree

Hide file tree

Showing 11 changed files with 132 additions and 127 deletions.
diff --git a/DXRCore/DeusEx/Classes/DXRActorsBase.uc b/DXRCore/DeusEx/Classes/DXRActorsBase.uc
@@ -1758,6 +1758,11 @@ function RemoveMoverPrePivot(Mover m)
     m.SetCollision(AbCollideActors, AbBlockActors, AbBlockPlayers);
 }
 
+function Vector GetMoverCenter(Mover m)
+{
+    return m.Location-(m.PrePivot >> m.Rotation);
+}
+
 static function Actor GlowUp(Actor a, optional byte hue, optional byte saturation)
 {
     local DynamicLight dl;

diff --git a/DXRCore/DeusEx/Classes/DXRVersion.uc b/DXRCore/DeusEx/Classes/DXRVersion.uc
@@ -5,20 +5,20 @@ simulated static function CurrentVersion(optional out int major, optional out in
     major=3;
     minor=3;
     patch=1;
-    build=1;//build can't be higher than 99
+    build=2;//build can't be higher than 99
 }
 
 simulated static function bool VersionIsStable()
 {
-    return false;
+    return true;
 }
 
 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/DXRMapFixups/DeusEx/Classes/DXRFixupParis.uc b/DXRMapFixups/DeusEx/Classes/DXRFixupParis.uc
@@ -45,7 +45,7 @@ function PreFirstEntryMapFixes()
             foreach AllActors(class'#var(prefix)MapExit',exit,'change_map'){break;}
             foreach AllActors(class'DeusExMover', m) {
                 if (m.Event=='change_map'){
-                    hoverHint = class'DXRTeleporterHoverHint'.static.Create(self, "", m.Location-m.PrePivot, 40, 75,exit);
+                    hoverHint = class'DXRTeleporterHoverHint'.static.Create(self, "", GetMoverCenter(m), 40, 75,exit);
                 }
             }
         }
@@ -56,7 +56,7 @@ function PreFirstEntryMapFixes()
         foreach AllActors(class'#var(prefix)MapExit',exit,'change_map'){break;}
         foreach AllActors(class'DeusExMover', m) {
             if (m.Event=='change_map'){
-                hoverHint = class'DXRTeleporterHoverHint'.static.Create(self, "", m.Location-m.PrePivot, 40, 75,exit);
+                hoverHint = class'DXRTeleporterHoverHint'.static.Create(self, "", GetMoverCenter(m), 40, 75,exit);
             }
         }
 
@@ -250,7 +250,7 @@ function PreFirstEntryMapFixes()
             foreach AllActors(class'#var(prefix)MapExit',exit,'change_map'){break;}
             foreach AllActors(class'DeusExMover', m) {
                 if (m.Event=='change_map'){
-                    hoverHint = class'DXRTeleporterHoverHint'.static.Create(self, "", m.Location-m.PrePivot, 40, 75,exit);
+                    hoverHint = class'DXRTeleporterHoverHint'.static.Create(self, "", GetMoverCenter(m), 40, 75,exit);
                 }
             }
 
@@ -301,7 +301,7 @@ function PreFirstEntryMapFixes()
             foreach AllActors(class'#var(prefix)MapExit',exit,'change_map'){break;}
             foreach AllActors(class'DeusExMover', m) {
                 if (m.Event=='change_map'){
-                    hoverHint = class'DXRTeleporterHoverHint'.static.Create(self, "", m.Location-(m.PrePivot * vect(-1,1,1)), 40, 75,exit);
+                    hoverHint = class'DXRTeleporterHoverHint'.static.Create(self, "", GetMoverCenter(m), 40, 75,exit);
                 }
             }
 

diff --git a/DXRModules/DeusEx/Classes/DXREvents.uc b/DXRModules/DeusEx/Classes/DXREvents.uc
@@ -3342,7 +3342,7 @@ defaultproperties
     bingo_options(90)=(event="Rat_ClassDead",desc="Kill %s rats",desc_singular="Kill 1 rat",max=30,missions=53118)
     bingo_options(91)=(event="UNATCOTroop_ClassUnconscious",desc="Knock out %s UNATCO Troopers",desc_singular="Knock out 1 UNATCO Trooper",max=15,missions=318)
     bingo_options(92)=(event="Terrorist_ClassUnconscious",desc="Knock out %s NSF Terrorists",desc_singular="Knock out 1 NSF Terrorist",max=15,missions=46)
-    bingo_options(93)=(event="MJ12Troop_ClassUnconscious",desc="Knock out %s MJ12 Troopers",desc_singular="Knock out 1 MJ12 Trooper",max=25,missions=57204)
+    bingo_options(93)=(event="MJ12Troop_ClassUnconscious",desc="Knock out %s MJ12 Troopers",desc_singular="Knock out 1 MJ12 Trooper",max=25,missions=57188)
     bingo_options(94)=(event="MJ12Commando_ClassUnconscious",desc="Knock out %s MJ12 Commandos",desc_singular="Knock out 1 MJ12 Commando",max=2,missions=56384)
     bingo_options(95)=(event="purge",desc="Release the gas in the MJ12 Helibase",max=1,missions=64)
     bingo_options(96)=(event="ChugWater",desc="Chug water %s times",desc_singular="Chug water 1 time",max=30,mission=40830)
@@ -3465,7 +3465,7 @@ defaultproperties
     bingo_options(202)=(event="M07MeetJaime_Played",desc="Meet Jaime in Hong Kong",max=1,missions=96)
     bingo_options(203)=(event="Terrorist_peeptime",desc="Watch Terrorists for %s seconds",desc_singular="Watch Terrorists for 1 second",max=30,missions=46)
     bingo_options(204)=(event="UNATCOTroop_peeptime",desc="Watch UNATCO Troopers for %s seconds",desc_singular="Watch UNATCO Troopers for 1 second",max=30,missions=318)
-    bingo_options(205)=(event="MJ12Troop_peeptime",desc="Watch MJ12 Troopers for %s seconds",desc_singular="Watch MJ12 Troopers for 1 second",max=30,missions=57204)
+    bingo_options(205)=(event="MJ12Troop_peeptime",desc="Watch MJ12 Troopers for %s seconds",desc_singular="Watch MJ12 Troopers for 1 second",max=30,missions=57188)
     bingo_options(206)=(event="MJ12Commando_peeptime",desc="Watch MJ12 Commandos for %s seconds",desc_singular="Watch MJ12 Commandos for 1 second",max=15,missions=56384)
     bingo_options(207)=(event="PawnAnim_Dance",desc="You can dance if you want to",max=1,missions=1364)
     bingo_options(208)=(event="BirdWatching",desc="Watch birds for %s seconds",desc_singular="Watch birds for 1 second",max=30,missions=19806)

diff --git a/DXRModules/DeusEx/Classes/DXRHints.uc b/DXRModules/DeusEx/Classes/DXRHints.uc
@@ -26,7 +26,7 @@ simulated function InitHints()
     if(telem == None || telem.enabled == false || mission < 1)
         AddHint("Check out https://mastodon.social/@DXRandoActivity!","Make sure \"Online Features\" are enabled to show up yourself!");
     else
-        AddHint("Check out https://mastodon.social/@DXRandoActivity!", "We just shared your death publicly, go retweet it!");
+        AddHint("Check out https://mastodon.social/@DXRandoActivity!", "We just shared your death publicly, go retweet it!",true);
 
     if(dxr.flags.crowdcontrol > 0) {
         if (dxr.flags.crowdcontrol!=3){