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

branch sync

Browse source
This commit is contained in:
mark 2012-11-11 00:04:51 +00:00
parent e10ca1fe1e
commit 24490dff69
5 changed files with 87 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Scripts/Engines/ConPVP/DuelContext.cs
View file

@ -128,6 +128,9 @@ namespace Server.Engines.ConPVP
if ( CantDoAnything( from ) )
return false;
if ( spell is Server.Spells.Fourth.RecallSpell )
from.SendMessage( "You may not cast this spell." );
string title = null, option = null;
if( spell is ArcanistSpell )
@ -273,6 +276,9 @@ namespace Server.Engines.ConPVP
if ( weapon.PoisonCharges > 0 && weapon.Poison != null && !m_Ruleset.GetOption( "Weapons", "Poisoned" ) )
return false;
if ( weapon is BaseWand && !m_Ruleset.GetOption( "Items", "Wands" ) )
return false;
}
return true;
@ -313,10 +319,10 @@ namespace Server.Engines.ConPVP
if ( pl == null || pl.Eliminated )
return true;
if ( item is EtherealMount )
if ( !(item is BaseRefreshPotion) )
{
from.SendMessage( "You may not mount an ethereal while dueling." );
return false;
if ( CantDoAnything( from ) )
return false;
}
string title = null, option = null;
@ -365,6 +371,11 @@ namespace Server.Engines.ConPVP
title = "Items";
option = "Orange Petals";
}
else if ( item is EtherealMount || item.Layer == Layer.Mount )
{
title = "Items";
option = "Mounts";
}
else if ( item is LeatherNinjaBelt )
{
title = "Items";
@ -380,6 +391,11 @@ namespace Server.Engines.ConPVP
title = "Items";
option = "Fire Horns";
}
else if ( item is BaseWand )
{
title = "Items";
option = "Wands";
}
if ( title != null && option != null && m_StartedBeginCountdown && !m_Started )
{
@ -397,12 +413,6 @@ namespace Server.Engines.ConPVP
return false;
}
if ( !(item is BaseRefreshPotion) )
{
if ( CantDoAnything( from ) )
return false;
}
if ( title == null || option == null || m_Ruleset.GetOption( title, option ) )
return true;
@ -2372,6 +2382,8 @@ namespace Server.Engines.ConPVP
public TournyMatch m_Match;
public EventGame m_EventGame;
public Tournament Tournament { get { return m_Tournament; } }
public void SendReadyGump( int count )
{
if ( !m_Registered )

7
Scripts/Engines/ConPVP/RulesetLayout.cs
View file

@ -299,8 +299,10 @@ namespace Server.Engines.ConPVP
new string[]
{
"Bandages",
"Wands",
"Trapped Containers",
"Bolas",
"Mounts",
"Orange Petals",
"Shurikens",
"Fukiya Darts",
@ -326,9 +328,12 @@ namespace Server.Engines.ConPVP
new string[]
{
"Bandages",
"Wands",
"Trapped Containers",
"Bolas",
"Orange Petals"
"Mounts",
"Orange Petals",
"Fire Horns"
} ) );
}