Commit e1e8f328 authored by NukeKitty's avatar NukeKitty
Browse files

Merge branch 'main' into append-inputenabled

parents 08c58924 cb88e6f3
Subproject commit fd8643ae48b174e7eb0a533f59eef79ff5e9df49
Subproject commit 39ceacc91fd41d1013185a350d84726f5aaa668f
......@@ -609,6 +609,7 @@ namespace MomentaryMeeting.Game
List<Prompt> prompts = _database.Locations[player.LocationName].Prompt;
sb.Append(EvaluatePrompt(prompts));
var neighbours = _arrangementGenerator.GetNeighbours(player.LocationName);
var needsNewlineBeforeAutoExit = true;
AutoExitForDirection(RelativeDirection.Forward);
AutoExitForDirection(RelativeDirection.Right);
AutoExitForDirection(RelativeDirection.Back);
......@@ -632,7 +633,14 @@ namespace MomentaryMeeting.Game
{
var target = _database.Locations[neighbours.GetNeighbour(dir)];
if (target.ViewFrom != null && target.ViewFrom.ContainsKey(dir))
{
if (needsNewlineBeforeAutoExit)
{
sb.AppendLine();
needsNewlineBeforeAutoExit = false;
}
sb.AppendLine().Append(EvaluatePrompt(target.ViewFrom[dir]));
}
}
}
}
......
......@@ -62,6 +62,7 @@
while (newdb.Include.Any())
{
var filename = newdb.Include.First();
_logger.LogInformation($"Loading {filename}");
var temp = _deserializer.Deserialize<Database>(getFileContents(filename));
temp.Arrangements?.ToList().ForEach(kv => newdb.Arrangements[kv.Key] = kv.Value);
temp.GlobalText?.ToList().ForEach(kv => newdb.GlobalText[kv.Key] = kv.Value);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment