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

- extensive framework for dueling, tournaments, and events

Browse source 
- IP address command implementor
- miscellaneous minor fixes
This commit is contained in:
mark 2012-04-22 05:37:16 +00:00
parent c52504151b
commit 599b2af6d5
82 changed files with 11920 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Scripts/Items/Skill Items/Lumberjack/Log.cs
View file

@ -17,6 +17,7 @@ namespace Server.Items
int ICommodity.DescriptionNumber { get { return CraftResources.IsStandard( m_Resource ) ? LabelNumber : 1075062 + ( (int)m_Resource - (int)CraftResource.RegularWood ); } }
bool ICommodity.IsDeedable { get { return true; } }
[Constructable]
public Log() : this( 1 )
{

1
Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs
View file

@ -222,7 +222,6 @@ namespace Server.Items
BasePotion pot = (BasePotion)item;
int toHold = Math.Min( 100 - m_Held, pot.Amount );
if ( toHold <= 0 )
{
from.SendLocalizedMessage( 502233 ); // The keg will not hold any more!

3
Scripts/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs
View file

@ -50,7 +50,8 @@ namespace Server.Items
{
BasePotion.PlayDrinkEffect( from );
this.Consume();
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
}
}
}

5
Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -173,7 +173,10 @@ namespace Server.Items
m.PlaySound( 0x2D6 );
m.AddToBackpack( new Bottle() );
#region Dueling
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( m ) )
m.AddToBackpack( new Bottle() );
#endregion
if ( m.Body.IsHuman && !m.Mounted )
m.Animate( 34, 5, 1, true, false, 0 );

3
Scripts/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs
View file

@ -97,7 +97,8 @@ namespace Server.Items
from.FixedParticles( 0x373A, 10, 15, 5012, EffectLayer.Waist );
from.PlaySound( 0x1E0 );
this.Consume();
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
}
else
{

3
Scripts/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs
View file

@ -56,7 +56,8 @@ namespace Server.Items
BasePotion.PlayDrinkEffect( from );
this.Consume();
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
Timer.DelayCall( TimeSpan.FromSeconds( Delay ), new TimerStateCallback( ReleaseHealLock ), from );
}

3
Scripts/Items/Skill Items/Magical/Potions/NightSight.cs
View file

@ -40,7 +40,8 @@ namespace Server.Items
BasePotion.PlayDrinkEffect( from );
this.Consume();
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
}
else
{

3
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs
View file

@ -43,7 +43,8 @@ namespace Server.Items
BasePotion.PlayDrinkEffect( from );
this.Consume();
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
}
}
}

3
Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs
View file

@ -37,7 +37,8 @@ namespace Server.Items
BasePotion.PlayDrinkEffect( from );
this.Consume();
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
}
else
{

3
Scripts/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs
View file

@ -50,7 +50,8 @@ namespace Server.Items
{
BasePotion.PlayDrinkEffect( from );
this.Consume();
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
}
}
}

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

@ -94,7 +94,8 @@ namespace Server.Items
{
if ( BandageContext.BeginHeal( from, (Mobile)targeted ) != null )
{
m_Bandage.Consume();
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
m_Bandage.Consume();
}
}
else
@ -509,7 +510,6 @@ namespace Server.Items
if ( !onSelf )
patient.SendLocalizedMessage( 1008078, false, healer.Name ); // : Attempting to heal you.
healer.SendLocalizedMessage( 500956 ); // You begin applying the bandages.
return context;
}