Reorganizes Project (#41)

Projects/Scripts/Items/Wands/BaseWand.cs

@@ -0,0 +1,308 @@
+using System;
+using System.Collections.Generic;
+using Server.Network;
+using Server.Spells;
+using Server.Targeting;
+
+namespace Server.Items
+{
+  public enum WandEffect
+  {
+    Clumsiness,
+    Identification,
+    Healing,
+    Feeblemindedness,
+    Weakness,
+    MagicArrow,
+    Harming,
+    Fireball,
+    GreaterHealing,
+    Lightning,
+    ManaDraining
+  }
+
+  public abstract class BaseWand : BaseBashing, ITokunoDyable
+  {
+    private int m_Charges;
+
+    private WandEffect m_WandEffect;
+
+    public BaseWand(WandEffect effect, int minCharges, int maxCharges) : base(Utility.RandomList(0xDF2, 0xDF3, 0xDF4,
+      0xDF5))
+    {
+      Weight = 1.0;
+      Effect = effect;
+      Charges = Utility.RandomMinMax(minCharges, maxCharges);
+      Attributes.SpellChanneling = 1;
+      Attributes.CastSpeed = -1;
+      WeaponAttributes.MageWeapon = Utility.RandomMinMax(1, 10);
+    }
+
+    public BaseWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount;
+    public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
+
+    public override int AosStrengthReq => 5;
+    public override int AosMinDamage => 9;
+    public override int AosMaxDamage => 11;
+    public override int AosSpeed => 40;
+    public override float MlSpeed => 2.75f;
+
+    public override int OldStrengthReq => 0;
+    public override int OldMinDamage => 2;
+    public override int OldMaxDamage => 6;
+    public override int OldSpeed => 35;
+
+    public override int InitMinHits => 31;
+    public override int InitMaxHits => 110;
+
+    public virtual TimeSpan GetUseDelay => TimeSpan.FromSeconds(4.0);
+
+    [CommandProperty(AccessLevel.GameMaster)]
+    public WandEffect Effect
+    {
+      get => m_WandEffect;
+      set
+      {
+        m_WandEffect = value;
+        InvalidateProperties();
+      }
+    }
+
+    [CommandProperty(AccessLevel.GameMaster)]
+    public int Charges
+    {
+      get => m_Charges;
+      set
+      {
+        m_Charges = value;
+        InvalidateProperties();
+      }
+    }
+
+    public void ConsumeCharge(Mobile from)
+    {
+      --Charges;
+
+      if (Charges == 0)
+        from.SendLocalizedMessage(1019073); // This item is out of charges.
+
+      ApplyDelayTo(from);
+    }
+
+    public virtual void ApplyDelayTo(Mobile from)
+    {
+      from.BeginAction<BaseWand>();
+      Timer.DelayCall(GetUseDelay, ReleaseWandLock_Callback, from);
+    }
+
+    public virtual void ReleaseWandLock_Callback(Mobile state)
+    {
+      state.EndAction<BaseWand>();
+    }
+
+    public override void OnDoubleClick(Mobile from)
+    {
+      if (!from.CanBeginAction<BaseWand>())
+      {
+        from.SendLocalizedMessage(1070860); // You must wait a moment for the wand to recharge.
+        return;
+      }
+
+      if (Parent == from)
+      {
+        if (Charges > 0)
+          OnWandUse(from);
+        else
+          from.SendLocalizedMessage(1019073); // This item is out of charges.
+      }
+      else
+      {
+        from.SendLocalizedMessage(502641); // You must equip this item to use it.
+      }
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+
+      writer.Write((int)m_WandEffect);
+      writer.Write(m_Charges);
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+
+      switch (version)
+      {
+        case 0:
+        {
+          m_WandEffect = (WandEffect)reader.ReadInt();
+          m_Charges = reader.ReadInt();
+
+          break;
+        }
+      }
+    }
+
+    public override void GetProperties(ObjectPropertyList list)
+    {
+      base.GetProperties(list);
+
+      switch (m_WandEffect)
+      {
+        case WandEffect.Clumsiness:
+          list.Add(1017326, m_Charges.ToString());
+          break; // clumsiness charges: ~1_val~
+        case WandEffect.Identification:
+          list.Add(1017350, m_Charges.ToString());
+          break; // identification charges: ~1_val~
+        case WandEffect.Healing:
+          list.Add(1017329, m_Charges.ToString());
+          break; // healing charges: ~1_val~
+        case WandEffect.Feeblemindedness:
+          list.Add(1017327, m_Charges.ToString());
+          break; // feeblemind charges: ~1_val~
+        case WandEffect.Weakness:
+          list.Add(1017328, m_Charges.ToString());
+          break; // weakness charges: ~1_val~
+        case WandEffect.MagicArrow:
+          list.Add(1060492, m_Charges.ToString());
+          break; // magic arrow charges: ~1_val~
+        case WandEffect.Harming:
+          list.Add(1017334, m_Charges.ToString());
+          break; // harm charges: ~1_val~
+        case WandEffect.Fireball:
+          list.Add(1060487, m_Charges.ToString());
+          break; // fireball charges: ~1_val~
+        case WandEffect.GreaterHealing:
+          list.Add(1017330, m_Charges.ToString());
+          break; // greater healing charges: ~1_val~
+        case WandEffect.Lightning:
+          list.Add(1060491, m_Charges.ToString());
+          break; // lightning charges: ~1_val~
+        case WandEffect.ManaDraining:
+          list.Add(1017339, m_Charges.ToString());
+          break; // mana drain charges: ~1_val~
+      }
+    }
+
+    public override void OnSingleClick(Mobile from)
+    {
+      List<EquipInfoAttribute> attrs = new List<EquipInfoAttribute>();
+
+      if (DisplayLootType)
+      {
+        if (LootType == LootType.Blessed)
+          attrs.Add(new EquipInfoAttribute(1038021)); // blessed
+        else if (LootType == LootType.Cursed)
+          attrs.Add(new EquipInfoAttribute(1049643)); // cursed
+      }
+
+      if (!Identified)
+      {
+        attrs.Add(new EquipInfoAttribute(1038000)); // Unidentified
+      }
+      else
+      {
+        int num = 0;
+
+        switch (m_WandEffect)
+        {
+          case WandEffect.Clumsiness:
+            num = 3002011;
+            break;
+          case WandEffect.Identification:
+            num = 1044063;
+            break;
+          case WandEffect.Healing:
+            num = 3002014;
+            break;
+          case WandEffect.Feeblemindedness:
+            num = 3002013;
+            break;
+          case WandEffect.Weakness:
+            num = 3002018;
+            break;
+          case WandEffect.MagicArrow:
+            num = 3002015;
+            break;
+          case WandEffect.Harming:
+            num = 3002022;
+            break;
+          case WandEffect.Fireball:
+            num = 3002028;
+            break;
+          case WandEffect.GreaterHealing:
+            num = 3002039;
+            break;
+          case WandEffect.Lightning:
+            num = 3002040;
+            break;
+          case WandEffect.ManaDraining:
+            num = 3002041;
+            break;
+        }
+
+        if (num > 0)
+          attrs.Add(new EquipInfoAttribute(num, m_Charges));
+      }
+
+      int number;
+
+      if (Name == null)
+      {
+        number = 1017085;
+      }
+      else
+      {
+        LabelTo(from, Name);
+        number = 1041000;
+      }
+
+      if (attrs.Count == 0 && Crafter == null && Name != null)
+        return;
+
+      EquipmentInfo eqInfo = new EquipmentInfo(number, Crafter, false,
+        attrs.ToArray());
+
+      from.Send(new DisplayEquipmentInfo(this, eqInfo));
+    }
+
+    public void Cast(Spell spell)
+    {
+      bool m = Movable;
+
+      Movable = false;
+      spell.Cast();
+      Movable = m;
+    }
+
+    public virtual void OnWandUse(Mobile from)
+    {
+      from.Target = new WandTarget(this);
+    }
+
+    public virtual void DoWandTarget(Mobile from, object o)
+    {
+      if (Deleted || Charges <= 0 || Parent != from || o is StaticTarget || o is LandTarget)
+        return;
+
+      if (OnWandTarget(from, o))
+        ConsumeCharge(from);
+    }
+
+    public virtual bool OnWandTarget(Mobile from, object o)
+    {
+      return true;
+    }
+  }
+}

Projects/Scripts/Items/Wands/ClumsyWand.cs

@@ -0,0 +1,35 @@
+using Server.Spells.First;
+
+namespace Server.Items
+{
+  public class ClumsyWand : BaseWand
+  {
+    [Constructible]
+    public ClumsyWand() : base(WandEffect.Clumsiness, 5, 30)
+    {
+    }
+
+    public ClumsyWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override void OnWandUse(Mobile from)
+    {
+      Cast(new ClumsySpell(from, this));
+    }
+  }
+}

Projects/Scripts/Items/Wands/FeebleWand.cs

@@ -0,0 +1,35 @@
+using Server.Spells.First;
+
+namespace Server.Items
+{
+  public class FeebleWand : BaseWand
+  {
+    [Constructible]
+    public FeebleWand() : base(WandEffect.Feeblemindedness, 5, 30)
+    {
+    }
+
+    public FeebleWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override void OnWandUse(Mobile from)
+    {
+      Cast(new FeeblemindSpell(from, this));
+    }
+  }
+}

Projects/Scripts/Items/Wands/FireballWand.cs

@@ -0,0 +1,35 @@
+using Server.Spells.Third;
+
+namespace Server.Items
+{
+  public class FireballWand : BaseWand
+  {
+    [Constructible]
+    public FireballWand() : base(WandEffect.Fireball, 5, Core.ML ? 109 : 15)
+    {
+    }
+
+    public FireballWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override void OnWandUse(Mobile from)
+    {
+      Cast(new FireballSpell(from, this));
+    }
+  }
+}

Projects/Scripts/Items/Wands/GreaterHealWand.cs

@@ -0,0 +1,35 @@
+using Server.Spells.Fourth;
+
+namespace Server.Items
+{
+  public class GreaterHealWand : BaseWand
+  {
+    [Constructible]
+    public GreaterHealWand() : base(WandEffect.GreaterHealing, 1, Core.ML ? 109 : 5)
+    {
+    }
+
+    public GreaterHealWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override void OnWandUse(Mobile from)
+    {
+      Cast(new GreaterHealSpell(from, this));
+    }
+  }
+}

Projects/Scripts/Items/Wands/HarmWand.cs

@@ -0,0 +1,35 @@
+using Server.Spells.Second;
+
+namespace Server.Items
+{
+  public class HarmWand : BaseWand
+  {
+    [Constructible]
+    public HarmWand() : base(WandEffect.Harming, 5, Core.ML ? 109 : 30)
+    {
+    }
+
+    public HarmWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override void OnWandUse(Mobile from)
+    {
+      Cast(new HarmSpell(from, this));
+    }
+  }
+}

Projects/Scripts/Items/Wands/HealWand.cs

@@ -0,0 +1,35 @@
+using Server.Spells.First;
+
+namespace Server.Items
+{
+  public class HealWand : BaseWand
+  {
+    [Constructible]
+    public HealWand() : base(WandEffect.Healing, 10, Core.ML ? 109 : 25)
+    {
+    }
+
+    public HealWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override void OnWandUse(Mobile from)
+    {
+      Cast(new HealSpell(from, this));
+    }
+  }
+}

Projects/Scripts/Items/Wands/IDWand.cs

@@ -0,0 +1,50 @@
+using System;
+
+namespace Server.Items
+{
+  public class IDWand : BaseWand
+  {
+    [Constructible]
+    public IDWand() : base(WandEffect.Identification, 25, 175)
+    {
+    }
+
+    public IDWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override TimeSpan GetUseDelay => TimeSpan.Zero;
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override bool OnWandTarget(Mobile from, object o)
+    {
+      if (o is Item item)
+      {
+        if (item is BaseWeapon weapon)
+          weapon.Identified = true;
+        else if (item is BaseArmor armor)
+          armor.Identified = true;
+
+        if (!Core.AOS)
+          item.OnSingleClick(from);
+
+        return true;
+      }
+
+      return false;
+    }
+  }
+}

Projects/Scripts/Items/Wands/LightningWand.cs

@@ -0,0 +1,35 @@
+using Server.Spells.Fourth;
+
+namespace Server.Items
+{
+  public class LightningWand : BaseWand
+  {
+    [Constructible]
+    public LightningWand() : base(WandEffect.Lightning, 5, Core.ML ? 109 : 20)
+    {
+    }
+
+    public LightningWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override void OnWandUse(Mobile from)
+    {
+      Cast(new LightningSpell(from, this));
+    }
+  }
+}

Projects/Scripts/Items/Wands/MagicArrowWand.cs

@@ -0,0 +1,35 @@
+using Server.Spells.First;
+
+namespace Server.Items
+{
+  public class MagicArrowWand : BaseWand
+  {
+    [Constructible]
+    public MagicArrowWand() : base(WandEffect.MagicArrow, 5, Core.ML ? 109 : 30)
+    {
+    }
+
+    public MagicArrowWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override void OnWandUse(Mobile from)
+    {
+      Cast(new MagicArrowSpell(from, this));
+    }
+  }
+}

Projects/Scripts/Items/Wands/ManaDrainWand.cs

@@ -0,0 +1,35 @@
+using Server.Spells.Fourth;
+
+namespace Server.Items
+{
+  public class ManaDrainWand : BaseWand
+  {
+    [Constructible]
+    public ManaDrainWand() : base(WandEffect.ManaDraining, 5, 30)
+    {
+    }
+
+    public ManaDrainWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override void OnWandUse(Mobile from)
+    {
+      Cast(new ManaDrainSpell(from, this));
+    }
+  }
+}

Projects/Scripts/Items/Wands/RandomWand.cs

@@ -0,0 +1,33 @@
+namespace Server.Items
+{
+  public class RandomWand
+  {
+    public static BaseWand CreateWand()
+    {
+      return CreateRandomWand();
+    }
+
+    public static BaseWand CreateRandomWand()
+    {
+      return Loot.RandomWand();
+
+      /*
+      switch ( Utility.Random( 11 ) )
+      {
+        default:
+        case  0: return new ClumsyWand();
+        case  1: return new FeebleWand();
+        case  2: return new FireballWand();
+        case  3: return new GreaterHealWand();
+        case  4: return new HarmWand();
+        case  5: return new HealWand();
+        case  6: return new IDWand();
+        case  7: return new LightningWand();
+        case  8: return new MagicArrowWand();
+        case  9: return new ManaDrainWand();
+        case 10: return new WeaknessWand();
+      }
+      */
+    }
+  }
+}

Projects/Scripts/Items/Wands/WandTarget.cs

@@ -0,0 +1,24 @@
+using Server.Items;
+
+namespace Server.Targeting
+{
+  public class WandTarget : Target
+  {
+    private BaseWand m_Item;
+
+    public WandTarget(BaseWand item) : base(6, false, TargetFlags.None)
+    {
+      m_Item = item;
+    }
+
+    private static int GetOffset(Mobile caster)
+    {
+      return 5 + (int)(caster.Skills.Magery.Value * 0.02);
+    }
+
+    protected override void OnTarget(Mobile from, object targeted)
+    {
+      m_Item.DoWandTarget(from, targeted);
+    }
+  }
+}

Projects/Scripts/Items/Wands/WeaknessWand.cs

@@ -0,0 +1,35 @@
+using Server.Spells.First;
+
+namespace Server.Items
+{
+  public class WeaknessWand : BaseWand
+  {
+    [Constructible]
+    public WeaknessWand() : base(WandEffect.Weakness, 5, 30)
+    {
+    }
+
+    public WeaknessWand(Serial serial) : base(serial)
+    {
+    }
+
+    public override void Serialize(GenericWriter writer)
+    {
+      base.Serialize(writer);
+
+      writer.Write(0); // version
+    }
+
+    public override void Deserialize(GenericReader reader)
+    {
+      base.Deserialize(reader);
+
+      int version = reader.ReadInt();
+    }
+
+    public override void OnWandUse(Mobile from)
+    {
+      Cast(new WeakenSpell(from, this));
+    }
+  }
+}