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

Browse source
This commit is contained in:
asayre 2006-08-30 03:24:57 +00:00
parent 4386cbac99
commit 71e80d5949
16 changed files with 63 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Scripts/Engines/AI/AI/BaseAI.cs
View file

@ -2642,22 +2642,23 @@ namespace Server.Mobiles
m_Timer.Start(); m_Timer.Start();
} }
private DateTime m_NextDetectHidden;
public virtual bool CanDetectHidden { get { return m_Mobile.Skills[SkillName.DetectHidden].Value > 0; } }
/* /*
* The Timer object * The Timer object
*/ */
private class AITimer : Timer private class AITimer : Timer
{ {
private BaseAI m_Owner; private BaseAI m_Owner;
private DateTime m_NextDetectHidden;
private bool m_bDetectHidden;
public AITimer( BaseAI owner ) public AITimer( BaseAI owner )
: base( TimeSpan.FromSeconds( Utility.RandomDouble() ), TimeSpan.FromSeconds( Math.Max( 0.0, owner.m_Mobile.CurrentSpeed ) ) ) : base( TimeSpan.FromSeconds( Utility.RandomDouble() ), TimeSpan.FromSeconds( Math.Max( 0.0, owner.m_Mobile.CurrentSpeed ) ) )
{ {
m_Owner = owner; m_Owner = owner;
m_bDetectHidden = false; m_Owner.m_NextDetectHidden = DateTime.Now;
m_NextDetectHidden = DateTime.Now;
Priority = TimerPriority.FiftyMS; Priority = TimerPriority.FiftyMS;
} }
@ -2723,7 +2724,7 @@ namespace Server.Mobiles
} }
} }
if( m_bDetectHidden && DateTime.Now > m_NextDetectHidden ) if( m_Owner.CanDetectHidden && DateTime.Now > m_Owner.m_NextDetectHidden )
{ {
m_Owner.DetectHidden(); m_Owner.DetectHidden();
@ -2736,11 +2737,7 @@ namespace Server.Mobiles
int min = delay * (9 / 10); // 13s at 1000 int, 33s at 400 int, 54s at <250 int int min = delay * (9 / 10); // 13s at 1000 int, 33s at 400 int, 54s at <250 int
int max = delay * (10 / 9); // 16s at 1000 int, 41s at 400 int, 66s at <250 int int max = delay * (10 / 9); // 16s at 1000 int, 41s at 400 int, 66s at <250 int
m_NextDetectHidden = DateTime.Now + TimeSpan.FromSeconds( Utility.RandomMinMax( min, max ) ); m_Owner.m_NextDetectHidden = DateTime.Now + TimeSpan.FromSeconds( Utility.RandomMinMax( min, max ) );
}
else
{
m_bDetectHidden = m_Owner.m_Mobile.Skills[SkillName.DetectHidden].Value > 0;
} }
} }
} }

14
Scripts/Engines/AI/Creature/BaseCreature.cs
View file

