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

just misc merge cleanups

Browse source
This commit is contained in:
mark@runuo.com 2013-09-04 23:07:39 +00:00
parent 030ad1db5b
commit 2a9b547f7b
13 changed files with 73 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Scripts/Mobiles/BaseCreature.cs
View file

@ -3349,6 +3349,15 @@ namespace Server.Mobiles
{
if ( m is BaseCreature && !((BaseCreature)m).Controlled )
return ( !Alive || !m.Alive || IsDeadBondedPet || m.IsDeadBondedPet ) || ( Hidden && AccessLevel > AccessLevel.Player );
#region Dueling
if ( Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) && m is PlayerMobile )
{
PlayerMobile pm = (PlayerMobile) m;
if ( pm.DuelContext == null || pm.DuelPlayer == null || !pm.DuelContext.Started || pm.DuelContext.Finished || pm.DuelPlayer.Eliminated )
return true;
}
#endregion
return base.OnMoveOver( m );
}

3
Scripts/Mobiles/Special/BaseChampion.cs
View file

@ -9,6 +9,9 @@ namespace Server.Mobiles
{
public abstract class BaseChampion : BaseCreature
{
public override bool CanMoveOverObstacles { get { return true; } }
public override bool CanDestroyObstacles { get { return true; } }
public BaseChampion( AIType aiType ) : this( aiType, FightMode.Closest )
{
}

3
Scripts/Mobiles/Special/Paragon.cs
View file

@ -127,12 +127,11 @@ namespace Server.Mobiles
public static void UnConvert( BaseCreature bc )
{
if( !bc.IsParagon )
if( !bc.IsParagon )
return;
bc.Hue = 0;
if ( bc.HitsMaxSeed >= 0 )
if( bc.HitsMaxSeed >= 0 )
bc.HitsMaxSeed = (int)( bc.HitsMaxSeed / HitsBuff );
bc.RawStr = (int)( bc.RawStr / StrBuff );

19
Scripts/Mobiles/Vendors/GenericBuy.cs
View file

@ -307,10 +307,23 @@ namespace Server.Mobiles
{
if ( m_Amount <= 0 )
{
m_MaxAmount *= 2;
/*
Core.ML using this vendor system is undefined behavior, so being
as it lends itself to an abusable exploit to cause ingame havok
and the stackable items are not found to be over 20 items, this is
changed until there is a better solution.
*/
if ( m_MaxAmount >= 999 )
m_MaxAmount = 999;
object Obj_Disp = GetDisplayEntity();
if( Core.ML && Obj_Disp is Item && !( Obj_Disp as Item ).Stackable )
{
m_MaxAmount = Math.Min( 20, m_MaxAmount );
}
else
{
m_MaxAmount = Math.Min( 999, m_MaxAmount * 2 );
}
}
else
{