diff --git a/Scripts/Items/Weapons/BaseWeapon.cs b/Scripts/Items/Weapons/BaseWeapon.cs
index 6d3bfe3b7..456f69765 100644
--- a/Scripts/Items/Weapons/BaseWeapon.cs
+++ b/Scripts/Items/Weapons/BaseWeapon.cs
@@ -1104,7 +1104,7 @@ namespace Server.Items
// Evasion grants a variable bonus post ML. 50% prior.
if ( Evasion.IsEvading( defender ) )
- chance *= Evasion.GetParryScalar( defender );
+ chance *= Evasion.GetParryScalar( defender );
// Low dexterity lowers the chance.
if ( defender.Dex < 80 )
@@ -1133,9 +1133,9 @@ namespace Server.Items
chance += 0.05;
}
- // Evasion grants a variable bonus post ML. 50% prior.
- if( Evasion.IsEvading( defender ) )
- chance *= Evasion.GetParryScalar( defender );
+ // Evasion grants a variable bonus post ML. 50% prior.
+ if( Evasion.IsEvading( defender ) )
+ chance *= Evasion.GetParryScalar( defender );
// Low dexterity lowers the chance.
if( defender.Dex < 80 )
diff --git a/Server/AssemblyInfo.cs b/Server/AssemblyInfo.cs
index 533a42246..7efa90638 100644
--- a/Server/AssemblyInfo.cs
+++ b/Server/AssemblyInfo.cs
@@ -20,6 +20,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
//
// General Information about an assembly is controlled through the following
@@ -33,7 +34,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
@@ -76,3 +77,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]
+
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Server/Commands.cs b/Server/Commands.cs
index 0666059ac..c1650981f 100644
--- a/Server/Commands.cs
+++ b/Server/Commands.cs
@@ -183,7 +183,7 @@ namespace Server.Commands
}
}
- public class CommandSystem
+ public static class CommandSystem
{
private static string m_Prefix = "[";
diff --git a/Server/Diagnostics/BaseProfile.cs b/Server/Diagnostics/BaseProfile.cs
index 586acb4f8..d40a95f89 100644
--- a/Server/Diagnostics/BaseProfile.cs
+++ b/Server/Diagnostics/BaseProfile.cs
@@ -77,7 +77,7 @@ namespace Server.Diagnostics {
}
}
- public BaseProfile( string name ) {
+ protected BaseProfile( string name ) {
_name = name;
_stopwatch = new Stopwatch();
diff --git a/Server/Diagnostics/PacketProfile.cs b/Server/Diagnostics/PacketProfile.cs
index e97033c7d..17f76b878 100644
--- a/Server/Diagnostics/PacketProfile.cs
+++ b/Server/Diagnostics/PacketProfile.cs
@@ -39,7 +39,7 @@ namespace Server.Diagnostics {
}
}
- public BasePacketProfile( string name )
+ protected BasePacketProfile(string name)
: base( name ) {
}
diff --git a/Server/Effects.cs b/Server/Effects.cs
index bf66e3d57..bc2ac5028 100644
--- a/Server/Effects.cs
+++ b/Server/Effects.cs
@@ -42,7 +42,7 @@ namespace Server
None
}
- public class Effects
+ public static class Effects
{
private static ParticleSupportType m_ParticleSupportType = ParticleSupportType.Detect;
diff --git a/Server/EventLog.cs b/Server/EventLog.cs
index 6f8c9fbae..bc5d68ea8 100644
--- a/Server/EventLog.cs
+++ b/Server/EventLog.cs
@@ -24,7 +24,7 @@ using DiagELog = System.Diagnostics.EventLog;
namespace Server
{
- public class EventLog
+ public static class EventLog
{
static EventLog()
{
diff --git a/Server/EventSink.cs b/Server/EventSink.cs
index fd234f3e7..a357a0435 100644
--- a/Server/EventSink.cs
+++ b/Server/EventSink.cs
@@ -789,7 +789,7 @@ namespace Server
public bool Blocked{ get{ return m_Blocked; } set{ m_Blocked = value; } }
}
- public class EventSink
+ public static class EventSink
{
public static event CharacterCreatedEventHandler CharacterCreated;
public static event OpenDoorMacroEventHandler OpenDoorMacroUsed;
diff --git a/Server/Guild.cs b/Server/Guild.cs
index 0b0d7f977..b43086d4d 100644
--- a/Server/Guild.cs
+++ b/Server/Guild.cs
@@ -36,7 +36,7 @@ namespace Server.Guilds
{
private int m_Id;
- public BaseGuild( int Id )//serialization ctor
+ protected BaseGuild( int Id )//serialization ctor
{
m_Id = Id;
m_GuildList.Add( m_Id, this );
@@ -44,7 +44,7 @@ namespace Server.Guilds
m_NextID = m_Id + 1;
}
- public BaseGuild()
+ protected BaseGuild()
{
m_Id = m_NextID++;
m_GuildList.Add( m_Id, this );
diff --git a/Server/Gumps/GumpEntry.cs b/Server/Gumps/GumpEntry.cs
index f42e193db..fedd8736a 100644
--- a/Server/Gumps/GumpEntry.cs
+++ b/Server/Gumps/GumpEntry.cs
@@ -27,7 +27,7 @@ namespace Server.Gumps
{
private Gump m_Parent;
- public GumpEntry()
+ protected GumpEntry()
{
}
diff --git a/Server/Item.cs b/Server/Item.cs
index f97603cb1..ae20fe032 100644
--- a/Server/Item.cs
+++ b/Server/Item.cs
@@ -544,6 +544,7 @@ namespace Server
Weight,
}
+ [Flags]
public enum ExpandFlag
{
None = 0x00,
diff --git a/Server/ItemBounds.cs b/Server/ItemBounds.cs
index 4f2d735d8..f361adcaa 100644
--- a/Server/ItemBounds.cs
+++ b/Server/ItemBounds.cs
@@ -23,7 +23,7 @@ using System.IO;
namespace Server
{
- public class ItemBounds
+ public static class ItemBounds
{
private static Rectangle2D[] m_Bounds;
diff --git a/Server/Items/VirtualHair.cs b/Server/Items/VirtualHair.cs
index 9a021981f..3b01507f4 100644
--- a/Server/Items/VirtualHair.cs
+++ b/Server/Items/VirtualHair.cs
@@ -35,18 +35,18 @@ namespace Server
[CommandProperty( AccessLevel.GameMaster )]
public int Hue { get { return m_Hue; } set { m_Hue = value; } }
- public BaseHairInfo( int itemid )
+ protected BaseHairInfo( int itemid )
: this( itemid, 0 )
{
}
- public BaseHairInfo( int itemid, int hue )
+ protected BaseHairInfo( int itemid, int hue )
{
m_ItemID = itemid;
m_Hue = hue;
}
- public BaseHairInfo( GenericReader reader )
+ protected BaseHairInfo( GenericReader reader )
{
int version = reader.ReadInt();
diff --git a/Server/Map.cs b/Server/Map.cs
index cbeae274f..d3d46215e 100644
--- a/Server/Map.cs
+++ b/Server/Map.cs
@@ -125,7 +125,7 @@ namespace Server
return m_Maps[index];
}
- throw new Exception( "Invalid map name" );
+ throw new ArgumentException( "Invalid map name" );
}
private static void CheckNamesAndValues()
diff --git a/Server/Mobile.cs b/Server/Mobile.cs
index 5c30b445c..dd3af789b 100644
--- a/Server/Mobile.cs
+++ b/Server/Mobile.cs
@@ -108,7 +108,7 @@ namespace Server
private double m_Value;
private bool m_ObeyCap;
- public SkillMod( SkillName skill, bool relative, double value )
+ protected SkillMod( SkillName skill, bool relative, double value )
{
m_Skill = skill;
m_Relative = relative;
diff --git a/Server/Movement.cs b/Server/Movement.cs
index e595951da..29bd3ed62 100644
--- a/Server/Movement.cs
+++ b/Server/Movement.cs
@@ -23,7 +23,7 @@ using System.Collections;
namespace Server.Movement
{
- public class Movement
+ public static class Movement
{
private static IMovementImpl m_Impl;
diff --git a/Server/MultiData.cs b/Server/MultiData.cs
index b89946284..f9186b7f9 100644
--- a/Server/MultiData.cs
+++ b/Server/MultiData.cs
@@ -24,7 +24,7 @@ using System.IO;
namespace Server
{
- public class MultiData
+ public static class MultiData
{
private static MultiComponentList[] m_Components;
diff --git a/Server/NativeReader.cs b/Server/NativeReader.cs
index 9954db6d1..c737773ee 100644
--- a/Server/NativeReader.cs
+++ b/Server/NativeReader.cs
@@ -22,7 +22,7 @@ using System;
using System.Runtime.InteropServices;
namespace Server {
- public class NativeReader {
+ public static class NativeReader {
private static readonly INativeReader m_NativeReader;
diff --git a/Server/Network/Compression.cs b/Server/Network/Compression.cs
index 3717e8d13..6a096271c 100644
--- a/Server/Network/Compression.cs
+++ b/Server/Network/Compression.cs
@@ -26,7 +26,7 @@ namespace Server.Network {
///
/// Handles outgoing packet compression for the network.
///
- public class Compression {
+ public static class Compression {
private static int[] _huffmanTable = new int[514]
{
0x2, 0x000, 0x5, 0x01F, 0x6, 0x022, 0x7, 0x034, 0x7, 0x075, 0x6, 0x028, 0x6, 0x03B, 0x7, 0x032,
diff --git a/Server/Network/PacketHandlers.cs b/Server/Network/PacketHandlers.cs
index a2482f3f0..61c4461f1 100644
--- a/Server/Network/PacketHandlers.cs
+++ b/Server/Network/PacketHandlers.cs
@@ -57,7 +57,7 @@ namespace Server.Network
Encoded = 0xC0
}
- public class PacketHandlers
+ public static class PacketHandlers
{
private static PacketHandler[] m_Handlers;
private static PacketHandler[] m_6017Handlers;
diff --git a/Server/Network/Packets.cs b/Server/Network/Packets.cs
index 82129eacf..df34a2db2 100644
--- a/Server/Network/Packets.cs
+++ b/Server/Network/Packets.cs
@@ -2715,7 +2715,7 @@ namespace Server.Network
}
}
- public class AttributeNormalizer
+ public static class AttributeNormalizer
{
private static int m_Maximum = 25;
private static bool m_Enabled = true;
@@ -3997,7 +3997,7 @@ namespace Server.Network
get{ return m_PacketID; }
}
- public Packet( int packetID )
+ protected Packet( int packetID )
{
m_PacketID = packetID;
@@ -4015,7 +4015,7 @@ namespace Server.Network
m_Stream.Write( (short) 0 );
}
- public Packet( int packetID, int length )
+ protected Packet( int packetID, int length )
{
m_PacketID = packetID;
m_Length = length;
diff --git a/Server/Notoriety.cs b/Server/Notoriety.cs
index 3a5ae3101..23c7f2e79 100644
--- a/Server/Notoriety.cs
+++ b/Server/Notoriety.cs
@@ -28,7 +28,7 @@ namespace Server
{
public delegate int NotorietyHandler( Mobile source, Mobile target );
- public class Notoriety
+ public static class Notoriety
{
public const int Innocent = 1;
public const int Ally = 2;
diff --git a/Server/Persistence/StandardSaveStrategy.cs b/Server/Persistence/StandardSaveStrategy.cs
index 4d1e380fc..a7374a757 100644
--- a/Server/Persistence/StandardSaveStrategy.cs
+++ b/Server/Persistence/StandardSaveStrategy.cs
@@ -108,7 +108,6 @@ namespace Server {
protected void SaveItems(SaveMetrics metrics)
{
Dictionary items = World.Items;
- List- decaying = new List
- ();
GenericWriter idx;
GenericWriter tdb;
diff --git a/Server/Prompt.cs b/Server/Prompt.cs
index 1519d16f6..0b2dd74ff 100644
--- a/Server/Prompt.cs
+++ b/Server/Prompt.cs
@@ -36,7 +36,7 @@ namespace Server.Prompts
}
}
- public Prompt()
+ protected Prompt()
{
do
{
diff --git a/Server/Race.cs b/Server/Race.cs
index 7df595aad..be64385d2 100644
--- a/Server/Race.cs
+++ b/Server/Race.cs
@@ -77,7 +77,7 @@ namespace Server
return m_Races[index];
}
- throw new Exception( "Invalid race name" );
+ throw new ArgumentException( "Invalid race name" );
}
private static void CheckNamesAndValues()
@@ -114,7 +114,7 @@ namespace Server
public int FemaleBody { get { return m_FemaleBody; } }
public int FemaleGhostBody { get { return m_FemaleGhostBody; } }
- public Race( int raceID, int raceIndex, string name, string pluralName, int maleBody, int femaleBody, int maleGhostBody, int femaleGhostBody, Expansion requiredExpansion )
+ protected Race( int raceID, int raceIndex, string name, string pluralName, int maleBody, int femaleBody, int maleGhostBody, int femaleGhostBody, Expansion requiredExpansion )
{
m_RaceID = raceID;
m_RaceIndex = raceIndex;
diff --git a/Server/ScriptCompiler.cs b/Server/ScriptCompiler.cs
index ff4938a8b..4c3da29a4 100644
--- a/Server/ScriptCompiler.cs
+++ b/Server/ScriptCompiler.cs
@@ -32,7 +32,7 @@ using Microsoft.VisualBasic;
namespace Server
{
- public class ScriptCompiler
+ public static class ScriptCompiler
{
private static Assembly[] m_Assemblies;
@@ -522,15 +522,6 @@ namespace Server
private delegate CompilerResults Compiler( bool debug );
- private void LoadScriptedAssembly( List assemblies, string fileName, Compiler compiler, bool debug )
- {
-
-
- if( File.Exists( fileName ) )
- {
- }
- }
-
public static bool Compile()
{
return Compile( false );
diff --git a/Server/Serialization.cs b/Server/Serialization.cs
index 016c31b39..a88e923af 100644
--- a/Server/Serialization.cs
+++ b/Server/Serialization.cs
@@ -34,7 +34,7 @@ namespace Server
{
public abstract class GenericReader
{
- public GenericReader() { }
+ protected GenericReader() { }
public abstract string ReadString();
public abstract DateTime ReadDateTime();
@@ -90,7 +90,7 @@ namespace Server
public abstract class GenericWriter
{
- public GenericWriter() { }
+ protected GenericWriter() { }
public abstract void Close();
diff --git a/Server/Targeting/MultiTarget.cs b/Server/Targeting/MultiTarget.cs
index a570ba574..0d411b717 100644
--- a/Server/Targeting/MultiTarget.cs
+++ b/Server/Targeting/MultiTarget.cs
@@ -53,11 +53,13 @@ namespace Server.Targeting
}
}
- public MultiTarget( int multiID, Point3D offset ) : this( multiID, offset, 10, true, TargetFlags.None )
+ protected MultiTarget( int multiID, Point3D offset )
+ : this( multiID, offset, 10, true, TargetFlags.None )
{
}
- public MultiTarget( int multiID, Point3D offset, int range, bool allowGround, TargetFlags flags ) : base( range, allowGround, flags )
+ protected MultiTarget( int multiID, Point3D offset, int range, bool allowGround, TargetFlags flags )
+ : base( range, allowGround, flags )
{
m_MultiID = multiID;
m_Offset = offset;
diff --git a/Server/Targeting/Target.cs b/Server/Targeting/Target.cs
index 21cc452da..c09301302 100644
--- a/Server/Targeting/Target.cs
+++ b/Server/Targeting/Target.cs
@@ -38,7 +38,7 @@ namespace Server.Targeting
public DateTime TimeoutTime{ get{ return m_TimeoutTime; } }
- public Target( int range, bool allowGround, TargetFlags flags )
+ protected Target( int range, bool allowGround, TargetFlags flags )
{
m_TargetID = ++m_NextTargetID;
m_Range = range;
diff --git a/Server/TileData.cs b/Server/TileData.cs
index 49770594b..82a0d99bb 100644
--- a/Server/TileData.cs
+++ b/Server/TileData.cs
@@ -197,7 +197,7 @@ namespace Server
StairRight = 0x80000000
}
- public class TileData
+ public static class TileData
{
private static LandData[] m_LandData;
private static ItemData[] m_ItemData;