Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,242 +1,257 @@
|
|||
using System;
|
||||
using Server.Engines.Craft;
|
||||
using Server.Factions;
|
||||
using Server.Mobiles;
|
||||
using Server.Regions;
|
||||
|
||||
namespace Server.Items
|
||||
{
|
||||
public class RepairDeed : Item
|
||||
{
|
||||
private class RepairSkillInfo
|
||||
{
|
||||
public TextDefinition NotNearbyMessage { get; }
|
||||
public class RepairDeed : Item
|
||||
{
|
||||
public enum RepairSkillType
|
||||
{
|
||||
Smithing,
|
||||
Tailoring,
|
||||
Tinkering,
|
||||
Carpentry,
|
||||
Fletching
|
||||
}
|
||||
|
||||
public TextDefinition Name { get; }
|
||||
private Mobile m_Crafter;
|
||||
|
||||
private RepairSkillType m_Skill;
|
||||
private double m_SkillLevel;
|
||||
|
||||
[Constructible]
|
||||
public RepairDeed() : this(RepairSkillType.Smithing, 100.0, null, true)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public RepairDeed(RepairSkillType skill, double level) : this(skill, level, null, true)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public RepairDeed(RepairSkillType skill, double level, bool normalizeLevel) : this(skill, level, null,
|
||||
normalizeLevel)
|
||||
{
|
||||
}
|
||||
|
||||
public RepairDeed(RepairSkillType skill, double level, Mobile crafter) : this(skill, level, crafter, true)
|
||||
{
|
||||
}
|
||||
|
||||
public RepairDeed(RepairSkillType skill, double level, Mobile crafter, bool normalizeLevel) : base(0x14F0)
|
||||
{
|
||||
if (normalizeLevel)
|
||||
SkillLevel = (int)(level / 10) * 10;
|
||||
else
|
||||
SkillLevel = level;
|
||||
|
||||
m_Skill = skill;
|
||||
m_Crafter = crafter;
|
||||
Hue = 0x1BC;
|
||||
LootType = LootType.Blessed;
|
||||
}
|
||||
|
||||
public RepairDeed(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool DisplayLootType => false;
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public RepairSkillType RepairSkill
|
||||
{
|
||||
get => m_Skill;
|
||||
set
|
||||
{
|
||||
m_Skill = value;
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public double SkillLevel
|
||||
{
|
||||
get => m_SkillLevel;
|
||||
set
|
||||
{
|
||||
m_SkillLevel = Math.Max(Math.Min(value, 120.0), 0);
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public Mobile Crafter
|
||||
{
|
||||
get => m_Crafter;
|
||||
set
|
||||
{
|
||||
m_Crafter = value;
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
||||
public override void AddNameProperty(ObjectPropertyList list)
|
||||
{
|
||||
list.Add(1061133,
|
||||
$"{GetSkillTitle(m_SkillLevel)}\t{RepairSkillInfo.GetInfo(m_Skill).Name}"); // A repair service contract from ~1_SKILL_TITLE~ ~2_SKILL_NAME~.
|
||||
}
|
||||
|
||||
public override void GetProperties(ObjectPropertyList list)
|
||||
{
|
||||
base.GetProperties(list);
|
||||
|
||||
if (m_Crafter != null)
|
||||
list.Add(1050043, m_Crafter.Name); // crafted by ~1_NAME~
|
||||
|
||||
//On OSI it says it's exceptional. Intentional difference.
|
||||
}
|
||||
|
||||
public override void OnSingleClick(Mobile from)
|
||||
{
|
||||
if (Deleted || !from.CanSee(this))
|
||||
return;
|
||||
|
||||
LabelTo(from, 1061133,
|
||||
$"{GetSkillTitle(m_SkillLevel)}\t{RepairSkillInfo.GetInfo(m_Skill).Name}"); // A repair service contract from ~1_SKILL_TITLE~ ~2_SKILL_NAME~.
|
||||
|
||||
if (m_Crafter != null)
|
||||
LabelTo(from, 1050043, m_Crafter.Name); // crafted by ~1_NAME~
|
||||
}
|
||||
|
||||
private static TextDefinition GetSkillTitle(double skillLevel)
|
||||
{
|
||||
int skill = (int)(skillLevel / 10);
|
||||
|
||||
if (skill >= 11)
|
||||
return 1062008 + skill - 11;
|
||||
if (skill >= 5)
|
||||
return 1061123 + skill - 5;
|
||||
|
||||
switch (skill)
|
||||
{
|
||||
case 4:
|
||||
return "a Novice";
|
||||
case 3:
|
||||
return "a Neophyte";
|
||||
default:
|
||||
return "a Newbie"; //On OSI, it shouldn't go below 50, but, this is for 'custom' support.
|
||||
}
|
||||
}
|
||||
|
||||
public static RepairSkillType GetTypeFor(CraftSystem s)
|
||||
{
|
||||
for (int i = 0; i < RepairSkillInfo.Table.Length; i++)
|
||||
if (RepairSkillInfo.Table[i].System == s)
|
||||
return (RepairSkillType)i;
|
||||
|
||||
return RepairSkillType.Smithing;
|
||||
}
|
||||
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
if (Check(from))
|
||||
Repair.Do(from, RepairSkillInfo.GetInfo(m_Skill).System, this);
|
||||
}
|
||||
|
||||
public bool Check(Mobile from)
|
||||
{
|
||||
if (!IsChildOf(from.Backpack))
|
||||
from.SendLocalizedMessage(1047012); // The contract must be in your backpack to use it.
|
||||
else if (!VerifyRegion(from))
|
||||
TextDefinition.SendMessageTo(from, RepairSkillInfo.GetInfo(m_Skill).NotNearbyMessage);
|
||||
else
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool VerifyRegion(Mobile m)
|
||||
{
|
||||
//TODO: When the entire region system data is in, convert to that instead of a proximity thing.
|
||||
|
||||
if (!m.Region.IsPartOf(typeof(TownRegion)))
|
||||
return false;
|
||||
|
||||
return Faction.IsNearType(m, RepairSkillInfo.GetInfo(m_Skill).NearbyTypes, 6);
|
||||
}
|
||||
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
|
||||
writer.Write((int)m_Skill);
|
||||
writer.Write(m_SkillLevel);
|
||||
writer.Write(m_Crafter);
|
||||
}
|
||||
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
|
||||
switch (version)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
m_Skill = (RepairSkillType)reader.ReadInt();
|
||||
m_SkillLevel = reader.ReadDouble();
|
||||
m_Crafter = reader.ReadMobile();
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class RepairSkillInfo
|
||||
{
|
||||
public RepairSkillInfo(CraftSystem system, Type[] nearbyTypes, TextDefinition notNearbyMessage,
|
||||
TextDefinition name)
|
||||
{
|
||||
System = system;
|
||||
NearbyTypes = nearbyTypes;
|
||||
NotNearbyMessage = notNearbyMessage;
|
||||
Name = name;
|
||||
}
|
||||
|
||||
public RepairSkillInfo(CraftSystem system, Type nearbyType, TextDefinition notNearbyMessage, TextDefinition name)
|
||||
: this(system, new[] { nearbyType }, notNearbyMessage, name)
|
||||
{
|
||||
}
|
||||
|
||||
public TextDefinition NotNearbyMessage{ get; }
|
||||
|
||||
public TextDefinition Name{ get; }
|
||||
|
||||
|
||||
public CraftSystem System { get; }
|
||||
public CraftSystem System{ get; }
|
||||
|
||||
public Type[] NearbyTypes { get; }
|
||||
public Type[] NearbyTypes{ get; }
|
||||
|
||||
public RepairSkillInfo( CraftSystem system, Type[] nearbyTypes, TextDefinition notNearbyMessage, TextDefinition name )
|
||||
{
|
||||
System = system;
|
||||
NearbyTypes = nearbyTypes;
|
||||
NotNearbyMessage = notNearbyMessage;
|
||||
Name = name;
|
||||
}
|
||||
public static RepairSkillInfo[] Table{ get; } =
|
||||
{
|
||||
new RepairSkillInfo(DefBlacksmithy.CraftSystem, typeof(Blacksmith), 1047013, 1023015),
|
||||
new RepairSkillInfo(DefTailoring.CraftSystem, typeof(Tailor), 1061132, 1022981),
|
||||
new RepairSkillInfo(DefTinkering.CraftSystem, typeof(Tinker), 1061166, 1022983),
|
||||
new RepairSkillInfo(DefCarpentry.CraftSystem, typeof(Carpenter), 1061135, 1060774),
|
||||
new RepairSkillInfo(DefBowFletching.CraftSystem, typeof(Bowyer), 1061134, 1023005)
|
||||
};
|
||||
|
||||
public RepairSkillInfo( CraftSystem system, Type nearbyType, TextDefinition notNearbyMessage, TextDefinition name )
|
||||
: this( system, new[] { nearbyType }, notNearbyMessage, name )
|
||||
{
|
||||
}
|
||||
public static RepairSkillInfo GetInfo(RepairSkillType type)
|
||||
{
|
||||
int v = (int)type;
|
||||
|
||||
public static RepairSkillInfo[] Table { get; } =
|
||||
{
|
||||
new RepairSkillInfo( DefBlacksmithy.CraftSystem, typeof( Blacksmith ), 1047013, 1023015 ),
|
||||
new RepairSkillInfo( DefTailoring.CraftSystem, typeof( Tailor ), 1061132, 1022981 ),
|
||||
new RepairSkillInfo( DefTinkering.CraftSystem, typeof( Tinker ), 1061166, 1022983 ),
|
||||
new RepairSkillInfo( DefCarpentry.CraftSystem, typeof( Carpenter ), 1061135, 1060774 ),
|
||||
new RepairSkillInfo( DefBowFletching.CraftSystem, typeof( Bowyer ), 1061134, 1023005 )
|
||||
};
|
||||
if (v < 0 || v >= Table.Length)
|
||||
v = 0;
|
||||
|
||||
public static RepairSkillInfo GetInfo( RepairSkillType type )
|
||||
{
|
||||
int v = (int)type;
|
||||
|
||||
if ( v < 0 || v >= Table.Length )
|
||||
v = 0;
|
||||
|
||||
return Table[v];
|
||||
}
|
||||
}
|
||||
public enum RepairSkillType
|
||||
{
|
||||
Smithing,
|
||||
Tailoring,
|
||||
Tinkering,
|
||||
Carpentry,
|
||||
Fletching
|
||||
}
|
||||
|
||||
public override bool DisplayLootType => false;
|
||||
|
||||
private RepairSkillType m_Skill;
|
||||
private double m_SkillLevel;
|
||||
|
||||
private Mobile m_Crafter;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public RepairSkillType RepairSkill
|
||||
{
|
||||
get => m_Skill;
|
||||
set { m_Skill = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public double SkillLevel
|
||||
{
|
||||
get => m_SkillLevel;
|
||||
set { m_SkillLevel = Math.Max( Math.Min( value, 120.0 ), 0 ) ; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Crafter
|
||||
{
|
||||
get => m_Crafter;
|
||||
set { m_Crafter = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
public override void AddNameProperty( ObjectPropertyList list )
|
||||
{
|
||||
list.Add( 1061133, $"{GetSkillTitle(m_SkillLevel).ToString()}\t{RepairSkillInfo.GetInfo(m_Skill).Name}"); // A repair service contract from ~1_SKILL_TITLE~ ~2_SKILL_NAME~.
|
||||
}
|
||||
|
||||
public override void GetProperties( ObjectPropertyList list )
|
||||
{
|
||||
base.GetProperties( list );
|
||||
|
||||
if ( m_Crafter != null )
|
||||
list.Add( 1050043, m_Crafter.Name ); // crafted by ~1_NAME~
|
||||
|
||||
//On OSI it says it's exceptional. Intentional difference.
|
||||
}
|
||||
|
||||
public override void OnSingleClick( Mobile from )
|
||||
{
|
||||
if ( Deleted || !from.CanSee( this ) )
|
||||
return;
|
||||
|
||||
LabelTo( from, 1061133,
|
||||
$"{GetSkillTitle(m_SkillLevel).ToString()}\t{RepairSkillInfo.GetInfo(m_Skill).Name}"); // A repair service contract from ~1_SKILL_TITLE~ ~2_SKILL_NAME~.
|
||||
|
||||
if ( m_Crafter != null )
|
||||
LabelTo( from, 1050043, m_Crafter.Name ); // crafted by ~1_NAME~
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public RepairDeed() : this( RepairSkillType.Smithing, 100.0, null, true )
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public RepairDeed( RepairSkillType skill, double level ) : this( skill, level, null, true )
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public RepairDeed( RepairSkillType skill, double level, bool normalizeLevel ) : this( skill, level, null, normalizeLevel )
|
||||
{
|
||||
}
|
||||
|
||||
public RepairDeed( RepairSkillType skill, double level, Mobile crafter ) : this( skill, level, crafter, true )
|
||||
{
|
||||
}
|
||||
|
||||
public RepairDeed( RepairSkillType skill, double level, Mobile crafter, bool normalizeLevel ) : base( 0x14F0 )
|
||||
{
|
||||
if ( normalizeLevel )
|
||||
SkillLevel = (int)(level/10)*10;
|
||||
else
|
||||
SkillLevel = level;
|
||||
|
||||
m_Skill = skill;
|
||||
m_Crafter = crafter;
|
||||
Hue = 0x1BC;
|
||||
LootType = LootType.Blessed;
|
||||
}
|
||||
|
||||
public RepairDeed( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
|
||||
private static TextDefinition GetSkillTitle( double skillLevel )
|
||||
{
|
||||
int skill = (int)(skillLevel/10);
|
||||
|
||||
if ( skill >= 11 )
|
||||
return (1062008 + skill-11);
|
||||
if ( skill >=5 )
|
||||
return (1061123 + skill-5);
|
||||
|
||||
switch( skill )
|
||||
{
|
||||
case 4:
|
||||
return "a Novice";
|
||||
case 3:
|
||||
return "a Neophyte";
|
||||
default:
|
||||
return "a Newbie"; //On OSI, it shouldn't go below 50, but, this is for 'custom' support.
|
||||
}
|
||||
}
|
||||
|
||||
public static RepairSkillType GetTypeFor( CraftSystem s )
|
||||
{
|
||||
for( int i = 0; i < RepairSkillInfo.Table.Length; i++ )
|
||||
{
|
||||
if ( RepairSkillInfo.Table[i].System == s )
|
||||
return (RepairSkillType)i;
|
||||
}
|
||||
|
||||
return RepairSkillType.Smithing;
|
||||
}
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if ( Check( from ) )
|
||||
Repair.Do( from, RepairSkillInfo.GetInfo( m_Skill ).System, this );
|
||||
}
|
||||
|
||||
public bool Check( Mobile from )
|
||||
{
|
||||
if ( !IsChildOf( from.Backpack ) )
|
||||
from.SendLocalizedMessage( 1047012 ); // The contract must be in your backpack to use it.
|
||||
else if ( !VerifyRegion( from ) )
|
||||
TextDefinition.SendMessageTo( from, RepairSkillInfo.GetInfo( m_Skill ).NotNearbyMessage );
|
||||
else
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool VerifyRegion( Mobile m )
|
||||
{
|
||||
//TODO: When the entire region system data is in, convert to that instead of a proximity thing.
|
||||
|
||||
if ( !m.Region.IsPartOf( typeof( TownRegion ) ) )
|
||||
return false;
|
||||
|
||||
return Factions.Faction.IsNearType( m, RepairSkillInfo.GetInfo( m_Skill ).NearbyTypes, 6 );
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
|
||||
writer.Write( (int)0 ); // version
|
||||
|
||||
writer.Write( (int)m_Skill );
|
||||
writer.Write( m_SkillLevel );
|
||||
writer.Write( m_Crafter );
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
|
||||
int version = reader.ReadInt();
|
||||
|
||||
switch( version )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
m_Skill = (RepairSkillType)reader.ReadInt();
|
||||
m_SkillLevel = reader.ReadDouble();
|
||||
m_Crafter = reader.ReadMobile();
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return Table[v];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue