Skip to content

Commit

Permalink
Updated .editorconfig file with advanced configuration settings that …
Browse files Browse the repository at this point in the history
…will help maintain user code style and best practices with most IDE's.

Complete core housekeeping operation using "Profile 1" with new .editorconfig settings.
  • Loading branch information
Voxpire authored and TrueUO committed Jan 15, 2021
1 parent 7ea8145 commit f840e50
Show file tree
Hide file tree
Showing 117 changed files with 10,899 additions and 10,777 deletions.
141 changes: 133 additions & 8 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,135 @@
# http://editorconfig.org
root=true

# You can modify the rules from these initially generated values to suit your own policies
# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
[*.cs]
indent_size = 4
indent_style = space
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true


#Core editorconfig formatting - indentation

#use hard tabs for indentation
indent_style = tab

#Formatting - indentation options

#csharp_indent_case_contents_when_block
csharp_indent_case_contents_when_block = true

#Formatting - new line options

#place catch statements on a new line
csharp_new_line_before_catch = true
#place else statements on a new line
csharp_new_line_before_else = true
#require finally statements to be on a new line after the closing brace
csharp_new_line_before_finally = true
#require members of object intializers to be on separate lines
csharp_new_line_before_members_in_object_initializers = true
#require braces to be on a new line for object_collection_array_initializers, control_blocks, types, properties, accessors, methods, and lambdas (also known as "Allman" style)
csharp_new_line_before_open_brace = all

#Formatting - organize using options

#sort System.* using directives alphabetically, and place them before other usings
dotnet_sort_system_directives_first = true

#Formatting - spacing options

#require NO space between a cast and the value
csharp_space_after_cast = false
#require a space before the colon for bases or interfaces in a type declaration
csharp_space_after_colon_in_inheritance_clause = true
#require a space after a keyword in a control flow statement such as a for loop
csharp_space_after_keywords_in_control_flow_statements = true
#require a space before the colon for bases or interfaces in a type declaration
csharp_space_before_colon_in_inheritance_clause = true
#remove space within empty argument list parentheses
csharp_space_between_method_call_empty_parameter_list_parentheses = false
#remove space between method call name and opening parenthesis
csharp_space_between_method_call_name_and_opening_parenthesis = false
#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
csharp_space_between_method_call_parameter_list_parentheses = false
#remove space within empty parameter list parentheses for a method declaration
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
csharp_space_between_method_declaration_parameter_list_parentheses = false

#Formatting - wrapping options

#leave code block on single line
csharp_preserve_single_line_blocks = true
#leave statements and member declarations on the same line
csharp_preserve_single_line_statements = true

#Style - Code block preferences

#prefer curly braces even for one line of code
csharp_prefer_braces = false:suggestion

#Style - expression bodied member options

#prefer expression bodies for accessors
csharp_style_expression_bodied_accessors = true:suggestion
#prefer block bodies for constructors
csharp_style_expression_bodied_constructors = false:suggestion
#prefer expression bodies for indexers
csharp_style_expression_bodied_indexers = true:suggestion
#prefer block bodies for methods
csharp_style_expression_bodied_methods = false
#prefer block bodies for operators
csharp_style_expression_bodied_operators = false:suggestion
#prefer expression bodies for properties
csharp_style_expression_bodied_properties = true:suggestion

#Style - expression level options

#prefer out variables to be declared within the method call
csharp_style_inlined_variable_declaration = true:suggestion
#prefer the type name for member access expressions, instead of the language keyword
dotnet_style_predefined_type_for_member_access = false:suggestion

#Style - Expression-level preferences

#prefer objects to be initialized using object initializers when possible
dotnet_style_object_initializer = true:suggestion

#Style - implicit and explicit types

#prefer var over explicit type in all cases, unless overridden by another code style rule
csharp_style_var_elsewhere = true:suggestion
#prefer var over explicit type to declare variables with built-in system types such as int
csharp_style_var_for_built_in_types = true:suggestion
#prefer var over explicit type when the type is already mentioned on the right-hand side of a declaration
csharp_style_var_when_type_is_apparent = true:suggestion

#Style - language keyword and framework type options

#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion

#Style - Miscellaneous preferences

#prefer anonymous functions over local functions
csharp_style_pattern_local_over_anonymous_function = false:suggestion

#Style - modifier options

#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion

#Style - Modifier preferences

#when this rule is set to a list of modifiers, prefer the specified ordering.
csharp_preferred_modifier_order = public,private,protected,override,static,virtual,readonly,abstract,sealed:suggestion

#Style - Pattern matching

#prefer is expression with type casts instead of pattern matching
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion

#Style - qualification options

