warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

branch sync

Browse source
This commit is contained in:
mark 2012-11-13 06:38:29 +00:00
parent 24490dff69
commit e32d3368af
4 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scripts/Mobiles/Animals/Mounts/Nightmare.cs
View file

@ -16,7 +16,7 @@ namespace Server.Mobiles
[Constructable]
public Nightmare( string name ) : base( name, 0x74, 0x3EA7, AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 )
{
BaseSoundID = 0xA8;
BaseSoundID = Core.AOS ? 0xA8 : 0x16A;
SetStr( 496, 525 );
SetDex( 86, 105 );
@ -116,8 +116,10 @@ namespace Server.Mobiles
int version = reader.ReadInt();
if ( BaseSoundID == 0x16A )
if ( Core.AOS && BaseSoundID == 0x16A )
BaseSoundID = 0xA8;
else if ( !Core.AOS && BaseSoundID == 0xA8 )
BaseSoundID = 0x16A;
}
}
}

25
Scripts/Mobiles/PlayerMobile.cs
View file

@ -515,18 +515,21 @@ namespace Server.Mobiles
if ( !base.OnDroppedItemToWorld( item, location ) )
return false;
IPooledEnumerable mobiles = Map.GetMobilesInRange( location, 0 );
foreach ( Mobile m in mobiles )
if ( Core.AOS )
{
if ( m.Z >= location.Z && m.Z < location.Z + 16 )
{
mobiles.Free();
return false;
}
}
IPooledEnumerable mobiles = Map.GetMobilesInRange( location, 0 );
mobiles.Free();
foreach ( Mobile m in mobiles )
{
if ( m.Z >= location.Z && m.Z < location.Z + 16 )
{
mobiles.Free();
return false;
}
}
mobiles.Free();
}
BounceInfo bi = item.GetBounce();
@ -2171,7 +2174,7 @@ namespace Server.Mobiles
DropHolding();
if (Backpack != null && !Backpack.Deleted)
if (Core.AOS && Backpack != null && !Backpack.Deleted)
{
List<Item> ilist = Backpack.FindItemsByType<Item>(FindItems_Callback);