Hotfix after changing db structure.

Updated to v0.5.4

01_DCS/Hooks/Perun.lua

@@ -20,7 +20,7 @@ Perun.MOTD_L2 = "Wymagamy obecnosci na 255Mhz (DCS SRS)"				-- (string) Message
 
 
 -- Variable init
-Perun.Version = "v0.5.0"
+Perun.Version = "v0.5.4"
 Perun.StatusData = {}
 Perun.SlotsData = {}
 Perun.MissionData = {}
@@ -285,7 +285,6 @@ Perun.LogStatsCount = function(argPlayerID,argAction,argType)
 		-- Create empty element
 		_temp={}
 		_temp['ps_type'] = argType
-		_temp['ps_kills'] = 0
 		_temp['ps_pvp'] = 0
 		_temp['ps_deaths'] = 0
 		_temp['ps_ejections'] = 0
@@ -298,6 +297,7 @@ Perun.LogStatsCount = function(argPlayerID,argAction,argType)
 		_temp['ps_kills_unarmed'] = 0
 		_temp['ps_kills_infantry'] = 0
 		_temp['ps_kills_ships'] = 0
+		_temp['ps_kills_fortification'] = 0
 		_temp['ps_kills_other'] = 0
 		_temp['ps_airfield_takeoffs'] = 0
 		_temp['ps_airfield_landings'] = 0
@@ -305,6 +305,8 @@ Perun.LogStatsCount = function(argPlayerID,argAction,argType)
 		_temp['ps_ship_landings'] = 0
 		_temp['ps_farp_takeoffs'] = 0
 		_temp['ps_farp_landings'] = 0
+		_temp['ps_other_takeoffs'] = 0
+		_temp['ps_other_landings'] = 0
 
 		Perun.StatData[_ucid]=_temp
 	end
@@ -350,10 +352,16 @@ Perun.LogStatsCount = function(argPlayerID,argAction,argType)
 		Perun.StatData[_ucid]['ps_kills_armor']=Perun.StatData[_ucid]['ps_kills_armor']+1
 	elseif  argAction == "kill_Infantry" then
 		Perun.StatData[_ucid]['ps_kills_infantry']=Perun.StatData[_ucid]['ps_kills_infantry']+1
+	elseif  argAction == "kill_Fortification" then
+		Perun.StatData[_ucid]['ps_kills_fortification']=Perun.StatData[_ucid]['ps_kills_fortification']+1
 	elseif  argAction == "kill_Other" then
 		Perun.StatData[_ucid]['ps_kills_other']=Perun.StatData[_ucid]['ps_kills_other']+1
 	elseif  argAction == "kill_PvP" then
 		Perun.StatData[_ucid]['ps_pvp']=Perun.StatData[_ucid]['ps_pvp']+1
+	elseif  argAction == "landing_OTHER" then
+		Perun.StatData[_ucid]['ps_other_landings']=Perun.StatData[_ucid]['ps_other_landings']+1
+	elseif  argAction == "tookoff_OTHER" then
+		Perun.StatData[_ucid]['ps_other_takeoffs']=Perun.StatData[_ucid]['ps_other_takeoffs']+1
 	end
 	
 	Perun.LogStats(argPlayerID);
@@ -482,12 +490,15 @@ end
 Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
     if eventName == "friendly_fire" then
         --"friendly_fire", playerID, weaponName, victimPlayerID
-		if arg2 == nil then
+		if arg2 == "" then
 			arg2 = "Cannon"
 		end
 		
         Perun.LogEvent(eventName,Perun.SideID2Name( net.get_player_info(arg1, "side")) .. " player " .. net.get_player_info(arg1, "name").." killed friendy " .. net.get_player_info(arg3, "name") .. " using " .. arg2,nil,nil);
-        Perun.LogStatsCount(arg1,"friendly_fire",DCS.getUnitType(arg1))
+        
+		if arg1 ~= arg3 then
+			Perun.LogStatsCount(arg1,"friendly_fire",DCS.getUnitType(arg1))
+		end
 
     elseif eventName == "mission_end" then
         --"mission_end", winner, msg
@@ -495,17 +506,17 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
 
     elseif eventName == "kill" then
         --"kill", killerPlayerID, killerUnitType, killerSide, victimPlayerID, victimUnitType, victimSide, weaponName
