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

branch sync #2

Browse source
This commit is contained in:
mark 2009-01-31 00:02:21 +00:00
parent 96a37544fd
commit 4e6256b8cd
39 changed files with 415 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Scripts/Skills/AnimalTaming.cs
View file

@ -82,12 +82,22 @@ namespace Server.SkillHandlers
public static void ScaleSkills( BaseCreature bc, double scalar )
{
int totalCapIncrease = 0;
for ( int i = 0; i < bc.Skills.Length; ++i )
{
bc.Skills[i].Base *= scalar;
if ( bc.Skills[i].Base > 100.0 )
if ( bc.Skills[i].Base > bc.Skills[i].Cap )
{
if( Core.SE )
totalCapIncrease += ( bc.Skills[i].BaseFixedPoint - bc.Skills[i].CapFixedPoint );
bc.Skills[i].Cap = bc.Skills[i].Base;
}
}
bc.SkillsCap += totalCapIncrease; //increase will be 0 if not .SE per above
}
private class InternalTarget : Target
@ -195,21 +205,6 @@ namespace Server.SkillHandlers
from.SendLocalizedMessage( 502801 ); // You can't tame that!
}
}
public static void AdjustSkillCaps( BaseCreature bc )
{
int totalCapIncrease = 0;
for ( int i = 0; i < bc.Skills.Length; ++i )
{
if( bc.Skills[i].Base > bc.Skills[i].Cap )
{
totalCapIncrease += (bc.Skills[i].BaseFixedPoint - bc.Skills[i].CapFixedPoint);
bc.Skills[i].Cap = bc.Skills[i].Base;
}
}
bc.SkillsCap += totalCapIncrease;
}
private class InternalTimer : Timer
{
@ -340,9 +335,6 @@ namespace Server.SkillHandlers
if ( m_Creature.StatLossAfterTame )
ScaleStats( m_Creature, 0.50 );
if( Core.SE )
AdjustSkillCaps( m_Creature );
}
if ( alreadyOwned )

2
Scripts/Skills/RemoveTrap.cs
View file

@ -94,7 +94,7 @@ namespace Server.SkillHandlers
}
else
{
if ( from.CheckTargetSkill( SkillName.RemoveTrap, trap, 80.0, 100.0 ) && from.CheckTargetSkill( SkillName.Tinkering, trap, 80.0, 100.0 ) )
if ( (Core.ML && isOwner) || (from.CheckTargetSkill( SkillName.RemoveTrap, trap, 80.0, 100.0 ) && from.CheckTargetSkill( SkillName.Tinkering, trap, 80.0, 100.0 )) )
{
from.PrivateOverheadMessage( MessageType.Regular, trap.MessageHue, trap.DisarmMessage, from.NetState );