Merge pull request #29 from ServUO/master

Merge with master

Data/Regions.xml

@@ -2022,7 +2022,7 @@
 			<rect x="528" y="376" width="96" height="88" />
 			<go x="568" y="430" z="41" />
 		</region>
-		<region type="DungeonRegion" priority="50" name="Ver Lor Reg">
+		<region type="VerLorRegCity" priority="50" name="Ver Lor Reg">
 			<rect x="824" y="552" width="32" height="176" />
 			<rect x="752" y="576" width="72" height="128" />
 			<rect x="856" y="576" width="48" height="128" />

Scripts/Abilities/SlayerGroup.cs

@@ -194,7 +194,9 @@ static SlayerGroup()
                     typeof(ValoriteElemental), typeof(VeriteElemental),
                     typeof(WaterElemental), typeof(SummonedWaterElemental),
                     typeof(Flurry), typeof(Mistral),
-                    typeof(Tempest)
+                    typeof(Tempest), typeof(UnboundEnergyVortex),
+                    typeof(ChaosVortex), typeof(WindElemental),
+                    typeof(FlameElemental), typeof(QuartzElemental)
                 );
 
             elemental.Entries = new SlayerEntry[]
@@ -214,7 +216,8 @@ static SlayerGroup()
                             typeof(CopperElemental),    typeof(DullCopperElemental),
                             typeof(EarthElemental),     typeof(SummonedEarthElemental),
                             typeof(GoldenElemental),    typeof(ShadowIronElemental),
-                            typeof(ValoriteElemental),  typeof(VeriteElemental)
+                            typeof(ValoriteElemental),  typeof(VeriteElemental),
+                            typeof(QuartzElemental)
                         ),
 
                     new SlayerEntry
@@ -229,7 +232,7 @@ static SlayerGroup()
                             SlayerName.FlameDousing,
 
                             typeof(FireElemental),  typeof(FireElementalRenowned),
-                            typeof(SummonedFireElemental)
+                            typeof(SummonedFireElemental), typeof(FlameElemental)
                         ),
 
                     new SlayerEntry
@@ -245,7 +248,8 @@ static SlayerGroup()
 
                             typeof(AirElemental),   typeof(SummonedAirElemental),
                             typeof(Flurry),         typeof(Mistral),
-                            typeof(Tempest)
+                            typeof(Tempest),        typeof(UnboundEnergyVortex),
+                            typeof(ChaosVortex),    typeof(WindElemental)
                         ),
 
                     new SlayerEntry
@@ -295,7 +299,8 @@ static SlayerGroup()
                         typeof(Anzuanord), typeof(Ballem),
                         typeof(Betballem), typeof(SkeletalLich),
                         typeof(UsagralemBallem), typeof(EffetePutridGargoyle),
-                        typeof(EffeteUndeadGargoyle), typeof(PitFiend)
+                        typeof(EffeteUndeadGargoyle), typeof(PitFiend),
+                        typeof(ArchDaemon), typeof(AbyssalAbomination)
                     );
 
                 abyss.Entries = new SlayerEntry[]
@@ -670,4 +675,4 @@ private static SlayerEntry[] CompileEntries(SlayerGroup[] groups)
             return entries;
         }
     }
-}
+}

Scripts/Items/Tools/ForgedMetalOfArtifacts.cs

