forked from LostArtefacts/TR-Rando
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
LostArtefacts#240 LostArtefacts#241 Enemy Environment Changes
Adds basic environment changing support, mainly targeted at mods post-enemy randomization. A new group is available - ConditionalAll - each item in this set has a condition and so will only run if the condition is met (can define OnTrue and/or OnFalse). This currently fixes moves enemy 8 in Jungle if it's not suitable for the crawlspace and handles the handscanner area in HSC if there isn't a prisoner to open the trapdoor. Environment rando will currently only apply All, ConditionalAll and NonPurist if defined. The UI options remain disabled.
- Loading branch information
Showing
11 changed files
with
361 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| using System.Collections.Generic; | ||
| using TRLevelReader.Model; | ||
|
|
||
| namespace TREnvironmentEditor.Model | ||
| { | ||
| public class EMConditionalSingleEditorSet : ITextureModifier | ||
| { | ||
| public BaseEMCondition Condition { get; set; } | ||
| public EMEditorSet OnTrue { get; set; } | ||
| public EMEditorSet OnFalse { get; set; } | ||
|
|
||
| public void ApplyToLevel(TR2Level level, IEnumerable<EMType> excludedTypes = null) | ||
| { | ||
| EMEditorSet edits = Condition.GetResult(level) ? OnTrue : OnFalse; | ||
| if (edits != null) | ||
| { | ||
| edits.ApplyToLevel(level, excludedTypes); | ||
| } | ||
| } | ||
|
|
||
| public void ApplyToLevel(TR3Level level, IEnumerable<EMType> excludedTypes = null) | ||
| { | ||
| EMEditorSet edits = Condition.GetResult(level) ? OnTrue : OnFalse; | ||
| if (edits != null) | ||
| { | ||
| edits.ApplyToLevel(level, excludedTypes); | ||
| } | ||
| } | ||
|
|
||
| public void RemapTextures(Dictionary<ushort, ushort> indexMap) | ||
| { | ||
| if (OnTrue != null) | ||
| { | ||
| OnTrue.RemapTextures(indexMap); | ||
| } | ||
| if (OnFalse != null) | ||
| { | ||
| OnFalse.RemapTextures(indexMap); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 151 additions & 6 deletions
157
TRRandomizerCore/Randomizers/TR3/TR3EnvironmentRandomizer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,161 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using TREnvironmentEditor; | ||
| using TREnvironmentEditor.Model; | ||
| using TREnvironmentEditor.Model.Types; | ||
| using TRGE.Core; | ||
| using TRLevelReader.Helpers; | ||
| using TRLevelReader.Model.Enums; | ||
| using TRRandomizerCore.Helpers; | ||
| using TRRandomizerCore.Levels; | ||
| using TRRandomizerCore.Textures; | ||
|
|
||
| namespace TRRandomizerCore.Randomizers.TR3 | ||
| namespace TRRandomizerCore.Randomizers | ||
| { | ||
| public class TR3EnvironmentRandomizer : BaseTR3Randomizer | ||
| { | ||
| internal bool EnforcedModeOnly => true;//!Settings.RandomizeEnvironment; | ||
| internal TR3TextureMonitorBroker TextureMonitor { get; set; } | ||
|
|
||
| private List<EMType> _disallowedTypes; | ||
| private List<TR3ScriptedLevel> _levelsToMirror; | ||
|
|
||
| public override void Randomize(int seed) | ||
| { | ||
| throw new NotImplementedException(); | ||
| _generator = new Random(seed); | ||
|
|
||
| _disallowedTypes = new List<EMType>(); | ||
| if (!Settings.RandomizeWaterLevels) | ||
| { | ||
| _disallowedTypes.Add(EMType.Flood); | ||
| _disallowedTypes.Add(EMType.Drain); | ||
| } | ||
| if (!Settings.RandomizeSlotPositions) | ||
| { | ||
| _disallowedTypes.Add(EMType.MoveSlot); | ||
| _disallowedTypes.Add(EMType.SwapSlot); | ||
| } | ||
| if (!Settings.RandomizeLadders) | ||
| { | ||
| _disallowedTypes.Add(EMType.Ladder); | ||
| } | ||
|
|
||
| _levelsToMirror = Levels.RandomSelection(_generator, (int)Settings.MirroredLevelCount, exclusions: new HashSet<TR3ScriptedLevel> | ||
| { | ||
| Levels.Find(l => l.Is(TR3LevelNames.ASSAULT)) | ||
| }); | ||
|
|
||
| foreach (TR3ScriptedLevel lvl in Levels) | ||
| { | ||
| LoadLevelInstance(lvl); | ||
|
|
||
| RandomizeEnvironment(_levelInstance); | ||
|
|
||
| SaveLevelInstance(); | ||
|
|
||
| if (!TriggerProgress()) | ||
| { | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void RandomizeEnvironment(TR3CombinedLevel level) | ||
| { | ||
| EMEditorMapping mapping = EMEditorMapping.Get(GetResourcePath(@"TR3\Environment\" + level.Name + "-Environment.json")); | ||
| if (mapping != null) | ||
| { | ||
| ApplyMappingToLevel(level, mapping); | ||
| } | ||
|
|
||
| if (!EnforcedModeOnly && (_levelsToMirror.Contains(level.Script) || (level.IsAssault && Settings.MirrorAssaultCourse))) | ||
| { | ||
| MirrorLevel(level, mapping); | ||
| } | ||
| } | ||
|
|
||
| private void ApplyMappingToLevel(TR3CombinedLevel level, EMEditorMapping mapping) | ||
| { | ||
| EMType[] emptyExclusions = new EMType[] { }; | ||
|
|
||
| // Process enforced packs first. We do not pass disallowed types here. | ||
| // These generally fix OG issues such as problems with box overlaps and | ||
| // textures. | ||
| mapping.All.ApplyToLevel(level.Data, emptyExclusions); | ||
|
|
||
| // Similar to All, but these mods will have conditions configured so may | ||
| // or may not apply. | ||
| foreach (EMConditionalSingleEditorSet mod in mapping.ConditionalAll) | ||
| { | ||
| mod.ApplyToLevel(level.Data, emptyExclusions); | ||
| } | ||
|
|
||
| if (!EnforcedModeOnly || !Settings.PuristMode) | ||
| { | ||
| // Non-purist packs generally make return paths available. | ||
| // These are applied only if Purist mode is off or if Environment | ||
| // rando is on as a whole, because some other categories may rely | ||
| // on these changes having been made. | ||
| mapping.NonPurist.ApplyToLevel(level.Data, emptyExclusions); | ||
| } | ||
|
|
||
| if (EnforcedModeOnly) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| if (mapping.Any.Count > 0) | ||
| { | ||
| // Pick a random number of packs to apply, but at least 1 | ||
| int packCount = _generator.Next(1, mapping.Any.Count + 1); | ||
| List<EMEditorSet> randomSet = mapping.Any.RandomSelection(_generator, packCount); | ||
| foreach (EMEditorSet mod in randomSet) | ||
| { | ||
| mod.ApplyToLevel(level.Data, _disallowedTypes); | ||
| } | ||
| } | ||
|
|
||
| // AllWithin means one from each set will be applied. Used for the likes of choosing a new | ||
| // keyhole position from a set. | ||
| foreach (List<EMEditorSet> modList in mapping.AllWithin) | ||
| { | ||
| EMEditorSet mod = modList[_generator.Next(0, modList.Count)]; | ||
| mod.ApplyToLevel(level.Data, _disallowedTypes); | ||
| } | ||
|
|
||
| // ConditionalAllWithin is similar to above, but different sets of mods can be returned based | ||
| // on a given condition. For example, move a slot to a room, but only if a specific entity exists. | ||
| foreach (EMConditionalEditorSet conditionalSet in mapping.ConditionalAllWithin) | ||
| { | ||
| List<EMEditorSet> modList = conditionalSet.GetApplicableSets(level.Data); | ||
| EMEditorSet mod = modList[_generator.Next(0, modList.Count)]; | ||
| mod.ApplyToLevel(level.Data, _disallowedTypes); | ||
| } | ||
|
|
||
| // OneOf is used for a leader-follower situation, but where only one follower from | ||
| // a group is wanted. An example is removing a ladder (the leader) and putting it in | ||
| // a different position, so the followers are the different positions from which we pick one. | ||
| foreach (EMEditorGroupedSet mod in mapping.OneOf) | ||
| { | ||
| EMEditorSet follower = mod.Followers[_generator.Next(0, mod.Followers.Count)]; | ||
| mod.ApplyToLevel(level.Data, follower, _disallowedTypes); | ||
| } | ||
| } | ||
|
|
||
| private void MirrorLevel(TR3CombinedLevel level, EMEditorMapping mapping) | ||
| { | ||
| EMMirrorFunction mirrorer = new EMMirrorFunction(); | ||
| mirrorer.ApplyToLevel(level.Data); | ||
|
|
||
| if (mapping != null) | ||
| { | ||
| // Process packs that need to be applied after mirroring. | ||
| mapping.Mirrored.ApplyToLevel(level.Data, new EMType[] { }); | ||
| } | ||
|
|
||
| // Notify the texture monitor that this level has been flipped | ||
| TextureMonitor<TR3Entities> monitor = TextureMonitor.CreateMonitor(level.Name); | ||
| monitor.UseMirroring = true; | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.