Merge pull request #129 from ProGEEK/master

Updates to ARK: Survival Evolved and DayZ Mod / Arma 2

modules/config_games/server_configs/arkse_linux64.xml

@@ -14,7 +14,7 @@
     <cli_param id="CONTROL_PASSWORD" cli_string="?ServerAdminPassword=" />
   </cli_params>
   <reserve_ports>
-    <port type="add" id="QUERY_PORT" cli_string="?QueryPort=">1</port>
+    <port type="add" id="QUERY_PORT" cli_string="?QueryPort=">19238</port>
   </reserve_ports>
   <map_list>maplist.txt</map_list>
   <console_log>ShooterGame/Saved/Logs/ShooterGame.log</console_log>

modules/config_games/server_configs/arkse_win64.xml

@@ -14,7 +14,7 @@
     <cli_param id="CONTROL_PASSWORD" cli_string="?ServerAdminPassword=" />
   </cli_params>
   <reserve_ports>
-    <port type="add" id="QUERY_PORT" cli_string="?QueryPort=">1</port>
+    <port type="add" id="QUERY_PORT" cli_string="?QueryPort=">19238</port>
   </reserve_ports>
   <map_list>maplist.txt</map_list>
   <console_log>ShooterGame/Saved/Logs/ShooterGame.log</console_log>
@@ -151,4 +151,4 @@
         echo TheIsland>> maplist.txt
     fi
   </post_install>
-</game_config>
+</game_config>

modules/config_games/server_configs/dayz_arma2co_linux.xml

@@ -1,7 +1,7 @@
 <game_config>
  <game_key>dayz_arma2co_linux</game_key>
  <protocol>lgsl</protocol>
- <lgsl_query_name>dayz_arma2co</lgsl_query_name>
+ <lgsl_query_name>dayzmod</lgsl_query_name>
  <game_name>DayZ</game_name>
  <server_exec_name>server</server_exec_name><!-- arma2arrowhead -->
  <cli_template>-server -mod="@hive;@dayz" -config="cfgdayz/server.cfg" -cfg="cfgdayz/basic.cfg" %PORT% -beta="expansion/beta;expansion/beta/expansion" -noSound -noPause -world=Chernarus -profiles=cfgdayz -name=cfgdayz %CPUCOUNT% -showscripterrors %PID_FILE% %MEMORY%</cli_template>
@@ -12,9 +12,9 @@
  <console_log>cfgdayz/arma2oaserver.RPT</console_log>
  <control_protocol>rcon2</control_protocol>
  <mods>
-  <mod key='dayz'>
+  <mod key='dayzmod'>
    <name>none</name>
-   <installer_name>dayz</installer_name>
+   <installer_name>dayzmod</installer_name>
   </mod>
  </mods>
  <replace_texts>
@@ -51,4 +51,4 @@
    <desc>Maximum usable CPUs, for example: 4</desc>
   </param>
  </server_params>
-</game_config>
+</game_config>

modules/config_games/server_configs/dayz_arma2co_win32.xml

@@ -1,7 +1,7 @@
 <game_config>
  <game_key>dayz_arma2co_win32</game_key>
  <protocol>lgsl</protocol>
- <lgsl_query_name>dayz_arma2co</lgsl_query_name>
+ <lgsl_query_name>dayzmod</lgsl_query_name>
  <game_name>DayZ</game_name>
  <server_exec_name>Expansion\beta\arma2oaserver.exe</server_exec_name>
  <cli_template>-mod=Expansion\beta;Expansion\beta\expansion;ca;@hive;@dayz -name=cfgdayz -config=cfgdayz\server.cfg -cfg=cfgdayz\arma2.cfg -profiles=cfgdayz %MEMORY% %PORT%</cli_template>
@@ -11,9 +11,9 @@
  <console_log>cfgdayz/arma2oaserver.RPT</console_log>
  <control_protocol>rcon2</control_protocol>
  <mods>
-  <mod key='dayz'>
+  <mod key='dayzmod'>
    <name>none</name>
-   <installer_name>dayz</installer_name>
+   <installer_name>dayzmod</installer_name>
   </mod>
  </mods>
  <replace_texts>
@@ -44,4 +44,4 @@
    <desc>Maximum usable memory in MB, for example: 1024</desc>
   </param>
  </server_params>
-</game_config>
+</game_config>

modules/config_games/server_configs/dayz_arma2oa_win32.xml