@@ -0,0 +1,205 @@
+using System;
+using Server;
+using Server.Mobiles;
+using Server.Gumps;
+using Server.Network;
+
+namespace Server.Items
+{
+    public class ForgedMetalOfArtifacts : Item
+    {
+        private int m_UsesRemaining;
+
+        public override int LabelNumber { get { return 1149868; } } // Forged Metal of Artifacts
+
+        [Constructable]
+        public ForgedMetalOfArtifacts(int uses)
+            : base(0xE8A)
+        {
+            Weight = 5.0;
+            Hue = 51;
+            ItemID = 4023;
+            m_UsesRemaining = uses;
+            LootType = LootType.Blessed;
+        }
+
+        [Constructable]
+        public ForgedMetalOfArtifacts()
+            : this(5)
+        {
+        }
+
+        public ForgedMetalOfArtifacts(Serial serial)
+            : base(serial)
+        {
+        }
+
+        [CommandProperty(AccessLevel.GameMaster)]
+        public int UsesRemaining
+        {
+            get { return m_UsesRemaining; }
+            set { m_UsesRemaining = value; InvalidateProperties(); }
+        }
+
+        public override void Serialize(GenericWriter writer)
+        {
+            base.Serialize(writer);
+            writer.Write((int)0); // version
+
+            writer.Write((int)m_UsesRemaining);
+        }
+
+        public override void Deserialize(GenericReader reader)
+        {
+            base.Deserialize(reader);
+            int version = reader.ReadInt();
+
+            m_UsesRemaining = reader.ReadInt();
+        }
+
+        public override void GetProperties(ObjectPropertyList list)
+        {
+            base.GetProperties(list);
+
+            list.Add(1060584, m_UsesRemaining.ToString()); // uses remaining: ~1_val~
+        }
+
+        public override void OnDoubleClick(Mobile from)
+        {
+            PlayerMobile pm = from as PlayerMobile;
+
+            from.CloseGump(typeof(InternalGump));
+            from.CloseGump(typeof(CancelGump));
+
+            if (IsChildOf(from.Backpack))
+            {
+                if (pm.NextEnhanceSuccess)
+                {
+                    from.SendGump(new CancelGump(pm));
+                    pm.NextEnhanceSuccess = false;
+                }
+                else
+                {
+                    from.SendGump(new InternalGump(pm, this));
+                }
+            }
+            else
+            {
+                from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
+            }
+        }
+
+        public void Use(PlayerMobile from)
+        {
+            if (IsChildOf(from.Backpack))
+            {
+                from.NextEnhanceSuccess = true;
+                from.SendLocalizedMessage(1149956); // A magical aura surrounds you and you feel your next item enhancing attempt will most certainly be successful.
+                this.m_UsesRemaining -= 1;
+                InvalidateProperties();
+                if (this.m_UsesRemaining <= 0)
+                {
+                    this.Delete();
+                    from.SendLocalizedMessage(1044038); // You have worn out your tool!
+                }
+            }
+            else
+            {
+                from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
+            }
+        }
+
+        public class InternalGump : Gump
+        {
+            private PlayerMobile m_Mobile;
+            private ForgedMetalOfArtifacts m_Tool;
+
+            public InternalGump(PlayerMobile from, ForgedMetalOfArtifacts tool)
+                : base(50, 50)
+            {
+                m_Mobile = from;
+                m_Tool = tool;
+
+                AddPage(0);
+
+                AddBackground(0, 0, 400, 230, 0x13BE);
+
+                AddImageTiled(5, 5, 390, 25, 0xA40);
+                AddHtmlLocalized(5, 8, 390, 25, 1113302, "#1149868", 0x7FFF, false, false); // <CENTER>Forged Metal of Artifacts</CENTER>
+
+                AddImageTiled(5, 35, 390, 125, 0xA40);
+
+                /* 
+				 * The next time that you try to enhance an item the success rate will be the value listed
+				 * below regardless of your skill and total intensity of the item. Skill requirements still
+				 * apply to material usage.  One charge on this item will be consumed per use and only one
+				 * instance of this buff can be active at any time.
+				 */
+                AddHtmlLocalized(10, 40, 380, 125, 1149920, 0x7FFF, false, false);
+
+                AddImageTiled(5, 165, 120, 30, 0xA40);
+                AddHtmlLocalized(10, 170, 120, 30, 1149921, 0x7FFF, false, false); // Skill:
+                AddImageTiled(125, 165, 140, 30, 0xA40);
+                AddHtmlLocalized(130, 170, 140, 30, 1114057, "#1149992", 0x7FFF, false, false); // All Crafting Skills
+
+                AddImageTiled(5, 195, 120, 30, 0xA40);
+                AddHtmlLocalized(10, 200, 120, 30, 1149933, 0x7FFF, false, false); // Success Rate:
+                AddImageTiled(125, 195, 140, 30, 0xA40);
+                AddHtmlLocalized(130, 200, 140, 30, 1149934, "100", 0x7FFF, false, false); // ~1_VAL~%
+
+                AddImageTiled(270, 165, 125, 60, 0xA40);
+                AddButton(275, 170, 0xFB7, 0xFB8, 1, GumpButtonType.Reply, 0);
+                AddHtmlLocalized(310, 172, 85, 30, 1149935, 0x7FFF, false, false); // OKAY
+                AddButton(275, 200, 0xFB1, 0xFB3, 0, GumpButtonType.Reply, 0);
+                AddHtmlLocalized(310, 202, 85, 30, 1060051, 0x7FFF, false, false); // CANCEL
+            }
+
+            public override void OnResponse(NetState sender, RelayInfo info)
+            {
+                if (info.ButtonID == 1)
+                {
+                    m_Tool.Use(m_Mobile);
+                }
+            }
+        }
+
+        public class CancelGump : Gump
+        {
+            private PlayerMobile m_Mobile;
+
+            public CancelGump(PlayerMobile from)
+                : base(50, 50)
+            {
+                m_Mobile = from;
+
+                AddPage(0);
+
+                AddBackground(0, 0, 400, 155, 0x13BE);
+                AddImageTiled(5, 5, 390, 25, 0xA40);
+                AddHtmlLocalized(5, 8, 390, 25, 1113302, "#1149868", 0x7FFF, false, false); // <CENTER>~1_VAL~</CENTER>
+                AddImageTiled(5, 35, 390, 52, 0xA40);
+                AddHtmlLocalized(10, 40, 380, 52, 1149967, 0x7FFF, false, false); // *CAUTION* You are under the following ENHANCE ITEM buff. Do you want to remove it?
+                AddImageTiled(5, 92, 120, 29, 0xA40);
+                AddHtmlLocalized(10, 97, 120, 29, 1149921, 0x7FFF, false, false); // Skill:
+                AddImageTiled(5, 121, 120, 29, 0xA40);
+                AddHtmlLocalized(10, 126, 120, 29, 1149933, 0x7FFF, false, false); // Success Rate:
+                AddImageTiled(125, 92, 140, 29, 0xA40);
+                AddHtmlLocalized(130, 97, 140, 29, 1114057, "#1149992", 0x7FFF, false, false); // ~1_val~
+                AddImageTiled(125, 121, 140, 29, 0xA40);
+                AddHtmlLocalized(130, 126, 140, 29, 1149934, "100", 0x7FFF, false, false); // ~1_VAL~%
+                AddImageTiled(270, 92, 125, 58, 0xA40);
+                AddButton(275, 97, 0xFB7, 0xFB8, 1, GumpButtonType.Reply, 0);
+                AddHtmlLocalized(310, 99, 85, 29, 1149968, 0x7FFF, false, false); // REMOVE
+            }
+
+            public override void OnResponse(NetState sender, RelayInfo info)
+            {
+                if (info.ButtonID == 1)
+                {
+                    m_Mobile.NextEnhanceSuccess = false;
+                    m_Mobile.SendLocalizedMessage(1149969); // The magical aura that surrounded you disipates and you feel that your item enhancement chances have returned to normal.
+                }
+            }
+        }
+    }
+}

