Changed exit examination to be more concise

benpollarduk · Dec 6, 2024 · be8b65d · be8b65d
1 parent 01c5b92
commit be8b65d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/NetAF/Assets/Locations/Exit.cs b/NetAF/Assets/Locations/Exit.cs
@@ -61,7 +61,7 @@ public Exit(Direction direction, bool isLocked = false, Identifier identifier =
         /// <returns>The completed Description.</returns>
         private IDescription GenerateDescription()
         {
-            return new ConditionalDescription($"The exit {Direction.ToString().ToLower()} is locked.", $"The exit {Direction.ToString().ToLower()} is unlocked.", () => IsLocked);
+            return new ConditionalDescription($"{Identifier.Name} is locked.", $"{Identifier.Name} is unlocked.", () => IsLocked);
         }
 
         /// <summary>

diff --git a/NetAF/Interpretation/SceneCommandInterpreter.cs b/NetAF/Interpretation/SceneCommandInterpreter.cs
@@ -318,10 +318,10 @@ private static bool TryParseUseOnCommand(string text, Game game, out ICommand co
 
             if (noun.CaseInsensitiveContains(onPadded))
             {
-                itemName = noun.Substring(0, noun.IndexOf(onPadded, StringComparison.CurrentCultureIgnoreCase));
+                itemName = noun[..noun.IndexOf(onPadded, StringComparison.CurrentCultureIgnoreCase)];
                 noun = noun.Replace(itemName, string.Empty);
                 var onIndex = noun.IndexOf(onPadded, StringComparison.CurrentCultureIgnoreCase);
-                var targetName = noun.Substring(onIndex + onPadded.Length);
+                var targetName = noun[(onIndex + onPadded.Length)..];
 
                 if (targetName.InsensitiveEquals(Me) || targetName.EqualsExaminable(game.Player))
                     target = game.Player;