Skip to content

Commit

Permalink
restore tabs and editorconfig file
Browse files Browse the repository at this point in the history
  • Loading branch information
JavidPack committed Mar 1, 2019
1 parent 37793fd commit 928a870
Show file tree
Hide file tree
Showing 6 changed files with 360 additions and 276 deletions.
84 changes: 84 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# Rules in this file were initially inferred by Visual Studio IntelliCode from the D:\Documents\My Games\Terraria\ModLoader\Mod Sources\HEROsMod\ codebase based on best match to current usage at 3/1/2019
# 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]

#Core editorconfig formatting - indentation

#use hard tabs for indentation
indent_style = tab

#Formatting - new line options

#require braces to be on a new line for control_blocks, types, properties, and methods (also known as "Allman" style)
csharp_new_line_before_open_brace = control_blocks, types, properties, methods

#Formatting - organize using options

#do not place System.* using directives before other using directives
dotnet_sort_system_directives_first = false

#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 - expression bodied member options

#prefer block bodies for accessors
csharp_style_expression_bodied_accessors = false:suggestion
#prefer block bodies for methods
csharp_style_expression_bodied_methods = false:suggestion
#prefer block bodies for properties
csharp_style_expression_bodied_properties = false:suggestion

#Style - expression level options

#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
dotnet_style_predefined_type_for_member_access = true:suggestion

#Style - implicit and explicit types

#prefer explicit type over var to declare variables with built-in system types such as int
csharp_style_var_for_built_in_types = false:suggestion
#prefer explicit type over var when the type is already mentioned on the right-hand side of a declaration
csharp_style_var_when_type_is_apparent = false: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 - qualification options

#prefer events not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_event = false:suggestion
#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
36 changes: 18 additions & 18 deletions HEROsModNetwork/DatabaseController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ public class DatabaseRegion
public int y;
public int width;
public int height;
public bool chestsprotected;
public Color color;
public bool chestsprotected;
public Color color;

//public byte[] permissions;
public int[] permissionsGroups;
Expand Down Expand Up @@ -531,11 +531,11 @@ public static void AddRegion(ref Region region)
dbRegion.y = region.Y;
dbRegion.width = region.Width;
dbRegion.height = region.Height;
dbRegion.chestsprotected = region.ChestsProtected;
//byte[] colorData = new byte[] { region.Color.R, region.Color.G, region.Color.B, region.Color.A };
//int colorNum = BitConverter.ToInt32(colorData, 0);
//dbRegion.color = colorNum;
dbRegion.color = region.Color;
dbRegion.chestsprotected = region.ChestsProtected;
//byte[] colorData = new byte[] { region.Color.R, region.Color.G, region.Color.B, region.Color.A };
//int colorNum = BitConverter.ToInt32(colorData, 0);
//dbRegion.color = colorNum;
dbRegion.color = region.Color;
//dbRegion.permissions = region.ExportPermissions();
dbRegion.permissionsPlayers = region.AllowedPlayersIDs.ToArray();
dbRegion.permissionsGroups = region.AllowedGroupsIDs.ToArray();
Expand Down Expand Up @@ -566,17 +566,17 @@ public static void WriteRegionColor(Region region)
SaveSetting(jsonDatabaseFilename);
}

public static void WriteRegionChestProtection(Region region)
{
DatabaseRegion r = currentDatabaseWorld.regions.Where(x => region.ID == x.ID).FirstOrDefault();
if (r != null)
{
r.chestsprotected = region.ChestsProtected;
}
SaveSetting(jsonDatabaseFilename);
}

public static void RemoveRegion(Region region)
public static void WriteRegionChestProtection(Region region)
{
DatabaseRegion r = currentDatabaseWorld.regions.Where(x => region.ID == x.ID).FirstOrDefault();
if (r != null)
{
r.chestsprotected = region.ChestsProtected;
}
SaveSetting(jsonDatabaseFilename);
}

