mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-22 12:47:46 +00:00
Code Activity

Merge branch 'develop' into group_work

Browse source 
# Conflicts:
#	FFXIVClassic Map Server/ConfigConstants.cs
This commit is contained in:
Filip Maj 2017-01-09 00:19:39 -05:00
commit 79de4fd1ff
14 changed files with 136 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
FFXIVClassic Lobby Server/ConfigConstants.cs
View file

@ -1,6 +1,8 @@
using FFXIVClassic.Common;
using System;
using System.IO;
using System.Linq;
using System.Net;
namespace FFXIVClassic_Lobby_Server
{
@ -23,7 +25,7 @@ namespace FFXIVClassic_Lobby_Server
if (!File.Exists("./lobby_config.ini"))
{
Program.Log.Error("FILE NOT FOUND!");
return false;
Program.Log.Error("Loading defaults...");
}
INIFile configIni = new INIFile("./lobby_config.ini");
@ -40,5 +42,34 @@ namespace FFXIVClassic_Lobby_Server
return true;
}
public static void ApplyLaunchArgs(string[] launchArgs)
{
var args = (from arg in launchArgs select arg.ToLower().Trim().TrimStart('-')).ToList();
for (var i = 0; i + 1 < args.Count; i += 2)
{
var arg = args[i];
var val = args[i + 1];
var legit = false;
if (arg == "ip")
{
IPAddress ip;
if (IPAddress.TryParse(val, out ip) && (legit = true))
OPTIONS_BINDIP = val;
}
else if (arg == "port")
{
UInt16 port;
if (UInt16.TryParse(val, out port) && (legit = true))
OPTIONS_PORT = val;
}
if (!legit)
{
Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);
}
}
}
}
}

2
FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj
View file

@ -133,7 +133,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy "$(SolutionDir)data\lobby_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)"</PostBuildEvent>
<PostBuildEvent>xcopy "$(SolutionDir)data\lobby_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)" /y</PostBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>

6
FFXIVClassic Lobby Server/Program.cs
View file

@ -25,8 +25,8 @@ namespace FFXIVClassic_Lobby_Server
bool startServer = true;
//Load Config
if (!ConfigConstants.Load())
startServer = false;
ConfigConstants.Load();
ConfigConstants.ApplyLaunchArgs(args);
//Test DB Connection
Program.Log.Info("Testing DB connection to \"{0}\"... ", ConfigConstants.DATABASE_HOST);
@ -51,7 +51,7 @@ namespace FFXIVClassic_Lobby_Server
{
Server server = new Server();
server.StartServer();
while (true) Thread.Sleep(10000);
while (true) Thread.Sleep(10000);
}
Program.Log.Info("Press any key to continue...");

43
FFXIVClassic Map Server/ConfigConstants.cs
View file

@ -1,6 +1,11 @@
using FFXIVClassic.Common;
using System;
using System.Collections.Generic;
using System.IO;
using System.Net.Sockets;
using MoonSharp.Interpreter.Interop;
using System.Linq;
using System.Net;
namespace FFXIVClassic_Map_Server
{
@ -8,8 +13,9 @@ namespace FFXIVClassic_Map_Server
{
public static String OPTIONS_BINDIP;
public static String OPTIONS_PORT;
public static bool OPTIONS_TIMESTAMP = false;
public static bool OPTIONS_TIMESTAMP = false;
public static uint DATABASE_WORLDID;
public static String DATABASE_HOST;
public static String DATABASE_PORT;
public static String DATABASE_NAME;
@ -23,7 +29,7 @@ namespace FFXIVClassic_Map_Server
if (!File.Exists("./map_config.ini"))
{
Program.Log.Error("FILE NOT FOUND");
return false;
Program.Log.Error("Loading defaults... ");
}
INIFile configIni = new INIFile("./map_config.ini");
@ -32,13 +38,44 @@ namespace FFXIVClassic_Map_Server
ConfigConstants.OPTIONS_PORT = configIni.GetValue("General", "server_port", "1989");
ConfigConstants.OPTIONS_TIMESTAMP = configIni.GetValue("General", "showtimestamp", "true").ToLower().Equals("true");
ConfigConstants.DATABASE_WORLDID = UInt32.Parse(configIni.GetValue("Database", "worldid", "0"));
ConfigConstants.DATABASE_HOST = configIni.GetValue("Database", "host", "");
ConfigConstants.DATABASE_PORT = configIni.GetValue("Database", "port", "");
ConfigConstants.DATABASE_NAME = configIni.GetValue("Database", "database", "");
ConfigConstants.DATABASE_USERNAME = configIni.GetValue("Database", "username", "");
ConfigConstants.DATABASE_PASSWORD = configIni.GetValue("Database", "password", "");
return true;
}
public static void ApplyLaunchArgs(string[] launchArgs)
{
var args = (from arg in launchArgs select arg.ToLower().Trim().TrimStart('-')).ToList();
for (var i = 0; i + 1 < args.Count; i += 2)
{
var arg = args[i];
var val = args[i + 1];
var legit = false;
if (arg == "ip")
{
IPAddress ip;
if (IPAddress.TryParse(val, out ip) && (legit = true))
OPTIONS_BINDIP = val;
}
else if (arg == "port")
{
UInt16 port;
if (UInt16.TryParse(val, out port) && (legit = true))
OPTIONS_PORT = val;
}
if (!legit)
{
Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);
}
}
}
}
}

10
FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
View file

