branch sync #2

This commit is contained in:
mark 2009-01-31 00:02:21 +00:00
parent 96a37544fd
commit 4e6256b8cd
39 changed files with 415 additions and 137 deletions

View file

@ -200,10 +200,15 @@ namespace Server.Multis
if ( Deleted )
return;
if ( Core.ML )
new TempNoHousingRegion( this );
KillVendors();
Delete();
}
public virtual TimeSpan RestrictedPlacingTime { get { return TimeSpan.FromHours( 1.0 ); } }
[CommandProperty( AccessLevel.GameMaster )]
public virtual double BonusStorageScalar { get { return (Core.ML ? 1.2 : 1.0); } }
@ -3384,6 +3389,8 @@ namespace Server.Multis
}
}
#region Targets
public class LockdownTarget : Target
{
private bool m_Release;
@ -3648,6 +3655,8 @@ namespace Server.Multis
}
}
#endregion
public class SetSecureLevelEntry : ContextMenuEntry
{
private Item m_Item;
@ -3713,4 +3722,20 @@ namespace Server.Multis
Owner.From.SendGump( new SetSecureLevelGump( Owner.From, sec, BaseHouse.FindHouseAt( m_Item ) ) );
}
}
public class TempNoHousingRegion : BaseRegion
{
public TempNoHousingRegion( BaseHouse house )
: base( null, house.Map, Region.DefaultPriority, house.Region.Area )
{
Register();
Timer.DelayCall( house.RestrictedPlacingTime, Unregister );
}
public override bool AllowHousing( Mobile from, Point3D p )
{
return false;
}
}
}