@ -800,7 +800,12 @@ namespace Server.Mobiles
return ( GetControlChance( m ) > 0.0 ); return ( GetControlChance( m ) > 0.0 );
} }
public virtual double GetControlChance( Mobile m ) public double GetControlChance( Mobile m )
{
return GetControlChance( m, false );
}
public virtual double GetControlChance( Mobile m, bool useBaseSkill )
{ {
if ( m_dMinTameSkill <= 29.1 || m_bSummoned || m.AccessLevel >= AccessLevel.GameMaster ) if ( m_dMinTameSkill <= 29.1 || m_bSummoned || m.AccessLevel >= AccessLevel.GameMaster )
return 1.0; return 1.0;
@ -810,8 +815,9 @@ namespace Server.Mobiles
if ( dMinTameSkill > -24.9 && Server.SkillHandlers.AnimalTaming.CheckMastery( m, this ) ) if ( dMinTameSkill > -24.9 && Server.SkillHandlers.AnimalTaming.CheckMastery( m, this ) )
dMinTameSkill = -24.9; dMinTameSkill = -24.9;
int taming = (int)(m.Skills[SkillName.AnimalTaming].Value * 10); int taming = (int)((useBaseSkill ? m.Skills[SkillName.AnimalTaming].Base : m.Skills[SkillName.AnimalTaming].Value ) * 10);
int lore = (int)(m.Skills[SkillName.AnimalLore].Value * 10); int lore = (int)((useBaseSkill ? m.Skills[SkillName.AnimalLore].Base : m.Skills[SkillName.AnimalLore].Value )* 10);
int difficulty = (int)(dMinTameSkill * 10); int difficulty = (int)(dMinTameSkill * 10);
int weighted = ((taming * 4) + lore) / 5; int weighted = ((taming * 4) + lore) / 5;
int bonus = weighted - difficulty; int bonus = weighted - difficulty;
@ -1876,7 +1882,7 @@ namespace Server.Mobiles
if ( master != null && master == from ) //So friends can't start the bonding process if ( master != null && master == from ) //So friends can't start the bonding process
{ {
if ( m_dMinTameSkill <= 29.1 || master.Skills[SkillName.AnimalTaming].Value >= m_dMinTameSkill || GetControlChance( master ) >= 1.0 ) if ( m_dMinTameSkill <= 29.1 || master.Skills[SkillName.AnimalTaming].Base >= m_dMinTameSkill || GetControlChance( master, true ) >= 1.0 )
{ {
if ( BondingBegin == DateTime.MinValue ) if ( BondingBegin == DateTime.MinValue )
{ {

4
Scripts/Engines/Craft/Core/Enhance.cs
View file

@ -39,10 +39,8 @@ namespace Server.Engines.Craft
if ( craftItem == null || craftItem.Ressources.Count == 0 ) if ( craftItem == null || craftItem.Ressources.Count == 0 )
return EnhanceResult.BadItem; return EnhanceResult.BadItem;
int quality = 0;
bool allRequiredSkills = false; bool allRequiredSkills = false;
if( craftItem.GetSuccessChance( from, resType, craftSystem, false, ref allRequiredSkills ) <= 0.0 )
if ( !craftItem.CheckSkills( from, resType, craftSystem, ref quality, ref allRequiredSkills, false ) )
return EnhanceResult.NoSkill; return EnhanceResult.NoSkill;
CraftResourceInfo info = CraftResources.GetInfo( resource ); CraftResourceInfo info = CraftResources.GetInfo( resource );

28
Scripts/Items/Misc/FlipableAttribute.cs
View file

@ -22,31 +22,32 @@ namespace Server.Items
private class FlipTarget : Target private class FlipTarget : Target
{ {
public FlipTarget() : base( -1, false, TargetFlags.None ) public FlipTarget()
: base( -1, false, TargetFlags.None )
{ {
} }
protected override void OnTarget( Mobile from, object targeted ) protected override void OnTarget( Mobile from, object targeted )
{ {
if ( targeted is Item ) if( targeted is Item )
{ {
Item item = (Item)targeted; Item item = (Item)targeted;
if ( item.Movable == false && from.AccessLevel == AccessLevel.Player ) if( item.Movable == false && from.AccessLevel == AccessLevel.Player )
return; return;
Type type = targeted.GetType(); Type type = targeted.GetType();
FlipableAttribute [] AttributeArray = (FlipableAttribute []) type.GetCustomAttributes(typeof(FlipableAttribute), false); FlipableAttribute[] AttributeArray = (FlipableAttribute[])type.GetCustomAttributes( typeof( FlipableAttribute ), false );
if( AttributeArray.Length == 0 ) if( AttributeArray.Length == 0 )
{ {
return ; return;
} }
FlipableAttribute fa = AttributeArray[0]; FlipableAttribute fa = AttributeArray[0];
fa.Flip( (Item)targeted); fa.Flip( (Item)targeted );
} }
} }
} }
@ -67,10 +68,11 @@ namespace Server.Items
public int[] ItemIDs public int[] ItemIDs
{ {
get{ return m_ItemIDs; } get { return m_ItemIDs; }
} }
public FlipableAttribute() : this ( null ) public FlipableAttribute()
: this( null )
{ {
} }
@ -81,12 +83,12 @@ namespace Server.Items
public virtual void Flip( Item item ) public virtual void Flip( Item item )
{ {
if ( m_ItemIDs == null ) if( m_ItemIDs == null )
{ {
try try
{ {
MethodInfo flipMethod = item.GetType().GetMethod( "Flip", Type.EmptyTypes ); MethodInfo flipMethod = item.GetType().GetMethod( "Flip", Type.EmptyTypes );
if ( flipMethod != null ) if( flipMethod != null )
flipMethod.Invoke( item, new object[0] ); flipMethod.Invoke( item, new object[0] );
} }
catch catch
@ -97,16 +99,16 @@ namespace Server.Items
else else
{ {
int index = 0; int index = 0;
for ( int i = 0; i < m_ItemIDs.Length; i++ ) for( int i = 0; i < m_ItemIDs.Length; i++ )
{ {
if ( item.ItemID == m_ItemIDs[i] ) if( item.ItemID == m_ItemIDs[i] )
{ {
index = i + 1; index = i + 1;
break; break;
} }
} }
if ( index > m_ItemIDs.Length - 1) if( index > m_ItemIDs.Length - 1 )
index = 0; index = 0;
item.ItemID = m_ItemIDs[index]; item.ItemID = m_ItemIDs[index];

7
Scripts/Items/Resources/MiscMLResources.cs
View file

@ -429,7 +429,7 @@ namespace Server.Items
[Constructable] [Constructable]
public GrizzledBones( int amount ) public GrizzledBones( int amount )
: base( 0x318F ) : base( 0x318C )
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
@ -444,7 +444,7 @@ namespace Server.Items
{ {
base.Serialize( writer ); base.Serialize( writer );
writer.Write( (int)0 ); // version writer.Write( (int)1 ); // version
} }
public override void Deserialize( GenericReader reader ) public override void Deserialize( GenericReader reader )
@ -452,6 +452,9 @@ namespace Server.Items
base.Deserialize( reader ); base.Deserialize( reader );
int version = reader.ReadInt(); int version = reader.ReadInt();
if( version <= 0 && ItemID == 0x318F )
ItemID = 0x318C;
} }
} }

5
Scripts/Items/Skill Items/Fishing/FishingPole.cs
View file

@ -20,6 +20,11 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from ) public override void OnDoubleClick( Mobile from )
{ {
Fishing.System.BeginHarvesting( from, this ); Fishing.System.BeginHarvesting( from, this );
Item item = from.FindItemOnLayer( Layer.OneHanded );
if( item != null )
from.RemoveItem( item );
} }
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list ) public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )

2
Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -262,7 +262,7 @@ namespace Server.Items
val += targ.SkillsTotal / 10; val += targ.SkillsTotal / 10;
if ( val > 700 ) if ( val > 700 )
val = 700 + ((val - 700) * (3 / 11)); val = 700 + (int)((val - 700) * (3.0 / 11));
BaseCreature bc = targ as BaseCreature; BaseCreature bc = targ as BaseCreature;

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

@ -1278,7 +1278,7 @@ namespace Server.Items
set{ m_InDoubleStrike = value; } set{ m_InDoubleStrike = value; }
} }
public virtual void OnHit( Mobile attacker, Mobile defender ) public void OnHit( Mobile attacker, Mobile defender )
{ {
OnHit( attacker, defender, 1.0 ); OnHit( attacker, defender, 1.0 );
} }
@ -1871,62 +1871,6 @@ namespace Server.Items
defender.Z ), defender.Map ); defender.Z ), defender.Map );
} }
} }
/* if ( damage <= 2 )
return;
Direction d = defender.GetDirectionTo( attacker );
int maxCount = damage / 15;
if ( maxCount < 1 )
maxCount = 1;
else if ( maxCount > 4 )
maxCount = 4;
for( int i = 0; i < Utility.Random( 1, maxCount ); ++i )
{
int x = defender.X;
int y = defender.Y;
switch( d )
{
case Direction.North:
x += Utility.Random( -1, 3 );
y += Utility.Random( 2 );
break;
case Direction.East:
y += Utility.Random( -1, 3 );
x += Utility.Random( -1, 2 );
break;
case Direction.West:
y += Utility.Random( -1, 3 );
x += Utility.Random( 2 );
break;
case Direction.South:
x += Utility.Random( -1, 3 );
y += Utility.Random( -1, 2 );
break;
case Direction.Up:
x += Utility.Random( 2 );
y += Utility.Random( 2 );
break;
case Direction.Down:
x += Utility.Random( -1, 2 );
y += Utility.Random( -1, 2 );
break;
case Direction.Left:
x += Utility.Random( 2 );
y += Utility.Random( -1, 2 );
break;
case Direction.Right:
x += Utility.Random( -1, 2 );
y += Utility.Random( 2 );
break;
}
new Blood().MoveToWorld( new Point3D( x, y, defender.Z ), defender.Map );
}*/
} }
public virtual void GetDamageTypes( Mobile wielder, out int phys, out int fire, out int cold, out int pois, out int nrgy ) public virtual void GetDamageTypes( Mobile wielder, out int phys, out int fire, out int cold, out int pois, out int nrgy )