@ -35,6 +35,9 @@
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>Always</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cyotek.Collections.Generic.CircularBuffer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=58daa28b0b2de221, processorArchitecture=MSIL">
<HintPath>..\packages\Cyotek.CircularBuffer.1.0.0.0\lib\net20\Cyotek.Collections.Generic.CircularBuffer.dll</HintPath>
@ -330,7 +333,12 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy "$(SolutionDir)data\map_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)"</PostBuildEvent>
<PostBuildEvent>xcopy "$(SolutionDir)data\map_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)" /d
xcopy "$(SolutionDir)data\scripts" "$(SolutionDir)$(ProjectName)\$(OutDir)scripts" /e /d /y /s</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>

4
FFXIVClassic Map Server/Program.cs
View file

@ -31,8 +31,8 @@ namespace FFXIVClassic_Map_Server
Program.Log.Info("---------FFXIV 1.0 Map Server---------");
//Load Config
if (!ConfigConstants.Load())
startServer = false;
ConfigConstants.Load();
ConfigConstants.ApplyLaunchArgs(args);
//Test DB Connection
Program.Log.Info("Testing DB connection... ");

2
FFXIVClassic Map Server/lua/LuaEngine.cs
View file

@ -207,7 +207,7 @@ namespace FFXIVClassic_Map_Server.lua
public static void RunGMCommand(Player player, String cmd, string[] param, bool help = false)
{
// load from scripts/commands/gm/ directory
var path = String.Format("./scripts/commands/gm/{0}.lua", cmd.ToString().ToLower());
var path = String.Format("./scripts/commands/gm/{0}.lua", cmd.ToLower());
// check if the file exists
if (File.Exists(path))

34
FFXIVClassic World Server/ConfigConstants.cs
View file

@ -1,6 +1,8 @@
using FFXIVClassic.Common;
using System;
using System.IO;
using System.Linq;
using System.Net;
namespace FFXIVClassic_World_Server
{
@ -26,7 +28,7 @@ namespace FFXIVClassic_World_Server
if (!File.Exists("./world_config.ini"))
{
Program.Log.Error("FILE NOT FOUND!");
return false;
Program.Log.Error("Loading defaults...");
}
INIFile configIni = new INIFile("./world_config.ini");
@ -44,5 +46,35 @@ namespace FFXIVClassic_World_Server
return true;
}
public static void ApplyLaunchArgs(string[] launchArgs)
{
var args = (from arg in launchArgs select arg.ToLower().Trim().TrimStart('-')).ToList();
for (var i = 0; i + 1 < args.Count; i += 2)
{
var arg = args[i];
var val = args[i + 1];
var legit = false;
if (arg == "ip")
{
IPAddress ip;
if (IPAddress.TryParse(val, out ip) && (legit = true))
OPTIONS_BINDIP = val;
}
else if (arg == "port")
{
UInt16 port;
if (UInt16.TryParse(val, out port) && (legit = true))
OPTIONS_PORT = val;
}
if (!legit)
{
Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);
}
}
}
}
}

3
FFXIVClassic World Server/FFXIVClassic World Server.csproj
View file

@ -156,6 +156,9 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(SolutionDir)data\world_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)" /d</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

4
FFXIVClassic World Server/Program.cs
View file

@ -39,8 +39,8 @@ namespace FFXIVClassic_World_Server
#endif
//Load Config
if (!ConfigConstants.Load())
startServer = false;
ConfigConstants.Load();
ConfigConstants.ApplyLaunchArgs(args);
//Test DB Connection
Log.Info("Testing DB connection... ");

2
data/lobby_config.ini
View file

@ -1,5 +1,5 @@
[General]
server_ip=127.0.0.1
server_ip=0.0.0.0
showtimestamp = true
[Database]

2
data/world_config.ini
View file

@ -1,5 +1,5 @@
[General]
server_ip=127.0.0.1
server_ip=0.0.0.0
showtimestamp = true
[Database]

13
sql/characters.sql
View file

@ -11,6 +11,7 @@ SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for characters
-- ----------------------------
DROP TABLE IF EXISTS `characters`;
CREATE TABLE `characters` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`userId` int(11) unsigned NOT NULL,
@ -30,11 +31,11 @@ CREATE TABLE `characters` (
`currentZoneId` smallint(5) unsigned DEFAULT '0',
`destinationZoneId` smallint(5) unsigned DEFAULT '0',
`destinationSpawnType` tinyint(3) unsigned DEFAULT '0',
`guardian` tinyint(3) unsigned NOT NULL,
`birthDay` tinyint(3) unsigned NOT NULL,
`birthMonth` tinyint(3) unsigned NOT NULL,
`initialTown` tinyint(3) unsigned NOT NULL,
`tribe` tinyint(3) unsigned NOT NULL,
`guardian` tinyint(3) unsigned NOT NULL DEFAULT '0',
`birthDay` tinyint(3) unsigned NOT NULL DEFAULT '0',
`birthMonth` tinyint(3) unsigned NOT NULL DEFAULT '0',
`initialTown` tinyint(3) unsigned NOT NULL DEFAULT '0',
`tribe` tinyint(3) unsigned NOT NULL DEFAULT '0',
`gcCurrent` tinyint(3) unsigned DEFAULT '0',
`gcLimsaRank` tinyint(3) unsigned DEFAULT '127',
`gcGridaniaRank` tinyint(3) unsigned DEFAULT '127',
@ -45,4 +46,4 @@ CREATE TABLE `characters` (
`currentPartyGroupId` bigint(20) unsigned DEFAULT '0',
`currentRetainerGroupId` bigint(20) unsigned DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=162 DEFAULT CHARSET=utf8;
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;

2
sql/users.sql
View file

@ -30,7 +30,7 @@ CREATE TABLE `users` (
`email` varchar(256) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `name_UNIQUE` (`name`)
) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--