@@ -0,0 +1,66 @@
+<game_config>
+ <game_key>dayz_arma2oa_win32</game_key>
+ <protocol>lgsl</protocol>
+ <lgsl_query_name>dayzmod</lgsl_query_name>
+ <game_name>DayZ Mod (OA)</game_name>
+ <server_exec_name>arma2oaserver.exe</server_exec_name>
+ <cli_template>-autoInit -noSound -noPause "-mod=@DayZ_Epoch;@DayZ_Epoch_Server;" -name=epoch "-config=epoch\\server.cfg" "-cfg=epoch\\basic.cfg" -profiles=epoch %MEMORY%</cli_template>
+ <reserve_ports>
+    <port type="add" id="QUERY_PORT">1</port>
+ </reserve_ports>
+ <console_log>epoch/arma2oaserver.RPT</console_log>
+ <max_user_amount>64</max_user_amount>
+ <control_protocol>rcon2</control_protocol>
+ <mods>
+  <mod key='dayzmod'>
+   <name>none</name>
+   <installer_name>dayzmod</installer_name>
+  </mod>
+ </mods>
+ <replace_texts>
+  <text key="home_name">
+   <default>(hostName\s*=\s*")(.*)(";)</default>
+   <var>hostName = "%key%";</var>
+   <filepath>epoch/server.cfg</filepath>
+   <options>key-regex</options>
+  </text>
+  <text key="max_players">
+   <default>(maxPlayers\s*=\s*)(.*)(;)</default>
+   <var>maxPlayers = %key%;</var>
+   <filepath>epoch/server.cfg</filepath>
+   <options>key-regex</options>
+  </text>
+  <text key="control_password">
+   <default>(passwordAdmin\s*=\s*")(.*)(";)</default>
+   <var>passwordAdmin = "%key%";</var>
+   <filepath>epoch/server.cfg</filepath>
+   <options>key-regex</options>
+  </text>
+  <text key="control_password">
+   <default>(RConPassword\s*)(.*)</default>
+   <var>RConPassword %key%</var>
+   <filepath>epoch/BattlEye/BEServer.cfg</filepath>
+   <options>key-regex</options>
+  </text>
+  <text key="port">
+   <default>(steamPort\s*=\s*)(.*)(;)</default>
+   <var>steamPort = %key%;</var>
+   <filepath>epoch/server.cfg</filepath>
+   <options>key-regex</options>
+  </text>
+  <text key="query_port">
+   <default>(steamQueryPort\s*=\s*)(.*)(;)</default>
+   <var>steamQueryPort = %key%;</var>
+   <filepath>epoch/server.cfg</filepath>
+   <options>key-regex</options>
+  </text>
+ </replace_texts>
+ <server_params>
+  <param id="MEMORY" key="-maxMem=" type="text">
+   <option>ns</option>
+   <default>2047</default>
+   <caption>Max RAM allocated</caption>
+   <desc>Maximum usable memory in MB, for example: 1024</desc>
+  </param>
+ </server_params>
+</game_config>

protocol/lgsl/lgsl_protocol.php

@@ -53,7 +53,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"crysiswars"	=> "Crysis Wars",
 		"cs2d"			=> "Counter-Strike 2D",
 		"cube"			=> "Cube Engine",
-		"dayz_arma2co"	=> "Dayz ArmA 2 Combined Operations",
+		"dayzmod"          => "DayZ Mod",
 		"doomskulltag"	=> "Doom - Skulltag",
 		"doomzdaemon"	=> "Doom - ZDaemon",
 		"doom3"			=> "Doom 3",
@@ -193,7 +193,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"crysiswars"	=> "06",
 		"cs2d"			=> "29",
 		"cube"			=> "24",
-		"dayz_arma2co"	=> "06",
+		"dayzmod"  => "05",
 		"doomskulltag"	=> "27",
 		"doomzdaemon"	=> "28",
 		"doom3"			=> "10",
@@ -313,7 +313,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"aarmy"			=> "qtracker://{IP}:{S_PORT}?game=ArmyOperations&action=show",
 		"aarmy3"		=> "qtracker://{IP}:{S_PORT}?game=AmericasArmy3&action=show",
 		"arcasimracing"	=> "http://en.wikipedia.org/wiki/ARCA_Sim_Racing",
-		"arkse"			=> "steam://connect/{IP}:{S_PORT}",
+		"arkse"			=> "steam://connect/{IP}:{Q_PORT}",
 		"arma"			=> "qtracker://{IP}:{S_PORT}?game=ArmedAssault&action=show",
 		"arma2"			=> "http://en.wikipedia.org/wiki/ARMA_2",
 		"arma2oa"		=> "http://en.wikipedia.org/wiki/ARMA_2",
