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

87
Scripts/Engines/MLQuests/QuestArea.cs
View file

@ -2,58 +2,57 @@
namespace Server.Engines.MLQuests
{
public class QuestArea
{
public TextDefinition Name { get; set; }
public class QuestArea
{
public QuestArea(TextDefinition name, string region)
: this(name, region, null)
{
}
public string RegionName { get; set; }
public QuestArea(TextDefinition name, string region, Map forceMap)
{
Name = name;
RegionName = region;
ForceMap = forceMap;
public Map ForceMap { get; set; }
if (MLQuestSystem.Debug)
ValidationQueue<QuestArea>.Add(this);
}
public QuestArea( TextDefinition name, string region )
: this( name, region, null )
{
}
public TextDefinition Name{ get; set; }
public QuestArea( TextDefinition name, string region, Map forceMap )
{
Name = name;
RegionName = region;
ForceMap = forceMap;
public string RegionName{ get; set; }
if ( MLQuestSystem.Debug )
ValidationQueue<QuestArea>.Add( this );
}
public Map ForceMap{ get; set; }
public bool Contains( Mobile mob )
{
return Contains( mob.Region );
}
public bool Contains(Mobile mob)
{
return Contains(mob.Region);
}
public bool Contains( Region reg )
{
if ( reg == null || ( ForceMap != null && reg.Map != ForceMap ) )
return false;
public bool Contains(Region reg)
{
if (reg == null || ForceMap != null && reg.Map != ForceMap)
return false;
return reg.IsPartOf( RegionName );
}
return reg.IsPartOf(RegionName);
}
// Debug method
public void Validate()
{
bool found = false;
// Debug method
public void Validate()
{
bool found = false;
foreach ( Region r in Region.Regions )
{
if ( r.Name == RegionName && ( ForceMap == null || r.Map == ForceMap ) )
{
found = true;
break;
}
}
foreach (Region r in Region.Regions)
if (r.Name == RegionName && (ForceMap == null || r.Map == ForceMap))
{
found = true;
break;
}
if ( !found )
Console.WriteLine( "Warning: QuestArea region '{0}' does not exist (ForceMap = {1})", RegionName, ( ForceMap == null ) ? "-null-" : ForceMap.ToString() );
}
}
}
if (!found)
Console.WriteLine("Warning: QuestArea region '{0}' does not exist (ForceMap = {1})", RegionName,
ForceMap == null ? "-null-" : ForceMap.ToString());
}
}
}