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

Fixes casting checks

Browse source
This commit is contained in:
Kamron Batman 2018-08-19 01:38:55 +08:00
parent 7ea00fbf4f
commit 03dd5f1926
431 changed files with 5616 additions and 6250 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Scripts/Gumps/Guilds/New Guild System/War Declaration gump.cs
View file

@ -39,10 +39,10 @@ namespace Server.Guilds
public override void OnResponse( NetState sender, RelayInfo info )
{
PlayerMobile pm = sender.Mobile as PlayerMobile;
if( !IsMember( pm, guild ) )
if ( !IsMember( pm, guild ) )
return;
RankDefinition playerRank = pm.GuildRank;
@ -52,18 +52,18 @@ namespace Server.Guilds
case 1:
{
AllianceInfo alliance = guild.Alliance;
AllianceInfo otherAlliance = m_Other.Alliance;
AllianceInfo otherAlliance = m_Other.Alliance;
if( !playerRank.GetFlag( RankFlags.ControlWarStatus ) )
if ( !playerRank.GetFlag( RankFlags.ControlWarStatus ) )
{
pm.SendLocalizedMessage( 1063440 ); // You don't have permission to negotiate wars.
}
else if( alliance != null && alliance.Leader != guild )
else if ( alliance != null && alliance.Leader != guild )
{
pm.SendLocalizedMessage( 1063239, String.Format( "{0}\t{1}", guild.Name, alliance.Name ) ); // ~1_val~ is not the leader of the ~2_val~ alliance.
pm.SendLocalizedMessage( 1070707, alliance.Leader.Name ); // You need to negotiate via ~1_val~ instead.
}
else if( otherAlliance != null && otherAlliance.Leader != m_Other )
else if ( otherAlliance != null && otherAlliance.Leader != m_Other )
{
pm.SendLocalizedMessage( 1063239, String.Format( "{0}\t{1}", m_Other.Name, otherAlliance.Name ) ); // ~1_val~ is not the leader of the ~2_val~ alliance.
pm.SendLocalizedMessage( 1070707, otherAlliance.Leader.Name ); // You need to negotiate via ~1_val~ instead.
@ -72,7 +72,7 @@ namespace Server.Guilds
{
WarDeclaration activeWar = guild.FindActiveWar( m_Other );
if( activeWar == null )
if ( activeWar == null )
{
WarDeclaration war = guild.FindPendingWar( m_Other );
WarDeclaration otherWar = m_Other.FindPendingWar( guild );
@ -84,7 +84,7 @@ namespace Server.Guilds
int maxKills = (tKills == null)? 0 : Math.Max( Math.Min( Utility.ToInt32( info.GetTextEntry( 11 ).Text ), 0xFFFF ), 0 );
TimeSpan warLength = TimeSpan.FromHours( (tWarLength == null) ? 0 : Math.Max( Math.Min( Utility.ToInt32( info.GetTextEntry( 10 ).Text ), 0xFFFF ), 0 ) );
if( war != null )
if ( war != null )
{
war.MaxKills = maxKills;
war.WarLength = warLength;
@ -95,7 +95,7 @@ namespace Server.Guilds
guild.PendingWars.Add( new WarDeclaration( guild, m_Other, maxKills, warLength, true ) );
}
if( otherWar != null )
if ( otherWar != null )
{
otherWar.MaxKills = maxKills;
otherWar.WarLength = warLength;
@ -106,7 +106,7 @@ namespace Server.Guilds
m_Other.PendingWars.Add( new WarDeclaration( m_Other, guild, maxKills, warLength, false ) );
}
if( war != null )
if ( war != null )
{
pm.SendLocalizedMessage( 1070752 ); // The proposal has been updated.
//m_Other.GuildMessage( 1070782 ); // ~1_val~ has responded to your proposal.
@ -127,4 +127,4 @@ namespace Server.Guilds
}
}
}
}
}