-        if net.get_player_info(arg4, "name") ~= nil then
-            _temp = " player ".. net.get_player_info(arg4, "name") .." ";
+		_tempX=""
+		if net.get_player_info(arg4, "name") ~= nil then
+            _tempX = " player ".. net.get_player_info(arg4, "name") .." ";
             
 			Perun.LogStats(arg4);
         else
-            _temp = " AI ";
+            _tempX = " AI ";
         end
 
         if net.get_player_info(arg1, "name") ~= nil then
-            _temp2 = " player ".. net.get_player_info(arg1, "name") .." ";
-            
+			_temp2 = " player ".. net.get_player_info(arg1, "name") .." ";
 			if Perun.GetCategory(arg5) == "Planes" then
 				Perun.LogStatsCount(arg1,"kill_Planes",arg2)
 			elseif Perun.GetCategory(arg5) == "Helicopters" then
@@ -520,23 +531,24 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
 				Perun.LogStatsCount(arg1,"kill_Armor",arg2)
 			elseif Perun.GetCategory(arg5) == "Infantry" then
 				Perun.LogStatsCount(arg1,"kill_Infantry",arg2)
+			elseif Perun.GetCategory(arg5) == "Fortification" then
+				Perun.LogStatsCount(arg1,"kill_Fortification",arg2)
 			else 
 				Perun.LogStatsCount(arg1,"kill_Other",arg2)
 			end
-			
-			if net.get_player_info(arg4, "name") ~= nil and killerSide ~= victimSide then
+			if net.get_player_info(arg4, "name") ~= nil and arg3 ~= arg6 then
 				Perun.LogStatsCount(arg1,"kill_PvP",arg2)
 			end
+			
         else
             _temp2 = " AI ";
         end
 		
-		if arg7 == nil then
+		if arg7 == "" then
 			arg7 = "Cannon"
 		end
-		
-        Perun.LogEvent(eventName,Perun.SideID2Name(arg3) .. _temp2 .. " in " .. arg2 .. " killed " .. Perun.SideID2Name(arg6) .. _temp .. " in " .. arg5  .. " using " .. arg7 .. " [".. Perun.GetCategory(arg5).."]",arg7,Perun.GetCategory(arg5));
 
+		Perun.LogEvent(eventName,Perun.SideID2Name(arg3) .. _temp2 .. " in " .. arg2 .. " killed " .. Perun.SideID2Name(arg6) .. _tempX .. " in " .. arg5  .. " using " .. arg7 .. " [".. Perun.GetCategory(arg5).."]",arg7,Perun.GetCategory(arg5));
     elseif eventName == "self_kill" then
         --"self_kill", playerID
         Perun.LogEvent(eventName,net.get_player_info(arg1, "name") .. " killed himself",nil,nil);
@@ -551,8 +563,8 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
             _temp = "SPECTATOR";
         end
 
-        Perun.LogEvent(eventName,Perun.SideID2Name( net.get_player_info(arg1, "side")) .. " player " .. net.get_player_info(arg1, "name") .. " changed slot to " .. _temp);
-       Perun.LogStatsCount(arg1,"init",_temp,nil,nil)
+       Perun.LogEvent(eventName,Perun.SideID2Name( net.get_player_info(arg1, "side")) .. " player " .. net.get_player_info(arg1, "name") .. " changed slot to " .. _temp,nil,nil);
+       Perun.LogStatsCount(arg1,"init",_temp)
 
     elseif eventName == "connect" then
         --"connect", playerID, name
@@ -575,7 +587,7 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
 
     elseif eventName == "takeoff" then
         --"takeoff", playerID, unit_missionID, airdromeName
-        if arg3 then
+        if arg3 ~= "" then
             _temp = " from " .. arg3;
         else
             _temp = "";
@@ -583,19 +595,19 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
 
         Perun.LogEvent(eventName, Perun.SideID2Name( net.get_player_info(arg1, "side")) .. " player " .. net.get_player_info(arg1, "name") .. " took off in ".. DCS.getUnitType(arg2) .. _temp,arg3,nil);
         
-		if string.find(arg3, "FARP") then
+		if string.find(arg3, "FARP",1,true) then
 			Perun.LogStatsCount(arg1,"tookoff_FARP",DCS.getUnitType(arg2))