3
Scripts/Misc/Guild.cs
View file

@ -961,7 +961,8 @@ namespace Server.Guilds
} }
set set
{ {
this.AddMember( value ); //Also removes from old guild. if( value != null )
this.AddMember( value ); //Also removes from old guild.
if( m_Leader is PlayerMobile && m_Leader.Guild == this ) if( m_Leader is PlayerMobile && m_Leader.Guild == this )
((PlayerMobile)m_Leader).GuildRank = RankDefinition.Member; ((PlayerMobile)m_Leader).GuildRank = RankDefinition.Member;

8
Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs
View file

@ -86,12 +86,14 @@ namespace Server.Mobiles
AddLoot( LootPack.Gems, 4 ); AddLoot( LootPack.Gems, 4 );
} }
public override double GetControlChance( Mobile m ) public override double GetControlChance( Mobile m, bool useBaseSkill )
{ {
if ( m.Skills.Bushido.Value >= 90.0 ) double skill = (useBaseSkill? m.Skills.Bushido.Base : m.Skills.Bushido.Value);
if ( skill >= 90.0 )
return 1.0; return 1.0;
return base.GetControlChance( m ); return base.GetControlChance( m, useBaseSkill );
} }
public override int TreasureMapLevel{ get{ return 3; } } public override int TreasureMapLevel{ get{ return 3; } }

