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

Healing

Browse source 
Cross-healing times were not properly calculated.
        http://www.uodemise.com/forum/showthread.php?t=120698

Housing

        Secured containers should count against lockdowns
        http://www.uodemise.com/forum/showthread.php?t=140087
This commit is contained in:
xavier 2010-03-20 12:57:07 +00:00
parent 1d74d05af4
commit f20b1af778
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Scripts/Items/Skill Items/Misc/Bandage.cs
View file

@ -472,10 +472,18 @@ namespace Server.Items
{ {
if ( Core.AOS && GetPrimarySkill( patient ) == SkillName.Veterinary ) if ( Core.AOS && GetPrimarySkill( patient ) == SkillName.Veterinary )
{ {
//if ( dex >= 40 )
seconds = 2.0; seconds = 2.0;
//else }
// seconds = 3.0; else if ( Core.AOS )
{
if (dex < 204)
{
seconds = 3.2-(Math.Sin((double)dex/130)*2.5) + resDelay;
}
else
{
seconds = 0.7 + resDelay;
}
} }
else else
{ {
@ -492,14 +500,16 @@ namespace Server.Items
if ( context != null ) if ( context != null )
context.StopHeal(); context.StopHeal();
seconds *= 1000;
context = new BandageContext( healer, patient, TimeSpan.FromSeconds( seconds ) );
context = new BandageContext( healer, patient, TimeSpan.FromMilliseconds( seconds ) );
m_Table[healer] = context; m_Table[healer] = context;
if ( !onSelf ) if ( !onSelf )
patient.SendLocalizedMessage( 1008078, false, healer.Name ); // : Attempting to heal you. patient.SendLocalizedMessage( 1008078, false, healer.Name ); // : Attempting to heal you.
healer.SendLocalizedMessage( 500956 ); // You begin applying the bandages. healer.SendLocalizedMessage( 500956 ); // You begin applying the bandages.
return context; return context;
} }

12
Scripts/Multis/BaseHouse.cs
View file

@ -291,12 +291,18 @@ namespace Server.Multis
ArrayList list = m_Secures; ArrayList list = m_Secures;
for ( int i = 0; list != null && i < list.Count; ++i ) if ( list != null )
{ {
SecureInfo si = (SecureInfo)list[i]; for ( int i = 0; i < list.Count; ++i )
{
SecureInfo si = (SecureInfo)list[i];
fromSecures += si.Item.TotalItems; fromSecures += si.Item.TotalItems;
}
fromLockdowns += list.Count;
} }
if ( m_LockDowns != null ) if ( m_LockDowns != null )
fromLockdowns += m_LockDowns.Count; fromLockdowns += m_LockDowns.Count;