Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -1,174 +1,179 @@
using System;
using Server.Misc;
using Server.Targeting;
using Server.Items;
using Server.Misc;
using Server.Network;
using Server.Targeting;
namespace Server.SkillHandlers
{
public class Begging
{
public static void Initialize()
{
SkillInfo.Table[(int)SkillName.Begging].Callback = OnUse;
}
public class Begging
{
public static void Initialize()
{
SkillInfo.Table[(int)SkillName.Begging].Callback = OnUse;
}
public static TimeSpan OnUse( Mobile m )
{
m.RevealingAction();
public static TimeSpan OnUse(Mobile m)
{
m.RevealingAction();
m.Target = new InternalTarget();
m.RevealingAction();
m.Target = new InternalTarget();
m.RevealingAction();
m.SendLocalizedMessage( 500397 ); // To whom do you wish to grovel?
m.SendLocalizedMessage(500397); // To whom do you wish to grovel?
return TimeSpan.FromHours( 6.0 );
}
return TimeSpan.FromHours(6.0);
}
private class InternalTarget : Target
{
private bool m_SetSkillTime = true;
private class InternalTarget : Target
{
private bool m_SetSkillTime = true;
public InternalTarget() : base ( 12, false, TargetFlags.None )
{
}
public InternalTarget() : base(12, false, TargetFlags.None)
{
}
protected override void OnTargetFinish( Mobile from )
{
if ( m_SetSkillTime )
from.NextSkillTime = Core.TickCount;
}
protected override void OnTargetFinish(Mobile from)
{
if (m_SetSkillTime)
from.NextSkillTime = Core.TickCount;
}
protected override void OnTarget( Mobile from, object targeted )
{
from.RevealingAction();
protected override void OnTarget(Mobile from, object targeted)
{
from.RevealingAction();
int number = -1;
int number = -1;
if ( targeted is Mobile )
{
Mobile targ = (Mobile)targeted;
if (targeted is Mobile)
{
Mobile targ = (Mobile)targeted;
if ( targ.Player ) // We can't beg from players
{
number = 500398; // Perhaps just asking would work better.
}
else if ( !targ.Body.IsHuman ) // Make sure the NPC is human
{
number = 500399; // There is little chance of getting money from that!
}
else if ( !from.InRange( targ, 2 ) )
{
if ( !targ.Female )
number = 500401; // You are too far away to beg from him.
else
number = 500402; // You are too far away to beg from her.
}
else if ( !Core.ML && from.Mounted ) // If we're on a mount, who would give us money? TODO: guessed it's removed since ML
{
number = 500404; // They seem unwilling to give you any money.
}
else
{
// Face eachother
from.Direction = from.GetDirectionTo( targ );
targ.Direction = targ.GetDirectionTo( from );
if (targ.Player) // We can't beg from players
{
number = 500398; // Perhaps just asking would work better.
}
else if (!targ.Body.IsHuman) // Make sure the NPC is human
{
number = 500399; // There is little chance of getting money from that!
}
else if (!from.InRange(targ, 2))
{
if (!targ.Female)
number = 500401; // You are too far away to beg from him.
else
number = 500402; // You are too far away to beg from her.
}
else if (!Core.ML && from.Mounted
) // If we're on a mount, who would give us money? TODO: guessed it's removed since ML
{
number = 500404; // They seem unwilling to give you any money.
}
else
{
// Face eachother
from.Direction = from.GetDirectionTo(targ);
targ.Direction = targ.GetDirectionTo(from);
from.Animate( 32, 5, 1, true, false, 0 ); // Bow
from.Animate(32, 5, 1, true, false, 0); // Bow
new InternalTimer( from, targ ).Start();
new InternalTimer(from, targ).Start();
m_SetSkillTime = false;
}
}
else // Not a Mobile
{
number = 500399; // There is little chance of getting money from that!
}
m_SetSkillTime = false;
}
}
else // Not a Mobile
{
number = 500399; // There is little chance of getting money from that!
}
if ( number != -1 )
from.SendLocalizedMessage( number );
}
if (number != -1)
from.SendLocalizedMessage(number);
}
private class InternalTimer : Timer
{
private Mobile m_From, m_Target;
private class InternalTimer : Timer
{
private Mobile m_From, m_Target;
public InternalTimer( Mobile from, Mobile target ) : base( TimeSpan.FromSeconds( 2.0 ) )
{
m_From = from;
m_Target = target;
Priority = TimerPriority.TwoFiftyMS;
}
public InternalTimer(Mobile from, Mobile target) : base(TimeSpan.FromSeconds(2.0))
{
m_From = from;
m_Target = target;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()
{
Container theirPack = m_Target.Backpack;
protected override void OnTick()
{
Container theirPack = m_Target.Backpack;
double badKarmaChance = 0.5 - ((double)m_From.Karma / 8570);
double badKarmaChance = 0.5 - (double)m_From.Karma / 8570;
if ( theirPack == null )
{
m_From.SendLocalizedMessage( 500404 ); // They seem unwilling to give you any money.
}
else if ( m_From.Karma < 0 && badKarmaChance > Utility.RandomDouble() )
{
m_Target.PublicOverheadMessage( MessageType.Regular, m_Target.SpeechHue, 500406 ); // Thou dost not look trustworthy... no gold for thee today!
}
else if ( m_From.CheckTargetSkill( SkillName.Begging, m_Target, 0.0, 100.0 ) )
{
int toConsume = theirPack.GetAmount( typeof( Gold ) ) / 10;
int max = 10 + (m_From.Fame / 2500);
if (theirPack == null)
{
m_From.SendLocalizedMessage(500404); // They seem unwilling to give you any money.
}
else if (m_From.Karma < 0 && badKarmaChance > Utility.RandomDouble())
{
m_Target.PublicOverheadMessage(MessageType.Regular, m_Target.SpeechHue,
500406); // Thou dost not look trustworthy... no gold for thee today!
}
else if (m_From.CheckTargetSkill(SkillName.Begging, m_Target, 0.0, 100.0))
{
int toConsume = theirPack.GetAmount(typeof(Gold)) / 10;
int max = 10 + m_From.Fame / 2500;
if ( max > 14 )
max = 14;
else if ( max < 10 )
max = 10;
if (max > 14)
max = 14;
else if (max < 10)
max = 10;
if ( toConsume > max )
toConsume = max;
if (toConsume > max)
toConsume = max;
if ( toConsume > 0 )
{
int consumed = theirPack.ConsumeUpTo( typeof( Gold ), toConsume );
if (toConsume > 0)
{
int consumed = theirPack.ConsumeUpTo(typeof(Gold), toConsume);
if ( consumed > 0 )
{
m_Target.PublicOverheadMessage( MessageType.Regular, m_Target.SpeechHue, 500405 ); // I feel sorry for thee...
if (consumed > 0)
{
m_Target.PublicOverheadMessage(MessageType.Regular, m_Target.SpeechHue,
500405); // I feel sorry for thee...
Gold gold = new Gold( consumed );
Gold gold = new Gold(consumed);
m_From.AddToBackpack( gold );
m_From.PlaySound( gold.GetDropSound() );
m_From.AddToBackpack(gold);
m_From.PlaySound(gold.GetDropSound());
if ( m_From.Karma > -3000 )
{
int toLose = m_From.Karma + 3000;
if (m_From.Karma > -3000)
{
int toLose = m_From.Karma + 3000;
if ( toLose > 40 )
toLose = 40;
if (toLose > 40)
toLose = 40;
Titles.AwardKarma( m_From, -toLose, true );
}
}
else
{
m_Target.PublicOverheadMessage( MessageType.Regular, m_Target.SpeechHue, 500407 ); // I have not enough money to give thee any!
}
}
else
{
m_Target.PublicOverheadMessage( MessageType.Regular, m_Target.SpeechHue, 500407 ); // I have not enough money to give thee any!
}
}
else
{
m_Target.SendLocalizedMessage( 500404 ); // They seem unwilling to give you any money.
}
Titles.AwardKarma(m_From, -toLose, true);
}
}
else
{
m_Target.PublicOverheadMessage(MessageType.Regular, m_Target.SpeechHue,
500407); // I have not enough money to give thee any!
}
}
else
{
m_Target.PublicOverheadMessage(MessageType.Regular, m_Target.SpeechHue,
500407); // I have not enough money to give thee any!
}
}
else
{
m_Target.SendLocalizedMessage(500404); // They seem unwilling to give you any money.
}
m_From.NextSkillTime = Core.TickCount + 10000;
}
}
}
}
m_From.NextSkillTime = Core.TickCount + 10000;
}
}
}
}
}