2
Scripts/Mobiles/Animals/Mounts/Ridgeback.cs
View file

@ -45,7 +45,7 @@ namespace Server.Mobiles
MinTameSkill = 83.1; MinTameSkill = 83.1;
} }
public override double GetControlChance( Mobile m ) public override double GetControlChance( Mobile m, bool useBaseSkill )
{ {
return 1.0; return 1.0;
} }

2
Scripts/Mobiles/Animals/Mounts/SavageRidgeback.cs
View file

@ -45,7 +45,7 @@ namespace Server.Mobiles
MinTameSkill = 83.1; MinTameSkill = 83.1;
} }
public override double GetControlChance( Mobile m ) public override double GetControlChance( Mobile m, bool useBaseSkill )
{ {
return 1.0; return 1.0;
} }

2
Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs
View file

@ -44,7 +44,7 @@ namespace Server.Mobiles
MinTameSkill = 93.9; MinTameSkill = 93.9;
} }
public override double GetControlChance( Mobile m ) public override double GetControlChance( Mobile m, bool useBaseSkill )
{ {
return 1.0; return 1.0;
} }

2
Scripts/Mobiles/Animals/Mounts/SwampDragon.cs
View file

@ -142,7 +142,7 @@ namespace Server.Mobiles
return 0x2C8; return 0x2C8;
} }
public override double GetControlChance( Mobile m ) public override double GetControlChance( Mobile m, bool useBaseSkill )
{ {
return 1.0; return 1.0;
} }

2
Scripts/Mobiles/Monsters/SE/FireBeetle.cs
View file

@ -77,7 +77,7 @@ namespace Server.Mobiles
public override int Meat{ get{ return 16; } } public override int Meat{ get{ return 16; } }
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override double GetControlChance( Mobile m ) public override double GetControlChance( Mobile m, bool useBaseSkill )
{ {
return 1.0; return 1.0;
} }

2
Scripts/Spells/Ninjitsu/MirrorImage.cs
View file

@ -262,5 +262,7 @@ namespace Server.Mobiles
return true; return true;
} }
public override bool CanDetectHidden { get { return false; } }
} }
} }