-		elseif string.find(arg3, "CVN-74 John C. Stennis") or string.find(arg3, "LHA-1 Tarawa") then
+		elseif string.find(arg3, "CVN-74 John C. Stennis",1,true) or string.find(arg3, "LHA-1 Tarawa",1,true) then
 			Perun.LogStatsCount(arg1,"tookoff_SHIP",DCS.getUnitType(arg2))
-		elseif arg3 then
+		elseif arg3 ~= "" then
 			Perun.LogStatsCount(arg1,"tookoff_AIRFIELD",DCS.getUnitType(arg2))
 		else
-			-- do nothing
+			Perun.LogStatsCount(arg1,"tookoff_OTHER",DCS.getUnitType(arg2))
 		end
 		
     elseif eventName == "landing" then
         --"landing", playerID, unit_missionID, airdromeName
-        if arg3 then
+        if arg3 ~= "" then
             _temp = " at " .. arg3;
         else
             _temp ="";
@@ -603,14 +615,14 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
 
         Perun.LogEvent(eventName, Perun.SideID2Name( net.get_player_info(arg1, "side")) .. " player " .. net.get_player_info(arg1, "name") .. " landed in " .. DCS.getUnitType(arg2).. _temp,arg3,nil);
 		
-		if string.find(arg3, "FARP") then
+		if string.find(arg3, "FARP",1,true) then
 			Perun.LogStatsCount(arg1,"landing_FARP",DCS.getUnitType(arg2))
-		elseif string.find(arg3, "CVN-74 John C. Stennis") or string.find(arg3, "LHA-1 Tarawa") then
+		elseif string.find(arg3, "CVN-74 John C. Stennis",1,true) or string.find(arg3, "LHA-1 Tarawa",1,true) then
 			Perun.LogStatsCount(arg1,"landing_SHIP",DCS.getUnitType(arg2))
-		elseif arg3 then
+		elseif arg3 ~= "" then
 			Perun.LogStatsCount(arg1,"landing_AIRFIELD",DCS.getUnitType(arg2))
 		else
-			-- do nothing
+			Perun.LogStatsCount(arg1,"landing_OTHER",DCS.getUnitType(arg2))
 		end
 		
     elseif eventName == "pilot_death" then

02_Windows_App/Perun_v1/01_Classes/DatabaseController.cs