public static void RemoveRegion(Region region)
{
DatabaseRegion databaseRegion = currentDatabaseWorld.regions.Where(x => x.ID == region.ID).FirstOrDefault();
if (databaseRegion != null)
Expand Down
72 changes: 36 additions & 36 deletions HEROsModNetwork/GeneralMessages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,13 @@ public static void ProcessData(ref BinaryReader reader, int playerNumber)
case MessageType.RequestChangeRegionColor:
ProcessChangeRegionColorRequest(ref reader, playerNumber);
break;
case MessageType.RequestToChangeRegionChestProtection:
ProcessChangeRegionChestProtectionRequest(ref reader, playerNumber);
break;
//case MessageType.RequestToggleHardmodeEnemies:
// ProcessToggleHardmodeEnemiesRequest(playerNumber);
// break;
case MessageType.RequestGodMode:
case MessageType.RequestToChangeRegionChestProtection:
ProcessChangeRegionChestProtectionRequest(ref reader, playerNumber);
break;
//case MessageType.RequestToggleHardmodeEnemies:
// ProcessToggleHardmodeEnemiesRequest(playerNumber);
// break;
case MessageType.RequestGodMode:
ProcessGodModeRequest(playerNumber);
break;

Expand Down Expand Up @@ -936,7 +936,7 @@ public static void RequestToChangeColorOfRegion(Region region, Color color)
Network.SendDataToServer();
}

private static void ProcessChangeRegionColorRequest(ref BinaryReader reader, int playerNumber)
private static void ProcessChangeRegionColorRequest(ref BinaryReader reader, int playerNumber)
{
if (Network.Players[playerNumber].Group.IsAdmin)
{
Expand All @@ -950,34 +950,34 @@ private static void ProcessChangeRegionColorRequest(ref BinaryReader reader, int
}
}

public static void RequestToChangeChestProtectionOfRegion(Region region, bool protectionEnabled)
{
WriteHeader(MessageType.RequestToChangeRegionChestProtection);
Writer.Write(region.ID);
Writer.Write(protectionEnabled);
Network.SendDataToServer();
}
public static void RequestToChangeChestProtectionOfRegion(Region region, bool protectionEnabled)
{
WriteHeader(MessageType.RequestToChangeRegionChestProtection);
Writer.Write(region.ID);
Writer.Write(protectionEnabled);
Network.SendDataToServer();
}

public static void ProcessChangeRegionChestProtectionRequest(ref BinaryReader reader, int playerNumber)
{
if (Network.Players[playerNumber].Group.IsAdmin)
{
Region region = Network.GetRegionByID(reader.ReadInt32());
if (region == null) return;
bool protectionEnabled = reader.ReadBoolean();
public static void ProcessChangeRegionChestProtectionRequest(ref BinaryReader reader, int playerNumber)
{
if (Network.Players[playerNumber].Group.IsAdmin)
{
Region region = Network.GetRegionByID(reader.ReadInt32());
if (region == null) return;
bool protectionEnabled = reader.ReadBoolean();

region.ChestsProtected = protectionEnabled;
DatabaseController.WriteRegionChestProtection(region);
SendRegionListToAllPlayers();
region.ChestsProtected = protectionEnabled;
DatabaseController.WriteRegionChestProtection(region);
SendRegionListToAllPlayers();

if(protectionEnabled)
Network.SendTextToPlayer($"Chest protection now enabled for region: {region.Name}", playerNumber, Color.Aqua);
else
Network.SendTextToPlayer($"Chest protection now disabled for region: {region.Name}", playerNumber, Color.Aqua);
}
}
if (protectionEnabled)
Network.SendTextToPlayer($"Chest protection now enabled for region: {region.Name}", playerNumber, Color.Aqua);
else
Network.SendTextToPlayer($"Chest protection now disabled for region: {region.Name}", playerNumber, Color.Aqua);
}
}

public static void RequestRestoreTiles(int playerID, bool onlinePlayer)
public static void RequestRestoreTiles(int playerID, bool onlinePlayer)
{
WriteHeader(MessageType.RequestRestoreTiles);

Expand Down Expand Up @@ -1292,7 +1292,7 @@ internal enum MessageType : byte
RequestAddGroupToRegion,
RequestChangeRegionColor,
RequestRemoveGroupFromRegion,
RequestRestoreTiles,
RequestRestoreTiles,
RequestSetSpawnPoint,
RequestToggleGravestones,
GravestonesToggled,
Expand All @@ -1310,9 +1310,9 @@ internal enum MessageType : byte
RequestTeleport,
RequestForcedSundial,
CurrentToggles,
SyncItemNonOwner,
RequestToChangeRegionChestProtection
}
SyncItemNonOwner,
RequestToChangeRegionChestProtection
}

public enum TimeChangeType
{
Expand Down
Loading

0 comments on commit 928a870

Please sign in to comment.