diff --git a/Programs/Baker/Baker.csproj b/Programs/Baker/Baker.csproj
index 2563b0c5..49fad964 100644
--- a/Programs/Baker/Baker.csproj
+++ b/Programs/Baker/Baker.csproj
@@ -1,91 +1,52 @@
-
- Local
- 14.0.25123
- 2.0
- {95F42663-0000-0000-0000-000000000000}
- Debug
- Baker
- JScript
- Grid
- IE50
- false
- net462;net471;net48
- WinExe
-
- Baker
- true
-
-
- True
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
- True
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
-
- System
- False
-
-
- System.Data
- False
-
-
- System.Drawing
- False
-
-
- System.Windows.Forms
- False
-
-
-
-
-
-
-
-
-
-
-
- OpenMetaverse Developers
- 1.2.0
- Copyright © OpenMetaverse Developers 2008, 2017 All rights reserved
- LibreMetaverse
-
-
+
+ Local
+ 14.0.25123
+ {95F42663-0000-0000-0000-000000000000}
+ JScript
+ Grid
+ IE50
+ net462;net471;net48
+ WinExe
+
+ true
+ 1591,1574,0419
+ False
+ 285212672
+
+ True
+ ..\..\bin\
+
+ False
+ 4096
+ False
+
+
+
+
+
+
+ OpenMetaverse Developers
+ 1.2.0
+ Copyright © OpenMetaverse Developers 2008, 2017 All rights reserved
+ LibreMetaverse
+
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Programs/VoiceTest/VoiceTest.csproj b/Programs/VoiceTest/VoiceTest.csproj
index 645c846c..fb97295f 100644
--- a/Programs/VoiceTest/VoiceTest.csproj
+++ b/Programs/VoiceTest/VoiceTest.csproj
@@ -1,76 +1,45 @@
-
- Local
- 14.0.25123
- 2.0
- {EE4EA934-0000-0000-0000-000000000000}
- Debug
-
-
- VoiceTest
- JScript
- Grid
- IE50
- false
- netstandard2.0;netstandard2.1
- Exe
- VoiceTest
- true
-
-
- True
- 285212672
- False
-
-
- TRACE;DEBUG
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
- True
- 285212672
- False
-
-
- TRACE
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.2.0
- OpenMetaverse Developers
- Copyright © OpenMetaverse Developers 2008, 2017 All rights reserved
- LibreMetaverse
-
-
+
+ Local
+ 14.0.25123
+ {EE4EA934-0000-0000-0000-000000000000}
+
+ JScript
+ Grid
+ IE50
+ netstandard2.0;netstandard2.1
+ Exe
+ true
+ ..\..\bin\
+ 1591,1574,0419
+ True
+ False
+
+ False
+ 285212672
+ False
+ 4096
+
+
+
+
+
+
+
+
+
+
+ 1.2.0
+ OpenMetaverse Developers
+ Copyright © OpenMetaverse Developers 2008, 2017 All rights reserved
+ LibreMetaverse
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Programs/examples/Dashboard/Dashboard.csproj b/Programs/examples/Dashboard/Dashboard.csproj
index a2c26ec9..2983f114 100644
--- a/Programs/examples/Dashboard/Dashboard.csproj
+++ b/Programs/examples/Dashboard/Dashboard.csproj
@@ -1,120 +1,57 @@
-
-
- Local
- 14.0.25123
- 2.0
- {592827AA-0000-0000-0000-000000000000}
- Debug
-
-
-
- Dashboard
- JScript
- Grid
- IE50
- false
- v4.0
- WinExe
-
- Dashboard
-
-
-
-
-
-
- True
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
- True
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
-
- System
- False
-
-
- System.Drawing
- False
-
-
- System.Windows.Forms
- False
-
-
-
-
- LibreMetaverse
- {27C70F3A-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- LibreMetaverse.GUI
- {09C292AF-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- LibreMetaverseTypes
- {B37B02AD-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Dashboard.cs
-
-
- Dashboard.cs
-
-
-
-
-
-
-
-
-
-
+
+
+ Local
+ 14.0.25123
+ {592827AA-0000-0000-0000-000000000000}
+
+
+ JScript
+ Grid
+ IE50
+ net40
+ WinExe
+
+
+
+
+
+ True
+
+ False
+ False
+ 1591,1574,0419
+ 4096
+ False
+ 285212672
+ ..\..\..\bin\
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+
+
+
+
+
+
+
+
+
+ Dashboard.cs
+
+
+ Dashboard.cs
+
+
+
\ No newline at end of file
diff --git a/Programs/examples/GridAccountant/AssemblyInfo.cs b/Programs/examples/GridAccountant/AssemblyInfo.cs
index 9f89a328..77ecbc8b 100644
--- a/Programs/examples/GridAccountant/AssemblyInfo.cs
+++ b/Programs/examples/GridAccountant/AssemblyInfo.cs
@@ -1,33 +1,6 @@
-using System.Reflection;
+using System.Reflection;
using System.Runtime.CompilerServices;
-//
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
-
//
// In order to sign your assembly you must specify a key to use. Refer to the
// Microsoft .NET Framework documentation for more information on assembly signing.
diff --git a/Programs/examples/GridAccountant/GridAccountant.csproj b/Programs/examples/GridAccountant/GridAccountant.csproj
index 056dd742..5d88202b 100644
--- a/Programs/examples/GridAccountant/GridAccountant.csproj
+++ b/Programs/examples/GridAccountant/GridAccountant.csproj
@@ -1,115 +1,56 @@
-
-
- Local
- 14.0.25123
- 2.0
- {6DE58F9A-0000-0000-0000-000000000000}
- Debug
-
-
-
- GridAccountant
- JScript
- Grid
- IE50
- false
- v4.0
- WinExe
-
- GridAccountant
-
-
-
-
-
-
- True
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
- True
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
-
- System
- False
-
-
- System.Data
- False
-
-
- System.Drawing
- False
-
-
- System.Windows.Forms
- False
-
-
-
-
- LibreMetaverse
- {27C70F3A-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- LibreMetaverseTypes
- {B37B02AD-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- frmGridAccountant.cs
-
-
-
-
-
-
-
-
-
-
+
+
+ Local
+ 14.0.25123
+ {6DE58F9A-0000-0000-0000-000000000000}
+
+
+ JScript
+ Grid
+ IE50
+ net40
+ WinExe
+
+
+
+
+ false
+ 1.0.*
+ 1.0.*
+ 285212672
+ False
+
+
+ 1591,1574,0419
+ 4096
+ False
+ ..\..\..\bin\
+ True
+ False
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+
+
+
+
+
+
+
+
+ frmGridAccountant.cs
+
+
+
\ No newline at end of file
diff --git a/Programs/examples/Heightmap/Heightmap.csproj b/Programs/examples/Heightmap/Heightmap.csproj
index 7f42efef..1a14175e 100644
--- a/Programs/examples/Heightmap/Heightmap.csproj
+++ b/Programs/examples/Heightmap/Heightmap.csproj
@@ -1,118 +1,56 @@
-
-
- Local
- 14.0.25123
- 2.0
- {16044D2B-0000-0000-0000-000000000000}
- Debug
-
-
-
- Heightmap
- JScript
- Grid
- IE50
- false
- v4.0
- WinExe
-
- Heightmap
-
-
-
-
-
-
- True
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
- True
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
-
- System
- False
-
-
- System.Data
- False
-
-
- System.Drawing
- False
-
-
- System.Windows.Forms
- False
-
-
-
-
- LibreMetaverse
- {27C70F3A-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- LibreMetaverseTypes
- {B37B02AD-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- frmHeightmap.cs
-
-
- frmHeightmap.cs
-
-
-
-
-
-
-
-
-
-
+
+
+ Local
+ 14.0.25123
+ {16044D2B-0000-0000-0000-000000000000}
+
+
+ JScript
+ Grid
+ IE50
+ net40
+ WinExe
+
+
+
+
+ 1591,1574,0419
+
+ False
+
+ False
+ False
+ 4096
+ 285212672
+ True
+ ..\..\..\bin\
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+
+
+
+
+
+
+
+
+ frmHeightmap.cs
+
+
+ frmHeightmap.cs
+
+
+
\ No newline at end of file
diff --git a/Programs/examples/IRCGateway/IRCGateway.csproj b/Programs/examples/IRCGateway/IRCGateway.csproj
index aa3bb58c..f4d1e98d 100644
--- a/Programs/examples/IRCGateway/IRCGateway.csproj
+++ b/Programs/examples/IRCGateway/IRCGateway.csproj
@@ -1,72 +1,41 @@
-
- Local
- 14.0.25123
- 2.0
- {89049BBC-0000-0000-0000-000000000000}
- Debug
-
-
- IRCGateway
- JScript
- Grid
- IE50
- false
- netstandard2.0;netstandard2.1
- Exe
- IRCGateway
- true
-
-
- True
- 285212672
- False
-
-
- TRACE;DEBUG
- True
- 4096
- False
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
- True
- 285212672
- False
-
-
- TRACE
- False
- 4096
- True
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
-
-
-
-
-
-
-
-
- 1.2.0
- OpenMetaverse Developers
- LibreMetaverse
- Copyright © OpenMetaverse Developers 2008, 2017 All rights reserved
-
-
+
+ Local
+ 14.0.25123
+ {89049BBC-0000-0000-0000-000000000000}
+
+ JScript
+ Grid
+ IE50
+ netstandard2.0;netstandard2.1
+ Exe
+ true
+ False
+ False
+ 4096
+ True
+ ..\..\..\bin\
+ 1591,1574,0419
+
+ 285212672
+ False
+
+
+
+
+
+
+
+
+
+
+ 1.2.0
+ OpenMetaverse Developers
+ LibreMetaverse
+ Copyright © OpenMetaverse Developers 2008, 2017 All rights reserved
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Programs/examples/PacketDump/PacketDump.csproj b/Programs/examples/PacketDump/PacketDump.csproj
index 40c997c4..7ab86041 100644
--- a/Programs/examples/PacketDump/PacketDump.csproj
+++ b/Programs/examples/PacketDump/PacketDump.csproj
@@ -1,75 +1,44 @@
-
- Local
- 14.0.25123
- 2.0
- {58443010-0000-0000-0000-000000000000}
- Debug
-
-
- PacketDump
- JScript
- Grid
- IE50
- false
- netstandard2.0;netstandard2.1
- Exe
- PacketDump
- true
-
-
- True
- 285212672
- False
-
-
- TRACE;DEBUG
- True
- 4096
- False
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
- True
- 285212672
- False
-
-
- TRACE
- False
- 4096
- True
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.2.0
- OpenMetaverse Developers
- LibreMetaverse
- Copyright © OpenMetaverse Developers 2008, 2017 All rights reserved
-
-
+
+ Local
+ 14.0.25123
+ {58443010-0000-0000-0000-000000000000}
+
+ JScript
+ Grid
+ IE50
+ netstandard2.0;netstandard2.1
+ Exe
+ true
+ False
+
+ False
+ 4096
+ False
+ True
+ 1591,1574,0419
+ ..\..\..\bin\
+ 285212672
+
+
+
+
+
+
+
+
+
+
+ 1.2.0
+ OpenMetaverse Developers
+ LibreMetaverse
+ Copyright © OpenMetaverse Developers 2008, 2017 All rights reserved
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Programs/examples/TestClient/TestClient.csproj b/Programs/examples/TestClient/TestClient.csproj
index 61d36749..67b32f99 100644
--- a/Programs/examples/TestClient/TestClient.csproj
+++ b/Programs/examples/TestClient/TestClient.csproj
@@ -1,74 +1,47 @@
-
- Local
- 14.0.25123
- 2.0
- {9F71FDB3-0000-0000-0000-000000000000}
- Debug
- TestClient
- JScript
- Grid
- IE50
- false
- netstandard2.0;netstandard2.1
- Exe
- TestClient
- true
-
-
- True
- 285212672
- False
- TRACE;DEBUG
- True
- 4096
- False
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
- True
- 285212672
- False
- TRACE
- False
- 4096
- True
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.2.0
- OpenMetaverse Developers
- LibreMetaverse
- Copyright © OpenMetaverse Developers 2008, 2017 All rights reserved
-
-
+
+ Local
+ 14.0.25123
+ {9F71FDB3-0000-0000-0000-000000000000}
+ JScript
+ Grid
+ IE50
+ netstandard2.0;netstandard2.1
+ Exe
+ true
+ 1591,1574,0419
+ True
+ 285212672
+ 4096
+ False
+ False
+ ..\..\..\bin\
+ False
+
+
+
+
+
+
+
+
+
+
+ 1.2.0
+ OpenMetaverse Developers
+ LibreMetaverse
+ Copyright © OpenMetaverse Developers 2008, 2017 All rights reserved
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Programs/examples/groupmanager/groupmanager.csproj b/Programs/examples/groupmanager/groupmanager.csproj
index 0f44a605..1b84e930 100644
--- a/Programs/examples/groupmanager/groupmanager.csproj
+++ b/Programs/examples/groupmanager/groupmanager.csproj
@@ -1,124 +1,62 @@
-
-
- Local
- 14.0.25123
- 2.0
- {97A800BC-0000-0000-0000-000000000000}
- Debug
-
-
-
- groupmanager
- JScript
- Grid
- IE50
- false
- v4.0
- WinExe
-
- groupmanager
-
-
-
-
-
-
- True
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
- True
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\..\bin\
- False
- False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
-
-
-
- System
- False
-
-
- System.Data
- False
-
-
- System.Drawing
- False
-
-
- System.Windows.Forms
- False
-
-
-
-
- LibreMetaverse
- {27C70F3A-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- LibreMetaverseTypes
- {B37B02AD-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- frmGroupInfo.cs
-
-
- frmGroupInfo.cs
-
-
- frmGroupManager.cs
-
-
- frmGroupManager.cs
-
-
-
-
-
-
-
-
-
-
+
+
+ Local
+ 14.0.25123
+ {97A800BC-0000-0000-0000-000000000000}
+
+
+ JScript
+ Grid
+ IE50
+ net40
+ WinExe
+
+
+
+
+
+ True
+ False
+ 4096
+ False
+ False
+ ..\..\..\bin\
+ 285212672
+ 1591,1574,0419
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+
+
+
+
+
+
+
+
+ frmGroupInfo.cs
+
+
+ frmGroupInfo.cs
+
+
+ frmGroupManager.cs
+
+
+ frmGroupManager.cs
+
+
+
\ No newline at end of file
diff --git a/Programs/mapgenerator/ProtocolManager.cs b/Programs/mapgenerator/ProtocolManager.cs
index 9653fd2f..883cc3df 100644
--- a/Programs/mapgenerator/ProtocolManager.cs
+++ b/Programs/mapgenerator/ProtocolManager.cs
@@ -89,13 +89,13 @@ namespace mapgenerator
{
MapField temp = (MapField)obj;
- if (this.KeywordPosition > temp.KeywordPosition)
+ if (KeywordPosition > temp.KeywordPosition)
{
return 1;
}
else
{
- if(temp.KeywordPosition == this.KeywordPosition)
+ if(temp.KeywordPosition == KeywordPosition)
{
return 0;
}
@@ -130,13 +130,13 @@ namespace mapgenerator
{
MapBlock temp = (MapBlock)obj;
- if (this.KeywordPosition > temp.KeywordPosition)
+ if (KeywordPosition > temp.KeywordPosition)
{
return 1;
}
else
{
- if(temp.KeywordPosition == this.KeywordPosition)
+ if(temp.KeywordPosition == KeywordPosition)
{
return 0;
}
@@ -186,9 +186,7 @@ namespace mapgenerator
///
///
///
- ///
///
- ///
public ProtocolManager(string mapFile)
{
// Initialize the map arrays
@@ -197,26 +195,28 @@ namespace mapgenerator
HighMaps = new MapPacket[256];
// Build the type size hash table
- TypeSizes = new Dictionary();
- TypeSizes.Add(FieldType.U8, 1);
- TypeSizes.Add(FieldType.U16, 2);
- TypeSizes.Add(FieldType.U32, 4);
- TypeSizes.Add(FieldType.U64, 8);
- TypeSizes.Add(FieldType.S8, 1);
- TypeSizes.Add(FieldType.S16, 2);
- TypeSizes.Add(FieldType.S32, 4);
- TypeSizes.Add(FieldType.F32, 4);
- TypeSizes.Add(FieldType.F64, 8);
- TypeSizes.Add(FieldType.LLUUID, 16);
- TypeSizes.Add(FieldType.BOOL, 1);
- TypeSizes.Add(FieldType.LLVector3, 12);
- TypeSizes.Add(FieldType.LLVector3d, 24);
- TypeSizes.Add(FieldType.LLVector4, 16);
- TypeSizes.Add(FieldType.LLQuaternion, 16);
- TypeSizes.Add(FieldType.IPADDR, 4);
- TypeSizes.Add(FieldType.IPPORT, 2);
- TypeSizes.Add(FieldType.Variable, -1);
- TypeSizes.Add(FieldType.Fixed, -2);
+ TypeSizes = new Dictionary
+ {
+ {FieldType.U8, 1},
+ {FieldType.U16, 2},
+ {FieldType.U32, 4},
+ {FieldType.U64, 8},
+ {FieldType.S8, 1},
+ {FieldType.S16, 2},
+ {FieldType.S32, 4},
+ {FieldType.F32, 4},
+ {FieldType.F64, 8},
+ {FieldType.LLUUID, 16},
+ {FieldType.BOOL, 1},
+ {FieldType.LLVector3, 12},
+ {FieldType.LLVector3d, 24},
+ {FieldType.LLVector4, 16},
+ {FieldType.LLQuaternion, 16},
+ {FieldType.IPADDR, 4},
+ {FieldType.IPPORT, 2},
+ {FieldType.Variable, -1},
+ {FieldType.Fixed, -2}
+ };
KeywordPositions = new Dictionary();
LoadMapFile(mapFile);
@@ -336,9 +336,10 @@ namespace mapgenerator
///
///
///
+ ///
///
///
- private void PrintOneMap(TextWriter writer, MapPacket[] map, string frequency) {
+ private void PrintOneMap(TextWriter writer, MapPacket[] map, string frequency) {
int i;
for (i = 0; i < map.Length; ++i)
@@ -515,53 +516,61 @@ namespace mapgenerator
// Truncate the id to a short
packetID &= 0xFFFF;
- LowMaps[packetID] = new MapPacket();
- LowMaps[packetID].ID = (ushort)packetID;
- LowMaps[packetID].Frequency = PacketFrequency.Low;
- LowMaps[packetID].Name = tokens[0];
- LowMaps[packetID].Trusted = (tokens[3] == "Trusted");
- LowMaps[packetID].Encoded = (tokens[4] == "Zerocoded");
- LowMaps[packetID].Blocks = new List();
+ LowMaps[packetID] = new MapPacket
+ {
+ ID = (ushort) packetID,
+ Frequency = PacketFrequency.Low,
+ Name = tokens[0],
+ Trusted = (tokens[3] == "Trusted"),
+ Encoded = (tokens[4] == "Zerocoded"),
+ Blocks = new List()
+ };
- currentPacket = LowMaps[packetID];
+ currentPacket = LowMaps[packetID];
}
else if (tokens[1] == "Low")
{
- LowMaps[packetID] = new MapPacket();
- LowMaps[packetID].ID = (ushort)packetID;
- LowMaps[packetID].Frequency = PacketFrequency.Low;
- LowMaps[packetID].Name = tokens[0];
- LowMaps[packetID].Trusted = (tokens[2] == "Trusted");
- LowMaps[packetID].Encoded = (tokens[4] == "Zerocoded");
- LowMaps[packetID].Blocks = new List();
+ LowMaps[packetID] = new MapPacket
+ {
+ ID = (ushort) packetID,
+ Frequency = PacketFrequency.Low,
+ Name = tokens[0],
+ Trusted = (tokens[2] == "Trusted"),
+ Encoded = (tokens[4] == "Zerocoded"),
+ Blocks = new List()
+ };
- currentPacket = LowMaps[packetID];
+ currentPacket = LowMaps[packetID];
}
else if (tokens[1] == "Medium")
{
- MediumMaps[packetID] = new MapPacket();
- MediumMaps[packetID].ID = (ushort)packetID;
- MediumMaps[packetID].Frequency = PacketFrequency.Medium;
- MediumMaps[packetID].Name = tokens[0];
- MediumMaps[packetID].Trusted = (tokens[2] == "Trusted");
- MediumMaps[packetID].Encoded = (tokens[4] == "Zerocoded");
- MediumMaps[packetID].Blocks = new List();
+ MediumMaps[packetID] = new MapPacket
+ {
+ ID = (ushort) packetID,
+ Frequency = PacketFrequency.Medium,
+ Name = tokens[0],
+ Trusted = (tokens[2] == "Trusted"),
+ Encoded = (tokens[4] == "Zerocoded"),
+ Blocks = new List()
+ };
- currentPacket = MediumMaps[packetID];
+ currentPacket = MediumMaps[packetID];
}
else if (tokens[1] == "High")
{
- HighMaps[packetID] = new MapPacket();
- HighMaps[packetID].ID = (ushort)packetID;
- HighMaps[packetID].Frequency = PacketFrequency.High;
- HighMaps[packetID].Name = tokens[0];
- HighMaps[packetID].Trusted = (tokens[2] == "Trusted");
- HighMaps[packetID].Encoded = (tokens[4] == "Zerocoded");
- HighMaps[packetID].Blocks = new List();
+ HighMaps[packetID] = new MapPacket
+ {
+ ID = (ushort) packetID,
+ Frequency = PacketFrequency.High,
+ Name = tokens[0],
+ Trusted = (tokens[2] == "Trusted"),
+ Encoded = (tokens[4] == "Zerocoded"),
+ Blocks = new List()
+ };
- currentPacket = HighMaps[packetID];
+ currentPacket = HighMaps[packetID];
}
else
@@ -590,14 +599,7 @@ namespace mapgenerator
field.KeywordPosition = KeywordPosition(field.Name);
field.Type = (FieldType)Enum.Parse(typeof(FieldType), tokens[2], true);
- if (tokens[3] != "}")
- {
- field.Count = Int32.Parse(tokens[3]);
- }
- else
- {
- field.Count = 1;
- }
+ field.Count = tokens[3] != "}" ? Int32.Parse(tokens[3]) : 1;
// Save this field to the current block
currentBlock.Fields.Add(field);
@@ -667,7 +669,7 @@ namespace mapgenerator
}
int hash = 0;
- for (int i = 1; i < keyword.Length; i++)
+ for (var i = 1; i < keyword.Length; ++i)
{
hash = (hash + (int)(keyword[i])) * 2;
}
diff --git a/Programs/mapgenerator/app.config b/Programs/mapgenerator/app.config
deleted file mode 100644
index d7c60fd5..00000000
--- a/Programs/mapgenerator/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/Programs/mapgenerator/mapgenerator.csproj b/Programs/mapgenerator/mapgenerator.csproj
index 42d991b1..6f61033a 100644
--- a/Programs/mapgenerator/mapgenerator.csproj
+++ b/Programs/mapgenerator/mapgenerator.csproj
@@ -1,98 +1,37 @@
-
+
Local
14.0.25123
- 2.0
{2867B4B3-0000-0000-0000-000000000000}
- Debug
-
-
-
-
- mapgenerator
+
+
JScript
Grid
IE50
- false
- v4.7.1
+ netstandard2.0
Exe
-
-
- mapgenerator
-
-
-
-
-
-
-
-
-
- True
- 285212672
- False
-
-
- TRACE;DEBUG
-
-
- True
- 4096
- False
- ..\..\bin\
- False
+
+
+
+
False
- False
- 4
- False
- 1591,1574,0419
- AnyCPU
- false
-
-
True
- 285212672
- False
-
-
- TRACE
-
-
- False
- 4096
- True
..\..\bin\
+ 285212672
+ 4096
False
- False
- False
- 4
- False
1591,1574,0419
- AnyCPU
- false
+
+ False
+
+
+
-
-
- System
- False
-
-
-
-
-
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file