#prefer fields not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_field = false:suggestion
#prefer methods not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_method = false:suggestion
#prefer properties not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_property = false:suggestion
2 changes: 1 addition & 1 deletion Application/ServUO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace ServUO
{
public static class ServUO
{
static void Main(string[] args)
private static void Main(string[] args)
{
Core.Setup(args);
Core.Run();
Expand Down
9 changes: 5 additions & 4 deletions ServUO.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csp
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EF956787-B078-4D19-B03B-4A8F2A4841AD}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
README.md = README.md
EndProjectSection
EndProject
Expand All @@ -23,6 +24,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1A651504-B0F6-4D8C-B869-F84F645FE4CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A651504-B0F6-4D8C-B869-F84F645FE4CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A651504-B0F6-4D8C-B869-F84F645FE4CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A651504-B0F6-4D8C-B869-F84F645FE4CC}.Release|Any CPU.Build.0 = Release|Any CPU
{308EA7C6-2873-4E47-AF3F-ABBA3F8AB63E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{308EA7C6-2873-4E47-AF3F-ABBA3F8AB63E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{308EA7C6-2873-4E47-AF3F-ABBA3F8AB63E}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -31,10 +36,6 @@ Global
{AE4A9EAA-E0EB-4DC9-9604-BE4289F9F6C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE4A9EAA-E0EB-4DC9-9604-BE4289F9F6C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE4A9EAA-E0EB-4DC9-9604-BE4289F9F6C3}.Release|Any CPU.Build.0 = Release|Any CPU
{1A651504-B0F6-4D8C-B869-F84F645FE4CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A651504-B0F6-4D8C-B869-F84F645FE4CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A651504-B0F6-4D8C-B869-F84F645FE4CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A651504-B0F6-4D8C-B869-F84F645FE4CC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion Server/AggressorInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private AggressorInfo(Mobile attacker, Mobile defender, bool criminal)

public static void DumpAccess()
{
using (StreamWriter op = new StreamWriter("warnings.log", true))
using (var op = new StreamWriter("warnings.log", true))
{
op.WriteLine("Warning: Access to queued AggressorInfo:");
op.WriteLine(new StackTrace());
Expand Down
168 changes: 84 additions & 84 deletions Server/Assets/AnimData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,88 +5,88 @@

namespace Server
{
public sealed class AnimData
{
private static readonly int[] m_Header;
private static readonly byte[] m_Unknown;

public static Hashtable Table { get; } = new Hashtable();

static unsafe AnimData()
{
string path = Core.FindDataFile("animdata.mul");

if (path == null)
return;

using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
using (BinaryReader bin = new BinaryReader(fs))
{
int id = 0;
int h = 0;

byte unk, fcount, finter, fstart;

sbyte[] fdata;

m_Header = new int[bin.BaseStream.Length / (4 + 8 * (64 + 4))];

while (h < m_Header.Length)
{
m_Header[h++] = bin.ReadInt32(); // chunk header

byte[] buffer = bin.ReadBytes(544); // Read 8 tiles

fixed (byte* buf = buffer)
{
byte* data = buf;

for (int i = 0; i < 8; ++i, ++id)
{
fdata = new sbyte[64];

for (int j = 0; j < 64; ++j)
fdata[j] = (sbyte)*data++;

unk = *data++;
fcount = *data++;
finter = *data++;
fstart = *data++;

if (fcount > 0)
Table[id] = new AnimationData(fdata, unk, fcount, finter, fstart);
}
}
}

int remaining = (int)(bin.BaseStream.Length - bin.BaseStream.Position);

if (remaining > 0)
m_Unknown = bin.ReadBytes(remaining);
}
}

public static AnimationData GetData(int id)
{
return (AnimationData)Table[id];
}
}

public class AnimationData
{
public sbyte[] FrameData { get; set; }
public byte Unknown { get; private set; }
public byte FrameCount { get; set; }
public byte FrameInterval { get; set; }
public byte FrameStart { get; set; }

public AnimationData(sbyte[] frame, byte unk, byte fcount, byte finter, byte fstart)
{
FrameData = frame;
Unknown = unk;
FrameCount = fcount;
FrameInterval = finter;
FrameStart = fstart;
}
}
public sealed class AnimData
{
private static readonly int[] m_Header;
private static readonly byte[] m_Unknown;

public static Hashtable Table { get; } = new Hashtable();

static unsafe AnimData()
{
var path = Core.FindDataFile("animdata.mul");

if (path == null)
return;

using (var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
using (var bin = new BinaryReader(fs))
{
var id = 0;
var h = 0;

byte unk, fcount, finter, fstart;

sbyte[] fdata;

m_Header = new int[bin.BaseStream.Length / (4 + 8 * (64 + 4))];

while (h < m_Header.Length)
{
m_Header[h++] = bin.ReadInt32(); // chunk header

var buffer = bin.ReadBytes(544); // Read 8 tiles

fixed (byte* buf = buffer)
{
var data = buf;

for (var i = 0; i < 8; ++i, ++id)
{
fdata = new sbyte[64];

for (var j = 0; j < 64; ++j)
fdata[j] = (sbyte)*data++;

unk = *data++;
fcount = *data++;
finter = *data++;
fstart = *data++;

if (fcount > 0)
Table[id] = new AnimationData(fdata, unk, fcount, finter, fstart);
}
}
}

var remaining = (int)(bin.BaseStream.Length - bin.BaseStream.Position);

if (remaining > 0)
m_Unknown = bin.ReadBytes(remaining);
}
}

public static AnimationData GetData(int id)
{
return (AnimationData)Table[id];
}
}

public class AnimationData
{
public sbyte[] FrameData { get; set; }
public byte Unknown { get; private set; }
public byte FrameCount { get; set; }
public byte FrameInterval { get; set; }
public byte FrameStart { get; set; }

public AnimationData(sbyte[] frame, byte unk, byte fcount, byte finter, byte fstart)
{
FrameData = frame;
Unknown = unk;
FrameCount = fcount;
FrameInterval = finter;
FrameStart = fstart;
}
}
}
Loading

0 comments on commit f840e50

Please sign in to comment.