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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

151
Scripts/Skills/TasteID.cs
View file

@ -1,94 +1,89 @@
using System;
using Server.Targeting;
using Server.Items;
using Server.Mobiles;
using Server.Targeting;
namespace Server.SkillHandlers
{
public class TasteID
{
public static void Initialize()
{
SkillInfo.Table[(int)SkillName.TasteID].Callback = OnUse;
}
public class TasteID
{
public static void Initialize()
{
SkillInfo.Table[(int)SkillName.TasteID].Callback = OnUse;
}
public static TimeSpan OnUse( Mobile m )
{
m.Target = new InternalTarget();
public static TimeSpan OnUse(Mobile m)
{
m.Target = new InternalTarget();
m.SendLocalizedMessage( 502807 ); // What would you like to taste?
m.SendLocalizedMessage(502807); // What would you like to taste?
return TimeSpan.FromSeconds( 1.0 );
}
return TimeSpan.FromSeconds(1.0);
}
[PlayerVendorTarget]
private class InternalTarget : Target
{
public InternalTarget() : base ( 2, false, TargetFlags.None )
{
AllowNonlocal = true;
}
[PlayerVendorTarget]
private class InternalTarget : Target
{
public InternalTarget() : base(2, false, TargetFlags.None)
{
AllowNonlocal = true;
}
protected override void OnTarget( Mobile from, object targeted )
{
if ( targeted is Mobile )
{
from.SendLocalizedMessage( 502816 ); // You feel that such an action would be inappropriate.
}
else if ( targeted is Food )
{
Food food = (Food) targeted;
protected override void OnTarget(Mobile from, object targeted)
{
if (targeted is Mobile)
{
from.SendLocalizedMessage(502816); // You feel that such an action would be inappropriate.
}
else if (targeted is Food)
{
Food food = (Food)targeted;
if ( from.CheckTargetSkill( SkillName.TasteID, food, 0, 100 ) )
{
if ( food.Poison != null )
{
food.SendLocalizedMessageTo( from, 1038284 ); // It appears to have poison smeared on it.
}
else
{
// No poison on the food
food.SendLocalizedMessageTo( from, 1010600 ); // You detect nothing unusual about this substance.
}
}
else
{
// Skill check failed
food.SendLocalizedMessageTo( from, 502823 ); // You cannot discern anything about this substance.
}
}
else if ( targeted is BasePotion )
{
BasePotion potion = (BasePotion) targeted;
if (from.CheckTargetSkill(SkillName.TasteID, food, 0, 100))
{
if (food.Poison != null)
food.SendLocalizedMessageTo(from, 1038284); // It appears to have poison smeared on it.
else
food.SendLocalizedMessageTo(from, 1010600); // You detect nothing unusual about this substance.
}
else
{
// Skill check failed
food.SendLocalizedMessageTo(from, 502823); // You cannot discern anything about this substance.
}
}
else if (targeted is BasePotion)
{
BasePotion potion = (BasePotion)targeted;
potion.SendLocalizedMessageTo( from, 502813 ); // You already know what kind of potion that is.
potion.SendLocalizedMessageTo( from, potion.LabelNumber );
}
else if ( targeted is PotionKeg )
{
PotionKeg keg = (PotionKeg) targeted;
potion.SendLocalizedMessageTo(from, 502813); // You already know what kind of potion that is.
potion.SendLocalizedMessageTo(from, potion.LabelNumber);
}
else if (targeted is PotionKeg)
{
PotionKeg keg = (PotionKeg)targeted;
if ( keg.Held <= 0 )
{
keg.SendLocalizedMessageTo( from, 502228 ); // There is nothing in the keg to taste!
}
else
{
keg.SendLocalizedMessageTo( from, 502229 ); // You are already familiar with this keg's contents.
keg.SendLocalizedMessageTo( from, keg.LabelNumber );
}
}
else
{
// The target is not food or potion or potion keg.
from.SendLocalizedMessage( 502820 ); // That's not something you can taste.
}
}
if (keg.Held <= 0)
{
keg.SendLocalizedMessageTo(from, 502228); // There is nothing in the keg to taste!
}
else
{
keg.SendLocalizedMessageTo(from, 502229); // You are already familiar with this keg's contents.
keg.SendLocalizedMessageTo(from, keg.LabelNumber);
}
}
else
{
// The target is not food or potion or potion keg.
from.SendLocalizedMessage(502820); // That's not something you can taste.
}
}
protected override void OnTargetOutOfRange( Mobile from, object targeted )
{
from.SendLocalizedMessage( 502815 ); // You are too far away to taste that.
}
}
}
protected override void OnTargetOutOfRange(Mobile from, object targeted)
{
from.SendLocalizedMessage(502815); // You are too far away to taste that.
}
}
}
}