last room and puzzle order

This commit is contained in:
2022-12-08 14:04:00 +01:00
parent b3c53031c1
commit 429f9536a9
9 changed files with 91 additions and 71 deletions

View File

@@ -37,11 +37,14 @@ namespace EscapeRoomEngine.Engine.Runtime
public IOption<Room> CurrentRoom => NumberOfRooms > 0 ? Some<Room>.Of(_rooms[^1]) : None<Room>.New();
private readonly List<Room> _rooms = new();
private List<PuzzleModuleDescription> _puzzles;
private GameObject _playSpaceOrigin;
private void Awake()
{
Measure.Clear();
_puzzles = new List<PuzzleModuleDescription>(theme.puzzleTypes);
}
private void Start()
@@ -79,7 +82,10 @@ namespace EscapeRoomEngine.Engine.Runtime
var puzzlesAdded = 0;
var tries = 0;
Space space;
Passage exit;
Passage exit = null;
var puzzle = _puzzles[0];
_puzzles.RemoveAt(0);
do
{
@@ -90,19 +96,20 @@ namespace EscapeRoomEngine.Engine.Runtime
space = new Space(room, entrance);
// add exit
var exitDoor = new DoorModule(space, theme.exitDoorTypes.RandomElement());
if (!space.AddModuleWithRequirements(exitDoor))
throw new EngineException("Could not satisfy requirements for exit door.");
exit = new Passage(exitDoor);
// add puzzles
var puzzleCount = Utilities.Utilities.RandomInclusive(theme.puzzleCount.x, theme.puzzleCount.y);
for (var i = 0; i < puzzleCount; i++)
if (_puzzles.Count > 0)
{
if (space.AddModuleWithRequirements(Module.CreateModuleByType(space, theme.puzzleTypes.RandomElement())))
var exitDoor = new DoorModule(space, theme.exitDoorTypes.RandomElement());
if (!space.AddModuleWithRequirements(exitDoor))
{
puzzlesAdded++;
throw new EngineException("Could not satisfy requirements for exit door.");
}
exit = new Passage(exitDoor);
}
// add puzzle
if (space.AddModuleWithRequirements(Module.CreateModuleByType(space, puzzle)))
{
puzzlesAdded++;
}
} while (puzzlesAdded == 0 && tries < maxSpaceGenerationTries);