v3.3.1.1 Beta Merge pull request #1081 from Die4Ever/develop

v3.3.1.1 Beta
Die4Ever · Jan 5, 2025 · e7b6363 · e7b6363
2 parents ef30b75 + a1ba3b1
commit e7b6363
Show file tree

Hide file tree

Showing 15 changed files with 139 additions and 15 deletions.
diff --git a/DXRCore/DeusEx/Classes/DXRVersion.uc b/DXRCore/DeusEx/Classes/DXRVersion.uc
@@ -5,7 +5,7 @@ simulated static function CurrentVersion(optional out int major, optional out in
     major=3;
     minor=3;
     patch=1;
-    build=0;//build can't be higher than 99
+    build=1;//build can't be higher than 99
 }
 
 simulated static function bool VersionIsStable()
@@ -18,7 +18,7 @@ simulated static function string VersionString(optional bool full)
     local int major,minor,patch,build;
     local string status;
 
-    status = "Alpha";
+    status = "Beta";
 
     if(status!="") {
         status = " " $ status;

diff --git a/DXRMapFixups/DeusEx/Classes/DXRFixupM09.uc b/DXRMapFixups/DeusEx/Classes/DXRFixupM09.uc
@@ -264,6 +264,14 @@ function PreFirstEntryMapFixes()
         foreach RadiusActors(class'BlockPlayer', bp, 725, vectm(3259, 1601, 252)) {
             bp.bBlockPlayers=false;
         }
+
+        // Revision has more along the wall with the grate, get rid of those too
+        if (!VanillaMaps){
+            foreach RadiusActors(class'BlockPlayer', bp, 200, vectm(2506,1380,252)) {
+                bp.bBlockPlayers=false;
+            }
+        }
+
         // 4030.847900 to 4078.623779
         foreach RadiusActors(class'BlockPlayer', bp, 25, vectm(4055, 1602, 252)) {
             dbp = Spawn(class'DynamicBlockPlayer',,, bp.Location + vectm(0,0,200));

diff --git a/DXRMapFixups/DeusEx/Classes/DXRFixupParis.uc b/DXRMapFixups/DeusEx/Classes/DXRFixupParis.uc
@@ -246,6 +246,14 @@ function PreFirstEntryMapFixes()
             Spawn(class'PlaceholderItem',,, vectm(-733,-251,-1061)); //Bench at subway
             Spawn(class'PlaceholderItem',,, vectm(300.7,491,-1061)); //Opposite side of tracks
         } else {
+            //Revision, metro station exit to Cathedral
+            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);
+                }
+            }
+
             Spawn(class'PlaceholderItem',,, vectm(-1135,3000,-125)); //Near ATM
             Spawn(class'PlaceholderItem',,, vectm(-855,2260,-150)); //Benches near ATM
             Spawn(class'PlaceholderItem',,, vectm(1155,1150,-320)); //Bench at subway
@@ -288,6 +296,15 @@ function PreFirstEntryMapFixes()
                     a.bIsSecretGoal=true;
                 }
             }
+
+            //Revision, entrance to Metro station
+            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);
+                }
+            }
+
         }
         break;
     case "11_PARIS_EVERETT":

diff --git a/DXRMapFixups/DeusEx/Classes/DXRFixupVandenberg.uc b/DXRMapFixups/DeusEx/Classes/DXRFixupVandenberg.uc
@@ -75,8 +75,6 @@ function PreFirstEntryMapFixes()
             RemoveReactions(tt);// he looks pretty sick
         }
 
-        class'FillCollisionHole'.static.CreateLine(self, vectm(3081.067383, 1640, -2031.417969), vectm(3081.067383, 6584, -2031.417969), 40, 300);
-
         class'PlaceholderEnemy'.static.Create(self,vectm(-2467,866,-2000));
         class'PlaceholderEnemy'.static.Create(self,vectm(-2689,4765,-2143));
         class'PlaceholderEnemy'.static.Create(self,vectm(-163,7797,-2143));
