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();
}
private DateTime m_NextDetectHidden;
public virtual bool CanDetectHidden { get { return m_Mobile.Skills[SkillName.DetectHidden].Value > 0; } }
/*
* The Timer object
*/
private class AITimer : Timer
{
private BaseAI m_Owner;
private DateTime m_NextDetectHidden;
private bool m_bDetectHidden;
public AITimer( BaseAI owner )
: base( TimeSpan.FromSeconds( Utility.RandomDouble() ), TimeSpan.FromSeconds( Math.Max( 0.0, owner.m_Mobile.CurrentSpeed ) ) )
{
m_Owner = owner;
m_bDetectHidden = false;
m_NextDetectHidden = DateTime.Now;
m_Owner.m_NextDetectHidden = DateTime.Now;
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();
@ -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 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 ) );
}
else
{
m_bDetectHidden = m_Owner.m_Mobile.Skills[SkillName.DetectHidden].Value > 0;
m_Owner.m_NextDetectHidden = DateTime.Now + TimeSpan.FromSeconds( Utility.RandomMinMax( min, max ) );
}
}
}

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

@ -800,7 +800,12 @@ namespace Server.Mobiles
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 )
return 1.0;
@ -810,8 +815,9 @@ namespace Server.Mobiles
if ( dMinTameSkill > -24.9 && Server.SkillHandlers.AnimalTaming.CheckMastery( m, this ) )
dMinTameSkill = -24.9;
int taming = (int)(m.Skills[SkillName.AnimalTaming].Value * 10);
int lore = (int)(m.Skills[SkillName.AnimalLore].Value * 10);
int taming = (int)((useBaseSkill ? m.Skills[SkillName.AnimalTaming].Base : m.Skills[SkillName.AnimalTaming].Value ) * 10);
int lore = (int)((useBaseSkill ? m.Skills[SkillName.AnimalLore].Base : m.Skills[SkillName.AnimalLore].Value )* 10);
int difficulty = (int)(dMinTameSkill * 10);
int weighted = ((taming * 4) + lore) / 5;
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 ( 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 )
{

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

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