@@ -341,7 +341,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"crysiswars"	=> "qtracker://{IP}:{S_PORT}?game=CrysisWars&action=show",
 		"cs2d"			=> "http://www.cs2d.com",
 		"cube"			=> "http://cubeengine.com",
-		"dayz_arma2co"	=> "http://en.wikipedia.org/wiki/ARMA_2",
+		"dayzmod"          => "steam://connect/{IP}:{S_PORT}",
 		"doomskulltag"	=> "http://skulltag.com",
 		"doomzdaemon"	=> "http://www.zdaemon.org",
 		"doom3"			=> "qtracker://{IP}:{S_PORT}?game=Doom3&action=show",
@@ -442,6 +442,9 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		// SOFTWARE PORT IS THE QUERY PORT UNLESS SET
 		if (!$s_port) { $s_port = $q_port; }
 
+		// Force the SimpleXMLElement into a plain string
+		$type = (string) $type;
+
 	   // TRY USING THE STANDARD LAUNCH LINK FOR ALTERNATE PROTOCOLS IF ONE IS NOT SET
 		$type = str_replace("_", "", $type);
 
@@ -460,7 +463,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 			case "aarmy"			: $c_to_q = 1;		$c_def = 1716;	$q_def = 1717;	$c_to_s = 0;	break;
 			case "aarmy3"			: $c_to_q = 0;		$c_def = 8777;	$q_def = 39300;	$c_to_s = 0;	break;
 			case "arcasimracing"	: $c_to_q = -100;	$c_def = 34397;	$q_def = 34297;	$c_to_s = 0;	break;
-			case "arkse"			: $c_to_q = 1;		$c_def = 7777;	$q_def = 7778;	$c_to_s = 0;	break;
+			case "arkse"			: $c_to_q = 19238;	$c_def = 7777;	$q_def = 27015;	$c_to_s = 0;	break;
 			case "arma3"			: $c_to_q = 1; 		$c_def = 2302; 	$q_def = 2303; 	$c_to_s = 0; 	break;
 			case "avorion"			: $c_to_q = 20; 	$c_def = 27000;	$q_def = 27020; $c_to_s = 0;  	break;
 			case "bfbc2"			: $c_to_q = 0;		$c_def = 19567;	$q_def = 48888;	$c_to_s = 0;	break;
@@ -471,6 +474,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 			case "bf2142"			: $c_to_q = 0;		$c_def = 17567;	$q_def = 29900;	$c_to_s = 0;	break;
 			case "conanexiles"		: $c_to_q = 2;		$c_def = 24000;	$q_def = 24002;	$c_to_s = 0;	break;
 			case "cube"				: $c_to_q = 1;		$c_def = 28785;	$q_def = 28786;	$c_to_s = 0;	break;
+			case "dayzmod"                     : $c_to_q = 1;	  	$c_def = 2302;  $q_def = 2303;  $c_to_s = 0;    break;
 			case "dh2005"			: $c_to_q = 0;		$c_def = 23459;	$q_def = 34567;	$c_to_s = 0;	break;
 			case "farcry"			: $c_to_q = 123;	$c_def = 49001;	$q_def = 49124;	$c_to_s = 0;	break;
 			case "flashpoint"		: $c_to_q = 1;		$c_def = 2302;	$q_def = 2303;	$c_to_s = 0;	break;
@@ -534,7 +538,6 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 	function lgsl_query_live($type, $ip, $c_port, $q_port, $s_port, $request)
 	{
 //---------------------------------------------------------+
-
 		if (preg_match("/[^0-9a-z\.\-\[\]\:]/i", $ip))
 		{
 			exit("LGSL PROBLEM: INVALID IP OR HOSTNAME");
@@ -1640,7 +1643,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 			if (!empty($server['e']['gsgamename'])) { $server['s']['game'] = $server['e']['gsgamename']; } // FEAR
 			if (!empty($server['e']['game_id']))	{ $server['s']['game'] = $server['e']['game_id']; }	// BFVIETNAM
 
-			if ($server['b']['type'] == "arma" || $server['b']['type'] == "arma2" || $server['b']['type'] == "arma2oa" || $server['b']['type'] == "arma2co" || $server['b']['type'] == "dayz_arma2co")
+			if ($server['b']['type'] == "arma" || $server['b']['type'] == "arma2" || $server['b']['type'] == "arma2oa" || $server['b']['type'] == "arma2co" || $server['b']['type'] == "dayzmod")
 			{
 				$server['s']['map'] = $server['e']['mission'];
 			}