From 3619a3c5d1701b513f253ecbd72d241b09eb5f6f Mon Sep 17 00:00:00 2001
From: lahm86 <33758420+lahm86@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:03:17 +0100
Subject: [PATCH] Fix misc TR1 issues (#749)

Resolves #748.
---
 CHANGELOG.md                                  |  2 ++
 .../Environment/LEVEL10B.PHD-Environment.json | 23 +++++++++++++++++++
 .../TR1/Locations/egg_locations.json          |  8 +++----
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f98d9ea4..8a14742e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
 - fixed some enemies in TR3 causing triggers for other objects to break e.g. Crash Site room 72 (#742)
 - fixed secret models in TR3R Aldwych appearing offset from their actual location (#744)
 - fixed a crash in Palace Midas when randomizing enemies natively (#746)
+- fixed being unable to shoot the scion in Atlantis if using the skip, without backtracking for its trigger when the T-rex or Adam is present (#746)
+- fixed an awkwardly positioned egg in Sanctuary of the Scion that could prevent being able to reach a switch (#748)
 - improved data integrity checks when opening a folder and prior to randomization (#719)
 
 ## [V1.9.1](https://github.com/LostArtefacts/TR-Rando/compare/V1.9.0...V1.9.1) - 2024-06-23
diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL10B.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL10B.PHD-Environment.json
index aa25732cb..1b8c9a546 100644
--- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL10B.PHD-Environment.json
+++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL10B.PHD-Environment.json
@@ -7600,6 +7600,29 @@
               }
             ]
           }
+        },
+        {
+          "Comments": "Add a second trigger to activate the scion in case the player uses the Atlantis skip.",
+          "EMType": 61,
+          "Locations": [
+            {
+              "X": 56832,
+              "Y": -15616,
+              "Z": 40448,
+              "Room": 56
+            }
+          ],
+          "Trigger": {
+            "Mask": 31,
+            "Actions": [
+              {
+                "Parameter": 109
+              },
+              {
+                "Parameter": 110
+              }
+            ]
+          }
         }
       ]
     }
diff --git a/TRRandomizerCore/Resources/TR1/Locations/egg_locations.json b/TRRandomizerCore/Resources/TR1/Locations/egg_locations.json
index 441952a7f..49a8fe429 100644
--- a/TRRandomizerCore/Resources/TR1/Locations/egg_locations.json
+++ b/TRRandomizerCore/Resources/TR1/Locations/egg_locations.json
@@ -658,11 +658,11 @@
       "EntityIndex": 7
     },
     {
-      "X": 47616,
-      "Y": -8704,
-      "Z": 33280,
+      "X": 43520,
+      "Y": -9216,
+      "Z": 38400,
       "Room": 15,
-      "Angle": 0,
+      "Angle": 16384,
       "EntityIndex": 34
     },
     {