v3.0.0.1 Beta Merge pull request #795 from Die4Ever/develop

v3.0.0.1 Beta

DXRBalance/DeusEx/Classes/AugHeartLung.uc

@@ -10,6 +10,14 @@ function PostPostBeginPlay()
     Description = default.Description;
 }
 
+function Deactivate()
+{
+    Super(Augmentation).Deactivate();
+
+    Player.AugmentationSystem.BoostAugs(False, Self);
+    //Player.AugmentationSystem.DeactivateAll();
+}
+
 defaultproperties
 {
     bAutomatic=true

DXRBalance/DeusEx/Classes/AugmentationManager.uc

@@ -160,6 +160,7 @@ simulated function Float CalcEnergyUse(float deltaTime)
     local float f, energyUse, boostedEnergyUse, energyMult, boostMult;
     local Augmentation anAug;
 
+    boostedEnergyUse = 0;
     energyUse = 0;
     energyMult = 1.0;
     boostMult = 1.0;
@@ -177,7 +178,7 @@ simulated function Float CalcEnergyUse(float deltaTime)
         if (anAug.bHasIt && anAug.bIsActive)
         {
             f = ((anAug.GetEnergyRate()/60) * deltaTime);
-            if(f > 0 && anAug.bBoosted) {
+            if(anAug.bBoosted) {
                 boostedEnergyUse += f;
             } else {
                 energyUse += f;
@@ -198,3 +199,31 @@ simulated function Float CalcEnergyUse(float deltaTime)
 
     return energyUse;
 }
+
+function BoostAugs(bool bBoostEnabled, Augmentation augBoosting)
+{
+    local Augmentation anAug;
+
+    for(anAug = FirstAug; anAug != None; anAug = anAug.next)
+    {
+        // Don't boost the augmentation causing the boosting!
+        if (anAug == augBoosting) continue;
+
+        // DXRando: don't boost free augs because (0 * synth_heart_strength) == 0
+        if (bBoostEnabled && anAug.energyRate > 0)
+        {
+            if (anAug.bIsActive && !anAug.bBoosted && (anAug.CurrentLevel < anAug.MaxLevel))
+            {
+                anAug.CurrentLevel++;
+                anAug.bBoosted = True;
+                anAug.Reset();
+            }
+        }
+        else if (anAug.bBoosted)
+        {
+            anAug.CurrentLevel--;
+            anAug.bBoosted = False;
+            anAug.Reset();
+        }
+    }
+}

DXRCore/DeusEx/Classes/DXRActorsBase.uc

@@ -400,6 +400,21 @@ function Inventory MoveNextItemTo(Inventory item, vector Location, name Tag)
     return nextItem;
 }
 
+static function DataVaultImage GivePlayerImage(DeusExPlayer player, class<DataVaultImage> imageClass)
+{
+    local DataVaultImage image;
+
+    image = DataVaultImage(player.FindInventoryType(imageClass));
+    if (image == None) {
+        image = player.Spawn(imageClass);
+        image.ItemName = imageClass.default.imageDescription;
+        image.ItemArticle = "-";
+        image.Frob(player, None);
+    }
+
+    return image;
+}
+
 function bool SkipActorBase(Actor a)
 {
     if( a.Owner != None || a.bStatic || a.bHidden || a.bMovable==False || a.bIsSecretGoal || a.bDeleteMe )
@@ -800,6 +815,27 @@ static function ConEventSpeech GetSpeechEvent(ConEvent start, string speech) {
     return None;
 }
 
+static function string GetGoalText(name goalName, Conversation con)
+{
+    local ConEvent ce;
+    local ConEventAddGoal ceag;
+
+    if (con == None || goalName == '') return "";
+
+    for (ce = con.eventList; ce != None; ce = ce.nextEvent) {
+        ceag = ConEventAddGoal(ce);
+        if (ceag != None && ceag.goalName == goalName)
+            return ceag.goalText;
+    }
+
+    return "";
+}
+
+function string GetGoalTextGC(name goalName, name conversationName)
+{
+    return GetGoalText(goalName, GetConversation(conversationName));
+}
+
 
 static function string GetActorName(Actor a)
 {

DXRCore/DeusEx/Classes/DXRBase.uc

@@ -434,6 +434,22 @@ simulated function rotator rotm(int p, int y, int roll, int offset)
     return r;
 }
 
+static simulated function rotator rotm_static(int p, int y, int roll, int offset, vector coords_mult)
+{
+    local Rotator r;
+    // TODO: only works for X or Y mirrors, haven't tested Y mirrors
+    if( (coords_mult.X < 0 && coords_mult.Y > 0) || (coords_mult.X > 0 && coords_mult.Y < 0)) {
+        y += offset;
+        y = imod(y, 65535) * -1;
+        y -= offset;
+        y = imod(y, 65535);
+    }
+    r.Pitch = p;
+    r.Yaw = y;
+    r.Roll = roll;
+    return r;
+}
+
 final function Class<Inventory> ModifyInventoryClass( out Class<Inventory> InventoryClass )
 {
 #ifdef hx

DXRCore/DeusEx/Classes/DXRVersion.uc

@@ -5,7 +5,7 @@ simulated static function CurrentVersion(optional out int major, optional out in
     major=3;
     minor=0;
     patch=0;
-    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;

DXRFixes/DeusEx/Classes/Animal.uc

@@ -65,7 +65,7 @@ function PetAnimal(#var(PlayerPawn) petter)
     foreach AllActors(class'DXRCameraModes',camera)
         break;
 
-    camera.EnableTempThirdPerson();
+    camera.EnableTempThirdPerson(true);
 
     highPet=False;
     if ((petter.bIsCrouching || petter.bForceDuck)){

DXRFixes/DeusEx/Classes/ScriptedPawn.uc

@@ -298,7 +298,7 @@ function _TakeDamageBase(int Damage, Pawn instigatedBy, Vector hitlocation, Vect
         SetEnemy(instigatedBy, 0, true);
 
         // gib us if we get blown up
-        if (DamageType == 'Exploded')
+        if (DamageType == 'Exploded' || DamageType == 'Helicopter')
             Health = -10000;
         else
             Health = -1;

DXRMapFixups/DeusEx/Classes/DXRFixupM02.uc

@@ -26,6 +26,8 @@ function PreFirstEntryMapFixes()
     local #var(prefix)CrateUnbreakableSmall crateSmall;
     local #var(prefix)CrateUnbreakableMed crateMedium;
     local Vector loc;
+    local Teleporter tel;
+    local DynamicTeleporter dtel;
 
 #ifdef injections
     local #var(prefix)Newspaper np;
@@ -133,6 +135,7 @@ function PreFirstEntryMapFixes()
                     break;
                 }
             }
+
             buttonHint = DXRButtonHoverHint(class'DXRButtonHoverHint'.static.Create(self, "", button.Location, button.CollisionRadius+5, button.CollisionHeight+5, exit));
             buttonHint.SetBaseActor(button);
 
@@ -213,6 +216,16 @@ function PreFirstEntryMapFixes()
         buttonHint.SetBaseActor(button);
 
         SetAllLampsState(false, true, true); // the lamp in Paul's apartment, seen through the window
+        if (#defined(vanilla))
+            class'MoverToggleTrigger'.static.CreateMTT(self, 'DXRSmugglerElevatorUsed', 'elevatorbutton', 0, 1, 0.0, 3);
+            foreach AllActors(class'Teleporter', tel) {
+                if (tel.URL == "02_NYC_Smug#ToSmugFrontDoor") {
+                    dtel = class'DynamicTeleporter'.static.ReplaceTeleporter(tel);
+                    dtel.SetDestination("02_NYC_Smug", 'PathNode83',, 16384);
+                    class'DXREntranceRando'.static.AdjustTeleporterStatic(dxr, dtel);
+                    break;
+                }
+            }
 
         break;
     case "02_NYC_BAR":
@@ -248,10 +261,16 @@ function PreFirstEntryMapFixes()
         foreach AllActors(class'DeusExMover', d,'botordertrigger') {
             d.tag = 'botordertriggerDoor';
         }
+
         oot = Spawn(class'OnceOnlyTrigger');
         oot.Event='botordertriggerDoor';
         oot.Tag='botordertrigger';
+
         SetAllLampsState(false, true, true); // smuggler has one table lamp, upstairs where no one is
+        if (#defined(vanilla)) {
+            class'MoverToggleTrigger'.static.CreateMTT(self, 'DXRSmugglerElevatorUsed', 'elevatorbutton', 1, 0, 0.0, 3);
+        }
+
         break;
 
     case "02_NYC_FREECLINIC":
@@ -340,7 +359,7 @@ function PostFirstEntryMapFixes()
 
 function AnyEntryMapFixes()
 {
-    Local Jock j;
+    local Jock j;
 
     switch (dxr.localURL) {
     case "02_NYC_BAR":
@@ -351,6 +370,7 @@ function AnyEntryMapFixes()
             }
         }
         break;
+
     case "02_NYC_SMUG":
         if (dxr.flagbase.getBool('SmugglerDoorDone')) {
             dxr.flagbase.setBool('MetSmuggler', true,, -1);

DXRMapFixups/DeusEx/Classes/DXRFixupM04.uc

@@ -51,6 +51,8 @@ function PreFirstEntryMapFixes()
     local DXRMapVariants mapvariants;
     local bool VanillaMaps;
     local #var(prefix)HumanCivilian hc;
+    local Teleporter tel;
+    local DynamicTeleporter dtel;
 
     VanillaMaps = class'DXRMapVariants'.static.IsVanillaMaps(player());
 
@@ -297,6 +299,16 @@ function PreFirstEntryMapFixes()
             troop.ChangeAlly('Player', 1.0, false);
             ChangeInitialAlliance(troop, 'Player', 1.0, false);
         }
+        if (#defined(vanilla))
+            class'MoverToggleTrigger'.static.CreateMTT(self, 'DXRSmugglerElevatorUsed', 'elevatorbutton', 0, 1, 0.0, 5);
+            foreach AllActors(class'Teleporter', tel) {
+                if (tel.URL == "04_NYC_Smug#ToSmugFrontDoor") {
+                    dtel = class'DynamicTeleporter'.static.ReplaceTeleporter(tel);
+                    dtel.SetDestination("04_NYC_Smug", 'PathNode83',, 16384);
+                    class'DXREntranceRando'.static.AdjustTeleporterStatic(dxr, dtel);
+                    break;
+                }
+            }
 
         break;
 
@@ -307,7 +319,10 @@ function PreFirstEntryMapFixes()
         oot = Spawn(class'OnceOnlyTrigger');
         oot.Event='botordertriggerDoor';
         oot.Tag='botordertrigger';
+
         SetAllLampsState(false, true, true); // smuggler has one table lamp, upstairs where no one is
+        class'MoverToggleTrigger'.static.CreateMTT(self, 'DXRSmugglerElevatorUsed', 'elevatorbutton', 1, 0, 0.0, 5);
+
         break;
     }
 }
@@ -387,6 +402,7 @@ function AnyEntryMapFixes()
                 door.DoOpen();
             }
         }
+
         break;
     }
 }