Scripts/Mobiles/AI/SpeedInfo.cs

@@ -120,7 +120,11 @@ private static void LoadTable()
                 typeof(Sewerrat), typeof(Skeleton), typeof(Slime),
                 typeof(Zombie), typeof(Walrus), typeof(RestlessSoul),
                 typeof(CrystalElemental), typeof(DarknightCreeper), typeof(MoundOfMaggots),
-                typeof(Juggernaut), typeof(Yamandon), typeof(Serado)
+                typeof(Juggernaut), typeof(Yamandon), typeof(Serado),
+                typeof(RuddyBoura), typeof(LowlandBoura), typeof(HighPlainsBoura),
+                typeof(Relanord), typeof(Ortanord), typeof(Korpre),
+                typeof(Anzuanord), typeof(Anlorzen), typeof(UndeadGuardian),
+                typeof(PutridUndeadGuardian)
             }),
             /* Fast */
             new SpeedInfo(0.2, 0.4, new Type[]
@@ -136,7 +140,12 @@ private static void LoadTable()
                 typeof(DemonKnight), typeof(GiantBlackWidow), typeof(SummonedAirElemental),
                 typeof(LesserHiryu), typeof(Hiryu), typeof(LadyOfTheSnow),
                 typeof(RaiJu), typeof(Ronin), typeof(RuneBeetle),
-                typeof(Changeling),
+                typeof(Changeling), typeof(SentinelSpider), typeof(Anlorvaglem),
+                typeof(Medusa), typeof(PrimevalLich), typeof(StygianDragon),
+                typeof(CoralSnake), typeof(DarkWisp), typeof(DreamWraith),
+                typeof(FireAnt), typeof(KepetchAmbusher), typeof(LavaElemental),
+                typeof(MaddeningHorror), typeof(Wight), typeof(WolfSpider),
+                typeof(UndeadGargoyle), typeof(SlasherOfVeils),
                 #region ML named mobs - before Paragon speedboost
                 typeof(LadyJennifyr), typeof(LadyMarai), typeof(MasterJonath),
                 typeof(MasterMikael), typeof(MasterTheophilus), typeof(RedDeath),
@@ -159,7 +168,8 @@ private static void LoadTable()
                 typeof(FactionHenchman), typeof(FactionMercenary), typeof(FactionNecromancer),
                 typeof(FactionSorceress), typeof(FactionWizard), typeof(FactionBerserker),
                 typeof(FactionPaladin), typeof(Leviathan), typeof(FireBeetle),
-                typeof(FanDancer), typeof(FactionDeathKnight)
+                typeof(FanDancer), typeof(FactionDeathKnight), typeof (ClockworkExodus),
+                typeof(Navrey), typeof(Raptor), typeof(TrapdoorSpider)
             }),
             /* Medium */
             new SpeedInfo(0.25, 0.5, new Type[]
@@ -234,7 +244,17 @@ private static void LoadTable()
                 typeof(Kappa), typeof(KazeKemono), typeof(DeathwatchBeetle),
                 typeof(TsukiWolf), typeof(YomotsuElder), typeof(YomotsuPriest),
                 typeof(YomotsuWarrior), typeof(RevenantLion), typeof(Oni),
-                typeof(Gaman), typeof(Crane), typeof(Beetle)
+                typeof(Gaman), typeof(Crane), typeof(Beetle),
+                typeof(ColdDrake), typeof(Vasanord), typeof(Ballem),
+                typeof(Betballem), typeof(Anlorlem), typeof(BloodWorm),
+                typeof(GreenGoblin), typeof(EnslavedGreenGoblin), typeof(GreenGoblinAlchemist),
+                typeof(GreenGoblinScout), typeof(Kepetch), typeof(ClanRC),
+                typeof(EnslavedGoblinKeeper), typeof(EnslavedGoblinMage), typeof(EnslavedGoblinScout),
+                typeof(EnslavedGrayGoblin), typeof(GrayGoblin), typeof(GrayGoblinKeeper),
+                typeof(GrayGoblinMage), typeof(Gremlin), typeof(SkeletalDrake),
+                typeof(Slith), typeof(StoneSlith), typeof(ToxicSlith),
+                typeof(WyvernRenowned), typeof(GrayGoblinMageRenowned), typeof(FireDaemon),
+                typeof(AcidSlug)
             })
         };
     }