From 8917701a19f5891410a1bf4820ada2749c9a78e5 Mon Sep 17 00:00:00 2001 From: szporowolik Date: Sat, 7 Nov 2020 12:08:31 +0100 Subject: [PATCH 1/4] Fixed default port to 48621 and info about new tables added in v0.11.0 --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 09893f1..56c7048 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Core: ## Running * Start DCS World and host multiplayer session - * by default the TCP port 48620 is in use as target port - ensure that port and instance ID in the options sections of the Lua file matches data + * by default the TCP port 48621 is in use as target port - ensure that port and instance ID in the options sections of the Lua file matches data * run the Win32 application * set MySQL connection data * **optionaly** point LotATC json file location @@ -87,6 +87,8 @@ DCS API does not track carrier or FARP operations natively, so there is a trick * table: pe_LogEvent - holds event history * table: pe_LogLogins - holds login to server event history * table: pe_LogStats - holds static information +* table: pe_OnlinePlayers - holds the list of actual players connected to the server +* table: pe_OnlineStatus - holds the information about server status of all instantes ![Database Scheme](https://i.imgur.com/zJsFxV0.png "MIT") @@ -141,3 +143,5 @@ This software is provide "as it is" without any warranties, but if you would lik ![Gildia.org Logo](https://images.weserv.nl/?url=https://i.imgur.com/nFHxQMy.png&w=140&il) Thanks to [Gildia DCS](https://forum.gildia.org) Polish community of DCS World pilots. + +Thanks to our Discord community for all the disussions, tests and proposals! From 174dccbe1a16a8814d789aac63e320f2e9987fbc Mon Sep 17 00:00:00 2001 From: VladMordock Date: Thu, 12 Nov 2020 00:26:06 +0100 Subject: [PATCH 2/4] Added info about STRICT_TRANS_TABLES into ReadMe --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 56c7048..278d972 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Core: * Download latest [release](https://github.com/szporwolik/perun/releases) * Copy contents of [01_DCS](https://github.com/szporwolik/perun/tree/master/01_DCS) to your \Scripts folder (located inside DCS folder in your Saved Games) * Create MySQL database using SQL script located in [03_MySQL](https://github.com/szporwolik/perun/tree/master/03_MySQL); note that you need just a one database per DCS server machine - multiple instances pushing data to the one database are supported +* Ensure that your MySQL config is not using STRICT_TRANS_TABLES ## Running * Start DCS World and host multiplayer session From 3f33b2a1662516046dc6c92aa86346ec39548c34 Mon Sep 17 00:00:00 2001 From: VladMordock Date: Thu, 12 Nov 2020 00:27:34 +0100 Subject: [PATCH 3/4] Fixed SQL Code --- 03_MySQL/m1081_perun.sql | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/03_MySQL/m1081_perun.sql b/03_MySQL/m1081_perun.sql index 16c92e8..7c7504f 100644 --- a/03_MySQL/m1081_perun.sql +++ b/03_MySQL/m1081_perun.sql @@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `pe_Config` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `pe_Config` (`pe_Config_id`, `pe_Config_payload`) VALUES -(1, 'v0.11.0'); +(1, 'v0.11.1'); DROP TABLE IF EXISTS `pe_DataMissionHashes`; CREATE TABLE IF NOT EXISTS `pe_DataMissionHashes` ( @@ -176,25 +176,25 @@ DROP TABLE IF EXISTS `pe_OnlinePlayers`; CREATE TABLE IF NOT EXISTS `pe_OnlinePlayers` ( `pe_OnlinePlayers_id` int(11) NOT NULL, `pe_OnlinePlayers_instance` int(11) NOT NULL, - `pe_OnlinePlayers_ping` int(11) NOT NULL, - `pe_OnlinePlayers_side` int(11) NOT NULL, - `pe_OnlinePlayers_slot` varchar(255) NOT NULL, - `pe_OnlinePlayers_ucid` varchar(255) NOT NULL, + `pe_OnlinePlayers_ping` int(11) DEFAULT NULL, + `pe_OnlinePlayers_side` int(11) DEFAULT NULL, + `pe_OnlinePlayers_slot` varchar(255) DEFAULT NULL, + `pe_OnlinePlayers_ucid` varchar(255) DEFAULT NULL, `pe_OnlinePlayers_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ) ENGINE=InnoDB DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `pe_OnlineStatus`; CREATE TABLE IF NOT EXISTS `pe_OnlineStatus` ( `pe_OnlineStatus_instance` int(11) NOT NULL, - `pe_OnlineStatus_theatre` varchar(255) NOT NULL, - `pe_OnlineStatus_name` varchar(255) NOT NULL, - `pe_OnlineStatus_pause` varchar(255) NOT NULL, - `pe_OnlineStatus_multiplayer` varchar(255) NOT NULL, - `pe_OnlineStatus_realtime` varchar(255) NOT NULL, - `pe_OnlineStatus_modeltime` varchar(255) NOT NULL, - `pe_OnlineStatus_players` int(11) NOT NULL, - `pe_OnlineStatus_perunversion_winapp` varchar(255) NOT NULL, - `pe_OnlineStatus_perunversion_dcshook` varchar(255) NOT NULL, + `pe_OnlineStatus_theatre` varchar(255) DEFAULT NULL, + `pe_OnlineStatus_name` varchar(255) DEFAULT NULL, + `pe_OnlineStatus_pause` varchar(255) DEFAULT NULL, + `pe_OnlineStatus_multiplayer` varchar(255) DEFAULT NULL, + `pe_OnlineStatus_realtime` varchar(255) DEFAULT NULL, + `pe_OnlineStatus_modeltime` varchar(255) DEFAULT NULL, + `pe_OnlineStatus_players` int(11) DEFAULT NULL, + `pe_OnlineStatus_perunversion_winapp` varchar(255) DEFAULT NULL, + `pe_OnlineStatus_perunversion_dcshook` varchar(255) DEFAULT NULL, `pe_OnlineStatus_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From a695d32ee3083495f90095016ed747bdbdf3e682 Mon Sep 17 00:00:00 2001 From: VladMordock Date: Thu, 12 Nov 2020 00:28:01 +0100 Subject: [PATCH 4/4] 0.11.1 for Perun.lua --- 01_DCS/Hooks/Perun.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/01_DCS/Hooks/Perun.lua b/01_DCS/Hooks/Perun.lua index 8d629f4..248df12 100644 --- a/01_DCS/Hooks/Perun.lua +++ b/01_DCS/Hooks/Perun.lua @@ -22,7 +22,7 @@ Perun.MOTD_L2 = "Wymagamy obecnosci DCS SRS oraz TeamSpeak - szczegoly na forum" -- ###################### END OF SETTINGS - DO NOT MODIFY OUTSIDE THIS SECTION ###################### -- Variable init -Perun.Version = "v0.11.0" +Perun.Version = "v0.11.1" Perun.StatusData = {} Perun.SlotsData = {} Perun.MissionData = {}