v3.2.3.4 It Takes Two, Merge pull request #1014 from Die4Ever/develop

v3.2.3.4 It Takes Two
Die4Ever · Oct 24, 2024 · e3e2161 · e3e2161
2 parents 899beba + d42b76f
commit e3e2161
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
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=2;
     patch=3;
-    build=3;//build can't be higher than 99
+    build=4;//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/DXRMissions/DeusEx/Classes/DXRMissionsM15.uc b/DXRMissions/DeusEx/Classes/DXRMissionsM15.uc
@@ -41,51 +41,52 @@ function int InitGoals(int mission, string map)
         break;
 
     case "15_AREA51_PAGE":
+        // GOAL_TYPE1 is for the goals that can be in easy locations, aka everything except Aquinas Substation Computer
         goal = AddGoal("15_AREA51_PAGE", "Aquinas Substation Computer", NORMAL_GOAL, 'ComputerSecurity0', PHYS_None);
         loc = AddGoalLocation("15_AREA51_PAGE", "Aquinas Substation", NORMAL_GOAL | VANILLA_GOAL, vect(7676.954590, -5536.813965, -5952.371094), rot(0, -32824, 0));
         AddMapMarker(class'Image15_Area51_Sector4',316,199,"E","Ending", loc,"One of the end game goals can be located on the wall of the Aquinas Substation.");
 
-        goal = AddGoal("15_AREA51_PAGE", "Coolant Deactivation Button", NORMAL_GOAL, 'Switch0', PHYS_None);
+        goal = AddGoal("15_AREA51_PAGE", "Coolant Deactivation Button", GOAL_TYPE1 | NORMAL_GOAL, 'Switch0', PHYS_None);
         AddGoalActor(goal, 1, 'DataLinkTrigger2', PHYS_None); // shutting down the coolant, DL_tong3: Good.  Now go to the reactor lab.
         AddGoalActor(goal, 2, 'DataLinkTrigger12', PHYS_None); // same
         AddGoalActor(goal, 3, 'DataLinkTrigger37', PHYS_None); // DL_ButtonWarning: You will stay away from the coolant controls.  I will be destroyed if the reactors become unstable, and without me there will be chaos.
         loc = AddGoalLocation("15_AREA51_PAGE", "Coolant B13", NORMAL_GOAL | VANILLA_GOAL, vect(7530.221191,-10824.041992, -5968.846680), rot(11200, -16088, 0));
         AddMapMarker(class'Image15_Area51_Sector4',78,208,"E","Ending", loc,"One of the end game goals can be located on the control panel in the Coolant B13 room.");
 
-        goal = AddGoal("15_AREA51_PAGE", "Blue Fusion Reactor 3 Control", NORMAL_GOAL, 'Keypad5', PHYS_None);
+        goal = AddGoal("15_AREA51_PAGE", "Blue Fusion Reactor 3 Control", GOAL_TYPE1 | NORMAL_GOAL, 'Keypad5', PHYS_None);
         AddGoalActor(goal, 1, 'DataLinkTrigger17', PHYS_None); // DL_Blue_Fusion: That's one of the blue-fusion reactors.  You need to shut down all four.
         loc = AddGoalLocation("15_AREA51_PAGE", "Ground Floor", NORMAL_GOAL | VANILLA_GOAL, vect(6360.212402, -6899.757324, -5988.736328), rot(0, -45056, 0));
         AddMapMarker(class'Image15_Area51_Sector4',256,254,"E","Ending", loc,"One of the end game goals can be located on the base of the ground floor Blue Fusion Reactor.");
 
-        goal = AddGoal("15_AREA51_PAGE", "Blue Fusion Reactor 4 Control", NORMAL_GOAL, 'Keypad6', PHYS_None);
+        goal = AddGoal("15_AREA51_PAGE", "Blue Fusion Reactor 4 Control", GOAL_TYPE1 | NORMAL_GOAL, 'Keypad6', PHYS_None);
         AddGoalActor(goal, 1, 'DataLinkTrigger19', PHYS_None); // DL_Blue_Fusion
         loc = AddGoalLocation("15_AREA51_PAGE", "Radioactive Room", NORMAL_GOAL | VANILLA_GOAL, vect(4764.696289, -6270.016113, -5596.736328), rot(0, -61760, 0));
         AddMapMarker(class'Image15_Area51_Sector4',155,376,"E","Ending", loc,"One of the end game goals can be located on the base of the Blue Fusion Reactor in the radioactive room.");
 
-        goal = AddGoal("15_AREA51_PAGE", "Blue Fusion Reactor 2 Control", NORMAL_GOAL, 'Keypad1', PHYS_None);
+        goal = AddGoal("15_AREA51_PAGE", "Blue Fusion Reactor 2 Control", GOAL_TYPE1 | NORMAL_GOAL, 'Keypad1', PHYS_None);
         AddGoalActor(goal, 1, 'DataLinkTrigger18', PHYS_None); // DL_Blue_Fusion
         loc = AddGoalLocation("15_AREA51_PAGE", "Under Page", NORMAL_GOAL | VANILLA_GOAL, vect(6153.652832, -7133.199219, -5596.736328), rot(0, -61568, 0));
         AddMapMarker(class'Image15_Area51_Sector4',115,314,"E","Ending", loc,"One of the end game goals can be located on the base of the Blue Fusion Reactor on the middle floor underneath Bob Page.");
 