@@ -62,8 +62,9 @@ internal class DatabaseController
             strSQLQueryTxt += "UPDATE `pe_DataMissionHashes` SET `pe_DataMissionHashes_datetime` = " + strUDPFrameTimestamp + " WHERE `pe_DataMissionHashes_hash` = '" + strUDPFrame.payload.stat_missionhash + "' AND `pe_DataMissionHashes_instance`=" + strUDPFrameInstance + " ;";
             strSQLQueryTxt += "INSERT INTO `pe_DataPlayers` (`pe_DataPlayers_ucid`) SELECT '" + strUDPFrame.payload.stat_ucid + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataPlayers` where `pe_DataPlayers_ucid` = '" + strUDPFrame.payload.stat_ucid + "');";
             strSQLQueryTxt += "UPDATE `pe_DataPlayers` SET `pe_DataPlayers_updated`=" + strUDPFrameTimestamp + " WHERE `pe_DataPlayers_ucid`='" + strUDPFrame.payload.stat_ucid + "';";
-            strSQLQueryTxt += "INSERT INTO `pe_LogStats` (`pe_LogStats_playerid`,`pe_LogStats_missionhash_id`,`pe_LogStats_type`) SELECT (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + strUDPFrame.payload.stat_ucid + "'), (SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + strUDPFrame.payload.stat_missionhash + "'),'" + strUDPFrame.payload.stat_data_type + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_LogStats` WHERE `pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + strUDPFrame.payload.stat_missionhash + "') AND `pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + strUDPFrame.payload.stat_ucid + "' AND `pe_LogStats_type`='"+ strUDPFrame.payload.stat_data_type + "') );";
-            strSQLQueryTxt += "UPDATE `pe_LogStats` SET `ps_kills`="+ strUDPFrame.payload.stat_data_perun.ps_kills + ",`ps_pvp`=" + strUDPFrame.payload.stat_data_perun.ps_pvp + ",`ps_deaths`=" + strUDPFrame.payload.stat_data_perun.ps_deaths + ",`ps_ejections`=" + strUDPFrame.payload.stat_data_perun.ps_ejections + ",`ps_crashes`=" + strUDPFrame.payload.stat_data_perun.ps_crashes + ",`ps_teamkills`=" + strUDPFrame.payload.stat_data_perun.ps_teamkills + ",`ps_kills_planes`=" + strUDPFrame.payload.stat_data_perun.ps_kills_planes + ",`ps_kills_helicopters`=" + strUDPFrame.payload.stat_data_perun.ps_kills_helicopters + ",`ps_kills_air_defense`=" + strUDPFrame.payload.stat_data_perun.ps_kills_air_defense + ",`ps_kills_armor`=" + strUDPFrame.payload.stat_data_perun.ps_kills_armor + ",`ps_kills_unarmed`=" + strUDPFrame.payload.stat_data_perun.ps_kills_unarmed + ",`ps_kills_infantry`=" + strUDPFrame.payload.stat_data_perun.ps_kills_infantry + ",`ps_kills_ships`=" + strUDPFrame.payload.stat_data_perun.ps_kills_ships + ",`ps_kills_other`=" + strUDPFrame.payload.stat_data_perun.ps_kills_other + ",`ps_airfield_takeoffs`=" + strUDPFrame.payload.stat_data_perun.ps_airfield_takeoffs + ",`ps_airfield_landings`=" + strUDPFrame.payload.stat_data_perun.ps_airfield_landings + ",`ps_ship_takeoffs`=" + strUDPFrame.payload.stat_data_perun.ps_ship_takeoffs + ",`ps_ship_landings`=" + strUDPFrame.payload.stat_data_perun.ps_ship_landings + ",`ps_farp_takeoffs`=" + strUDPFrame.payload.stat_data_perun.ps_farp_takeoffs + ",`ps_farp_landings`=" + strUDPFrame.payload.stat_data_perun.ps_farp_landings + ", `pe_LogStats_perun` = JSON_QUOTE('" + strUDPFramePayload_Perun + "'), `pe_LogStats_datetime`='" + strUDPFrame.payload.stat_datetime + "',`pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + strUDPFrame.payload.stat_ucid + "'),`pe_LogStats_dcs`=JSON_QUOTE('" + strUDPFramePayload + "'),`pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + strUDPFrame.payload.stat_missionhash + "') WHERE `pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + strUDPFrame.payload.stat_missionhash + "') AND `pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + strUDPFrame.payload.stat_ucid + "') AND `pe_LogStats_type`='" + strUDPFrame.payload.stat_data_type + "';";
+            strSQLQueryTxt += "INSERT INTO `pe_DataTypes` (`pe_DataTypes_name`) SELECT '" + strUDPFrame.payload.stat_data_type + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataTypes` where `pe_DataTypes_name` = '" + strUDPFrame.payload.stat_data_type + "');";
+            strSQLQueryTxt += "INSERT INTO `pe_LogStats` (`pe_LogStats_playerid`,`pe_LogStats_missionhash_id`,`pe_LogStats_typeid`) SELECT (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + strUDPFrame.payload.stat_ucid + "'), (SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + strUDPFrame.payload.stat_missionhash + "'), (SELECT pe_DataTypes_id FROM `pe_DataTypes` where `pe_DataTypes_name` = '" + strUDPFrame.payload.stat_data_type + "') FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_LogStats` WHERE `pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + strUDPFrame.payload.stat_missionhash + "') AND `pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + strUDPFrame.payload.stat_ucid + "') AND `pe_LogStats_typeid`= (SELECT pe_DataTypes_id FROM `pe_DataTypes` where `pe_DataTypes_name` = '" + strUDPFrame.payload.stat_data_type + "'));";
+            strSQLQueryTxt += "UPDATE `pe_LogStats` SET `ps_kills_fortification`=" + strUDPFrame.payload.stat_data_perun.ps_kills_fortification + ",`ps_other_landings`=" + strUDPFrame.payload.stat_data_perun.ps_other_landings + ",`ps_other_takeoffs`=" + strUDPFrame.payload.stat_data_perun.ps_other_takeoffs + ",`ps_pvp`=" + strUDPFrame.payload.stat_data_perun.ps_pvp + ",`ps_deaths`=" + strUDPFrame.payload.stat_data_perun.ps_deaths + ",`ps_ejections`=" + strUDPFrame.payload.stat_data_perun.ps_ejections + ",`ps_crashes`=" + strUDPFrame.payload.stat_data_perun.ps_crashes + ",`ps_teamkills`=" + strUDPFrame.payload.stat_data_perun.ps_teamkills + ",`ps_kills_planes`=" + strUDPFrame.payload.stat_data_perun.ps_kills_planes + ",`ps_kills_helicopters`=" + strUDPFrame.payload.stat_data_perun.ps_kills_helicopters + ",`ps_kills_air_defense`=" + strUDPFrame.payload.stat_data_perun.ps_kills_air_defense + ",`ps_kills_armor`=" + strUDPFrame.payload.stat_data_perun.ps_kills_armor + ",`ps_kills_unarmed`=" + strUDPFrame.payload.stat_data_perun.ps_kills_unarmed + ",`ps_kills_infantry`=" + strUDPFrame.payload.stat_data_perun.ps_kills_infantry + ",`ps_kills_ships`=" + strUDPFrame.payload.stat_data_perun.ps_kills_ships + ",`ps_kills_other`=" + strUDPFrame.payload.stat_data_perun.ps_kills_other + ",`ps_airfield_takeoffs`=" + strUDPFrame.payload.stat_data_perun.ps_airfield_takeoffs + ",`ps_airfield_landings`=" + strUDPFrame.payload.stat_data_perun.ps_airfield_landings + ",`ps_ship_takeoffs`=" + strUDPFrame.payload.stat_data_perun.ps_ship_takeoffs + ",`ps_ship_landings`=" + strUDPFrame.payload.stat_data_perun.ps_ship_landings + ",`ps_farp_takeoffs`=" + strUDPFrame.payload.stat_data_perun.ps_farp_takeoffs + ",`ps_farp_landings`=" + strUDPFrame.payload.stat_data_perun.ps_farp_landings + ", `pe_LogStats_datetime`='" + strUDPFrame.payload.stat_datetime + "',`pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + strUDPFrame.payload.stat_ucid + "'),`pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + strUDPFrame.payload.stat_missionhash + "') WHERE `pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + strUDPFrame.payload.stat_missionhash + "') AND `pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + strUDPFrame.payload.stat_ucid + "') AND `pe_LogStats_typeid`=(SELECT pe_DataTypes_id FROM `pe_DataTypes` where `pe_DataTypes_name` = '" + strUDPFrame.payload.stat_data_type + "');";
         }
         else if (strUDPFrameType == "53")
         {
@@ -125,4 +126,4 @@ internal class DatabaseController
         connMySQL.Close();
         Console.WriteLine("Sending data to MySQL - Done");
     }
