Changed MOTD dla gildia.org

Fix for friendly fire not being properly logged

01_DCS/Hooks/Perun.lua

@@ -14,13 +14,13 @@ Perun.UDPSourcePort = 48621												-- (int) UDP port to send data from
 Perun.Instance = 1														-- (int) Id number of instance (if multiple DCS instances are to run at the same PC)
 Perun.JsonStatusLocation = "Scripts\\Json\\" 							-- (string) folder relative do user's SaveGames DCS folder -> status file updated each RefreshMission
 Perun.MOTD_L1 = "Witamy na serwerze Gildia.org !"						-- (string) Message send to players connecting the server - Line 1
-Perun.MOTD_L2 = "Wymagamy obecnosci na 255Mhz (DCS SRS)"				-- (string) Message send to players connecting the server - Line 2
+Perun.MOTD_L2 = "Wymagamy obecnosci DCS SRS - szczegoly na forum"		-- (string) Message send to players connecting the server - Line 2
 
 -- ###################### END OF SETTINGS - DO NOT MODIFY OUTSIDE THIS SECTION ######################
 
 
 -- Variable init
-Perun.Version = "v0.5.4"
+Perun.Version = "v0.6.0"
 Perun.StatusData = {}
 Perun.SlotsData = {}
 Perun.MissionData = {}
@@ -238,6 +238,18 @@ Perun.UpdateStatus = function()
 
 		for j, i in pairs(Perun.SlotsData['coalitions']) do
 			Perun.SlotsData['slots'][j]=DCS.getAvailableSlots(j)
+			
+			for sj, si in pairs(Perun.SlotsData['slots'][j]) do
+				Perun.SlotsData['slots'][j][sj]['countryName']= nil
+				Perun.SlotsData['slots'][j][sj]['onboard_num']= nil
+				Perun.SlotsData['slots'][j][sj]['groupSize']= nil
+				Perun.SlotsData['slots'][j][sj]['groupName']= nil
+				Perun.SlotsData['slots'][j][sj]['callsign']= nil
+				Perun.SlotsData['slots'][j][sj]['task']= nil
+				Perun.SlotsData['slots'][j][sj]['airdromeId']= nil
+				Perun.SlotsData['slots'][j][sj]['helipadName']= nil
+			end
+			
 		end
 		-- Send
 		Perun.Send(3,Perun.SlotsData)
@@ -497,7 +509,7 @@ 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").." killed friendy " .. net.get_player_info(arg3, "name") .. " using " .. arg2,nil,nil);
         
 		if arg1 ~= arg3 then
-			Perun.LogStatsCount(arg1,"friendly_fire",DCS.getUnitType(arg1))
+			-- Perun.LogStatsCount(arg1,"friendly_fire",DCS.getUnitType(net.get_player_info(arg1 , 'slot')))
 		end
 
     elseif eventName == "mission_end" then
@@ -540,6 +552,10 @@ Perun.onGameEvent = function (eventName,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
 				Perun.LogStatsCount(arg1,"kill_PvP",arg2)
 			end
 			
+			if arg3 == arg6 then
+				Perun.LogStatsCount(arg1,"friendly_fire",arg2)
+			end
+			
         else
             _temp2 = " AI ";
         end

02_Windows_App/Perun_v1/Perun_v1.csproj

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

02_Windows_App/Perun_v1/Properties/AssemblyInfo.cs

@@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
 // Możesz określić wszystkie wartości lub użyć domyślnych numerów kompilacji i poprawki
 // przy użyciu symbolu „*”, tak jak pokazano poniżej:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.6.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyFileVersion("0.6.0.0")]
 [assembly: NeutralResourcesLanguage("en")]
 

03_MySQL/m1081_perun.sql

@@ -1,3 +1,4 @@
+
 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
 SET AUTOCOMMIT = 0;
 START TRANSACTION;