Skip to content

Handle eel positions in Golden Mask #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lahm86 wants to merge 1 commit into from
Closed

Handle eel positions in Golden Mask #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions TRRandomizerCore/Randomizers/Shared/EnemyAllocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Newtonsoft.Json;
using TRLevelControl.Model;
using TRLevelControl.Model;
using TRRandomizerCore.Editors;
using TRRandomizerCore.Helpers;
using TRRandomizerCore.Utilities;
Expand All @@ -22,10 +21,13 @@ public EnemyAllocator(TRGameVersion version)
{
string relocFile = $"Resources/{version}/Locations/enemy_relocations.json";
_relocations = File.Exists(relocFile)
? JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText(relocFile))
: new();
? JsonUtils.ReadFile<Dictionary<string, List<Location>>>(relocFile)
: [];
RelocationsLoaded();
}

protected virtual void RelocationsLoaded() { }

public void Initialise()
{
_resultantEnemies = new();
Expand Down
20 changes: 20 additions & 0 deletions TRRandomizerCore/Randomizers/TR2/Shared/TR2EnemyAllocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,26 @@ protected override Dictionary<TR2Type, List<int>> GetRestrictedRooms(string leve
protected override bool IsOneShotType(TR2Type type)
=> type == TR2Type.MarcoBartoli;

protected override void RelocationsLoaded()
{
foreach (var locations in _relocations.Values)
{
var blackLocations = locations.FindAll(l => l.TargetType == (short)TR2Type.BlackMorayEel);
foreach (var blackEel in blackLocations)
{
var hasYellowEel = locations.Any(l => l.IsEquivalent(blackEel)
&& l.EntityIndex == blackEel.EntityIndex
&& l.TargetType == (short)TR2Type.YellowMorayEel);
if (!hasYellowEel)
{
var yellowEel = blackEel.Clone();
yellowEel.TargetType = (short)TR2Type.YellowMorayEel;
locations.Add(yellowEel);
}
}
}
}

public EnemyTransportCollection<TR2Type> SelectCrossLevelEnemies(string levelName, TR2Level level)
{
if (levelName == TR2LevelNames.ASSAULT)
Expand Down
Loading
Loading