@@ -120,6 +118,9 @@ function PreFirstEntryMapFixes()
         AddSwitch( vect(-278.854828,657.390503,-1977.144531), rot(0, 16384, 0), 'CmdBackDoor');
 
         if (VanillaMaps){
+            //Patch holes in the wall in the vanilla map
+            class'FillCollisionHole'.static.CreateLine(self, vectm(3081.067383, 1640, -2031.417969), vectm(3081.067383, 6584, -2031.417969), 40, 300);
+
             VandenbergCmdFixTimsDoor();
             FixCmdElevator();
             UnleashingBotsOpenCommsDoor();

diff --git a/DXRModules/DeusEx/Classes/DXREvents.uc b/DXRModules/DeusEx/Classes/DXREvents.uc
@@ -3680,5 +3680,5 @@ defaultproperties
     mutually_exclusive(58)=(e1="Karkian_ClassDead",e2="PetKarkians")
     mutually_exclusive(59)=(e1="PerformBurder",e2="PetBirds")
     mutually_exclusive(60)=(e1="PetRats",e2="PetBirds")
-    mutually_exclusive(61)=(e1="TiffanySavage_Dead"e2="TiffanyHeli")
+    mutually_exclusive(61)=(e1="TiffanySavage_Dead",e2="TiffanyHeli")
 }
diff --git a/DXRModules/DeusEx/Classes/DXREventsBase.uc b/DXRModules/DeusEx/Classes/DXREventsBase.uc
@@ -3,7 +3,7 @@ class DXREventsBase extends DXRActorsBase;
 const FAILED_MISSION_MASK = 1;
 
 var bool died;
-var name watchflags[32];
+var() name watchflags[32];
 var int num_watchflags;
 var int bingo_win_countdown;
 var name rewatchflags[8];
@@ -17,12 +17,12 @@ struct BingoOption {
     var int max;
     var int missions;// bit masks
 };
-var BingoOption bingo_options[350];
+var() BingoOption bingo_options[350];
 
 struct MutualExclusion {
     var string e1, e2;
 };
-var MutualExclusion mutually_exclusive[64];
+var() MutualExclusion mutually_exclusive[64];
 
 struct ActorWatchItem {
     var Actor a;

diff --git a/DXRModules/DeusEx/Classes/DXRMapInfo.uc b/DXRModules/DeusEx/Classes/DXRMapInfo.uc
@@ -289,6 +289,7 @@ switch(mapname)
                     return "Road to NSF HQ";
                 case "PathNode194":
                 case "ToStreet":
+                case "NYCSubway":  //Rev: Backtracking from M04 Battery Park back to Hell's Kitchen
                     return "Hells Kitchen Subway";
                 case "":
                     return "Hells Kitchen Streets";
@@ -638,6 +639,7 @@ switch(mapname)
                 case "cathedralstart":
                     return "Cathedral Sewer Entrance";
                 case "Paris_Underground":
+                case "FromMetro": //Revision
                     return "Cathedral Metro Entrance";
             }
             break;
@@ -652,6 +654,7 @@ switch(mapname)
             switch(teleportername)
             {
                 case "Paris_Underground":
+                case "metro": //Revision
                     return "Paris Metro Interior Entrance";
                 case "PathNode68":
                     return "Paris Metro Train Tracks";

diff --git a/DXRNonVanilla/DeusEx/Classes/RevRandoPlayer.uc b/DXRNonVanilla/DeusEx/Classes/RevRandoPlayer.uc
@@ -889,6 +889,87 @@ function InstantlyUseItem(DeusExPickup item)
     }
 }
 
