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

8
Scripts/Skills/Peacemaking.cs
View file

@ -54,6 +54,14 @@ namespace Server.SkillHandlers
{
from.SendLocalizedMessage( 1049528 ); // You cannot calm that!
}
else if ( from.Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) )
{
from.SendMessage( "You may not peacemake here." );
}
else if ( ((Mobile)targeted).Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) )
{
from.SendMessage( "You may not peacemake there." );
}
else if ( !m_Instrument.IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1062488 ); // The instrument you are trying to play is no longer in your backpack!

7
Scripts/Skills/Poisoning.cs
View file

@ -81,8 +81,11 @@ namespace Server.SkillHandlers
from.PlaySound( 0x4F );
m_Potion.Consume();
from.AddToBackpack( new Bottle() );
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
{
m_Potion.Consume();
from.AddToBackpack( new Bottle() );
}
}
else // Target can't be poisoned
{