-}
+}

02_Windows_App/Perun_v1/Perun_v1.csproj

@@ -32,8 +32,8 @@
     <SuiteName>Perun</SuiteName>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>Perun.htm</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.5.0.%2a</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>0.5.4.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

03_MySQL/m1081_perun.sql

@@ -1,5 +1,3 @@
-
-
 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
 SET AUTOCOMMIT = 0;
 START TRANSACTION;
@@ -44,8 +42,8 @@ DROP TABLE IF EXISTS `pe_DataPlayers`;
 CREATE TABLE IF NOT EXISTS `pe_DataPlayers` (
   `pe_DataPlayers_id` bigint(20) NOT NULL AUTO_INCREMENT,
   `pe_DataPlayers_ucid` varchar(150) NOT NULL,
-  `pe_DataPlayers_lastip` varchar(100) NOT NULL,
   `pe_DataPlayers_lastname` varchar(150) NOT NULL,
+  `pe_DataPlayers_lastip` varchar(100) NOT NULL,
   `pe_DataPlayers_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`pe_DataPlayers_id`),
   UNIQUE KEY `UNIQUE_UCID` (`pe_DataPlayers_ucid`)
@@ -68,6 +66,21 @@ CREATE TABLE IF NOT EXISTS `pe_DataRaw` (
 
 -- --------------------------------------------------------
 
+--
+-- Struktura tabeli dla tabeli `pe_DataTypes`
+--
+
+DROP TABLE IF EXISTS `pe_DataTypes`;
+CREATE TABLE IF NOT EXISTS `pe_DataTypes` (
+  `pe_DataTypes_id` int(11) NOT NULL AUTO_INCREMENT,
+  `pe_DataTypes_name` varchar(100) NOT NULL,
+  `pe_DataTypes_update` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`pe_DataTypes_id`),
+  UNIQUE KEY `UNIQUE_TYPE_NAME` (`pe_DataTypes_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
 --
 -- Struktura tabeli dla tabeli `pe_LogChat`
 --
@@ -94,8 +107,8 @@ CREATE TABLE IF NOT EXISTS `pe_LogChat` (
 DROP TABLE IF EXISTS `pe_LogEvent`;
 CREATE TABLE IF NOT EXISTS `pe_LogEvent` (
   `pe_LogEvent_id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `pe_LogEvent_missionhash_id` bigint(20) DEFAULT NULL,
   `pe_LogEvent_datetime` datetime DEFAULT CURRENT_TIMESTAMP,
+  `pe_LogEvent_missionhash_id` bigint(20) DEFAULT NULL,
   `pe_LogEvent_type` varchar(100) NOT NULL,
   `pe_LogEvent_content` text NOT NULL,
   `pe_LogEvent_arg1` varchar(150) DEFAULT NULL,
@@ -131,13 +144,10 @@ CREATE TABLE IF NOT EXISTS `pe_LogLogins` (
 DROP TABLE IF EXISTS `pe_LogStats`;
 CREATE TABLE IF NOT EXISTS `pe_LogStats` (
   `pe_LogStats_id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `pe_LogStats_missionhash_id` bigint(20) DEFAULT NULL,
   `pe_LogStats_datetime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `pe_LogStats_missionhash_id` bigint(20) DEFAULT NULL,
   `pe_LogStats_playerid` bigint(20) DEFAULT NULL,
-  `pe_LogStats_type` varchar(50) DEFAULT NULL,
-  `pe_LogStats_debug` text,
-  `pe_LogStats_dcs` text,
-  `pe_LogStats_perun` text,
+  `pe_LogStats_typeid` int(11) DEFAULT NULL,
   `ps_kills` int(11) UNSIGNED NOT NULL DEFAULT '0',
   `ps_pvp` int(11) UNSIGNED NOT NULL DEFAULT '0',
   `ps_deaths` int(11) UNSIGNED NOT NULL DEFAULT '0',
@@ -151,6 +161,7 @@ CREATE TABLE IF NOT EXISTS `pe_LogStats` (
   `ps_kills_unarmed` int(11) UNSIGNED NOT NULL DEFAULT '0',
   `ps_kills_infantry` int(11) UNSIGNED NOT NULL DEFAULT '0',
   `ps_kills_ships` int(11) UNSIGNED NOT NULL DEFAULT '0',
+  `ps_kills_fortification` int(10) UNSIGNED NOT NULL DEFAULT '0',
   `ps_kills_other` int(11) UNSIGNED NOT NULL DEFAULT '0',
   `ps_airfield_takeoffs` int(11) UNSIGNED NOT NULL DEFAULT '0',
   `ps_airfield_landings` int(11) UNSIGNED NOT NULL DEFAULT '0',
@@ -158,9 +169,10 @@ CREATE TABLE IF NOT EXISTS `pe_LogStats` (
   `ps_ship_landings` int(11) UNSIGNED NOT NULL DEFAULT '0',
   `ps_farp_takeoffs` int(11) UNSIGNED NOT NULL DEFAULT '0',
   `ps_farp_landings` int(11) UNSIGNED NOT NULL DEFAULT '0',
+  `ps_other_landings` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `ps_other_takeoffs` int(10) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY (`pe_LogStats_id`),
-  UNIQUE KEY `UNIQUE_STATS_PER_MISSION_AND_UCID_AND_TYPE` (`pe_LogStats_playerid`,`pe_LogStats_missionhash_id`,`pe_LogStats_type`) USING BTREE,
-  KEY `pe_LogStats_type` (`pe_LogStats_type`)
+  UNIQUE KEY `UNIQUE_STATS_PER_MISSION_AND_UCID_AND_TYPE` (`pe_LogStats_playerid`,`pe_LogStats_missionhash_id`,`pe_LogStats_typeid`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 COMMIT;