diff --git a/Data/Regions.xml b/Data/Regions.xml
index 7ed114b6b..8d5366828 100644
--- a/Data/Regions.xml
+++ b/Data/Regions.xml
@@ -19,6 +19,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -714,8 +747,6 @@
-
-
@@ -727,6 +758,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -885,11 +961,20 @@
+
+
+
+
+
+
+
+
+
+ -->
+
@@ -1650,6 +1735,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -1987,6 +2083,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2006,7 +2116,7 @@
-
+
diff --git a/Scripts/Engines/Craft/Core/Repair.cs b/Scripts/Engines/Craft/Core/Repair.cs
index 03f4522d9..bec85013c 100644
--- a/Scripts/Engines/Craft/Core/Repair.cs
+++ b/Scripts/Engines/Craft/Core/Repair.cs
@@ -336,7 +336,7 @@ namespace Server.Engines.Craft
toDelete = true;
}
}
- else if ( targeted is BaseClothing )
+ else if ( (targeted is BaseClothing) )
{
BaseClothing clothing = (BaseClothing)targeted;
SkillName skill = m_CraftSystem.MainSkill;
@@ -358,7 +358,7 @@ namespace Server.Engines.Craft
toWeaken = 3;
}
- if ( m_CraftSystem.CraftItems.SearchForSubclass( clothing.GetType() ) == null && !IsSpecialClothing( clothing ))
+ if (m_CraftSystem.CraftItems.SearchForSubclass(clothing.GetType()) == null && !IsSpecialClothing(clothing) && !((targeted is TribalMask) || (targeted is HornedTribalMask) || targeted.GetType().IsSubclassOf(typeof(HornedTribalMask)) || targeted.GetType().IsSubclassOf(typeof(TribalMask))))
{
number = (usingDeed) ? 1061136 : 1044277; // That item cannot be repaired. // You cannot repair that item with this type of repair contract.
}
diff --git a/Scripts/Engines/Craft/DefTailoring.cs b/Scripts/Engines/Craft/DefTailoring.cs
index 122679734..8034cb8fc 100644
--- a/Scripts/Engines/Craft/DefTailoring.cs
+++ b/Scripts/Engines/Craft/DefTailoring.cs
@@ -247,7 +247,7 @@ namespace Server.Engines.Craft
AddCraft( typeof( LeatherGorget ), 1015293, 1025063, 53.9, 78.9, typeof( Leather ), 1044462, 4, 1044463 );
AddCraft( typeof( LeatherCap ), 1015293, 1027609, 6.2, 31.2, typeof( Leather ), 1044462, 2, 1044463 );
AddCraft( typeof( LeatherGloves ), 1015293, 1025062, 51.8, 76.8, typeof( Leather ), 1044462, 3, 1044463 );
- AddCraft( typeof( LeatherArms ), 1015293, 1025061, 53.9, 78.9, typeof( Leather ), 1044462, 8, 1044463 );
+ AddCraft( typeof( LeatherArms ), 1015293, 1025061, 53.9, 78.9, typeof( Leather ), 1044462, 4, 1044463 );
AddCraft( typeof( LeatherLegs ), 1015293, 1025067, 66.3, 91.3, typeof( Leather ), 1044462, 10, 1044463 );
AddCraft( typeof( LeatherChest ), 1015293, 1025068, 70.5, 95.5, typeof( Leather ), 1044462, 12, 1044463 );
@@ -269,7 +269,7 @@ namespace Server.Engines.Craft
SetNeededExpansion( index, Expansion.SE );
index = AddCraft( typeof( LeatherNinjaJacket ), 1015293, 1030206, 85.0, 110.0, typeof( Leather ), 1044462, 13, 1044463 );
SetNeededExpansion( index, Expansion.SE );
- index = AddCraft( typeof( LeatherNinjaBelt ), 1015293, 1030203, 50.0, 75.0, typeof( Leather ), 1044462, 15, 1044463 );
+ index = AddCraft( typeof( LeatherNinjaBelt ), 1015293, 1030203, 50.0, 75.0, typeof( Leather ), 1044462, 5, 1044463 );
SetNeededExpansion( index, Expansion.SE );
index = AddCraft( typeof( LeatherNinjaMitts ), 1015293, 1030205, 65.0, 90.0, typeof( Leather ), 1044462, 12, 1044463 );
SetNeededExpansion( index, Expansion.SE );
diff --git a/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs b/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs
index a6f3df884..c3a5ad588 100644
--- a/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs
+++ b/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs
@@ -136,7 +136,7 @@ namespace Server.Items
}
- public class Stormgrip : LeatherGloves
+ public class Stormgrip : LeatherNinjaMitts
{
public override int InitMinHits { get { return 255; } }
public override int InitMaxHits { get { return 255; } }
diff --git a/Scripts/Items/Armor/Leather/LeatherNinjaMitts.cs b/Scripts/Items/Armor/Leather/LeatherNinjaMitts.cs
index eb3ae3795..d44d61ec7 100644
--- a/Scripts/Items/Armor/Leather/LeatherNinjaMitts.cs
+++ b/Scripts/Items/Armor/Leather/LeatherNinjaMitts.cs
@@ -37,13 +37,30 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
- writer.Write( (int) 0 );
+ writer.Write( (int) 2 );
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
+
+ switch ( version )
+ {
+ case 1:
+ {
+ if ( reader.ReadBool() )
+ {
+ reader.ReadInt();
+ reader.ReadInt();
+ }
+
+ Weight = 2.0;
+ ItemID = 0x2792;
+
+ break;
+ }
+ }
}
}
}
\ No newline at end of file
diff --git a/Scripts/Items/Deeds/HolidayTreeDeed.cs b/Scripts/Items/Deeds/HolidayTreeDeed.cs
index 2b9522f87..4606da02c 100644
--- a/Scripts/Items/Deeds/HolidayTreeDeed.cs
+++ b/Scripts/Items/Deeds/HolidayTreeDeed.cs
@@ -108,7 +108,8 @@ namespace Server.Items
this.Delete();
HolidayTree tree = new HolidayTree( from, type, loc );
BaseHouse house = BaseHouse.FindHouseAt( tree );
- house.Addons.Add( tree );
+ if ( house != null )
+ house.Addons.Add( tree );
}
public override void OnDoubleClick( Mobile from )
diff --git a/Scripts/Mobiles/Animals/Mounts/Ethereals.cs b/Scripts/Mobiles/Animals/Mounts/Ethereals.cs
index ff9371456..190b0cf4c 100644
--- a/Scripts/Mobiles/Animals/Mounts/Ethereals.cs
+++ b/Scripts/Mobiles/Animals/Mounts/Ethereals.cs
@@ -371,7 +371,7 @@ namespace Server.Mobiles
{
get
{
- return TimeSpan.FromSeconds( ((m_Mount.IsDonationItem && RewardSystem.GetRewardLevel( m_Rider ) < 3)? 12.5 : 5.0) );
+ return TimeSpan.FromSeconds( ((m_Mount.IsDonationItem && RewardSystem.GetRewardLevel( m_Rider ) < 3)? ( 7.5 + ( Core.AOS ? 2.0 : 3.0)) : ( Core.AOS ? 2.0 : 3.0)) );
}
}
diff --git a/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs b/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs
index edc271f21..a7f4fb26d 100644
--- a/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs
+++ b/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs
@@ -74,7 +74,7 @@ namespace Server.Mobiles
SetSkill( SkillName.Wrestling, 100.1, 120.0 );
Fame = 10000;
- Karma = 10000;
+ Karma = -10000;
Tamable = true;
ControlSlots = 3;
diff --git a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs
index 37e8194cb..c31b2f93c 100644
--- a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs
+++ b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs
@@ -9,7 +9,7 @@ namespace Server.Mobiles
public class DeathwatchBeetleHatchling : BaseCreature
{
[Constructable]
- public DeathwatchBeetleHatchling() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 )
+ public DeathwatchBeetleHatchling() : base( AIType.AI_Melee, Core.ML ? FightMode.Aggressor : FightMode.Closest, 10, 1, 0.2, 0.4 )
{
Name = "a deathwatch beetle hatchling";
Body = 242;
@@ -92,7 +92,7 @@ namespace Server.Mobiles
public DeathwatchBeetleHatchling( Serial serial ) : base( serial )
{
}
-
+ public override int Hides{ get{ return 8; } }
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
diff --git a/Scripts/Spells/Necromancy/AnimateDeadSpell.cs b/Scripts/Spells/Necromancy/AnimateDeadSpell.cs
index 33ce9e5cb..b9b610220 100644
--- a/Scripts/Spells/Necromancy/AnimateDeadSpell.cs
+++ b/Scripts/Spells/Necromancy/AnimateDeadSpell.cs
@@ -125,7 +125,7 @@ namespace Server.Spells.Necromancy
// Dragons
new CreatureGroup( new Type[]
{
- typeof( AncientWyrm ), typeof( Dragon ), typeof( SerpentineDragon ),
+ typeof( AncientWyrm ), typeof( Dragon ), typeof( GreaterDragon ), typeof( SerpentineDragon ),
typeof( ShadowWyrm ), typeof( SkeletalDragon ), typeof( WhiteWyrm ),
typeof( Drake ), typeof( Wyvern ), typeof( LesserHiryu ), typeof( Hiryu )
}, new SummonEntry[]
diff --git a/Scripts/Spells/Sixth/Invisibility.cs b/Scripts/Spells/Sixth/Invisibility.cs
index 1f50dea6a..af2c48e06 100644
--- a/Scripts/Spells/Sixth/Invisibility.cs
+++ b/Scripts/Spells/Sixth/Invisibility.cs
@@ -45,6 +45,7 @@ namespace Server.Spells.Sixth
m.PlaySound( 0x3C4 );
m.Hidden = true;
+ m.Warmode = false;
RemoveTimer( m );