+//Similar duplicated logic from DXRVanilla/Weapon.uc::HandlePickupQuery
+function bool CheckForRemainingWeaponAmmo(#var(DeusExPrefix)Weapon W)
+{
+    local class<Ammo> defAmmoClass;
+    local Ammo defAmmo,newAmmo;
+    local int ammoToAdd,ammoRemaining;
+
+    if (W==None) return True; //Don't know what you're looting, but it's apparently not a weapon
+
+    if (!( (w.bWeaponStay && (Level.NetMode == NM_Standalone)) && (!w.bHeldItem || w.bTossedOut)))
+    {
+        if ( w.AmmoNames[0] == None ){
+            defAmmoClass = w.AmmoName;
+        }else{
+            defAmmoClass = w.AmmoNames[0];
+        }
+        defAmmo = Ammo(FindInventoryType(defAmmoClass));
+        if(defAmmo!=None){
+            ammoToAdd = w.PickUpAmmoCount;
+            ammoRemaining=0;
+            if ((ammoToAdd + defAmmo.AmmoAmount) > defAmmo.MaxAmmo){
+                ammoRemaining = (ammoToAdd + defAmmo.AmmoAmount) - defAmmo.MaxAmmo;
+                ammoToAdd = ammoToAdd - ammoRemaining;
+            }
+
+
+            w.PickUpAmmoCount = ammoToAdd;
+            if (ammoRemaining>0){
+                if(defAmmo.Default.Mesh!=LodMesh'DeusExItems.TestBox' && defAmmo.Default.PickupViewMesh!=LodMesh'DeusExItems.TestBox'){
+                    //Weapons with normal ammo that exists
+                    newAmmo = Spawn(defAmmoClass,,,w.Location,w.Rotation);
+                    newAmmo.ammoAmount = ammoRemaining;
+                    newAmmo.Velocity = Velocity + VRand() * 160;
+                    return true;
+                } else {
+                    w.PickUpAmmoCount = ammoRemaining;
+                    defAmmo.AddAmmo(ammoToAdd);
+                    if (ammoToAdd>0){
+                        ClientMessage("Took "$ammoToAdd$" "$defAmmo.ItemName,, true);
+                    } else {
+                        ClientMessage(TooMuchAmmo);
+                    }
+                    return false;
+                }
+            }
+        }
+    }
+    return true;
+}
+
+function bool CheckForAmmoToLeaveBehind(Ammo thisAmmo)
+{
+    local Ammo ownedAmmo;
+    local int ammoToAdd,ammoRemaining;
+
+    if (thisAmmo==None) return True; //I don't know how this would happen
+    if (thisAmmo.AmmoAmount<=0) return True; //Ammo is empty, so you can definitely handle it
+
+    ownedAmmo = Ammo(FindInventoryType(thisAmmo.Class));
+    if (ownedAmmo!=None){
+        ammoToAdd = thisAmmo.AmmoAmount;
+        ammoRemaining=0;
+        if ((ammoToAdd + ownedAmmo.AmmoAmount) > ownedAmmo.MaxAmmo){
+            ammoRemaining = (ammoToAdd + ownedAmmo.AmmoAmount) - ownedAmmo.MaxAmmo;
+            ammoToAdd = ammoToAdd - ammoRemaining;
+        }
+
+        if (ammoRemaining>0){
+            thisAmmo.ammoAmount = ammoRemaining;
+            ownedAmmo.AddAmmo(ammoToAdd);
+            if (ammoToAdd>0){
+                ClientMessage("Took "$ammoToAdd$" "$thisAmmo.ItemName,, true);
+            } else {
+                ClientMessage(TooMuchAmmo);
+            }
+            return False; //What ammo can be taken has been taken, but you "can't" pick up the actual item
+        }
+    }
+
+    return True;
+}
 
 
 function bool HandleItemPickup(Actor FrobTarget, optional bool bSearchOnly)
@@ -897,7 +978,7 @@ function bool HandleItemPickup(Actor FrobTarget, optional bool bSearchOnly)
     local #var(DeusExPrefix)Weapon weap,ownedWeapon;
     local int ammoAvail,ammoToAdd,ammoRemaining;
     local class<Ammo> defAmmoClass;
-    local #var(DeusExPrefix)Ammo ownAmmo;
+    local #var(DeusExPrefix)Ammo ownAmmo,ammoItem;
     local bool isThrown, isMelee;
     local #var(DeusExPrefix)Pickup pickup,ownedPickup;
     local #var(prefix)WeaponMod mod;
@@ -923,10 +1004,24 @@ function bool HandleItemPickup(Actor FrobTarget, optional bool bSearchOnly)
         }
     }
 
