Skip to content

Commit

Permalink
Tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
ben_singer committed Oct 25, 2024
1 parent 70c763a commit 3c2b75b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions NetAF/Interpretation/GameCommandInterpreter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -447,9 +447,9 @@ private static bool TryParseUseOnCommand(string text, Game game, out ICommand co
var onIndex = noun.IndexOf(onPadded, StringComparison.CurrentCultureIgnoreCase);
var targetName = noun.Substring(onIndex + onPadded.Length);

if ((targetName.InsensitiveEquals(Me)) || (targetName.EqualsExaminable(game.Player)))
if (targetName.InsensitiveEquals(Me) || targetName.EqualsExaminable(game.Player))
target = game.Player;
else if ((targetName.InsensitiveEquals(Room)) || (targetName.EqualsExaminable(game.Overworld.CurrentRegion.CurrentRoom)))
else if (targetName.InsensitiveEquals(Room) || targetName.EqualsExaminable(game.Overworld.CurrentRegion.CurrentRoom))
target = game.Overworld.CurrentRegion.CurrentRoom;
else
target = game.FindInteractionTarget(targetName);
Expand Down Expand Up @@ -609,7 +609,7 @@ public CommandHelp[] GetContextualCommandHelp(Game game)
commands.Add(new CommandHelp($"{Take}/{TakeShort} {All}", "Take all items in the current room"));
}

if ((game.Player.CanConverse) && (game.Overworld.CurrentRegion.CurrentRoom.Characters.Any()))
if (game.Player.CanConverse && game.Overworld.CurrentRegion.CurrentRoom.Characters.Any())
commands.Add(new CommandHelp($"{Talk}/{TalkShort} {To.ToLower()} {Variable}", "Talk to a character"));

if (game.Overworld.CurrentRegion.CurrentRoom.Items.Any() || game.Player.Items.Any())
Expand Down
6 changes: 3 additions & 3 deletions NetAF/Utilities/RegionMaker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ internal static Matrix ConvertToRoomMatrix(IReadOnlyCollection<RoomPosition> roo
var maxY = roomPositions.Max(x => x.Y);
var maxZ = roomPositions.Max(x => x.Z);

var lengthX = (maxX - minX) + 1;
var lengthY = (maxY - minY) + 1;
var lengthZ = (maxZ - minZ) + 1;
var lengthX = maxX - minX + 1;
var lengthY = maxY - minY + 1;
var lengthZ = maxZ - minZ + 1;

var xNormalisationOffset = 0 - minX;
var yNormalisationOffset = 0 - minY;
Expand Down

0 comments on commit 3c2b75b

Please sign in to comment.