add PlaceMonster failure reasons, refactor fixed artifact wizard

.gitignore

@@ -72,3 +72,5 @@ bin/
 /AngbandOS.SqlPersistentStorage/obj/AngbandOS.PersistentStorage.Sql.csproj.nuget.g.props
 /AngbandOS.Core/.idea
 /AngbandOS.SqlPersistentStorage/obj/Debug/net6.0/AngbandOS.PersistentStorage.Sql.csproj.CopyComplete
+/AngbandOS.PersistentStorage.Sql.Schema/AngbandOS.PersistentStorage.Sql.Schema.dbmdl
+/AngbandOS.PersistentStorage.Sql.Schema/AngbandOS.PersistentStorage.Sql.Schema.jfm

AngbandOS.Avalonia/MainWindow.axaml.cs

@@ -72,7 +72,7 @@ private void RunGame()
                 }
                 else
                 {
-                    // We cannot append to a non-existant replay file.
+                    // We cannot append to a non-existent replay file.
                     gameResults = gameServer.PlayGame(this, null);
                 }
             }
@@ -104,14 +104,7 @@ private async void MainWindow_Opened(object? sender, EventArgs e)
     {
         await Task.Run(() =>
         {
-            try
-            {
-                RunGame();
-            }
-            catch (Exception ex)
-            {
-                Dispatcher.UIThread.Post(() => GameExceptionThrown(ex.Message));
-            }
+            RunGame();
         });
 
         Dispatcher.UIThread.Post(() => this.Close());

AngbandOS.Avalonia/Mixer.cs

@@ -2,7 +2,7 @@
 
 namespace AngbandOS.Avalonia
 {
-    internal class Mixer
+internal class Mixer
     {
         public float MusicVolume = 1;
         public float SoundVolume = 1;

AngbandOS.Avalonia/Program.cs

@@ -3,7 +3,7 @@
 
 namespace AngbandOS.Avalonia
 {
-    internal class Program
+internal class Program
     {
         // Initialization code. Don't use any Avalonia, third-party APIs or any
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized

AngbandOS.Avalonia/RendererControl.cs

@@ -12,7 +12,7 @@
 namespace AngbandOS.Avalonia
 {
     // Single-control renderer (fast). It owns its buffers and draws in Render.
-    internal class RendererControl : Control
+internal class RendererControl : Control
     {
         private readonly object _sync = new();
 

AngbandOS.Core.Expressions.IDE/ExperienceLevelIdentifierExpression.cs

@@ -8,16 +8,15 @@
 using AngbandOS.Core.Expressions.IDE;
 namespace AngbandOS.Core.Expressions;
 
-[Serializable]
 internal class ExperienceLevelIdentifierExpression : IdentifierExpression
 {
     private readonly int Value;
-    public ExperienceLevelIdentifierExpression(int value, string matchedIdentifier) : base(matchedIdentifier)
+    public ExperienceLevelIdentifierExpression(int value, string matchedIdentifier, bool? sign = null) : base(matchedIdentifier, sign)
     {
         Value = value;
     }
     public override Type[] ResultTypes => new Type[] { typeof(IntegerExpression) };
-    public override Expression Compute(Dictionary<string, object> variables)
+    protected override Expression ComputeIdentifier(Dictionary<string, object> providers)
     {
         return new IntegerExpression(Value);
     }

AngbandOS.Core.Expressions.IDE/ExperienceLevelIdentifierFactorParser.cs

@@ -6,7 +6,6 @@
 // copies. Other copyrights may also apply.”
 namespace AngbandOS.Core.Expressions;
 
-[Serializable]
 internal class ExperienceLevelIdentifierFactorParser : IdentifierFactorParser
 {
     private readonly int Value;
@@ -15,8 +14,8 @@ public ExperienceLevelIdentifierFactorParser(int value)
         Value = value;
     }
     public override string Identifier => "x";
-    protected override Expression GenerateExpression(string matchedIdentifier)
+    protected override Expression GenerateExpression(string matchedIdentifier, bool? sign)
     {
-        return new ExperienceLevelIdentifierExpression(Value, Identifier);
+        return new ExperienceLevelIdentifierExpression(Value, Identifier, sign);
     }
 }

AngbandOS.Core.Expressions.IDE/MainForm.cs

@@ -36,7 +36,9 @@ private void RenderExpression(TreeNode rootNode, Expression expression)
                 newNode = rootNode.Nodes.Add($"Integer {integerExpression.Value}");
                 break;
             case IdentifierExpression identifierExpression:
-                newNode = rootNode.Nodes.Add($"Identifier {identifierExpression.Identifier}");
+                string idSign = !identifierExpression.Sign.HasValue ? ""
+                              : identifierExpression.Sign.Value ? " + " : " - ";
+                newNode = rootNode.Nodes.Add($"Identifier {idSign}{identifierExpression.Identifier}");
                 break;
             case MultiplicationInfixExpression multiplicationExpression:
                 newNode = rootNode.Nodes.Add($"Multiply");

AngbandOS.Core.Expressions/ExpressionParser.cs

@@ -121,7 +121,12 @@ private Expression ParseExpression(string text, int precedence, ref int characte
             return expression;
         }
     }
-    private void IgnoreWhitespace(string text, ref int characterIndex)
+    /// <summary>
+    /// Ignores whitespace characters in the <paramref name="text"/> starting at the position indicated by <paramref name="characterIndex"/>.
+    /// </summary>
+    /// <param name="text">The text to parse.</param>
+    /// <param name="characterIndex">The current position in the text.</param>
+    public void IgnoreWhitespace(string text, ref int characterIndex)
     {
         while (characterIndex < text.Length && ParseLanguage.WhitespaceCharacters.Contains(text[characterIndex]))
         {

AngbandOS.Core.Expressions/IdentifierExpression.cs

@@ -3,9 +3,49 @@
 public abstract class IdentifierExpression : Expression
 {
     public readonly string Identifier;
-    public IdentifierExpression(string identifier)
+    public readonly bool? Sign;
+
+    public IdentifierExpression(string identifier, bool? sign = null)
     {
         Identifier = identifier;
+        Sign = sign;
+    }
+
+    /// <summary>
+    /// Derived expressions compute their unsigned value here.  The sign is applied by Compute.
+    /// </summary>
+    protected abstract Expression ComputeIdentifier(Dictionary<string, object> providers);
+
+    public override Expression Compute(Dictionary<string, object> providers)
+    {
+        Expression computedExpression = ComputeIdentifier(providers);
+
+        if (!Sign.HasValue || Sign.Value)
+        {
+            return computedExpression;
+        }
+
+        switch (computedExpression)
+        {
+            case IntegerExpression integerExpression:
+                return new IntegerExpression(-integerExpression.Value);
+            case DecimalExpression decimalExpression:
+                return new DecimalExpression(-decimalExpression.Value);
+            default:
+                throw new Exception($"Invalid type for signed identifier {Identifier}.");
+        }
+    }
+
+    public override string Text
+    {
+        get
+        {
+            string signSymbol = "";
+            if (Sign.HasValue)
+            {
+                signSymbol = Sign.Value ? "+" : "-";
+            }
+            return $"{signSymbol}{Identifier}";
+        }
     }
-    public override string Text => $"{Identifier}";
 }

AngbandOS.Core.Expressions/IdentifierFactorParser.cs

@@ -4,11 +4,29 @@ public abstract class IdentifierFactorParser : FactorParser
 {
     public virtual bool CaseSensitive => false;
     public abstract string Identifier { get; }
-    protected abstract Expression GenerateExpression(string matchedIdentifier);
+    protected abstract Expression GenerateExpression(string matchedIdentifier, bool? sign);
     public override Expression? TryParse(ExpressionParser parser, string text, ref int characterIndex)
     {
         int currentCharacterIndex = characterIndex;
 
+        // Check for a sign before the identifier.
+        bool? sign = null;
+        if (text[currentCharacterIndex] == '+')
+        {
+            sign = true;
+            currentCharacterIndex++;
+        }
+        else if (text[currentCharacterIndex] == '-')
+        {
+            sign = false;
+            currentCharacterIndex++;
+        }
+
+        if (sign.HasValue)
+        {
+            parser.IgnoreWhitespace(text, ref currentCharacterIndex);
+        }
+
         // Check to see if there is enough length for a match.
         if (currentCharacterIndex + Identifier.Length > text.Length)
         {
@@ -19,7 +37,7 @@ public abstract class IdentifierFactorParser : FactorParser
         if (CaseSensitive && matchedIdentifier == Identifier || !CaseSensitive && matchedIdentifier.ToLower() == Identifier.ToLower())
         {
             characterIndex = currentCharacterIndex + matchedIdentifier.Length;
-            return GenerateExpression(matchedIdentifier);
+            return GenerateExpression(matchedIdentifier, sign);
         }
 
         return null;

AngbandOS.Core.Interface.Configuration/AttributeFilterGameConfiguration.cs

@@ -8,9 +8,9 @@ namespace AngbandOS.Core.Interface.Configuration;
 
 public class AttributeFilterGameConfiguration : NonCompositeSingletonGameConfiguration
 {
-    public virtual (string AttributeKey, bool DesiredValue)[]? OrAttributeFilterBindings { get; set; } = null;
+    public virtual (string AttributeKey, bool DesiredValue)[]? BitwiseOrAttributeFilterBindings { get; set; } = null;
     public virtual (string AttributeKey, bool?[] DesiredValue)[]? BoolAttributeFilterBindings { get; set; } = null;
-    public virtual (string AttributeKey, int? StartingValue, int? EndingValue)[]? SumAttributeFilterBindings { get; set; } = null;
+    public virtual (string AttributeKey, int? StartingValue, int? EndingValue)[]? SummationAttributeFilterBindings { get; set; } = null;
     public virtual bool? ActivationAttributeNonNull { get; set; } = null;
     public virtual bool? ArtifactBiasAttributeNonNull { get; set; } = null;
 }

AngbandOS.Core.Interface.Configuration/BitwiseOrAttributeGameConfiguration.cs

@@ -0,0 +1,5 @@
+namespace AngbandOS.Core.Interface.Configuration;
+
+public class BitwiseOrAttributeGameConfiguration : NonCompositeSingletonGameConfiguration
+{
+}

AngbandOS.Core.Interface.Configuration/Enums/EquipmentWieldSlotsEnum.cs

@@ -0,0 +1,23 @@
+// AngbandOS: 2022 Marc Johnston
+//
+// This game is released under the “Angband License”, defined as: “© 1997 Ben Harrison, James E.
+// Wilson, Robert A. Koeneke This software may be copied and distributed for educational, research,
+// and not for profit purposes provided that this copyright and statement are included in all such
+// copies. Other copyrights may also apply.”
+namespace AngbandOS.Core.Interface.Configuration;
+
+public enum EquipmentWieldSlotsEnum
+{
+    MeleeWeaponWieldSlot,
+    MissileWeaponWieldSlot,
+    BowWieldSlot,
+    ShieldWieldSlot,
+    HeadArmorWieldSlot,
+    BodyArmorWieldSlot,
+    CloakWieldSlot,
+    GlovesWieldSlot,
+    BootsWieldSlot,
+    AmuletWieldSlot,
+    LeftRingWieldSlot,
+    RightRingWieldSlot,
+}

AngbandOS.Core.Interface.Configuration/Enums/PropertiesEnum.cs

@@ -35,7 +35,6 @@ public enum PropertiesEnum
     Property,
     RefreshMapProperty,
     SpareSpellSlotsIntProperty,
-    SpeedIntProperty,
     StringProperty,
     TrackedMonsterChangedProperty,
     TrackedMonsterNullableMonsterProperty,

AngbandOS.Core.Interface.Configuration/Enums/SystemScriptsEnum.cs

@@ -2,6 +2,42 @@
 {
     public enum SystemScriptsEnum
     {
+        AlcoholRandomMutationScript,
+        AttAnimalRandomMutationScript,
+        AttDemonRandomMutationScript,
+        AttDragonRandomMutationScript,
+        BanishAllRandomMutationScript,
+        BersRageRandomMutationScript,
+        CowardiceRandomMutationScript,
+        DetectCursesMutationScript,
+        DisarmRandomMutationScript,
+        EatLightRandomMutationScript,
+        FlatulentRandomMutationScript,
+        HalluRandomMutationScript,
+        HpToSpRandomMutationScript,
+        HypnoticGazeMutationScript,
+        IlluminateMutationScript,
+        InvulnRandomMutationScript,
+        LaserEyesMutationScript,
+        NauseaRandomMutationScript,
+        NormalityRandomMutationScript,
+        PolymorphSelfMutationScript,
+        PolyWoundRandomMutationScript,
+        ProdManaRandomMutationScript,
+        RandomTeleportationRandomMutationScript,
+        RawChaosRandomMutationScript,
+        ResistElementsMutationScript,
+        SmellMetalMutationScript,
+        SpeedFluxRandomMutationScript,
+        SpToHpRandomMutationScript,
+        SwapPositionMutationScript,
+        TeleportAtWillMutationScript,
+        WalkShadRandomMutationScript,
+        WarningRandomMutationScript,
+        WastingRandomMutationScript,
+        WeirdMindRandomMutationScript,
+        WraithRandomMutationScript,
+
         AcidTrapScript,
         AcquirementIdentifableAndUsedScript,
         ActivateScript,
@@ -100,7 +136,6 @@ public enum SystemScriptsEnum
         DestroyAreaR15Script,
         DestroyItemScript,
         DestroyTrapsAndDoorsScript,
-        DetCurseMutationScript,
         DetectDoorsAndStairsScript,
         DetectDoorsTrapsAndStairsScript,
         DetectEvilMonstersScript,
@@ -266,13 +301,11 @@ public enum SystemScriptsEnum
         HolyWordScript,
         HorrificVisageScript,
         HorrifyScript,
-        HypnGazeMutationScript,
         HypnoticEyesScript,
         Ice175R4IdentifableAndUsedScript,
         IdentifyAllItemsScript,
         IdentifyItemFullyScript,
         IdentifyItemScript,
-        IllumineMutationScript,
         IlluminationEvery1d10p10Script,
         IlluminationIdentifiedAndUsedScriptItemAndDirection,
         ImpRacialPowerScript,
@@ -285,7 +318,6 @@ public enum SystemScriptsEnum
         JournalScript,
         TeleportToDepthScript,
         KlackonRacialPowerScript,
-        LaserEyeMutationScript,
         LauncherMutationScript,
         LearnScript,
         LeaveStoreScript,
@@ -427,7 +459,6 @@ public enum SystemScriptsEnum
         ResistEnvironmentScript,
         ResistFire1d10p10Script,
         ResistFireScript,
-        ResistMutationScript,
         ResistPoisonIn5EnchantmentScript,
         ResistTrueScript,
         RestAllScript,
@@ -473,7 +504,6 @@ public enum SystemScriptsEnum
         SlimeMoldScript,
         SlowDartScript,
         SlowPoisonScript,
-        SmellMetMutationScript,
         SpawnMonsterScript,
         SpecialAcquirementIdentifableAndUsedScript,
         SpecialEnlightenmentScript,
@@ -517,7 +547,6 @@ public enum SystemScriptsEnum
         SummonUndeadScript,
         SuperHeroism1D25P25ResetFearAndHeal30Script,
         SuperheroismAndBlessing50p1d50Script,
-        SwapPosMutationScript,
         TakeOffScript,
         TargetScript,
         TarotDrawScript,
@@ -566,7 +595,6 @@ public enum SystemScriptsEnum
         VersionScript,
         ViewCharacterScript,
         ViewMapScript,
-        VteleportMutationScript,
         WalkAndPickupScript,
         WalkWithoutPickupScript,
         WallOfStoneScript,
@@ -580,6 +608,7 @@ public enum SystemScriptsEnum
         WinnerScript,
         WizardBoltScript,
         WizardGainExperienceScript,
+        WizardLoseAllMutationsScript,
         WizardGainMutationScript,
         WizardHelpScript,
         WordOfDestructionScript,