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

misc merge/tidy from Zenvera

Browse source
This commit is contained in:
Mark Sturgill 2013-10-24 14:23:03 -07:00
parent 5b03ef628e
commit 2d60d61a6b
8 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -494,6 +494,9 @@ namespace Server.Engines.ConPVP
pl.Eliminated = true;
if ( mob.Poison != null )
mob.Poison = null;
Requip( mob, corpse );
DelayBounce( TimeSpan.FromSeconds( 4.0 ), mob, corpse );

2
Scripts/Items/Addons/SHTeleporter.cs
View file

@ -31,7 +31,7 @@ namespace Server.Items
set { m_TeleOffset = value; }
}
[CommandProperty( AccessLevel.Counselor )]
[CommandProperty(AccessLevel.GameMaster)]
public Point3D TelePoint
{
get { return new Point3D( Location.X + TeleOffset.X, Location.Y + TeleOffset.Y, Location.Z + TeleOffset.Z ); }

7
Scripts/Items/Special/Broken Furniture Collection/BrokenFallenChair.cs
View file

@ -2,7 +2,7 @@ using System;
namespace Server.Items
{
[Flipable( 0xC19, 0xC1a )]
[Flipable( 0xC19, 0xC1A )]
public class BrokenFallenChairComponent : AddonComponent
{
public override int LabelNumber { get { return 1076264; } } // Broken Fallen Chair
@ -19,7 +19,7 @@ namespace Server.Items
{
base.Serialize( writer );
writer.WriteEncodedInt( 0 ); // version
writer.WriteEncodedInt( 1 ); // version
}
public override void Deserialize( GenericReader reader )
@ -27,6 +27,9 @@ namespace Server.Items
base.Deserialize( reader );
int version = reader.ReadEncodedInt();
if (version < 1 && ItemID == 0xC17)
ItemID = 0xC19;
}
}

2
Scripts/Items/Weapons/Axes/BaseAxe.cs
View file

@ -154,7 +154,7 @@ namespace Server.Items
{
base.OnHit( attacker, defender, damageBonus );
if ( !Core.AOS && (attacker.Player || attacker.Body.IsHuman) && Layer == Layer.TwoHanded && (attacker.Skills[SkillName.Anatomy].Value / 400.0) >= Utility.RandomDouble() && Engines.ConPVP.DuelContext.AllowSpecialAbility( attacker, "Concussion Blow", false ) )
if (!Core.AOS && (attacker.Player || attacker.Body.IsHuman) && Layer == Layer.TwoHanded && attacker.Skills[SkillName.Anatomy].Value >= 80 && (attacker.Skills[SkillName.Anatomy].Value / 400.0) >= Utility.RandomDouble() && Engines.ConPVP.DuelContext.AllowSpecialAbility(attacker, "Concussion Blow", false))
{
StatMod mod = defender.GetStatMod( "Concussion" );

2
Scripts/Items/Weapons/BaseWeapon.cs
View file

@ -1638,7 +1638,7 @@ namespace Server.Items
attacker.PlaySound( 0x44D );
}
if ( m_MaxHits > 0 && ((MaxRange <= 1 && (defender is Slime || defender is AcidElemental)) || Utility.Random( 25 ) == 0) ) // Stratics says 50% chance, seems more like 4%..
if ( m_MaxHits > 0 && ((MaxRange <= 1 && (defender is Slime || defender is AcidElemental)) || Utility.RandomDouble() < .04) ) // Stratics says 50% chance, seems more like 4%..
{
if ( MaxRange <= 1 && (defender is Slime || defender is AcidElemental) )
attacker.LocalOverheadMessage( MessageType.Regular, 0x3B2, 500263 ); // *Acid blood scars your weapon!*

2
Scripts/Items/Weapons/Maces/BaseBashing.cs
View file

@ -46,7 +46,7 @@ namespace Server.Items
{
double damage = base.GetBaseDamage( attacker );
if ( !Core.AOS && (attacker.Player || attacker.Body.IsHuman) && Layer == Layer.TwoHanded && (attacker.Skills[SkillName.Anatomy].Value / 400.0) >= Utility.RandomDouble() && Engines.ConPVP.DuelContext.AllowSpecialAbility( attacker, "Crushing Blow", false ) )
if (!Core.AOS && (attacker.Player || attacker.Body.IsHuman) && Layer == Layer.TwoHanded && attacker.Skills[SkillName.Anatomy].Value >= 80 && (attacker.Skills[SkillName.Anatomy].Value / 400.0) >= Utility.RandomDouble() && Engines.ConPVP.DuelContext.AllowSpecialAbility(attacker, "Crushing Blow", false))
{
damage *= 1.5;

2
Scripts/Items/Weapons/PoleArms/BasePoleArm.cs
View file

@ -107,7 +107,7 @@ namespace Server.Items
{
base.OnHit( attacker, defender, damageBonus );
if ( !Core.AOS && (attacker.Player || attacker.Body.IsHuman) && Layer == Layer.TwoHanded && (attacker.Skills[SkillName.Anatomy].Value / 400.0) >= Utility.RandomDouble() && Engines.ConPVP.DuelContext.AllowSpecialAbility( attacker, "Concussion Blow", false ) )
if (!Core.AOS && (attacker.Player || attacker.Body.IsHuman) && Layer == Layer.TwoHanded && attacker.Skills[SkillName.Anatomy].Value >= 80 && (attacker.Skills[SkillName.Anatomy].Value / 400.0) >= Utility.RandomDouble() && Engines.ConPVP.DuelContext.AllowSpecialAbility(attacker, "Concussion Blow", false))
{
StatMod mod = defender.GetStatMod( "Concussion" );

11
Scripts/Misc/Email.cs
View file

@ -23,6 +23,7 @@ namespace Server.Misc
*/
public static readonly string EmailServer = null;
public static readonly int EmailPort = 25;
public static readonly string FromAddress = null;
public static readonly string CrashAddresses = null;
@ -43,13 +44,21 @@ namespace Server.Misc
public static void Configure()
{
if ( EmailServer != null )
_Client = new SmtpClient( EmailServer );
_Client = new SmtpClient( EmailServer, EmailPort );
}
public static bool Send( MailMessage message )
{
try
{
// .NET relies on the MTA to generate Message-ID header. Not all MTAs will add this header.
DateTime now = DateTime.UtcNow;
string messageID = String.Format("<{0}.{1}@{2}>", now.ToString("yyyyMMdd"), now.ToString("HHmmssff"), EmailServer );
message.Headers.Add("Message-ID", messageID );
message.Headers.Add("X-Mailer", "RunUO");
lock ( _Client ) {
_Client.Send( message );
}