-        goal = AddGoal("15_AREA51_PAGE", "Blue Fusion Reactor 1 Control", NORMAL_GOAL, 'Keypad0', PHYS_None);
+        goal = AddGoal("15_AREA51_PAGE", "Blue Fusion Reactor 1 Control", GOAL_TYPE1 | NORMAL_GOAL, 'Keypad0', PHYS_None);
         AddGoalActor(goal, 1, 'DataLinkTrigger21', PHYS_None); // DL_Blue_Fusion
         loc = AddGoalLocation("15_AREA51_PAGE", "Observation Deck", NORMAL_GOAL | VANILLA_GOAL, vect(6029.028809, -8301.839844, -5148.736328), rot(0, -36944, 0));
         AddMapMarker(class'Image15_Area51_Sector4',192,77,"E","Ending", loc,"One of the end game goals can be located on the base of the Blue Fusion Reactor in the top floor Observation Deck overlooking Bob Page.");
 
         if (FeatureFlag(3,3,0, "Area51EndingBalancePass2")){
             if (#bool(shuffleucswitches)){
                 //Shuffle the UC switches themselves
-                goal = AddGoal("15_AREA51_PAGE", "Upper UC Shutdown", NORMAL_GOAL, 'DeusExMover72', PHYS_MovingBrush);
-                loc = AddGoalLocation("15_AREA51_PAGE", "Upper UC Control Room", NORMAL_GOAL | VANILLA_GOAL, vect(7873,-7548,-5096), rot(0, 16384, 0));
+                goal = AddGoal("15_AREA51_PAGE", "Upper UC Shutdown", GOAL_TYPE1 | NORMAL_GOAL, 'DeusExMover72', PHYS_MovingBrush);
+                loc = AddGoalLocation("15_AREA51_PAGE", "Upper UC Control Room", GOAL_TYPE1 | VANILLA_GOAL, vect(7873,-7548,-5096), rot(0, 16384, 0));
 
-                goal = AddGoal("15_AREA51_PAGE", "Middle UC Shutdown", NORMAL_GOAL, 'DeusExMover51', PHYS_MovingBrush);
+                goal = AddGoal("15_AREA51_PAGE", "Middle UC Shutdown", GOAL_TYPE1| NORMAL_GOAL, 'DeusExMover51', PHYS_MovingBrush);
                 loc = AddGoalLocation("15_AREA51_PAGE", "Middle UC Control Room", NORMAL_GOAL | VANILLA_GOAL, vect(5518,-8644,-5540), rot(0, 16384, 0));
 
-                goal = AddGoal("15_AREA51_PAGE", "Bottom UC Shutdown", NORMAL_GOAL, 'DeusExMover49', PHYS_MovingBrush);
+                goal = AddGoal("15_AREA51_PAGE", "Bottom UC Shutdown", GOAL_TYPE1 | NORMAL_GOAL, 'DeusExMover49', PHYS_MovingBrush);
                 loc = AddGoalLocation("15_AREA51_PAGE", "Bottom UC Control Room", NORMAL_GOAL | VANILLA_GOAL, vect(7956,-7495,-5931), rot(0, 32768, 0));
             } else {
                 //Only use the rooms as extra locations
-                loc = AddGoalLocation("15_AREA51_PAGE", "Upper UC Control Room", NORMAL_GOAL, vect(7991,-7395,-5096), rot(0, 32768, 0));
+                loc = AddGoalLocation("15_AREA51_PAGE", "Upper UC Control Room", GOAL_TYPE1, vect(7991,-7395,-5096), rot(0, 32768, 0));
                 loc = AddGoalLocation("15_AREA51_PAGE", "Middle UC Control Room", NORMAL_GOAL, vect(5382,-8556,-5540), rot(0, 0, 0));
                 loc = AddGoalLocation("15_AREA51_PAGE", "Bottom UC Control Room", NORMAL_GOAL, vect(7868,-7631,-5931), rot(0, 16384, 0));
             }

diff --git a/DXRando/DeusEx/Classes/MemConUnit.uc b/DXRando/DeusEx/Classes/MemConUnit.uc
@@ -22,7 +22,10 @@ function PostPostBeginPlay()
         Description="This item is capable of capturing and containing half of your memories, requiring 2 of them to save the game one time. The only freebie autosave you get is at the very start of the game.";
     }
     if (m.IsFixedSaves()){
-        Description=Description $ "|n|nYou must have an ATM, personal computer, public terminal, or security computer highlighted in order to save your game. You do not need to open the computer, just look at it. Then you can use the normal Save Game menu or the Quicksave button.";
+        Description=Description
+            $ "|n|nYou must have an ATM, personal computer, public terminal, or security computer highlighted in order to save your game. You do not need to open the computer, just look at it. Then you can use the normal Save Game menu or the Quicksave button."
+            $ "|n|nSometimes you might want to backtrack to save."
+            $ "|n|nRemember that if you die not all is lost, because you now have a better plan!";
     }
 }
 #endif

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