diff --git a/Scripts/Items/Equipment/Armor/FemaleGargishPlateArms.cs b/Scripts/Items/Equipment/Armor/FemaleGargishPlateArms.cs index 74e2ae149..d0d5d5c11 100644 --- a/Scripts/Items/Equipment/Armor/FemaleGargishPlateArms.cs +++ b/Scripts/Items/Equipment/Armor/FemaleGargishPlateArms.cs @@ -6,9 +6,16 @@ namespace Server.Items { [Constructable] public FemaleGargishPlateArms() - : base(0x404F) + : this(0) { - this.Weight = 4.0; + } + + [Constructable] + public FemaleGargishPlateArms(int hue) + : base(0x307) + { + Weight = 5.0; + Hue = hue; } public FemaleGargishPlateArms(Serial serial) @@ -16,104 +23,22 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 25; - } - } - public override int OldStrReq - { - get - { - return 25; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowMaleWearer - { - get - { - return false; - } - } + public override int BasePhysicalResistance { get { return 8; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 5; } } + public override int BasePoisonResistance { get { return 6; } } + public override int BaseEnergyResistance { get { return 5; } } + + public override int InitMinHits { get { return 50; } } + public override int InitMaxHits { get { return 65; } } + + public override int AosStrReq { get { return 80; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } + public override void Serialize(GenericWriter writer) { base.Serialize(writer); diff --git a/Scripts/Items/Equipment/Armor/FemaleGargishPlateChest.cs b/Scripts/Items/Equipment/Armor/FemaleGargishPlateChest.cs index 1f1efc4e5..209f4151a 100644 --- a/Scripts/Items/Equipment/Armor/FemaleGargishPlateChest.cs +++ b/Scripts/Items/Equipment/Armor/FemaleGargishPlateChest.cs @@ -6,9 +6,16 @@ namespace Server.Items { [Constructable] public FemaleGargishPlateChest() - : base(0x4051) + : this(0) { - this.Weight = 8.0; + } + + [Constructable] + public FemaleGargishPlateChest(int hue) + : base(0x309) + { + Weight = 10.0; + Hue = hue; } public FemaleGargishPlateChest(Serial serial) @@ -16,104 +23,22 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 35; - } - } - public override int OldStrReq - { - get - { - return 35; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowMaleWearer - { - get - { - return false; - } - } + public override int BasePhysicalResistance { get { return 8; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 5; } } + public override int BasePoisonResistance { get { return 6; } } + public override int BaseEnergyResistance { get { return 5; } } + + public override int InitMinHits { get { return 50; } } + public override int InitMaxHits { get { return 65; } } + + public override int AosStrReq { get { return 95; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } + public override void Serialize(GenericWriter writer) { base.Serialize(writer); diff --git a/Scripts/Items/Equipment/Armor/FemaleGargishPlateKilt.cs b/Scripts/Items/Equipment/Armor/FemaleGargishPlateKilt.cs index c529c9a52..78771e901 100644 --- a/Scripts/Items/Equipment/Armor/FemaleGargishPlateKilt.cs +++ b/Scripts/Items/Equipment/Armor/FemaleGargishPlateKilt.cs @@ -6,9 +6,16 @@ namespace Server.Items { [Constructable] public FemaleGargishPlateKilt() - : base(0x4053) + : this(0) { - this.Weight = 5.0; + } + + [Constructable] + public FemaleGargishPlateKilt(int hue) + : base(0x30B) + { + Weight = 5.0; + Hue = hue; } public FemaleGargishPlateKilt(Serial serial) @@ -16,104 +23,22 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 30; - } - } - public override int OldStrReq - { - get - { - return 35; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowMaleWearer - { - get - { - return false; - } - } + public override int BasePhysicalResistance { get { return 8; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 5; } } + public override int BasePoisonResistance { get { return 6; } } + public override int BaseEnergyResistance { get { return 5; } } + + public override int InitMinHits { get { return 50; } } + public override int InitMaxHits { get { return 65; } } + + public override int AosStrReq { get { return 80; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } + public override void Serialize(GenericWriter writer) { base.Serialize(writer); diff --git a/Scripts/Items/Equipment/Armor/FemaleGargishPlateLegs.cs b/Scripts/Items/Equipment/Armor/FemaleGargishPlateLegs.cs index b8814d05a..7749b8288 100644 --- a/Scripts/Items/Equipment/Armor/FemaleGargishPlateLegs.cs +++ b/Scripts/Items/Equipment/Armor/FemaleGargishPlateLegs.cs @@ -6,9 +6,16 @@ namespace Server.Items { [Constructable] public FemaleGargishPlateLegs() - : base(0x4055) + : this(0) { - this.Weight = 1.0; + } + + [Constructable] + public FemaleGargishPlateLegs(int hue) + : base(0x30D) + { + Weight = 7.0; + Hue = hue; } public FemaleGargishPlateLegs(Serial serial) @@ -16,104 +23,22 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 25; - } - } - public override int OldStrReq - { - get - { - return 25; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowMaleWearer - { - get - { - return false; - } - } + public override int BasePhysicalResistance { get { return 8; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 5; } } + public override int BasePoisonResistance { get { return 6; } } + public override int BaseEnergyResistance { get { return 5; } } + + public override int InitMinHits { get { return 50; } } + public override int InitMaxHits { get { return 65; } } + + public override int AosStrReq { get { return 90; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } + public override void Serialize(GenericWriter writer) { base.Serialize(writer); diff --git a/Scripts/Items/Equipment/Armor/FemaleGargishStoneArms.cs b/Scripts/Items/Equipment/Armor/FemaleGargishStoneArms.cs index 9bac06d73..5e7167a37 100644 --- a/Scripts/Items/Equipment/Armor/FemaleGargishStoneArms.cs +++ b/Scripts/Items/Equipment/Armor/FemaleGargishStoneArms.cs @@ -6,9 +6,16 @@ namespace Server.Items { [Constructable] public FemaleGargishStoneArms() + : this(0) + { + } + + [Constructable] + public FemaleGargishStoneArms(int hue) : base(0x283) { - this.Weight = 5.0; + Weight = 10.0; + Hue = hue; } public FemaleGargishStoneArms(Serial serial) @@ -16,111 +23,22 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 80; - } - } - public override int OldStrReq - { - get - { - return 40; - } - } - public override int OldDexBonus - { - get - { - return -2; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowMaleWearer - { - get - { - return false; - } - } + public override int BasePhysicalResistance { get { return 6; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 4; } } + public override int BasePoisonResistance { get { return 8; } } + public override int BaseEnergyResistance { get { return 6; } } + + public override int InitMinHits { get { return 40; } } + public override int InitMaxHits { get { return 50; } } + + public override int AosStrReq { get { return 40; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } + public override void Serialize(GenericWriter writer) { base.Serialize(writer); diff --git a/Scripts/Items/Equipment/Armor/FemaleGargishStoneChest.cs b/Scripts/Items/Equipment/Armor/FemaleGargishStoneChest.cs index 679a3beae..e698b8dfc 100644 --- a/Scripts/Items/Equipment/Armor/FemaleGargishStoneChest.cs +++ b/Scripts/Items/Equipment/Armor/FemaleGargishStoneChest.cs @@ -6,9 +6,16 @@ namespace Server.Items { [Constructable] public FemaleGargishStoneChest() + : this(0) + { + } + + [Constructable] + public FemaleGargishStoneChest(int hue) : base(0x285) { - this.Weight = 10.0; + Weight = 15.0; + Hue = hue; } public FemaleGargishStoneChest(Serial serial) @@ -16,111 +23,22 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 95; - } - } - public override int OldStrReq - { - get - { - return 60; - } - } - public override int OldDexBonus - { - get - { - return -8; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowMaleWearer - { - get - { - return false; - } - } + public override int BasePhysicalResistance { get { return 6; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 4; } } + public override int BasePoisonResistance { get { return 8; } } + public override int BaseEnergyResistance { get { return 6; } } + + public override int InitMinHits { get { return 40; } } + public override int InitMaxHits { get { return 50; } } + + public override int AosStrReq { get { return 40; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } + public override void Serialize(GenericWriter writer) { base.Serialize(writer); diff --git a/Scripts/Items/Equipment/Armor/MaleGargishLeatherChest.cs b/Scripts/Items/Equipment/Armor/FemaleGargishStoneKilt.cs similarity index 61% rename from Scripts/Items/Equipment/Armor/MaleGargishLeatherChest.cs rename to Scripts/Items/Equipment/Armor/FemaleGargishStoneKilt.cs index d8cd82576..1a5771b60 100644 --- a/Scripts/Items/Equipment/Armor/MaleGargishLeatherChest.cs +++ b/Scripts/Items/Equipment/Armor/FemaleGargishStoneKilt.cs @@ -2,41 +2,39 @@ using System; namespace Server.Items { - public class MaleGargishLeatherChest : BaseArmor + public class FemaleGargishStoneKilt : BaseArmor { [Constructable] - public MaleGargishLeatherChest() + public FemaleGargishStoneKilt() : this(0) { } [Constructable] - public MaleGargishLeatherChest(int hue) - : base(0x0304) + public FemaleGargishStoneKilt(int hue) + : base(0x287) { - Weight = 8.0; + Weight = 10.0; Hue = hue; } - public MaleGargishLeatherChest(Serial serial) + public FemaleGargishStoneKilt(Serial serial) : base(serial) { } - public override int BasePhysicalResistance { get { return 5; } } + public override int BasePhysicalResistance { get { return 6; } } public override int BaseFireResistance { get { return 6; } } - public override int BaseColdResistance { get { return 7; } } - public override int BasePoisonResistance { get { return 6; } } + public override int BaseColdResistance { get { return 4; } } + public override int BasePoisonResistance { get { return 8; } } public override int BaseEnergyResistance { get { return 6; } } - public override int InitMinHits { get { return 30; } } + public override int InitMinHits { get { return 40; } } public override int InitMaxHits { get { return 50; } } - public override int AosStrReq { get { return 25; } } + public override int AosStrReq { get { return 40; } } - public override ArmorMeditationAllowance DefMedAllowance { get { return ArmorMeditationAllowance.All; } } - public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } public override Race RequiredRace { get { return Race.Gargoyle; } } public override bool CanBeWornByGargoyles { get { return true; } } diff --git a/Scripts/Items/Equipment/Armor/FemaleGargishStoneLegs.cs b/Scripts/Items/Equipment/Armor/FemaleGargishStoneLegs.cs index ff53139a2..de3c7cc80 100644 --- a/Scripts/Items/Equipment/Armor/FemaleGargishStoneLegs.cs +++ b/Scripts/Items/Equipment/Armor/FemaleGargishStoneLegs.cs @@ -6,9 +6,16 @@ namespace Server.Items { [Constructable] public FemaleGargishStoneLegs() - : base(0x0289) + : this(0) { - this.Weight = 2.0; + } + + [Constructable] + public FemaleGargishStoneLegs(int hue) + : base(0x289) + { + Weight = 15.0; + Hue = hue; } public FemaleGargishStoneLegs(Serial serial) @@ -16,111 +23,22 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 70; - } - } - public override int OldStrReq - { - get - { - return 30; - } - } - public override int OldDexBonus - { - get - { - return -2; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowMaleWearer - { - get - { - return false; - } - } + public override int BasePhysicalResistance { get { return 6; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 4; } } + public override int BasePoisonResistance { get { return 8; } } + public override int BaseEnergyResistance { get { return 6; } } + + public override int InitMinHits { get { return 40; } } + public override int InitMaxHits { get { return 50; } } + + public override int AosStrReq { get { return 40; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } + public override void Serialize(GenericWriter writer) { base.Serialize(writer); diff --git a/Scripts/Items/Equipment/Armor/FemaleGargishStonePlateKilt.cs b/Scripts/Items/Equipment/Armor/FemaleGargishStonePlateKilt.cs deleted file mode 100644 index 2f4218f91..000000000 --- a/Scripts/Items/Equipment/Armor/FemaleGargishStonePlateKilt.cs +++ /dev/null @@ -1,136 +0,0 @@ -using System; - -namespace Server.Items -{ - public class FemaleGargishStoneKilt : BaseArmor - { - [Constructable] - public FemaleGargishStoneKilt() - : base(0x0287) - { - this.Weight = 7.0; - } - - public FemaleGargishStoneKilt(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 90; - } - } - public override int OldStrReq - { - get - { - return 60; - } - } - public override int OldDexBonus - { - get - { - return -6; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowMaleWearer - { - get - { - return false; - } - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/GargishLeatherArms.cs b/Scripts/Items/Equipment/Armor/GargishLeatherArms.cs index 1c16643ff..eeab7d321 100644 --- a/Scripts/Items/Equipment/Armor/GargishLeatherArms.cs +++ b/Scripts/Items/Equipment/Armor/GargishLeatherArms.cs @@ -3,6 +3,7 @@ using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishLeatherArms")] public class GargishLeatherArms : BaseArmor { [Constructable] diff --git a/Scripts/Items/Equipment/Armor/GargishLeatherChest.cs b/Scripts/Items/Equipment/Armor/GargishLeatherChest.cs index a9b96cd09..f86260245 100644 --- a/Scripts/Items/Equipment/Armor/GargishLeatherChest.cs +++ b/Scripts/Items/Equipment/Armor/GargishLeatherChest.cs @@ -3,6 +3,7 @@ using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishLeatherChest")] public class GargishLeatherChest : BaseArmor { [Constructable] diff --git a/Scripts/Items/Equipment/Armor/GargishLeatherKilt.cs b/Scripts/Items/Equipment/Armor/GargishLeatherKilt.cs index b9600425e..f1fddae99 100644 --- a/Scripts/Items/Equipment/Armor/GargishLeatherKilt.cs +++ b/Scripts/Items/Equipment/Armor/GargishLeatherKilt.cs @@ -3,6 +3,7 @@ using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishLeatherKilt")] public class GargishLeatherKilt : BaseArmor { [Constructable] diff --git a/Scripts/Items/Equipment/Armor/GargishLeatherLegs.cs b/Scripts/Items/Equipment/Armor/GargishLeatherLegs.cs index 76c3ad1be..19c4240d7 100644 --- a/Scripts/Items/Equipment/Armor/GargishLeatherLegs.cs +++ b/Scripts/Items/Equipment/Armor/GargishLeatherLegs.cs @@ -3,6 +3,7 @@ using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishLeatherLegs")] public class GargishLeatherLegs : BaseArmor { [Constructable] diff --git a/Scripts/Items/Equipment/Armor/GargishLeatherWingArmor.cs b/Scripts/Items/Equipment/Armor/GargishLeatherWingArmor.cs index d830b60a5..0b0a4b6a9 100644 --- a/Scripts/Items/Equipment/Armor/GargishLeatherWingArmor.cs +++ b/Scripts/Items/Equipment/Armor/GargishLeatherWingArmor.cs @@ -10,8 +10,8 @@ namespace Server.Items public GargishLeatherWingArmor() : base(0x457E) { - this.Weight = 2.0; - this.Layer = Layer.Cloak; + Weight = 2.0; + Layer = Layer.Cloak; } @@ -26,67 +26,16 @@ namespace Server.Items public override int PoisonResistance { get { return 0; } } public override int EnergyResistance { get { return 0; } } - public override int AosStrReq - { - get - { - return 10; - } - } - public override int OldStrReq - { - get - { - return 10; - } - } - public override int ArmorBase - { - get - { - return 13; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Leather; - } - } - public override CraftResource DefaultResource - { - get - { - return CraftResource.RegularLeather; - } - } - public override ArmorMeditationAllowance DefMedAllowance - { - get - { - return ArmorMeditationAllowance.All; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } + public override int AosStrReq { get { return 10; } } + public override int OldStrReq { get { return 10; } } + public override int ArmorBase { get { return 13; } } + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Leather; } } + public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMeditationAllowance DefMedAllowance { get { return ArmorMeditationAllowance.All; } } + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } - public override int GetLuckBonus() - { - return 0; - } + public override int GetLuckBonus() { return 0; } public override int OnCraft(int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool, CraftItem craftItem, int resHue) { diff --git a/Scripts/Items/Equipment/Armor/GargishPlateArms.cs b/Scripts/Items/Equipment/Armor/GargishPlateArms.cs index f11e638e2..4c77fcd1a 100644 --- a/Scripts/Items/Equipment/Armor/GargishPlateArms.cs +++ b/Scripts/Items/Equipment/Armor/GargishPlateArms.cs @@ -1,14 +1,23 @@ +using Server.Engines.Craft; using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishPlateArms")] public class GargishPlateArms : BaseArmor { [Constructable] public GargishPlateArms() - : base(0x4050) + : this(0) { - this.Weight = 4.0; + } + + [Constructable] + public GargishPlateArms(int hue) + : base(0x308) + { + Weight = 5.0; + Hue = hue; } public GargishPlateArms(Serial serial) @@ -16,96 +25,43 @@ namespace Server.Items { } - public override int BasePhysicalResistance + public override int BasePhysicalResistance { get { return 8; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 5; } } + public override int BasePoisonResistance { get { return 6; } } + public override int BaseEnergyResistance { get { return 5; } } + + public override int InitMinHits { get { return 50; } } + public override int InitMaxHits { get { return 65; } } + + public override int AosStrReq { get { return 80; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } + + public override int OnCraft(int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool, CraftItem craftItem, int resHue) { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 25; - } - } - public override int OldStrReq - { - get - { - return 25; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } + Quality = (ItemQuality)quality; + + if (makersMark) + Crafter = from; + + Type resourceType = typeRes; + + if (resourceType == null) + resourceType = craftItem.Resources.GetAt(0).ItemType; + + Resource = CraftResources.GetFromType(resourceType); + + PlayerConstructed = true; + + CraftContext context = craftSystem.GetContext(from); + + Hue = CraftResources.GetHue(Resource); + + return quality; } public override void Serialize(GenericWriter writer) diff --git a/Scripts/Items/Equipment/Armor/GargishPlateChest.cs b/Scripts/Items/Equipment/Armor/GargishPlateChest.cs index c39af7696..55db13f52 100644 --- a/Scripts/Items/Equipment/Armor/GargishPlateChest.cs +++ b/Scripts/Items/Equipment/Armor/GargishPlateChest.cs @@ -2,13 +2,21 @@ using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishPlateChest")] public class GargishPlateChest : BaseArmor { [Constructable] public GargishPlateChest() - : base(0x4052) + : this(0) { - this.Weight = 10.0; + } + + [Constructable] + public GargishPlateChest(int hue) + : base(0x30A) + { + Weight = 10.0; + Hue = hue; } public GargishPlateChest(Serial serial) @@ -26,31 +34,11 @@ namespace Server.Items public override int InitMaxHits { get { return 65; } } public override int AosStrReq { get { return 95; } } - public override int OldStrReq { get { return 95; } - } - public override int ArmorBase { get { return 16; } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } public override void Serialize(GenericWriter writer) { diff --git a/Scripts/Items/Equipment/Armor/GargishPlateKilt.cs b/Scripts/Items/Equipment/Armor/GargishPlateKilt.cs index 9932658ce..cd47c3532 100644 --- a/Scripts/Items/Equipment/Armor/GargishPlateKilt.cs +++ b/Scripts/Items/Equipment/Armor/GargishPlateKilt.cs @@ -2,13 +2,21 @@ using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishPlateKilt")] public class GargishPlateKilt : BaseArmor { [Constructable] public GargishPlateKilt() - : base(0x4054) + : this(0) { - this.Weight = 5.0; + } + + [Constructable] + public GargishPlateKilt(int hue) + : base(0x30C) + { + Weight = 5.0; + Hue = hue; } public GargishPlateKilt(Serial serial) @@ -16,97 +24,21 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 30; - } - } - public override int OldStrReq - { - get - { - return 35; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } + public override int BasePhysicalResistance { get { return 8; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 5; } } + public override int BasePoisonResistance { get { return 6; } } + public override int BaseEnergyResistance { get { return 5; } } + + public override int InitMinHits { get { return 50; } } + public override int InitMaxHits { get { return 65; } } + + public override int AosStrReq { get { return 80; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } public override void Serialize(GenericWriter writer) { diff --git a/Scripts/Items/Equipment/Armor/GargishPlateLegs.cs b/Scripts/Items/Equipment/Armor/GargishPlateLegs.cs index 697d4c0f3..132eee7eb 100644 --- a/Scripts/Items/Equipment/Armor/GargishPlateLegs.cs +++ b/Scripts/Items/Equipment/Armor/GargishPlateLegs.cs @@ -2,13 +2,21 @@ using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishPlateLegs")] public class GargishPlateLegs : BaseArmor { [Constructable] public GargishPlateLegs() - : base(0x4056) + : this(0) { - this.Weight = 1.0; + } + + [Constructable] + public GargishPlateLegs(int hue) + : base(0x30E) + { + Weight = 7.0; + Hue = hue; } public GargishPlateLegs(Serial serial) @@ -16,97 +24,21 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 25; - } - } - public override int OldStrReq - { - get - { - return 25; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } + public override int BasePhysicalResistance { get { return 8; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 5; } } + public override int BasePoisonResistance { get { return 6; } } + public override int BaseEnergyResistance { get { return 5; } } + + public override int InitMinHits { get { return 50; } } + public override int InitMaxHits { get { return 65; } } + + public override int AosStrReq { get { return 90; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } public override void Serialize(GenericWriter writer) { diff --git a/Scripts/Items/Equipment/Armor/GargishPlateWingArmor.cs b/Scripts/Items/Equipment/Armor/GargishPlateWingArmor.cs deleted file mode 100644 index b4b7544b1..000000000 --- a/Scripts/Items/Equipment/Armor/GargishPlateWingArmor.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System; - -namespace Server.Items -{ - [FlipableAttribute(0x4580, 0x4581)] - public class GargishPlateWingArmor : BaseArmor - { - [Constructable] - public GargishPlateWingArmor() - : base(0x4580) - { - this.Weight = 4.0; - this.Layer = Layer.Cloak; - } - - public GargishPlateWingArmor(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance { get { return 0; } } - public override int BaseFireResistance { get { return 0; } } - public override int BaseColdResistance { get { return 0; } } - public override int BasePoisonResistance { get { return 0; } } - public override int BaseEnergyResistance { get { return 0; } } - - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 35; - } - } - public override int OldStrReq - { - get - { - return 35; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override int GetLuckBonus() - { - return 0; - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/GargishStoneArms.cs b/Scripts/Items/Equipment/Armor/GargishStoneArms.cs index 9c113d5d0..d89364140 100644 --- a/Scripts/Items/Equipment/Armor/GargishStoneArms.cs +++ b/Scripts/Items/Equipment/Armor/GargishStoneArms.cs @@ -2,13 +2,21 @@ using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishStoneArms")] public class GargishStoneArms : BaseArmor { [Constructable] public GargishStoneArms() + : this(0) + { + } + + [Constructable] + public GargishStoneArms(int hue) : base(0x284) { - this.Weight = 5.0; + Weight = 10.0; + Hue = hue; } public GargishStoneArms(Serial serial) @@ -16,104 +24,21 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 80; - } - } - public override int OldStrReq - { - get - { - return 40; - } - } - public override int OldDexBonus - { - get - { - return -2; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } + public override int BasePhysicalResistance { get { return 6; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 4; } } + public override int BasePoisonResistance { get { return 8; } } + public override int BaseEnergyResistance { get { return 6; } } + + public override int InitMinHits { get { return 40; } } + public override int InitMaxHits { get { return 50; } } + + public override int AosStrReq { get { return 40; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } public override void Serialize(GenericWriter writer) { diff --git a/Scripts/Items/Equipment/Armor/GargishStoneChest.cs b/Scripts/Items/Equipment/Armor/GargishStoneChest.cs index cc52e5372..083e33b49 100644 --- a/Scripts/Items/Equipment/Armor/GargishStoneChest.cs +++ b/Scripts/Items/Equipment/Armor/GargishStoneChest.cs @@ -2,13 +2,21 @@ using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishStoneChest")] public class GargishStoneChest : BaseArmor { [Constructable] public GargishStoneChest() + : this(0) + { + } + + [Constructable] + public GargishStoneChest(int hue) : base(0x286) { - this.Weight = 10.0; + Weight = 15.0; + Hue = hue; } public GargishStoneChest(Serial serial) @@ -16,116 +24,21 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 95; - } - } - public override int OldStrReq - { - get - { - return 60; - } - } - public override int OldDexBonus - { - get - { - return -8; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override void OnAdded(object parent) - { - if (parent is Mobile) - { - if (((Mobile)parent).Female && this.ItemID != 0x285) - this.ItemID = 0x285; - else if (this.ItemID != 0x286) - this.ItemID = 0x286; - } + public override int BasePhysicalResistance { get { return 6; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 4; } } + public override int BasePoisonResistance { get { return 8; } } + public override int BaseEnergyResistance { get { return 6; } } - base.OnAdded(parent); - } + public override int InitMinHits { get { return 40; } } + public override int InitMaxHits { get { return 50; } } + + public override int AosStrReq { get { return 40; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } public override void Serialize(GenericWriter writer) { diff --git a/Scripts/Items/Equipment/Armor/MaleGargishLeatherArms.cs b/Scripts/Items/Equipment/Armor/GargishStoneKilt.cs similarity index 60% rename from Scripts/Items/Equipment/Armor/MaleGargishLeatherArms.cs rename to Scripts/Items/Equipment/Armor/GargishStoneKilt.cs index 84f3c8a7f..0d806428a 100644 --- a/Scripts/Items/Equipment/Armor/MaleGargishLeatherArms.cs +++ b/Scripts/Items/Equipment/Armor/GargishStoneKilt.cs @@ -2,42 +2,40 @@ using System; namespace Server.Items { - public class MaleGargishLeatherArms : BaseArmor + [TypeAlias("Server.Items.MaleGargishStoneKilt")] + public class GargishStoneKilt : BaseArmor { [Constructable] - public MaleGargishLeatherArms() + public GargishStoneKilt() : this(0) { } [Constructable] - public MaleGargishLeatherArms(int hue) - : base(0x0302) + public GargishStoneKilt(int hue) + : base(0x288) { - Layer = Layer.Arms; - Weight = 4.0; + Weight = 10.0; Hue = hue; } - public MaleGargishLeatherArms(Serial serial) + public GargishStoneKilt(Serial serial) : base(serial) { } - public override int BasePhysicalResistance { get { return 5; } } + public override int BasePhysicalResistance { get { return 6; } } public override int BaseFireResistance { get { return 6; } } - public override int BaseColdResistance { get { return 7; } } - public override int BasePoisonResistance { get { return 6; } } + public override int BaseColdResistance { get { return 4; } } + public override int BasePoisonResistance { get { return 8; } } public override int BaseEnergyResistance { get { return 6; } } - public override int InitMinHits { get { return 30; } } + public override int InitMinHits { get { return 40; } } public override int InitMaxHits { get { return 50; } } - public override int AosStrReq { get { return 25; } } + public override int AosStrReq { get { return 40; } } - public override ArmorMeditationAllowance DefMedAllowance { get { return ArmorMeditationAllowance.All; } } - public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } public override Race RequiredRace { get { return Race.Gargoyle; } } public override bool CanBeWornByGargoyles { get { return true; } } diff --git a/Scripts/Items/Equipment/Armor/GargishStoneLegs.cs b/Scripts/Items/Equipment/Armor/GargishStoneLegs.cs index b85d41047..107a14391 100644 --- a/Scripts/Items/Equipment/Armor/GargishStoneLegs.cs +++ b/Scripts/Items/Equipment/Armor/GargishStoneLegs.cs @@ -2,13 +2,21 @@ using System; namespace Server.Items { + [TypeAlias("Server.Items.MaleGargishStoneLegs")] public class GargishStoneLegs : BaseArmor { [Constructable] public GargishStoneLegs() - : base(0x028A) + : this(0) { - this.Weight = 2.0; + } + + [Constructable] + public GargishStoneLegs(int hue) + : base(0x28A) + { + Weight = 15.0; + Hue = hue; } public GargishStoneLegs(Serial serial) @@ -16,116 +24,21 @@ namespace Server.Items { } - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 70; - } - } - public override int OldStrReq - { - get - { - return 30; - } - } - public override int OldDexBonus - { - get - { - return -2; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override void OnAdded(object parent) - { - if (parent is Mobile) - { - if (((Mobile)parent).Female && this.ItemID != 0x0289) - this.ItemID = 0x0289; - else if (this.ItemID != 0x028A) - this.ItemID = 0x028A; - } + public override int BasePhysicalResistance { get { return 6; } } + public override int BaseFireResistance { get { return 6; } } + public override int BaseColdResistance { get { return 4; } } + public override int BasePoisonResistance { get { return 8; } } + public override int BaseEnergyResistance { get { return 6; } } - base.OnAdded(parent); - } + public override int InitMinHits { get { return 40; } } + public override int InitMaxHits { get { return 50; } } + + public override int AosStrReq { get { return 40; } } + + public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Plate; } } + + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } public override void Serialize(GenericWriter writer) { diff --git a/Scripts/Items/Equipment/Armor/GargishStonePlateKilt.cs b/Scripts/Items/Equipment/Armor/GargishStonePlateKilt.cs deleted file mode 100644 index b5536d2d6..000000000 --- a/Scripts/Items/Equipment/Armor/GargishStonePlateKilt.cs +++ /dev/null @@ -1,142 +0,0 @@ -using System; - -namespace Server.Items -{ - public class GargishStoneKilt : BaseArmor - { - [Constructable] - public GargishStoneKilt() - : base(0x0288) - { - this.Weight = 7.0; - } - - public GargishStoneKilt(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 90; - } - } - public override int OldStrReq - { - get - { - return 60; - } - } - public override int OldDexBonus - { - get - { - return -6; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override void OnAdded(object parent) - { - if (parent is Mobile) - { - if (((Mobile)parent).Female && this.ItemID != 0x0287) - this.ItemID = 0x0287; - else if (this.ItemID != 0x0288) - this.ItemID = 0x0288; - } - - base.OnAdded(parent); - } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/GargishStoneWingArmor.cs b/Scripts/Items/Equipment/Armor/GargishStoneWingArmor.cs deleted file mode 100644 index 31afb59da..000000000 --- a/Scripts/Items/Equipment/Armor/GargishStoneWingArmor.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System; - -namespace Server.Items -{ - [FlipableAttribute(0x45A6, 0x45A7)] - public class GargishStoneWingArmor : BaseArmor - { - [Constructable] - public GargishStoneWingArmor() - : base(0x45A6) - { - this.Weight = 8.0; - this.Layer = Layer.Cloak; - } - - public GargishStoneWingArmor(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance { get { return 0; } } - public override int BaseFireResistance { get { return 0; } } - public override int BaseColdResistance { get { return 0; } } - public override int BasePoisonResistance { get { return 0; } } - public override int BaseEnergyResistance { get { return 0; } } - - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 95; - } - } - public override int OldStrReq - { - get - { - return 60; - } - } - public override int OldDexBonus - { - get - { - return -8; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override int GetLuckBonus() - { - return 0; - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/MaleGargishLeatherKilt.cs b/Scripts/Items/Equipment/Armor/MaleGargishLeatherKilt.cs deleted file mode 100644 index 7f96d2a72..000000000 --- a/Scripts/Items/Equipment/Armor/MaleGargishLeatherKilt.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; - -namespace Server.Items -{ - public class MaleGargishLeatherKilt : BaseArmor - { - [Constructable] - public MaleGargishLeatherKilt() - : this(0) - { - } - - [Constructable] - public MaleGargishLeatherKilt(int hue) - : base(0x311) - { - Layer = Layer.Gloves; - Weight = 5.0; - Hue = hue; - } - - public MaleGargishLeatherKilt(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance { get { return 5; } } - public override int BaseFireResistance { get { return 6; } } - public override int BaseColdResistance { get { return 7; } } - public override int BasePoisonResistance { get { return 6; } } - public override int BaseEnergyResistance { get { return 6; } } - - public override int InitMinHits { get { return 30; } } - public override int InitMaxHits { get { return 50; } } - - public override int AosStrReq { get { return 25; } } - - public override ArmorMeditationAllowance DefMedAllowance { get { return ArmorMeditationAllowance.All; } } - public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } - - public override Race RequiredRace { get { return Race.Gargoyle; } } - public override bool CanBeWornByGargoyles { get { return true; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/MaleGargishLeatherLegs.cs b/Scripts/Items/Equipment/Armor/MaleGargishLeatherLegs.cs deleted file mode 100644 index 58012d838..000000000 --- a/Scripts/Items/Equipment/Armor/MaleGargishLeatherLegs.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; - -namespace Server.Items -{ - public class MaleGargishLeatherLegs : BaseArmor - { - [Constructable] - public MaleGargishLeatherLegs() - : this(0) - { - } - - [Constructable] - public MaleGargishLeatherLegs(int hue) - : base(0x305) - { - Weight = 5.0; - Hue = hue; - } - - public MaleGargishLeatherLegs(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance { get { return 5; } } - public override int BaseFireResistance { get { return 6; } } - public override int BaseColdResistance { get { return 7; } } - public override int BasePoisonResistance { get { return 6; } } - public override int BaseEnergyResistance { get { return 6; } } - - public override int InitMinHits { get { return 30; } } - public override int InitMaxHits { get { return 50; } } - - public override int AosStrReq { get { return 20; } } - - public override ArmorMeditationAllowance DefMedAllowance { get { return ArmorMeditationAllowance.All; } } - public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } - - public override Race RequiredRace { get { return Race.Gargoyle; } } - public override bool CanBeWornByGargoyles { get { return true; } } - - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); // version - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/MaleGargishPlateArms.cs b/Scripts/Items/Equipment/Armor/MaleGargishPlateArms.cs deleted file mode 100644 index 9aec0f8ff..000000000 --- a/Scripts/Items/Equipment/Armor/MaleGargishPlateArms.cs +++ /dev/null @@ -1,129 +0,0 @@ -using System; - -namespace Server.Items -{ - public class MaleGargishPlateArms : BaseArmor - { - [Constructable] - public MaleGargishPlateArms() - : base(0x0308) - { - this.Weight = 4.0; - } - - public MaleGargishPlateArms(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance - { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 25; - } - } - public override int OldStrReq - { - get - { - return 25; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowFemaleWearer - { - get - { - return false; - } - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/MaleGargishPlateChest.cs b/Scripts/Items/Equipment/Armor/MaleGargishPlateChest.cs deleted file mode 100644 index 77014c0f5..000000000 --- a/Scripts/Items/Equipment/Armor/MaleGargishPlateChest.cs +++ /dev/null @@ -1,129 +0,0 @@ -using System; - -namespace Server.Items -{ - public class MaleGargishPlateChest : BaseArmor - { - [Constructable] - public MaleGargishPlateChest() - : base(0x030A) - { - this.Weight = 8.0; - } - - public MaleGargishPlateChest(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance - { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 35; - } - } - public override int OldStrReq - { - get - { - return 35; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowFemaleWearer - { - get - { - return false; - } - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/MaleGargishPlateKilt.cs b/Scripts/Items/Equipment/Armor/MaleGargishPlateKilt.cs deleted file mode 100644 index b403d414d..000000000 --- a/Scripts/Items/Equipment/Armor/MaleGargishPlateKilt.cs +++ /dev/null @@ -1,129 +0,0 @@ -using System; - -namespace Server.Items -{ - public class MaleGargishPlateKilt : BaseArmor - { - [Constructable] - public MaleGargishPlateKilt() - : base(0x030C) - { - this.Weight = 5.0; - } - - public MaleGargishPlateKilt(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance - { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 30; - } - } - public override int OldStrReq - { - get - { - return 35; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowFemaleWearer - { - get - { - return false; - } - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/MaleGargishPlateLegs.cs b/Scripts/Items/Equipment/Armor/MaleGargishPlateLegs.cs deleted file mode 100644 index ee8dca60e..000000000 --- a/Scripts/Items/Equipment/Armor/MaleGargishPlateLegs.cs +++ /dev/null @@ -1,129 +0,0 @@ -using System; - -namespace Server.Items -{ - public class MaleGargishPlateLegs : BaseArmor - { - [Constructable] - public MaleGargishPlateLegs() - : base(0x030E) - { - this.Weight = 1.0; - } - - public MaleGargishPlateLegs(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance - { - get - { - return 2; - } - } - public override int BaseFireResistance - { - get - { - return 4; - } - } - public override int BaseColdResistance - { - get - { - return 3; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 4; - } - } - public override int InitMinHits - { - get - { - return 35; - } - } - public override int InitMaxHits - { - get - { - return 45; - } - } - public override int AosStrReq - { - get - { - return 25; - } - } - public override int OldStrReq - { - get - { - return 25; - } - } - public override int ArmorBase - { - get - { - return 16; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowFemaleWearer - { - get - { - return false; - } - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/MaleGargishStoneArms.cs b/Scripts/Items/Equipment/Armor/MaleGargishStoneArms.cs deleted file mode 100644 index 4a281f152..000000000 --- a/Scripts/Items/Equipment/Armor/MaleGargishStoneArms.cs +++ /dev/null @@ -1,136 +0,0 @@ -using System; - -namespace Server.Items -{ - public class MaleGargishStoneArms : BaseArmor - { - [Constructable] - public MaleGargishStoneArms() - : base(0x284) - { - this.Weight = 5.0; - } - - public MaleGargishStoneArms(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 80; - } - } - public override int OldStrReq - { - get - { - return 40; - } - } - public override int OldDexBonus - { - get - { - return -2; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowFemaleWearer - { - get - { - return false; - } - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/MaleGargishStoneChest.cs b/Scripts/Items/Equipment/Armor/MaleGargishStoneChest.cs deleted file mode 100644 index 60ec0135b..000000000 --- a/Scripts/Items/Equipment/Armor/MaleGargishStoneChest.cs +++ /dev/null @@ -1,136 +0,0 @@ -using System; - -namespace Server.Items -{ - public class MaleGargishStoneChest : BaseArmor - { - [Constructable] - public MaleGargishStoneChest() - : base(0x286) - { - this.Weight = 10.0; - } - - public MaleGargishStoneChest(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 95; - } - } - public override int OldStrReq - { - get - { - return 60; - } - } - public override int OldDexBonus - { - get - { - return -8; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowFemaleWearer - { - get - { - return false; - } - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/MaleGargishStoneLegs.cs b/Scripts/Items/Equipment/Armor/MaleGargishStoneLegs.cs deleted file mode 100644 index 18a9d5bdd..000000000 --- a/Scripts/Items/Equipment/Armor/MaleGargishStoneLegs.cs +++ /dev/null @@ -1,136 +0,0 @@ -using System; - -namespace Server.Items -{ - public class MaleGargishStoneLegs : BaseArmor - { - [Constructable] - public MaleGargishStoneLegs() - : base(0x028A) - { - this.Weight = 2.0; - } - - public MaleGargishStoneLegs(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 70; - } - } - public override int OldStrReq - { - get - { - return 30; - } - } - public override int OldDexBonus - { - get - { - return -2; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowFemaleWearer - { - get - { - return false; - } - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Armor/MaleGargishStonePlateKilt.cs b/Scripts/Items/Equipment/Armor/MaleGargishStonePlateKilt.cs deleted file mode 100644 index fee150ae7..000000000 --- a/Scripts/Items/Equipment/Armor/MaleGargishStonePlateKilt.cs +++ /dev/null @@ -1,136 +0,0 @@ -using System; - -namespace Server.Items -{ - public class MaleGargishStoneKilt : BaseArmor - { - [Constructable] - public MaleGargishStoneKilt() - : base(0x0288) - { - this.Weight = 7.0; - } - - public MaleGargishStoneKilt(Serial serial) - : base(serial) - { - } - - public override int BasePhysicalResistance - { - get - { - return 5; - } - } - public override int BaseFireResistance - { - get - { - return 3; - } - } - public override int BaseColdResistance - { - get - { - return 2; - } - } - public override int BasePoisonResistance - { - get - { - return 3; - } - } - public override int BaseEnergyResistance - { - get - { - return 2; - } - } - public override int InitMinHits - { - get - { - return 50; - } - } - public override int InitMaxHits - { - get - { - return 65; - } - } - public override int AosStrReq - { - get - { - return 90; - } - } - public override int OldStrReq - { - get - { - return 60; - } - } - public override int OldDexBonus - { - get - { - return -6; - } - } - public override int ArmorBase - { - get - { - return 40; - } - } - public override ArmorMaterialType MaterialType - { - get - { - return ArmorMaterialType.Plate; - } - } - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - public override bool AllowFemaleWearer - { - get - { - return false; - } - } - public override void Serialize(GenericWriter writer) - { - base.Serialize(writer); - writer.Write((int)0); - } - - public override void Deserialize(GenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file diff --git a/Scripts/Items/Equipment/Clothing/Cloaks.cs b/Scripts/Items/Equipment/Clothing/Cloaks.cs index e70e6de9f..fa39bb0af 100644 --- a/Scripts/Items/Equipment/Clothing/Cloaks.cs +++ b/Scripts/Items/Equipment/Clothing/Cloaks.cs @@ -370,21 +370,6 @@ namespace Server.Items [FlipableAttribute(0x45A4, 0x45A5)] public class GargishClothWingArmor : BaseClothing { - public override Race RequiredRace - { - get - { - return Race.Gargoyle; - } - } - public override bool CanBeWornByGargoyles - { - get - { - return true; - } - } - [Constructable] public GargishClothWingArmor() : this(0) @@ -395,9 +380,13 @@ namespace Server.Items public GargishClothWingArmor(int hue) : base(0x45A4, Layer.Cloak, hue) { - this.Weight = 2.0; + Weight = 2.0; } + public override int AosStrReq { get { return 10; } } + public override Race RequiredRace { get { return Race.Gargoyle; } } + public override bool CanBeWornByGargoyles { get { return true; } } + public GargishClothWingArmor(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/NPCs/GargishWarrior.cs b/Scripts/Mobiles/NPCs/GargishWarrior.cs index 03597ee07..4e991fcfa 100644 --- a/Scripts/Mobiles/NPCs/GargishWarrior.cs +++ b/Scripts/Mobiles/NPCs/GargishWarrior.cs @@ -28,10 +28,10 @@ namespace Server.Mobiles this.Body = 666; this.HairItemID = 16987; this.HairHue = 1801; - this.AddItem(new MaleGargishPlateChest()); - this.AddItem(new MaleGargishPlateKilt()); - this.AddItem(new MaleGargishPlateLegs()); - this.AddItem(new MaleGargishPlateArms()); + this.AddItem(new GargishPlateChest()); + this.AddItem(new GargishPlateKilt()); + this.AddItem(new GargishPlateLegs()); + this.AddItem(new GargishPlateArms()); this.AddItem(new PlateTalons()); this.AddItem(new GlassSword()); diff --git a/Scripts/Scripts.csproj b/Scripts/Scripts.csproj index a8561a5de..09c09a347 100644 --- a/Scripts/Scripts.csproj +++ b/Scripts/Scripts.csproj @@ -3820,7 +3820,7 @@ Code - + Code @@ -3850,9 +3850,6 @@ Code - - Code - Code @@ -3862,10 +3859,7 @@ Code - - Code - - + Code @@ -4099,42 +4093,6 @@ Code - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - Code diff --git a/Scripts/Services/Armor Refinement/Gumps.cs b/Scripts/Services/Armor Refinement/Gumps.cs index e1d9bf289..d3e58b885 100644 --- a/Scripts/Services/Armor Refinement/Gumps.cs +++ b/Scripts/Services/Armor Refinement/Gumps.cs @@ -225,13 +225,13 @@ namespace Server.Gumps return armor is DecorativePlateKabuto || armor is HeavyPlateJingasa || armor is LightPlateJingasa || armor is PlateBattleKabuto || armor is PlateDo || armor is PlateHaidate || armor is PlateHatsuburi || armor is PlateHiroSode || armor is PlateMempo || armor is PlateSuneate || armor is SmallPlateJingasa || armor is StandardPlateKabuto; case RefinementSubCraftType.GargishPlatemail: - return armor is GargishPlateArms || armor is GargishPlateChest || armor is GargishPlateKilt || armor is GargishPlateLegs || armor is GargishPlateWingArmor; + return armor is GargishPlateArms || armor is GargishPlateChest || armor is GargishPlateKilt || armor is GargishPlateLegs || armor is FemaleGargishPlateArms || armor is FemaleGargishPlateArms || armor is FemaleGargishPlateArms || armor is FemaleGargishPlateArms; case RefinementSubCraftType.Dragon: return armor is DragonArms || armor is DragonChest || armor is DragonGloves || armor is DragonHelm || armor is DragonLegs; case RefinementSubCraftType.Woodland: return armor is WoodlandArms || armor is WoodlandChest || armor is WoodlandGloves || armor is WoodlandGorget || armor is WoodlandLegs; case RefinementSubCraftType.GargishStone: - return armor is GargishStoneArms || armor is GargishStoneChest || armor is GargishStoneLegs || armor is GargishStoneKilt || armor is GargishStoneWingArmor; + return armor is GargishStoneArms || armor is GargishStoneChest || armor is GargishStoneLegs || armor is GargishStoneKilt || armor is FemaleGargishStoneArms || armor is FemaleGargishStoneChest || armor is FemaleGargishStoneLegs || armor is FemaleGargishStoneKilt; } return false; diff --git a/Scripts/Services/Craft/DefMasonry.cs b/Scripts/Services/Craft/DefMasonry.cs index 70c6fa8f2..114d86c2a 100644 --- a/Scripts/Services/Craft/DefMasonry.cs +++ b/Scripts/Services/Craft/DefMasonry.cs @@ -217,17 +217,31 @@ namespace Server.Engines.Craft #region Gargish Armor if (Core.SA) { - int index = this.AddCraft(typeof(GargishStoneArms), 1111705, 1020643, 52.0, 102.0, typeof(Granite), 1044514, 8, 1044513); + int index = this.AddCraft(typeof(FemaleGargishStoneArms), 1111705, 1020643, 52.0, 102.0, typeof(Granite), 1044514, 8, 1044513); + this.SetNeededExpansion(index, Expansion.SA); + + index = this.AddCraft(typeof(FemaleGargishStoneChest), 1111705, 1020645, 55.0, 105.0, typeof(Granite), 1044514, 12, 1044513); + this.SetNeededExpansion(index, Expansion.SA); + + index = this.AddCraft(typeof(FemaleGargishStoneLegs), 1111705, 1020649, 53.5, 103.5, typeof(Granite), 1044514, 10, 1044513); + this.SetNeededExpansion(index, Expansion.SA); + + index = this.AddCraft(typeof(FemaleGargishStoneKilt), 1111705, 1020647, 50.0, 100.0, typeof(Granite), 1044514, 6, 1044513); + this.SetNeededExpansion(index, Expansion.SA); + + + index = this.AddCraft(typeof(GargishStoneArms), 1111705, 1020643, 52.0, 102.0, typeof(Granite), 1044514, 8, 1044513); this.SetNeededExpansion(index, Expansion.SA); index = this.AddCraft(typeof(GargishStoneChest), 1111705, 1020645, 55.0, 105.0, typeof(Granite), 1044514, 12, 1044513); this.SetNeededExpansion(index, Expansion.SA); - - index = this.AddCraft(typeof(GargishStoneKilt), 1111705, 1020647, 50.0, 100.0, typeof(Granite), 1044514, 6, 1044513); - this.SetNeededExpansion(index, Expansion.SA); - + index = this.AddCraft(typeof(GargishStoneLegs), 1111705, 1020649, 53.5, 103.5, typeof(Granite), 1044514, 10, 1044513); this.SetNeededExpansion(index, Expansion.SA); + + index = this.AddCraft(typeof(GargishStoneKilt), 1111705, 1020647, 50.0, 100.0, typeof(Granite), 1044514, 6, 1044513); + this.SetNeededExpansion(index, Expansion.SA); + index = this.AddCraft(typeof(LargeStoneShield), 1111705, 1095773, 55.0, 105.0, typeof(Granite), 1044514, 16, 1044513); this.SetNeededExpansion(index, Expansion.SA); diff --git a/Scripts/Skills/Imbuing/Core/Imbuing.cs b/Scripts/Skills/Imbuing/Core/Imbuing.cs index 1b9dbd951..dda21e7ab 100644 --- a/Scripts/Skills/Imbuing/Core/Imbuing.cs +++ b/Scripts/Skills/Imbuing/Core/Imbuing.cs @@ -1607,7 +1607,7 @@ namespace Server.SkillHandlers private static Type[] m_CannotImbue = new Type[] { - typeof(GargishPlateWingArmor), typeof(GargishLeatherWingArmor), typeof(GargishClothWingArmor), typeof(GargishStoneWingArmor) + typeof(GargishLeatherWingArmor), typeof(GargishClothWingArmor) }; public static object GetAttribute(int mod) @@ -2216,7 +2216,7 @@ namespace Server.SkillHandlers if (armor.MaterialType == ArmorMaterialType.Dragon) return 12; - if (armor is GargishStoneKilt || armor is GargishStoneChest || armor is GargishStoneLegs || armor is GargishStoneArms || armor is GargishStoneAmulet) + if (armor is GargishStoneKilt || armor is GargishStoneChest || armor is GargishStoneLegs || armor is GargishStoneArms || armor is FemaleGargishStoneKilt || armor is FemaleGargishStoneChest || armor is FemaleGargishStoneLegs || armor is FemaleGargishStoneArms || armor is GargishStoneAmulet) return 11; if (armor is WoodlandGorget || armor is WoodlandLegs || armor is WoodlandGloves || armor is WoodlandChest || armor is WoodlandArms) diff --git a/Scripts/VendorInfo/SBSAArmor.cs b/Scripts/VendorInfo/SBSAArmor.cs index 3e1490ecd..0b0a67669 100644 --- a/Scripts/VendorInfo/SBSAArmor.cs +++ b/Scripts/VendorInfo/SBSAArmor.cs @@ -8,6 +8,7 @@ namespace Server.Mobiles { private readonly List m_BuyInfo = new InternalBuyInfo(); private readonly IShopSellInfo m_SellInfo = new InternalSellInfo(); + public SBSAArmor() { } @@ -31,21 +32,22 @@ namespace Server.Mobiles { public InternalBuyInfo() { - Add(new GenericBuyInfo(typeof(GargishPlateArms), 363, 20, 0x307, 0)); + Add(new GenericBuyInfo(typeof(FemaleGargishPlateArms), 363, 20, 0x307, 0)); Add(new GenericBuyInfo(typeof(GargishPlateArms), 328, 20, 0x308, 0)); - Add(new GenericBuyInfo(typeof(GargishPlateChest), 481, 20, 0x309, 0)); + Add(new GenericBuyInfo(typeof(FemaleGargishPlateChest), 481, 20, 0x309, 0)); Add(new GenericBuyInfo(typeof(GargishPlateChest), 462, 20, 0x30A, 0)); - Add(new GenericBuyInfo(typeof(GargishPlateKilt), 338, 20, 0x30B, 0)); + Add(new GenericBuyInfo(typeof(FemaleGargishPlateKilt), 338, 20, 0x30B, 0)); Add(new GenericBuyInfo(typeof(GargishPlateKilt), 370, 20, 0x30C, 0)); - Add(new GenericBuyInfo(typeof(GargishPlateLegs), 372, 20, 0x30D, 0)); + Add(new GenericBuyInfo(typeof(FemaleGargishPlateLegs), 372, 20, 0x30D, 0)); Add(new GenericBuyInfo(typeof(GargishPlateLegs), 355, 20, 0x30E, 0)); - Add(new GenericBuyInfo(typeof(GargishStoneArms), 116, 20, 0x283, 0)); + + Add(new GenericBuyInfo(typeof(FemaleGargishStoneArms), 116, 20, 0x283, 0)); Add(new GenericBuyInfo(typeof(GargishStoneArms), 121, 20, 0x284, 0)); - Add(new GenericBuyInfo(typeof(GargishStoneChest), 135, 20, 0x285, 0)); + Add(new GenericBuyInfo(typeof(FemaleGargishStoneChest), 135, 20, 0x285, 0)); Add(new GenericBuyInfo(typeof(GargishStoneChest), 142, 20, 0x286, 0)); - Add(new GenericBuyInfo(typeof(GargishStoneKilt), 135, 20, 0x287, 0)); + Add(new GenericBuyInfo(typeof(FemaleGargishStoneKilt), 135, 20, 0x287, 0)); Add(new GenericBuyInfo(typeof(GargishStoneKilt), 132, 20, 0x288, 0)); - Add(new GenericBuyInfo(typeof(GargishStoneLegs), 116, 20, 0x289, 0)); + Add(new GenericBuyInfo(typeof(FemaleGargishStoneLegs), 116, 20, 0x289, 0)); Add(new GenericBuyInfo(typeof(GargishStoneLegs), 113, 20, 0x28A, 0)); } } @@ -54,21 +56,22 @@ namespace Server.Mobiles { public InternalSellInfo() { - Add(typeof(GargishPlateArms), 181); + Add(typeof(FemaleGargishPlateArms), 181); Add(typeof(GargishPlateArms), 164); - Add(typeof(GargishPlateChest), 240); + Add(typeof(FemaleGargishPlateChest), 240); Add(typeof(GargishPlateChest), 231); - Add(typeof(GargishPlateKilt), 169); + Add(typeof(FemaleGargishPlateKilt), 169); Add(typeof(GargishPlateKilt), 185); - Add(typeof(GargishPlateLegs), 186); + Add(typeof(FemaleGargishPlateLegs), 186); Add(typeof(GargishPlateLegs), 177); - Add(typeof(GargishStoneArms), 58); + + Add(typeof(FemaleGargishStoneArms), 58); Add(typeof(GargishStoneArms), 60); - Add(typeof(GargishStoneChest), 67); + Add(typeof(FemaleGargishStoneChest), 67); Add(typeof(GargishStoneChest), 71); - Add(typeof(GargishStoneKilt), 67); + Add(typeof(FemaleGargishStoneKilt), 67); Add(typeof(GargishStoneKilt), 66); - Add(typeof(GargishStoneLegs), 58); + Add(typeof(FemaleGargishStoneLegs), 58); Add(typeof(GargishStoneLegs), 56); } }