+    ammoItem = #var(DeusExPrefix)Ammo(FrobTarget);
+    if (ammoItem!=None){
+        //Ammo not full, but not necessarily able to take *all* the ammo, so check
+        if (False == CheckForAmmoToLeaveBehind(ammoItem)){
+            return false;
+        }
+    }
+
+    weap = #var(DeusExPrefix)Weapon(FrobTarget);
+    if (weap!=None && weap.PickUpAmmoCount!=0){
+        if (False==CheckForRemainingWeaponAmmo(weap)){
+            return false;
+        }
+    }
+
     bCanPickup = Super.HandleItemPickup(FrobTarget, bSearchOnly);
 
     //Ammo Looting
-    weap = #var(DeusExPrefix)Weapon(FrobTarget);
     if (bCanPickup==False && weap!=None && weap.PickUpAmmoCount!=0){
         ownedWeapon=#var(DeusExPrefix)Weapon(FindInventoryType(FrobTarget.Class));
         //You can't pick up the weapon, but let's yoink the ammo
@@ -967,8 +1062,6 @@ function bool HandleItemPickup(Actor FrobTarget, optional bool bSearchOnly)
         }
     }
 
-
-
     //Looting partial stacks of items (eg 1 out of 3 in a stack of multitools)
     pickup = #var(DeusExPrefix)Pickup(FrobTarget);
     if (pickup!=None && pickup.Owner!=Self && pickup.maxCopies>1){

diff --git a/DXRVanilla/DeusEx/Classes/Player.uc b/DXRVanilla/DeusEx/Classes/Player.uc
@@ -318,7 +318,9 @@ function bool HandleItemPickup(Actor FrobTarget, optional bool bSearchOnly)
 
                 ownAmmo.AddAmmo(ammoToAdd);
                 weap.PickUpAmmoCount=ammoRemaining;
-                ClientMessage("Took "$ammoToAdd$" "$ownAmmo.ItemName$" from "$weap.ItemName,, true);
+                if (ammoToAdd>0){
+                    ClientMessage("Took "$ammoToAdd$" "$ownAmmo.ItemName$" from "$weap.ItemName,, true);
+                }
                 UpdateBeltText(weap);
             }
         }

diff --git a/DXRando/DeusEx/Classes/DXRandoCrowdControlEffects.uc b/DXRando/DeusEx/Classes/DXRandoCrowdControlEffects.uc
@@ -2857,7 +2857,7 @@ function int doCrowdControlEvent(string code, string param[5], string viewer, in
 
         // dmg_double and dmg_half require changes inside the player class
         case "dmg_double":
-            if (!#defined(vanilla)){
+            if (!#defined(vanilla) && !#defined(revision)){
                 PlayerMessage("Double Damage effect unavailable in this mod");
                 return NotAvail;
             }
@@ -2872,7 +2872,7 @@ function int doCrowdControlEvent(string code, string param[5], string viewer, in
             break;
 
         case "dmg_half":
-            if (!#defined(vanilla)){
+            if (!#defined(vanilla) && !#defined(revision)){
                 PlayerMessage("Half Damage effect unavailable in this mod");
                 return NotAvail;
             }

diff --git a/DeusEx.u b/DeusEx.u
diff --git a/GMDXRandomizer.u b/GMDXRandomizer.u
diff --git a/HXRandomizer.u b/HXRandomizer.u
diff --git a/RevRandomizer.u b/RevRandomizer.u
diff --git a/VMDRandomizer.u b/VMDRandomizer.u